From af3ea7d5579536417fb8b3c90e91514462257edb Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Tue, 24 Jan 2017 23:59:54 +0000 Subject: [PATCH 1/1] Import harfbuzz_1.4.2.orig.tar.bz2 [dgit import orig harfbuzz_1.4.2.orig.tar.bz2] --- AUTHORS | 9 + BUILD.md | 36 + COPYING | 36 + ChangeLog | 57702 ++++++++++++++++ INSTALL | 370 + Makefile.am | 82 + Makefile.in | 940 + NEWS | 1581 + README | 12 + README.python | 30 + THANKS | 7 + TODO | 69 + aclocal.m4 | 1314 + ar-lib | 270 + autogen.sh | 46 + compile | 347 + config.guess | 1558 + config.h.in | 202 + config.sub | 1791 + configure | 22344 ++++++ configure.ac | 531 + depcomp | 791 + docs/HarfBuzz.png | Bin 0 -> 3419 bytes docs/Makefile.am | 122 + docs/Makefile.in | 873 + docs/harfbuzz-docs.xml | 194 + docs/harfbuzz-overrides.txt | 0 docs/harfbuzz-sections.txt | 599 + docs/harfbuzz.types | 27 + docs/html/HarfBuzz.png | Bin 0 -> 3419 bytes ...clustering-example-for-levels-0-and-1.html | 81 + docs/html/adding-text-to-the-buffer.html | 35 + docs/html/annotation-glossary.html | 72 + docs/html/api-index-0-9-10.html | 41 + docs/html/api-index-0-9-11.html | 34 + docs/html/api-index-0-9-2.html | 749 + docs/html/api-index-0-9-20.html | 38 + docs/html/api-index-0-9-22.html | 34 + docs/html/api-index-0-9-28.html | 34 + docs/html/api-index-0-9-30.html | 41 + docs/html/api-index-0-9-31.html | 46 + docs/html/api-index-0-9-38.html | 45 + docs/html/api-index-0-9-39.html | 34 + docs/html/api-index-0-9-41.html | 34 + docs/html/api-index-0-9-42.html | 38 + docs/html/api-index-0-9-5.html | 56 + docs/html/api-index-0-9-7.html | 191 + docs/html/api-index-0-9-8.html | 34 + docs/html/api-index-1-0-5.html | 42 + docs/html/api-index-1-1-2.html | 38 + docs/html/api-index-1-1-3.html | 49 + docs/html/api-index-1-2-3.html | 46 + docs/html/api-index-1-3-3.html | 86 + docs/html/api-index-full.html | 1940 + ...buffers-language-script-and-direction.html | 87 + docs/html/building.html | 80 + docs/html/ch08.html | 106 + docs/html/clusters.html | 97 + docs/html/customizing-unicode-functions.html | 31 + docs/html/deprecated-api-index.html | 56 + docs/html/fonts-and-faces.html | 40 + docs/html/harfbuzz-Buffers.html | 2738 + docs/html/harfbuzz-Shaping.html | 345 + docs/html/harfbuzz-hb-blob.html | 651 + docs/html/harfbuzz-hb-common.html | 1451 + docs/html/harfbuzz-hb-coretext.html | 135 + docs/html/harfbuzz-hb-deprecated.html | 169 + docs/html/harfbuzz-hb-face.html | 619 + docs/html/harfbuzz-hb-font.html | 2999 + docs/html/harfbuzz-hb-ft.html | 258 + docs/html/harfbuzz-hb-glib.html | 120 + docs/html/harfbuzz-hb-gobject.html | 726 + docs/html/harfbuzz-hb-graphite2.html | 109 + docs/html/harfbuzz-hb-icu.html | 105 + docs/html/harfbuzz-hb-ot-font.html | 76 + docs/html/harfbuzz-hb-ot-layout.html | 719 + docs/html/harfbuzz-hb-ot-math.html | 967 + docs/html/harfbuzz-hb-ot-shape.html | 80 + docs/html/harfbuzz-hb-ot-tag.html | 157 + docs/html/harfbuzz-hb-ot.html | 53 + docs/html/harfbuzz-hb-set.html | 947 + docs/html/harfbuzz-hb-shape-plan.html | 434 + docs/html/harfbuzz-hb-unicode.html | 1495 + docs/html/harfbuzz-hb-uniscribe.html | 91 + docs/html/harfbuzz-hb-version.html | 214 + docs/html/harfbuzz-hb.html | 53 + docs/html/harfbuzz.devhelp2 | 878 + docs/html/hello-harfbuzz.html | 181 + docs/html/home.png | Bin 0 -> 256 bytes docs/html/index.html | 207 + docs/html/install-harfbuzz.html | 59 + docs/html/left-insensitive.png | Bin 0 -> 395 bytes docs/html/left.png | Bin 0 -> 262 bytes docs/html/level-2.html | 130 + docs/html/object-tree.html | 61 + docs/html/plans-and-caching.html | 31 + docs/html/pt01.html | 87 + docs/html/pt02.html | 143 + docs/html/reordering-in-levels-0-and-1.html | 53 + docs/html/right-insensitive.png | Bin 0 -> 373 bytes docs/html/right.png | Bin 0 -> 261 bytes docs/html/setting-buffer-properties.html | 31 + docs/html/shaping-and-shape-plans.html | 39 + docs/html/style.css | 479 + ...he-distinction-between-levels-0-and-1.html | 81 + docs/html/up-insensitive.png | Bin 0 -> 374 bytes docs/html/up.png | Bin 0 -> 260 bytes ...fbuzzs-native-opentype-implementation.html | 31 + docs/html/using-your-own-font-functions.html | 31 + docs/html/what-about-the-other-scripts.html | 31 + docs/html/what-is-harfbuzz.html | 124 + docs/html/why-is-it-called-harfbuzz.html | 38 + ...-buffers-language-script-and-direction.xml | 77 + docs/usermanual-clusters.xml | 304 + docs/usermanual-fonts-and-faces.xml | 18 + docs/usermanual-glyph-information.xml | 8 + docs/usermanual-hello-harfbuzz.xml | 183 + docs/usermanual-install-harfbuzz.xml | 70 + docs/usermanual-opentype-features.xml | 13 + docs/usermanual-what-is-harfbuzz.xml | 115 + docs/version.xml | 1 + docs/version.xml.in | 1 + gtk-doc.make | 289 + harfbuzz.doap | 24 + install-sh | 527 + ltmain.sh | 9661 +++ m4/ax_pthread.m4 | 309 + m4/gtk-doc.m4 | 88 + m4/libtool.m4 | 7997 +++ m4/ltoptions.m4 | 384 + m4/ltsugar.m4 | 123 + m4/ltversion.m4 | 23 + m4/lt~obsolete.m4 | 98 + m4/pkg.m4 | 157 + missing | 215 + src/Makefile.am | 374 + src/Makefile.in | 3002 + src/Makefile.sources | 160 + src/check-c-linkage-decls.sh | 28 + src/check-defs.sh | 44 + src/check-header-guards.sh | 24 + src/check-includes.sh | 44 + src/check-libstdc++.sh | 34 + src/check-static-inits.sh | 39 + src/check-symbols.sh | 43 + src/gen-arabic-table.py | 269 + src/gen-indic-table.py | 260 + src/gen-use-table.py | 477 + src/harfbuzz-gobject.pc.in | 12 + src/harfbuzz-icu.pc.in | 13 + src/harfbuzz.pc.in | 13 + src/hb-atomic-private.hh | 189 + src/hb-blob.cc | 478 + src/hb-blob.h | 126 + src/hb-buffer-deserialize-json.hh | 643 + src/hb-buffer-deserialize-json.rl | 132 + src/hb-buffer-deserialize-text.hh | 571 + src/hb-buffer-deserialize-text.rl | 126 + src/hb-buffer-private.hh | 296 + src/hb-buffer-serialize.cc | 454 + src/hb-buffer.cc | 1818 + src/hb-buffer.h | 472 + src/hb-cache-private.hh | 74 + src/hb-common.cc | 951 + src/hb-common.h | 403 + src/hb-coretext.cc | 1310 + src/hb-coretext.h | 60 + src/hb-deprecated.h | 61 + src/hb-directwrite.cc | 934 + src/hb-directwrite.h | 38 + src/hb-face-private.hh | 111 + src/hb-face.cc | 475 + src/hb-face.h | 117 + src/hb-fallback-shape.cc | 143 + src/hb-font-private.hh | 553 + src/hb-font.cc | 1773 + src/hb-font.h | 627 + src/hb-ft.cc | 763 + src/hb-ft.h | 126 + src/hb-glib.cc | 402 + src/hb-glib.h | 56 + src/hb-gobject-enums.cc.tmpl | 73 + src/hb-gobject-enums.h.tmpl | 55 + src/hb-gobject-structs.cc | 83 + src/hb-gobject-structs.h | 117 + src/hb-gobject.h | 40 + src/hb-graphite2.cc | 427 + src/hb-graphite2.h | 48 + src/hb-icu.cc | 371 + src/hb-icu.h | 52 + src/hb-mutex-private.hh | 141 + src/hb-object-private.hh | 202 + src/hb-open-file-private.hh | 268 + src/hb-open-type-private.hh | 1168 + src/hb-ot-cbdt-table.hh | 384 + src/hb-ot-cmap-table.hh | 535 + src/hb-ot-font.cc | 631 + src/hb-ot-font.h | 45 + src/hb-ot-glyf-table.hh | 104 + src/hb-ot-head-table.hh | 154 + src/hb-ot-hhea-table.hh | 103 + src/hb-ot-hmtx-table.hh | 102 + src/hb-ot-layout-common-private.hh | 1721 + src/hb-ot-layout-gdef-table.hh | 459 + src/hb-ot-layout-gpos-table.hh | 1654 + src/hb-ot-layout-gsub-table.hh | 1369 + src/hb-ot-layout-gsubgpos-private.hh | 2329 + src/hb-ot-layout-jstf-table.hh | 234 + src/hb-ot-layout-private.hh | 627 + src/hb-ot-layout.cc | 1231 + src/hb-ot-layout.h | 321 + src/hb-ot-map-private.hh | 239 + src/hb-ot-map.cc | 328 + src/hb-ot-math-table.hh | 722 + src/hb-ot-math.cc | 254 + src/hb-ot-math.h | 209 + src/hb-ot-maxp-table.hh | 72 + src/hb-ot-name-table.hh | 136 + src/hb-ot-os2-table.hh | 105 + src/hb-ot-post-table.hh | 119 + src/hb-ot-shape-complex-arabic-fallback.hh | 354 + src/hb-ot-shape-complex-arabic-private.hh | 50 + src/hb-ot-shape-complex-arabic-table.hh | 395 + src/hb-ot-shape-complex-arabic-win1256.hh | 323 + src/hb-ot-shape-complex-arabic.cc | 624 + src/hb-ot-shape-complex-default.cc | 46 + src/hb-ot-shape-complex-hangul.cc | 425 + src/hb-ot-shape-complex-hebrew.cc | 186 + src/hb-ot-shape-complex-indic-machine.hh | 1564 + src/hb-ot-shape-complex-indic-machine.rl | 129 + src/hb-ot-shape-complex-indic-private.hh | 189 + src/hb-ot-shape-complex-indic-table.cc | 484 + src/hb-ot-shape-complex-indic.cc | 1820 + src/hb-ot-shape-complex-myanmar-machine.hh | 400 + src/hb-ot-shape-complex-myanmar-machine.rl | 128 + src/hb-ot-shape-complex-myanmar.cc | 545 + src/hb-ot-shape-complex-private.hh | 374 + src/hb-ot-shape-complex-thai.cc | 382 + src/hb-ot-shape-complex-tibetan.cc | 63 + src/hb-ot-shape-complex-use-machine.hh | 450 + src/hb-ot-shape-complex-use-machine.rl | 173 + src/hb-ot-shape-complex-use-private.hh | 96 + src/hb-ot-shape-complex-use-table.cc | 734 + src/hb-ot-shape-complex-use.cc | 610 + src/hb-ot-shape-fallback-private.hh | 53 + src/hb-ot-shape-fallback.cc | 553 + src/hb-ot-shape-normalize-private.hh | 69 + src/hb-ot-shape-normalize.cc | 415 + src/hb-ot-shape-private.hh | 106 + src/hb-ot-shape.cc | 922 + src/hb-ot-shape.h | 53 + src/hb-ot-tag.cc | 1080 + src/hb-ot-tag.h | 59 + src/hb-ot-var-avar-table.hh | 144 + src/hb-ot-var-fvar-table.hh | 209 + src/hb-ot-var-hvar-table.hh | 165 + src/hb-ot-var.cc | 160 + src/hb-ot-var.h | 105 + src/hb-ot.h | 45 + src/hb-private.hh | 1024 + src/hb-set-private.hh | 402 + src/hb-set.cc | 471 + src/hb-set.h | 157 + src/hb-shape-plan-private.hh | 67 + src/hb-shape-plan.cc | 585 + src/hb-shape-plan.h | 108 + src/hb-shape.cc | 161 + src/hb-shape.h | 62 + src/hb-shaper-impl-private.hh | 43 + src/hb-shaper-list.hh | 58 + src/hb-shaper-private.hh | 108 + src/hb-shaper.cc | 111 + src/hb-ucdn.cc | 243 + src/hb-ucdn/COPYING | 13 + src/hb-ucdn/Makefile.am | 16 + src/hb-ucdn/Makefile.in | 653 + src/hb-ucdn/Makefile.sources | 4 + src/hb-ucdn/README | 40 + src/hb-ucdn/ucdn.c | 359 + src/hb-ucdn/ucdn.h | 460 + src/hb-ucdn/unicodedata_db.h | 5514 ++ src/hb-unicode-private.hh | 370 + src/hb-unicode.cc | 563 + src/hb-unicode.h | 471 + src/hb-uniscribe.cc | 1036 + src/hb-uniscribe.h | 46 + src/hb-utf-private.hh | 282 + src/hb-version.h | 66 + src/hb-version.h.in | 66 + src/hb-warning.cc | 39 + src/hb.h | 51 + src/main.cc | 199 + src/test-buffer-serialize.cc | 129 + src/test-size-params.cc | 96 + src/test-would-substitute.cc | 106 + src/test.cc | 136 + test-driver | 139 + test/Makefile.am | 9 + test/Makefile.in | 670 + test/api/Makefile.am | 161 + test/api/Makefile.in | 1476 + test/api/fonts/MathTestFontEmpty.otf | Bin 0 -> 14320 bytes test/api/fonts/MathTestFontFull.otf | Bin 0 -> 25412 bytes test/api/fonts/MathTestFontNone.otf | Bin 0 -> 14284 bytes test/api/fonts/MathTestFontPartial1.otf | Bin 0 -> 14348 bytes test/api/fonts/MathTestFontPartial2.otf | Bin 0 -> 14356 bytes test/api/fonts/MathTestFontPartial3.otf | Bin 0 -> 14380 bytes test/api/fonts/MathTestFontPartial4.otf | Bin 0 -> 14360 bytes test/api/hb-test.h | 265 + test/api/test-blob.c | 349 + test/api/test-buffer.c | 884 + test/api/test-c.c | 62 + test/api/test-common.c | 225 + test/api/test-cplusplus.cc | 30 + test/api/test-font.c | 525 + test/api/test-object.c | 375 + test/api/test-ot-math.c | 712 + test/api/test-ot-tag.c | 320 + test/api/test-set.c | 250 + test/api/test-shape.c | 208 + test/api/test-unicode.c | 937 + test/api/test-version.c | 81 + test/fuzzing/Makefile.am | 53 + test/fuzzing/Makefile.in | 731 + test/fuzzing/README | 21 + test/fuzzing/hb-fuzzer.cc | 52 + test/fuzzing/hb-fuzzer.hh | 4 + test/fuzzing/main.cc | 21 + test/shaping/Makefile.am | 95 + test/shaping/Makefile.in | 908 + test/shaping/README.md | 40 + ...09e80afb379d16560e9e47bdd7d888bebdebc6.ttf | Bin 0 -> 61 bytes ...1d92f8bc6ff724511b296c27623f824de256e9.ttf | Bin 0 -> 2028 bytes ...f054357ff8638bac3711b422a1e31180bba863.ttf | Bin 0 -> 848 bytes ...dfc433a135a658b9f4b1a861b5cdd9658ccbb9.ttf | Bin 0 -> 4936 bytes ...1826b9643e3f124d865d617ae609db6a2ce203.ttf | Bin 0 -> 2140 bytes ...6f1687b7a221f9f2c834b0b360d3c8463b6daf.ttf | Bin 0 -> 64 bytes ...04a16f32a39c26c851b7fc014d2e8d298ba2b8.ttf | Bin 0 -> 820 bytes ...2c3fc37b2d4c3cb2ef726c6cdaaabd4b7f3eb9.ttf | Bin 0 -> 316 bytes ...2fb74c1b2aa173262734c1f616148f1648cfd6.ttf | Bin 0 -> 4064 bytes ...5edd09bd3d141cc9580f650109556cc28b22cb.ttf | Bin 0 -> 1966 bytes ...7a934cfe15c548b572c203dceb2befdf026462.ttf | Bin 0 -> 1384 bytes ...6bc2deab3846f1a682085f70c67d0421014144.ttf | Bin 0 -> 2828 bytes ...0b89df543a7e48e206a2d830c0e10e5265c630.ttf | Bin 0 -> 3428 bytes ...8c9e1d955f10f6f72c6915c3c6ff9bf9695cec.ttf | Bin 0 -> 2520 bytes ...11ff5c1647150595846ac414c595cccac34f18.ttf | Bin 0 -> 1483 bytes ...033cc5cf37bb223d7355153016b6ccece93b28.ttf | Bin 0 -> 2780 bytes ...5d6ae32a3cbe52fbf81a4e5777e3377675d5a3.ttf | Bin 0 -> 1024 bytes ...979b90b2dd929723cf4fe1715990bcb9c9a56b.ttf | Bin 0 -> 1804 bytes ...ef465752be9af900745f72fe29cb853a1401a5.ttf | Bin 0 -> 4272 bytes ...855bc8d46332b39c4ab9e2ee1a26b1f896da6b.ttf | Bin 0 -> 1088 bytes ...c9f7485c1392fa09a1b801bc2ffea79275f22e.ttf | Bin 0 -> 1496 bytes ...ce528e99f600ed9c25a2b69e32eb94a03b4ae8.ttf | Bin 0 -> 1320 bytes ...28afb650b1bb718ed2131e872fbcce57828fff.ttf | Bin 0 -> 4720 bytes ...cfd0e18d07f41c38e9598545a6d369127fc6f9.ttf | Bin 0 -> 1412 bytes ...a9d9f83020155cbb1d2be1f43d82388cbecc88.ttf | Bin 0 -> 2272 bytes ...5daf5eb5a4db77a2baa3ad9c7a6ed6e0655fa8.ttf | Bin 0 -> 61 bytes ...1bd9db850193064d17575053ae2bf8ec149ddc.ttf | Bin 0 -> 305 bytes ...66d38c62e73a39202435a4f73bf5d6acbb73c0.ttf | Bin 0 -> 824 bytes ...91b13ce889466be6de3f66e891de2bc0f117ee.ttf | Bin 0 -> 5596 bytes ...f0fbead4462d9f229167b4e6839eceb8465058.ttf | Bin 0 -> 1148 bytes ...6c5d7b625f207bc0d874c67237aad6f1e9cd6f.ttf | Bin 0 -> 3868 bytes ...7ebd573617a24aa9dfbf0b885c54875c6fe06b.ttf | Bin 0 -> 1804 bytes ...37dc4d5bf018456aea291cee06daf004c0221c.ttf | Bin 0 -> 1080 bytes ...14e7883ed152baa158b80e207b66114c823a8b.ttf | Bin 0 -> 1644 bytes ...f276fc886ea502a03b9b0e5c8b547d5dc2b61c.ttf | Bin 0 -> 784 bytes ...99955657a54e9ee38a6ba1d6f950ce58e3cc25.ttf | Bin 0 -> 1024 bytes ...3c2f8e5512187fd982417a7fb4286728e6f4a8.ttf | Bin 0 -> 3428 bytes ...40789f6d12d4cfc4b5e8e6f246c3701bcf861f.ttf | Bin 0 -> 633 bytes ...54d22037f892e76614e1645d066689a0200e61.ttf | Bin 0 -> 6068 bytes ...414f2552b654585b7a8d13dcc3e8fd9f7970a3.ttf | Bin 0 -> 66936 bytes ...9fea2a7384f2116e5b84a9b31f83be7850ce21.ttf | Bin 0 -> 3428 bytes ...4a7b00f22ffb5fd7eef6933b81c7e71bc2cdfb.ttf | Bin 0 -> 3700 bytes ...19b33197965846f21074b24e30250d67277bce.ttf | Bin 0 -> 12560 bytes ...8e908e2ed21b22228ea59ebcc0f05034c86f2e.ttf | Bin 0 -> 1016 bytes ...e2aaa0d75fcef6971ec3a96d806ba4a6b31fe2.ttf | Bin 0 -> 1804 bytes ...0c53752e85c3d28973ebc913287b8987d3dfe8.ttf | Bin 0 -> 976 bytes ...29ce50df2bdba2d10726427c6b7609bf460e04.ttf | Bin 0 -> 74856 bytes ...9473d2403488714043bcfb946c9f78b86ad627.ttf | Bin 0 -> 3440 bytes ...e48b0886ef460f532fb49f00047ec92c432ec0.ttf | Bin 0 -> 2512 bytes ...5f3d2d717fb6bd4dfae1c16d48a2cb8e12233b.ttf | Bin 0 -> 1448 bytes ...29e7fedc0b350222d7987345fe61613fa3929a.ttf | Bin 0 -> 1768 bytes ...768b9c257e0c9c35786c47cae15c46571d56be.ttf | Bin 0 -> 6332 bytes ...07635780b42f898d58654b65098763e340f5c7.ttf | Bin 0 -> 3000 bytes ...39587d13b2afa5499cc79e45780aa79293bbd4.ttf | Bin 0 -> 3724 bytes ...86fe710cfea877bbe0dbb6946a1f88d0661031.ttf | Bin 0 -> 2748 bytes ...2416c692720a7d46fadf4af99f4c9e094f00b9.ttf | Bin 0 -> 16736 bytes ...99fbc23865022234775c43503bba2e63978fe1.ttf | Bin 0 -> 3564 bytes ...18eb6f6b5eec2946c9fbbbde44e45d46f5e2ac.ttf | Bin 0 -> 1356 bytes ...b1dd4dcb515e757789a22cb4241107746fd3d0.ttf | Bin 0 -> 1004 bytes ...b39d60d758cb586db5a504f218442cd1395725.ttf | Bin 0 -> 1894 bytes ...b6c84c9e1fe0c39e152fbe845e51fd81f6748e.ttf | Bin 0 -> 2616 bytes ...dcffbdf1c4c97c05308d7600e4c283eb47dbca.ttf | Bin 0 -> 1344 bytes ...a0f5d2d9025486d8469d8b1fdd983e7632499b.ttf | Bin 0 -> 1448 bytes test/shaping/hb-diff | 10 + test/shaping/hb-diff-colorize | 7 + test/shaping/hb-diff-filter-failures | 5 + test/shaping/hb-diff-ngrams | 5 + test/shaping/hb-diff-stat | 5 + test/shaping/hb-manifest-read | 5 + test/shaping/hb-manifest-update | 5 + test/shaping/hb-unicode-decode | 5 + test/shaping/hb-unicode-encode | 5 + test/shaping/hb-unicode-prettyname | 6 + test/shaping/hb_test_tools.py | 561 + test/shaping/record-test.sh | 95 + test/shaping/run-tests.sh | 52 + .../tests/arabic-fallback-shaping.tests | 1 + test/shaping/tests/arabic-feature-order.tests | 3 + test/shaping/tests/automatic-fractions.tests | 3 + test/shaping/tests/cluster.tests | 2 + test/shaping/tests/color-fonts.tests | 1 + test/shaping/tests/context-matching.tests | 3 + test/shaping/tests/cursive-positioning.tests | 4 + test/shaping/tests/default-ignorables.tests | 1 + test/shaping/tests/fallback-positioning.tests | 2 + test/shaping/tests/fuzzed.tests | 12 + test/shaping/tests/hangul-jamo.tests | 2 + test/shaping/tests/hyphens.tests | 2 + .../tests/indic-joiner-candrabindu.tests | 2 + test/shaping/tests/indic-old-spec.tests | 2 + test/shaping/tests/indic-pref-blocking.tests | 2 + test/shaping/tests/language-tags.tests | 12 + test/shaping/tests/ligature-id.tests | 35 + test/shaping/tests/mark-filtering-sets.tests | 5 + .../tests/mongolian-variation-selector.tests | 4 + test/shaping/tests/simple.tests | 2 + test/shaping/tests/spaces.tests | 17 + test/shaping/tests/use-marchen.tests | 35 + test/shaping/tests/use.tests | 4 + test/shaping/tests/vertical.tests | 3 + test/shaping/tests/zero-width-marks.tests | 11 + .../script-arabic/language-persian/mehran.txt | 8 + .../language-urdu/crulp/ligatures/2grams.txt | 601 + .../language-urdu/crulp/ligatures/3grams.txt | 3415 + .../language-urdu/crulp/ligatures/4grams.txt | 6316 ++ .../language-urdu/crulp/ligatures/5grams.txt | 5029 ++ .../language-urdu/crulp/ligatures/6grams.txt | 1542 + .../language-urdu/crulp/ligatures/7grams.txt | 354 + .../language-urdu/crulp/ligatures/8grams.txt | 26 + .../language-urdu/crulp/ligatures/LICENSE | 3 + .../language-urdu/crulp/ligatures/README | 16 + .../language-urdu/crulp/ligatures/SOURCES | 4 + .../misc/diacritics/lam-alef.txt | 28 + .../misc/diacritics/language-arabic.txt | 695 + .../misc/diacritics/language-persian.txt | 48 + .../misc/diacritics/language-urdu.txt | 188 + .../misc/diacritics/ligature-components.txt | 18 + .../misc/diacritics/ligature-diacritics.txt | 1 + .../misc/diacritics/mark-skipping.txt | 10 + .../script-mongolian/misc/misc.txt | 6 + .../script-mongolian/misc/non-joining.txt | 8 + .../script-mongolian/misc/poem.txt | 4 + .../misc/variation-selectors.txt | 8 + .../shaper-arabic/script-nko/misc/misc.txt | 5 + .../script-phags-pa/misc/misc.txt | 14 + .../script-syriac/misc/abbreviation-mark.txt | 11 + .../script-syriac/misc/alaph.txt | 98 + .../script-ethiopic/misc/misc.txt | 1 + .../script-han/misc/cjk-compat.txt | 3 + .../misc/kazuraki-liga-lines.txt | 8 + .../script-hiragana/misc/kazuraki-liga.txt | 53 + .../script-linear-b/misc/misc.txt | 1 + .../script-tifinagh/misc/misc.txt | 11 + .../shaper-hangul/script-hangul/misc/misc.txt | 4 + .../script-hebrew/misc/diacritics.txt | 16 + .../indic/script-assamese/utrrs/LICENSE | 19 + .../indic/script-assamese/utrrs/README | 13 + .../indic/script-assamese/utrrs/SOURCES | 2 + ...cFontFeatureCodepoint-AdditionalVowels.txt | 4 + .../IndicFontFeatureCodepoint-Consonants.txt | 40 + ...icFontFeatureCodepoint-DependentVowels.txt | 10 + .../IndicFontFeatureCodepoint-Digits.txt | 10 + ...FontFeatureCodepoint-IndependentVowels.txt | 11 + .../IndicFontFeatureCodepoint-Reserved.txt | 2 + ...IndicFontFeatureCodepoint-VariousSigns.txt | 6 + .../gpos/IndicFontFeatureGPOS-AboveBase.txt | 59 + .../gpos/IndicFontFeatureGPOS-BelowBase.txt | 131 + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 139 + .../indic/script-bengali/misc/misc.txt | 53 + .../indic/script-bengali/misc/reph.txt | 14 + .../indic/script-bengali/utrrs/LICENSE | 19 + .../indic/script-bengali/utrrs/README | 13 + .../indic/script-bengali/utrrs/SOURCES | 2 + ...cFontFeatureCodepoint-AdditionalVowels.txt | 1 + .../IndicFontFeatureCodepoint-Consonants.txt | 36 + ...icFontFeatureCodepoint-DependentVowels.txt | 10 + .../IndicFontFeatureCodepoint-Digits.txt | 10 + ...FontFeatureCodepoint-IndependentVowels.txt | 12 + .../IndicFontFeatureCodepoint-Reserved.txt | 2 + ...IndicFontFeatureCodepoint-VariousSigns.txt | 6 + .../gpos/IndicFontFeatureGPOS-AboveBase.txt | 58 + .../gpos/IndicFontFeatureGPOS-BelowBase.txt | 119 + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 215 + .../script-devanagari/misc/dottedcircle.txt | 8 + .../indic/script-devanagari/misc/eyelash.txt | 3 + .../indic/script-devanagari/misc/joiners.txt | 19 + .../indic/script-devanagari/misc/misc.txt | 36 + .../misc/spec-deviations.txt | 1 + .../misc/tricky-reordering.txt | 5 + .../indic/script-devanagari/utrrs/LICENSE | 19 + .../indic/script-devanagari/utrrs/README | 13 + .../indic/script-devanagari/utrrs/SOURCES | 2 + ...tFeatureCodepoint-AdditionalConsonants.txt | 8 + ...cFontFeatureCodepoint-AdditionalVowels.txt | 4 + .../IndicFontFeatureCodepoint-Consonants.txt | 45 + ...icFontFeatureCodepoint-DependentVowels.txt | 14 + ...ureCodepoint-DevnagariSpecificAddition.txt | 1 + .../IndicFontFeatureCodepoint-Digits.txt | 10 + ...ontFeatureCodepoint-GenericPunctuation.txt | 2 + ...FontFeatureCodepoint-IndependentVowels.txt | 16 + ...IndicFontFeatureCodepoint-VariousSigns.txt | 10 + .../gpos/IndicFontFeatureGPOS-AboveBase.txt | 185 + .../gpos/IndicFontFeatureGPOS-BelowBase.txt | 185 + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 1367 + .../indic/script-gujarati/utrrs/LICENSE | 19 + .../indic/script-gujarati/utrrs/README | 13 + .../indic/script-gujarati/utrrs/SOURCES | 2 + ...cFontFeatureCodepoint-AdditionalVowels.txt | 1 + .../IndicFontFeatureCodepoint-Consonants.txt | 34 + ...icFontFeatureCodepoint-DependentVowels.txt | 12 + .../IndicFontFeatureCodepoint-Digits.txt | 10 + ...FontFeatureCodepoint-IndependentVowels.txt | 13 + .../IndicFontFeatureCodepoint-Reserved.txt | 2 + ...IndicFontFeatureCodepoint-VariousSigns.txt | 7 + .../gpos/IndicFontFeatureGPOS-AboveBase.txt | 170 + .../gpos/IndicFontFeatureGPOS-BelowBase.txt | 170 + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 1156 + .../indic/script-gurmukhi/misc/misc.txt | 2 + .../indic/script-gurmukhi/utrrs/LICENSE | 19 + .../indic/script-gurmukhi/utrrs/README | 13 + .../indic/script-gurmukhi/utrrs/SOURCES | 2 + .../IndicFontFeatureCodepoint-Consonants.txt | 38 + ...icFontFeatureCodepoint-DependentVowels.txt | 9 + .../IndicFontFeatureCodepoint-Digits.txt | 10 + ...cFontFeatureCodepoint-GurmukhiSpecific.txt | 6 + ...FontFeatureCodepoint-IndependentVowels.txt | 10 + .../IndicFontFeatureCodepoint-Reserved.txt | 2 + ...IndicFontFeatureCodepoint-VariousSigns.txt | 6 + .../gpos/IndicFontFeatureGPOS-AboveBase.txt | 22 + .../gpos/IndicFontFeatureGPOS-BelowBase.txt | 2 + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 152 + .../indic/script-kannada/misc/misc.txt | 20 + .../script-kannada/misc/right-matras.txt | 7 + .../indic/script-kannada/utrrs/LICENSE | 19 + .../indic/script-kannada/utrrs/README | 13 + .../indic/script-kannada/utrrs/SOURCES | 2 + ...tFeatureCodepoint-AdditionalConsonants.txt | 1 + ...cFontFeatureCodepoint-AdditionalVowels.txt | 4 + .../IndicFontFeatureCodepoint-Consonants.txt | 40 + ...icFontFeatureCodepoint-DependentVowels.txt | 13 + .../IndicFontFeatureCodepoint-Digits.txt | 10 + ...FontFeatureCodepoint-IndependentVowels.txt | 14 + .../IndicFontFeatureCodepoint-Reserved.txt | 2 + ...IndicFontFeatureCodepoint-VariousSigns.txt | 9 + .../gpos/IndicFontFeatureGPOS-AboveBase.txt | 188 + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 306 + .../indic/script-malayalam/misc/cibu.txt | 188 + .../indic/script-malayalam/misc/dot-reph.txt | 15 + .../indic/script-malayalam/misc/misc.txt | 65 + .../indic/script-malayalam/utrrs/LICENSE | 19 + .../indic/script-malayalam/utrrs/README | 13 + .../indic/script-malayalam/utrrs/SOURCES | 2 + ...cFontFeatureCodepoint-AdditionalVowels.txt | 2 + .../IndicFontFeatureCodepoint-Consonants.txt | 36 + ...icFontFeatureCodepoint-DependentVowels.txt | 12 + .../IndicFontFeatureCodepoint-Digits.txt | 10 + ...FontFeatureCodepoint-IndependentVowels.txt | 14 + .../IndicFontFeatureCodepoint-Reserved.txt | 2 + ...IndicFontFeatureCodepoint-VariousSigns.txt | 4 + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 254 + .../indic/script-oriya/misc/bindu.txt | 2 + .../indic/script-oriya/misc/misc.txt | 28 + .../indic/script-oriya/utrrs/LICENSE | 19 + .../indic/script-oriya/utrrs/README | 13 + .../indic/script-oriya/utrrs/SOURCES | 2 + ...tFeatureCodepoint-AdditionalConsonants.txt | 3 + ...cFontFeatureCodepoint-AdditionalVowels.txt | 2 + .../IndicFontFeatureCodepoint-Consonants.txt | 34 + ...icFontFeatureCodepoint-DependentVowels.txt | 12 + .../IndicFontFeatureCodepoint-Digits.txt | 10 + ...FontFeatureCodepoint-IndependentVowels.txt | 12 + ...ndicFontFeatureCodepoint-OriyaSpecific.txt | 2 + .../IndicFontFeatureCodepoint-Reserved.txt | 2 + ...IndicFontFeatureCodepoint-VariousSigns.txt | 8 + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 170 + .../indic/script-sinhala/misc/extensive.txt | 4390 ++ .../indic/script-sinhala/misc/misc.txt | 41 + .../indic/script-sinhala/misc/reph.txt | 3 + .../script-sinhala/misc/split-matras.txt | 4 + .../indic/script-sinhala/utrrs/LICENSE | 19 + .../indic/script-sinhala/utrrs/README | 13 + .../indic/script-sinhala/utrrs/SOURCES | 2 + .../IndicFontFeatureCodepoint-Consonants.txt | 41 + ...icFontFeatureCodepoint-DependentVowels.txt | 17 + ...FontFeatureCodepoint-IndependentVowels.txt | 18 + .../IndicFontFeatureCodepoint-Punctuation.txt | 1 + ...IndicFontFeatureCodepoint-VariousSigns.txt | 3 + .../utrrs/gpos/IndicFontFeatureGPOS.txt | 162 + .../gsub/IndicFontFeatureGSUB-Conjunct.txt | 1 + .../IndicFontFeatureGSUB-Rakaaraansaya.txt | 41 + .../gsub/IndicFontFeatureGSUB-Repaya.txt | 42 + .../IndicFontFeatureGSUB-Special-Cases.txt | 2 + .../IndicFontFeatureGSUB-TouchingLetters.txt | 1 + .../gsub/IndicFontFeatureGSUB-Yansaya.txt | 41 + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 1 + .../indic/script-tamil/misc/misc.txt | 43 + .../indic/script-tamil/utrrs/LICENSE | 19 + .../indic/script-tamil/utrrs/README | 13 + .../indic/script-tamil/utrrs/SOURCES | 2 + .../IndicFontFeatureCodepoint-Consonants.txt | 23 + ...icFontFeatureCodepoint-CurrencySymbols.txt | 1 + ...icFontFeatureCodepoint-DependentVowels.txt | 11 + .../IndicFontFeatureCodepoint-Digits.txt | 10 + ...FontFeatureCodepoint-IndependentVowels.txt | 12 + .../IndicFontFeatureCodepoint-Numerics.txt | 3 + .../IndicFontFeatureCodepoint-Reserved.txt | 2 + .../IndicFontFeatureCodepoint-Symbols.txt | 6 + .../IndicFontFeatureCodepoint-TamilSymbol.txt | 1 + ...IndicFontFeatureCodepoint-VariousSigns.txt | 4 + .../gpos/IndicFontFeatureGPOS-AboveBase.txt | 64 + .../gpos/IndicFontFeatureGPOS-BelowBase.txt | 44 + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 4 + .../indic/script-telugu/misc/misc.txt | 12 + .../indic/script-telugu/utrrs/LICENSE | 19 + .../indic/script-telugu/utrrs/README | 13 + .../indic/script-telugu/utrrs/SOURCES | 2 + ...cFontFeatureCodepoint-AdditionalVowels.txt | 2 + .../IndicFontFeatureCodepoint-Consonants.txt | 38 + ...icFontFeatureCodepoint-DependentVowels.txt | 13 + .../IndicFontFeatureCodepoint-Digits.txt | 10 + ...FontFeatureCodepoint-IndependentVowels.txt | 14 + .../IndicFontFeatureCodepoint-Reserved.txt | 2 + ...IndicFontFeatureCodepoint-VariousSigns.txt | 6 + .../gpos/IndicFontFeatureGPOS-AboveBase.txt | 385 + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 287 + .../south-east-asian/script-javanese/misc.txt | 54 + .../script-khmer/misc/misc.txt | 23 + .../script-khmer/misc/other-marks-invalid.txt | 4 + .../script-khmer/misc/other-marks.txt | 7 + .../script-myanmar/misc/misc.txt | 7 + .../script-myanmar/misc/otspec.txt | 2 + .../script-myanmar/misc/utn11.txt | 34 + .../shaper-thai/script-lao/misc/sara-am.txt | 20 + .../shaper-thai/script-thai/misc/misc.txt | 11 + .../shaper-thai/script-thai/misc/phinthu.txt | 16 + .../script-thai/misc/pua-shaping.txt | 11 + .../shaper-thai/script-thai/misc/sara-am.txt | 20 + .../script-tibetan/misc/contractions.txt | 612 + .../script-tibetan/misc/misc.txt | 2 + .../in-tree/shaper-use/script-batak/misc.txt | 9 + .../shaper-use/script-buginese/misc.txt | 70 + .../in-tree/shaper-use/script-cham/misc.txt | 3 + .../in-tree/shaper-use/script-kaithi/misc.txt | 6 + .../shaper-use/script-kharoshti/misc.txt | 36 + .../shaper-use/script-tai-tham/misc.txt | 2 + .../shaper-use/script-tai-tham/torture.txt | 23 + util/Makefile.am | 70 + util/Makefile.in | 855 + util/Makefile.sources | 32 + util/ansi-print.cc | 427 + util/ansi-print.hh | 39 + util/hb-ot-shape-closure.cc | 115 + util/hb-shape.cc | 133 + util/hb-view.cc | 40 + util/helper-cairo-ansi.cc | 102 + util/helper-cairo-ansi.hh | 39 + util/helper-cairo.cc | 551 + util/helper-cairo.hh | 85 + util/main-font-text.hh | 114 + util/options.cc | 884 + util/options.hh | 501 + util/shape-consumer.hh | 89 + util/view-cairo.cc | 133 + util/view-cairo.hh | 104 + win32/Makefile.am | 16 + win32/Makefile.in | 501 + win32/Makefile.vc | 52 + win32/README.txt | 78 + win32/build-rules-msvc.mak | 127 + win32/config-msvc.mak | 217 + win32/config.h.win32 | 158 + win32/config.h.win32.in | 158 + win32/create-lists-msvc.mak | 138 + win32/create-lists.bat | 42 + win32/detectenv-msvc.mak | 144 + win32/generate-msvc.mak | 26 + win32/hb-introspection-msvc.mak | 42 + win32/info-msvc.mak | 142 + win32/install.mak | 25 + win32/introspection-msvc.mak | 73 + 691 files changed, 249374 insertions(+) create mode 100644 AUTHORS create mode 100644 BUILD.md create mode 100644 COPYING create mode 100644 ChangeLog create mode 100644 INSTALL create mode 100644 Makefile.am create mode 100644 Makefile.in create mode 100644 NEWS create mode 100644 README create mode 100644 README.python create mode 100644 THANKS create mode 100644 TODO create mode 100644 aclocal.m4 create mode 100755 ar-lib create mode 100755 autogen.sh create mode 100755 compile create mode 100755 config.guess create mode 100644 config.h.in create mode 100755 config.sub create mode 100755 configure create mode 100644 configure.ac create mode 100755 depcomp create mode 100644 docs/HarfBuzz.png create mode 100644 docs/Makefile.am create mode 100644 docs/Makefile.in create mode 100644 docs/harfbuzz-docs.xml create mode 100644 docs/harfbuzz-overrides.txt create mode 100644 docs/harfbuzz-sections.txt create mode 100644 docs/harfbuzz.types create mode 100644 docs/html/HarfBuzz.png create mode 100644 docs/html/a-clustering-example-for-levels-0-and-1.html create mode 100644 docs/html/adding-text-to-the-buffer.html create mode 100644 docs/html/annotation-glossary.html create mode 100644 docs/html/api-index-0-9-10.html create mode 100644 docs/html/api-index-0-9-11.html create mode 100644 docs/html/api-index-0-9-2.html create mode 100644 docs/html/api-index-0-9-20.html create mode 100644 docs/html/api-index-0-9-22.html create mode 100644 docs/html/api-index-0-9-28.html create mode 100644 docs/html/api-index-0-9-30.html create mode 100644 docs/html/api-index-0-9-31.html create mode 100644 docs/html/api-index-0-9-38.html create mode 100644 docs/html/api-index-0-9-39.html create mode 100644 docs/html/api-index-0-9-41.html create mode 100644 docs/html/api-index-0-9-42.html create mode 100644 docs/html/api-index-0-9-5.html create mode 100644 docs/html/api-index-0-9-7.html create mode 100644 docs/html/api-index-0-9-8.html create mode 100644 docs/html/api-index-1-0-5.html create mode 100644 docs/html/api-index-1-1-2.html create mode 100644 docs/html/api-index-1-1-3.html create mode 100644 docs/html/api-index-1-2-3.html create mode 100644 docs/html/api-index-1-3-3.html create mode 100644 docs/html/api-index-full.html create mode 100644 docs/html/buffers-language-script-and-direction.html create mode 100644 docs/html/building.html create mode 100644 docs/html/ch08.html create mode 100644 docs/html/clusters.html create mode 100644 docs/html/customizing-unicode-functions.html create mode 100644 docs/html/deprecated-api-index.html create mode 100644 docs/html/fonts-and-faces.html create mode 100644 docs/html/harfbuzz-Buffers.html create mode 100644 docs/html/harfbuzz-Shaping.html create mode 100644 docs/html/harfbuzz-hb-blob.html create mode 100644 docs/html/harfbuzz-hb-common.html create mode 100644 docs/html/harfbuzz-hb-coretext.html create mode 100644 docs/html/harfbuzz-hb-deprecated.html create mode 100644 docs/html/harfbuzz-hb-face.html create mode 100644 docs/html/harfbuzz-hb-font.html create mode 100644 docs/html/harfbuzz-hb-ft.html create mode 100644 docs/html/harfbuzz-hb-glib.html create mode 100644 docs/html/harfbuzz-hb-gobject.html create mode 100644 docs/html/harfbuzz-hb-graphite2.html create mode 100644 docs/html/harfbuzz-hb-icu.html create mode 100644 docs/html/harfbuzz-hb-ot-font.html create mode 100644 docs/html/harfbuzz-hb-ot-layout.html create mode 100644 docs/html/harfbuzz-hb-ot-math.html create mode 100644 docs/html/harfbuzz-hb-ot-shape.html create mode 100644 docs/html/harfbuzz-hb-ot-tag.html create mode 100644 docs/html/harfbuzz-hb-ot.html create mode 100644 docs/html/harfbuzz-hb-set.html create mode 100644 docs/html/harfbuzz-hb-shape-plan.html create mode 100644 docs/html/harfbuzz-hb-unicode.html create mode 100644 docs/html/harfbuzz-hb-uniscribe.html create mode 100644 docs/html/harfbuzz-hb-version.html create mode 100644 docs/html/harfbuzz-hb.html create mode 100644 docs/html/harfbuzz.devhelp2 create mode 100644 docs/html/hello-harfbuzz.html create mode 100644 docs/html/home.png create mode 100644 docs/html/index.html create mode 100644 docs/html/install-harfbuzz.html create mode 100644 docs/html/left-insensitive.png create mode 100644 docs/html/left.png create mode 100644 docs/html/level-2.html create mode 100644 docs/html/object-tree.html create mode 100644 docs/html/plans-and-caching.html create mode 100644 docs/html/pt01.html create mode 100644 docs/html/pt02.html create mode 100644 docs/html/reordering-in-levels-0-and-1.html create mode 100644 docs/html/right-insensitive.png create mode 100644 docs/html/right.png create mode 100644 docs/html/setting-buffer-properties.html create mode 100644 docs/html/shaping-and-shape-plans.html create mode 100644 docs/html/style.css create mode 100644 docs/html/the-distinction-between-levels-0-and-1.html create mode 100644 docs/html/up-insensitive.png create mode 100644 docs/html/up.png create mode 100644 docs/html/using-harfbuzzs-native-opentype-implementation.html create mode 100644 docs/html/using-your-own-font-functions.html create mode 100644 docs/html/what-about-the-other-scripts.html create mode 100644 docs/html/what-is-harfbuzz.html create mode 100644 docs/html/why-is-it-called-harfbuzz.html create mode 100644 docs/usermanual-buffers-language-script-and-direction.xml create mode 100644 docs/usermanual-clusters.xml create mode 100644 docs/usermanual-fonts-and-faces.xml create mode 100644 docs/usermanual-glyph-information.xml create mode 100644 docs/usermanual-hello-harfbuzz.xml create mode 100644 docs/usermanual-install-harfbuzz.xml create mode 100644 docs/usermanual-opentype-features.xml create mode 100644 docs/usermanual-what-is-harfbuzz.xml create mode 100644 docs/version.xml create mode 100644 docs/version.xml.in create mode 100644 gtk-doc.make create mode 100644 harfbuzz.doap create mode 100755 install-sh create mode 100644 ltmain.sh create mode 100644 m4/ax_pthread.m4 create mode 100644 m4/gtk-doc.m4 create mode 100644 m4/libtool.m4 create mode 100644 m4/ltoptions.m4 create mode 100644 m4/ltsugar.m4 create mode 100644 m4/ltversion.m4 create mode 100644 m4/lt~obsolete.m4 create mode 100644 m4/pkg.m4 create mode 100755 missing create mode 100644 src/Makefile.am create mode 100644 src/Makefile.in create mode 100644 src/Makefile.sources create mode 100755 src/check-c-linkage-decls.sh create mode 100755 src/check-defs.sh create mode 100755 src/check-header-guards.sh create mode 100755 src/check-includes.sh create mode 100755 src/check-libstdc++.sh create mode 100755 src/check-static-inits.sh create mode 100755 src/check-symbols.sh create mode 100755 src/gen-arabic-table.py create mode 100755 src/gen-indic-table.py create mode 100755 src/gen-use-table.py create mode 100644 src/harfbuzz-gobject.pc.in create mode 100644 src/harfbuzz-icu.pc.in create mode 100644 src/harfbuzz.pc.in create mode 100644 src/hb-atomic-private.hh create mode 100644 src/hb-blob.cc create mode 100644 src/hb-blob.h create mode 100644 src/hb-buffer-deserialize-json.hh create mode 100644 src/hb-buffer-deserialize-json.rl create mode 100644 src/hb-buffer-deserialize-text.hh create mode 100644 src/hb-buffer-deserialize-text.rl create mode 100644 src/hb-buffer-private.hh create mode 100644 src/hb-buffer-serialize.cc create mode 100644 src/hb-buffer.cc create mode 100644 src/hb-buffer.h create mode 100644 src/hb-cache-private.hh create mode 100644 src/hb-common.cc create mode 100644 src/hb-common.h create mode 100644 src/hb-coretext.cc create mode 100644 src/hb-coretext.h create mode 100644 src/hb-deprecated.h create mode 100644 src/hb-directwrite.cc create mode 100644 src/hb-directwrite.h create mode 100644 src/hb-face-private.hh create mode 100644 src/hb-face.cc create mode 100644 src/hb-face.h create mode 100644 src/hb-fallback-shape.cc create mode 100644 src/hb-font-private.hh create mode 100644 src/hb-font.cc create mode 100644 src/hb-font.h create mode 100644 src/hb-ft.cc create mode 100644 src/hb-ft.h create mode 100644 src/hb-glib.cc create mode 100644 src/hb-glib.h create mode 100644 src/hb-gobject-enums.cc.tmpl create mode 100644 src/hb-gobject-enums.h.tmpl create mode 100644 src/hb-gobject-structs.cc create mode 100644 src/hb-gobject-structs.h create mode 100644 src/hb-gobject.h create mode 100644 src/hb-graphite2.cc create mode 100644 src/hb-graphite2.h create mode 100644 src/hb-icu.cc create mode 100644 src/hb-icu.h create mode 100644 src/hb-mutex-private.hh create mode 100644 src/hb-object-private.hh create mode 100644 src/hb-open-file-private.hh create mode 100644 src/hb-open-type-private.hh create mode 100644 src/hb-ot-cbdt-table.hh create mode 100644 src/hb-ot-cmap-table.hh create mode 100644 src/hb-ot-font.cc create mode 100644 src/hb-ot-font.h create mode 100644 src/hb-ot-glyf-table.hh create mode 100644 src/hb-ot-head-table.hh create mode 100644 src/hb-ot-hhea-table.hh create mode 100644 src/hb-ot-hmtx-table.hh create mode 100644 src/hb-ot-layout-common-private.hh create mode 100644 src/hb-ot-layout-gdef-table.hh create mode 100644 src/hb-ot-layout-gpos-table.hh create mode 100644 src/hb-ot-layout-gsub-table.hh create mode 100644 src/hb-ot-layout-gsubgpos-private.hh create mode 100644 src/hb-ot-layout-jstf-table.hh create mode 100644 src/hb-ot-layout-private.hh create mode 100644 src/hb-ot-layout.cc create mode 100644 src/hb-ot-layout.h create mode 100644 src/hb-ot-map-private.hh create mode 100644 src/hb-ot-map.cc create mode 100644 src/hb-ot-math-table.hh create mode 100644 src/hb-ot-math.cc create mode 100644 src/hb-ot-math.h create mode 100644 src/hb-ot-maxp-table.hh create mode 100644 src/hb-ot-name-table.hh create mode 100644 src/hb-ot-os2-table.hh create mode 100644 src/hb-ot-post-table.hh create mode 100644 src/hb-ot-shape-complex-arabic-fallback.hh create mode 100644 src/hb-ot-shape-complex-arabic-private.hh create mode 100644 src/hb-ot-shape-complex-arabic-table.hh create mode 100644 src/hb-ot-shape-complex-arabic-win1256.hh create mode 100644 src/hb-ot-shape-complex-arabic.cc create mode 100644 src/hb-ot-shape-complex-default.cc create mode 100644 src/hb-ot-shape-complex-hangul.cc create mode 100644 src/hb-ot-shape-complex-hebrew.cc create mode 100644 src/hb-ot-shape-complex-indic-machine.hh create mode 100644 src/hb-ot-shape-complex-indic-machine.rl create mode 100644 src/hb-ot-shape-complex-indic-private.hh create mode 100644 src/hb-ot-shape-complex-indic-table.cc create mode 100644 src/hb-ot-shape-complex-indic.cc create mode 100644 src/hb-ot-shape-complex-myanmar-machine.hh create mode 100644 src/hb-ot-shape-complex-myanmar-machine.rl create mode 100644 src/hb-ot-shape-complex-myanmar.cc create mode 100644 src/hb-ot-shape-complex-private.hh create mode 100644 src/hb-ot-shape-complex-thai.cc create mode 100644 src/hb-ot-shape-complex-tibetan.cc create mode 100644 src/hb-ot-shape-complex-use-machine.hh create mode 100644 src/hb-ot-shape-complex-use-machine.rl create mode 100644 src/hb-ot-shape-complex-use-private.hh create mode 100644 src/hb-ot-shape-complex-use-table.cc create mode 100644 src/hb-ot-shape-complex-use.cc create mode 100644 src/hb-ot-shape-fallback-private.hh create mode 100644 src/hb-ot-shape-fallback.cc create mode 100644 src/hb-ot-shape-normalize-private.hh create mode 100644 src/hb-ot-shape-normalize.cc create mode 100644 src/hb-ot-shape-private.hh create mode 100644 src/hb-ot-shape.cc create mode 100644 src/hb-ot-shape.h create mode 100644 src/hb-ot-tag.cc create mode 100644 src/hb-ot-tag.h create mode 100644 src/hb-ot-var-avar-table.hh create mode 100644 src/hb-ot-var-fvar-table.hh create mode 100644 src/hb-ot-var-hvar-table.hh create mode 100644 src/hb-ot-var.cc create mode 100644 src/hb-ot-var.h create mode 100644 src/hb-ot.h create mode 100644 src/hb-private.hh create mode 100644 src/hb-set-private.hh create mode 100644 src/hb-set.cc create mode 100644 src/hb-set.h create mode 100644 src/hb-shape-plan-private.hh create mode 100644 src/hb-shape-plan.cc create mode 100644 src/hb-shape-plan.h create mode 100644 src/hb-shape.cc create mode 100644 src/hb-shape.h create mode 100644 src/hb-shaper-impl-private.hh create mode 100644 src/hb-shaper-list.hh create mode 100644 src/hb-shaper-private.hh create mode 100644 src/hb-shaper.cc create mode 100644 src/hb-ucdn.cc create mode 100644 src/hb-ucdn/COPYING create mode 100644 src/hb-ucdn/Makefile.am create mode 100644 src/hb-ucdn/Makefile.in create mode 100644 src/hb-ucdn/Makefile.sources create mode 100644 src/hb-ucdn/README create mode 100644 src/hb-ucdn/ucdn.c create mode 100644 src/hb-ucdn/ucdn.h create mode 100644 src/hb-ucdn/unicodedata_db.h create mode 100644 src/hb-unicode-private.hh create mode 100644 src/hb-unicode.cc create mode 100644 src/hb-unicode.h create mode 100644 src/hb-uniscribe.cc create mode 100644 src/hb-uniscribe.h create mode 100644 src/hb-utf-private.hh create mode 100644 src/hb-version.h create mode 100644 src/hb-version.h.in create mode 100644 src/hb-warning.cc create mode 100644 src/hb.h create mode 100644 src/main.cc create mode 100644 src/test-buffer-serialize.cc create mode 100644 src/test-size-params.cc create mode 100644 src/test-would-substitute.cc create mode 100644 src/test.cc create mode 100755 test-driver create mode 100644 test/Makefile.am create mode 100644 test/Makefile.in create mode 100644 test/api/Makefile.am create mode 100644 test/api/Makefile.in create mode 100644 test/api/fonts/MathTestFontEmpty.otf create mode 100644 test/api/fonts/MathTestFontFull.otf create mode 100644 test/api/fonts/MathTestFontNone.otf create mode 100644 test/api/fonts/MathTestFontPartial1.otf create mode 100644 test/api/fonts/MathTestFontPartial2.otf create mode 100644 test/api/fonts/MathTestFontPartial3.otf create mode 100644 test/api/fonts/MathTestFontPartial4.otf create mode 100644 test/api/hb-test.h create mode 100644 test/api/test-blob.c create mode 100644 test/api/test-buffer.c create mode 100644 test/api/test-c.c create mode 100644 test/api/test-common.c create mode 100644 test/api/test-cplusplus.cc create mode 100644 test/api/test-font.c create mode 100644 test/api/test-object.c create mode 100644 test/api/test-ot-math.c create mode 100644 test/api/test-ot-tag.c create mode 100644 test/api/test-set.c create mode 100644 test/api/test-shape.c create mode 100644 test/api/test-unicode.c create mode 100644 test/api/test-version.c create mode 100644 test/fuzzing/Makefile.am create mode 100644 test/fuzzing/Makefile.in create mode 100644 test/fuzzing/README create mode 100644 test/fuzzing/hb-fuzzer.cc create mode 100644 test/fuzzing/hb-fuzzer.hh create mode 100644 test/fuzzing/main.cc create mode 100644 test/shaping/Makefile.am create mode 100644 test/shaping/Makefile.in create mode 100644 test/shaping/README.md create mode 100644 test/shaping/fonts/sha1sum/0509e80afb379d16560e9e47bdd7d888bebdebc6.ttf create mode 100644 test/shaping/fonts/sha1sum/051d92f8bc6ff724511b296c27623f824de256e9.ttf create mode 100644 test/shaping/fonts/sha1sum/07f054357ff8638bac3711b422a1e31180bba863.ttf create mode 100644 test/shaping/fonts/sha1sum/15dfc433a135a658b9f4b1a861b5cdd9658ccbb9.ttf create mode 100644 test/shaping/fonts/sha1sum/191826b9643e3f124d865d617ae609db6a2ce203.ttf create mode 100644 test/shaping/fonts/sha1sum/1a6f1687b7a221f9f2c834b0b360d3c8463b6daf.ttf create mode 100644 test/shaping/fonts/sha1sum/1c04a16f32a39c26c851b7fc014d2e8d298ba2b8.ttf create mode 100644 test/shaping/fonts/sha1sum/1c2c3fc37b2d4c3cb2ef726c6cdaaabd4b7f3eb9.ttf create mode 100644 test/shaping/fonts/sha1sum/1c2fb74c1b2aa173262734c1f616148f1648cfd6.ttf create mode 100644 test/shaping/fonts/sha1sum/205edd09bd3d141cc9580f650109556cc28b22cb.ttf create mode 100644 test/shaping/fonts/sha1sum/217a934cfe15c548b572c203dceb2befdf026462.ttf create mode 100644 test/shaping/fonts/sha1sum/226bc2deab3846f1a682085f70c67d0421014144.ttf create mode 100644 test/shaping/fonts/sha1sum/270b89df543a7e48e206a2d830c0e10e5265c630.ttf create mode 100644 test/shaping/fonts/sha1sum/298c9e1d955f10f6f72c6915c3c6ff9bf9695cec.ttf create mode 100644 test/shaping/fonts/sha1sum/3511ff5c1647150595846ac414c595cccac34f18.ttf create mode 100644 test/shaping/fonts/sha1sum/37033cc5cf37bb223d7355153016b6ccece93b28.ttf create mode 100644 test/shaping/fonts/sha1sum/375d6ae32a3cbe52fbf81a4e5777e3377675d5a3.ttf create mode 100644 test/shaping/fonts/sha1sum/43979b90b2dd929723cf4fe1715990bcb9c9a56b.ttf create mode 100644 test/shaping/fonts/sha1sum/43ef465752be9af900745f72fe29cb853a1401a5.ttf create mode 100644 test/shaping/fonts/sha1sum/45855bc8d46332b39c4ab9e2ee1a26b1f896da6b.ttf create mode 100644 test/shaping/fonts/sha1sum/49c9f7485c1392fa09a1b801bc2ffea79275f22e.ttf create mode 100644 test/shaping/fonts/sha1sum/4cce528e99f600ed9c25a2b69e32eb94a03b4ae8.ttf create mode 100644 test/shaping/fonts/sha1sum/5028afb650b1bb718ed2131e872fbcce57828fff.ttf create mode 100644 test/shaping/fonts/sha1sum/56cfd0e18d07f41c38e9598545a6d369127fc6f9.ttf create mode 100644 test/shaping/fonts/sha1sum/57a9d9f83020155cbb1d2be1f43d82388cbecc88.ttf create mode 100644 test/shaping/fonts/sha1sum/5a5daf5eb5a4db77a2baa3ad9c7a6ed6e0655fa8.ttf create mode 100644 test/shaping/fonts/sha1sum/641bd9db850193064d17575053ae2bf8ec149ddc.ttf create mode 100644 test/shaping/fonts/sha1sum/6466d38c62e73a39202435a4f73bf5d6acbb73c0.ttf create mode 100644 test/shaping/fonts/sha1sum/6991b13ce889466be6de3f66e891de2bc0f117ee.ttf create mode 100644 test/shaping/fonts/sha1sum/6ff0fbead4462d9f229167b4e6839eceb8465058.ttf create mode 100644 test/shaping/fonts/sha1sum/706c5d7b625f207bc0d874c67237aad6f1e9cd6f.ttf create mode 100644 test/shaping/fonts/sha1sum/757ebd573617a24aa9dfbf0b885c54875c6fe06b.ttf create mode 100644 test/shaping/fonts/sha1sum/7a37dc4d5bf018456aea291cee06daf004c0221c.ttf create mode 100644 test/shaping/fonts/sha1sum/7e14e7883ed152baa158b80e207b66114c823a8b.ttf create mode 100644 test/shaping/fonts/sha1sum/7ef276fc886ea502a03b9b0e5c8b547d5dc2b61c.ttf create mode 100644 test/shaping/fonts/sha1sum/8099955657a54e9ee38a6ba1d6f950ce58e3cc25.ttf create mode 100644 test/shaping/fonts/sha1sum/813c2f8e5512187fd982417a7fb4286728e6f4a8.ttf create mode 100644 test/shaping/fonts/sha1sum/8240789f6d12d4cfc4b5e8e6f246c3701bcf861f.ttf create mode 100644 test/shaping/fonts/sha1sum/8454d22037f892e76614e1645d066689a0200e61.ttf create mode 100644 test/shaping/fonts/sha1sum/85414f2552b654585b7a8d13dcc3e8fd9f7970a3.ttf create mode 100644 test/shaping/fonts/sha1sum/8a9fea2a7384f2116e5b84a9b31f83be7850ce21.ttf create mode 100644 test/shaping/fonts/sha1sum/a34a7b00f22ffb5fd7eef6933b81c7e71bc2cdfb.ttf create mode 100644 test/shaping/fonts/sha1sum/a919b33197965846f21074b24e30250d67277bce.ttf create mode 100644 test/shaping/fonts/sha1sum/a98e908e2ed21b22228ea59ebcc0f05034c86f2e.ttf create mode 100644 test/shaping/fonts/sha1sum/b9e2aaa0d75fcef6971ec3a96d806ba4a6b31fe2.ttf create mode 100644 test/shaping/fonts/sha1sum/bb0c53752e85c3d28973ebc913287b8987d3dfe8.ttf create mode 100644 test/shaping/fonts/sha1sum/bb29ce50df2bdba2d10726427c6b7609bf460e04.ttf create mode 100644 test/shaping/fonts/sha1sum/bb9473d2403488714043bcfb946c9f78b86ad627.ttf create mode 100644 test/shaping/fonts/sha1sum/c4e48b0886ef460f532fb49f00047ec92c432ec0.ttf create mode 100644 test/shaping/fonts/sha1sum/cc5f3d2d717fb6bd4dfae1c16d48a2cb8e12233b.ttf create mode 100644 test/shaping/fonts/sha1sum/d629e7fedc0b350222d7987345fe61613fa3929a.ttf create mode 100644 test/shaping/fonts/sha1sum/df768b9c257e0c9c35786c47cae15c46571d56be.ttf create mode 100644 test/shaping/fonts/sha1sum/e207635780b42f898d58654b65098763e340f5c7.ttf create mode 100644 test/shaping/fonts/sha1sum/ee39587d13b2afa5499cc79e45780aa79293bbd4.ttf create mode 100644 test/shaping/fonts/sha1sum/ef86fe710cfea877bbe0dbb6946a1f88d0661031.ttf create mode 100644 test/shaping/fonts/sha1sum/f22416c692720a7d46fadf4af99f4c9e094f00b9.ttf create mode 100644 test/shaping/fonts/sha1sum/f499fbc23865022234775c43503bba2e63978fe1.ttf create mode 100644 test/shaping/fonts/sha1sum/f518eb6f6b5eec2946c9fbbbde44e45d46f5e2ac.ttf create mode 100644 test/shaping/fonts/sha1sum/f9b1dd4dcb515e757789a22cb4241107746fd3d0.ttf create mode 100644 test/shaping/fonts/sha1sum/fab39d60d758cb586db5a504f218442cd1395725.ttf create mode 100644 test/shaping/fonts/sha1sum/fbb6c84c9e1fe0c39e152fbe845e51fd81f6748e.ttf create mode 100644 test/shaping/fonts/sha1sum/fcdcffbdf1c4c97c05308d7600e4c283eb47dbca.ttf create mode 100644 test/shaping/fonts/sha1sum/ffa0f5d2d9025486d8469d8b1fdd983e7632499b.ttf create mode 100755 test/shaping/hb-diff create mode 100755 test/shaping/hb-diff-colorize create mode 100755 test/shaping/hb-diff-filter-failures create mode 100755 test/shaping/hb-diff-ngrams create mode 100755 test/shaping/hb-diff-stat create mode 100755 test/shaping/hb-manifest-read create mode 100755 test/shaping/hb-manifest-update create mode 100755 test/shaping/hb-unicode-decode create mode 100755 test/shaping/hb-unicode-encode create mode 100755 test/shaping/hb-unicode-prettyname create mode 100644 test/shaping/hb_test_tools.py create mode 100755 test/shaping/record-test.sh create mode 100755 test/shaping/run-tests.sh create mode 100644 test/shaping/tests/arabic-fallback-shaping.tests create mode 100644 test/shaping/tests/arabic-feature-order.tests create mode 100644 test/shaping/tests/automatic-fractions.tests create mode 100644 test/shaping/tests/cluster.tests create mode 100644 test/shaping/tests/color-fonts.tests create mode 100644 test/shaping/tests/context-matching.tests create mode 100644 test/shaping/tests/cursive-positioning.tests create mode 100644 test/shaping/tests/default-ignorables.tests create mode 100644 test/shaping/tests/fallback-positioning.tests create mode 100644 test/shaping/tests/fuzzed.tests create mode 100644 test/shaping/tests/hangul-jamo.tests create mode 100644 test/shaping/tests/hyphens.tests create mode 100644 test/shaping/tests/indic-joiner-candrabindu.tests create mode 100644 test/shaping/tests/indic-old-spec.tests create mode 100644 test/shaping/tests/indic-pref-blocking.tests create mode 100644 test/shaping/tests/language-tags.tests create mode 100644 test/shaping/tests/ligature-id.tests create mode 100644 test/shaping/tests/mark-filtering-sets.tests create mode 100644 test/shaping/tests/mongolian-variation-selector.tests create mode 100644 test/shaping/tests/simple.tests create mode 100644 test/shaping/tests/spaces.tests create mode 100644 test/shaping/tests/use-marchen.tests create mode 100644 test/shaping/tests/use.tests create mode 100644 test/shaping/tests/vertical.tests create mode 100644 test/shaping/tests/zero-width-marks.tests create mode 100755 test/shaping/texts/in-tree/shaper-arabic/script-arabic/language-persian/mehran.txt create mode 100644 test/shaping/texts/in-tree/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/2grams.txt create mode 100644 test/shaping/texts/in-tree/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/3grams.txt create mode 100644 test/shaping/texts/in-tree/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/4grams.txt create mode 100644 test/shaping/texts/in-tree/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/5grams.txt create mode 100644 test/shaping/texts/in-tree/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/6grams.txt create mode 100644 test/shaping/texts/in-tree/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/7grams.txt create mode 100644 test/shaping/texts/in-tree/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/8grams.txt create mode 100644 test/shaping/texts/in-tree/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/LICENSE create mode 100644 test/shaping/texts/in-tree/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/README create mode 100644 test/shaping/texts/in-tree/shaper-arabic/script-arabic/language-urdu/crulp/ligatures/SOURCES create mode 100644 test/shaping/texts/in-tree/shaper-arabic/script-arabic/misc/diacritics/lam-alef.txt create mode 100644 test/shaping/texts/in-tree/shaper-arabic/script-arabic/misc/diacritics/language-arabic.txt create mode 100644 test/shaping/texts/in-tree/shaper-arabic/script-arabic/misc/diacritics/language-persian.txt create mode 100644 test/shaping/texts/in-tree/shaper-arabic/script-arabic/misc/diacritics/language-urdu.txt create mode 100644 test/shaping/texts/in-tree/shaper-arabic/script-arabic/misc/diacritics/ligature-components.txt create mode 100644 test/shaping/texts/in-tree/shaper-arabic/script-arabic/misc/diacritics/ligature-diacritics.txt create mode 100644 test/shaping/texts/in-tree/shaper-arabic/script-arabic/misc/diacritics/mark-skipping.txt create mode 100644 test/shaping/texts/in-tree/shaper-arabic/script-mongolian/misc/misc.txt create mode 100644 test/shaping/texts/in-tree/shaper-arabic/script-mongolian/misc/non-joining.txt create mode 100644 test/shaping/texts/in-tree/shaper-arabic/script-mongolian/misc/poem.txt create mode 100644 test/shaping/texts/in-tree/shaper-arabic/script-mongolian/misc/variation-selectors.txt create mode 100644 test/shaping/texts/in-tree/shaper-arabic/script-nko/misc/misc.txt create mode 100644 test/shaping/texts/in-tree/shaper-arabic/script-phags-pa/misc/misc.txt create mode 100644 test/shaping/texts/in-tree/shaper-arabic/script-syriac/misc/abbreviation-mark.txt create mode 100644 test/shaping/texts/in-tree/shaper-arabic/script-syriac/misc/alaph.txt create mode 100644 test/shaping/texts/in-tree/shaper-default/script-ethiopic/misc/misc.txt create mode 100644 test/shaping/texts/in-tree/shaper-default/script-han/misc/cjk-compat.txt create mode 100644 test/shaping/texts/in-tree/shaper-default/script-hiragana/misc/kazuraki-liga-lines.txt create mode 100644 test/shaping/texts/in-tree/shaper-default/script-hiragana/misc/kazuraki-liga.txt create mode 100644 test/shaping/texts/in-tree/shaper-default/script-linear-b/misc/misc.txt create mode 100644 test/shaping/texts/in-tree/shaper-default/script-tifinagh/misc/misc.txt create mode 100644 test/shaping/texts/in-tree/shaper-hangul/script-hangul/misc/misc.txt create mode 100644 test/shaping/texts/in-tree/shaper-hebrew/script-hebrew/misc/diacritics.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-assamese/utrrs/LICENSE create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-assamese/utrrs/README create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-assamese/utrrs/SOURCES create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-assamese/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-assamese/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-assamese/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-assamese/utrrs/gsub/IndicFontFeatureGSUB.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-bengali/misc/misc.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-bengali/misc/reph.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-bengali/utrrs/LICENSE create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-bengali/utrrs/README create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-bengali/utrrs/SOURCES create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-bengali/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-bengali/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-bengali/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-bengali/utrrs/gsub/IndicFontFeatureGSUB.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/misc/dottedcircle.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/misc/eyelash.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/misc/joiners.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/misc/misc.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/misc/spec-deviations.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/misc/tricky-reordering.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/utrrs/LICENSE create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/utrrs/README create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/utrrs/SOURCES create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-DevnagariSpecificAddition.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-GenericPunctuation.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/utrrs/gsub/IndicFontFeatureGSUB.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-gujarati/utrrs/LICENSE create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-gujarati/utrrs/README create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-gujarati/utrrs/SOURCES create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-gujarati/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-gujarati/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-gujarati/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-gujarati/utrrs/gsub/IndicFontFeatureGSUB.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-gurmukhi/misc/misc.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-gurmukhi/utrrs/LICENSE create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-gurmukhi/utrrs/README create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-gurmukhi/utrrs/SOURCES create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-GurmukhiSpecific.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-gurmukhi/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-gurmukhi/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-gurmukhi/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-gurmukhi/utrrs/gsub/IndicFontFeatureGSUB.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-kannada/misc/misc.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-kannada/misc/right-matras.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-kannada/utrrs/LICENSE create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-kannada/utrrs/README create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-kannada/utrrs/SOURCES create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-kannada/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-kannada/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-kannada/utrrs/gsub/IndicFontFeatureGSUB.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-malayalam/misc/cibu.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-malayalam/misc/dot-reph.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-malayalam/misc/misc.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-malayalam/utrrs/LICENSE create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-malayalam/utrrs/README create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-malayalam/utrrs/SOURCES create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-malayalam/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-malayalam/utrrs/gsub/IndicFontFeatureGSUB.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-oriya/misc/bindu.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-oriya/misc/misc.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-oriya/utrrs/LICENSE create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-oriya/utrrs/README create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-oriya/utrrs/SOURCES create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-OriyaSpecific.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-oriya/utrrs/gsub/IndicFontFeatureGSUB.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-sinhala/misc/extensive.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-sinhala/misc/misc.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-sinhala/misc/reph.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-sinhala/misc/split-matras.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-sinhala/utrrs/LICENSE create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-sinhala/utrrs/README create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-sinhala/utrrs/SOURCES create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-Punctuation.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-sinhala/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-sinhala/utrrs/gpos/IndicFontFeatureGPOS.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Conjunct.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Rakaaraansaya.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Repaya.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Special-Cases.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-TouchingLetters.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Yansaya.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-tamil/misc/misc.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-tamil/utrrs/LICENSE create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-tamil/utrrs/README create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-tamil/utrrs/SOURCES create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-CurrencySymbols.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Numerics.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Symbols.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-TamilSymbol.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-tamil/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-tamil/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-tamil/utrrs/gsub/IndicFontFeatureGSUB.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-telugu/misc/misc.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-telugu/utrrs/LICENSE create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-telugu/utrrs/README create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-telugu/utrrs/SOURCES create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-telugu/utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-telugu/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/indic/script-telugu/utrrs/gsub/IndicFontFeatureGSUB.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/south-east-asian/script-javanese/misc.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/south-east-asian/script-khmer/misc/misc.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/south-east-asian/script-khmer/misc/other-marks-invalid.txt create mode 100644 test/shaping/texts/in-tree/shaper-indic/south-east-asian/script-khmer/misc/other-marks.txt create mode 100644 test/shaping/texts/in-tree/shaper-myanmar/script-myanmar/misc/misc.txt create mode 100644 test/shaping/texts/in-tree/shaper-myanmar/script-myanmar/misc/otspec.txt create mode 100644 test/shaping/texts/in-tree/shaper-myanmar/script-myanmar/misc/utn11.txt create mode 100644 test/shaping/texts/in-tree/shaper-thai/script-lao/misc/sara-am.txt create mode 100644 test/shaping/texts/in-tree/shaper-thai/script-thai/misc/misc.txt create mode 100644 test/shaping/texts/in-tree/shaper-thai/script-thai/misc/phinthu.txt create mode 100644 test/shaping/texts/in-tree/shaper-thai/script-thai/misc/pua-shaping.txt create mode 100644 test/shaping/texts/in-tree/shaper-thai/script-thai/misc/sara-am.txt create mode 100644 test/shaping/texts/in-tree/shaper-tibetan/script-tibetan/misc/contractions.txt create mode 100644 test/shaping/texts/in-tree/shaper-tibetan/script-tibetan/misc/misc.txt create mode 100644 test/shaping/texts/in-tree/shaper-use/script-batak/misc.txt create mode 100644 test/shaping/texts/in-tree/shaper-use/script-buginese/misc.txt create mode 100644 test/shaping/texts/in-tree/shaper-use/script-cham/misc.txt create mode 100644 test/shaping/texts/in-tree/shaper-use/script-kaithi/misc.txt create mode 100644 test/shaping/texts/in-tree/shaper-use/script-kharoshti/misc.txt create mode 100644 test/shaping/texts/in-tree/shaper-use/script-tai-tham/misc.txt create mode 100644 test/shaping/texts/in-tree/shaper-use/script-tai-tham/torture.txt create mode 100644 util/Makefile.am create mode 100644 util/Makefile.in create mode 100644 util/Makefile.sources create mode 100644 util/ansi-print.cc create mode 100644 util/ansi-print.hh create mode 100644 util/hb-ot-shape-closure.cc create mode 100644 util/hb-shape.cc create mode 100644 util/hb-view.cc create mode 100644 util/helper-cairo-ansi.cc create mode 100644 util/helper-cairo-ansi.hh create mode 100644 util/helper-cairo.cc create mode 100644 util/helper-cairo.hh create mode 100644 util/main-font-text.hh create mode 100644 util/options.cc create mode 100644 util/options.hh create mode 100644 util/shape-consumer.hh create mode 100644 util/view-cairo.cc create mode 100644 util/view-cairo.hh create mode 100644 win32/Makefile.am create mode 100644 win32/Makefile.in create mode 100644 win32/Makefile.vc create mode 100644 win32/README.txt create mode 100644 win32/build-rules-msvc.mak create mode 100644 win32/config-msvc.mak create mode 100644 win32/config.h.win32 create mode 100644 win32/config.h.win32.in create mode 100644 win32/create-lists-msvc.mak create mode 100644 win32/create-lists.bat create mode 100644 win32/detectenv-msvc.mak create mode 100644 win32/generate-msvc.mak create mode 100644 win32/hb-introspection-msvc.mak create mode 100644 win32/info-msvc.mak create mode 100644 win32/install.mak create mode 100644 win32/introspection-msvc.mak diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..81cdc4c --- /dev/null +++ b/AUTHORS @@ -0,0 +1,9 @@ +Behdad Esfahbod +Simon Hausmann +Martin Hosken +Jonathan Kew +Lars Knoll +Werner Lemberg +Roozbeh Pournader +Owen Taylor +David Turner diff --git a/BUILD.md b/BUILD.md new file mode 100644 index 0000000..7518c2e --- /dev/null +++ b/BUILD.md @@ -0,0 +1,36 @@ +On Linux, install the development packages for FreeType, +Cairo, and GLib. For example, on Ubuntu / Debian, you would do: +* sudo apt-get install gcc g++ libfreetype6-dev libglib2.0-dev libcairo2-dev + +whereas on Fedora, RHEL, CentOS, and other Red Hat based systems you would do: +* sudo yum install gcc gcc-c++ freetype-devel glib2-devel cairo-devel + +on the Mac, using MacPorts: +* sudo port install freetype glib2 cairo + +or using Homebrew: +* brew install freetype glib cairo + +If you are using a tarball, you can now proceed to running configure and make +as with any other standard package. That should leave you with a shared +library in src/, and a few utility programs including hb-view and hb-shape +under util/. From the tarball, NMake Makefiles are also provided in win32/, +which supports building HarfBuzz using Visual Studio, with a README.txt that +gives instructions on building using NMake. +If you are bootstraping from git, you need a few more tools before you can +run autogen.sh for the first time. Namely, pkg-config and ragel. Again, +on Ubuntu / Debian: +* sudo apt-get install autoconf automake libtool pkg-config ragel gtk-doc-tools + +and on Fedora, RHEL, CentOS: +* sudo yum install autoconf automake libtool pkgconfig ragel gtk-doc + +on the Mac, using MacPorts: +* sudo port install autoconf automake libtool pkgconfig ragel gtk-doc + +or using Homebrew: +* brew install autoconf automake libtool pkgconfig ragel gtk-doc + +To build the Python bindings, you also need: + +* brew install pygobject3 diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..9d1056f --- /dev/null +++ b/COPYING @@ -0,0 +1,36 @@ +HarfBuzz is licensed under the so-called "Old MIT" license. Details follow. +For parts of HarfBuzz that are licensed under different licenses see individual +files names COPYING in subdirectories where applicable. + +Copyright © 2010,2011,2012 Google, Inc. +Copyright © 2012 Mozilla Foundation +Copyright © 2011 Codethink Limited +Copyright © 2008,2010 Nokia Corporation and/or its subsidiary(-ies) +Copyright © 2009 Keith Stribley +Copyright © 2009 Martin Hosken and SIL International +Copyright © 2007 Chris Wilson +Copyright © 2006 Behdad Esfahbod +Copyright © 2005 David Turner +Copyright © 2004,2007,2008,2009,2010 Red Hat, Inc. +Copyright © 1998-2004 David Turner and Werner Lemberg + +For full copyright notices consult the individual files in the package. + + +Permission is hereby granted, without written agreement and without +license or royalty fees, to use, copy, modify, and distribute this +software and its documentation for any purpose, provided that the +above copyright notice and the following two paragraphs appear in +all copies of this software. + +IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR +DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN +IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. + +THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS +ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO +PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..6aa7876 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,57702 @@ +commit 79e8e27ffd3da29ca27d3aebd2ef425bf1cb7f9d +Author: Behdad Esfahbod +Date: Mon Jan 23 17:55:31 2017 -0800 + + [var] Hook up advance variations to hb-ot-font + + Yay, works! + + src/hb-ot-font.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 607434037199ccca422287e4d097487f17f3cfb5 +Author: Behdad Esfahbod +Date: Mon Jan 23 17:55:16 2017 -0800 + + [var] Fix bug in HVAR/VVAR impl + + src/hb-ot-var-hvar-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit bd3b11d92663343350813ca29606b369f691af03 +Author: Behdad Esfahbod +Date: Mon Jan 23 17:34:44 2017 -0800 + + [var] Prepare for hooking up advance variations to hb-ot-font + + src/hb-ot-font.cc | 28 +++++++++++++++++----------- + src/hb-ot-var-hvar-table.hh | 8 ++++---- + 2 files changed, 21 insertions(+), 15 deletions(-) + +commit a4fca9f0051dbc177390a4e555b2d0fe642f724e +Author: Behdad Esfahbod +Date: Mon Jan 23 11:56:08 2017 -0800 + + [var] Implement DeltaSetIndexMap and advance delta fetching + + Not hooked up to hb-ot-font yet. + + src/hb-ot-layout-common-private.hh | 8 ++++++ + src/hb-ot-var-hvar-table.hh | 56 + ++++++++++++++++++++++++++++++++++++-- + 2 files changed, 61 insertions(+), 3 deletions(-) + +commit 7b399f73efa76cd97131fd123a9a1566f8639cfd +Author: Behdad Esfahbod +Date: Mon Jan 23 11:41:43 2017 -0800 + + [var] Start adding HVAR/VVAR + + src/Makefile.sources | 1 + + src/hb-ot-font.cc | 1 + + src/hb-ot-var-avar-table.hh | 1 - + src/hb-ot-var-fvar-table.hh | 1 - + src/hb-ot-var-hvar-table.hh | 115 + ++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 117 insertions(+), 2 deletions(-) + +commit b732c53eb5bd0c2cc86f35a9d9623c92579a0b8c +Author: Behdad Esfahbod +Date: Sun Jan 22 20:31:53 2017 -0800 + + Add LArrayOf<> + + src/hb-open-type-private.hh | 1 + + src/hb-ot-cbdt-table.hh | 4 ++-- + src/hb-ot-layout-common-private.hh | 2 +- + 3 files changed, 4 insertions(+), 3 deletions(-) + +commit 5e156fa5ed33cd1a8ff388833563f15930bb12f9 +Author: Behdad Esfahbod +Date: Sun Jan 22 20:28:56 2017 -0800 + + Add LOffsetTo<> + + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 1 + + src/hb-ot-cbdt-table.hh | 4 ++-- + src/hb-ot-cmap-table.hh | 6 +++--- + src/hb-ot-layout-common-private.hh | 10 +++++----- + src/hb-ot-layout-gdef-table.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 7 files changed, 15 insertions(+), 14 deletions(-) + +commit d6bdbbca307d1a4aed60a78133eea40a1a9d5bf3 +Author: Behdad Esfahbod +Date: Sun Jan 22 20:16:51 2017 -0800 + + [var] Remove HB_OT_TAG_fvar/avar + + We're not going to define public macros for tags for tables. + There's little use to those and they are implementation detail. + + docs/harfbuzz-sections.txt | 2 -- + src/hb-ot-var-avar-table.hh | 2 ++ + src/hb-ot-var-fvar-table.hh | 2 ++ + src/hb-ot-var.h | 3 --- + 4 files changed, 4 insertions(+), 5 deletions(-) + +commit a11d9a0466e480efebd69a34827675387cd2ca34 +Author: Behdad Esfahbod +Date: Sun Jan 22 20:09:47 2017 -0800 + + Minor + + src/hb-ot-font.cc | 6 +++--- + src/hb-ot-hmtx-table.hh | 8 +++----- + 2 files changed, 6 insertions(+), 8 deletions(-) + +commit 7a860f656e4aec45c45e0f5fb28c49a91dc5eef2 +Author: Behdad Esfahbod +Date: Sun Jan 22 19:52:09 2017 -0800 + + [var] Add macros for standard axes + + docs/harfbuzz-sections.txt | 7 +++++++ + src/hb-ot-var.h | 6 ++++++ + 2 files changed, 13 insertions(+) + +commit a484e237b11650d00092329855d33dd2f67980e4 +Author: Behdad Esfahbod +Date: Sun Jan 22 19:41:33 2017 -0800 + + [var] Implement 'avar' table mapping + + Untested! + + src/hb-ot-math.cc | 2 -- + src/hb-ot-var-avar-table.hh | 46 + ++++++++++++++++++++++++++++++++++++++++++++- + src/hb-ot-var.cc | 23 +++++++++++++++-------- + 3 files changed, 60 insertions(+), 11 deletions(-) + +commit a42909057207cbed1ef95716170434c05beb0002 +Author: Behdad Esfahbod +Date: Sun Jan 22 19:01:07 2017 -0800 + + [var] Flesh out --variations documentation + + util/options.cc | 53 + ++++++++++++++--------------------------------------- + 1 file changed, 14 insertions(+), 39 deletions(-) + +commit 5ec96d30cad1592b5e468bd8ad1832dbaf0ad32b +Author: Behdad Esfahbod +Date: Sun Jan 22 18:52:00 2017 -0800 + + [var] Adjust API in prep for 'avar' implementation + + The 'avar' table does not allow random access to axis maps, + so change API to avoid quadratic-time implementation. + + Removed -hb_ot_var_normalize_axis_value(), added + +hb_ot_var_normalize_variations() and + +hb_ot_var_normalize_coords() instead. + + docs/harfbuzz-sections.txt | 3 ++- + src/Makefile.sources | 1 + + src/hb-font.cc | 20 +++++--------------- + src/hb-ot-var.cc | 45 + +++++++++++++++++++++++++++++++++++++++------ + src/hb-ot-var.h | 16 ++++++++++++---- + 5 files changed, 59 insertions(+), 26 deletions(-) + +commit 8a577aaa0dd760409bcad1ae3d4f5fb561a62a4b +Author: Behdad Esfahbod +Date: Sun Jan 22 18:22:40 2017 -0800 + + [var] Stub implementation of avar table + + src/hb-ot-var-avar-table.hh | 99 + +++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 99 insertions(+) + +commit 7647a05a0b37c53465560952b412db4e590f2716 +Author: Behdad Esfahbod +Date: Sun Jan 22 17:47:49 2017 -0800 + + Minor + + src/hb-font.cc | 5 ++++- + src/hb-font.h | 2 +- + src/hb-ft.cc | 2 +- + util/helper-cairo.cc | 14 +++++++++----- + 4 files changed, 15 insertions(+), 8 deletions(-) + +commit d2f249e745a9179943ee39c719b73e1057acbc13 +Author: Behdad Esfahbod +Date: Sun Jan 22 17:42:33 2017 -0800 + + Stub out doc comments for new symbols + + docs/harfbuzz-docs.xml | 2 +- + docs/harfbuzz-sections.txt | 35 +++++++++++++++++++++++++++++++++-- + src/hb-common.cc | 10 ++++++++++ + src/hb-common.h | 5 +++++ + src/hb-directwrite.cc | 2 +- + src/hb-directwrite.h | 2 +- + src/hb-font.cc | 20 ++++++++++++++++++++ + src/hb-ot-var.cc | 24 ++++++++++++++++++++++-- + src/hb-ot-var.h | 12 +++++------- + src/hb-set.cc | 2 +- + 10 files changed, 99 insertions(+), 15 deletions(-) + +commit 5dfd341f51543279039ddafe883c0a1de205fb8a +Author: Behdad Esfahbod +Date: Sun Jan 22 16:55:40 2017 -0800 + + Minor + + src/hb-directwrite.cc | 4 ++-- + src/hb-shape.cc | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 825e40407da74576f8e83ce0bacad5b0459b83c8 +Author: Behdad Esfahbod +Date: Sun Jan 22 16:41:45 2017 -0800 + + [hb-ft] Remove use of variable-length array + + Hopefully also fixes build failure on msvc. + + src/hb-ft.cc | 33 +++++++++++++++++++++------------ + 1 file changed, 21 insertions(+), 12 deletions(-) + +commit 47ee34e84745756a9aaeb964772377b6c1417ed1 +Author: Behdad Esfahbod +Date: Sat Jan 21 18:10:08 2017 -0800 + + [var] Hook up variations to FreeType face + + hb-view correctly renders variations with ft font-funcs now. + hb-ot-font needs HVAR implementation. + + src/hb-ft.cc | 10 ++++++++++ + util/helper-cairo.cc | 16 +++++++++++++++- + 2 files changed, 25 insertions(+), 1 deletion(-) + +commit 111f3e55178f7cd5a8ae4e8ae111cb48aea4acb5 +Author: Behdad Esfahbod +Date: Sat Jan 21 17:51:41 2017 -0800 + + [util] Add --variations + + Is hooked up to the font, but not to FreeType, so raster doesn't + show yet. + + Documentation needs to be done. + + util/options.cc | 91 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + util/options.hh | 8 ++++- + 2 files changed, 98 insertions(+), 1 deletion(-) + +commit bb1e19268f02d4aad2240c52852e72afcf0f79ad +Author: Behdad Esfahbod +Date: Sat Jan 21 17:41:37 2017 -0800 + + [var] Rename var_coord to variation + + Looks much better. + + src/hb-common.cc | 36 ++++++++++++++++++------------------ + src/hb-common.h | 10 +++++----- + src/hb-font.cc | 20 ++++++++++---------- + src/hb-font.h | 6 +++--- + 4 files changed, 36 insertions(+), 36 deletions(-) + +commit 64fe92bf2d43a0ea31743d774e073f202021dbd1 +Author: Behdad Esfahbod +Date: Sat Jan 21 15:36:35 2017 -0800 + + [var] Remove use of variable-length arrays + + src/hb-font.cc | 30 +++++++++++++++++++++--------- + 1 file changed, 21 insertions(+), 9 deletions(-) + +commit 2491134b386507f611a47e43e3f7c2766d0d288b +Author: Behdad Esfahbod +Date: Sat Jan 21 15:21:50 2017 -0800 + + [var] Add hb_font_set_var_coords() + + src/hb-font.cc | 38 ++++++++++++++++++++++++++++++++++++-- + src/hb-font.h | 8 ++++++-- + 2 files changed, 42 insertions(+), 4 deletions(-) + +commit 113393efec5e0c4c10c141a6d4b801d50fcd8ab8 +Author: Behdad Esfahbod +Date: Sat Jan 21 15:12:03 2017 -0800 + + Remove a few unused includes + + src/hb-face.cc | 6 +----- + src/hb-font.cc | 7 ------- + src/hb-ot-layout.cc | 5 +---- + src/hb-ot-tag.cc | 3 --- + 4 files changed, 2 insertions(+), 19 deletions(-) + +commit 2d40923ca914c90304d07d6e7b9b1040c79c76fe +Author: Behdad Esfahbod +Date: Sat Jan 21 15:06:15 2017 -0800 + + Minor + + src/hb-ot-math.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8b2a58047095604dcdc576ecbe3e8c2ebb8f48f0 +Author: Behdad Esfahbod +Date: Sat Jan 21 15:05:00 2017 -0800 + + [var] Add hb_font_set_var_coords_design() + + src/hb-font.cc | 21 +++++++++++++++++++-- + src/hb-font.h | 7 ++++++- + 2 files changed, 25 insertions(+), 3 deletions(-) + +commit 0dcc7b49a830e2680d3e6d86d953efab85cef6ff +Author: Behdad Esfahbod +Date: Sat Jan 21 14:50:22 2017 -0800 + + [var] Minor lifecycle adjustment + + src/hb-font.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit bf0d3a665baac9e33c0f774b22197c321b864c80 +Author: Behdad Esfahbod +Date: Sat Jan 21 14:48:46 2017 -0800 + + [var] Add hb_font_get_var_coords_normalized() + + src/hb-font.cc | 10 ++++++++++ + src/hb-font.h | 4 ++++ + 2 files changed, 14 insertions(+) + +commit b3c0714b4bbb726b2b3e5e0416ac84cb5c6eb34e +Author: Behdad Esfahbod +Date: Fri Jan 20 20:30:03 2017 -0800 + + [var] Add hb_var_coord_t and parsing routines + + src/hb-common.cc | 94 + +++++++++++++++++++++++++++++++++++++++++++++++++++++--- + src/hb-common.h | 15 ++++++++- + 2 files changed, 103 insertions(+), 6 deletions(-) + +commit 72364103bc9d910d19f23a3764d045af79d076d5 +Author: Behdad Esfahbod +Date: Fri Jan 20 20:16:53 2017 -0800 + + Move code around + + src/hb-common.cc | 250 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-common.h | 18 ++++ + src/hb-shape.cc | 248 + ------------------------------------------------------ + src/hb-shape.h | 16 ---- + 4 files changed, 268 insertions(+), 264 deletions(-) + +commit 785982bf830723552270db5649abcb9f9f0b46b1 +Author: Behdad Esfahbod +Date: Fri Jan 20 19:57:27 2017 -0800 + + [var] Flesh out some more + + src/Makefile.am | 2 ++ + src/hb-ot-var-fvar-table.hh | 69 + ++++++++++++++++++++++++++++++++------------- + src/hb-ot-var.cc | 39 ++++++++++++++++++++++++- + src/hb-ot-var.h | 21 +++++++++----- + 4 files changed, 104 insertions(+), 27 deletions(-) + +commit 422c0c36c80145a2d993f80d5c7d3265e3d8357a +Author: Behdad Esfahbod +Date: Fri Jan 20 19:14:54 2017 -0800 + + [var] Flesh out a bit + + src/hb-ot-var-fvar-table.hh | 72 + ++++++++++++++++++++++++++++++++++++--------- + src/hb-ot-var.h | 10 ++++++- + 2 files changed, 67 insertions(+), 15 deletions(-) + +commit b8376b10904e1772b8d34d852d1100ca7e2185e2 +Author: Behdad Esfahbod +Date: Fri Jan 20 18:19:28 2017 -0800 + + Minor + + src/hb-ft.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f2e73d37e77ccea8b948d1ecf5f11e7a699386dc +Author: Behdad Esfahbod +Date: Fri Jan 20 17:42:18 2017 -0800 + + [var] Remove over-optimization + + src/hb-font.cc | 4 ---- + 1 file changed, 4 deletions(-) + +commit 469926cc45760cb681d44e5757b18b9bdd736189 +Author: Behdad Esfahbod +Date: Fri Jan 20 17:40:46 2017 -0800 + + [var] Change double to float in API + + src/hb-ot-var.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 55d42fd667b9c34a1109bb850bf2ea7322c01040 +Author: Behdad Esfahbod +Date: Thu Jan 19 19:35:48 2017 -0800 + + Start adding hb-ot-var.h and implementation + + Supports enumerating variation axes, normalizing values, etc. + + src/Makefile.sources | 3 + + src/hb-ot-layout-private.hh | 6 ++ + src/hb-ot-layout.cc | 4 ++ + src/hb-ot-var-fvar-table.hh | 133 + ++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-var.cc | 63 +++++++++++++++++++++ + src/hb-ot-var.h | 81 +++++++++++++++++++++++++++ + src/hb-ot.h | 1 + + 7 files changed, 291 insertions(+) + +commit 272b5115325b785e92ff5500d4bfc3a67490b6f8 +Author: Behdad Esfahbod +Date: Thu Jan 19 19:33:07 2017 -0800 + + Minor + + src/hb-ot-math.cc | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit a8a5e81a52f56f5f8bf975dc4d9f79bede5d895b +Author: Behdad Esfahbod +Date: Thu Jan 19 16:55:04 2017 -0800 + + [test-ot-math] Add test with nil face/font + + test/api/test-ot-math.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 331d07bd40a3d9ff30db5cdf85fdc4f10f0fcb99 +Author: Behdad Esfahbod +Date: Thu Jan 19 16:51:36 2017 -0800 + + Minor + + test/api/test-ot-math.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit b5ecf1bfa459a755e36bc4c7f545c7f803b7d016 +Author: Behdad Esfahbod +Date: Thu Jan 19 16:50:29 2017 -0800 + + Fix warnings + + test/api/test-ot-math.c | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +commit 2f2ceee1853649d1b2ad4315a38cd9c07659932a +Author: Behdad Esfahbod +Date: Thu Jan 19 16:48:01 2017 -0800 + + Minor + + test/api/test-ot-math.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 2452543fdd383e62b8c4bc44b11bfd6796fc9963 +Author: Khaled Hosny +Date: Wed Jan 18 22:48:13 2017 +0200 + + [ot] Fix automatic fraction for RTL scripts (#405) + + The numbers for right-to-left scripts are processed also from right to + left, so the order of applying “numr” and “dnom” features + should be + reversed in such case. + + Fixes https://github.com/behdad/harfbuzz/issues/395 + + src/hb-ot-shape.cc | 16 + ++++++++++++++-- + test/shaping/Makefile.am | 1 + + .../15dfc433a135a658b9f4b1a861b5cdd9658ccbb9.ttf | Bin 0 -> + 4936 bytes + test/shaping/tests/automatic-fractions.tests | 3 +++ + 4 files changed, 18 insertions(+), 2 deletions(-) + +commit 1337428e4f8a2a4c78312c581bf4e96cd49d783f +Author: Sascha Brawer +Date: Wed Jan 18 13:51:02 2017 +0100 + + Update language tags to OpenType 1.8.1 (#403) + + Resolves https://github.com/behdad/harfbuzz/issues/324 + + src/hb-ot-tag.cc | 77 + ++++++++++++++++++++++++++++++++++++++++++++------ + test/api/test-ot-tag.c | 58 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 126 insertions(+), 9 deletions(-) + +commit 784d1180de19fbf4948f08ee2124277cc06066dd +Author: Behdad Esfahbod +Date: Wed Jan 11 11:58:13 2017 -0800 + + Fix build with clang + + src/hb-open-type-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 1f810daf1640f279c2f7aad8c312664cf2293987 +Author: Behdad Esfahbod +Date: Mon Jan 9 23:50:56 2017 -0800 + + Port math table to hb_lazy_table_loader_t + + src/hb-open-type-private.hh | 22 +++++++++++++++++----- + src/hb-ot-layout-private.hh | 4 ++-- + src/hb-ot-layout.cc | 7 +++---- + src/hb-ot-math.cc | 17 +---------------- + 4 files changed, 23 insertions(+), 27 deletions(-) + +commit ebbcc1112229cde9ed469efdfeac7ef79dfcd834 +Author: Behdad Esfahbod +Date: Mon Jan 9 22:45:25 2017 -0800 + + Add hb_lazy_table_loader_t + + src/hb-open-type-private.hh | 40 ++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 40 insertions(+) + +commit 1af9d924a474f210fda10b5e8ab6b388241aa0b5 +Author: Behdad Esfahbod +Date: Mon Jan 9 22:22:37 2017 -0800 + + Move lazy-loader to more generic place + + src/hb-open-type-private.hh | 47 + ++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-font.cc | 48 + ++------------------------------------------- + 2 files changed, 49 insertions(+), 46 deletions(-) + +commit ac274331c285e1b42632870e150e1d66a9e21933 +Author: Behdad Esfahbod +Date: Mon Jan 9 22:20:38 2017 -0800 + + In lazy-loading, remember allocation failure + + src/hb-ot-font.cc | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 29fb0cb727555ea60460d794a3c6f30179546af9 +Author: Behdad Esfahbod +Date: Mon Jan 9 21:18:55 2017 -0800 + + Minor + + src/hb-face-private.hh | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 93ef684b9bc411b7642df3adeb2248ad6010ee66 +Author: Behdad Esfahbod +Date: Mon Jan 9 21:11:00 2017 -0800 + + Rename hb-ot-layout-math-table.hh to hb-ot-math-table.hh + + src/Makefile.sources | 2 +- + src/{hb-ot-layout-math-table.hh => hb-ot-math-table.hh} | 6 +++--- + src/hb-ot-math.cc | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +commit 3b5263b0e9e23e56e14ce6a8498c21c5ce95cc35 +Author: Behdad Esfahbod +Date: Mon Jan 9 15:49:08 2017 -0800 + + Typo + + src/hb-ot-layout-math-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ebf927d3d4394159e480fec2042a0456df8dd0f4 +Author: ebraminio +Date: Mon Jan 9 13:12:09 2017 +0330 + + Make UCDN default enabled (fixes #389) (#391) + + win32/config-msvc.mak | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 00adf9c8a4573a2b3ef61991197821af03bca310 +Author: Behdad Esfahbod +Date: Mon Jan 9 00:00:49 2017 -0800 + + Minor + + Should be enough to get -hangul.cc out of SOURCES in Firefox build: + https://dxr.mozilla.org/mozilla-central/source/gfx/harfbuzz/src/moz.build + + No one else should care! + + src/hb-ot-shape-complex-hangul.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7cf9952e7fc015d0b08d3de6c95357662d57ad8d +Author: Behdad Esfahbod +Date: Sun Jan 8 23:55:54 2017 -0800 + + [USE] Remove non-canonical decompositions + + We have had added this in Indic shaper to assist shaping these + scripts. + In Universal Shaping Engine however, it is up to font designer to + decompose them. Hence moving them from Indic shaper to USE was + wrong. + + Fixup for f6ba63b2e8eb577385f70758efdd3b8408c8a9cb + + Part of fixing https://github.com/behdad/harfbuzz/issues/387 + + src/hb-ot-shape-complex-use.cc | 22 ---------------------- + 1 file changed, 22 deletions(-) + +commit af596a5655ee2ed09da17a7de79f619e1547dcd9 +Author: Behdad Esfahbod +Date: Thu Jan 5 20:24:41 2017 -0800 + + 1.4.1 + + NEWS | 10 ++++++++++ + configure.ac | 2 +- + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit 31f7b1bb94c2cef7ce58df52ddd1b09b42e8f596 +Author: Behdad Esfahbod +Date: Thu Jan 5 20:20:06 2017 -0800 + + Add tests for USE using Marchen font and text + + From http://www.babelstone.co.uk/Fonts/Marchen.html + + test/shaping/Makefile.am | 1 + + .../85414f2552b654585b7a8d13dcc3e8fd9f7970a3.ttf | Bin 0 -> 66936 bytes + test/shaping/tests/use-marchen.tests | 35 + +++++++++++++++++++++ + 3 files changed, 36 insertions(+) + +commit 53543f8b3e19456279c86f711feba42ce976668c +Author: Behdad Esfahbod +Date: Thu Jan 5 20:12:32 2017 -0800 + + Ship UCDN and use it by default + + So we are not relying on version of Unicode data in glib... + + Fixes https://github.com/behdad/harfbuzz/issues/386 + Fixes https://github.com/behdad/harfbuzz/issues/388 + + configure.ac | 12 ++++++++---- + src/hb-unicode.cc | 6 +++--- + 2 files changed, 11 insertions(+), 7 deletions(-) + +commit f3397069479cae34e6bdc658e2875fb178b03e43 +Author: Behdad Esfahbod +Date: Thu Jan 5 01:27:49 2017 -0800 + + 1.4.0 + + NEWS | 34 ++++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 35 insertions(+), 1 deletion(-) + +commit ae00af4a47587308969dfaf7baa93164d7842710 +Author: Frédéric Wang +Date: Tue Jan 3 05:55:09 2017 +0100 + + Move math-specific code from hb-ot-layout to hb-ot-math #235 (#384) + + src/Makefile.sources | 1 + + src/hb-ot-layout.cc | 244 --------------------------------------------- + src/hb-ot-math.cc | 272 + +++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 273 insertions(+), 244 deletions(-) + +commit e053ccc5bb7268fe5900dd364d906638c58b2908 +Author: Behdad Esfahbod +Date: Wed Dec 28 15:51:57 2016 -0500 + + Remove Android.mk + + Android uses its own file these days and third-party developers should + be using the autotools-based system against Android NDK. + + Android.mk | 107 + ------------------------------------------------------------ + Makefile.am | 1 - + 2 files changed, 108 deletions(-) + +commit 6cff75394192a1ab0dda82981752ade532838333 +Author: Behdad Esfahbod +Date: Wed Dec 28 13:46:21 2016 -0500 + + Remove Tibetan decomposition rules from Indic shaper + + The decomposition is very obscure and unlikely to help + any fonts. Just remove it since Uniscribe probably doesn't + do this either. + + Fixes https://github.com/behdad/harfbuzz/issues/382 + + src/hb-ot-shape-complex-indic.cc | 4 ---- + 1 file changed, 4 deletions(-) + +commit f6ba63b2e8eb577385f70758efdd3b8408c8a9cb +Author: Behdad Esfahbod +Date: Wed Dec 28 13:45:32 2016 -0500 + + Port decompositions from Indic to USE shaper + + Part of https://github.com/behdad/harfbuzz/issues/382 + + src/hb-ot-shape-complex-indic.cc | 16 ---------------- + src/hb-ot-shape-complex-use.cc | 22 ++++++++++++++++++++++ + 2 files changed, 22 insertions(+), 16 deletions(-) + +commit e678b537f77954615721abd65fef28854f95dc5d +Author: Behdad Esfahbod +Date: Mon Dec 26 14:11:59 2016 -0500 + + [indic] Remove Chakma decomposition rule from Indic shaper + + This is now added to USE: + https://github.com/behdad/harfbuzz/pull/383 + + See: + https://github.com/behdad/harfbuzz/issues/381 + https://github.com/behdad/harfbuzz/issues/382 + + src/hb-ot-shape-complex-indic.cc | 4 ---- + 1 file changed, 4 deletions(-) + +commit 49ba698124399373cea000d08e0e9fe5fc2396e8 +Author: jfkthame +Date: Wed Dec 28 18:00:51 2016 +0000 + + [use] Special-case Chakma split-vowel decomp in the USE shaper. (#383) + + src/hb-ot-shape-complex-use.cc | 21 ++++++++++++++++++++- + 1 file changed, 20 insertions(+), 1 deletion(-) + +commit c4ca49d55b49c65e04f0b2acecacd6a5c70978f4 +Author: Behdad Esfahbod +Date: Mon Dec 26 14:52:08 2016 -0500 + + Revert "[indic] Remove redundant Chakma decomposition rule" + + This reverts commit 805f76fc002d703acfcc4c5727f0b4d1baecefaa. + + Need to investigate why having this rule (with the reversed order) + fixes decomposition as reported by punchcutter: + https://github.com/behdad/harfbuzz/issues/381#issuecomment-269237796 + + src/hb-ot-shape-complex-indic.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 805f76fc002d703acfcc4c5727f0b4d1baecefaa +Author: Behdad Esfahbod +Date: Mon Dec 26 14:11:59 2016 -0500 + + [indic] Remove redundant Chakma decomposition rule + + This was not used BTW since Chakma doesn't go through Indic shaper + anymore. + + See: + https://github.com/behdad/harfbuzz/issues/381 + https://github.com/behdad/harfbuzz/issues/382 + + src/hb-ot-shape-complex-indic.cc | 4 ---- + 1 file changed, 4 deletions(-) + +commit 3cc48a46b56be06e6734aaabf37a4b521606380c +Author: Behdad Esfahbod +Date: Mon Dec 26 13:10:31 2016 -0500 + + [indix] Comment + + src/hb-ot-shape-complex-indic.cc | 25 ++++++++++++++++++++++--- + 1 file changed, 22 insertions(+), 3 deletions(-) + +commit 7d1c5d8281b05a5c178ea3ae048b0062145968aa +Author: nvelinov +Date: Sat Dec 24 02:46:37 2016 +0100 + + Compilation Error for ASSERT_STATIC on Some Compilers (#380) + + * this pointer in type definitions is not interpreted as a constant. + This rule is not enforced strictly by all compilers, but the Green + Hills Software compiler will regard this as an error. + + * Merging branches for the DEFINE_SIZE_UNION macro + Adding check for the existence of static_size field in the tested + member. + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e2b878055bb1c0b84e1f7cfbf3d3f80bfc6811ea +Author: Behdad Esfahbod +Date: Thu Dec 22 14:40:19 2016 -0600 + + Disable OTL processing for Hebrew if GPOS doesn't have Hebrew subtable + + New approach to fix this: + https://github.com/behdad/harfbuzz/commit/69f9fbc4200442a35484d3c790ae8f4979be5d60 + + Previous approach was reverted as it was too broad. See context: + https://github.com/behdad/harfbuzz/issues/347#issuecomment-267838368 + + With U+05E9,U+05B8,U+05C1,U+05DC and Arial Unicode, we now (correctly) + disable + GDEF and GPOS, so we get results very close to Uniscribe, but + slightly different + since our fallback position logic is not exactly the same: + + Before: [gid1166=3+991|gid1142=0+737|gid5798=0+1434] + After: [gid1166=3+991|gid1142=0@402,-26+0|gid5798=0+1434] + Uniscribe: [gid1166=3+991|gid1142=0@348,0+0|gid5798=0+1434] + + src/hb-ot-shape-complex-arabic.cc | 1 + + src/hb-ot-shape-complex-default.cc | 1 + + src/hb-ot-shape-complex-hangul.cc | 1 + + src/hb-ot-shape-complex-hebrew.cc | 13 +++++++++++++ + src/hb-ot-shape-complex-indic.cc | 1 + + src/hb-ot-shape-complex-myanmar.cc | 2 ++ + src/hb-ot-shape-complex-private.hh | 8 ++++++++ + src/hb-ot-shape-complex-thai.cc | 1 + + src/hb-ot-shape-complex-tibetan.cc | 1 + + src/hb-ot-shape-complex-use.cc | 1 + + src/hb-ot-shape.cc | 29 ++++++++++++++++------------- + 11 files changed, 46 insertions(+), 13 deletions(-) + +commit 1a0f4aa6dfee69236b422f7c8825eff940f45c19 +Author: Behdad Esfahbod +Date: Thu Dec 22 13:33:54 2016 -0600 + + Revert "Synthesize GDEF glyph class for any glyph that does not have + one in GDEF" + + This reverts commit 69f9fbc4200442a35484d3c790ae8f4979be5d60. + + See + https://github.com/behdad/harfbuzz/issues/347#issuecomment-268873401 + Fixes https://github.com/behdad/harfbuzz/issues/347 + + src/hb-ot-layout-gsub-table.hh | 22 ++-------------------- + src/hb-ot-shape.cc | 29 +++++++++++++++++++++++++++++ + 2 files changed, 31 insertions(+), 20 deletions(-) + +commit 4b4a1b9f235598b04ce9ae1f9670fc978ab7620d +Author: Behdad Esfahbod +Date: Wed Dec 21 23:10:43 2016 -0600 + + Fix assert fail with contextual matching + + As discovered by libFuzzer / Chromium fuzzing. + + Fixes https://bugs.chromium.org/p/chromium/issues/detail?id=659496 + CC https://github.com/behdad/harfbuzz/issues/139 + + src/hb-ot-layout-gsubgpos-private.hh | 6 +++++- + .../sha1sum/217a934cfe15c548b572c203dceb2befdf026462.ttf | Bin 0 -> + 1384 bytes + test/shaping/tests/fuzzed.tests | 1 + + 3 files changed, 6 insertions(+), 1 deletion(-) + +commit df98ce5fc8cf1dafd58c329975f07aafbeee3263 +Author: Behdad Esfahbod +Date: Wed Dec 21 19:27:30 2016 -0600 + + Improve debug output with really deep nesting + + src/hb-private.hh | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +commit eab418c5e6fa34b90133862cc8ce11e617ce08bf +Author: Behdad Esfahbod +Date: Wed Dec 21 15:51:28 2016 -0600 + + Avoid infinite loop in CoverageFormat2 iteration with bad fonts + + Fixes https://github.com/behdad/harfbuzz/issues/363 + + src/hb-ot-layout-common-private.hh | 29 ++++++++++++++++++----------- + 1 file changed, 18 insertions(+), 11 deletions(-) + +commit a0688e8e7b58c156f5809c272b5884bfe75f68ae +Author: Behdad Esfahbod +Date: Tue Dec 20 20:52:50 2016 -0600 + + Ouch, finish previous change + + test/fuzzing/Makefile.am | 3 ++- + test/fuzzing/hb-fuzzer.cc | 30 ++++-------------------------- + 2 files changed, 6 insertions(+), 27 deletions(-) + +commit de14c19d14be90367a1231de56dd347e3f54931c +Author: Behdad Esfahbod +Date: Tue Dec 20 20:50:38 2016 -0600 + + [fuzzer] Separate main() into a new file + + test/fuzzing/hb-fuzzer.hh | 4 ++++ + test/fuzzing/main.cc | 21 +++++++++++++++++++++ + 2 files changed, 25 insertions(+) + +commit 7ed71eb347c894c5b4b012bcca0816922c3052c2 +Author: Behdad Esfahbod +Date: Tue Dec 20 15:01:16 2016 -0600 + + Protect collect_glyphs() and closure() against malicious DDOS fonts + + Fixes https://github.com/behdad/harfbuzz/issues/363 + + src/hb-ot-layout-gsub-table.hh | 58 + ++++++++++++++++++++++++++++++++++-------- + 1 file changed, 48 insertions(+), 10 deletions(-) + +commit 1c98ff87c76536553e53c131e75aba33033ee3a0 +Author: Mike Hommey +Date: Fri Sep 30 18:15:37 2016 +0900 + + Support building with older glib versions + + It is desirable to be able to build against older versions of glib. + + fd7a245 changed the configure check to require glib > 2.38 for + G_TEST_DIST. Before that, version 2.16 was required, but in fact, + since aafe395, G_PASTE is being used, which was introduced in 2.19.1. + And since 0ef179e2, hb-glib uses GBytes, which were introduced in + 2.31.10. + + 2.19.1 is rather old, but 2.38 is rather new. For Firefox, building + against 2.22 is still supported, although we could probably get away + with bumping that to 2.28. Either way, GBytes is not available. + + Arguably, if you build against a glib that doesn't support GBytes, + you're not going to use the hb_glib_blob_create function, so we hide + the function when building against such a glib. + + As for G_TEST_DIST, when building against versions of glib that don't + support it, we can fallback to the previous behavior, which, AIUI, was + just making the test not work when building in a separate directory. + + configure.ac | 2 +- + src/hb-glib.cc | 2 ++ + src/hb-glib.h | 3 ++- + test/api/test-ot-math.c | 4 ++++ + 4 files changed, 9 insertions(+), 2 deletions(-) + +commit ad273881c597a95929ce3b84f63865f9d7dcdb7e +Author: Volker H. Simonis +Date: Wed Dec 14 18:56:17 2016 +0100 + + Minor fixes to pacify Coverity code scan + + Fixes https://github.com/behdad/harfbuzz/pull/377 + + src/hb-ot-font.cc | 6 +++++- + src/hb-ot-layout-gpos-table.hh | 14 +++++++------- + 2 files changed, 12 insertions(+), 8 deletions(-) + +commit 1e1825bf47aa29968f75a78305d4541ce2c9d40c +Author: ebraminio +Date: Sat Dec 17 10:30:40 2016 +0330 + + [dwrite] Provide an experimental API for justification (#279) + + src/hb-directwrite.cc | 48 + ++++++++++++++++++++++++++++++++++++++++-------- + src/hb-directwrite.h | 4 ++++ + 2 files changed, 44 insertions(+), 8 deletions(-) + +commit 4cd0cd67914db1da10906e40335faea7dbec1d0a +Author: elmarb +Date: Wed Dec 7 11:50:27 2016 +0100 + + NMake ICU option builds with builtin ICU (#375) + + win32/build-rules-msvc.mak | 13 ------------- + win32/config-msvc.mak | 37 ++++++++++++++++++++----------------- + win32/create-lists-msvc.mak | 13 ------------- + win32/detectenv-msvc.mak | 4 +++- + win32/generate-msvc.mak | 2 +- + win32/info-msvc.mak | 12 +++++------- + win32/install.mak | 4 ---- + 7 files changed, 29 insertions(+), 56 deletions(-) + +commit 75fa884f925c203a839b5874f30bf9ebf025b6e4 +Author: Khaled Hosny +Date: Mon Dec 5 23:20:47 2016 +0200 + + [win32] Fix wrong description of the ICU option (#372) + + win32/README.txt | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 219cb29c5d230ecc6ee154b447fabd7b59fbe089 +Author: Behdad Esfahbod +Date: Wed Sep 28 17:16:06 2016 +0200 + + Fix build after rebasing opentype-gx branch on top of MATH table + + src/hb-ot-layout-common-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0aedfd59be54972e61a952753ffc0d12631771fe +Author: Behdad Esfahbod +Date: Wed Sep 28 17:05:43 2016 +0200 + + [GX] Apply 'rvrn' feature before any other feature + + src/hb-ot-shape.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 42c81425316190f6424ecb9b19d5a886aa1e4136 +Author: Behdad Esfahbod +Date: Tue Sep 13 23:49:46 2016 +0200 + + [GX] Fix build with older FreeType + + configure.ac | 4 ++++ + src/hb-ft.cc | 12 ++++++++---- + 2 files changed, 12 insertions(+), 4 deletions(-) + +commit 72873cf522a6e3bec1b6508d8d20d3d2ce233cd6 +Author: Sascha Brawer +Date: Tue Sep 13 18:40:07 2016 +0200 + + Call hb_font_set_var_coords_normalized() from FT_Face coords + + src/hb-ft.cc | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +commit 4ebbeb7c50e5c1e934d230ceacf792602c6eb9b9 +Author: Behdad Esfahbod +Date: Sat Sep 10 04:52:34 2016 -0700 + + [GX] Make FeatureVariations actually work + + Yay!!!! + + src/hb-ot-layout-common-private.hh | 19 +++++++------------ + src/hb-ot-layout-gsubgpos-private.hh | 3 ++- + 2 files changed, 9 insertions(+), 13 deletions(-) + +commit 72ada4f0c6998fc2a282efc2a573733e37db8be5 +Author: Behdad Esfahbod +Date: Sat Sep 10 03:57:24 2016 -0700 + + [GX] Hook up feature variations + + Shape-plan caching is not implemented. + + src/hb-coretext.cc | 8 +++- + src/hb-directwrite.cc | 6 ++- + src/hb-fallback-shape.cc | 4 +- + src/hb-font.cc | 6 +-- + src/hb-graphite2.cc | 4 +- + src/hb-ot-map-private.hh | 17 +++++--- + src/hb-ot-map.cc | 25 ++++++++--- + src/hb-ot-shape-private.hh | 6 ++- + src/hb-ot-shape.cc | 9 ++-- + src/hb-shape-plan-private.hh | 9 +++- + src/hb-shape-plan.cc | 102 + +++++++++++++++++++++++++++++++++++++++---- + src/hb-shape-plan.h | 19 ++++++++ + src/hb-shape.cc | 5 ++- + src/hb-uniscribe.cc | 4 +- + 14 files changed, 183 insertions(+), 41 deletions(-) + +commit ec87ba9ba32a374d49dd3e40137f75f4f4232aee +Author: Behdad Esfahbod +Date: Sat Sep 10 03:53:11 2016 -0700 + + [GX] Add hb_ot_layout_feature_with_variations_get_lookups() + + src/hb-ot-layout-common-private.hh | 30 +++++++++++++++++++++++++++++- + src/hb-ot-layout-gsubgpos-private.hh | 12 ++++++++++++ + src/hb-ot-layout.cc | 28 ++++++++++++++++++++++++---- + src/hb-ot-layout.h | 9 +++++++++ + 4 files changed, 74 insertions(+), 5 deletions(-) + +commit 30c42b644eb33551aa0986287182a46f2d8c32ed +Author: Behdad Esfahbod +Date: Sat Sep 10 03:32:39 2016 -0700 + + [GX] Add hb_ot_layout_table_find_feature_variations() + + src/hb-ot-layout-common-private.hh | 18 +++++++++++------- + src/hb-ot-layout-gsubgpos-private.hh | 6 +++--- + src/hb-ot-layout.cc | 15 +++++++++++++++ + src/hb-ot-layout.h | 10 ++++++++++ + 4 files changed, 39 insertions(+), 10 deletions(-) + +commit 7ceadbe981aa50481163bb365f0fe3f994266165 +Author: Behdad Esfahbod +Date: Sat Sep 10 02:44:20 2016 -0700 + + Shuffle code around + + src/hb-ot-map.cc | 81 + ++++++++++++++++++++++++++++---------------------------- + 1 file changed, 41 insertions(+), 40 deletions(-) + +commit bde5e3959c0ffdb92db87668035b01aaee9b2352 +Author: Behdad Esfahbod +Date: Sat Sep 10 02:43:20 2016 -0700 + + Move add_lookups from map to map-builder + + In prep for more changes. + + src/hb-ot-map-private.hh | 15 ++++++++------- + src/hb-ot-map.cc | 29 +++++++++++++++-------------- + 2 files changed, 23 insertions(+), 21 deletions(-) + +commit 26648cebcd14bd26142ccfe5ac8c0be08a213671 +Author: Behdad Esfahbod +Date: Sat Sep 10 02:11:05 2016 -0700 + + [GX] Remove (partial) support for anisotropic variations + + It doesn't always work, not part of FreeType, and we were not going + to expose it in the API anyway. Can always be added later. + + src/hb-font-private.hh | 3 +-- + src/hb-font.cc | 17 ++++++----------- + src/hb-ot-layout-common-private.hh | 9 ++++----- + 3 files changed, 11 insertions(+), 18 deletions(-) + +commit c22176d4bac720b4c9121b3d6629595831f19fb0 +Author: Behdad Esfahbod +Date: Sat Sep 10 01:58:27 2016 -0700 + + [GX] Handle setting var coords to NULL + + src/hb-font.cc | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 59055b5494f802013ca3613a15e565ae1ca0c589 +Author: Behdad Esfahbod +Date: Sat Sep 10 01:24:28 2016 -0700 + + [GX] Implement Feature Variations + + Not hooked up to shaper yet. + + src/hb-ot-layout-common-private.hh | 168 + ++++++++++++++++++++++++++++++++++- + src/hb-ot-layout-gdef-table.hh | 1 - + src/hb-ot-layout-gpos-table.hh | 2 - + src/hb-ot-layout-gsub-table.hh | 2 - + src/hb-ot-layout-gsubgpos-private.hh | 15 +++- + 5 files changed, 180 insertions(+), 8 deletions(-) + +commit 85ec4944346a1ac111217698e1424669a9732280 +Author: Behdad Esfahbod +Date: Sat Sep 10 00:25:16 2016 -0700 + + [GX] Fix another x/y thinko + + Thanks Werner! + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cf3de4d8f79fc6e8413957cdef034e975343ce30 +Author: Behdad Esfahbod +Date: Sat Sep 10 00:22:24 2016 -0700 + + [GX] Rename VarStore to VariationStore + + src/hb-ot-layout-common-private.hh | 12 ++++++------ + src/hb-ot-layout-gdef-table.hh | 14 +++++++------- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 4 files changed, 15 insertions(+), 15 deletions(-) + +commit 1f6ed356e0a849b61ce98b6a2f38d04d98c2191e +Author: Behdad Esfahbod +Date: Sat Sep 10 00:01:10 2016 -0700 + + [GX] Fix build with some compilers + + Eg. + https://ci.appveyor.com/project/behdad/harfbuzz/build/1.0.48/job/o9mnd33kcdeeg30r + + hb-open-type-private.hh:103:29: error: static data member + 'OT::Device::::::static_size' + in unnamed class [-fpermissive] + + src/hb-ot-layout-common-private.hh | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + +commit 250bcd6fb691d6f15fa9ca71b475ce419d0b5e37 +Author: Behdad Esfahbod +Date: Fri Sep 9 23:12:14 2016 -0700 + + [GX] Skip tail zero entries when setting variation coordinates + + src/hb-font.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 1124d2ece55e323ed934357b30e68df75829cfaa +Author: Behdad Esfahbod +Date: Fri Sep 9 22:48:27 2016 -0700 + + [GX] Fix thinko + + src/hb-ot-layout-common-private.hh | 1 - + src/hb-ot-layout-gpos-table.hh | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +commit ad69e8f07c6e3e47fe7e7103c2ff7c053d272b1a +Author: Behdad Esfahbod +Date: Fri Sep 9 22:23:34 2016 -0700 + + [GX] Add new API hb_font_set_var_coords_normalized() + + Will probably change. + + src/hb-font.cc | 23 +++++++++++++++++++++++ + src/hb-font.h | 5 +++++ + 2 files changed, 28 insertions(+) + +commit 151d93de8a595924a8dcb00fcba648b4b3df0bf5 +Author: Behdad Esfahbod +Date: Fri Sep 9 17:03:11 2016 -0700 + + [GX] Hook up GPOS to Variation Store stored in GDEF + + Untested. + + src/hb-ot-layout-common-private.hh | 22 ++++++++++---------- + src/hb-ot-layout-gdef-table.hh | 27 +++++++++++++++--------- + src/hb-ot-layout-gpos-table.hh | 40 + ++++++++++++++++-------------------- + src/hb-ot-layout-gsubgpos-private.hh | 2 ++ + 4 files changed, 48 insertions(+), 43 deletions(-) + +commit dcfd309533ac83e44369dea7204d668623b08207 +Author: Behdad Esfahbod +Date: Fri Sep 9 16:51:07 2016 -0700 + + [GX] Change GDEF API to return varStore + + src/hb-ot-layout-gdef-table.hh | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 49cb87850c2692be45b201168c8ce10b263168cc +Author: Behdad Esfahbod +Date: Fri Sep 9 16:27:03 2016 -0700 + + [GX] Pass apply-context down to get_anchor() + + Needed to access GDEF for varStore. + + src/hb-ot-layout-gpos-table.hh | 57 + ++++++++++++++++++++++-------------------- + 1 file changed, 30 insertions(+), 27 deletions(-) + +commit f0c3fd8c9ab402be923fe0845fb51d99841829b6 +Author: Behdad Esfahbod +Date: Fri Sep 9 16:22:45 2016 -0700 + + [GX] Add varStore member to GDEF + + Still not hooked up from GPOS. + + src/hb-ot-layout-gdef-table.hh | 17 ++++++++++++++--- + 1 file changed, 14 insertions(+), 3 deletions(-) + +commit 5c971f8dbc823dbad4a2869cf9e835095ab6ddb2 +Author: Behdad Esfahbod +Date: Fri Sep 9 16:05:17 2016 -0700 + + Minor change to GDEF, in prep for new version + + src/hb-ot-layout-gdef-table.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit dc9f2297998b4cbc4f9e4c2591fc2bb5f92986d1 +Author: Behdad Esfahbod +Date: Fri Sep 9 15:40:15 2016 -0700 + + [GX] Port variation stuff to Variation Store design + + Not hooked up to GDEF yet. + + src/hb-ot-layout-common-private.hh | 294 + +++++++++++++++++++++++-------------- + src/hb-ot-layout-gpos-table.hh | 2 +- + 2 files changed, 184 insertions(+), 112 deletions(-) + +commit a7edeb6f02cbc4418285fdfc58ef8a8740a380e9 +Author: Behdad Esfahbod +Date: Fri Sep 9 15:39:52 2016 -0700 + + Make OffsetArrayOf take OffsetType template argument + + src/hb-open-type-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8dddc231cf9d934eb93a39f2657717cbdad43a64 +Author: Behdad Esfahbod +Date: Fri Sep 9 13:17:33 2016 -0700 + + [GX] Revert "[GX] Add VariationAlternates, to allow conditional + lookups in GSUB/GPOS" + + This reverts commit 2859f1c7174d6f7ae5dcf0db5411bc0182b21594. + We are going in a different direction. + + src/hb-open-type-private.hh | 1 - + src/hb-ot-layout-common-private.hh | 99 + +------------------------------------- + 2 files changed, 2 insertions(+), 98 deletions(-) + +commit bb4d2e6ed562c248fff15313a013d49e38a18789 +Author: Behdad Esfahbod +Date: Fri Sep 9 13:08:52 2016 -0700 + + [GX] Free GX coordinates + + src/hb-font.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit baa329c6a12c7ffd56feed32351d9405b7d1651b +Author: Behdad Esfahbod +Date: Fri Mar 18 15:52:24 2016 -0700 + + [GX] Add compact VariationDevice implementation + + Add compact format that uses signed bytes instead of shorts. + + src/hb-open-type-private.hh | 1 + + src/hb-ot-layout-common-private.hh | 35 + ++++++++++++++++++++++++----------- + 2 files changed, 25 insertions(+), 11 deletions(-) + +commit 71b06fd392680b6fcfece60d8a83ba6c56eada09 +Author: Behdad Esfahbod +Date: Sat Mar 12 23:49:09 2016 -0800 + + [GX] Add VariationAlternates, to allow conditional lookups in + GSUB/GPOS + + Not hooked up to runtime yet. + + src/hb-open-type-private.hh | 1 + + src/hb-ot-layout-common-private.hh | 99 + +++++++++++++++++++++++++++++++++++++- + 2 files changed, 98 insertions(+), 2 deletions(-) + +commit 976eeb8e025e2b7601a91e661d6e9a88bf8afbd2 +Author: Behdad Esfahbod +Date: Sat Mar 12 23:28:12 2016 -0800 + + [GX] Minor + + src/hb-ot-layout-common-private.hh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit ed8a9067ca0fe51ac4b80dab55db596763df72bb +Author: Behdad Esfahbod +Date: Wed Mar 2 12:54:35 2016 -0800 + + [GX] Minor + + src/hb-ot-layout-common-private.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 15c5ee67473a17859a919104c5e6fed1f813aa65 +Author: Behdad Esfahbod +Date: Wed Mar 2 12:41:49 2016 +0900 + + [GX] Minor rename + + src/hb-ot-layout-common-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 4c535a822f16b23a4e41e14d1b17fe179b83eabc +Author: Behdad Esfahbod +Date: Wed Mar 2 12:21:36 2016 +0900 + + [GX] Hookup VariationDevice to Device table implementation + + src/hb-ot-layout-common-private.hh | 65 + +++++++++++++++++++++++++++++++++++++- + 1 file changed, 64 insertions(+), 1 deletion(-) + +commit a0c2366075fcb894212b9bf137e4dd34bb65537c +Author: Behdad Esfahbod +Date: Tue Mar 1 19:42:24 2016 +0900 + + [GX] Break out early if factor is zero + + Also disable sanity-checking of variation records. + + src/hb-ot-layout-common-private.hh | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit ca286703164caf1eda665f6f27ef83bf04e2f8ba +Author: Behdad Esfahbod +Date: Tue Mar 1 19:29:36 2016 +0900 + + [GX] Towards anisotropic interpolation + + Also hookup to ValueRecord and Anchors. + + src/hb-font-private.hh | 5 +++-- + src/hb-font.cc | 9 +++++++-- + src/hb-ot-layout-common-private.hh | 4 ++-- + src/hb-ot-layout-gpos-table.hh | 20 ++++++++++---------- + 4 files changed, 22 insertions(+), 16 deletions(-) + +commit 6d9d3c55bbd4209ba339ccd2b925bb4a6c97f622 +Author: Behdad Esfahbod +Date: Tue Mar 1 19:12:08 2016 +0900 + + [GX] Add data types for encoding numerical variations + + src/hb-font-private.hh | 10 ++++ + src/hb-font.cc | 3 + + src/hb-ot-layout-common-private.hh | 113 + +++++++++++++++++++++++++++++++++++++ + 3 files changed, 126 insertions(+) + +commit b843c6d8b66c2833cd35407ee494546465e6d775 +Author: Behdad Esfahbod +Date: Mon Dec 5 13:42:28 2016 -0800 + + 1.3.4 + + NEWS | 8 ++++++++ + configure.ac | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit 8c842e4a44908cce0f416481c73dc0866a0a9c95 +Author: Behdad Esfahbod +Date: Sun Dec 4 20:28:38 2016 -0800 + + [hb-fuzzer] Get glyph extents for output glyphs + + To exercise glyph-extents codepaths (glyf / CBLC+CBDT). + + test/fuzzing/hb-fuzzer.cc | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit 9f6144cdb9dd2bc8cd147306e678d76ae82663d8 +Author: Behdad Esfahbod +Date: Sun Dec 4 19:55:17 2016 -0800 + + [CBDT] Add test for fetching glyph extents + + test/shaping/Makefile.am | 1 + + .../sha1sum/ee39587d13b2afa5499cc79e45780aa79293bbd4.ttf | Bin 0 -> + 3724 bytes + test/shaping/tests/color-fonts.tests | 1 + + 3 files changed, 2 insertions(+) + +commit e4bfccfb2a0f425ff69b0a50ca8a4731c4001069 +Author: Behdad Esfahbod +Date: Sun Dec 4 19:43:33 2016 -0800 + + [CBDT] Minor + + src/hb-ot-cbdt-table.hh | 21 ++++++++++++++------- + src/hb-ot-font.cc | 38 ++++++++++++++++++++------------------ + 2 files changed, 34 insertions(+), 25 deletions(-) + +commit b7068af423dba30fd831041aabf4b805d26fe349 +Author: Behdad Esfahbod +Date: Sun Dec 4 19:36:30 2016 -0800 + + [CBDT] Fix thinko! + + src/hb-ot-cbdt-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a141d1da9bb0f91521a9a7749f9533c75cfe6a2f +Author: Behdad Esfahbod +Date: Sun Dec 4 19:26:54 2016 -0800 + + [CBDT] Implement IndexSubtableFormat3 + + src/hb-ot-cbdt-table.hh | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit 9eda74c92c9024ffb8ec6e9344c99d51dd763f0c +Author: Behdad Esfahbod +Date: Sun Dec 4 19:12:52 2016 -0800 + + [cbdt] Move some more code around + + src/hb-ot-cbdt-table.hh | 61 + ++++++++++++++++++++++++++++++++++--------------- + src/hb-ot-font.cc | 18 ++++++--------- + 2 files changed, 49 insertions(+), 30 deletions(-) + +commit 654f9ab0d8d5ee032b5da763e34e7b1f454416b9 +Author: Behdad Esfahbod +Date: Sun Dec 4 18:56:24 2016 -0800 + + [cbdt] Fix sign bug + + Was introduced in d495fc5e38038f4cfb20425b1109324fa70bf2f9 + + src/hb-ot-cbdt-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c27d6fcf8db6f02e075dd1868ae67d878fff39d4 +Author: Behdad Esfahbod +Date: Fri Dec 2 22:43:05 2016 -0800 + + [cbdt] Last of sanitization fixes + + Should be all good now.. + + src/hb-ot-font.cc | 23 ++++++++++++++++------- + 1 file changed, 16 insertions(+), 7 deletions(-) + +commit d495fc5e38038f4cfb20425b1109324fa70bf2f9 +Author: Behdad Esfahbod +Date: Fri Dec 2 21:36:42 2016 -0800 + + [cbdt] Clean up some more + + Almost there.. + + src/hb-ot-cbdt-table.hh | 134 + +++++++++++++++++++++++++++++++++++++++++++----- + src/hb-ot-font.cc | 38 ++++---------- + 2 files changed, 131 insertions(+), 41 deletions(-) + +commit ce09e90e1502d5f944bafd64e51c29e365a963ae +Author: Behdad Esfahbod +Date: Fri Dec 2 20:12:57 2016 -0800 + + [cbdt] More sanitize work + + src/hb-ot-cbdt-table.hh | 65 + +++++++++++++++++++++++++++++-------------------- + src/hb-ot-font.cc | 46 ++++++++++++++++++---------------- + 2 files changed, 63 insertions(+), 48 deletions(-) + +commit 70eb2ff682344688635cebb716fee0b73557c925 +Author: Behdad Esfahbod +Date: Fri Dec 2 19:51:23 2016 -0800 + + Check for offset overflows during sanitize + + src/hb-open-type-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 4b58c9e326acde09d389c699014e4e7f6259f50a +Author: Behdad Esfahbod +Date: Fri Dec 2 19:25:54 2016 -0800 + + [cbdt] Start fixing sanitization (or lack thereof) + + src/hb-ot-cbdt-table.hh | 77 + ++++++++++++++++++++++++++++++++++++------------- + src/hb-ot-font.cc | 22 +++++++------- + 2 files changed, 68 insertions(+), 31 deletions(-) + +commit b92ba7bafcd9545a401fb871eb342e6284032c47 +Author: Behdad Esfahbod +Date: Fri Dec 2 15:21:43 2016 -0800 + + [CBDT] Use CHAR instead of int8_t + + src/hb-open-type-private.hh | 1 + + src/hb-ot-cbdt-table.hh | 28 ++++++++++++++-------------- + 2 files changed, 15 insertions(+), 14 deletions(-) + +commit efca7bf97f9967af4fa399a6665b723af643cecd +Author: Behdad Esfahbod +Date: Fri Dec 2 15:11:37 2016 -0800 + + Rename 'ebdt' to 'cbdt' since we only support the PNG format + + src/Makefile.sources | 2 +- + src/{hb-ot-ebdt-table.hh => hb-ot-cbdt-table.hh} | 6 +++--- + src/hb-ot-font.cc | 12 ++++++------ + 3 files changed, 10 insertions(+), 10 deletions(-) + +commit 831852594b777f250efedb76d19bee1cfc8eeaa4 +Author: Seigo Nonaka +Date: Fri Dec 2 15:03:50 2016 -0800 + + Introduce get_extent support for color bitmap font. (#351) + + hb_font_get_glyph_extents now works for color bitmap fonts. + Currently only font having index format 1 and image format 17 + is supported. + + src/Makefile.sources | 1 + + src/hb-ot-ebdt-table.hh | 193 + ++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-font.cc | 96 ++++++++++++++++++++++++ + 3 files changed, 290 insertions(+) + +commit 261837e7202ec584f653f379851e1c6457396b07 +Author: Ebrahim Byagowi +Date: Fri Oct 28 21:49:11 2016 +0330 + + Fix "nmake install" when ADDITIONAL_LIB_DIR is provided and test it + on CI (#356) + + appveyor.yml | 1 + + win32/detectenv-msvc.mak | 4 ++-- + win32/generate-msvc.mak | 2 +- + 3 files changed, 4 insertions(+), 3 deletions(-) + +commit d163cd956246449e3e48b54ce6eb5cdb14e3a0a6 +Author: Behdad Esfahbod +Date: Wed Oct 26 18:27:48 2016 +0200 + + [tests] Add tests for vertical origin with ft and ot font-funcs + + .../sha1sum/f9b1dd4dcb515e757789a22cb4241107746fd3d0.ttf | Bin 0 -> + 1004 bytes + test/shaping/tests/vertical.tests | 2 ++ + 2 files changed, 2 insertions(+) + +commit 2b117720c03869c7714304fd7fbfb2b01199bb3a +Author: Behdad Esfahbod +Date: Wed Oct 26 18:12:50 2016 +0200 + + Use horizontal ascent as fallback vertical origin + + src/hb-font-private.hh | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit a7b32f2057098012b3ab43121397766ae45b3559 +Author: Behdad Esfahbod +Date: Wed Oct 26 18:08:41 2016 +0200 + + Move code around + + src/hb-font-private.hh | 38 +++++++++++++++++++++++--------------- + 1 file changed, 23 insertions(+), 15 deletions(-) + +commit 63635c763dd9393df236f49d491510cca18a1ccc +Author: Behdad Esfahbod +Date: Wed Oct 26 17:54:04 2016 +0200 + + [hb-ot-font] Use ascent+descent as fallback vertical advance + + src/hb-ot-font.cc | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 9ee23c49a7a7b2479ae0d36a64720e92eb8a36e7 +Author: Behdad Esfahbod +Date: Wed Oct 26 17:44:16 2016 +0200 + + Fix vertical glyph origin with hb-ot-font + + src/hb-font-private.hh | 51 + ++++++++++++++++++++++++++++---------------------- + 1 file changed, 29 insertions(+), 22 deletions(-) + +commit b3b0816d5fc00298621f738cf400de60f8a42c5d +Author: Behdad Esfahbod +Date: Wed Oct 26 17:19:07 2016 +0200 + + Fix vertical font metrics + + Ouch! + + src/hb-font-private.hh | 4 ++-- + src/hb-ot-font.cc | 8 ++++++-- + 2 files changed, 8 insertions(+), 4 deletions(-) + +commit 966ac7ecd3d0128a3adacdd26aacef2bd8afa4d4 +Author: Behdad Esfahbod +Date: Wed Oct 26 16:17:15 2016 +0200 + + 1.3.3 + + NEWS | 24 ++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 25 insertions(+), 1 deletion(-) + +commit 118164293cc7eb18ba03896f602aff816400134b +Author: Behdad Esfahbod +Date: Wed Oct 26 16:04:30 2016 +0200 + + Fix "make distcheck" + + configure.ac | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit b6c765871b752c9436ec993e47b48f9d4fecaed5 +Author: Behdad Esfahbod +Date: Wed Oct 26 10:33:33 2016 +0200 + + [ci] Fix appveyor.yml syntax error + + appveyor.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0e79ebb3ca9b7b6d238a0007e5ca022845ee9afc +Author: Behdad Esfahbod +Date: Sun Oct 23 14:39:43 2016 +0200 + + [gobject] Update for new MATH structs + + src/hb-gobject-structs.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 8c854dc023b1f9e081a3bbd16416b88a4671c267 +Merge: bb9805f5 c3fa5d0e +Author: Khaled Hosny +Date: Tue Oct 25 00:31:36 2016 +0300 + + Merge pull request #352 from fred-wang/makefile-am + + Remove inexistent file ttx file from test/api/Makefile.am + +commit c3fa5d0e03b57be131c66ea8720806c946d0e10f +Author: Frédéric Wang +Date: Mon Oct 24 21:42:04 2016 +0200 + + Remove inexistent file ttx file from test/api/Makefile.am + + test/api/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +commit bb9805f5419f18c7f5cab32d660fd4109c30f7cc +Merge: 702d9f52 755a0c20 +Author: Ebrahim Byagowi +Date: Sat Oct 22 12:23:05 2016 +0330 + + Merge pull request #349 from ebraminio/mergebackvcpkgpatches + + [ci] Enable hb-freetype on Windows build tests + +commit 755a0c20798e3c3e6bb933a28e38f9667fccdadc +Author: Ebrahim Byagowi +Date: Fri Oct 21 11:48:58 2016 +0330 + + [ci] Enable freetype on msvc using vcpkg + + appveyor.yml | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +commit 4631d84c2bb51395efe3156f9c9f1a6b0e277947 +Author: Ebrahim Byagowi +Date: Tue Oct 18 14:30:00 2016 +0330 + + Merge back @vlj's local patches of vcpkg + + win32/config-msvc.mak | 7 +++++++ + win32/detectenv-msvc.mak | 3 +++ + 2 files changed, 10 insertions(+) + +commit 702d9f522d1ac4797700f0ea056f69169b8d1a78 +Merge: 331c46c7 d8e2eb9e +Author: Ebrahim Byagowi +Date: Fri Oct 14 13:54:55 2016 +0330 + + Merge pull request #340 from ebraminio/nouniscribe + + Make Uniscribe optional on nmake win32 builds + +commit d8e2eb9ee0f47af7e90056d8db5949d10a88786a +Author: Ebrahim Byagowi +Date: Sun Oct 9 09:06:05 2016 +0330 + + Make Uniscribe optional on nmake win32 builds + + Most of harfbuzz clients don't need Uniscribe and DirectWrite support + at all + as harfbuzz is a replacement for Uniscribe so Chromium and Firefox + are using + harfbuzz without them on Windows. + + This removal also helps win32 nmake clients to have reduced binary + size and + libs count. + + appveyor.yml | 2 +- + win32/README.txt | 13 +++++++------ + win32/config-msvc.mak | 18 +++++++++++++----- + win32/config.h.win32.in | 2 +- + win32/info-msvc.mak | 11 +++++++++-- + 5 files changed, 31 insertions(+), 15 deletions(-) + +commit 331c46c79b4d18cb4948be12c78ebb71a143e7ac +Author: Behdad Esfahbod +Date: Tue Oct 11 13:45:22 2016 -0700 + + Fix configure on iOS + + Fixes https://github.com/behdad/harfbuzz/issues/342 + + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit f6e194e77a2c34cd118b47c0d73a22afde85dfda +Merge: 7201fdd0 bef240b3 +Author: Ebrahim Byagowi +Date: Tue Oct 11 17:23:41 2016 +0330 + + Merge pull request #344 from ebraminio/fixmacci + + [ci] Whitelist more symbols and unbreak mac CI + +commit bef240b36ee9086b0d92e351e4c5118c0bbb5df6 +Author: Ebrahim Byagowi +Date: Mon Oct 10 17:27:52 2016 +0330 + + [ci] Whitelist more symbols and unbreak mac CI + + Thanks to @khaledhosny, actually this is his work :) + + src/check-symbols.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7201fdd0a8e26d49b13e289b53de375d5b1c9fcb +Author: Behdad Esfahbod +Date: Tue Oct 4 14:53:17 2016 -0700 + + LFS (large file system?) support in hb-*shap*, hb-view + + Fixes https://github.com/behdad/harfbuzz/issues/336 + + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +commit 34fc4a2cfa61089b7ec2d9510d99cdc4c13bceb4 +Author: Behdad Esfahbod +Date: Wed Sep 28 19:17:27 2016 +0200 + + Fix dist + + test/api/Makefile.am | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit d1c62370a0c2bdb365a1468dc8d782b9a7245946 +Author: Behdad Esfahbod +Date: Wed Sep 28 19:11:22 2016 +0200 + + Aim math API for 1.3.3 instead of 1.4.0 + + docs/harfbuzz-docs.xml | 6 +++--- + docs/harfbuzz-sections.txt | 12 ++++++------ + src/hb-ot-layout.cc | 18 +++++++++--------- + src/hb-ot-math.h | 10 +++++----- + 4 files changed, 23 insertions(+), 23 deletions(-) + +commit 7adbc5dd62ca03a65d1886e0f32e7026964dc5e5 +Author: Khaled Hosny +Date: Fri Sep 30 04:01:24 2016 -0700 + + Fix building math docs (#335) + + src/hb-ot-layout.cc | 9 --------- + 1 file changed, 9 deletions(-) + +commit fd7a245d3525905ffbce57472b52900fcb0e330b +Author: Behdad Esfahbod +Date: Tue Sep 27 17:56:35 2016 +0200 + + Require glib >= 2.38.0 for G_TEST_DIST + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6d3e6abf0c6ad55dabae96c76b4da9ab14bf16ef +Merge: f73a87d9 c3e21a66 +Author: Behdad Esfahbod +Date: Tue Sep 27 17:15:59 2016 +0200 + + Merge branch 'math' + + Supercedes https://github.com/behdad/harfbuzz/pull/326 + Fixes https://github.com/behdad/harfbuzz/pull/331 + +commit c3e21a6620c35500afa350d11620f69802920df3 +Author: Behdad Esfahbod +Date: Tue Sep 27 16:51:38 2016 +0200 + + [MATH] Fix more docs + + src/hb-ot-layout.cc | 18 +++++++++--------- + src/hb-ot-math.h | 25 +++++++++++++++++++++++++ + 2 files changed, 34 insertions(+), 9 deletions(-) + +commit 46cc4a3a2a529c80677babe38ca1542f9c773ac0 +Author: Behdad Esfahbod +Date: Tue Sep 27 16:44:22 2016 +0200 + + [MATH] Rename hb_math_*_t types to hb_ot_math_*_t + + With this, I believe MATH table API is not ready to be merged. + + docs/harfbuzz-sections.txt | 6 +++--- + src/hb-ot-layout-math-table.hh | 12 ++++++------ + src/hb-ot-layout.cc | 8 ++++---- + src/hb-ot-math.h | 16 ++++++++-------- + test/api/test-ot-math.c | 4 ++-- + 5 files changed, 23 insertions(+), 23 deletions(-) + +commit db5ebcf10f8595d1f4a9df27befd6cb5e76ca94d +Author: Behdad Esfahbod +Date: Tue Sep 27 16:42:25 2016 +0200 + + Update docs + + docs/harfbuzz-docs.xml | 9 +++++++++ + docs/harfbuzz-sections.txt | 30 ++++++++++++++++++++++++++++-- + 2 files changed, 37 insertions(+), 2 deletions(-) + +commit 0762b35474c47171e5661904e93851eb73a44e5c +Author: Frédéric Wang +Date: Tue Sep 27 15:28:35 2016 +0200 + + Document API for MathVariants (#330) + + src/hb-ot-layout.cc | 56 + +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 56 insertions(+) + +commit 8d622f1114d6a0eca1786b94c7fc1a0bcd87f74b +Author: Frédéric Wang +Date: Tue Sep 27 13:53:34 2016 +0200 + + Add tests for get_mathvariant (#329) + + test/api/test-ot-math.c | 160 + ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 160 insertions(+) + +commit f73a87d9a8c76a181794b74b527ea268048f78e3 +Author: Behdad Esfahbod +Date: Tue Sep 27 13:50:54 2016 +0200 + + 1.3.2 + + NEWS | 7 +++++++ + configure.ac | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) + +commit 485e4873fb7cacfa9d853272c2275bbc5826023e +Author: Frédéric Wang +Date: Tue Sep 27 13:18:00 2016 +0200 + + Add tests for hb_ot_math_get_glyph_variants (#328) + + test/api/test-ot-math.c | 126 + ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 126 insertions(+) + +commit f16bf6c2dacf5b9c82b2d1ffacc092cc396189a7 +Author: Phil Krylov +Date: Tue Sep 27 12:38:49 2016 +0200 + + Allow building with graphite2 without pkg-config (#318) + + configure.ac | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit a5629a2ed9c2e69f2b4ebb74d85fbe0b5ba2be67 +Author: Behdad Esfahbod +Date: Tue Sep 27 11:30:44 2016 +0200 + + [MATH] Simplify test + + test/api/test-ot-math.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit edcfa789bf92c18f5badad31c0ad04a6a77d7226 +Author: Frédéric Wang +Date: Tue Sep 27 11:02:08 2016 +0200 + + test-ot-math: Use different scales for vertical + and horizontal directions and add test for + hb_ot_math_get_min_connector_overlap. (#327) + + test/api/test-ot-math.c | 81 + ++++++++++++++++++++++++++++++------------------- + 1 file changed, 49 insertions(+), 32 deletions(-) + +commit bc19f7fe20e89823dba07a46c3d48c7406b781b6 +Author: Behdad Esfahbod +Date: Tue Sep 27 10:58:08 2016 +0200 + + [MATH] Add HB_OT_MATH_SCRIPT + + src/hb-ot-math.h | 3 +++ + 1 file changed, 3 insertions(+) + +commit cdc9eef7da934ae71578694f29665e439686c3bd +Author: Behdad Esfahbod +Date: Mon Sep 26 22:18:41 2016 +0200 + + [MATH] Enable tests for glyph-assembly italics-correction + + test/api/test-ot-math.c | 49 + ++++++++++++++++++++++++++++++------------------- + 1 file changed, 30 insertions(+), 19 deletions(-) + +commit 86106c7528d9bff8de6bc3e1487be780c31ea4fd +Author: Behdad Esfahbod +Date: Mon Sep 26 22:12:48 2016 +0200 + + [MATH] Rename all API to hb_ot_math_* + + src/hb-ot-layout-private.hh | 10 -- + src/hb-ot-layout.cc | 69 ++++---- + src/hb-ot-math.h | 56 +++--- + test/api/Makefile.am | 6 +- + test/api/test-ot-layout-math.c | 382 + ----------------------------------------- + test/api/test-ot-math.c | 381 + ++++++++++++++++++++++++++++++++++++++++ + 6 files changed, 447 insertions(+), 457 deletions(-) + +commit 1ba767cd4e3606beb9dc59806b83b1e61f5958d4 +Author: Behdad Esfahbod +Date: Mon Sep 26 21:57:14 2016 +0200 + + [MATH] Move API from hb-ot-layout.h to hb-ot-math.h + + src/hb-ot-layout.h | 52 + -------------------------------------------------- + src/hb-ot-math.h | 56 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot.h | 1 + + 3 files changed, 57 insertions(+), 52 deletions(-) + +commit 97b72da6006d8d6355ee90d514f627e6604a4936 +Author: Behdad Esfahbod +Date: Mon Sep 26 21:53:25 2016 +0200 + + Whitespace + + src/hb-ot-layout-math-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 559eb564472575ae4d87a241314b8a3ca24418c4 +Author: Behdad Esfahbod +Date: Mon Sep 26 21:46:05 2016 +0200 + + [MATH] Wire up get_glyph_assembly() + + src/hb-ot-layout-math-table.hh | 64 + ++++++++++++++++++++++++++++++++++++++---- + src/hb-ot-layout.cc | 26 +++++++++-------- + src/hb-ot-layout.h | 14 ++++----- + 3 files changed, 81 insertions(+), 23 deletions(-) + +commit 353f455af7ccbc1af8338dcb0c8ab87aef866c79 +Author: Behdad Esfahbod +Date: Mon Sep 26 21:22:48 2016 +0200 + + [MATH] Wire up get_glyph_variants() + + src/hb-font-private.hh | 11 ++- + src/hb-ot-layout-math-table.hh | 178 + +++++++++++++++++++---------------------- + src/hb-ot-layout.cc | 7 +- + src/hb-ot-layout.h | 2 +- + 4 files changed, 95 insertions(+), 103 deletions(-) + +commit 7fe0e28c22331a353d396f8bc1e3a60f1580a96d +Author: Behdad Esfahbod +Date: Mon Sep 26 17:51:47 2016 +0100 + + [MATH] Start fleshing out glyph variant API + + src/hb-font-private.hh | 4 +++ + src/hb-ot-layout-math-table.hh | 10 ++---- + src/hb-ot-layout.cc | 73 + +++++++++++++++--------------------------- + src/hb-ot-layout.h | 20 ++++++++++++ + src/hb-ot-math.h | 18 +++++++++++ + 5 files changed, 71 insertions(+), 54 deletions(-) + +commit 1f3327f21045df8a050a21a949b44b9ce186ceaa +Author: Behdad Esfahbod +Date: Mon Sep 26 16:10:08 2016 +0100 + + [MATH] Clean up math variants + + src/hb-ot-layout-math-table.hh | 35 +++++++++-------------------------- + 1 file changed, 9 insertions(+), 26 deletions(-) + +commit 51da7a1cd672aada84bdbb3a2a8dd77ab1134249 +Author: Frédéric Wang +Date: Thu Aug 25 11:17:50 2016 +0200 + + MATH table: Add API to access math variants. + + src/hb-ot-layout-math-table.hh | 253 + +++++++++++++++++++++++++++++++- + src/hb-ot-layout-private.hh | 10 ++ + src/hb-ot-layout.cc | 54 +++++++ + test/api/fonts/MathTestFontPartial4.otf | Bin 0 -> 14360 bytes + test/api/test-ot-layout-math.c | 51 +++++++ + 5 files changed, 364 insertions(+), 4 deletions(-) + +commit 722e620f20fa2225cf874f4aeb115a064142fcf1 +Author: Frédéric Wang +Date: Mon Sep 26 11:51:36 2016 +0200 + + Use G_TEST_DIST to build the path of math test fonts + + test/api/Makefile.am | 2 ++ + test/api/test-ot-layout-math.c | 8 ++++++-- + 2 files changed, 8 insertions(+), 2 deletions(-) + +commit 8d58e3433e242bd9dd18aa08f55ab0a406583fb0 +Author: Behdad Esfahbod +Date: Mon Sep 26 13:39:58 2016 +0100 + + [MATH] Fix get_kerning() with negative y-scale + + src/hb-ot-layout-math-table.hh | 36 +++++++++++++++++++++--------------- + 1 file changed, 21 insertions(+), 15 deletions(-) + +commit 94f5df5626b223ad92d0c167f560c1f2e2f19042 +Author: Behdad Esfahbod +Date: Mon Sep 26 13:31:47 2016 +0100 + + [MATH] Clean up get_kerning() + + src/hb-ot-layout-math-table.hh | 29 +++++++++++++++++------------ + src/hb-ot-layout.cc | 5 +---- + 2 files changed, 18 insertions(+), 16 deletions(-) + +commit 17ff30e9afde79e41c17786223293e867b49ebba +Author: Behdad Esfahbod +Date: Mon Sep 26 12:18:32 2016 +0100 + + [MATH] Clean up get_top_accent_attachment() + + Note, the function now returns "half of horizontal advance width" + if top accent attachment for glyph is not explicitly defined. + This is what the spec requires. Updated tests. + + src/hb-ot-layout-math-table.hh | 31 +++++++++++-------------------- + src/hb-ot-layout.cc | 7 +------ + test/api/test-ot-layout-math.c | 8 ++++---- + 3 files changed, 16 insertions(+), 30 deletions(-) + +commit 8bcf517fe59608d2247a8974445b3ff0f4b4b4ac +Author: Behdad Esfahbod +Date: Mon Sep 26 12:12:41 2016 +0100 + + [MATH] Clean up get_italics_correction() + + src/hb-ot-layout-math-table.hh | 16 ++++++++-------- + src/hb-ot-layout.cc | 17 ++++++----------- + src/hb-ot-layout.h | 4 ++-- + test/api/test-ot-layout-math.c | 18 +++++++++--------- + 4 files changed, 25 insertions(+), 30 deletions(-) + +commit 06003f71ba0d0327fb1a17098a9d7faa8fb336f0 +Author: Behdad Esfahbod +Date: Mon Sep 26 12:07:29 2016 +0100 + + [MATH] Clean up a bit more + + src/hb-ot-layout-math-table.hh | 12 +-------- + src/hb-ot-layout.cc | 57 + ++++++++++++++++-------------------------- + 2 files changed, 22 insertions(+), 47 deletions(-) + +commit 54c0cc38fba24fa4370231408ba121589b190a28 +Author: Behdad Esfahbod +Date: Mon Sep 26 11:56:40 2016 +0100 + + [MATH] Clean up get_math_constant implementation + + src/hb-ot-layout-math-table.hh | 10 +++++----- + src/hb-ot-layout.cc | 5 ++--- + 2 files changed, 7 insertions(+), 8 deletions(-) + +commit 8a8cfad9a0834fe278a747c1d755144bd78f564b +Author: Behdad Esfahbod +Date: Mon Sep 26 11:47:05 2016 +0100 + + [MATH] Cleanup previous commit a bit + + src/hb-ot-layout-math-table.hh | 186 + ++++++++++++++++++++--------------------- + src/hb-ot-layout.cc | 30 +++---- + src/hb-ot-layout.h | 14 ++-- + 3 files changed, 113 insertions(+), 117 deletions(-) + +commit d7182d129612c619b9026ee9b15f2dcfada132db +Author: Frédéric Wang +Date: Thu Aug 25 11:15:31 2016 +0200 + + MATH Table: Add API to access glyph info. + + src/hb-ot-layout-math-table.hh | 271 + +++++++++++++++++++++++++++++++- + src/hb-ot-layout.cc | 114 ++++++++++++++ + src/hb-ot-layout.h | 18 +++ + src/hb-ot-math.h | 7 + + test/api/fonts/MathTestFontPartial1.otf | Bin 0 -> 14348 bytes + test/api/fonts/MathTestFontPartial2.otf | Bin 0 -> 14356 bytes + test/api/fonts/MathTestFontPartial3.otf | Bin 0 -> 14380 bytes + test/api/test-ot-layout-math.c | 155 ++++++++++++++++++ + 8 files changed, 563 insertions(+), 2 deletions(-) + +commit 6fd2fe418dc838743f0d4a8a2222cdcaf587500c +Author: Behdad Esfahbod +Date: Mon Sep 26 11:24:39 2016 +0100 + + [MATH] Fixup math constants commit a bit more + + src/hb-ot-layout-math-table.hh | 24 +++++++++++------------- + 1 file changed, 11 insertions(+), 13 deletions(-) + +commit 1a381153a2e6a15bded1f8e31f6b0e0cadb078af +Author: Behdad Esfahbod +Date: Mon Sep 26 11:15:59 2016 +0100 + + [MATH] Fixups for math constants commit + + src/hb-ot-layout-math-table.hh | 19 +++++++++---------- + 1 file changed, 9 insertions(+), 10 deletions(-) + +commit 319ff59161e6b027391f8b9fdce0db6dd44cc20d +Author: Frédéric Wang +Date: Thu Aug 25 11:06:41 2016 +0200 + + MATH Table: Add API to access math contants. + + src/Makefile.sources | 1 + + src/hb-ot-layout-math-table.hh | 146 + +++++++++++++++++++++++++++++++++++- + src/hb-ot-layout.cc | 25 ++++++ + src/hb-ot-layout.h | 5 ++ + src/hb-ot-math.h | 100 ++++++++++++++++++++++++ + test/api/fonts/MathTestFontFull.otf | Bin 0 -> 25412 bytes + test/api/test-ot-layout-math.c | 72 ++++++++++++++++++ + 7 files changed, 345 insertions(+), 4 deletions(-) + +commit 4d3892e9b05a4df67b2f5cfd6dd3a1e0f5b38fc7 +Author: Behdad Esfahbod +Date: Mon Sep 26 10:45:58 2016 +0100 + + [MATH] Fixups for previous commit + + src/hb-ot-layout-math-table.hh | 8 ++++---- + src/hb-ot-layout.cc | 29 +++++++++++++++++++---------- + src/hb-ot-layout.h | 2 ++ + test/api/Makefile.am | 6 ++---- + test/api/test-ot-layout-math.c | 16 +++++++++------- + 5 files changed, 36 insertions(+), 25 deletions(-) + +commit 5fbcb992bd7887f95b1cf2ca045c9226de8148fc +Author: Frédéric Wang +Date: Thu Aug 25 10:47:15 2016 +0200 + + MATH Table: Add API to check availability of math data. + + src/Makefile.sources | 1 + + src/hb-ot-layout-math-table.hh | 60 +++++++++++++++++++++ + src/hb-ot-layout-private.hh | 3 ++ + src/hb-ot-layout.cc | 45 ++++++++++++++++ + src/hb-ot-layout.h | 7 +++ + test/api/Makefile.am | 14 ++++- + test/api/fonts/MathTestFontEmpty.otf | Bin 0 -> 14320 bytes + test/api/fonts/MathTestFontNone.otf | Bin 0 -> 14284 bytes + test/api/test-ot-layout-math.c | 98 + +++++++++++++++++++++++++++++++++++ + 9 files changed, 227 insertions(+), 1 deletion(-) + +commit 02bfd965af588640250c47f344ad3096c8a373e0 +Author: Gregory Morse +Date: Mon Sep 12 10:22:15 2016 +0200 + + Update detectenv-msvc.mak (#316) + + Windows x86 ARM capability + + win32/detectenv-msvc.mak | 3 +++ + 1 file changed, 3 insertions(+) + +commit fc4e671f311241e21c1cc3ed941b1fc651875a2e +Author: Ebrahim Byagowi +Date: Fri Sep 9 23:28:28 2016 +0430 + + [coretext] Use intended coretext version check logic (#315) + + src/hb-coretext.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 48677345281a93d8829dd37d0480a6062945416a +Author: Khaled Hosny +Date: Thu Sep 8 04:44:37 2016 +0300 + + Try to unbreak building on older macOS again (#314) + + src/hb-coretext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d22ab6cf040467e7f17476ccdfe9cab4dce16639 +Author: Behdad Esfahbod +Date: Wed Sep 7 14:28:47 2016 -0700 + + 1.3.1 + + NEWS | 9 +++++++++ + configure.ac | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) + +commit b717cd7be506217e466e32a456df9af4d2720c0c +Author: Dominik Röttsches +Date: Wed Sep 7 23:56:57 2016 +0300 + + Do reconfigure the cascade list for Emoji font on OS X 10.9.5 (#313) + + This seems to fix crash issues on 10.9.5 reported on Chrome, compare + crbug.com/549610 + + src/hb-coretext.cc | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +commit 67e9fdf427e8536f0a134f84ad3bf1740245fe12 +Author: Dominik Röttsches +Date: Mon Sep 5 11:27:25 2016 +0300 + + Blacklist Padauk 2.80 and 3.00 (#311) + + According to comments in issue #305 broken GDEF tables lead + to incorrect rendering of Latin characters. Blacklisting + this font. + + src/hb-ot-layout.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 17f0dd2dfb9a15aed9d1a229115940cc23bdbc97 +Author: Ebrahim Byagowi +Date: Fri Sep 2 01:21:48 2016 +0430 + + [ci] Add msys2 build to CI and run its testsuite on Windows (#310) + + appveyor.yml | 20 ++++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) + +commit 5362ce6a6455c539d615e7fb221a904ac744b74c +Author: Ebrahim Byagowi +Date: Thu Sep 1 20:05:45 2016 +0430 + + [dwrite] Minor, don't include unnecessary headers (#309) + + src/hb-directwrite.cc | 4 ---- + 1 file changed, 4 deletions(-) + +commit c4f36b04e32ae5111ef11d225e5d6e82c8216185 +Author: Ebrahim Byagowi +Date: Thu Sep 1 17:31:16 2016 +0430 + + [ci] Add Windows CI support, provided by AppVeyor (#308) + + README | 1 + + appveyor.yml | 28 ++++++++++++++++++++++++++++ + win32/generate-msvc.mak | 2 +- + 3 files changed, 30 insertions(+), 1 deletion(-) + +commit 3d976d20f1b97c771e64a9cfed2760ebec64037a +Author: Khaled Hosny +Date: Sat Aug 27 16:38:42 2016 +0300 + + Show the shaper name in the debug message (#306) + + src/hb-shape-plan.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 547ddb0721365dca985aef5b759d08718f7c5f82 +Merge: bd1aac9c e7ecbba2 +Author: Sascha Brawer +Date: Thu Aug 18 22:33:14 2016 +0200 + + Merge pull request #303 from behdad/fonnapa + + Support Americanist Phonetic Notation + +commit e7ecbba2cc3c9369c5e7dc7296cb210018aca3bb +Author: Sascha Brawer +Date: Thu Aug 18 12:48:38 2016 +0200 + + Support Americanist Phonetic Notation + + OpenType language system tag: `APPH` + https://www.microsoft.com/typography/otspec/languagetags.htm + + IETF BCP47 variant tag: `fonnapa` + http://www.iana.org/assignments/language-subtag-registry/language-subtag-registry + + src/hb-ot-tag.cc | 14 ++++++++++++-- + test/api/test-ot-tag.c | 6 ++++++ + 2 files changed, 18 insertions(+), 2 deletions(-) + +commit bd1aac9c0021a936058637424a478abf792533dd +Merge: 18c19dd3 a0f1b44b +Author: Sascha Brawer +Date: Thu Aug 18 13:59:38 2016 +0200 + + Merge pull request #302 from khaledhosny/master + + [travis] Fix MacOS libtool issue + +commit a0f1b44b6c0e3b1e6a1ba63dde2be22e0425353f +Author: Khaled Hosny +Date: Tue Aug 16 03:09:04 2016 +0200 + + [coretext] Blind fix for build on MacOS 10.9 + + src/hb-coretext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0634d5600e559a69a92d49173ffb8e715fe7576c +Author: Khaled Hosny +Date: Tue Aug 16 02:49:48 2016 +0200 + + [travis] Fix MacOS libtool issue + + Reveals another MacOS build breakage in the Core Text shaper. + + .travis.yml | 1 + + 1 file changed, 1 insertion(+) + +commit 18c19dd34dcdcaab0a6d47768339f8fb70c0d3f0 +Author: Behdad Esfahbod +Date: Tue Aug 9 13:03:14 2016 -0700 + + Fix build + + test/api/test-ot-tag.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 91f2585411aaf5565fcf0c991b9055b0b397f1cd +Author: Behdad Esfahbod +Date: Mon Aug 8 18:08:08 2016 -0700 + + Actually add test + + test/shaping/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit f1b76275da716a4174092e6389979e03c0e3be59 +Author: Behdad Esfahbod +Date: Mon Aug 8 18:06:09 2016 -0700 + + Add tests for Chinese language tags + + Using font from https://github.com/behdad/harfbuzz/issues/300 + + .../sha1sum/6991b13ce889466be6de3f66e891de2bc0f117ee.ttf | Bin 0 -> + 5596 bytes + test/shaping/tests/language-tags.tests | 12 + ++++++++++++ + 2 files changed, 12 insertions(+) + +commit 37f21bdbb75c98d741e749b7f1e0f367941aef4e +Author: Behdad Esfahbod +Date: Mon Aug 8 17:57:06 2016 -0700 + + Map Macao to ZHH lang tag + + Fixes https://github.com/behdad/harfbuzz/issues/300 + + src/hb-ot-tag.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 09c7a2d6bf00dc902343e999f92cac0e8146f949 +Author: Behdad Esfahbod +Date: Mon Aug 8 17:28:54 2016 -0700 + + Limit bits-per-feature to eight + + Limits number of alternatives per glyph per feature to 255, so be it. + That's better than possibly breaking shaping because of one bad + feature + value. + + src/hb-ot-map.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 333173103bb618f721bd25d0c565a3c3c9ea224e +Author: Behdad Esfahbod +Date: Mon Aug 8 17:24:04 2016 -0700 + + Fix sign of shift operators + + This one: + + map->mask = (1 << (next_bit + bits_needed)) - (1 << next_bit); + + before the fix, the shift was done as an int, causing overflow + if it ever got to 1 << 31. Sprinkle 'u's around. + + Fixes https://bugs.chromium.org/p/chromium/issues/detail?id=634805 + + src/hb-buffer-private.hh | 6 +++--- + src/hb-cache-private.hh | 8 ++++---- + src/hb-coretext.cc | 2 +- + src/hb-directwrite.cc | 2 +- + src/hb-face.cc | 2 -- + src/hb-font.cc | 2 -- + src/hb-ft.cc | 6 ++++-- + src/hb-ot-map.cc | 4 ++-- + src/hb-set-private.hh | 4 ++-- + src/hb-uniscribe.cc | 4 ++-- + 10 files changed, 19 insertions(+), 21 deletions(-) + +commit 10a0d4aa2254f783758bb908175047df3a0b41fe +Author: Behdad Esfahbod +Date: Mon Aug 8 16:51:08 2016 -0700 + + Map zh-Hant-HK to ZHH + + Fixes https://github.com/behdad/harfbuzz/issues/300 + + src/hb-ot-tag.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit dd31fc9f7e6d23b414b22874de96eb3c002c80ba +Author: Khaled Hosny +Date: Fri Jul 22 02:26:54 2016 +0300 + + Don’t build UCDN support when building with GLib (#296) + + Regression from: b424b6c372dfe4c0ed75a49761eb34a416819446. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 489acf6c3180d3726158864fa0e1adeea3c23fae +Author: Behdad Esfahbod +Date: Fri Jul 22 17:41:43 2016 -0700 + + [coretext] "Fix" crashes on CoreText < 10.10 + + Fixes https://github.com/behdad/harfbuzz/issues/297 + + src/hb-coretext.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit a732e00ea4fffebaa85a89420f09df4c11d650e0 +Author: Behdad Esfahbod +Date: Thu Jul 21 01:58:00 2016 -0700 + + 1.3.0 + + NEWS | 15 +++++++++++++++ + configure.ac | 2 +- + 2 files changed, 16 insertions(+), 1 deletion(-) + +commit 08c08af2f9ed683ad20322c3ef1ba0f87ce15426 +Author: Behdad Esfahbod +Date: Thu Jul 21 01:23:33 2016 -0700 + + [ucdn] Update to Unicode 9.0.0 + + Fixes https://github.com/grigorig/ucdn/issues/12 + + src/hb-ucdn.cc | 6 + + src/hb-ucdn/README | 1 - + src/hb-ucdn/ucdn.c | 80 +- + src/hb-ucdn/ucdn.h | 98 +- + src/hb-ucdn/unicodedata_db.h | 4750 + +++++++++++++++++++++++------------------- + 5 files changed, 2783 insertions(+), 2152 deletions(-) + +commit f3f6c1ccbf89e15cda03e0c3a2df4297e98adf60 +Author: jfkthame +Date: Thu Jun 16 00:10:42 2016 +0100 + + Blacklist GDEF tables of more fonts + + This is based on bug reports that have been filed against Firefox + since it + updated to a version of harfbuzz that uses zeroing by GDEF rather + than by + Unicode. I'm sure there are a bunch more font versions that should + also be + included; these are just the ones I have on hand and have confirmed + as having + bad GDEF data. + + Given how the list here is growing, I think we should reconsider + the approach, + and perhaps revert to zeroing by Unicode instead. + + Fixes https://github.com/behdad/harfbuzz/issues/264 + Fixes https://github.com/behdad/harfbuzz/pull/266 + + src/hb-ot-layout.cc | 39 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 39 insertions(+) + +commit 34f9aa582c3a03b578c7eae3d2e8860a0bd5cb00 +Author: Behdad Esfahbod +Date: Wed Jul 20 02:35:54 2016 -0700 + + Implement symbol cmap in ft and ot fonts + + Fixes https://github.com/behdad/harfbuzz/issues/236 + Fixes https://bugs.chromium.org/p/chromium/issues/detail?id=627953 + + src/hb-ft.cc | 27 +++++++++++++++++++++++---- + src/hb-ot-font.cc | 50 ++++++++++++++++++++++++++++++++++++++------------ + 2 files changed, 61 insertions(+), 16 deletions(-) + +commit 6363d7df28dc4307ef1abb9857d14c35e656b85a +Author: Behdad Esfahbod +Date: Wed Jul 20 01:43:56 2016 -0700 + + Clean up buffer area when rewinding + + Fixes https://bugs.chromium.org/p/chromium/issues/detail?id=614647 + If allocation fails, we might be leaving junk behind. At least + clear it up. + + src/hb-buffer.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit f80c34eb556d12c45c961d6742c289baef58899d +Author: Behdad Esfahbod +Date: Tue Jul 12 11:18:26 2016 -0700 + + Whitespace + + src/hb-unicode-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 874421203e0161db2cbfb27be6c039cba57f7c63 +Author: Ebrahim Byagowi +Date: Tue Jul 12 03:49:21 2016 +0430 + + [coretext] Speculative fix for CoreText nullptr access (#288) + + src/hb-coretext.cc | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +commit 6bf9db4f1e1d51f9acb5e37b89caa8f4d275e7ce +Author: Birunthan Mohanathas +Date: Mon Jul 11 13:38:23 2016 -0700 + + [ft] Fix unsafe cast of FT_Done_Face in + hb_ft_{face,font}_create_referenced (#289) + + Prior to this change the function `FT_Error FT_Done_Face(FT_Face + *)` was + called through a pointer with the signature `void (void *)` + resulting in + undefined behaviour. + + src/hb-ft.cc | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +commit 0b8f3ab0220ca4731516313828515f26bb480645 +Author: Steve Lhomme +Date: Mon Jul 11 21:57:26 2016 +0200 + + clang in MSVC mode doesn't like when we redefine __attribute__ (#283) + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2f522fd485c2e946c9bce9e3828b6ff6247c59e4 +Merge: d3e2a06b e4d451ee +Author: Behdad Esfahbod +Date: Fri Jul 1 17:09:28 2016 -0700 + + Merge pull request #286 from khaledhosny/gi-tag_from_string + + [introspection] Fix hb_tag_from_string annotation + +commit e4d451ee55a57e1231b4076fcd1e87994f6b9528 +Author: Khaled Hosny +Date: Sat Jul 2 00:04:57 2016 +0200 + + [introspection] Fix hb_tag_from_string annotation + + src/hb-common.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d3e2a06b0f2587e913a9c3ff1a20c187f260db80 +Author: Behdad Esfahbod +Date: Thu Jun 30 11:01:22 2016 -0700 + + [python] Use utf-32 / utf-16 based on build of Python + + Fixes https://github.com/behdad/harfbuzz/pull/271 + + src/sample.py | 22 +++++++++++++++++++++- + 1 file changed, 21 insertions(+), 1 deletion(-) + +commit fc9de44a03a97f6e93bd98d804596cb1f9f4b5fd +Author: Behdad Esfahbod +Date: Thu Jun 30 09:46:52 2016 -0700 + + Comments + + src/hb-coretext.cc | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 46809dee30232d493539519b1bb527fa816c37db +Merge: 70e72e5f 1bea49eb +Author: Behdad Esfahbod +Date: Thu Jun 30 09:41:03 2016 -0700 + + Merge pull request #268 from drott/conflictingFontFix + + Discard reconfigured CTFont if URL changes + +commit 1bea49eb4b7a94ab6222f9c3c40320cbdb247b2d +Merge: 7aa3631d 70e72e5f +Author: Dominik Röttsches +Date: Wed Jun 29 12:10:41 2016 +0200 + + Merge branch 'master' into conflictingFontFix + +commit 70e72e5f61d73c33d3c8f3bf07f5a9afd0db046a +Author: Behdad Esfahbod +Date: Tue Jun 28 21:00:37 2016 -0700 + + [gobject] Fix a few warnings + + Part of https://github.com/behdad/harfbuzz/issues/277 + + src/hb-buffer.cc | 2 +- + src/hb-gobject-structs.h | 12 ++++++++++++ + src/hb-shape.cc | 2 -- + src/hb-unicode.h | 15 --------------- + 4 files changed, 13 insertions(+), 18 deletions(-) + +commit d8273aac19771033c5064a2f079c29d09a86e7c0 +Merge: abae93fa ae9054c7 +Author: Behdad Esfahbod +Date: Tue Jun 28 21:15:28 2016 -0700 + + Merge pull request #280 from behdad/revert-271-patch-2 + + Revert "use utf32" + +commit ae9054c740631e36b7582b44c5afb42ff4509461 +Author: Behdad Esfahbod +Date: Tue Jun 28 21:14:38 2016 -0700 + + Revert "use utf32" + + src/sample.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 7aa3631dd06af74a1fa9f0bfaa5f721876be817f +Merge: f7da0486 abae93fa +Author: Dominik Röttsches +Date: Tue Jun 28 09:52:18 2016 +0200 + + Merge branch 'master' into conflictingFontFix + +commit abae93faef32562f34a72981d252c848cc4f7565 +Merge: 07461d06 8179ff5d +Author: Behdad Esfahbod +Date: Mon Jun 27 14:33:27 2016 -0400 + + Merge pull request #273 from ebraminio/master + + [dwrite] Use stream font loader instead GDI interop + +commit 8179ff5d7ba4a140cf6743729a22072800e98a79 +Author: Ebrahim Byagowi +Date: Mon Jun 27 03:54:15 2016 +0430 + + [dwrite] Don't allocate more than needed + + Addressing Nikolay Sivov reviews on harfbuzz mailing list + + src/hb-directwrite.cc | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +commit 07b724f3419a28c479cd8a75ae0eecb841a6d2f3 +Author: Ebrahim Byagowi +Date: Fri Jun 24 12:23:25 2016 +0430 + + [dwrite] Delete remained objects + + No longer noticeable memory increase on create/destroy iterations, + highly better than current state of uniscribe backend + + src/hb-directwrite.cc | 33 ++++++++++++++++++++++++--------- + 1 file changed, 24 insertions(+), 9 deletions(-) + +commit be565d17141818e006aa1e4582f3ae14c726fa85 +Author: Ebrahim Byagowi +Date: Fri Jun 24 11:42:01 2016 +0430 + + [dwrite] Release allocated blob on face destroy + + This reduces memory consumption of my iterated font create/destroy + cycle test + significantly and makes it much better than uniscribe backend even + + src/hb-directwrite.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit f3f0ea980a359343ac0e3d359a95855c2cf7be25 +Author: Ebrahim Byagowi +Date: Thu Jun 23 16:41:37 2016 +0430 + + [dwrite] Remove ifdefs without breaking execution on old Windows + versions + + src/hb-directwrite.cc | 205 + +++++++++++++++++++++++++------------------------- + 1 file changed, 103 insertions(+), 102 deletions(-) + +commit 6b861dbd8b3662d0fa0e51fad1736d72192da868 +Author: Ebrahim Byagowi +Date: Tue Jun 21 13:57:26 2016 +0430 + + [dwrite] Use stream font loader instead GDI interop + + With help of + https://dxr.mozilla.org/mozilla-central/source/gfx/2d/NativeFontResourceDWrite.cpp + + src/hb-directwrite.cc | 350 + +++++++++++++++++++------------------------------- + src/hb-directwrite.h | 2 +- + 2 files changed, 135 insertions(+), 217 deletions(-) + +commit f7da0486ed8884481d477ce08fcf928c4da9a0a3 +Merge: a0223274 07461d06 +Author: Dominik Röttsches +Date: Mon Jun 20 10:25:43 2016 +0300 + + Merge branch 'master' into conflictingFontFix + +commit 07461d06d242cd5cfda7ccb891189f074a89b460 +Author: Kelvin +Date: Sat Jun 18 22:46:38 2016 +0000 + + Use UTF-32 in Python sample + + src/sample.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit fca0c61d67aa309fc824fb18f247493c2b7701ef +Merge: 4b8de1ea 98835058 +Author: Khaled Hosny +Date: Sun Jun 19 00:08:51 2016 +0300 + + Merge pull request #270 from khaledhosny/travis-failure + + Fix make check on Travis + +commit 988350586f607c7a46bbb658a2abecfd004f41fb +Author: Khaled Hosny +Date: Sat Jun 18 21:12:19 2016 +0200 + + [tests] Workaround Python 2 “narrow” builds + + The so-called Python 2 “narrow” builds support UCS2 only, this + is a + workaround to allow unichr to work with any Unicode character in such + builds. This fixes Travis-CI failure as it has narrow Python 2 builds. + + Copied from: + https://github.com/behdad/fonttools/blob/master/Lib/fontTools/misc/py23.py + + test/shaping/hb_test_tools.py | 38 +++++++++++++++++++++++++++++++++++++- + 1 file changed, 37 insertions(+), 1 deletion(-) + +commit a0223274b97e82fe02730fd45729172511fec459 +Author: Dominik Röttsches +Date: Thu Jun 16 14:19:39 2016 +0200 + + Discard reconfigured CTFont if URL changes + + Fixes https://github.com/behdad/harfbuzz/issues/267 + + src/hb-coretext.cc | 24 +++++++++++++++++++++--- + 1 file changed, 21 insertions(+), 3 deletions(-) + +commit 4b8de1ea804b225e8357422d0686aad76b05ccf3 +Author: Behdad Esfahbod +Date: Mon Jun 6 23:08:54 2016 -0700 + + Round, not truncate, when scaling values + + Fixes https://github.com/behdad/harfbuzz/issues/255 + + src/hb-font-private.hh | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit a93078a0ece6dcdea8c5b46cabd30854dd7cf593 +Author: Behdad Esfahbod +Date: Mon Jun 6 15:58:41 2016 -0700 + + Change bugreport URL to github + + That's where everything is happening these days. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bed201d2b839c1b1e727e17efc2e0c8f705b86c5 +Author: Behdad Esfahbod +Date: Mon Jun 6 14:14:24 2016 -0700 + + Update for latest Unicode 9 data files + + src/hb-ot-shape-complex-indic-table.cc | 10 +++++----- + src/hb-ot-shape-complex-indic.cc | 5 ----- + src/hb-ot-shape-complex-use-table.cc | 4 ++-- + 3 files changed, 7 insertions(+), 12 deletions(-) + +commit aba4b0ca52f490adfc2f3c6ec0accddd6596fdf6 +Author: Behdad Esfahbod +Date: Wed Jun 1 16:57:29 2016 -0700 + + Add TODO + + src/hb-font.cc | 1 + + 1 file changed, 1 insertion(+) + +commit a2b03de5b30b7e83f7fbf3457e9ba9c00eb88d00 +Author: Behdad Esfahbod +Date: Fri May 6 17:56:07 2016 +0100 + + [myanmar] Handle U+AA74..U+AA76 + + Fixes https://github.com/behdad/harfbuzz/issues/218 + + src/hb-ot-shape-complex-myanmar.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 6c0aa9e92bbd22011c85d98c6db021012f7b4101 +Author: Behdad Esfahbod +Date: Fri May 6 17:50:06 2016 +0100 + + Fix build on droid.io + + test/shaping/tests/use.tests | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9b6312f9451db790db00dc2c2e27a5a1db852e72 +Author: Behdad Esfahbod +Date: Fri May 6 17:41:49 2016 +0100 + + [use] Update to draft spec from Andrew Glass from August 2015 + + src/gen-use-table.py | 29 +++-- + src/hb-ot-shape-complex-use-machine.rl | 15 +-- + src/hb-ot-shape-complex-use-private.hh | 1 - + src/hb-ot-shape-complex-use-table.cc | 142 + ++++++++++----------- + src/hb-ot-shape-complex-use.cc | 11 +- + .../6ff0fbead4462d9f229167b4e6839eceb8465058.ttf | Bin 0 -> 1148 bytes + test/shaping/tests/use.tests | 1 + + 7 files changed, 93 insertions(+), 106 deletions(-) + +commit 3e4e7616a8ca80a50a438601b84428b4ba4c8694 +Author: Behdad Esfahbod +Date: Fri May 6 17:28:25 2016 +0100 + + [use] Add a catch-all clause to the machine + + src/hb-ot-shape-complex-use-machine.rl | 2 ++ + src/hb-ot-shape-complex-use.cc | 2 ++ + 2 files changed, 4 insertions(+) + +commit d04e461fe3310ccaf8633efcb79b8eb6ca2201c3 +Author: Behdad Esfahbod +Date: Fri May 6 17:17:00 2016 +0100 + + [use] Fix 'Number-joiner terminated cluster' to use HN instead of H + + From draft update to USE. + + src/hb-ot-shape-complex-use-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 359dead960c825edeb4587915a511d323f1c1f2a +Author: Behdad Esfahbod +Date: Fri May 6 16:19:19 2016 +0100 + + Allow MultipleSubst to delete glyph + + Fixes https://github.com/behdad/harfbuzz/issues/253 + + Hopefully we got the logic right. + + src/hb-ot-layout-gsub-table.hh | 17 +++++++---------- + src/hb-ot-layout-gsubgpos-private.hh | 11 +++++++---- + 2 files changed, 14 insertions(+), 14 deletions(-) + +commit 3c1666cfb589275de96d54eecb95a13a98e3819e +Author: Behdad Esfahbod +Date: Fri May 6 16:05:07 2016 +0100 + + [indic] Remove more unused logic after Javanese is gone + + src/hb-ot-shape-complex-indic.cc | 50 + +++++++++++++++------------------------- + 1 file changed, 18 insertions(+), 32 deletions(-) + +commit 8b5d6e755b271d0d22b31a7726d5bfbf2aae8b2f +Author: Behdad Esfahbod +Date: Fri May 6 15:59:27 2016 +0100 + + [indic] Remove unused Javanese bits + + src/hb-ot-shape-complex-indic-machine.rl | 3 +-- + src/hb-ot-shape-complex-indic-private.hh | 5 ++--- + src/hb-ot-shape-complex-indic.cc | 4 ---- + 3 files changed, 3 insertions(+), 9 deletions(-) + +commit 30e6e29f0f0f77eb65bfd1c4576b38c2da555017 +Author: Behdad Esfahbod +Date: Fri May 6 15:52:27 2016 +0100 + + [indic/use] Move Javanese from Indic shaper to USE + + Fixes https://github.com/behdad/harfbuzz/issues/243 + + With javatext.ttf, the reodering medial Ra gets its advance width + zero'ed in Uniscribe implementation, and the font adds the advance + back. Our Indic shaper does not do that, but USE does. So, route + Javanese through USE. That's what Microsoft does anyway. Test: + + U+A9A5,U+A9BA + + This also seems to fix the following sequence, and variations thereof: + + U+A99F,U+A9C0,U+A9A2,U+A9BF + + src/gen-indic-table.py | 1 - + src/hb-ot-shape-complex-indic-table.cc | 23 + ++++------------------ + src/hb-ot-shape-complex-private.hh | 5 +---- + .../south-east-asian/script-javanese/misc.txt | 1 + + 4 files changed, 6 insertions(+), 24 deletions(-) + +commit c6ee5f5f06a27a6f147f63aaf51186622821f20b +Author: Behdad Esfahbod +Date: Fri May 6 15:39:02 2016 +0100 + + Add Javanese sample text + + .../south-east-asian/script-javanese/misc.txt | 53 + ++++++++++++++++++++++ + 1 file changed, 53 insertions(+) + +commit e21921a68a959b7e929f71a4260a6cbe055ab4e6 +Author: Behdad Esfahbod +Date: Fri May 6 15:24:39 2016 +0100 + + Minor + + BUILD.md | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 01a30a6aa9a5827c93245961e3392a1f361745fe +Author: Behdad Esfahbod +Date: Fri May 6 11:50:02 2016 +0100 + + [indic] Remove data for scripts that don't go thorough this shaper + + src/gen-indic-table.py | 29 +- + src/hb-ot-shape-complex-indic-table.cc | 604 + +-------------------------------- + 2 files changed, 43 insertions(+), 590 deletions(-) + +commit 7cd9269f4eba7b85cd72301a3fc39fab42a4e439 +Author: Behdad Esfahbod +Date: Fri May 6 11:34:46 2016 +0100 + + Update tables to Unicode 9.0.0 beta + + Fixes https://github.com/behdad/harfbuzz/issues/251 + + src/hb-ot-shape-complex-arabic-table.hh | 56 ++++++++----- + src/hb-ot-shape-complex-indic-table.cc | 137 + +++++++++++++++++++++++--------- + src/hb-ot-shape-complex-use-table.cc | 86 ++++++++++++++------ + 3 files changed, 196 insertions(+), 83 deletions(-) + +commit f718fe370ea89e8aeb407addaa6cc926d52a4cdb +Author: Behdad Esfahbod +Date: Fri May 6 11:21:12 2016 +0100 + + Minor + + src/gen-indic-table.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 691086f131cb6c9d97e98730c27673484bf93f87 +Author: Behdad Esfahbod +Date: Fri May 6 12:08:18 2016 +0100 + + Add Unicode 9 beta scripts + + These are frozen, so good time to add. + + src/hb-common.cc | 3 +++ + src/hb-common.h | 9 +++++++++ + src/hb-ot-shape-complex-private.hh | 9 +++++++++ + src/hb-ot-shape-complex-use.cc | 3 +++ + 4 files changed, 24 insertions(+) + +commit bc5198fe1277d662926a4f616913c085cd4fc8ee +Author: Behdad Esfahbod +Date: Fri May 6 11:59:05 2016 +0100 + + Whitespace + + src/hb-common.h | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +commit a5b7b0dd4508d8a1e7573b75c4cb8832c9e34e3f +Author: Behdad Esfahbod +Date: Mon May 2 10:44:13 2016 +0200 + + 1.2.7 + + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + 2 files changed, 13 insertions(+), 1 deletion(-) + +commit 9879fc1db3cad684f412c2f3d6b49e0435697d0e +Author: Behdad Esfahbod +Date: Mon May 2 10:29:12 2016 +0200 + + [ot-font] Remove unused 'post' table include for now + + To make a release... + + src/hb-ot-font.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f8061ae7972462ad800c23be7cd7b3d7ab94b93b +Author: Behdad Esfahbod +Date: Mon May 2 10:28:24 2016 +0200 + + [tests] Fix test + + test/shaping/Makefile.am | + 2 +- + .../tests/{fallback-positioning.test => fallback-positioning.tests} + | 0 + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit f00ab2a33ab34ba64f38cbbe65830c770a3e071e +Author: Behdad Esfahbod +Date: Mon May 2 10:24:00 2016 +0200 + + [hb-ot-font] Make 'glyf' table loading lazy + + Apparently some clients have reference-table callbacks that copy + the table. + As such, avoid loading 'glyf' table which is only needed if fallback + positioning + happens. + + src/hb-ot-font.cc | 45 + ++++++++++++++++++++- + test/shaping/Makefile.am | 1 + + .../7ef276fc886ea502a03b9b0e5c8b547d5dc2b61c.ttf | Bin 0 -> 784 bytes + test/shaping/tests/fallback-positioning.test | 2 + + 4 files changed, 46 insertions(+), 2 deletions(-) + +commit 587d46227a56940a7f5bb053cbeda6144394acf7 +Author: Behdad Esfahbod +Date: Sat Apr 30 19:20:56 2016 +0200 + + [ot-font] Start implementing 'post' table, for accessing glyph names + + src/Makefile.sources | 1 + + src/hb-open-type-private.hh | 12 ++++- + src/hb-ot-font.cc | 1 + + src/hb-ot-post-table.hh | 119 + ++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 132 insertions(+), 1 deletion(-) + +commit 9abaaac409b8e3a0a9182b67dc384133013f7878 +Merge: 2f560ee4 264b7a72 +Author: Behdad Esfahbod +Date: Wed Apr 27 03:38:24 2016 -0700 + + Merge commit '264b7a728a41becfbf23ce258fc2a3af19d0cbbe' into HEAD + +commit 2f560ee44b7b08683e8e6955fe3b95187e8bda32 +Author: Behdad Esfahbod +Date: Wed Apr 27 03:11:41 2016 -0700 + + [tibetan] Reorder marks to better match Uniscribe + + Fixes https://github.com/behdad/harfbuzz/issues/237 + + Note that Uniscribe enforces a certain syllable order. We don't. + But with this change, I get all of the tibetan contractions pass + with Microsoft Himalaya font. + + src/hb-unicode-private.hh | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit f68390f196216718c22c434e1d8921118e646824 +Author: Behdad Esfahbod +Date: Wed Apr 27 02:44:35 2016 -0700 + + [test] Add text for Tibetan shorthand contractions + + From http://www.babelstone.co.uk/Tibetan/Contractions.html + + .../script-tibetan/misc/contractions.txt | 612 + +++++++++++++++++++++ + 1 file changed, 612 insertions(+) + +commit 264b7a728a41becfbf23ce258fc2a3af19d0cbbe +Merge: 7e2da035 adafdcdd +Author: Khaled Hosny +Date: Wed Apr 27 03:48:23 2016 +0300 + + Merge pull request #247 from khaledhosny/update-opentype-language-tags + + Update opentype language tags + +commit adafdcddced076da4bfa3114a00e15a387aaf1f7 +Author: Arthur Reutenauer +Date: Sat Nov 7 23:37:21 2015 +0000 + + Mass-added “difficult” tags – to be curated. + + src/hb-ot-tag.cc | 69 + +++++++++++++++++++++++++++++--------------------------- + 1 file changed, 36 insertions(+), 33 deletions(-) + +commit 3d6a2c0d7d9f6c5b3097f78c1123f9e59dcc76e2 +Author: Arthur Reutenauer +Date: Sat Nov 7 22:59:13 2015 +0000 + + Initial import of missing OpenType 1.7 language tags. + + src/hb-ot-tag.cc | 67 + +++++++++++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 61 insertions(+), 6 deletions(-) + +commit 7e2da035f68e46ce8f4759b67b4ed3a1b211d793 +Author: Behdad Esfahbod +Date: Tue Apr 26 16:42:25 2016 -0700 + + Undo accidental change + + src/hb-ot-shape-complex-arabic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b20305022a8235b19e6b640bc62651854e1336f1 +Author: Behdad Esfahbod +Date: Tue Apr 26 16:41:17 2016 -0700 + + Do NOT ignore Mongolian Free Variation Selectors during matching + + Fixes https://github.com/behdad/harfbuzz/issues/234 + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-ot-layout-private.hh | 23 + +++++++++++++++++++-- + src/hb-ot-shape-complex-arabic.cc | 2 +- + .../a34a7b00f22ffb5fd7eef6933b81c7e71bc2cdfb.ttf | Bin 0 -> 3700 bytes + .../tests/mongolian-variation-selector.tests | 1 + + 5 files changed, 24 insertions(+), 4 deletions(-) + +commit 21ab5501f5f5267d20cf23256866dd9d82a667ef +Author: Behdad Esfahbod +Date: Tue Apr 26 16:02:04 2016 -0700 + + Move ZWJ/ZWNJ bits to top byte of unicode_props() + + To make room to remember Mongolian Free Variation Selectors. + Part of fixing https://github.com/behdad/harfbuzz/issues/234 + + src/hb-ot-layout-private.hh | 40 ++++++++++++++++++++++------------------ + 1 file changed, 22 insertions(+), 18 deletions(-) + +commit de508516cb06ddb064d75bd7be8e843a5ebcf70d +Author: Behdad Esfahbod +Date: Tue Apr 26 11:28:37 2016 -0700 + + [util] Print out --debug buffer to stderr + + util/main-font-text.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 29393884b9f045460fb65d6ad10a94461ba93430 +Author: Behdad Esfahbod +Date: Tue Apr 26 10:35:23 2016 -0700 + + Annotate blacklisted fonts with their sha1sum + + src/hb-ot-layout.cc | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +commit 14bb4a56971fd45063cd6c1288d911627088abb2 +Merge: 1c625dff 5069062d +Author: Sascha Brawer +Date: Tue Apr 26 11:38:16 2016 +0200 + + Merge pull request #245 from KonstantinRitt/fixes/ce + + Unbreak build on Windows CE + +commit 5069062d0a9342bb716eebf3ddc1efad91924caa +Author: Konstantin Ritt +Date: Tue Apr 26 12:02:26 2016 +0400 + + Unbreak build on Windows CE + + 0475ef2f97e3035a2eea9a0f96031331e07e8e29 broke the build by using + vsnprintf(), which is not defined on Windows CE + + src/hb-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 1c625dff2269c54ff429ca45be88893ff1fa6c34 +Author: Behdad Esfahbod +Date: Sat Apr 9 12:53:23 2016 -0700 + + Minor + + src/hb-ot-layout.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 851b0db36d1b724fc1e0db506445119c78186285 +Author: Behdad Esfahbod +Date: Fri Apr 8 23:46:55 2016 -0700 + + Minor. We should never get to this branch, but fix it anyway. + + src/hb-ot-layout-common-private.hh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 00ea66f35754a1e6e4d3b7b139d611a9a623a9d1 +Author: Behdad Esfahbod +Date: Fri Apr 8 13:51:01 2016 -0700 + + 1.2.6 + + NEWS | 10 ++++++++++ + configure.ac | 2 +- + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit 4f3d59a1877dcb94d09da48e9694a6c1b05a86fe +Author: Behdad Esfahbod +Date: Fri Apr 8 13:41:20 2016 -0700 + + Blacklist another set of timesi.ttf and timesbi.ttf + + src/hb-ot-layout.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit ef476be80d773332e0c768a3465d99381d76edd9 +Merge: a0331b55 d3134a66 +Author: Behdad Esfahbod +Date: Fri Apr 8 13:16:33 2016 -0700 + + Merge pull request #239 from ebraminio/dwfix + + Improve DirectWrite backend + +commit d3134a66ad551ded726db9528d3c25459088f105 +Author: Ebrahim Byagowi +Date: Tue Apr 5 21:01:05 2016 +0000 + + Fix when no feature is given + + src/hb-directwrite.cc | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit a0331b55f7b45437980e1fc323251f4091bf2c4e +Author: Behdad Esfahbod +Date: Mon Apr 4 16:25:32 2016 -0700 + + 1.2.5 + + NEWS | 7 +++++++ + configure.ac | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) + +commit 6e55199b5f097ac93bad38f32e9813e2da14c5a7 +Author: Behdad Esfahbod +Date: Mon Apr 4 16:24:27 2016 -0700 + + Add test for 6dd80faf0dcb3e8a8915c3a25da44e2a67cb0cd8 + + test/shaping/Makefile.am | 1 + + .../f22416c692720a7d46fadf4af99f4c9e094f00b9.ttf | Bin 0 -> + 16736 bytes + test/shaping/tests/mark-filtering-sets.tests | 5 +++++ + 3 files changed, 6 insertions(+) + +commit 59089622dbb8dda783b1639c932123f125c3592d +Author: Behdad Esfahbod +Date: Mon Apr 4 14:54:32 2016 -0700 + + [coretext] Clarify comment + + src/hb-coretext.cc | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +commit 6dd80faf0dcb3e8a8915c3a25da44e2a67cb0cd8 +Author: Behdad Esfahbod +Date: Mon Apr 4 14:34:25 2016 -0700 + + Fix FixedVersion::to_int() + + Ouch. Had broken it in 9a13ed453ef96822a47d6e6f58332b87f38d5c59 + + Fixes https://github.com/behdad/harfbuzz/issues/238 + Will add test soon. + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4a104021697439fd21390a1f4cdc9310348882fa +Author: Ebrahim Byagowi +Date: Sat Apr 2 13:47:59 2016 +0000 + + Hide justification behind HB_DIRECTWRITE_EXPERIMENTAL_JUSTIFICATION + + src/hb-directwrite.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 63ee9ca5d81b53eb035972754ed95572821c393c +Author: Ebrahim Byagowi +Date: Fri Apr 1 15:47:07 2016 +0000 + + Use standard types instead Windows favourites ones + + src/hb-directwrite.cc | 100 + +++++++++++++++++++++++++------------------------- + 1 file changed, 50 insertions(+), 50 deletions(-) + +commit adf20ba0d18d1506e633dcd9b4827a6c93abcadd +Author: Ebrahim Byagowi +Date: Fri Apr 1 15:36:40 2016 +0000 + + Limit GetJustifiedGlyphs only to scripts with custom justification + character + + src/hb-directwrite.cc | 98 + +++++++++++++++++++++++++++++++-------------------- + 1 file changed, 60 insertions(+), 38 deletions(-) + +commit 32ae9d1b3ffbe7e26e654437a56a26a95fe9f5a6 +Author: Ebrahim Byagowi +Date: Fri Apr 1 06:39:57 2016 +0000 + + Add justification support + + src/hb-directwrite.cc | 321 + ++++++++++++++++++++++++++++++++------------------ + 1 file changed, 205 insertions(+), 116 deletions(-) + +commit 10c3d9e41520595c88dd2a8321590e03ce8fcf47 +Author: Ebrahim Byagowi +Date: Thu Mar 31 18:19:44 2016 +0000 + + Basic opentype features support + + src/hb-directwrite.cc | 62 + ++++++++++++++++++++++++++++++++++----------------- + 1 file changed, 42 insertions(+), 20 deletions(-) + +commit d129897120d3ad414220d603557c15a60aa69fa6 +Author: Ebrahim Byagowi +Date: Thu Mar 31 13:45:37 2016 +0000 + + Refactor and remove dupe getglyphs call + + src/hb-directwrite.cc | 106 + ++++++++++++++++++++++++-------------------------- + 1 file changed, 51 insertions(+), 55 deletions(-) + +commit 5f1a8961008b93f72acc47336109af3a64e248d0 +Author: Ebrahim Byagowi +Date: Thu Mar 31 12:26:16 2016 +0000 + + Better glyph offset support + + src/hb-directwrite.cc | 44 ++++++++++++++++++++++++-------------------- + 1 file changed, 24 insertions(+), 20 deletions(-) + +commit d691ba3f405738c6857450752b8cc0911dfcdb01 +Author: Ebrahim Byagowi +Date: Wed Mar 30 20:21:40 2016 +0000 + + Don't fail when language is not set + + src/hb-directwrite.cc | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 1c00a46c7a608ebc0b03c5abfcfe7f2b9881d0df +Author: Ebrahim Byagowi +Date: Wed Mar 30 20:15:09 2016 +0000 + + Make DirectWrite backend to work with different font sizes + + Actually copyedited same logic from Uniscribe to make it just work + + src/hb-directwrite.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 0251b0cc5c39272d2299d4b2ab802faaafe96837 +Author: Behdad Esfahbod +Date: Thu Mar 17 14:37:11 2016 -0700 + + 1.2.4 + + NEWS | 15 +++++++++++++++ + configure.ac | 2 +- + 2 files changed, 16 insertions(+), 1 deletion(-) + +commit 69f9fbc4200442a35484d3c790ae8f4979be5d60 +Author: Behdad Esfahbod +Date: Thu Mar 17 11:59:43 2016 -0700 + + Synthesize GDEF glyph class for any glyph that does not have one + in GDEF + + Previously we only synthesized GDEF glyph classes if the glyphClassDef + array in GDEF was null. This worked well enough, and is indeed what + OpenType requires: "If the font does not include a GlyphClassDef + table, + the client must define and maintain this information when using the + GSUB and GPOS tables." That sentence does not quite make sense since + one needs Unicode properties as well, but is close enough. + + However, looks like Arial Unicode as shipped on WinXP, does have GDEF + glyph class array, but defines no classes for Hebrew. This results + in Hebrew marks not getting their widths zeroed. So, with this + change, + we synthesize glyph class for any glyph that is not specified in the + GDEF glyph class table. Since, from our point of view, a glyph not + being listed in that table is a font bug, any unwanted consequence of + this change is a font bug :). + + Note that we still don't get the same rendering as Uniscribe, since + Uniscribe seems to do fallback positioning as well, even though the + font does have a GPOS table (which does NOT cover Hebrew!). We are + not going to try to match that though. + + Test string for Arial Unicode: + + U+05E9,U+05B8,U+05C1,U+05DC + + Before: [gid1166=3+991|gid1142=0+737|gid5798=0+1434] + After: [gid1166=3+991|gid1142=0+0|gid5798=0+1434] + Uniscribe: [gid1166=3+991|gid1142=0@348,0+0|gid5798=0+1434] + + Note that our new output matches what we were generating until July + 2014, because the Hebrew shaper used to zero mark advances based on + Unicode, NOT GDEF. That's 9e834e29e0b657f0555df1ab9cea79ff7abcf08d. + + Reported by Greg Douglas. + + src/hb-ot-layout-gsub-table.hh | 22 ++++++++++++++++++++-- + src/hb-ot-shape.cc | 29 ----------------------------- + 2 files changed, 20 insertions(+), 31 deletions(-) + +commit fef5dd9a72f326c160a7194f558749d24bac7283 +Merge: 01ea9eaa 5f995db1 +Author: Behdad Esfahbod +Date: Sat Mar 12 19:15:15 2016 -0800 + + Merge pull request #232 from c0nk/wip-icu + + Add --with-icu=builtin option; fix compile error + +commit 01ea9eaac373d9f3de6e56c1ca26cdcd259ecc8e +Author: Behdad Esfahbod +Date: Fri Mar 11 18:50:02 2016 -0800 + + [build] Use tar-ustar instead of tar-pax + + The default tar-v7 is not good enough for us (99 char filename + limit), so I have had bumped to tar-pax. We got one complaint + that someone's tar couldn't handle tar-pax. Set to tar-ustar + which is ~13 years earlier than tar-pax and is good enough for us. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3e10460a1dd41de32752e308771aa30d23565cc0 +Author: Behdad Esfahbod +Date: Fri Mar 11 18:45:19 2016 -0800 + + Minor comment + + src/hb-unicode-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d14fea4bdcc1423fe9a585af3abdefa9605d17e6 +Author: Behdad Esfahbod +Date: Tue Mar 8 12:16:41 2016 -0800 + + Remove default clause in minor switch statements + + Bending to clang warnings... + https://bugs.chromium.org/p/chromium/issues/detail?id=593057 + + src/hb-ot-shape-complex-indic.cc | 4 ---- + src/hb-ot-shape-complex-thai.cc | 1 - + 2 files changed, 5 deletions(-) + +commit ce8ae9970102f83b67bb1e8e8b2bf894a0e26c07 +Merge: 731a430c 71248a84 +Author: Behdad Esfahbod +Date: Fri Mar 4 17:20:35 2016 -0800 + + Merge pull request #231 from KonstantinRitt/post123buildfix + + Fix build with HB_DISABLE_DEPRECATED + +commit 731a430cd36caabcef04e099b21ebc6daedd536f +Author: Behdad Esfahbod +Date: Wed Mar 2 13:32:42 2016 -0800 + + Fix requiredFeature stage handling logic + + Originally the way Jonathan had written this was correct in + "continue"ing: + + https://github.com/jfkthame/harfbuzz/commit/35e28c7a733eaffcd9f062b18d7db9fbb3d990fc#diff-ead86a33a5cc9ad7f6e6381031a0baddR199 + + When I rewrote his patch, I messed it up: + + https://github.com/behdad/harfbuzz/commit/da132937989acb4d8ca9bd41c79f98750e7dda30#diff-ead86a33a5cc9ad7f6e6381031a0baddR209 + + the intended behavior was NOT to set found=TRUE and NOT to continue. + This was resulting in feature_index[table_index] being left unset. + Oops! + + src/hb-ot-map.cc | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit 68b6296d3333fd38bd5442d2ba087ced481603bc +Author: Behdad Esfahbod +Date: Tue Mar 1 16:41:53 2016 +0900 + + Add F2DOT14 type + + src/hb-open-type-private.hh | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 082b79fe9f06607998178dcdcbe817af28b017de +Author: Behdad Esfahbod +Date: Tue Mar 1 16:41:26 2016 +0900 + + Use FWORD and UFWORD when it makes sense + + I had forgotten about those types. + + src/hb-ot-glyf-table.hh | 8 ++++---- + src/hb-ot-hmtx-table.hh | 6 +++--- + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit 5f995db10381172ec63fd7ffbb0acf2c6b3dae5e +Author: Kal Conley +Date: Fri Feb 26 00:36:17 2016 +0100 + + Fix missing ICU #include + + Fix compile error in hb-icu.cc when ICU configured with + U_NO_DEFAULT_INCLUDE_UTF_HEADERS=1 + + src/hb-icu.cc | 1 + + 1 file changed, 1 insertion(+) + +commit b424b6c372dfe4c0ed75a49761eb34a416819446 +Author: Kal Conley +Date: Fri Feb 26 00:35:15 2016 +0100 + + Add --with-icu=builtin configure option + + configure.ac | 33 +++++++++++++++++++-------------- + src/Makefile.am | 7 +++++++ + 2 files changed, 26 insertions(+), 14 deletions(-) + +commit 71248a843f976c86022eb5bb8c6e8880b2499937 +Author: Konstantin Ritt +Date: Thu Feb 25 18:55:28 2016 +0400 + + Fix build with HB_DISABLE_DEPRECATED + + When HB_DISABLE_DEPRECATED is defined, no code from hb-deprecated.h + should be used, even from within HB itself. + + src/hb-font.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 0c7fb7419c20d04b803412945565562c32b42929 +Author: Behdad Esfahbod +Date: Thu Feb 25 14:40:09 2016 +0900 + + Speed up buffer variable allocation sanity check + + This makes defining HB_NDEBUG much less relevant, to the + point of irrelevance. Sorry about all the fuss in previous + release! + + src/hb-buffer-private.hh | 67 + ++++++++++++++++++++++++++++----------------- + src/hb-buffer.cc | 70 + ------------------------------------------------ + 2 files changed, 43 insertions(+), 94 deletions(-) + +commit 91dd11565221bdb108c138662ea013aac14bb968 +Author: Behdad Esfahbod +Date: Thu Feb 25 13:56:47 2016 +0900 + + Add HB_NDEBUG + + API changes: + - If NDEBUG is defined, define HB_NDEBUG + - Disable costlier sanity checks if HB_NDEBUG is defined. + + In 1.2.3 introduced some code to disable costly sanity checks if + NDEBUG is defined. NDEBUG, however, disables all assert()s as + well. With HB_NDEBUG, one can disable costlier checks but keep + assert()s. + + I'll probably add a way to define HB_NDEBUG automatically in + release tarballs. But for now, production systems that do NOT + define NDEBUG, are encouraged to define HB_NDEBUG for our build. + + src/Makefile.am | 2 +- + src/hb-buffer-private.hh | 4 ++-- + src/hb-buffer.cc | 4 ++-- + src/hb-private.hh | 9 +++++++++ + 4 files changed, 14 insertions(+), 5 deletions(-) + +commit 75568b0a7f811ea18e23037735ec8541a7431f88 +Author: Behdad Esfahbod +Date: Thu Feb 25 12:26:26 2016 +0900 + + 1.2.3 + + NEWS | 42 ++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 43 insertions(+), 1 deletion(-) + +commit 988165021f8d48dc7120b071d056491256569f4f +Author: Behdad Esfahbod +Date: Thu Feb 25 12:23:02 2016 +0900 + + Disable internal buffer variable bookkeeping in NDEBUG builds + + Saves some sweet time and binary size! + + src/Makefile.am | 1 + + src/hb-buffer-private.hh | 30 ++++++++++++++++++++---------- + src/hb-buffer.cc | 6 ++++-- + 3 files changed, 25 insertions(+), 12 deletions(-) + +commit 94dd0bb7e78125994cb7c833a5b03110f1ffc822 +Author: Behdad Esfahbod +Date: Thu Feb 25 11:31:03 2016 +0900 + + Add blacklist signature for Times New Roman (Bold) Italic on OS X + + src/hb-ot-layout.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit dd8598c1c7f29fc92253b0cd4e856c1941b1d0c0 +Author: Behdad Esfahbod +Date: Thu Feb 25 11:20:05 2016 +0900 + + [test] Pass closure to hb_font_set_glyph_func() + + Exercises fix in c335fd7986fe360ab8e1c032c9b988d0d30511eb + + test/api/test-shape.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e23cf902e91142a10229e3514be4ceee69efde04 +Author: Behdad Esfahbod +Date: Thu Feb 25 11:11:15 2016 +0900 + + Blacklist GDEF table of timesi.ttf and timesbi.ttf on Win 7 + + See discussion: + https://lists.freedesktop.org/archives/harfbuzz/2016-February/005489.html + + src/hb-ot-layout.cc | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + +commit c335fd7986fe360ab8e1c032c9b988d0d30511eb +Author: Behdad Esfahbod +Date: Thu Feb 25 09:16:05 2016 +0900 + + In trampoline implementation of get_glyph(), don't destroy user + data twice! + + src/hb-font.cc | 41 +++++++++++++++++++++++++++-------------- + 1 file changed, 27 insertions(+), 14 deletions(-) + +commit 23335deaad9d4d9824ff41343264514d3f9f7e37 +Author: Behdad Esfahbod +Date: Wed Feb 24 20:27:13 2016 +0900 + + [ot-font] Accelerate cmap format4 get_glyph + + src/hb-ot-cmap-table.hh | 111 + ++++++++++++++++++++++++++++-------------------- + src/hb-ot-font.cc | 14 +++++- + 2 files changed, 77 insertions(+), 48 deletions(-) + +commit e0f16a715bc3e621ff21a8be88102e9672630574 +Author: Behdad Esfahbod +Date: Wed Feb 24 19:52:36 2016 +0900 + + [ot-font] Towards accelerating get_glyph() + + src/hb-ot-font.cc | 23 ++++++++++++++++++++--- + 1 file changed, 20 insertions(+), 3 deletions(-) + +commit 5473ebfb84c7b6059ac16e04676b363acc51aa00 +Author: Behdad Esfahbod +Date: Wed Feb 24 19:32:43 2016 +0900 + + [ot-font] Remove level of indirection in get_glyph_variant + + src/hb-ot-cmap-table.hh | 14 ++------------ + src/hb-ot-font.cc | 13 +++++++++---- + 2 files changed, 11 insertions(+), 16 deletions(-) + +commit 49fe6ecf19522413e79a11a29aa0ffc5bdfcd2f8 +Author: Behdad Esfahbod +Date: Wed Feb 24 19:10:06 2016 +0900 + + [TODO] Update + + This file is rather obsolete. Still, give it a refresh. + + TODO | 16 ++-------------- + 1 file changed, 2 insertions(+), 14 deletions(-) + +commit 8b5bc141cd3a6bfcea3c91a882a630426876ceb3 +Author: Behdad Esfahbod +Date: Wed Feb 24 19:05:23 2016 +0900 + + Add get_nominal_glyph() and get_variation_glyph() instead of + get_glyph() + + New API: + - hb_font_get_nominal_glyph_func_t + - hb_font_get_variation_glyph_func_t + - hb_font_funcs_set_nominal_glyph_func() + - hb_font_funcs_set_variation_glyph_func() + - hb_font_get_nominal_glyph() + - hb_font_get_variation_glyph() + + Deprecated API: + - hb_font_get_glyph_func_t + - hb_font_funcs_set_glyph_func() + + Clients that implement their own font-funcs are encouraged to replace + their get_glyph() implementation with a get_nominal_glyph() and + get_variation_glyph() pair. The variation version can assume that + variation_selector argument is not zero. + + src/hb-deprecated.h | 10 ++ + src/hb-fallback-shape.cc | 4 +- + src/hb-font-private.hh | 26 +++-- + src/hb-font.cc | 203 + ++++++++++++++++++++++++++++++++++--- + src/hb-font.h | 55 +++++++--- + src/hb-ft.cc | 38 ++++--- + src/hb-ot-font.cc | 57 +++++++---- + src/hb-ot-shape-complex-indic.cc | 8 +- + src/hb-ot-shape-complex-myanmar.cc | 2 +- + src/hb-ot-shape-complex-use.cc | 2 +- + src/hb-ot-shape-fallback.cc | 6 +- + src/hb-ot-shape-normalize.cc | 18 ++-- + src/hb-ot-shape.cc | 6 +- + 13 files changed, 344 insertions(+), 91 deletions(-) + +commit b30a971bf792b9c683c345e1be25c5a5869a113c +Author: Behdad Esfahbod +Date: Wed Feb 24 17:32:22 2016 +0900 + + 1.2.2 + + NEWS | 14 +++++++++++++- + configure.ac | 2 +- + 2 files changed, 14 insertions(+), 2 deletions(-) + +commit af48e3d27c01c538f46f1dc376d994a0c24a8170 +Author: Behdad Esfahbod +Date: Wed Feb 24 16:06:40 2016 +0900 + + Fix recent test + + Not sure why the FT functions were returning advance 1024. This + caused failure on drone.io. Switch to hb-ot-font and disable + glyph names. + + test/shaping/tests/cursive-positioning.tests | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 17c831701756bb46300c412fd64b19d67f299c18 +Author: Behdad Esfahbod +Date: Wed Feb 24 16:06:23 2016 +0900 + + [tests] Fix for multiple options in test runner scripts + + test/shaping/run-tests.sh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit ebd7431f824c718db6ce5b85e94f2b3911127af4 +Author: Behdad Esfahbod +Date: Wed Feb 24 15:53:40 2016 +0900 + + Partially revert 86c68c7a2c971efe8e35b1f1bd99401dc8b688d2 + + That commit moved the advance adjustment for mark positioning to + be applied immediately, instead of doing late before. This breaks + if mark advances are zeroed late, like in Arabic. Also, easier to + hit it in RTL scripts since a single mark with non-zero advance is + enough to hit the bug, whereas in LTR, at least two marks are needed. + + This reopens https://github.com/behdad/harfbuzz/issues/211 + The cursive+mark interaction is broken again. To be fixed in a + different way. + + src/hb-ot-layout-gpos-table.hh | 28 + ++++++++++++---------------- + test/shaping/tests/cursive-positioning.tests | 2 +- + 2 files changed, 13 insertions(+), 17 deletions(-) + +commit 284481b3120963353f5f34ed094f07ffc13480ef +Author: Behdad Esfahbod +Date: Wed Feb 24 15:52:37 2016 +0900 + + Add test for mark positioning in rtl with non-zero mark advance + + Apparently I broke this 86c68c7a2c971efe8e35b1f1bd99401dc8b688d2. + Fix coming. + + .../sha1sum/07f054357ff8638bac3711b422a1e31180bba863.ttf | Bin 0 -> + 848 bytes + test/shaping/tests/cursive-positioning.tests | 1 + + 2 files changed, 1 insertion(+) + +commit 56a84e8dd18c63782b8db3a86e94651dae5bb01b +Author: Behdad Esfahbod +Date: Wed Feb 24 15:50:33 2016 +0900 + + [tests] Allow commenting out tests to be skipped + + test/shaping/run-tests.sh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 7cfd6cc486f2751d7f78c5008a636d677af4e12f +Author: Behdad Esfahbod +Date: Wed Feb 24 12:30:57 2016 +0900 + + [Android.mk] Update with warning flags + + Android.mk | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit dabf32a5ad706726412ba5c64e1ea614a707b928 +Author: Behdad Esfahbod +Date: Tue Feb 23 15:38:43 2016 +0900 + + 1.2.1 + + NEWS | 13 +++++++++++++ + configure.ac | 2 +- + 2 files changed, 14 insertions(+), 1 deletion(-) + +commit 525cc7d28cbe4e8149ddba677224f134dc0a3274 +Author: Behdad Esfahbod +Date: Tue Feb 23 15:19:27 2016 +0900 + + Add note re only adding tests with Free Software fonts + + test/shaping/README.md | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 6a09d7e34b949f9929f616ee53278b2edfd9b7ea +Author: Behdad Esfahbod +Date: Tue Feb 23 13:47:16 2016 +0900 + + [test] Add README about how to add shaping tests + + test/shaping/Makefile.am | 1 + + test/shaping/README.md | 37 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 38 insertions(+) + +commit f8ee7906d0454d950081c621f2b04a6d08e1b92f +Author: Behdad Esfahbod +Date: Tue Feb 23 13:45:38 2016 +0900 + + Remove MANIFEST files + + They are unused currently. We can add later if we hook them up + to anything useful. + + test/shaping/fonts/sha1sum/MANIFEST | 52 + ---------------------- + test/shaping/tests/MANIFEST | 19 -------- + test/shaping/texts/MANIFEST | 1 - + test/shaping/texts/in-tree/MANIFEST | 9 ---- + test/shaping/texts/in-tree/shaper-arabic/MANIFEST | 6 --- + .../in-tree/shaper-arabic/script-arabic/MANIFEST | 3 -- + .../script-arabic/language-persian/MANIFEST | 1 - + .../script-arabic/language-urdu/MANIFEST | 1 - + .../script-arabic/language-urdu/crulp/MANIFEST | 1 - + .../language-urdu/crulp/ligatures/MANIFEST | 7 --- + .../shaper-arabic/script-arabic/misc/MANIFEST | 1 - + .../script-arabic/misc/diacritics/MANIFEST | 7 --- + .../in-tree/shaper-arabic/script-mandaic/MANIFEST | 1 - + .../shaper-arabic/script-mandaic/misc/MANIFEST | 0 + .../shaper-arabic/script-mongolian/MANIFEST | 1 - + .../shaper-arabic/script-mongolian/misc/MANIFEST | 4 -- + .../in-tree/shaper-arabic/script-nko/MANIFEST | 1 - + .../in-tree/shaper-arabic/script-nko/misc/MANIFEST | 1 - + .../in-tree/shaper-arabic/script-phags-pa/MANIFEST | 1 - + .../shaper-arabic/script-phags-pa/misc/MANIFEST | 1 - + .../in-tree/shaper-arabic/script-syriac/MANIFEST | 1 - + .../shaper-arabic/script-syriac/misc/MANIFEST | 2 - + test/shaping/texts/in-tree/shaper-default/MANIFEST | 5 --- + .../shaper-default/script-ethiopic/MANIFEST | 1 - + .../shaper-default/script-ethiopic/misc/MANIFEST | 1 - + .../in-tree/shaper-default/script-han/MANIFEST | 1 - + .../shaper-default/script-han/misc/MANIFEST | 1 - + .../shaper-default/script-hiragana/MANIFEST | 1 - + .../shaper-default/script-hiragana/misc/MANIFEST | 2 - + .../shaper-default/script-linear-b/MANIFEST | 1 - + .../shaper-default/script-linear-b/misc/MANIFEST | 1 - + .../shaper-default/script-tifinagh/MANIFEST | 1 - + .../shaper-default/script-tifinagh/misc/MANIFEST | 1 - + test/shaping/texts/in-tree/shaper-hangul/MANIFEST | 1 - + .../in-tree/shaper-hangul/script-hangul/MANIFEST | 1 - + .../shaper-hangul/script-hangul/misc/MANIFEST | 1 - + test/shaping/texts/in-tree/shaper-hebrew/MANIFEST | 1 - + .../in-tree/shaper-hebrew/script-hebrew/MANIFEST | 1 - + .../shaper-hebrew/script-hebrew/misc/MANIFEST | 1 - + test/shaping/texts/in-tree/shaper-indic/MANIFEST | 2 - + .../texts/in-tree/shaper-indic/indic/MANIFEST | 11 ----- + .../shaper-indic/indic/script-assamese/MANIFEST | 2 - + .../indic/script-assamese/misc/MANIFEST | 0 + .../indic/script-assamese/utrrs/MANIFEST | 3 -- + .../indic/script-assamese/utrrs/codepoint/MANIFEST | 7 --- + .../indic/script-assamese/utrrs/gpos/MANIFEST | 2 - + .../indic/script-assamese/utrrs/gsub/MANIFEST | 1 - + .../shaper-indic/indic/script-bengali/MANIFEST | 2 - + .../indic/script-bengali/misc/MANIFEST | 2 - + .../indic/script-bengali/utrrs/MANIFEST | 3 -- + .../indic/script-bengali/utrrs/codepoint/MANIFEST | 7 --- + .../indic/script-bengali/utrrs/gpos/MANIFEST | 2 - + .../indic/script-bengali/utrrs/gsub/MANIFEST | 1 - + .../shaper-indic/indic/script-devanagari/MANIFEST | 2 - + .../indic/script-devanagari/misc/MANIFEST | 6 --- + .../indic/script-devanagari/utrrs/MANIFEST | 3 -- + .../script-devanagari/utrrs/codepoint/MANIFEST | 9 ---- + .../indic/script-devanagari/utrrs/gpos/MANIFEST | 2 - + .../indic/script-devanagari/utrrs/gsub/MANIFEST | 1 - + .../shaper-indic/indic/script-gujarati/MANIFEST | 2 - + .../indic/script-gujarati/misc/MANIFEST | 0 + .../indic/script-gujarati/utrrs/MANIFEST | 3 -- + .../indic/script-gujarati/utrrs/codepoint/MANIFEST | 7 --- + .../indic/script-gujarati/utrrs/gpos/MANIFEST | 2 - + .../indic/script-gujarati/utrrs/gsub/MANIFEST | 1 - + .../shaper-indic/indic/script-gurmukhi/MANIFEST | 2 - + .../indic/script-gurmukhi/misc/MANIFEST | 1 - + .../indic/script-gurmukhi/utrrs/MANIFEST | 3 -- + .../indic/script-gurmukhi/utrrs/codepoint/MANIFEST | 7 --- + .../indic/script-gurmukhi/utrrs/gpos/MANIFEST | 2 - + .../indic/script-gurmukhi/utrrs/gsub/MANIFEST | 1 - + .../shaper-indic/indic/script-kannada/MANIFEST | 2 - + .../indic/script-kannada/misc/MANIFEST | 2 - + .../indic/script-kannada/utrrs/MANIFEST | 3 -- + .../indic/script-kannada/utrrs/codepoint/MANIFEST | 8 ---- + .../indic/script-kannada/utrrs/gpos/MANIFEST | 1 - + .../indic/script-kannada/utrrs/gsub/MANIFEST | 1 - + .../shaper-indic/indic/script-malayalam/MANIFEST | 2 - + .../indic/script-malayalam/misc/MANIFEST | 3 -- + .../indic/script-malayalam/utrrs/MANIFEST | 2 - + .../script-malayalam/utrrs/codepoint/MANIFEST | 7 --- + .../indic/script-malayalam/utrrs/gsub/MANIFEST | 1 - + .../shaper-indic/indic/script-oriya/MANIFEST | 2 - + .../shaper-indic/indic/script-oriya/misc/MANIFEST | 2 - + .../shaper-indic/indic/script-oriya/utrrs/MANIFEST | 2 - + .../indic/script-oriya/utrrs/codepoint/MANIFEST | 9 ---- + .../indic/script-oriya/utrrs/gsub/MANIFEST | 1 - + .../shaper-indic/indic/script-sinhala/MANIFEST | 2 - + .../indic/script-sinhala/misc/MANIFEST | 4 -- + .../indic/script-sinhala/utrrs/MANIFEST | 3 -- + .../indic/script-sinhala/utrrs/codepoint/MANIFEST | 5 --- + .../indic/script-sinhala/utrrs/gpos/MANIFEST | 1 - + .../indic/script-sinhala/utrrs/gsub/MANIFEST | 7 --- + .../shaper-indic/indic/script-tamil/MANIFEST | 2 - + .../shaper-indic/indic/script-tamil/misc/MANIFEST | 1 - + .../shaper-indic/indic/script-tamil/utrrs/MANIFEST | 3 -- + .../indic/script-tamil/utrrs/codepoint/MANIFEST | 10 ----- + .../indic/script-tamil/utrrs/gpos/MANIFEST | 2 - + .../indic/script-tamil/utrrs/gsub/MANIFEST | 1 - + .../shaper-indic/indic/script-telugu/MANIFEST | 2 - + .../shaper-indic/indic/script-telugu/misc/MANIFEST | 1 - + .../indic/script-telugu/utrrs/MANIFEST | 3 -- + .../indic/script-telugu/utrrs/codepoint/MANIFEST | 7 --- + .../indic/script-telugu/utrrs/gpos/MANIFEST | 1 - + .../indic/script-telugu/utrrs/gsub/MANIFEST | 1 - + .../in-tree/shaper-indic/south-east-asian/MANIFEST | 1 - + .../south-east-asian/script-khmer/MANIFEST | 1 - + .../south-east-asian/script-khmer/misc/MANIFEST | 3 -- + test/shaping/texts/in-tree/shaper-myanmar/MANIFEST | 1 - + .../in-tree/shaper-myanmar/script-myanmar/MANIFEST | 1 - + .../shaper-myanmar/script-myanmar/misc/MANIFEST | 3 -- + test/shaping/texts/in-tree/shaper-thai/MANIFEST | 2 - + .../texts/in-tree/shaper-thai/script-lao/MANIFEST | 1 - + .../in-tree/shaper-thai/script-lao/misc/MANIFEST | 1 - + .../texts/in-tree/shaper-thai/script-thai/MANIFEST | 1 - + .../in-tree/shaper-thai/script-thai/misc/MANIFEST | 4 -- + test/shaping/texts/in-tree/shaper-tibetan/MANIFEST | 1 - + .../in-tree/shaper-tibetan/script-tibetan/MANIFEST | 1 - + .../shaper-tibetan/script-tibetan/misc/MANIFEST | 1 - + test/shaping/texts/in-tree/shaper-use/MANIFEST | 6 --- + .../texts/in-tree/shaper-use/script-batak/MANIFEST | 1 - + .../in-tree/shaper-use/script-buginese/MANIFEST | 1 - + .../texts/in-tree/shaper-use/script-cham/MANIFEST | 1 - + .../in-tree/shaper-use/script-kaithi/MANIFEST | 1 - + .../in-tree/shaper-use/script-kharoshti/MANIFEST | 1 - + .../in-tree/shaper-use/script-tai-tham/MANIFEST | 2 - + 126 files changed, 381 deletions(-) + +commit 815bdd7700155efcffa9a4c3ca5bfc31833d0586 +Author: Behdad Esfahbod +Date: Mon Feb 22 18:22:44 2016 +0900 + + In cluster-level=0, group ZWJ/ZWNJ with previous cluster + + This better emulates Unicode grapheme clusters. + + Note that Uniscribe does NOT do this, but should be harmless with + most clients, + and improve fallback with clients that use HarfBuzz cluster as unit + of fallback. + + Fixes https://github.com/behdad/harfbuzz/issues/217 + + src/hb-ot-layout-private.hh | 6 ++++++ + src/hb-ot-shape.cc | 3 ++- + test/shaping/tests/indic-joiner-candrabindu.tests | 2 +- + test/shaping/tests/mongolian-variation-selector.tests | 2 +- + 4 files changed, 10 insertions(+), 3 deletions(-) + +commit 89137e325a19d62fb00979e1e8ab2ca59a2c1147 +Author: Behdad Esfahbod +Date: Mon Feb 22 16:00:59 2016 +0900 + + Minor + + src/hb-coretext.cc | 2 +- + src/hb-ot-shape.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 15063b12f7619d4f44981248e28f38c172d12e1f +Author: Behdad Esfahbod +Date: Mon Feb 22 15:56:29 2016 +0900 + + [coretext] Move CTFont construction to face_data + + src/hb-coretext.cc | 66 + +++++++++++++++++++++++++----------------------------- + 1 file changed, 30 insertions(+), 36 deletions(-) + +commit ba3d49d9a56932d341bf1916a30f322be665e3a6 +Author: Behdad Esfahbod +Date: Mon Feb 22 15:50:12 2016 +0900 + + [coretext] Move code around + + src/hb-coretext.cc | 70 + +++++++++++++++++++++++++++++++----------------------- + 1 file changed, 40 insertions(+), 30 deletions(-) + +commit 90194efb8480d58c55b7a19962624c7aadbdca63 +Author: Behdad Esfahbod +Date: Mon Feb 22 15:42:53 2016 +0900 + + [coretext] Move code around + + src/hb-coretext.cc | 46 ++++++++++++++++++++++++++-------------------- + 1 file changed, 26 insertions(+), 20 deletions(-) + +commit ca539e37a4b71e585a267a288db1a3975cbb99fc +Author: Behdad Esfahbod +Date: Mon Feb 22 15:37:18 2016 +0900 + + [build] git.mk fix for m4/gtk-doc.m4 + + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 54788cb1ecc5a5ffd63d07cd1f0b07b2afa9a8ca +Author: Behdad Esfahbod +Date: Mon Feb 22 15:32:52 2016 +0900 + + [win32] Install git.mk + + win32/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit 9a13ed453ef96822a47d6e6f58332b87f38d5c59 +Author: Behdad Esfahbod +Date: Mon Feb 22 11:44:45 2016 +0900 + + Make FixedVersion a template + + src/hb-open-file-private.hh | 4 ++-- + src/hb-open-type-private.hh | 9 +++++---- + src/hb-ot-head-table.hh | 4 ++-- + src/hb-ot-hhea-table.hh | 2 +- + src/hb-ot-layout-gdef-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-ot-layout-jstf-table.hh | 2 +- + src/hb-ot-maxp-table.hh | 2 +- + 8 files changed, 14 insertions(+), 13 deletions(-) + +commit 238b943e850ea1ab0093e12c74d2cd7c686f318e +Author: Behdad Esfahbod +Date: Mon Feb 22 15:31:22 2016 +0900 + + [coretext] Fix leak! + + src/hb-coretext.cc | 1 + + 1 file changed, 1 insertion(+) + +commit e561122856a50ed405d71cb1629317e7ae63f316 +Author: Behdad Esfahbod +Date: Mon Feb 22 15:28:37 2016 +0900 + + [coretext] Move code around + + src/hb-coretext.cc | 109 + ++++++++++++++++++++++++++++++----------------------- + 1 file changed, 62 insertions(+), 47 deletions(-) + +commit 04c64431530a4a6d9ebd33674c4665a8e6d25bdd +Author: Behdad Esfahbod +Date: Mon Feb 22 15:12:27 2016 +0900 + + [coretext] Ignore PPEM in font size selection + + src/hb-coretext.cc | 14 ++++---------- + 1 file changed, 4 insertions(+), 10 deletions(-) + +commit 62c2711121fe78f373c15c0f53090b62b52d11c1 +Author: Behdad Esfahbod +Date: Mon Feb 22 15:07:20 2016 +0900 + + [coretext] Limit grapheme-cluster forming to cluster-level=0 + + src/hb-coretext.cc | 1 + + src/hb-ot-shape.cc | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 061105ec443eb7350ffe217305f9d8902c179e2f +Author: Behdad Esfahbod +Date: Mon Feb 22 14:59:39 2016 +0900 + + [coretext] Fix shaping with varying font size + + Fixes https://github.com/libass/libass/issues/212 + + src/hb-coretext.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 27847cab1264b4ce8342603f4626b4e0645979e4 +Author: Behdad Esfahbod +Date: Fri Feb 19 15:56:50 2016 +0700 + + 1.2.0 + + NEWS | 20 ++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 21 insertions(+), 1 deletion(-) + +commit c3731559042e1730e85d19574321ad850010f7de +Author: Behdad Esfahbod +Date: Fri Feb 19 15:13:07 2016 +0700 + + [fuzzing] Add test for recent fix + + Test from https://github.com/behdad/harfbuzz/issues/223 + + I forgot that we do run hb-fuzzer on tests in + shaping/tests/fuzzed.tests. + + .../sha1sum/205edd09bd3d141cc9580f650109556cc28b22cb.ttf | Bin 0 -> + 1966 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/fuzzed.tests | 1 + + 3 files changed, 2 insertions(+) + +commit aa33cb72ab29c31e87f0cca9a0e72fe3a68247b7 +Author: Behdad Esfahbod +Date: Fri Feb 19 15:12:24 2016 +0700 + + [fuzzing] Make test runner actually work + + test/fuzzing/Makefile.am | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 2735555c6b0c95db7dfc2b391f92a1a5c06084c4 +Author: Behdad Esfahbod +Date: Fri Feb 19 15:12:16 2016 +0700 + + [fuzzing] Add TODO item + + test/fuzzing/hb-fuzzer.cc | 1 + + 1 file changed, 1 insertion(+) + +commit b87e36f6f119fac80b8fd55f3abae563c2c5b798 +Author: Behdad Esfahbod +Date: Fri Feb 19 14:52:31 2016 +0700 + + Avoid buffer->move_to() in case of buffer error + + Fixes https://github.com/behdad/harfbuzz/issues/223 + + Right now we cannot test this because it has to be tested using + hb-fuzzer. + We should move all fuzzing tests from test/shaping/tests/fuzzed.tests + to + test/fuzzing/ and have its own test runner. At that point, should add + test from this issue as well. + + src/hb-buffer.cc | 2 ++ + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit 7e76bbabbaa56af314abff8ddba8866c634919cd +Author: Behdad Esfahbod +Date: Fri Feb 19 14:43:39 2016 +0700 + + [fuzzing] Make "make hb-fuzzer" build lib dependency + + Not going to do with util/, but is convenient here. + + test/fuzzing/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +commit 568a0c60e8695a6ad8a93ec60d55b137c48890cb +Author: Behdad Esfahbod +Date: Thu Feb 18 19:31:51 2016 +0700 + + Remove pointless overflow check in pointer math + + Fixes https://github.com/behdad/harfbuzz/issues/227 + + src/hb-blob.cc | 1 - + 1 file changed, 1 deletion(-) + +commit aae2847099cbf05bf0668fbe526fc58736837c1b +Author: Behdad Esfahbod +Date: Thu Feb 18 17:06:25 2016 +0700 + + Emoji skin tone modifiers need to be treated as combining marks + + Fixes https://github.com/behdad/harfbuzz/issues/169 + + src/hb-ot-layout-private.hh | 15 ++++++++++++++- + src/hb-unicode-private.hh | 5 +++-- + 2 files changed, 17 insertions(+), 3 deletions(-) + +commit da41e48f0a1a6af6d44ef25185d2421a29bd4166 +Author: Behdad Esfahbod +Date: Tue Feb 16 17:16:33 2016 +0700 + + [USE] Zero mark advances by GDEF early + + This is what Microsoft's implementation does. Marks that need advance + need to add it back using 'dist' or other feature in GPOS. + Update tests to + match. + + src/hb-ot-shape-complex-use.cc | 2 +- + test/shaping/fonts/sha1sum/MANIFEST | 1 + + .../sha1sum/f518eb6f6b5eec2946c9fbbbde44e45d46f5e2ac.ttf | Bin 0 -> + 1356 bytes + test/shaping/tests/context-matching.tests | 2 +- + test/shaping/tests/use.tests | 2 ++ + 5 files changed, 5 insertions(+), 2 deletions(-) + +commit 86c68c7a2c971efe8e35b1f1bd99401dc8b688d2 +Author: Behdad Esfahbod +Date: Tue Feb 16 16:07:20 2016 +0700 + + [GPOS] Fix interaction of mark attachments and cursive chaining + + Fixes https://github.com/behdad/harfbuzz/issues/211 + + What happens in that bug is that a mark is attached to base first, + then a second mark is cursive-chained to the first mark. This only + "works" because it's in the Indic shaper where mark advances are + not zeroed. + + Before, we didn't allow cursive to run on marks at all. Fix that. + We also where updating mark major offsets at the end of GPOS, such + that changes in advance of base will not change the mark attachment + position. That was superior to the alternative (which is what + Uniscribe + does BTW), but made it hard to apply cursive to the mark after it + was positioned. We could track major-direction offset changes and + apply that to cursive in the post process, but that's a much trickier + thing to do than the fix here, which is to immediately apply the + major-direction advance-width offsets... Ie.: + + https://github.com/behdad/harfbuzz/issues/211#issuecomment-183194739 + + If this breaks any fonts, the font should be fixed to do mark + attachment + after all the advances are set up first (kerning, etc). + + Finally, this, still doesn't make us match Uniscribe, for I explained + in that bug. Looks like Uniscribe applies minor-direction cursive + adjustment immediate as well. We don't, and we like it our way, at + least for now. Eg. the sequence in the test case does this: + + - The first subscript attaches with mark-to-base, moving in x only, + - The second subscript attaches with cursive attachment to first + subscript + moving in x only, + - A final context rule moves the first subscript up by 104 units. + + The way we do, the final shift-up, also shifts up the second subscript + mark because it's cursively-attached. Uniscribe doesn't. We get: + + [ttaorya=0+1307|casubscriptorya=0@-242,104+-231|casubscriptnarroworya=0@20,104+507] + + while Uniscribe gets: + + [ttaorya=0+1307|casubscriptorya=0@-242,104+-211|casubscriptnarroworya=0+487] + + note the different y-offset of the last glyph. In our view, + after cursive, + things move together, period. + + src/hb-ot-layout-gpos-table.hh | 31 + +++++++++++---------- + .../706c5d7b625f207bc0d874c67237aad6f1e9cd6f.ttf | Bin 0 -> 3868 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/cursive-positioning.tests | 1 + + 4 files changed, 18 insertions(+), 15 deletions(-) + +commit 80c8855cfeffa028d74a25df884d0e5577c95c6c +Author: Behdad Esfahbod +Date: Fri Feb 12 12:50:17 2016 +0700 + + Minor + + src/hb-common.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6ab920224c32e38072a0bec5e84d4b0d58b74167 +Author: Behdad Esfahbod +Date: Thu Feb 11 16:57:52 2016 +0700 + + [GPOS] Minor + + No effect. + + src/hb-ot-layout-gpos-table.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit cbc3a76c5a38ab24f72e80357377711bd3f54d56 +Author: Behdad Esfahbod +Date: Thu Feb 11 16:48:13 2016 +0700 + + [GPOS] Merge fixing of offsets for cursive and mark attachments + + Part of fixing https://github.com/behdad/harfbuzz/issues/211 + + src/hb-buffer-private.hh | 3 +- + src/hb-ot-layout-gpos-table.hh | 73 + ++++++++++++++++++------------------------ + 2 files changed, 33 insertions(+), 43 deletions(-) + +commit 7d8d58ac81fe267e29ea68cdc6f4a4fa8c22d40f +Author: Behdad Esfahbod +Date: Thu Feb 11 16:34:28 2016 +0700 + + [GPOS] Divide position_finish() into two phases, for advances + and offsets + + Right now the position_finish_advances() is empty. To be used for + spacing attachments proposal later. + + src/hb-ot-layout-gpos-table.hh | 11 +++++++++-- + src/hb-ot-layout-gsub-table.hh | 6 ------ + src/hb-ot-layout-private.hh | 19 +++++++++---------- + src/hb-ot-layout.cc | 16 ++++++++-------- + src/hb-ot-shape.cc | 7 +++---- + 5 files changed, 29 insertions(+), 30 deletions(-) + +commit 8474231567a08873cc5e0aa08fea60316a04c27e +Author: Behdad Esfahbod +Date: Thu Feb 11 16:27:41 2016 +0700 + + [ot] Minor shuffling code around + + src/hb-ot-layout-gpos-table.hh | 2 -- + src/hb-ot-shape.cc | 13 ++++++++----- + 2 files changed, 8 insertions(+), 7 deletions(-) + +commit b0b11614e9fb9ecd1faae28b0ed71ac6bf5c1266 +Author: Behdad Esfahbod +Date: Thu Feb 11 15:28:55 2016 +0700 + + [GPOS] Add harmless recursion in fix_mark_attachment() + + Will do nothing. Just useful for merging two functions. + + src/hb-ot-layout-gpos-table.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 686567baab5a32ffea843538643e01de2885fa4f +Author: Behdad Esfahbod +Date: Thu Feb 11 15:25:28 2016 +0700 + + [GPOS] Merge attach_chain() and cursive_chain() + + Differentiate, using new attach_type(). + + src/hb-ot-layout-gpos-table.hh | 50 + +++++++++++++++++++++++++++--------------- + 1 file changed, 32 insertions(+), 18 deletions(-) + +commit 806ad8dc65931ab7893bff7d5592a67a9bd237ca +Author: Behdad Esfahbod +Date: Thu Feb 11 14:53:11 2016 +0700 + + [GPOS] Minor shuffling + + src/hb-ot-layout-gpos-table.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 0f6278d1fbb75856132f1fa2d29648979f033316 +Author: Behdad Esfahbod +Date: Thu Feb 11 14:49:10 2016 +0700 + + [GPOS] Negate sign of attach_lookback(), and rename it to + attach_chain() + + No behavior change. Preparing to unify how cursive and mark + attachments + work. + + src/hb-ot-layout-gpos-table.hh | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +commit 5b5dc2c0406d8180e72d97a54334c722fda325b1 +Author: Behdad Esfahbod +Date: Thu Feb 11 12:15:38 2016 +0700 + + [tests] Add test for advance zeroing of an ASCII letter marked as + mark in GDEF + + test/shaping/fonts/sha1sum/MANIFEST | 1 + + .../sha1sum/a98e908e2ed21b22228ea59ebcc0f05034c86f2e.ttf | Bin 0 -> + 1016 bytes + test/shaping/tests/zero-width-marks.tests | 1 + + 3 files changed, 2 insertions(+) + +commit 660c9d3fc21172e8dc340b017122c084dac6334c +Author: Behdad Esfahbod +Date: Thu Feb 11 12:14:27 2016 +0700 + + Remove font-dependent ASCII-only perf hack + + Is confusing. I already hit it myself. Remove. We can optimize + ASCII based on Unicode properties. But should not do based on + assumptions on the font. + + src/hb-ot-shape.cc | 4 ---- + 1 file changed, 4 deletions(-) + +commit 3fe0cf10401875f1e9b8b5fbaf59826e64ea61d2 +Author: Behdad Esfahbod +Date: Wed Feb 10 18:43:43 2016 +0700 + + Fix previous commit! + + test/shaping/fonts/sha1sum/MANIFEST | 6 +++--- + test/shaping/tests/zero-width-marks.tests | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit 293a210eee0a53b59f4b33298f42ec6e59d785e0 +Author: Behdad Esfahbod +Date: Wed Feb 10 18:39:59 2016 +0700 + + [tests] Fix fonts in cc4a78bf22c4a735b84c89b04be3bb531f42135e + + They had an invalid LookupFlag (32). + + .../sha1sum/0dd3a51c3ea50997cb1f72515d1060408f8b4b59.ttf | Bin 1412 -> + 0 bytes + .../sha1sum/56cfd0e18d07f41c38e9598545a6d369127fc6f9.ttf | Bin 0 -> + 1412 bytes + .../sha1sum/828114d00931885bc25abf7cdb878b2914a2e743.ttf | Bin 1448 -> + 0 bytes + .../sha1sum/894e96a367f00c196d82e6243673a1d4414f4f6a.ttf | Bin 1448 -> + 0 bytes + .../sha1sum/cc5f3d2d717fb6bd4dfae1c16d48a2cb8e12233b.ttf | Bin 0 -> + 1448 bytes + .../sha1sum/ffa0f5d2d9025486d8469d8b1fdd983e7632499b.ttf | Bin 0 -> + 1448 bytes + 6 files changed, 0 insertions(+), 0 deletions(-) + +commit eaadcbbc53e02838c847e53ef214a55d6915d677 +Author: Behdad Esfahbod +Date: Wed Feb 10 18:29:54 2016 +0700 + + Remove now-unused mark zeroing BY_UNICODE + + src/hb-ot-shape-complex-private.hh | 2 -- + src/hb-ot-shape.cc | 29 ----------------------------- + 2 files changed, 31 deletions(-) + +commit cc4a78bf22c4a735b84c89b04be3bb531f42135e +Author: Behdad Esfahbod +Date: Wed Feb 10 18:24:08 2016 +0700 + + [tests] Add tests for Latin mark zeroing + + .../sha1sum/0dd3a51c3ea50997cb1f72515d1060408f8b4b59.ttf | Bin 0 -> + 1412 bytes + .../sha1sum/828114d00931885bc25abf7cdb878b2914a2e743.ttf | Bin 0 -> + 1448 bytes + .../sha1sum/894e96a367f00c196d82e6243673a1d4414f4f6a.ttf | Bin 0 -> + 1448 bytes + test/shaping/fonts/sha1sum/MANIFEST | 4 ++++ + .../sha1sum/fcdcffbdf1c4c97c05308d7600e4c283eb47dbca.ttf | Bin 0 -> + 1344 bytes + test/shaping/tests/zero-width-marks.tests | 4 ++++ + 6 files changed, 8 insertions(+) + +commit 55ff34b9c157a839d026465af8f30424ce7f891b +Author: Behdad Esfahbod +Date: Wed Feb 10 18:20:02 2016 +0700 + + [tests] Add tests for Thai mark zeroing + + .../sha1sum/45855bc8d46332b39c4ab9e2ee1a26b1f896da6b.ttf | Bin 0 -> + 1088 bytes + .../sha1sum/7a37dc4d5bf018456aea291cee06daf004c0221c.ttf | Bin 0 -> + 1080 bytes + .../sha1sum/8099955657a54e9ee38a6ba1d6f950ce58e3cc25.ttf | Bin 0 -> + 1024 bytes + test/shaping/fonts/sha1sum/MANIFEST | 4 ++++ + .../sha1sum/bb0c53752e85c3d28973ebc913287b8987d3dfe8.ttf | Bin 0 -> + 976 bytes + test/shaping/tests/zero-width-marks.tests | 4 ++++ + 6 files changed, 8 insertions(+) + +commit b3582a8ee82942a931130a83b2867b239f8ca71a +Author: Behdad Esfahbod +Date: Wed Feb 10 18:10:15 2016 +0700 + + Change default mark advance zeroing behavior from Unicode to GDEF + + See thread at: + https://lists.freedesktop.org/archives/harfbuzz/2016-February/005462.html + + src/hb-ot-shape-complex-default.cc | 2 +- + src/hb-ot-shape-complex-thai.cc | 2 +- + src/hb-ot-shape-complex-tibetan.cc | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 43bb2b8fb00705c3334730a58ade7984181018b2 +Author: Behdad Esfahbod +Date: Wed Feb 10 14:11:43 2016 +0700 + + Minor + + test/shaping/hb_test_tools.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bdaa784bb610ec65626d63cc068a0958ff5005fc +Merge: a168db47 f6ffba63 +Author: Behdad Esfahbod +Date: Wed Feb 10 11:11:36 2016 +0700 + + Merge pull request #164 from fanc999/msvc.build + + Enable Build of HarfBuzz under Visual Studio using NMake Makefiles + +commit a168db4739148459bc33c7dae88e73efa0153d72 +Author: Behdad Esfahbod +Date: Wed Feb 10 11:10:08 2016 +0700 + + [README] Add ABI Tracker link + + README | 1 + + 1 file changed, 1 insertion(+) + +commit f6ffba634bb33d6d4b051abce9c23fcae280c3fe +Author: Chun-wei Fan +Date: Wed Dec 9 14:57:15 2015 +0800 + + MSVC builds: Add support to build DirectWrite shaping backend + + Add into the NMake Makefiles to build the DirectWrite shaping backend, + but as PR #134 mentions, this is considered to be in an experimental + state, + so don't include this in the build by default for now. This is + most probably + going to replace the Uniscribe backend eventually, since DirectWrite + is meant + to be Uniscribe's replacement, and is needed for Windows Store apps + if a + system shaping API is to be used. + + win32/README.txt | 4 ++++ + win32/config-msvc.mak | 10 ++++++++++ + win32/config.h.win32.in | 3 +++ + win32/info-msvc.mak | 7 +++++++ + 4 files changed, 24 insertions(+) + +commit c6792854557ca104948e8f0b142c9384105b0d05 +Author: Chun-wei Fan +Date: Wed Feb 3 18:31:23 2016 +0800 + + build: Build the DirectWrite sources if requested + + This adds to the autotools build system so that the (experimental) + DirectWrite support for HarfBuzz is built (and dist'ed). + + configure.ac | 25 +++++++++++++++++++++++++ + src/Makefile.am | 7 +++++++ + src/Makefile.sources | 3 +++ + 3 files changed, 35 insertions(+) + +commit d7b6636e5ebf1ddf7d7a04007ffbc411cf7e462e +Author: Chun-wei Fan +Date: Tue Nov 3 19:00:42 2015 +0800 + + build: Support Visual Studio builds using NMake + + This adds a set of NMake Makefiles that can be used to build + HarfBuzz, from + the standard basic build building the minimal HarfBuzz DLL (consisting + of OpenType, fallback and Uniscribe support only), to a full + fledged build + consisting of GLib and FreeType support, as well as building the + utilities, + the test programs in src/ and test/api, and HarfBuzz-ICU and + HarfBuzz-GObject, and up to building the introspection files. + This means a + flexible build mechanism is supported here, so anything that is + supported + for a Windows build (code-wise), should all be supported by this build + system. + + As in an earlier commit, the source listings are shared with the + autotools + builds with the various Makefile.sources in src/, src/hb-ucdn and + util/, and + this set of NMake Makefiles will transform these lists into the + form they + want. + + In the current form, all the test programs in test/api pass, and + this has + been checked successfully with 'make -j8 distcheck'. + + BUILD.md | 4 +- + Makefile.am | 2 +- + configure.ac | 2 + + win32/Makefile.am | 14 +++ + win32/Makefile.vc | 52 +++++++++++ + win32/README.txt | 75 ++++++++++++++++ + win32/build-rules-msvc.mak | 140 ++++++++++++++++++++++++++++++ + win32/config-msvc.mak | 188 + ++++++++++++++++++++++++++++++++++++++++ + win32/create-lists-msvc.mak | 151 ++++++++++++++++++++++++++++++++ + win32/create-lists.bat | 42 +++++++++ + win32/detectenv-msvc.mak | 136 +++++++++++++++++++++++++++++ + win32/generate-msvc.mak | 26 ++++++ + win32/hb-introspection-msvc.mak | 42 +++++++++ + win32/info-msvc.mak | 130 +++++++++++++++++++++++++++ + win32/install.mak | 29 +++++++ + win32/introspection-msvc.mak | 73 ++++++++++++++++ + 16 files changed, 1104 insertions(+), 2 deletions(-) + +commit 5c3e7260bcb4999b8b7cb9afb26e6eaff867634b +Author: Chun-wei Fan +Date: Tue Nov 3 18:52:46 2015 +0800 + + MSVC builds: Add a pre-configured config.h(.win32) template + + This adds a pre-configured config.h template that can be used + for Visual + Studio builds, where autotools is not normally available. This has + the + configs that are suitable for Visual Studio builds, as well as all the + features used for Windows builds enabled (HAVE_OT, HAVE_FALLBACK and + HAVE_UNISCRIBE). + + Note that the optional features are not enabled here, they are + enabled by + /D's (or -D's) in the NMake Makefiles as requested. + + win32/config.h.win32.in | 155 + ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 155 insertions(+) + +commit 35ded3af74a5bc4b038a07308354d5f7501ae3c7 +Author: Chun-wei Fan +Date: Tue Nov 3 16:56:27 2015 +0800 + + build: Move source listings into separate Makefile snippets + + This moves all the source listings in src/Makefile.am, + src/hb-ucdn/Makefile.am and util/Makefile.am into separate Makefile + snippets, so that they may be shared between different Makefile-based + build systems, such as NMake for Visual Studio. + + src/Makefile.am | 165 + +++++++++---------------------------------- + src/Makefile.sources | 147 ++++++++++++++++++++++++++++++++++++++ + src/hb-ucdn/Makefile.am | 6 +- + src/hb-ucdn/Makefile.sources | 4 ++ + util/Makefile.am | 34 ++------- + util/Makefile.sources | 32 +++++++++ + 6 files changed, 223 insertions(+), 165 deletions(-) + +commit b894a85ad1e7c3ecfb6d3732a7c9779f5462fe70 +Author: Behdad Esfahbod +Date: Tue Feb 2 16:39:19 2016 +0800 + + Fix more hangs in case of buffer allocation errors + + Hopefully + fixes https://github.com/behdad/harfbuzz/issues/214 + + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape-complex-myanmar.cc | 2 +- + src/hb-ot-shape-complex-use.cc | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit b693992ea160b66541f678dc9be29b513c77a30b +Merge: 9a6a33cc 498574e6 +Author: Behdad Esfahbod +Date: Tue Feb 2 12:33:32 2016 +0800 + + Merge pull request #222 from n8willis/master + + Add usermanual chapter on cluster levels + +commit 498574e6c1a83bbd2768925af6e39806fe1ea8bb +Author: n8willis +Date: Thu Jan 28 12:21:32 2016 -0600 + + Update Makefile.am + + docs/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit e12fc666994573dbabb6928a8b2e8698667088ce +Author: n8willis +Date: Thu Jan 28 12:14:12 2016 -0600 + + Added initial usermanual chapter on cluster levels. + + docs/harfbuzz-docs.xml | 1 + + docs/usermanual-clusters.xml | 304 + +++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 305 insertions(+) + +commit 9a6a33ccbea8a2e23e779bd955958fa41974c1c7 +Merge: d05b7833 146fe252 +Author: Behdad Esfahbod +Date: Mon Jan 18 12:47:18 2016 +0100 + + Merge pull request #216 from mhosken/master + + Refactor graphite2 to make ovleraps into negative width spaces + +commit 146fe252c3ebd0253344ce20981554e40926497b +Author: Martin Hosken +Date: Sat Jan 16 17:24:00 2016 -0600 + + Refactor graphite2 to make ovleraps into negative width spaces + + src/hb-graphite2.cc | 71 + ++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 43 insertions(+), 28 deletions(-) + +commit d05b783322d90208b2ddf06a5ebffc7c301be3d7 +Author: Behdad Esfahbod +Date: Tue Jan 12 16:17:21 2016 +0000 + + Fix compiler warning + + Fixes https://github.com/behdad/harfbuzz/issues/212 + + src/hb-ot-tag.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d163dc18e66c9e2f404d09310482464245cae704 +Author: Behdad Esfahbod +Date: Tue Jan 12 13:05:01 2016 +0000 + + Minor + + src/hb-ot-layout-common-private.hh | 30 +++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) + +commit 505b7d4732c6a8c423f43c0de46e05dc583e82c0 +Author: Behdad Esfahbod +Date: Mon Jan 11 18:31:04 2016 +0000 + + [fuzzing] Fuzz input text + + Very rudimentary right now, but will get kcc's bot going. + + From + https://github.com/behdad/harfbuzz/issues/139#issuecomment-163580783 + + test/fuzzing/hb-fuzzer.cc | 25 +++++++++++++++++++------ + 1 file changed, 19 insertions(+), 6 deletions(-) + +commit 3e704521f67e021fb51cda7319925fd39eba4f97 +Author: Behdad Esfahbod +Date: Mon Jan 11 17:38:41 2016 +0000 + + [OT] Get list of lookup subtables once and loop through them + + This speeds up shaping the Amiri font by over 15%. + + This was primarily needed for my work on OpenType GX, since + we will be collecting only sublookups that are "active" for + current font instance; but it's a nice boost in general as + well. + + We might, in the future, collect subtables in the lookup_accel. + That would also allow us to do a per-subtbale set-digest, which + should speed things up some more, specially for ContextChainFormat3 + lookups... Amiri, for example, contains one lookup with 53 + subtables! + + src/hb-ot-layout.cc | 120 + +++++++++++++++++++++++++++++++++++----------------- + 1 file changed, 81 insertions(+), 39 deletions(-) + +commit 11441291bbf4326dca9b14ec3e9cad3d4d229303 +Author: Behdad Esfahbod +Date: Mon Jan 11 13:16:35 2016 +0000 + + 1.1.3 + + NEWS | 29 +++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 30 insertions(+), 1 deletion(-) + +commit 97624d9244de0fdb9c03f60e03fe242028efa8a1 +Author: Behdad Esfahbod +Date: Mon Jan 11 12:58:45 2016 +0000 + + [docs] Minor fixes. + + src/hb-buffer.h | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +commit a39ff95fce39226e80850ff251cb34a7aad12bd7 +Author: Behdad Esfahbod +Date: Mon Jan 11 12:28:37 2016 +0000 + + [coretext] Speed up CoreText font fallback + + Fixes https://code.google.com/p/chromium/issues/detail?id=547912 + + src/hb-coretext.cc | 45 ++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 40 insertions(+), 5 deletions(-) + +commit 5afebbdcb2dab0e9a42d580df629d8e60b50d2f9 +Author: Behdad Esfahbod +Date: Thu Jan 7 22:53:59 2016 +0000 + + Add Homebrew build instructions + + BUILD.md | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit e8a27d79476a5d7a83cf2287d92ca291257546f4 +Author: Behdad Esfahbod +Date: Thu Jan 7 22:52:16 2016 +0000 + + Don't build hb-fuzzer in "make", only "make check" + + test/fuzzing/Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 25671466d245449187f8ab17e1a233f1d087d5ed +Author: Behdad Esfahbod +Date: Thu Jan 7 19:11:41 2016 +0000 + + Add 9 reserved entries to hb_font_extents_t + + Might add italic-angle, underline/strikethrough-position/thickness + in the future. Do this before new struct goes into a release. + + src/hb-font.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit e6d5e4c3106180cb22253c2c278b40f7c4c98f2f +Author: Behdad Esfahbod +Date: Wed Jan 6 12:29:50 2016 +0000 + + [uniscribe] Fix negative advance + + This happens with at least one test font I have. + + src/hb-uniscribe.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 99d34955762d0fff4b66a30e6fbe65fd1cf9976b +Author: Behdad Esfahbod +Date: Wed Jan 6 12:20:47 2016 +0000 + + [test] Add test text for Kaithi + + test/shaping/texts/in-tree/shaper-hangul/MANIFEST | 1 + + test/shaping/texts/in-tree/shaper-hebrew/MANIFEST | 1 + + test/shaping/texts/in-tree/shaper-tibetan/MANIFEST | 1 + + test/shaping/texts/in-tree/shaper-use/MANIFEST | 1 + + test/shaping/texts/in-tree/shaper-use/script-kaithi/MANIFEST | 1 + + test/shaping/texts/in-tree/shaper-use/script-kaithi/misc.txt | 6 ++++++ + 6 files changed, 11 insertions(+) + +commit 53c47c85827a7e3ca82000e3baa9aa87c5770ce9 +Author: Behdad Esfahbod +Date: Tue Jan 5 13:26:20 2016 +0000 + + Increase sanitize edit count from 8 to 32 + + See previous commit. + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit da2fcfdc51a2cc0d0a782efa6c91b733f7aa84ba +Author: Behdad Esfahbod +Date: Tue Jan 5 13:23:45 2016 +0000 + + Don't count fixing-up FeatureParams offset as error + + The font Garamond Premier Pro Caption (and possibly many other + Adobe fonts), have many FeatureParamsSize tables with the old + wrong offset. We handle fixing those up, but they were still + contributing to edit_count, and when I reduced HB_SANITIZE_MAX_EDIT + from 100 to 8 in 14c2de321826c36037adde859ccca3e2011325a9, these + fonts were now getting GPOS dropped and hence kerning disabled. + + Fix, by not counting edits made towareds offset fix-up. I'll + also increase edit count again, in the next commit. + + src/hb-ot-layout-common-private.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit d0adc80965506810820f9ec165b8df80cc8907e3 +Author: Behdad Esfahbod +Date: Sat Jan 2 13:25:18 2016 +0000 + + Check magicNumber in head table during sanitize + + src/hb-ot-head-table.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 3a48c776701a919e11b067129586e40372d90d54 +Merge: 9230911f 4b4948d3 +Author: Behdad Esfahbod +Date: Sat Jan 2 00:59:14 2016 +0000 + + Merge pull request #208 from khaledhosny/travis-trusty + + [travis] Try building on Trusty + +commit 4b4948d360a2141e0ffda2994aa308645dc32f59 +Author: Khaled Hosny +Date: Sat Jan 2 00:36:19 2016 +0400 + + [travis] Try building on Trusty + + Trusty has gtk-doc 1.20 which has better markdown support which should + fix some of the brokenness in the newly added documentation. The build + seems to be as fast as the current container-based build on Precise. + + .travis.yml | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 9230911facf90c06626e54023ca4d99f5e05f1a4 +Author: Behdad Esfahbod +Date: Fri Jan 1 19:06:43 2016 +0000 + + [travis] Only run coveralls if testing behdad/harfbuzz + + Fixes failures in others' forks, like: + https://travis-ci.org/khaledhosny/harfbuzz/jobs/99719710#L3912 + + .travis.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6f66f05757d3d5738571b3d4ee40afffb8f26ff9 +Merge: bfdf684f 9ab9f974 +Author: Behdad Esfahbod +Date: Fri Jan 1 16:44:01 2016 +0000 + + Merge pull request #207 from khaledhosny/docs-4 + + [docs] More buffers documentation + +commit 9ab9f974d42e0001966e243a23a64e6aefbd4764 +Author: Khaled Hosny +Date: Fri Jan 1 20:38:21 2016 +0400 + + [docs] More buffers documentation + + docs/harfbuzz-sections.txt | 4 +- + src/hb-buffer-serialize.cc | 85 + ++++++++++++++++++++++++++++++------------- + src/hb-buffer.cc | 91 + +++++++++++++++++++++++++++++++++++----------- + src/hb-buffer.h | 78 +++++++++++++++++++++++++-------------- + src/hb-shape.cc | 10 +++-- + 5 files changed, 187 insertions(+), 81 deletions(-) + +commit bfdf684f7957645dd016fbf76700c5911c4bee2d +Merge: d7ed6f50 85c2443b +Author: Behdad Esfahbod +Date: Wed Dec 30 22:20:14 2015 +0100 + + Merge pull request #205 from khaledhosny/more-docs + + More docs + +commit d7ed6f50b4ff13a94701131913d931f13a4d1266 +Merge: b758e5ea a7f0e25d +Author: Behdad Esfahbod +Date: Wed Dec 30 22:20:00 2015 +0100 + + Merge pull request #206 from nico/patch-3 + + Remove unused HB_SHAPER_DATA_ENSURE_DECLARE lines. + +commit a7f0e25dafa90bd21b01c38cb0782ade54b75cdc +Author: Nico Weber +Date: Wed Dec 30 16:05:52 2015 -0500 + + Remove unused HB_SHAPER_DATA_ENSURE_DECLARE lines. + + The coretext_aat shaper delegates to the regular coretext_..._ensure() + functions, so coretext_aat_..._ensure() functions defined by these + macros are unused. The compiler warns about them, which in turn can + confuse people to think that the coretext_aat_..._ensure() functions + weren't called by accident. + + src/hb-coretext.cc | 4 ---- + 1 file changed, 4 deletions(-) + +commit 85c2443b737335b77c7e9bb6fd6741912f70fcef +Author: Khaled Hosny +Date: Wed Dec 30 22:57:04 2015 +0400 + + [docs] Reduce gtkdoc-check errors + + Now it is just reporting one error about “503 undocumented or + incomplete + symbols”, that will be the easy part I guess. + + docs/harfbuzz-docs.xml | 74 + ++++++++++++++++++++++++++++++++++++++++++++++ + docs/harfbuzz-sections.txt | 40 +++++++++++++++++++++++++ + 2 files changed, 114 insertions(+) + +commit 9cffe329f15b3a74a3af4e68c1884f1dbda49666 +Author: Khaled Hosny +Date: Wed Dec 30 22:50:08 2015 +0400 + + [docs] Typo + + src/hb-buffer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b758e5ea223eced0fde9a3e62d0fdf04c04914a1 +Merge: 266bfa37 8b1224f0 +Author: Behdad Esfahbod +Date: Wed Dec 30 16:44:19 2015 +0100 + + Merge pull request #203 from nico/patch-1 + + Remove unused `retry:` label. + +commit 266bfa3772e75fedcd93db22bf8672a13ad7a7d9 +Author: Behdad Esfahbod +Date: Wed Dec 30 16:25:48 2015 +0100 + + [docs] Minor + + .ci/deploy-docs.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d08035f8f15b7ddd89a318ea34bc386a9e33a8ea +Author: Behdad Esfahbod +Date: Wed Dec 30 16:15:36 2015 +0100 + + [docs] Fix up build, really + + .ci/deploy-docs.sh | 9 ++++----- + .travis.yml | 2 +- + 2 files changed, 5 insertions(+), 6 deletions(-) + +commit 0d45c3cf63692151166ca7071f755dfaa8922a67 +Author: Behdad Esfahbod +Date: Wed Dec 30 16:09:39 2015 +0100 + + [docs] Turn bash tracing on + + .ci/deploy-docs.sh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 33b2d981a0b12ea165ef9282204a73f4a1ce0477 +Author: Behdad Esfahbod +Date: Wed Dec 30 15:56:56 2015 +0100 + + [docs] Another try, not sure why the bot isn't building + + .ci/deploy-docs.sh | 13 ++++--------- + 1 file changed, 4 insertions(+), 9 deletions(-) + +commit f3a051149b3b565b5ad4e489bf730c5203c3549e +Author: Behdad Esfahbod +Date: Wed Dec 30 15:45:43 2015 +0100 + + [docs] Shuffling code around in deploy-docs.sh + + Temporarily makes it rebuild docs on every change again. + + .ci/deploy-docs.sh | 46 +++++++++++++++++++++++++++------------------- + 1 file changed, 27 insertions(+), 19 deletions(-) + +commit 8f31d0a94b27bb658aabe600472fc10bc47885f6 +Merge: 9d280cf4 fb192c26 +Author: Behdad Esfahbod +Date: Wed Dec 30 15:13:37 2015 +0100 + + Merge pull request #202 from khaledhosny/doc-fixes + + Doc fixes + +commit fb192c263e17081c87f4cc971274d9be42f19513 +Author: Khaled Hosny +Date: Wed Dec 30 15:05:50 2015 +0400 + + [docs] A bit more buffers documentation + + docs/harfbuzz-sections.txt | 2 ++ + src/hb-buffer.cc | 7 +++--- + src/hb-buffer.h | 56 + ++++++++++++++++++++++++++++++++++++++++++++-- + 3 files changed, 60 insertions(+), 5 deletions(-) + +commit 8ab797c5b86c33eab6ee024471fd3c147325d26a +Author: Khaled Hosny +Date: Tue Dec 29 17:42:16 2015 +0400 + + [docs] A bit more buffers documentation + + docs/harfbuzz-sections.txt | 60 +++++++++++++++--------------- + src/hb-buffer.cc | 93 + +++++++++++++++++++++++++++++++--------------- + src/hb-buffer.h | 7 +++- + src/hb-common.cc | 43 +++++++++++++-------- + src/hb-common.h | 15 +++++--- + 5 files changed, 135 insertions(+), 83 deletions(-) + +commit f18d2226b62f20d29e6299c01ae8467c725ea971 +Author: Khaled Hosny +Date: Tue Dec 29 15:21:20 2015 +0400 + + [docs] Some documentation on buffers + + Some of it (create, reference, destroy) are adapted from Cairo docs. + + docs/harfbuzz-sections.txt | 55 +++++++------- + src/hb-buffer.cc | 174 + +++++++++++++++++++++++++++------------------ + 2 files changed, 132 insertions(+), 97 deletions(-) + +commit d7bf9d05c519a369a7b3a02e9ed5ecc05a20cd3e +Author: Khaled Hosny +Date: Tue Dec 29 02:23:24 2015 +0400 + + [docs] Fix comment syntax + + To lower the number of gtk-doc warnings. + + .travis.yml | 2 +- + src/hb-directwrite.cc | 4 ++-- + src/hb-ot-layout.cc | 14 ++++++++++++++ + src/hb-unicode.h | 16 ++++++++++++++++ + 4 files changed, 33 insertions(+), 3 deletions(-) + +commit 8b1224f0eece7a5b6846e206333e57ac4653a705 +Author: Nico Weber +Date: Mon Dec 28 21:31:28 2015 -0500 + + Remove unused `retry:` label. + + Fixes a -Wunused-label warning when building harfbuzz with clang + -Wall. + + src/hb-coretext.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 1f5559293f9bb1b4e911f4bdecf276ff1f6ae01c +Author: Khaled Hosny +Date: Tue Dec 29 02:15:21 2015 +0400 + + [docs] Ignore the new HB_EXTERN decoration + + Otherwise, almost all API functions are not extracted. + + docs/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 9d280cf49f25181f64c978752f926b79e7c3746a +Author: Khaled Hosny +Date: Sat Dec 26 06:45:51 2015 +0400 + + Fix previous commit + + .ci/deploy-docs.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b789199f107912cfce5e4a95d6152f9a1a7993f2 +Author: Khaled Hosny +Date: Sat Dec 26 06:35:08 2015 +0400 + + [travis] Build docs only on tagged revisions + + Lets see if it works… + + .ci/deploy-docs.sh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit e5b90c08a4c1f475560209a5e47628f695606d89 +Author: Behdad Esfahbod +Date: Fri Dec 25 18:41:41 2015 +0100 + + [travis] Remove secure var + + I've set up a secure var for behdad/harfbuzz through Travis web + interface, no need + to set the var here. + + .ci/deploy-docs.sh | 2 +- + .travis.yml | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +commit e75c1ffdf548185ce1f1df7937f0d028e5e40efe +Merge: 6173c2a6 d25317f6 +Author: Behdad Esfahbod +Date: Fri Dec 25 18:21:08 2015 +0100 + + Merge pull request #199 from behdad/travis-docs + + Deploy docs to gh-pages branch from Travis builds + +commit 6173c2a6fc6ea0bf812f7f398770b5342974f9bf +Author: Behdad Esfahbod +Date: Fri Dec 25 18:18:23 2015 +0100 + + Fix flaky test + + This test font had a upem of 769, which results in rounding-related + errors with + the FreeType font funcs. Change the upem to 1024 to fix that. + + Fixes https://github.com/behdad/harfbuzz/issues/201 + + ...> 1c2fb74c1b2aa173262734c1f616148f1648cfd6.ttf} | Bin 4064 -> + 4064 bytes + test/shaping/fonts/sha1sum/MANIFEST | 2 +- + test/shaping/tests/ligature-id.tests | 70 + ++++++++++----------- + 3 files changed, 36 insertions(+), 36 deletions(-) + +commit 3fcae6d82da389c9944386a8ab41eb1c13b99330 +Author: Behdad Esfahbod +Date: Fri Dec 25 18:18:02 2015 +0100 + + [tests] Add --reference, for re-recording tests + + test/shaping/run-tests.sh | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +commit d25317f67f3c5c77f9059961935b0f35cbaa9ac4 +Author: Khaled Hosny +Date: Wed Dec 23 01:29:48 2015 +0400 + + Move more docs from FreeDesktop page + + docs/Makefile.am | 1 + + docs/harfbuzz-docs.xml | 15 ++++---- + docs/usermanual-install-harfbuzz.xml | 70 + ++++++++++++++++++++++++++++++++++++ + 3 files changed, 80 insertions(+), 6 deletions(-) + +commit 493a92220844c8996be67c8a7a2c5447942fe2c1 +Author: Khaled Hosny +Date: Wed Dec 23 00:33:41 2015 +0400 + + Rename user manual files + + Use chapter ids instead of numbers, so that we can reorder them, + introduce new ones etc. without the numbers becoming out of date. + + docs/Makefile.am | 12 + ++++++------ + docs/harfbuzz-docs.xml | 12 + ++++++------ + ... => usermanual-buffers-language-script-and-direction.xml} | 0 + docs/{usermanual-ch04.xml => usermanual-fonts-and-faces.xml} | 0 + ...{usermanual-ch06.xml => usermanual-glyph-information.xml} | 0 + docs/{usermanual-ch02.xml => usermanual-hello-harfbuzz.xml} | 0 + ...{usermanual-ch05.xml => usermanual-opentype-features.xml} | 0 + .../{usermanual-ch01.xml => usermanual-what-is-harfbuzz.xml} | 0 + 8 files changed, 12 insertions(+), 12 deletions(-) + +commit 4dc2265918089ee08c6d82eed0cfd41e02d7d231 +Author: Khaled Hosny +Date: Wed Dec 23 00:26:20 2015 +0400 + + Intro from freedesktop.org/wiki/Software/HarfBuzz/ + + docs/HarfBuzz.png | Bin 0 -> 3419 bytes + docs/Makefile.am | 3 ++- + docs/harfbuzz-docs.xml | 31 ++++++++++++++++++++++++++++++- + 3 files changed, 32 insertions(+), 2 deletions(-) + +commit 22b07782ced6503a0bf33f2fe157b70540238f6d +Author: Khaled Hosny +Date: Mon Dec 14 23:33:51 2015 +0400 + + Deploy docs to gh-pages branch from Travis builds + + Build docs in Travis and push them to the gh-pages branch, which makes + them available at http://behdad.github.io/harfbuzz/ + + .ci/deploy-docs.sh | 25 +++++++++++++++++++++++++ + .travis.yml | 4 ++++ + 2 files changed, 29 insertions(+) + +commit fc38e6034c76d5450f5398d667184bc3696efcc4 +Author: Behdad Esfahbod +Date: Wed Dec 23 14:50:53 2015 +0100 + + [layout] Collect coverage glyphs in PairPos + + Apparently class=0 is used for ClassDef1. See: + https://github.com/adobe-type-tools/afdko/issues/90 + + src/hb-ot-layout-gpos-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8718dae818b22c3933c33bdfc8a7413ef4c3110a +Author: Behdad Esfahbod +Date: Fri Dec 18 19:53:40 2015 +0000 + + [python] Hook up sample debugger + + src/sample.py | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 0475ef2f97e3035a2eea9a0f96031331e07e8e29 +Author: Behdad Esfahbod +Date: Fri Dec 18 18:17:07 2015 +0000 + + [buffer] Add debugging, aka, message, API + + Currently just announces lookup applications. Message-API *will* + change. + hb-shape / hb-view are updated to print-out messages to stder + if --debug + is specified. + + src/hb-buffer-private.hh | 18 ++++++++++++++++++ + src/hb-buffer.cc | 44 + ++++++++++++++++++++++++++++++++++++++++++++ + src/hb-buffer.h | 15 +++++++++++++++ + src/hb-ot-layout.cc | 12 ++---------- + util/main-font-text.hh | 18 ++++++++++++++++++ + 5 files changed, 97 insertions(+), 10 deletions(-) + +commit 9ea0aa43ac5cf243b698aae0ec80241b5efd7488 +Author: Behdad Esfahbod +Date: Fri Dec 18 17:30:18 2015 +0000 + + Don't deserialize positions if buffer has no positions + + src/hb-buffer-serialize.cc | 3 +++ + src/hb-ot-layout.cc | 2 -- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit 862b1644e9469a7e70555141f53729409d50d0d2 +Author: Behdad Esfahbod +Date: Fri Dec 18 13:54:06 2015 +0000 + + [use] Only set syllable-based topographical features if not + Arabic-joining + + src/hb-ot-shape-complex-use.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 45b7ec365225109eb0854e6c417f48860b5f24af +Author: Behdad Esfahbod +Date: Fri Dec 18 13:47:16 2015 +0000 + + [indic] Followup fix for Malayalam context matching + + We regeressed Malayalam in 508cc3d3cfcfb0383df0fe795cc28db4e0fd5729 + This brings down the failures to 198 (from 750). + + BENGALI: 353725 out of 354188 tests passed. 463 failed (0.130722%) + DEVANAGARI: 707307 out of 707394 tests passed. 87 failed (0.0122987%) + GUJARATI: 366349 out of 366457 tests passed. 108 failed (0.0294714%) + GURMUKHI: 60732 out of 60747 tests passed. 15 failed (0.0246926%) + KANNADA: 951190 out of 951913 tests passed. 723 failed (0.0759523%) + KHMER: 299070 out of 299124 tests passed. 54 failed (0.0180527%) + MALAYALAM: 1048136 out of 1048334 tests passed. 198 failed + (0.0188871%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271662 out of 271847 tests passed. 185 failed (0.068053%) + TAMIL: 1091753 out of 1091754 tests passed. 1 failed (9.15957e-05%) + TELUGU: 970555 out of 970573 tests passed. 18 failed (0.00185457%) + MYANMAR: 1123865 out of 1123883 tests passed. 18 failed (0.00160159%) + + src/hb-ot-shape-complex-indic.cc | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +commit 2813e3049a69d64e5395f68c52c4690e1d256d55 +Author: Behdad Esfahbod +Date: Fri Dec 18 11:05:11 2015 +0000 + + [indic] Update data tables to Unicode 8.0 + + Test stats remain unchanged, except for Malayalam, which we + investigate: + + BENGALI: 353725 out of 354188 tests passed. 463 failed (0.130722%) + DEVANAGARI: 707307 out of 707394 tests passed. 87 failed (0.0122987%) + GUJARATI: 366349 out of 366457 tests passed. 108 failed (0.0294714%) + GURMUKHI: 60732 out of 60747 tests passed. 15 failed (0.0246926%) + KANNADA: 951190 out of 951913 tests passed. 723 failed (0.0759523%) + KHMER: 299070 out of 299124 tests passed. 54 failed (0.0180527%) + MALAYALAM: 1047584 out of 1048334 tests passed. 750 failed + (0.0715421%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271662 out of 271847 tests passed. 185 failed (0.068053%) + TAMIL: 1091753 out of 1091754 tests passed. 1 failed (9.15957e-05%) + TELUGU: 970555 out of 970573 tests passed. 18 failed (0.00185457%) + + Myanmar, compared to Windows 10 mmrtext.ttf: + + MYANMAR: 1123865 out of 1123883 tests passed. 18 failed (0.00160159%) + + src/gen-indic-table.py | 1 + + src/hb-ot-shape-complex-indic-private.hh | 40 ++-- + src/hb-ot-shape-complex-indic-table.cc | 372 + ++++++++++++++++++------------- + src/hb-ot-shape-complex-indic.cc | 23 +- + src/hb-ot-shape-complex-myanmar.cc | 4 + + 5 files changed, 244 insertions(+), 196 deletions(-) + +commit fc06cff40f136440f6402d0a5e735e2a4a3c062a +Author: Behdad Esfahbod +Date: Thu Dec 17 17:47:35 2015 +0000 + + Remove HB_OT_SHAPE_ZERO_WIDTH_MARKS_DEFAULT + + The DEFAULT naming wasn't helpful, so just remove it. + + src/hb-ot-shape-complex-default.cc | 2 +- + src/hb-ot-shape-complex-private.hh | 4 +--- + src/hb-ot-shape-complex-thai.cc | 2 +- + src/hb-ot-shape-complex-tibetan.cc | 2 +- + 4 files changed, 4 insertions(+), 6 deletions(-) + +commit 508cc3d3cfcfb0383df0fe795cc28db4e0fd5729 +Author: Behdad Esfahbod +Date: Thu Dec 17 17:31:17 2015 +0000 + + [indic] Allow context when matching for Malayalam new-spec + + Test sequence: + U+0995,U+09CD,U+09B0 + + With Nirmala shipped on Windows 10, this failed to form the below + form. + Works now. + + Reported by Sairus. + + src/hb-ot-shape-complex-indic.cc | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit eaf1e93ef1ee19a3e72d781e8abbd7f1165c1618 +Author: Behdad Esfahbod +Date: Thu Dec 17 16:57:47 2015 +0000 + + [uniscribe] Handle E_NOT_SUFFICIENT_BUFFER as well as E_OUTOFMEMORY + + On Windows 10 we are seeing that other error message... + + Test sequence: U+0995,U+-9CD,U+09B0 + With Nirmala shipped on Windows 10, this failed to form the below + form. + Works now. + + Reported by Sairus. + + src/hb-uniscribe.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 21e5d7edc4f28157254ef29a8ac247f3a572f6a6 +Author: Behdad Esfahbod +Date: Thu Dec 17 16:28:38 2015 +0000 + + [util] Use O_BINARY instead of _O_BINARY + + The latter doesn't seem to be available in Cygwin. I'm surprised it + compiled before... + + util/options.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 100fbeaf196515774c985ee839d0fa0695f9a6fa +Author: Behdad Esfahbod +Date: Thu Dec 17 15:23:09 2015 +0000 + + Fix ligature component of a mark happening after a ligature within + a ligature! + + Say, if we are ligating "A B_C m D", then previously 'm' was being + attached to 'B' in the combined A_B_C_D ligature. Now we attach it + to 'C'. No test for this though :(. + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2f02fc79a5018e3348fccf366c470803554e1e58 +Author: Behdad Esfahbod +Date: Thu Dec 17 15:21:14 2015 +0000 + + Improve ligature-component handling + + We use three bits for lig_id these days, so we finally got a report of + two separate ligatures with the same lig_id happening adjacent to each + other, and then the component-handling code was breaking things. + Protect against that by ignoring same-lig-id but lig-comp=0 glyphs + after + a new ligature. + + Fixes https://github.com/behdad/harfbuzz/issues/198 + + src/hb-ot-layout-gsubgpos-private.hh | 12 +++++-- + test/shaping/Makefile.am | 1 + + test/shaping/fonts/sha1sum/MANIFEST | 1 + + .../c78d1f25ea1df1210414f2fe2e0e1e53082bba76.ttf | Bin 0 -> 4064 bytes + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/ligature-id.tests | 35 + +++++++++++++++++++++ + 6 files changed, 47 insertions(+), 3 deletions(-) + +commit 2ab0de9fbd03231b647345b01e31b136e2e00978 +Author: Behdad Esfahbod +Date: Thu Dec 17 11:59:15 2015 +0000 + + [use] Fix halant detection + + Before, we were just checking the use_category(). This detects as + halant a ligature that had the halant as first glyph (as seen in + NotoSansBalinese.) Change that to use the is_ligated() glyph prop + bit. The font is forming this ligature in ccmp, which is before + the rphf / pref tests. So we need to make sure the "ligated" bit + survives those tests. Since those only check the "substituted" bit, + we now only clear that bit for them and "ligated" survives. + + Fixes https://github.com/behdad/harfbuzz/issues/180 + + src/hb-ot-layout-private.hh | 6 ++---- + src/hb-ot-shape-complex-use.cc | 19 + ++++++++++++------- + test/shaping/Makefile.am | 1 + + test/shaping/fonts/sha1sum/MANIFEST | 1 + + .../fbb6c84c9e1fe0c39e152fbe845e51fd81f6748e.ttf | Bin 0 -> + 2616 bytes + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/use.tests | 1 + + 7 files changed, 18 insertions(+), 11 deletions(-) + +commit 86bcbd65b0d98357fb3d67a2f4f2a704ace55e10 +Author: Behdad Esfahbod +Date: Thu Dec 17 11:04:33 2015 +0000 + + [arabic] Use glyph advance width in apply_stch() instead of extents + + That seems to be what Windows is doing, and makes more sense. + + src/hb-ot-shape-complex-arabic.cc | 24 +++++++----------------- + 1 file changed, 7 insertions(+), 17 deletions(-) + +commit f11c11a1f123ef245e59ba892230db14170a8e5a +Author: Behdad Esfahbod +Date: Wed Dec 16 17:08:36 2015 +0100 + + Fix Since: tags for new API + + https://github.com/behdad/harfbuzz/commit/e1d4d0f1dbd8518b5672245c05d73f22a9ed03ea#commitcomment-15006653 + + src/hb-font.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 15f2c055c17c54b0a6ae6eef50dcda13c58cda75 +Merge: 49e72634 a13b023d +Author: Behdad Esfahbod +Date: Mon Dec 14 14:19:03 2015 +0100 + + Merge pull request #196 from srl295/aix + + AIX fixes + +commit a13b023dbfd0532e8cd74c356fbbd4453d0ffaa0 +Author: Steven R. Loomis +Date: Fri Dec 11 10:21:27 2015 -0800 + + AIX fixes + + - use '-w' instead of '\<...\>' for check-header-guards + grep manpage says these are the same + + - put '-q' first in the grep options + + - move VAR into hb-private.hh + + - hb-font-private.hh - use [VAR] instead of [] for variable array + + src/check-header-guards.sh | 5 ++--- + src/hb-font-private.hh | 2 +- + src/hb-open-type-private.hh | 3 --- + src/hb-private.hh | 2 ++ + 4 files changed, 5 insertions(+), 7 deletions(-) + +commit 49e72634af74a9fbad01f42f48e104218413acc0 +Author: Behdad Esfahbod +Date: Thu Dec 10 17:44:19 2015 +0100 + + Limit use of AIX intrinsics to IBM's compiler + + src/hb-atomic-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e1d4d0f1dbd8518b5672245c05d73f22a9ed03ea +Merge: 70b33eda 808d3fc0 +Author: Behdad Esfahbod +Date: Thu Dec 10 16:56:07 2015 +0100 + + Merge branch 'font-extents' + + Fixes https://github.com/behdad/harfbuzz/pull/165 + +commit 808d3fc0eadd379909f2a0308fd3db474f1efde8 +Author: Behdad Esfahbod +Date: Thu Dec 10 16:55:16 2015 +0100 + + [util] Port hb-view to use font metrics from HarfBuzz instead of cairo + + util/helper-cairo.cc | 4 +++- + util/view-cairo.cc | 24 ++++++++++++------------ + 2 files changed, 15 insertions(+), 13 deletions(-) + +commit 31fa3892947138c7950303ea3719bb5ceb813625 +Author: Behdad Esfahbod +Date: Thu Dec 10 16:38:29 2015 +0100 + + [ft] Use ftface->size->metrics for font extent info + + src/hb-ft.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 3ad16048fdd841f31f1cb98d7ff9ea1871841146 +Author: Behdad Esfahbod +Date: Thu Dec 10 16:37:49 2015 +0100 + + [ot-font] Respect OS/2 fsSelection USE_TYPO_METRICS bit + + src/hb-ot-font.cc | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 70b33edae7c8b9c031b83c95f00cb383789f1041 +Author: Behdad Esfahbod +Date: Thu Dec 10 15:54:42 2015 +0100 + + Add atomic ops for AIX + + Patch from Volker Simonis. + + src/hb-atomic-private.hh | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + +commit 98460779bae19e4d64d29461ff154b3527bf8420 +Author: Behdad Esfahbod +Date: Mon Dec 7 21:38:47 2015 +0100 + + Remove final pause from Arabic shaper + + Back in the old days, we used to apply 'calt' and 'cswh' in Arabic + shaper, + with a pause in between. Then we disabled the 'cswh' because + Microsoft + disabled it, but forgot to remove the unnecessary pause. Do that now. + + This has the benefit that it fixes shaping with monbaiti from + Windows 10. + In that version of that font, the lookups from 'calt' are duplicated + in + 'rclt', and Mongolian was changed to go through Universal Shaping + Engine. + We still use the Arabic shaper for Mongolian. With a pause after + 'calt', + we were applying the duplicate lookups from 'calt' and 'rclt' twice. + It + happened to be the case that these lookups were NOT idempotent. So we + were getting wrong shaping. See thread "Windows 10 monbaiti.ttf + upgrade + (5.01 -> 5.51) caused loss of diacritical marks when shaped with + harfbuz" + on the mailing list. This fixes that. + + src/hb-ot-shape-complex-arabic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dee0fbf9e2eac8b61730efc4978bc10c552b5227 +Merge: 255df680 a7ffe353 +Author: Behdad Esfahbod +Date: Mon Dec 7 10:44:08 2015 +0100 + + Merge pull request #192 from behdad/jfkthame-stch + + [issue 191] Make apply_stch() give a more precise fit + +commit 255df6801201fb22402420f7b7b7ea8b042df8ba +Author: Behdad Esfahbod +Date: Mon Dec 7 10:34:47 2015 +0100 + + Fix undefined behavior in cmp function + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=93274 + + src/hb-ot-map-private.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit fcf9e61bad13c828b5482f26491c82db65d91c96 +Author: Behdad Esfahbod +Date: Mon Dec 7 10:30:43 2015 +0100 + + Fix sorting order of ot_languages array + + Looks like the original sort was wrongly done. + Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=93275 + + src/hb-ot-tag.cc | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 70952ddb5a29c5bcbb4b6c3a05a428496033234a +Author: Behdad Esfahbod +Date: Mon Dec 7 10:28:46 2015 +0100 + + Add test to make sure ot-languages array is sorted + + Currently fails. Part of + https://bugs.freedesktop.org/show_bug.cgi?id=93275 + + src/Makefile.am | 9 ++++++++- + src/hb-ot-tag.cc | 23 +++++++++++++++++++++++ + 2 files changed, 31 insertions(+), 1 deletion(-) + +commit 8c37556f730d7e961394075cd863f624af4c53c4 +Merge: 8e5f9026 f35b3e93 +Author: Behdad Esfahbod +Date: Mon Dec 7 09:34:58 2015 +0100 + + Merge pull request #134 from ebraminio/dwrite + + Add working but less prefect DirectWrite backend + +commit a7ffe3535836032dba5559080dffeec79473197b +Author: jfkthame +Date: Sat Dec 5 17:47:37 2015 +0000 + + Make apply_stch() give a more precise fit + + This aims to make Syriac Abbr Mark sizing more accurate when repeating + segments are used, by adding an extra repeat and tightening up the + spacing slightly rather than leaving a shortfall corresponding to + a partial repeat-width. + + src/hb-ot-shape-complex-arabic.cc | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +commit 8e5f902656d2882d24c30e8b26ddbd3963baa55c +Author: Behdad Esfahbod +Date: Mon Nov 30 16:53:21 2015 -0800 + + src/test.cc: wrong field printed + + Fixes https://github.com/behdad/harfbuzz/issues/188 + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=93182 + + src/test.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6f2e6de1fae0ab2269b472a750788817de6c2a6e +Author: Simon Cozens +Date: Mon Oct 26 16:23:22 2015 +0900 + + Get font ascender and descender metrics from OS/2 table. + + src/hb-font-private.hh | 39 ++++++++++++++++++- + src/hb-font.cc | 102 + ++++++++++++++++++++++++++++++++++++++++++++++++- + src/hb-font.h | 62 ++++++++++++++++++++++++++++-- + src/hb-ft.cc | 21 ++++++++++ + src/hb-ot-font.cc | 58 ++++++++++++++++++++++++++-- + 5 files changed, 274 insertions(+), 8 deletions(-) + +commit 097c998a0c7b250924801bb69f5fa0c529edd183 +Author: Simon Cozens +Date: Mon Oct 26 16:22:38 2015 +0900 + + Parse the OS/2 table. + + src/Makefile.am | 1 + + src/hb-ot-os2-table.hh | 105 + +++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 106 insertions(+) + +commit d44d52bd0da033865641dfd39d94852119fd4fd7 +Author: Behdad Esfahbod +Date: Thu Nov 26 19:35:43 2015 -0500 + + 1.1.2 + + NEWS | 15 +++++++++++++++ + configure.ac | 2 +- + 2 files changed, 16 insertions(+), 1 deletion(-) + +commit 35d18585fc57750d817f57bfffe569069f9803b5 +Author: Behdad Esfahbod +Date: Thu Nov 26 19:30:37 2015 -0500 + + Fix a few docs blocks + + src/hb-buffer.cc | 4 ++++ + src/hb-glib.cc | 2 ++ + src/hb-ot-font.cc | 2 ++ + src/hb-ot-layout.cc | 6 ++++++ + src/hb-ot-shape.cc | 4 ++++ + 5 files changed, 18 insertions(+) + +commit 0e38c918b66df31978d8fd3d8271a9b781384545 +Author: Behdad Esfahbod +Date: Thu Nov 26 19:26:26 2015 -0500 + + [introspection] Make scanner happy with HB_EXTERN + + src/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit ea512f71084296be3bd893f78650def894066de0 +Author: Behdad Esfahbod +Date: Thu Nov 26 19:22:22 2015 -0500 + + Use C-style casts instead of compare to 0, to convert hb_bool_t + to bool + + src/hb-common.cc | 2 +- + src/hb-fallback-shape.cc | 2 +- + src/hb-font-private.hh | 2 +- + src/hb-ot-layout.cc | 2 +- + src/hb-ot-map.cc | 2 +- + src/hb-ot-shape-complex-hangul.cc | 2 +- + src/hb-ot-shape-complex-hebrew.cc | 2 +- + src/hb-ot-shape-complex-indic.cc | 4 ++-- + src/hb-ot-shape-normalize.cc | 6 +++--- + src/hb-ot-shape.cc | 2 +- + 10 files changed, 13 insertions(+), 13 deletions(-) + +commit 67a36a725e2a61a096ba0324f359d17f9b02d312 +Author: Behdad Esfahbod +Date: Thu Nov 26 18:48:42 2015 -0500 + + Fix vertical GPOS + + This was brorken earlier, though, it's really hard to notice it. + Unlike the glyph_h_origin(), an unset glyph_v_origin() does NOT + mean that the vertical origin is at 0,0. + + Related to https://github.com/behdad/harfbuzz/issues/187 + + src/hb-ot-shape.cc | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +commit 1c6a057dd1a52511474630896a597bf8e5215214 +Author: Behdad Esfahbod +Date: Thu Nov 26 18:48:30 2015 -0500 + + Add tests for previous commit + + test/shaping/Makefile.am | 1 + + .../sha1sum/49c9f7485c1392fa09a1b801bc2ffea79275f22e.ttf | Bin 0 -> + 1496 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/simple.tests | 2 ++ + 5 files changed, 5 insertions(+) + +commit c41c145c7386ebe72b1cfb0475d836a689fecc5e +Author: Behdad Esfahbod +Date: Thu Nov 26 18:43:15 2015 -0500 + + Make nil glyph_h_origin() function return true + + Fixes https://github.com/behdad/harfbuzz/issues/187 + + Funcs implementations that have a non-zero horizontal origin must + implement the glyph_h_origin() callback, nothing new here. + + Other implementations (all I know of!) can simply not set + glyph_h_origin() now. I did that for hb-ot and hb-ft in + 44f82750807475aa5b16099ccccd917d488df703, though that broke the + fallback shaper because the default was returning false... + + src/hb-font.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 766963adba6770dcd45de4417481ed8eda60a716 +Merge: b344af80 f798b8e2 +Author: Behdad Esfahbod +Date: Tue Nov 24 15:38:43 2015 -0600 + + Merge pull request #114 from ThePhD/vc++-fixes + + Fix all VC++ warnings and errors + +commit b344af80ca95b9eddfd6017aa6ae103388d6b5f8 +Merge: 662acd26 835bbdc7 +Author: Behdad Esfahbod +Date: Tue Nov 24 15:30:27 2015 -0600 + + Merge pull request #177 from fanc999/exporting + + Enable use of compiler directives to export symbols + +commit 662acd26d10c38e96a9afcdaab2cb2979794966f +Merge: b24e93e3 1979f6fe +Author: Behdad Esfahbod +Date: Tue Nov 24 15:29:44 2015 -0600 + + Merge pull request #181 from mhosken/master + + Fix y_scale problems in hb-gr + +commit b24e93e3a4d98111c4684fa08e9080b471881d5c +Author: Behdad Esfahbod +Date: Tue Nov 24 13:18:20 2015 -0600 + + 1.1.1 + + NEWS | 7 +++++++ + configure.ac | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) + +commit 233944ac91bb81250c0e63150eecfedfaf09f590 +Merge: 5a24b1d2 d5382019 +Author: Khaled Hosny +Date: Tue Nov 24 18:37:35 2015 +0400 + + Merge pull request #185 from khaledhosny/travis-osx + + [travis] Enable Mac OS X support + +commit d538201918e6932ef7645f8d5b2c3491954936f8 +Author: Khaled Hosny +Date: Tue Nov 24 12:46:35 2015 +0400 + + [travis] Enable Mac OS X support + + Fixes https://github.com/behdad/harfbuzz/issues/182 + + .travis.yml | 22 ++++++++++++++++------ + 1 file changed, 16 insertions(+), 6 deletions(-) + +commit 5a24b1d25c59865e298bf105f54503e79587265c +Author: Behdad Esfahbod +Date: Mon Nov 23 16:46:14 2015 -0600 + + [travis] Remove coverity scan + + I never could get it to work, and it's a proprietary platform. + + .travis.yml | 11 ----------- + README | 1 - + 2 files changed, 12 deletions(-) + +commit 1979f6fedca82fa1e4f65491de491db1aa6dc645 +Author: Martin Hosken +Date: Mon Nov 23 10:03:56 2015 +0700 + + Fix y_scale problems in hb-gr + + src/hb-graphite2.cc | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +commit 835bbdc7c92bd774ff92c42a9277ded72066d29d +Author: Chun-wei Fan +Date: Thu Nov 19 18:34:12 2015 +0800 + + Public headers: Decorate public symbols with HB_EXTERN + + This prepares the headers for exporting symbols using visibility + attributes or __declspec(dllexport), so that we do not need to + maintain + symbols listing files, as this is what was and is done in GLib + and GTK+. + + src/hb-blob.h | 24 +++++----- + src/hb-buffer.h | 100 +++++++++++++++++++------------------- + src/hb-common.h | 22 ++++----- + src/hb-coretext.h | 6 +-- + src/hb-face.h | 34 ++++++------- + src/hb-font.h | 114 + ++++++++++++++++++++++---------------------- + src/hb-ft.h | 18 +++---- + src/hb-glib.h | 8 ++-- + src/hb-gobject-enums.h.tmpl | 2 +- + src/hb-gobject-structs.h | 26 +++++----- + src/hb-graphite2.h | 4 +- + src/hb-icu.h | 6 +-- + src/hb-ot-font.h | 2 +- + src/hb-ot-layout.h | 56 +++++++++++----------- + src/hb-ot-shape.h | 4 +- + src/hb-ot-tag.h | 8 ++-- + src/hb-set.h | 52 ++++++++++---------- + src/hb-shape-plan.h | 18 +++---- + src/hb-shape.h | 10 ++-- + src/hb-unicode.h | 52 ++++++++++---------- + src/hb-uniscribe.h | 4 +- + src/hb-version.h.in | 6 +-- + src/hb.h | 4 ++ + 23 files changed, 292 insertions(+), 288 deletions(-) + +commit f798b8e2d683a1b89b6905b1a8615375b847b468 +Author: ThePhD +Date: Sat Nov 21 16:57:26 2015 -0500 + + c-style cast + + src/hb-ot-shape-complex-use.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a6991813659376a6a11c00a9f67d85b4f7ba9b5d +Merge: 1dc32ea4 f19c6db1 +Author: Behdad Esfahbod +Date: Fri Nov 20 13:28:42 2015 -0800 + + Merge pull request #176 from behdad/missing-braces + + Add braces for subobject initializer in _hb_font_funcs_nil + +commit 1dc32ea4d2f294f9d1ae1c8fd19fb75f9278223b +Author: Behdad Esfahbod +Date: Fri Nov 20 13:24:19 2015 -0800 + + Whitespace + + src/hb-private.hh | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +commit f94c0ecbb1488138d3ec3b9d6d9fb78113dfee4f +Author: Behdad Esfahbod +Date: Fri Nov 20 13:21:29 2015 -0800 + + Define HB_MARK_AS_FLAG_T as a macro instead of using templates + + The generic template operator overloading was causing more problems + than it + solved. Eg: + + https://github.com/behdad/harfbuzz/pull/163 + https://github.com/behdad/harfbuzz/issues/175 + + So, just use macros. + + Fixes https://github.com/behdad/harfbuzz/issues/175 + Fixes https://github.com/behdad/harfbuzz/pull/178 + + src/hb-private.hh | 27 +++++++++++---------------- + 1 file changed, 11 insertions(+), 16 deletions(-) + +commit f19c6db18e2e2dd0e9a406fc7e8533049fab48b0 +Author: jfkthame +Date: Fri Nov 20 08:43:49 2015 +0000 + + Add braces for subobject initializer in _hb_font_funcs_nil + + To avoid triggering -Wmissing-braces; see + https://bugzilla.mozilla.org/show_bug.cgi?id=1226175#c8 + + src/hb-font.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 9cc1ed4fa68075b3b142a2737438109772dd0002 +Author: Behdad Esfahbod +Date: Thu Nov 19 12:39:09 2015 -0800 + + Do not allow recursiving to same position and same lookup + + This is just to make it harder to be extremely slow. There definitely + are ways still, just harder. Oh well... how do we tame this problem + without solving halting problem?! + + Fixes https://github.com/behdad/harfbuzz/issues/174 + + src/hb-ot-layout-gsubgpos-private.hh | 5 +++++ + test/shaping/fonts/sha1sum/MANIFEST | 1 + + .../sha1sum/fab39d60d758cb586db5a504f218442cd1395725.ttf | Bin 0 -> + 1894 bytes + test/shaping/tests/fuzzed.tests | 1 + + 4 files changed, 7 insertions(+) + +commit 7d75eee799bbb5ee7eef2651cf7b7d3aee6f09b0 +Author: Behdad Esfahbod +Date: Thu Nov 19 12:03:04 2015 -0800 + + [fuzzing] Run fuzzing tests using hb-fuzzer as well + + test/fuzzing/Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 13188cba7f0eaacd587beeb1c2258526ae24c438 +Author: Behdad Esfahbod +Date: Thu Nov 19 11:59:03 2015 -0800 + + Revert "Fix hang in OOM situations" + + This reverts commit f0599db761d7fc2d585d86e757a797f75ebc7499. + + Commit abadc1717d997b69f987fdf1be9e12156d2d13d6 provides a better + fix for this. + + src/hb-buffer-private.hh | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +commit 18e1c6b6ef7c85a1b02e3dae86280d8ed6b65118 +Author: Behdad Esfahbod +Date: Thu Nov 19 11:50:58 2015 -0800 + + Revert "Make sure we make progress in OOM situations" + + This reverts commit 68b507a3c3c62c28c38e13fee733702bb703b6ca. + + Commit abadc1717d997b69f987fdf1be9e12156d2d13d6 provides a better + fix for this. + + src/hb-buffer-private.hh | 7 +++++-- + src/hb-buffer.cc | 31 ++++++++----------------------- + 2 files changed, 13 insertions(+), 25 deletions(-) + +commit e1118aeac3b5556df0ce502732df8ac92bdac45a +Author: Behdad Esfahbod +Date: Wed Nov 18 23:40:47 2015 -0800 + + 1.1.0 + + NEWS | 22 ++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 23 insertions(+), 1 deletion(-) + +commit 63fe05c8b1cd4f08b525028409e1299f34750810 +Author: Behdad Esfahbod +Date: Wed Nov 18 23:52:34 2015 -0800 + + Fix make distcheck + + src/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 9b087dec7753ad96d256ce1b9ae347bd8d697c75 +Author: Behdad Esfahbod +Date: Wed Nov 18 23:23:35 2015 -0800 + + [travis] Only coverity-scan the coverity_scan branch + + This essentially disables coverity-scan right now, until we find + a pattern to continuously submit branches there. + + For background reasoning, see: + Fixes https://github.com/behdad/harfbuzz/issues/171 + + .travis.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 85062e3b4655ec6d5c3cf5344ce22cd88c21a2aa +Author: Behdad Esfahbod +Date: Wed Nov 18 23:09:13 2015 -0800 + + Add tests for previous two commits + + To fully test what these are supposed to test, they should be run + against libharfbuzz-fuzzing.la instead of libharfbuzz.la, but for + now just record the files. + + .../sha1sum/43979b90b2dd929723cf4fe1715990bcb9c9a56b.ttf | Bin 0 -> + 1804 bytes + test/shaping/fonts/sha1sum/MANIFEST | 2 ++ + .../sha1sum/b9e2aaa0d75fcef6971ec3a96d806ba4a6b31fe2.ttf | Bin 0 -> + 1804 bytes + test/shaping/tests/fuzzed.tests | 2 ++ + 4 files changed, 4 insertions(+) + +commit 37b40cd8a18e25d3324f829acec197f016f4a524 +Author: Behdad Esfahbod +Date: Wed Nov 18 23:04:45 2015 -0800 + + Fix another move_to assertion failure + + If buf->idx is at end, don't set end past it... + + Fixes https://github.com/behdad/harfbuzz/issues/173 + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit abadc1717d997b69f987fdf1be9e12156d2d13d6 +Author: Behdad Esfahbod +Date: Wed Nov 18 17:52:08 2015 -0800 + + Try to better handle OOM situations + + Fixes assert fail in https://github.com/behdad/harfbuzz/issues/161 + with libharfbuzz-fuzzing. + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-ot-layout.cc | 2 +- + src/hb-ot-shape-complex-hangul.cc | 2 +- + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape-complex-thai.cc | 2 +- + src/hb-ot-shape-complex-use.cc | 8 +------- + src/hb-ot-shape-normalize.cc | 10 +++++----- + src/hb-ot-shape.cc | 2 +- + 8 files changed, 12 insertions(+), 18 deletions(-) + +commit ec625f7dfb5f6df19d35d81af6605d05e08321f2 +Author: Behdad Esfahbod +Date: Wed Nov 18 16:37:59 2015 -0800 + + Try to fix gnome-continuous build fail + + test/fuzzing/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit ff16ef3379e06afe44b5e78b8893aeae0cee2b5b +Author: Behdad Esfahbod +Date: Wed Nov 18 16:27:32 2015 -0800 + + Enable building a bounded version of the library for fuzzing + + test/fuzzing/hb-fuzzer links against libharfbuzz-fuzzing.so now. + + src/Makefile.am | 16 ++++++++++++++++ + test/fuzzing/Makefile.am | 9 ++------- + test/fuzzing/README | 6 ++---- + 3 files changed, 20 insertions(+), 11 deletions(-) + +commit e0082ae60dbd87d433f3b2b9d2bfa64b9a4c3663 +Author: Behdad Esfahbod +Date: Tue Nov 17 18:42:13 2015 -0800 + + Move things around + + src/hb-private.hh | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +commit dde8cc87bd880bd35baf764820f4c85bd0a58696 +Merge: e97835ad 167c3271 +Author: Behdad Esfahbod +Date: Tue Nov 17 18:40:10 2015 -0800 + + Merge pull request #163 from fanc999/msvc.src + + Update the sources so they will compile under Visual Studio + +commit 167c3271778cd1a8c4433b9d2230901ce17c099e +Author: Chun-wei Fan +Date: Mon Nov 9 17:17:56 2015 +0800 + + Fix build on MSVC >= 2012 + + Use the DEFINE_ENUM_FLAG_OPERATORS macro in winnt.h on Visual Studio, + which defines the bitwise operators for the enumerations that we + want to + mark as hb_mark_as_flags_t, which will take care of the situation + on newer + Visual Studio (>= 2012), where the build breaks with C2057 errors + as the + underlying types of the enumerations is not clear to the compiler + when we + do a bitwise op within the declaration of the enumerations themselves. + + Also disable the C4200 (nonstandard extension used : zero-sized + array in + struct/union) and C4800 ('type' : forcing value to bool 'true' or + 'false' + (performance warning)) warnings as the C4200 is the intended + scenario and + C4800 is harmless but is so far an unavoidable side effect of using + DEFINE_ENUM_FLAG_OPERATORS. + + src/hb-buffer-private.hh | 6 +++--- + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-private.hh | 4 ++-- + src/hb-ot-map-private.hh | 2 +- + src/hb-private.hh | 11 +++++++++++ + 5 files changed, 18 insertions(+), 7 deletions(-) + +commit 4d27bb87468a1b84387e7ce084e3d92c0fc8f065 +Author: Chun-wei Fan +Date: Fri Nov 6 14:28:30 2015 +0800 + + hb-ot-shape-complex-arabic.cc: Fix build on Visual Studio + + Visual Studio does not like declaring a enum variable within a for + statement, so fix the build by declaring the enum before doing the for + loop. + + src/hb-ot-shape-complex-arabic.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit a49e7b7e40127beba25f39ef3c10d7a77e2bb0f0 +Author: Chun-wei Fan +Date: Tue Nov 3 18:49:34 2015 +0800 + + MSVC builds: Add fallback implementation for pre-2013 MSVC + + Pre-2013 MSVC does not have scalbn() and scalbnf(), which are used + in the + utility programs. Add fallback implementations for these, which + can be + used when necessary. + + util/options.hh | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit 998e8dda938cfef0146f1bfc4e8973a0e12d7d35 +Author: Chun-wei Fan +Date: Mon Nov 2 16:55:29 2015 +0800 + + util: Fix build on Visual Studio + + Use the fallback implementation for lround() only on pre-2013 Visual + Studio, and ensure we are clear about the types of the parameters for + lround() and scalbnf(), since Visual Studio can be quite picky on + ambiguous parameter types. Also, use g_ascii_strcasecmp() rather than + strcasecmp() as we are already using GLib for this code and we are + assured that g_ascii_strcasemp() is available. + + For scalbnf() on pre-2013 Visaul Studio, a fallback implementation is + needed, but use another forced-included header for those compilers, + which + will be added later. + + Also use (char)27 on Visual Studio builds as '\e' is not a recognized + escape sequence, which will do the same thing. + + util/ansi-print.cc | 16 +++++++++------- + util/helper-cairo.cc | 20 ++++++++++---------- + util/options.cc | 2 +- + 3 files changed, 20 insertions(+), 18 deletions(-) + +commit e97835ad43f5c68e8cb29599246cae0f4461d663 +Author: Behdad Esfahbod +Date: Tue Nov 10 11:37:01 2015 -0800 + + [util] Fix crash when --output-file is specified but not + --output-format + + util/options.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit d5f0d7c9fb14255388ab616f56e178cb7ca10ec2 +Merge: 04ff23e7 529a9331 +Author: Behdad Esfahbod +Date: Sat Nov 7 07:50:58 2015 -0800 + + Merge pull request #167 from KonstantinRitt/unicode_cp_opt + + Micro optimizations to UTF-16 and UTF-32 codecs + +commit 04ff23e73d847ab3a5da0e9fac4fbca19aefd284 +Author: Behdad Esfahbod +Date: Fri Nov 6 16:29:44 2015 -0800 + + [arabic] Improve stretch length calculation + + Err on the side of being too short, than too wide. Reduces chance + of overlaps with neighboring glyphs. + + src/hb-ot-shape-complex-arabic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 59821ab8b413df3a444c38b80582a5137e364a70 +Author: Behdad Esfahbod +Date: Fri Nov 6 16:27:44 2015 -0800 + + [arabic] Don't stretch over cased letters + + Addresses + https://github.com/behdad/harfbuzz/commit/6e6f82b6f3dde0fc6c3c7d991d9ec6cfff57823d#commitcomment-14248516 + + src/hb-ot-shape-complex-arabic.cc | 24 + +++++++++++++++++++++- + src/hb-unicode-private.hh | 20 + ------------------ + .../script-syriac/misc/abbreviation-mark.txt | 4 ++-- + 3 files changed, 25 insertions(+), 23 deletions(-) + +commit 5337db29af39084d677a63154f404eca0c20cfeb +Author: Behdad Esfahbod +Date: Fri Nov 6 16:18:09 2015 -0800 + + Revert "Don't process lookups if buffer is in error" + + This reverts commit f92bd86cc8c11d262d1830c631cb7c63fc9d4bc8. + + We don't want to be like cairo, where as soon as there's an error, + nothing works anymore. So, lets process lookups as long as there's + no new memory needed. That's also a model that hides fewer bugs. + + src/hb-ot-layout.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 529a93312815dff3c2f37f880bf6ccb428bd3da0 +Author: Konstantin Ritt +Date: Sat Nov 7 02:00:04 2015 +0400 + + Micro optimization to hb_utf16_t and hb_utf32_t ::prev() + + Implement reverse lookup instead of re-using next() + + src/hb-utf-private.hh | 29 +++++++++++++++++++---------- + 1 file changed, 19 insertions(+), 10 deletions(-) + +commit 44ae9be7a29eebd6003cad2fdb90b40512a9c8eb +Author: Konstantin Ritt +Date: Sat Nov 7 01:58:38 2015 +0400 + + Nano optimization to hb_utf16_t and hb_utf32_t ::next() + + src/hb-utf-private.hh | 17 ++++++----------- + 1 file changed, 6 insertions(+), 11 deletions(-) + +commit a6d7668a954a763a053f8af8edbff4731aa43729 +Author: Behdad Esfahbod +Date: Fri Nov 6 09:46:54 2015 -0800 + + [fuzzing] Cap max buffer len at 128 + + test/fuzzing/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit f1c4adbcd3f6275e81e118ddadc9396f82daeccf +Author: Behdad Esfahbod +Date: Fri Nov 6 09:46:05 2015 -0800 + + Fix typo + + src/hb-buffer-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 68b507a3c3c62c28c38e13fee733702bb703b6ca +Author: Behdad Esfahbod +Date: Fri Nov 6 00:09:26 2015 -0800 + + Make sure we make progress in OOM situations + + src/hb-buffer-private.hh | 7 ++----- + src/hb-buffer.cc | 31 +++++++++++++++++++++++-------- + 2 files changed, 25 insertions(+), 13 deletions(-) + +commit 5a7eb5d4d862f402136044c19ead87ad098bd78f +Author: Behdad Esfahbod +Date: Fri Nov 6 00:01:24 2015 -0800 + + [fuzzing] Add test case for OOM + + From https://github.com/behdad/harfbuzz/issues/161 + + .../sha1sum/3511ff5c1647150595846ac414c595cccac34f18.ttf | Bin 0 -> + 1483 bytes + test/shaping/fonts/sha1sum/MANIFEST | 2 +- + test/shaping/tests/fuzzed.tests | 1 + + 3 files changed, 2 insertions(+), 1 deletion(-) + +commit f0599db761d7fc2d585d86e757a797f75ebc7499 +Author: Behdad Esfahbod +Date: Thu Nov 5 23:52:41 2015 -0800 + + Fix hang in OOM situations + + Fixes https://github.com/behdad/harfbuzz/issues/161 + + src/hb-buffer-private.hh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit f92bd86cc8c11d262d1830c631cb7c63fc9d4bc8 +Author: Behdad Esfahbod +Date: Thu Nov 5 23:52:29 2015 -0800 + + Don't process lookups if buffer is in error + + src/hb-ot-layout.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4301703bddb63a01651a0d58474bb15ac0ebbcf6 +Author: Behdad Esfahbod +Date: Thu Nov 5 23:44:59 2015 -0800 + + Limit buffer max size growth + + https://github.com/behdad/harfbuzz/issues/161 + + src/hb-buffer-private.hh | 11 +++++++++++ + src/hb-buffer.cc | 8 ++++++++ + src/hb-ot-shape.cc | 6 ++++++ + test/fuzzing/Makefile.am | 2 ++ + 4 files changed, 27 insertions(+) + +commit 19300183a6f0bac0d23f7a994b40a51e9c90d6e1 +Author: Behdad Esfahbod +Date: Thu Nov 5 23:08:50 2015 -0800 + + [fuzzing] Add build system + + configure.ac | 1 + + test/Makefile.am | 2 +- + test/fuzzing/Makefile.am | 44 + ++++++++++++++++++++++++++++++++++++++++++++ + test/fuzzing/README | 2 ++ + test/fuzzing/hb-fuzzer.cc | 4 ++-- + 5 files changed, 50 insertions(+), 3 deletions(-) + +commit 9c9ad214af43685b00f6d8493b7807d6607d4e2d +Author: Behdad Esfahbod +Date: Thu Nov 5 22:50:52 2015 -0800 + + [fuzzer] Add README + + https://github.com/behdad/harfbuzz/issues/139#issuecomment-154202645 + + test/fuzzing/README | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +commit 6e6f82b6f3dde0fc6c3c7d991d9ec6cfff57823d +Author: Behdad Esfahbod +Date: Thu Nov 5 17:29:03 2015 -0800 + + Implement SYRIAC ABBREVIATION MARK with 'stch' feature + + The feature is enabled for any character in the Arabic shaper. + We should experiment with using it for Arabic subtending marks. + Though, that has a directionality problem as well, since those + are used with digits... + + Fixes https://github.com/behdad/harfbuzz/issues/141 + + src/hb-ot-shape-complex-arabic.cc | 219 + ++++++++++++++++++++- + src/hb-unicode-private.hh | 19 ++ + .../shaper-arabic/script-syriac/misc/MANIFEST | 1 + + .../script-syriac/misc/abbreviation-mark.txt | 11 ++ + 4 files changed, 244 insertions(+), 6 deletions(-) + +commit c743ec5886a1f6d57de26da33a770a8706be83d6 +Author: Behdad Esfahbod +Date: Thu Nov 5 17:33:57 2015 -0800 + + [ft] Fix extents with negative scales + + Fixes https://github.com/behdad/harfbuzz/issues/162 + + src/hb-ft.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 73fec3992acb492829bde1d885f1ebeed8dcc133 +Author: Behdad Esfahbod +Date: Thu Nov 5 15:22:18 2015 -0800 + + Reserve a few scratch-flags bits for complex shapers + + src/hb-buffer-private.hh | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 136863371c1402769426d892aef1b92f9ca1a25e +Author: Behdad Esfahbod +Date: Thu Nov 5 13:24:15 2015 -0800 + + Add new shaper method postprocess_glyphs() + + Unused currently. To be used for Syriac stretch implementation. + + https://github.com/behdad/harfbuzz/issues/141 + + src/hb-ot-shape-complex-arabic.cc | 3 ++- + src/hb-ot-shape-complex-default.cc | 1 + + src/hb-ot-shape-complex-hangul.cc | 7 ++++--- + src/hb-ot-shape-complex-hebrew.cc | 1 + + src/hb-ot-shape-complex-indic.cc | 1 + + src/hb-ot-shape-complex-myanmar.cc | 2 ++ + src/hb-ot-shape-complex-private.hh | 9 +++++++++ + src/hb-ot-shape-complex-thai.cc | 1 + + src/hb-ot-shape-complex-tibetan.cc | 1 + + src/hb-ot-shape-complex-use.cc | 1 + + src/hb-ot-shape.cc | 9 ++++++--- + 11 files changed, 29 insertions(+), 7 deletions(-) + +commit 6c0ebd02c99e7536975ba7194832a1f33abd7faf +Author: Behdad Esfahbod +Date: Thu Nov 5 11:37:48 2015 -0800 + + [util] If font has color, generate PNG with color + + util/helper-cairo.cc | 33 ++++++++++++++++++++++++++------- + util/helper-cairo.hh | 6 +++++- + util/view-cairo.cc | 7 ++++++- + 3 files changed, 37 insertions(+), 9 deletions(-) + +commit e95eb23a4ee920eab1e2f4eec9cf490bb431452c +Author: Behdad Esfahbod +Date: Wed Nov 4 22:55:11 2015 -0800 + + Don't try zeroing marks by GDEF if there are no non-ASCII + + This one is a hack, but should be ok. + + src/hb-ot-shape.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 7fa54ed75aa30ae1d6ee9136ccb83b630c24fb65 +Author: Behdad Esfahbod +Date: Wed Nov 4 22:54:49 2015 -0800 + + Don't try zeroing mark attachments by Unicode if there's no non-ASCII + + src/hb-ot-shape.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 550bd14d2b21ec2a2b509ff42f4df4341dbf2d46 +Author: Behdad Esfahbod +Date: Wed Nov 4 22:58:58 2015 -0800 + + Actually commit changes for previous commit + + src/hb-buffer-private.hh | 2 ++ + src/hb-ot-layout-gpos-table.hh | 15 ++++++++------- + 2 files changed, 10 insertions(+), 7 deletions(-) + +commit ff31b3c1b8a2a21b57dba37eb5bb5db0579e0640 +Author: Behdad Esfahbod +Date: Wed Nov 4 22:42:41 2015 -0800 + + Skip GPOS cursive / attachment adjustmnent if none happened + + I'm starting to really like how free these new scratch_flags are. + + src/hb-ot-layout-gpos-table.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit 0f407325f6923db11d332585e8250e3646cb74d6 +Author: Behdad Esfahbod +Date: Wed Nov 4 22:28:44 2015 -0800 + + Minor + + src/hb-ot-shape.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 497a6c2071cd0638e4c6af07621d01335fd963a9 +Author: Behdad Esfahbod +Date: Wed Nov 4 22:24:19 2015 -0800 + + Skip forming clusters if text is all ASCII + + src/hb-ot-shape.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 28de104f15b80df4b678267c4488b7d09a42720c +Author: Behdad Esfahbod +Date: Wed Nov 4 22:00:25 2015 -0800 + + Move variable-sized struct member to end + + Hopefully makes clang build happy + + src/hb-font-private.hh | 21 ++++++++++----------- + src/hb-font.cc | 20 ++++++++++++++++++++ + 2 files changed, 30 insertions(+), 11 deletions(-) + +commit 5bc28b5f688ee90d103d052e98bc15d6e0e7e0b1 +Author: Behdad Esfahbod +Date: Wed Nov 4 21:53:16 2015 -0800 + + Optimize positioning for when h_origin is nil + + src/hb-ot-shape.cc | 38 ++++++++++++++++++++------------------ + 1 file changed, 20 insertions(+), 18 deletions(-) + +commit 762770c964f9f0591bf4c44427f73ea3e1c51733 +Author: Behdad Esfahbod +Date: Wed Nov 4 21:42:55 2015 -0800 + + Add font->has_...() to check for individual nil font funcs + + Hopefully this wouldn't break any compiler. There was some magic + moments to getting this to compile... + + src/hb-font-private.hh | 19 +++++++++++++++++-- + src/hb-font.cc | 7 +++++++ + 2 files changed, 24 insertions(+), 2 deletions(-) + +commit 88e9a9bcae61421d9dd65715d25e5f20b2847c03 +Author: Behdad Esfahbod +Date: Wed Nov 4 21:16:26 2015 -0800 + + Minor reshaping of hb_font_funcs_t implementation + + In anticipation of further changes. No functional changes. + + src/hb-font-private.hh | 80 + ++++++++++++++++++++++++++------------------------ + src/hb-font.cc | 4 +-- + 2 files changed, 43 insertions(+), 41 deletions(-) + +commit a6a7715bac8b0c8f5473b84bc649c315ad4d2d51 +Author: Behdad Esfahbod +Date: Wed Nov 4 20:51:21 2015 -0800 + + Comments + + src/hb-font-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6c48ec830ffac00a920d047ed77acd1b05549074 +Author: Behdad Esfahbod +Date: Wed Nov 4 20:47:42 2015 -0800 + + [ot] Remove font funcs that do nothing + + src/hb-ot-font.cc | 95 + ++++--------------------------------------------------- + 1 file changed, 7 insertions(+), 88 deletions(-) + +commit 75ea2daa1d9bbe235cd4a8570efb1913d58c3c62 +Author: Behdad Esfahbod +Date: Wed Nov 4 20:43:59 2015 -0800 + + [ot] Port ot font funcs to allocated object + + src/hb-ot-font.cc | 47 ++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 38 insertions(+), 9 deletions(-) + +commit 44f82750807475aa5b16099ccccd917d488df703 +Author: Behdad Esfahbod +Date: Wed Nov 4 20:40:05 2015 -0800 + + [ft] Remove font funcs that do nothing + + src/hb-ft.cc | 29 ++++------------------------- + 1 file changed, 4 insertions(+), 25 deletions(-) + +commit 7918c261efd283e0428ce7836e9e42768a6aa05c +Author: Behdad Esfahbod +Date: Wed Nov 4 20:37:49 2015 -0800 + + [ft] Port ft font funcs to allocated object + + src/hb-ft.cc | 45 ++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 36 insertions(+), 9 deletions(-) + +commit da29b43794cfa3f9a602c34b33c5d8a9c36f87b5 +Author: Behdad Esfahbod +Date: Wed Nov 4 20:22:44 2015 -0800 + + Separate nil font-funcs from parent-peeking font-funcs + + API change: all fonts created with hb_font_create() now inherit from + (ie have parent) hb_font_get_empty(). + + src/hb-font.cc | 211 + +++++++++++++++++++++++++++++++++++---------------- + test/api/test-font.c | 2 +- + 2 files changed, 145 insertions(+), 68 deletions(-) + +commit bee901b38ef3c26a04f69c299c8d5e028a0090e9 +Author: Behdad Esfahbod +Date: Wed Nov 4 19:28:17 2015 -0800 + + Optimize positioning direction calculations + + It makes the binary smaller AND faster. Yumm! + + src/hb-font-private.hh | 40 +++++++++++++++++++++++++++++++++++++++ + src/hb-ot-shape.cc | 51 + +++++++++++++++++++++++++++----------------------- + 2 files changed, 68 insertions(+), 23 deletions(-) + +commit e3e4bb011ae1a2f1ba05e7ea450595b185304bec +Author: Behdad Esfahbod +Date: Wed Nov 4 18:58:02 2015 -0800 + + Don't do fractions if buffer is ASCII-only + + src/hb-buffer-private.hh | 5 +++-- + src/hb-ot-layout-private.hh | 1 + + src/hb-ot-shape.cc | 3 ++- + 3 files changed, 6 insertions(+), 3 deletions(-) + +commit 6986208ba3b395534f4c7bcfa51df6bf9038f717 +Author: Behdad Esfahbod +Date: Wed Nov 4 18:46:22 2015 -0800 + + Optimize runs without Default_Ignorable's + + Now that we have a buffer-wide scratch flags facility, use it to + optimize away a few passes. + + src/hb-buffer-private.hh | 3 ++- + src/hb-ot-layout-private.hh | 4 +++- + src/hb-ot-shape-normalize.cc | 4 ++-- + src/hb-ot-shape.cc | 10 ++++++---- + src/hb-private.hh | 3 +++ + 5 files changed, 16 insertions(+), 8 deletions(-) + +commit 14c2de321826c36037adde859ccca3e2011325a9 +Author: Behdad Esfahbod +Date: Wed Nov 4 18:00:57 2015 -0800 + + Limit max edits during sanitize to 8 + + Used to be 100. If a tabe needs more than one or two edits, it's + probably completely bogus... + + Might help with speeding up fuzzing for + https://github.com/behdad/harfbuzz/issues/157 + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9cbc39aef962a95b0eba32c24ff9c415d1316d56 +Author: Behdad Esfahbod +Date: Wed Nov 4 18:00:53 2015 -0800 + + Minor + + src/hb-ot-shape-normalize.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 52e6c4e15893ed1cb0997795912a07b3e446b65a +Author: Behdad Esfahbod +Date: Wed Nov 4 17:45:06 2015 -0800 + + If font doesn't support U+2011, fall back to U+2010 + + Test passes now. + + src/hb-ot-shape-normalize.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 75483aafa6ad02d6391712d082d093823edcd758 +Author: Behdad Esfahbod +Date: Wed Nov 4 17:43:36 2015 -0800 + + Untangle if/else waterfall + + src/hb-ot-shape-normalize.cc | 40 + +++++++++++++++++++++++++++------------- + 1 file changed, 27 insertions(+), 13 deletions(-) + +commit 04fd8517f85ae9aa05b44f25578d2b19abfef7cb +Author: Behdad Esfahbod +Date: Wed Nov 4 17:38:22 2015 -0800 + + Add tests for hyphen fallback + + U+2011 is equivaent of U+2010, so we should do the fallback + for it. Currently fails. + + test/shaping/Makefile.am | 1 + + .../sha1sum/1c04a16f32a39c26c851b7fc014d2e8d298ba2b8.ttf | Bin 0 -> + 820 bytes + test/shaping/fonts/sha1sum/MANIFEST | 2 ++ + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/hyphens.tests | 2 ++ + 5 files changed, 6 insertions(+) + +commit 550417117da7e14457a11f49a20145311f58587b +Author: Behdad Esfahbod +Date: Wed Nov 4 17:37:30 2015 -0800 + + [test] Drop hintings when subsetting fonts to record + + test/shaping/record-test.sh | 1 + + 1 file changed, 1 insertion(+) + +commit 49ef630936325b2e56a870fcef9aa8473a8f8526 +Author: Behdad Esfahbod +Date: Wed Nov 4 17:27:07 2015 -0800 + + Adjust the width of various spaces if font does not cover them + + See discussion here: + https://github.com/behdad/harfbuzz/commit/81ef4f407d9c7bd98cf62cef951dc538b13442eb + + There's no way to disable this fallback, but I don't think it would + be needed. Let's hope for the best! + + Fixes https://github.com/behdad/harfbuzz/issues/153 + + src/hb-buffer-private.hh | 7 ++++ + src/hb-buffer.cc | 2 ++ + src/hb-ot-shape-fallback-private.hh | 4 +++ + src/hb-ot-shape-fallback.cc | 67 + +++++++++++++++++++++++++++++++++++++ + src/hb-ot-shape-normalize.cc | 1 + + src/hb-ot-shape.cc | 3 ++ + src/hb-unicode-private.hh | 56 +++++++++++++++++-------------- + test/shaping/tests/spaces.tests | 24 ++++++------- + 8 files changed, 126 insertions(+), 38 deletions(-) + +commit aa7044de0ceacd71cab19212d266c3a66c03b41e +Author: Behdad Esfahbod +Date: Wed Nov 4 16:25:57 2015 -0800 + + Generalize flags types + + src/hb-buffer-private.hh | 3 +++ + src/hb-ot-layout-common-private.hh | 5 +++++ + src/hb-ot-layout-private.hh | 8 +++++--- + src/hb-ot-map-private.hh | 16 +--------------- + src/hb-ot-shape.cc | 2 +- + src/hb-private.hh | 14 ++++++++++++++ + 6 files changed, 29 insertions(+), 19 deletions(-) + +commit 7793aad946e09b53523b30d57de85abd1d15f8b6 +Author: Behdad Esfahbod +Date: Wed Nov 4 14:48:46 2015 -0800 + + Normalize various spaces to space if font doesn't support + + This resurrects the space fallback feature, after I disabled + the compatibility decomposition. Now I can release HarfBuzz + again without breaking Pango! + + It also remembers which space character it was, such that later + on we can approximate the width of this particular space + character. That part is not implemented yet. + + We normalize all GC=Zs chars except for U+1680 OGHA SPACE MARK, + which is better left alone. + + src/hb-ot-layout-private.hh | 47 + +++------------------ + src/hb-ot-shape-normalize.cc | 12 +++++- + src/hb-unicode-private.hh | 40 + ++++++++++++++++++ + test/shaping/Makefile.am | 1 + + .../1c2c3fc37b2d4c3cb2ef726c6cdaaabd4b7f3eb9.ttf | Bin 0 -> 316 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/spaces.tests | 17 ++++++++ + 8 files changed, 76 insertions(+), 43 deletions(-) + +commit 8b3c7f9ede77052225cff8495d660860bf9c7629 +Author: Behdad Esfahbod +Date: Wed Nov 4 15:30:48 2015 -0800 + + [test] Support recording multiple lines of text in record-test.sh + + test/shaping/record-test.sh | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +commit 85658394809fe0593ab5dfb30fd96118765c7dc5 +Author: Behdad Esfahbod +Date: Wed Nov 4 14:46:52 2015 -0800 + + Protect against possible invalid-memory access after OOM + + src/hb-buffer-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4cc80bed25450af3d84a30ea417fa9275b15e014 +Author: Behdad Esfahbod +Date: Wed Nov 4 14:46:10 2015 -0800 + + Fix typo! + + Ouch! Fortunately that function was unused. + + src/hb-buffer-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9ac4b9656dd78ffd129bc3d560a92e2692bc3058 +Author: Behdad Esfahbod +Date: Wed Nov 4 14:18:39 2015 -0800 + + Add Unicode space category + + Unused so far. + + src/hb-ot-layout-private.hh | 78 + +++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 76 insertions(+), 2 deletions(-) + +commit 8249ec3f86510fd24462ce71ed64a6978f0ade17 +Author: Behdad Esfahbod +Date: Wed Nov 4 13:26:17 2015 -0800 + + Make top-byte of unicode_props available to be used differently per-GC + + src/hb-ot-layout-private.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit cc5d3a33882b52f906ee4346707700f5e846d2ac +Author: Behdad Esfahbod +Date: Wed Nov 4 13:21:25 2015 -0800 + + Towards using top-byte of unicode-props for more things + + src/hb-ot-layout-gsubgpos-private.hh | 1 - + src/hb-ot-layout-private.hh | 3 ++- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 2f38dde5a1ea5459789fabaee661cae9235d204e +Author: Behdad Esfahbod +Date: Wed Nov 4 13:17:33 2015 -0800 + + Add _hb_glyph_info_is_unicode_mark() + + Unused right now. + + src/hb-ot-layout-private.hh | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 90d75f93bb85aeb627c4e6bb9e4cbd75895c99f7 +Author: Behdad Esfahbod +Date: Tue Nov 3 12:58:12 2015 -0800 + + Tighten ccc-setting a bit and document it + + src/hb-ot-layout-private.hh | 12 +++++++++++- + src/hb-unicode-private.hh | 5 +++++ + 2 files changed, 16 insertions(+), 1 deletion(-) + +commit 2f0dfd43cdc2259e6117704f8077ab6951c761e5 +Author: Behdad Esfahbod +Date: Tue Nov 3 12:28:34 2015 -0800 + + Fix test expectation + + test/shaping/tests/fuzzed.tests | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit df698f3299d92867e3305715f675b2621c316acd +Author: Behdad Esfahbod +Date: Tue Nov 3 12:15:12 2015 -0800 + + [ot-font] Fix hmtx table length checking, *again* + + Exactly the same problem that I fixed in + 63ef0b41dc48d6112d1918c1b1de9de8ea90adb5 + + I rewrote the table checking yesterday in + 67f8821fb25d9bd55719f5e29a582ae1af4b02b3 + and introduced the exact same issue again. :( + Good thing we have ongoing fuzzing going now. Was discovered + immediately by libFuzzer. Thanks kcc! + + https://github.com/behdad/harfbuzz/issues/139#issuecomment-153449473 + Fixes https://github.com/behdad/harfbuzz/issues/156 + + src/hb-ot-font.cc | 4 ++-- + .../sha1sum/8240789f6d12d4cfc4b5e8e6f246c3701bcf861f.ttf | Bin 0 -> + 633 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/fuzzed.tests | 1 + + 4 files changed, 4 insertions(+), 2 deletions(-) + +commit 3530cc2d7c3b7102902cb0e38b0bf9f46188078d +Author: Behdad Esfahbod +Date: Tue Nov 3 11:34:47 2015 -0800 + + [util] Fix option-parsing leaks + + util/helper-cairo.cc | 7 +++++-- + util/main-font-text.hh | 22 ++++++++++++++++++--- + util/options.cc | 21 ++++++++++---------- + util/options.hh | 53 + +++++++++++++++++++++++++++++++++----------------- + 4 files changed, 70 insertions(+), 33 deletions(-) + +commit 642135f3b2d6d6eb800153c76c4718239733c0e6 +Author: Behdad Esfahbod +Date: Tue Nov 3 11:26:34 2015 -0800 + + [util] In --debug mode, duplicate font data + + This has the effect that the font data will end up in a memory + section malloc()ed exactly to its size. This gives us better + valgrind detection of out-of-bounds access. + + Previously, the font data was placed in a mmap()ed section or + GString-allocated area, which didn't have proper protections + at the end when running under valgrind. + + util/options.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit ed2024ef93ac3af214082016e5aa8c14db9d7515 +Author: Behdad Esfahbod +Date: Mon Nov 2 17:58:12 2015 -0800 + + [perf] Micro-optimize + + src/hb-ot-layout-private.hh | 23 ++++++++++++++--------- + 1 file changed, 14 insertions(+), 9 deletions(-) + +commit 76a5310a830c7ae12037b768c5043bef0ff733a0 +Author: Behdad Esfahbod +Date: Mon Nov 2 17:52:45 2015 -0800 + + Remove irrelevant comment + + I tried moving the is_default_ignorable() function to an INTERNAL + function. That made the binary size grow by 5k AND things got a + tad bit slower! + + src/hb-ot-layout-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 8259669fbd1b070fc02287325894caf1bc4d590e +Author: Behdad Esfahbod +Date: Mon Nov 2 17:44:05 2015 -0800 + + Minor + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-ot-shape-complex-thai.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 9382c471eabce8d36d3a73c97499ab60af422716 +Author: Behdad Esfahbod +Date: Mon Nov 2 17:36:51 2015 -0800 + + Combine unicode_props0/1 into a uint16 + + Slightly faster. In prep for more changes. + + src/hb-ot-layout-private.hh | 55 + ++++++++++++++++++++++++--------------------- + 1 file changed, 29 insertions(+), 26 deletions(-) + +commit 71277185454482cff9b0c10b85c416eb4d6e0ed9 +Author: Behdad Esfahbod +Date: Mon Nov 2 17:27:48 2015 -0800 + + [perf] Only call combining_class() for marks + + Saves some time. Also preparing for reusing the ccc byte for + other stuff. + + src/hb-ot-layout-private.hh | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit 5ba450407b9d9856453e63a815499da8721ff6a7 +Author: Behdad Esfahbod +Date: Mon Nov 2 15:43:08 2015 -0800 + + Make max context-length and max nesting level configurable + + ...at compile time. + + src/hb-ot-layout-common-private.hh | 10 ++++++++-- + src/hb-ot-layout-gsub-table.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 20 ++++++++++---------- + 3 files changed, 20 insertions(+), 14 deletions(-) + +commit 67f8821fb25d9bd55719f5e29a582ae1af4b02b3 +Author: Behdad Esfahbod +Date: Mon Nov 2 15:37:29 2015 -0800 + + [ot] Make bad-hmtx handling match FreeType + + Also route fuzzing-related tests through hb-ot-font, to reduce + dependency + on FreeType behavior for badly-broken fonts. Fixes failing test with + FreeType master. + + src/hb-ot-font.cc | 24 ++++++++++++++---------- + test/shaping/tests/fuzzed.tests | 10 +++++----- + 2 files changed, 19 insertions(+), 15 deletions(-) + +commit 672ca3b4e65a75fb3a418ec5d117ad242a98acbb +Author: Behdad Esfahbod +Date: Mon Oct 26 14:05:05 2015 -0700 + + Use templates for making sure expression is constant + + src/hb-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 5c8174eda32c08187bc2ed40eefa1017f5b40668 +Author: Behdad Esfahbod +Date: Wed Oct 21 18:51:40 2015 -0200 + + Update comments for removal of compat decompositions + + src/hb-ot-shape-normalize.cc | 16 ++-------------- + 1 file changed, 2 insertions(+), 14 deletions(-) + +commit f6799700404c49ae0a6018fd51be19551c76768a +Author: Behdad Esfahbod +Date: Wed Oct 21 17:20:55 2015 -0200 + + Disable compatibility decomposition usage during normalization + + Fixes https://github.com/behdad/harfbuzz/issues/152 + + src/hb-ot-shape-normalize.cc | 24 ------------------------ + 1 file changed, 24 deletions(-) + +commit ce889189c1f8ef5b400a17f623dcb8b935d1102b +Author: Behdad Esfahbod +Date: Wed Oct 21 11:23:12 2015 -0200 + + Fix two more -Wshadow warnings + + https://bugzilla.mozilla.org/show_bug.cgi?id=1215894 + + src/hb-open-type-private.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 4a6b1eedbb0044b57505eea65a329d2dc4f9f917 +Author: Behdad Esfahbod +Date: Wed Oct 21 11:20:55 2015 -0200 + + Fix one more -Wshadow warning + + https://bugzilla.mozilla.org/show_bug.cgi?id=1215894 + + src/hb-ot-layout-gsubgpos-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 6f932bc8f9045b224613a617af2b4f3450c79467 +Author: Behdad Esfahbod +Date: Wed Oct 21 11:16:49 2015 -0200 + + Fix a few more -Wshadow-local warnings + + https://bugzilla.mozilla.org/show_bug.cgi?id=1215894 + + src/hb-ot-shape-complex-indic.cc | 10 +++++----- + src/hb-ot-shape-complex-myanmar.cc | 10 +++++----- + src/hb-ot-shape-complex-use.cc | 10 +++++----- + 3 files changed, 15 insertions(+), 15 deletions(-) + +commit b90cb366d7723c28758c6b75a0770613fbb5456e +Author: Behdad Esfahbod +Date: Wed Oct 21 11:13:21 2015 -0200 + + Fix one -Wshadow-compatible-local warning + + From https://bugzilla.mozilla.org/show_bug.cgi?id=1215894 + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 50e5750bd8670b4cf4463471a2348d4c99c9d054 +Author: Behdad Esfahbod +Date: Wed Oct 21 11:10:10 2015 -0200 + + Avoid unnecessary cast to 64-bit + + Fixes https://github.com/behdad/harfbuzz/issues/146 + + Or I think it should. + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 305d2fbf5a2db51447c8ed894a48a88896930673 +Author: Behdad Esfahbod +Date: Wed Oct 21 11:04:28 2015 -0200 + + Add HB_FALLTHROUGH + + Borrowed from https://bugzilla.mozilla.org/show_bug.cgi?id=1215411 + + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape-complex-thai.cc | 2 +- + src/hb-ot-shape-fallback.cc | 4 +++- + src/hb-private.hh | 30 ++++++++++++++++++++++++++++++ + 4 files changed, 35 insertions(+), 3 deletions(-) + +commit f35b3e931ddacd075c5d0810e9b17de07b232ee2 +Author: Ebrahim Byagowi +Date: Fri Sep 11 09:48:12 2015 +0430 + + Add a prototype of DirectWrite as a shaping backend + + src/hb-directwrite.cc | 827 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-directwrite.h | 34 +++ + src/hb-shaper-list.hh | 3 + + 3 files changed, 864 insertions(+) + +commit 6486e3755482563ecd89aeb3f8348ed190945e26 +Author: Behdad Esfahbod +Date: Tue Oct 20 16:39:41 2015 -0200 + + Fix typo + + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 753ea7b90904c951c199861409458bea182abb37 +Author: Behdad Esfahbod +Date: Tue Oct 20 15:21:18 2015 -0200 + + Add BUILD.md to dist + + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 5d7a30fde09320c2c62c7c73570ce3f2e298eba6 +Merge: 904b0dc3 2fb95a0c +Author: Behdad Esfahbod +Date: Tue Oct 20 15:19:41 2015 -0200 + + Merge pull request #148 from ebraminio/inst + + Add BUILD.md based on harfbuzz.org docs + +commit 904b0dc3811464cf61dc9457664de95ee4f61a86 +Merge: 86cadc2c ba096bcc +Author: Behdad Esfahbod +Date: Mon Oct 19 16:59:43 2015 -0200 + + Merge pull request #147 from ebraminio/dockerci + + [ci] change to docker infrastructure + +commit ba096bcc28ca80e2096e0a15191848fcd175e395 +Author: Ebrahim Byagowi +Date: Mon Oct 19 21:41:01 2015 +0330 + + [ci] change to docker infrastructure + + .travis.yml | 24 ++++++++++++++++-------- + 1 file changed, 16 insertions(+), 8 deletions(-) + +commit 2fb95a0c9d2cb8b03b7c158706d6b0e41283a6df +Author: Ebrahim Byagowi +Date: Mon Oct 19 22:02:12 2015 +0330 + + Add BUILD.md based on harfbuzz.org docs + + BUILD.md | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + +commit 86cadc2cd4171050e9d74306b76c42f6ec74b861 +Author: Behdad Esfahbod +Date: Thu Oct 15 20:25:29 2015 -0300 + + 1.0.6 + + NEWS | 13 +++++++++++++ + configure.ac | 2 +- + 2 files changed, 14 insertions(+), 1 deletion(-) + +commit ca97ea7aa2cb7186f432aaba76f4f151aa90c1d0 +Author: Behdad Esfahbod +Date: Thu Oct 15 20:20:22 2015 -0300 + + [ft] Revert change-of-behavior of hb_ft_font_create() introduced + in 1.0.5 + + The default FreeType load flags where changed from FT_LOAD_NO_HINTING + to FT_LOAD_DEFAULT in 2a9627c5641cd000e2adff0e42a0dc687b53ec70. + This is crashing HarfBuzz-enabled FreeType as I suppose it causes + infinite recursion between HB and FT autohinter... + + Revert the behavior change. + + Fixes https://github.com/behdad/harfbuzz/issues/143 + + src/hb-ft.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 338ffec9e4a5819f2be21c3a320a567378c977b1 +Author: Behdad Esfahbod +Date: Thu Oct 15 12:55:57 2015 -0300 + + Add tests for a couple of fixed issues found by libFuzzer + + From: + https://github.com/behdad/harfbuzz/issues/139#issuecomment-147616887 + https://github.com/behdad/harfbuzz/issues/139#issuecomment-148289957 + + .../sha1sum/375d6ae32a3cbe52fbf81a4e5777e3377675d5a3.ttf | Bin 0 -> + 1024 bytes + .../sha1sum/641bd9db850193064d17575053ae2bf8ec149ddc.ttf | Bin 0 -> + 305 bytes + test/shaping/fonts/sha1sum/MANIFEST | 2 ++ + test/shaping/tests/fuzzed.tests | 2 ++ + 4 files changed, 4 insertions(+) + +commit 63ef0b41dc48d6112d1918c1b1de9de8ea90adb5 +Author: Behdad Esfahbod +Date: Thu Oct 15 12:47:22 2015 -0300 + + [ot-font] Fix hmtx wrong table length check + + Discovered by libFuzzer. Ouch! + + https://github.com/behdad/harfbuzz/issues/139#issuecomment-148289957 + + src/hb-ot-font.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 613e630617074eb9b62b794cc37c9b42a7fb079b +Author: Behdad Esfahbod +Date: Tue Oct 13 23:33:28 2015 -0300 + + Reduce max nesting level from 8 to 6 + + We probably should implement better system to catch cyclic lookups. + But for now, this speeds up worst case behavior with broken fonts + considerably without compromising legitimate usecases. + + https://github.com/behdad/harfbuzz/issues/139#issuecomment-147788447 + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ab170529246ad80830bef2b3c8b48e9a8d2b7483 +Author: Behdad Esfahbod +Date: Tue Oct 13 10:55:33 2015 -0300 + + 1.0.5 + + NEWS | 24 ++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 25 insertions(+), 1 deletion(-) + +commit ed13e2ce509408f849255be1d3cc3dbd7dbb3ba2 +Author: Behdad Esfahbod +Date: Tue Oct 13 10:32:56 2015 -0300 + + [ot-font] Fix leak + + https://github.com/behdad/harfbuzz/issues/139#issuecomment-147616887 + + src/hb-ot-font.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 55db94be2b754ba9b9121f09abcf8496c798affc +Author: Behdad Esfahbod +Date: Tue Oct 13 00:33:59 2015 -0400 + + Add test for previous commit + + .../sha1sum/0509e80afb379d16560e9e47bdd7d888bebdebc6.ttf | Bin 0 -> + 61 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/fuzzed.tests | 1 + + 3 files changed, 2 insertions(+) + +commit f96664974774bfeb237a7274f512f64aaafb201e +Author: Behdad Esfahbod +Date: Tue Oct 13 00:30:50 2015 -0400 + + Fix another memory access issue discovered by libFuzzer + + Fixes + https://github.com/behdad/harfbuzz/issues/139#issuecomment-146984679 + + src/hb-ot-layout-gpos-table.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit c1a5dc46c2231f7b62421e06b9766ccfebaf3ef5 +Author: Behdad Esfahbod +Date: Mon Oct 12 17:39:52 2015 -0400 + + [fuzz] Add fuzzing script from kcc@ + + https://github.com/behdad/harfbuzz/issues/139 + + test/fuzzing/hb-fuzzer.cc | 47 + +++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 47 insertions(+) + +commit cc6ea308d4c99b9dd6d625fa3a9b0ef62fa2614f +Author: Behdad Esfahbod +Date: Mon Oct 12 17:21:52 2015 -0400 + + Extern "C" custom-allocator declerations + + src/hb-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 98c6fccc00062ead7a86892dd059aa13d266b981 +Author: Behdad Esfahbod +Date: Sun Oct 11 21:41:04 2015 -0400 + + Add test for ee9b0b6cb5fdb08671ab064f26c299135f828260 + + .../sha1sum/5a5daf5eb5a4db77a2baa3ad9c7a6ed6e0655fa8.ttf | Bin 0 -> + 61 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/fuzzed.tests | 1 + + 3 files changed, 2 insertions(+) + +commit 50f489a0a013fc589626bb532a9f64f50bb41f58 +Author: Behdad Esfahbod +Date: Sun Oct 11 20:59:29 2015 -0400 + + Typo + + src/hb-font-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ee9b0b6cb5fdb08671ab064f26c299135f828260 +Author: Behdad Esfahbod +Date: Fri Oct 9 14:23:15 2015 -0400 + + Fix another sanitize bug + + Also discovered by "libFuzzer". + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 34379b49e6922b86c15ee62f7fe3bf016cdc2514 +Author: Behdad Esfahbod +Date: Fri Oct 9 12:34:02 2015 -0400 + + Add test for previous fix + + test/shaping/Makefile.am | 1 + + .../sha1sum/1a6f1687b7a221f9f2c834b0b360d3c8463b6daf.ttf | Bin 0 -> + 64 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/fuzzed.tests | 1 + + 5 files changed, 4 insertions(+) + +commit f396fbb000dc1c8acddbf6a16e193b328c5e551e +Author: Behdad Esfahbod +Date: Fri Oct 9 12:25:55 2015 -0400 + + Fix return value of sanitize when subformat is not readable + + This is a fix on top of the previous issue fixed in + c917965b9e6fe2b21ed6c51559673288fa3af4b7. + + This was caught by "libFuzzer" testing. + + src/hb-open-type-private.hh | 2 ++ + src/hb-ot-layout-gpos-table.hh | 15 +++++++-------- + src/hb-ot-layout-gsub-table.hh | 13 ++++++------- + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- + 4 files changed, 19 insertions(+), 19 deletions(-) + +commit 77a1a2bc18e7b04d4e352a8777ccce345b2f8659 +Author: Behdad Esfahbod +Date: Fri Oct 9 12:20:58 2015 -0400 + + Add hb_dispatch_context_t + + src/hb-open-type-private.hh | 26 ++++++++++++++++++++++---- + src/hb-ot-layout-gsubgpos-private.hh | 36 + ++++++++++++------------------------ + src/hb-ot-layout.cc | 8 +++----- + 3 files changed, 37 insertions(+), 33 deletions(-) + +commit 3e905e396bcd745bda88e751998a76556c5cb8c6 +Author: Behdad Esfahbod +Date: Thu Oct 8 12:51:02 2015 -0400 + + Add hb_font_set_parent() + + No reason to not have it. Makes life easier later. + We (hb-ft, hb-ot-font, etc) can use this API to inject new + parent into a font... + + src/hb-font.cc | 26 ++++++++++++++++++++++++++ + src/hb-font.h | 4 ++++ + test/api/test-font.c | 12 ++++++++++++ + 3 files changed, 42 insertions(+) + +commit edeb3dabf4a589d67c3f1da7ba43a74e4d3a9afd +Author: Behdad Esfahbod +Date: Thu Oct 8 12:47:15 2015 -0400 + + [ft] Add version for new API + + src/hb-ft.cc | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +commit 2a9627c5641cd000e2adff0e42a0dc687b53ec70 +Author: Behdad Esfahbod +Date: Wed Oct 7 17:33:20 2015 -0400 + + [ft] API: Add hb_font_[sg]et_load_flags() API + + This changes the default load_flags of fonts created using + hb_ft_font_create() from NO_HINTING to DEFAULT. Hope that doesn't + break too much client code. + + Code calling hb_ft_font_set_funcs() is unaffected. + + src/hb-ft.cc | 163 + +++++++++++++++++++++++++++++++++++++++-------------------- + src/hb-ft.h | 13 +++-- + 2 files changed, 118 insertions(+), 58 deletions(-) + +commit 3224a594dcf2164b5585b4ccba34f244af3f61b9 +Author: Behdad Esfahbod +Date: Wed Oct 7 17:33:02 2015 -0400 + + Minor + + src/hb-ot-font.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 52b418555b62a3b25399f202c1fa72ab7288c224 +Author: Behdad Esfahbod +Date: Sat Oct 3 13:20:55 2015 +0100 + + Allow compiling with custom allocators + + User can define hb_malloc_impl, etc, to name of custom allocator + functions + that have the same signature as malloc. + + src/hb-private.hh | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit 88da7bba9fa4665b33f5bfcd45add7443097eaf3 +Author: Behdad Esfahbod +Date: Fri Oct 2 14:38:20 2015 +0100 + + Default font scale to face upem + + Makes for a better default and avoids nasty inheritance issues. + See mailing list thread "Default hb_font_t scale". + + src/hb-font.cc | 2 ++ + test/api/test-font.c | 13 ++++++++----- + 2 files changed, 10 insertions(+), 5 deletions(-) + +commit 1866e17114b41d565eb066e7d9393c2ff3e0a12b +Author: Behdad Esfahbod +Date: Fri Oct 2 14:21:29 2015 +0100 + + Make hb_font_create_sub_font() NOT make parent immutable + + We don't rely on that. However, whenever hb_font_make_immutable() + is called, it makes its parenting chain immutable. + + src/hb-font.cc | 4 +++- + test/api/test-font.c | 21 +++++++++++++++------ + 2 files changed, 18 insertions(+), 7 deletions(-) + +commit 980e25cad2e58c31f5361862b9223d94ec47fc7a +Author: Behdad Esfahbod +Date: Fri Oct 2 08:21:12 2015 +0100 + + Fix hb-ot-shape-normalize with empty buffer + + Part of https://github.com/behdad/harfbuzz/issues/136 + + src/hb-ot-shape-normalize.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit a5efaac4ff61b587f228830b265b39fe8e5e4e47 +Author: Behdad Esfahbod +Date: Fri Oct 2 08:02:29 2015 +0100 + + Replace a couple of malloc()s with calloc() + + src/hb-face.cc | 2 +- + src/hb-shape-plan.cc | 2 +- + src/hb-shaper.cc | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 26ba4d1e1fb8949632fe08e6a7600badfba4f142 +Author: Behdad Esfahbod +Date: Fri Oct 2 07:25:52 2015 +0100 + + Fix segfault with empty buffer in hb_shape_plan_execute() + + Move the empty-buffer check from hb_shape_full() to + hb_shape_plan_execute(). + + Reported by Simon Cozens. + + src/hb-shape-plan.cc | 9 +++++++-- + src/hb-shape.cc | 5 ----- + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit 432ffc47a46d41bea17d839d0d3980e654c6e638 +Author: Behdad Esfahbod +Date: Wed Sep 30 22:51:16 2015 +0100 + + 1.0.4 + + NEWS | 7 +++++++ + configure.ac | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) + +commit b47159011ca518c3b94d782ed16a91ffe9dd2ab2 +Author: Behdad Esfahbod +Date: Tue Sep 29 14:57:02 2015 +0100 + + Define return_trace() + + Not functional change (expected!). + + src/hb-open-file-private.hh | 20 +-- + src/hb-open-type-private.hh | 62 +++---- + src/hb-ot-cmap-table.hh | 56 +++---- + src/hb-ot-glyf-table.hh | 4 +- + src/hb-ot-head-table.hh | 2 +- + src/hb-ot-hhea-table.hh | 2 +- + src/hb-ot-hmtx-table.hh | 2 +- + src/hb-ot-layout-common-private.hh | 108 ++++++------- + src/hb-ot-layout-gdef-table.hh | 44 ++--- + src/hb-ot-layout-gpos-table.hh | 252 +++++++++++++++-------------- + src/hb-ot-layout-gsub-table.hh | 304 + ++++++++++++++++++----------------- + src/hb-ot-layout-gsubgpos-private.hh | 205 +++++++++++------------ + src/hb-ot-layout-jstf-table.hh | 35 ++-- + src/hb-ot-maxp-table.hh | 5 +- + src/hb-ot-name-table.hh | 14 +- + src/hb-private.hh | 6 +- + 16 files changed, 575 insertions(+), 546 deletions(-) + +commit c917965b9e6fe2b21ed6c51559673288fa3af4b7 +Author: Behdad Esfahbod +Date: Tue Sep 29 14:45:35 2015 +0100 + + Add missing returns + + Fixes possible invalid read of two bytes. + + Reported by Behzad Najjarpour Jabbari, Secunia Research. + + src/hb-ot-layout-gpos-table.hh | 14 +++++++------- + src/hb-ot-layout-gsub-table.hh | 12 ++++++------ + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- + 3 files changed, 17 insertions(+), 17 deletions(-) + +commit f3159ba5141c2ab0e430e64742972df140f91c43 +Author: Behdad Esfahbod +Date: Tue Sep 29 14:34:56 2015 +0100 + + Micro-optimize hb_language_from_string() + + As measured / improved by Benson Limketkai. + + src/hb-common.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit f2ad935e19338a29113492150f0c5a5fd5befd75 +Author: Sascha Brawer +Date: Sun Jun 28 03:29:47 2015 +0200 + + Handle language tags that indicate phonetic IPA transcription + + The BCP-47 registry defines a variant subtag "fonipa" that can be used + in combination with arbitrary other language tags. For example, + "rm-CH-fonipa-sursilv" indicates the Sursilvan dialect of Romansh + as used in Switzerland, transcribed used the International Phonetic + Alphabet. + + http://www.iana.org/assignments/language-subtag-registry/language-subtag-registry + + src/hb-ot-tag.cc | 15 ++++++++++++++- + test/api/test-ot-tag.c | 7 +++++++ + 2 files changed, 21 insertions(+), 1 deletion(-) + +commit b8811429b6810c4f13be087b593a862c17d9d987 +Author: Behdad Esfahbod +Date: Thu Sep 3 15:53:22 2015 +0430 + + Fix Since tags + + Fixes https://github.com/behdad/harfbuzz/issues/103 + + src/hb-blob.cc | 24 +++++++++---------- + src/hb-buffer-serialize.cc | 10 ++++---- + src/hb-buffer.cc | 58 + +++++++++++++++++++++++----------------------- + src/hb-buffer.h | 9 +++++++ + src/hb-common.cc | 24 +++++++++---------- + src/hb-common.h | 3 +++ + src/hb-coretext.cc | 3 +++ + src/hb-font.h | 18 +++++++------- + src/hb-ft.cc | 6 ++--- + src/hb-graphite2.cc | 6 +++++ + src/hb-ot-layout.cc | 2 +- + src/hb-ot-tag.cc | 2 +- + src/hb-set.h | 3 +++ + src/hb-shape.cc | 2 +- + src/hb-unicode.cc | 18 +++++++------- + src/hb-unicode.h | 10 ++++---- + 16 files changed, 111 insertions(+), 87 deletions(-) + +commit 5d74ff02ab01df67808b416af8bb9cefb06f841e +Author: Behdad Esfahbod +Date: Thu Sep 3 14:55:59 2015 +0430 + + Fix Since: version tags on font and face APIs + + A while back we marked every API as version:1.0. We should fix + them all + to reflect real version they were introduced. This is a start. + + Patch from Nikolay Sivov. + + src/hb-face.cc | 22 ++++++++--------- + src/hb-font.cc | 76 + +++++++++++++++++++++++++++++----------------------------- + 2 files changed, 49 insertions(+), 49 deletions(-) + +commit 7f5405397406a24c5a001b5ef43dcf4d6926415e +Author: Behdad Esfahbod +Date: Tue Sep 1 17:03:50 2015 +0100 + + 1.0.3 + + NEWS | 11 +++++++++++ + configure.ac | 2 +- + 2 files changed, 12 insertions(+), 1 deletion(-) + +commit 5828c45d7a816ccd0a7f10a665ea3cf8cfd63b05 +Author: Behdad Esfahbod +Date: Tue Sep 1 16:26:35 2015 +0100 + + [indic] Add comments to merge_clusters calls + + src/hb-ot-shape-complex-indic.cc | 21 ++++++++++++++++----- + 1 file changed, 16 insertions(+), 5 deletions(-) + +commit bdc8215949a7add742cc800b4fdea6acaa37d152 +Author: Behdad Esfahbod +Date: Tue Sep 1 16:24:54 2015 +0100 + + [thai] Respect cluster-level > 0 + + src/hb-ot-shape-complex-thai.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5b31fe383ead726ec77062501ed3bb24c02842b3 +Author: Behdad Esfahbod +Date: Tue Sep 1 16:24:34 2015 +0100 + + [use] Merge /before/ reordering + + src/hb-ot-shape-complex-use.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0d438f89bd9422c66838c776eb4aa867de0a2ad8 +Author: Behdad Esfahbod +Date: Tue Sep 1 16:24:13 2015 +0100 + + [hangul] Merge /before/ reordering + + src/hb-ot-shape-complex-hangul.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f883de664fc4bfe01e30c89e07e31dc113f906d9 +Author: Behdad Esfahbod +Date: Tue Sep 1 16:23:40 2015 +0100 + + [OT] Merge /before/ reordering + + src/hb-ot-shape.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit c403d6320074455a5e8e48902c0ac4ee9685e33d +Author: Behdad Esfahbod +Date: Tue Sep 1 16:15:25 2015 +0100 + + [myanmar] Use buffer->sort() to sort cluster + + This can possibly produce more granular clusters. + + src/hb-ot-shape-complex-myanmar.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit e995d33c10a4bd9404699d01bddb2b69d811e9ed +Author: Behdad Esfahbod +Date: Tue Sep 1 16:13:32 2015 +0100 + + [OT] Merge clusters when reordering marks for normalization + + Fixes https://bugzilla.gnome.org/show_bug.cgi?id=541608 + and cluster test. + + src/hb-buffer-private.hh | 2 ++ + src/hb-buffer.cc | 21 +++++++++++++++++++++ + src/hb-ot-shape-normalize.cc | 2 +- + 3 files changed, 24 insertions(+), 1 deletion(-) + +commit b6d7d161a87b5dde710924e5c557d39c302f5630 +Author: Behdad Esfahbod +Date: Tue Sep 1 16:12:44 2015 +0100 + + [tests] Add Hebrew test for normalization under cluster-level=1 + + Currently fails. + https://bugzilla.gnome.org/show_bug.cgi?id=541608 + + .../sha1sum/43ef465752be9af900745f72fe29cb853a1401a5.ttf | Bin 0 -> + 4272 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/cluster.tests | 1 + + 3 files changed, 2 insertions(+) + +commit 93099748e39740a3f6f003c83d9dec1d21660ce8 +Author: Behdad Esfahbod +Date: Tue Sep 1 16:11:27 2015 +0100 + + Minor + + src/hb-private.hh | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit 85846b3de7491b6a07fed6a2c0c6c1b09943b249 +Author: Behdad Esfahbod +Date: Tue Sep 1 15:07:52 2015 +0100 + + Use insertion-sort instead of bubble-sort + + Needed for upcoming merge-clusters fix. + + src/hb-buffer.cc | 4 +-- + src/hb-ot-shape-complex-arabic-fallback.hh | 6 ++-- + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape-complex-myanmar.cc | 2 +- + src/hb-ot-shape-normalize.cc | 6 ++-- + src/hb-private.hh | 56 + +++++++++++++----------------- + 6 files changed, 34 insertions(+), 42 deletions(-) + +commit fad2674874591b4a1df822603144c8864f5364c1 +Author: Behdad Esfahbod +Date: Tue Sep 1 14:45:46 2015 +0100 + + Minor + + test/Makefile.am | 4 ++++ + test/api/Makefile.am | 4 ++++ + test/shaping/Makefile.am | 4 ++++ + 3 files changed, 12 insertions(+) + +commit 23e4fac6de913201f263a73e13d3c1fab31d1bdd +Author: Behdad Esfahbod +Date: Mon Aug 31 19:41:01 2015 +0100 + + Update git.mk from upstream + + git.mk | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +commit 5783e05f81bbf6debf2618c8994d6852630d9847 +Author: Behdad Esfahbod +Date: Mon Aug 31 19:18:10 2015 +0100 + + [docs] Move docs/reference/ contents into docs/ + + configure.ac | 3 +- + docs/Makefile.am | 117 + ++++++++++++++++++++++++++- + docs/{reference => }/harfbuzz-docs.xml | 0 + docs/{reference => }/harfbuzz-overrides.txt | 0 + docs/{reference => }/harfbuzz-sections.txt | 0 + docs/reference/Makefile.am | 118 + ---------------------------- + docs/{reference => }/usermanual-ch01.xml | 0 + docs/{reference => }/usermanual-ch02.xml | 0 + docs/{reference => }/usermanual-ch03.xml | 0 + docs/{reference => }/usermanual-ch04.xml | 0 + docs/{reference => }/usermanual-ch05.xml | 0 + docs/{reference => }/usermanual-ch06.xml | 0 + docs/{reference => }/version.xml.in | 0 + 13 files changed, 117 insertions(+), 121 deletions(-) + +commit cd5e3a13a6e0b6606d3a421f8cd44cdfb8314907 +Author: Behdad Esfahbod +Date: Mon Aug 31 19:16:41 2015 +0100 + + [docs] Fix out-of-tree build + + docs/reference/Makefile.am | 9 ++++++++- + docs/reference/harfbuzz-docs.xml | 12 ++++++------ + docs/{ => reference}/usermanual-ch01.xml | 0 + docs/{ => reference}/usermanual-ch02.xml | 0 + docs/{ => reference}/usermanual-ch03.xml | 0 + docs/{ => reference}/usermanual-ch04.xml | 0 + docs/{ => reference}/usermanual-ch05.xml | 0 + docs/{ => reference}/usermanual-ch06.xml | 0 + 8 files changed, 14 insertions(+), 7 deletions(-) + +commit 3899795fa3c3e058e3885ec7a6638f0597a752cc +Merge: d2059652 01e16e88 +Author: Behdad Esfahbod +Date: Mon Aug 31 10:46:01 2015 +0100 + + Merge pull request #131 from simoncozens/docs + + Use gtk-doc to build user's manual as well as reference + +commit 01e16e88f50b65b82dcb84773f532f18a351319f +Author: Simon Cozens +Date: Mon Aug 31 10:40:17 2015 +0100 + + Combine user / reference information into gtk-doc generated manual. + + docs/reference/harfbuzz-docs.xml | 91 + +++++++++++++++++++++++----------------- + 1 file changed, 52 insertions(+), 39 deletions(-) + +commit 11a07c4729174e1d4af028103ecb0a351e4c2707 +Author: Simon Cozens +Date: Mon Aug 31 10:39:10 2015 +0100 + + Correct tag hierarchy, to allow for table-of-contents entries. + + docs/usermanual-ch01.xml | 12 ++++++------ + docs/usermanual-ch02.xml | 8 ++++---- + docs/usermanual-ch03.xml | 24 ++++++++++++------------ + docs/usermanual-ch04.xml | 16 ++++++++-------- + docs/usermanual-ch05.xml | 12 ++++++------ + 5 files changed, 36 insertions(+), 36 deletions(-) + +commit 387d6af428ddd5d4f211fe5748412011013a3826 +Author: Simon Cozens +Date: Mon Aug 31 10:31:09 2015 +0100 + + Missing tag (oops). + + docs/usermanual-ch02.xml | 1 + + 1 file changed, 1 insertion(+) + +commit d205965286798af4b7ad07e1eafa58288bee4bdb +Author: Behdad Esfahbod +Date: Mon Aug 31 10:12:05 2015 +0100 + + [docs] Fix typo + + docs/usermanual-ch03.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c424b41705b50055c7f92b268cf78a2680af73af +Merge: 31594b98 5470e744 +Author: Behdad Esfahbod +Date: Mon Aug 31 09:53:16 2015 +0100 + + Merge pull request #129 from simoncozens/docs + + First two chapters. More to follow. + +commit 31594b98af0c9181982c77d8d3803753007f8fd4 +Author: Behdad Esfahbod +Date: Sun Aug 30 17:33:04 2015 +0100 + + [test] Fix test-object + + See previous commit. + + test/api/test-object.c | 4 ---- + 1 file changed, 4 deletions(-) + +commit 326b5ebf5748f547e4eb7388d66b79fe23130e2a +Author: Behdad Esfahbod +Date: Sun Aug 30 17:29:21 2015 +0100 + + Poison freed objects such that double-free is detected + + Previously we were setting refcount of freed objects to the inert + value, which + was harmful because it caused further destroy()s of the freed object + to NOT + call free() and hence hide the bug. Indeed, after eb0bf3ae6688b7 + test-object + was double-free'ing objects and this was never caught on Linux. + It only was + caught as crashing on Mac. + + Now we poison refcount upon freeing and check that it's valid + whenever reading + it. Makes test-object fail now. + + src/hb-object-private.hh | 21 ++++++++++++++++----- + 1 file changed, 16 insertions(+), 5 deletions(-) + +commit 5470e744dd264c2dc33437a68d20bcf7c5ffb905 +Author: Simon Cozens +Date: Sat Aug 29 08:21:18 2015 +0100 + + Current state and skeleton outline + + docs/usermanual-ch03.xml | 77 + ++++++++++++++++++++++++++++++++++++++++++++++++ + docs/usermanual-ch04.xml | 18 +++++++++++ + docs/usermanual-ch05.xml | 13 ++++++++ + docs/usermanual-ch06.xml | 8 +++++ + 4 files changed, 116 insertions(+) + +commit 6578575cc8aeb05341f2053039acfcd735707674 +Author: Behdad Esfahbod +Date: Tue Aug 25 20:24:59 2015 +0100 + + [GPOS] Fix cursive connection with mix of RTL and non-RTL lookups + + See thread "Issue with cursive attachment" started by Khaled. + Turned out fixing this wasn't as bad as I had assumed. I like the + new code better; we now have a theoretical model of cursive + connections that is easier to reason about. + + src/hb-ot-layout-gpos-table.hh | 34 ++++++++++++++++++++++++++++++++++ + 1 file changed, 34 insertions(+) + +commit 7368da67244ea53195cd9b95a5c57485df695732 +Author: Behdad Esfahbod +Date: Tue Aug 25 20:28:39 2015 +0100 + + [test] Add test for cursive-positioning with mixed directions + + Fails now. Fix coming. See thread "Issue with cursive attachment" + started by Khaled. Test fonts were made by modifying test font + from Khaled to add more anchors. + + test/shaping/Makefile.am | 1 + + .../sha1sum/298c9e1d955f10f6f72c6915c3c6ff9bf9695cec.ttf | Bin 0 -> + 2520 bytes + test/shaping/fonts/sha1sum/MANIFEST | 2 ++ + .../sha1sum/c4e48b0886ef460f532fb49f00047ec92c432ec0.ttf | Bin 0 -> + 2512 bytes + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/cursive-positioning.tests | 2 ++ + 6 files changed, 6 insertions(+) + +commit f0807654da160bd7ceb9aff5b8338ec0b643171c +Author: Simon Cozens +Date: Tue Aug 25 19:57:15 2015 +0100 + + First two chapters. More to follow. + + docs/usermanual-ch01.xml | 115 ++++++++++++++++++++++++++++++ + docs/usermanual-ch02.xml | 182 + +++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 297 insertions(+) + +commit 58f2a73fb95af42e264a91cdef7bb5a89e965601 +Author: Behdad Esfahbod +Date: Tue Aug 25 18:55:34 2015 +0100 + + [GPOS] Rewrite cursive attachment slightly differently + + In anticipation for upcoming fix for bug reported by + Khaled in thread "Issue with cursive attachment". + + src/hb-ot-layout-gpos-table.hh | 36 ++++++++++++++++++++++++------------ + 1 file changed, 24 insertions(+), 12 deletions(-) + +commit fdd1770e006ca2d2973c049177ceda87a575e07f +Author: Behdad Esfahbod +Date: Mon Aug 24 13:49:55 2015 +0100 + + Add API/cmdline to show glyph extents when serializing buffer + + New API: HB_BUFFER_SERIALIZE_FLAG_GLYPH_EXTENTS + + hb-shape now accepts --show-extents. + + Patch from Simon Cozens. + + src/hb-buffer-serialize.cc | 17 +++++++++++++++++ + src/hb-buffer.h | 3 ++- + util/hb-shape.cc | 2 ++ + util/options.cc | 1 + + util/options.hh | 2 ++ + 5 files changed, 24 insertions(+), 1 deletion(-) + +commit 2cee5b68a07b99214ef9428fe5d03e7b378a558f +Author: Behdad Esfahbod +Date: Mon Aug 24 13:45:12 2015 +0100 + + [ot-font] Fix short-offset calculation + + src/hb-ot-font.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit b50fcfa82994f93568a54dd1eb7fd327f6db5586 +Author: Behdad Esfahbod +Date: Sun Aug 23 14:42:20 2015 +0100 + + [ot-font] Implement glyph_extents() for TrueType fonts + + This brings ot-fonts into almost-complete shape and mostly in par with + ft font. + + src/Makefile.am | 1 + + src/hb-font.h | 9 +++-- + src/hb-ot-font.cc | 90 +++++++++++++++++++++++++++++++++++++++-- + src/hb-ot-glyf-table.hh | 104 + ++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-head-table.hh | 3 +- + 5 files changed, 198 insertions(+), 9 deletions(-) + +commit 0299b45000b5047c0b9bf0fe51f3b8b68a7982f8 +Author: Behdad Esfahbod +Date: Fri Aug 21 12:44:36 2015 +0100 + + Make BYTE a real type + + src/hb-open-type-private.hh | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +commit ed6962c795ae7c54aaee9ed5667fa65ccf7412bf +Author: Behdad Esfahbod +Date: Thu Aug 20 15:39:53 2015 +0100 + + [coretext] Use i32 instead of u32 as well + + Shouldn't cause *any* functional changes, but is more correct. + + src/hb-coretext.cc | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +commit 163c435f1807c138da9f74f09d29d913eb9e29e9 +Author: Behdad Esfahbod +Date: Thu Aug 20 15:39:06 2015 +0100 + + [uniscribe] Fix negative offsets + + Ouch! + + src/hb-uniscribe.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 789b89ef7130ffe5f22c571fc3cb4e6d35456654 +Author: Behdad Esfahbod +Date: Wed Aug 19 13:39:57 2015 +0100 + + 1.0.2 + + NEWS | 13 +++++++++++++ + configure.ac | 2 +- + 2 files changed, 14 insertions(+), 1 deletion(-) + +commit 958c268fa3a520666436e77a2111a3b564a36d96 +Author: Behdad Esfahbod +Date: Wed Aug 19 13:22:12 2015 +0100 + + [coretext] Add TODO item + + src/hb-coretext.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 7c5bee09d9c7c25672c7c77572ebae0b731892d0 +Author: Behdad Esfahbod +Date: Wed Aug 19 13:20:31 2015 +0100 + + [uniscribe] Fix font scale handling + + By default shape at upem (or ppem), and scale results. + Similar to work done in CoreText backend, but using upem as default. + + src/hb-uniscribe.cc | 25 +++++++++++++++++++------ + 1 file changed, 19 insertions(+), 6 deletions(-) + +commit 902e74a098dad8c3b487856284f9fdf99b04f9f1 +Author: Behdad Esfahbod +Date: Tue Aug 18 18:55:03 2015 +0100 + + Commented-out code to print buffer before each lookup + + To be turned into a useful HB_DEBUG_SHAPE infrastructure... + + src/hb-ot-layout.cc | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit 75504a50488a6aac0b9789f728fb5b87e641d4c3 +Author: Behdad Esfahbod +Date: Tue Aug 18 18:47:02 2015 +0100 + + Allow serializing buffer with output-buffer being used + + Ie, don't call get_positions() if positions are not + requested for serialization. + + src/hb-buffer-serialize.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit e47b772a56af44a9a4f9ec907ee2091b725b94c1 +Author: Behdad Esfahbod +Date: Tue Aug 18 18:42:47 2015 +0100 + + [ot] Change buffer content type right after we map to glyphs + + Needed for upcoming debug output changes. + + src/hb-ot-shape.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit d104415e4c1e0f9140f794cd8d09c6460c63e966 +Author: Behdad Esfahbod +Date: Tue Aug 18 17:33:34 2015 +0100 + + [Android.mk] Update for SEA removal and USE addition + + Android.mk | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit ddd6bf12f1cabaa298feed820313483b9893528c +Author: Behdad Esfahbod +Date: Tue Aug 18 15:55:09 2015 +0100 + + Don't declare dependency on freetype in harfbuzz.pc + + See comments. + + src/Makefile.am | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 2c8b3b2e5312c9858584f568b1528c57e5bb8a10 +Author: Behdad Esfahbod +Date: Tue Aug 18 14:36:43 2015 +0100 + + [debug] Print lookup index in debug-apply output + + src/hb-ot-layout-gpos-table.hh | 5 ++++- + src/hb-ot-layout-gsub-table.hh | 5 ++++- + src/hb-ot-layout-gsubgpos-private.hh | 7 +++++-- + src/hb-ot-layout.cc | 3 ++- + 4 files changed, 15 insertions(+), 5 deletions(-) + +commit 50ad7788eeb7160caef4ec78e65c7c630e601b06 +Author: Behdad Esfahbod +Date: Tue Aug 18 10:22:16 2015 +0100 + + [coretext] Remove assert that kicks in on Mac OS 10.6 + + http://crbug.com/419769 + + src/hb-coretext.cc | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +commit 2b646fa07f5f9d4d10d563a91d22a2750b5fc771 +Author: Behdad Esfahbod +Date: Mon Aug 17 16:03:28 2015 +0200 + + Remove unused function + + src/hb-ot-shape-complex-use.cc | 8 -------- + 1 file changed, 8 deletions(-) + +commit 23237b0279a04407addf33f599c45faa60f002ca +Author: ThePhD +Date: Fri Aug 14 01:19:08 2015 -0400 + + Last apparent boolean fix! + + src/hb-ot-shape-complex-use.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5c99cf93d6242803bddcac2ca8300fdec7e0f8a7 +Merge: 8ad89f05 539a610e +Author: ThePhD +Date: Fri Aug 14 01:02:00 2015 -0400 + + Merge branch 'master' into vc++-fixes + +commit 539a610e2e72375e598ab29fd390ed9ec93816d5 +Author: Behdad Esfahbod +Date: Tue Aug 11 12:58:49 2015 +0200 + + Add Libs.private and Requires.private to harfbuzz.pc + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=64501 + + configure.ac | 12 +++++++++--- + src/Makefile.am | 15 ++++++++++++--- + src/harfbuzz.pc.in | 2 ++ + 3 files changed, 23 insertions(+), 6 deletions(-) + +commit c7dfe316f8c0fc04b7976fca5e58eb46d91b4821 +Author: jfkthame +Date: Fri Aug 7 17:55:03 2015 +0100 + + Don't rely on .cluster in _hb_ot_shape_normalize() + + Fixes https://github.com/behdad/harfbuzz/pull/124 + + src/hb-ot-shape-normalize.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9099e48e29fe5cfdf8566c8f1ba6ddc8c0799e7e +Author: jfkthame +Date: Fri Aug 7 17:51:28 2015 +0100 + + Don't rely on .cluster field in fallback_position + + Fixes tests/cluster. + + Fixes https://github.com/behdad/harfbuzz/pull/123 + + src/hb-ot-shape-fallback.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit f3792342f670978cdc3f8512fb5e80314ca0678d +Author: Behdad Esfahbod +Date: Sat Aug 8 18:02:18 2015 +0200 + + [tests] Add test for fallback positioning with cluster_level > 0 + + For https://github.com/behdad/harfbuzz/pull/123 + Currently fails. Fix coming. + + test/shaping/Makefile.am | 1 + + .../sha1sum/6466d38c62e73a39202435a4f73bf5d6acbb73c0.ttf | Bin 0 -> + 824 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/cluster.tests | 1 + + 5 files changed, 4 insertions(+) + +commit bd22a5cfae24b3b9253bccaeb139e698e74cd0c3 +Author: Behdad Esfahbod +Date: Fri Aug 7 11:13:27 2015 +0200 + + Bug 91559 - HarfBuzz 1.0.1: Inconsistent DLL files + specified/created... + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=91559 + + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 02d6439f420d959183dd446abd0b0118ee1ee061 +Merge: 9002c27b 160f6355 +Author: Behdad Esfahbod +Date: Mon Aug 3 22:47:18 2015 +0300 + + Merge pull request #122 from RomainNaour/static-fix + + fix static linking with icu-uc + +commit 160f635523d596f61e292776f638d4eb09673463 +Author: Romain Naour +Date: Wed Jul 22 23:26:23 2015 +0200 + + fix static linking with icu-uc + + When linking test-unicode statically it needs $(ICU_LIBS) + which contains all required flags. + Especially -lstdc++. + + Fixes: + http://autobuild.buildroot.net/results/210/2107f9dfb39eeb6559fb4271c7af8b39aef521ca/ + + Signed-off-by: Romain Naour + + test/api/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9002c27b2f54bb5135db92045c0d770b47317577 +Author: Behdad Esfahbod +Date: Mon Jul 27 12:17:54 2015 +0200 + + 1.0.1 + + NEWS | 9 ++++++++- + configure.ac | 2 +- + 2 files changed, 9 insertions(+), 2 deletions(-) + +commit f1c20e1ba5bf218df7dc3e198bdcf1f449fc9387 +Author: Behdad Esfahbod +Date: Mon Jul 27 12:16:02 2015 +0200 + + [USE] Fix out-of-bounds static array access + + src/hb-ot-shape-complex-use.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 260442346a5756c3538ee8fcbf157d1cddcf6f36 +Author: Behdad Esfahbod +Date: Sun Jul 26 23:39:10 2015 +0200 + + 1.0.0 + + NEWS | 10 ++++++++++ + configure.ac | 4 ++-- + src/Makefile.am | 2 +- + 3 files changed, 13 insertions(+), 3 deletions(-) + +commit df6cb84449a473d540821e41fb5007b59644780f +Merge: 2ed6be66 786ba458 +Author: Behdad Esfahbod +Date: Sun Jul 26 19:40:55 2015 +0200 + + Merge branch 'use' + +commit 2ed6be66703e6cc67f3a3746e197001dad3d9b74 +Author: Behdad Esfahbod +Date: Sun Jul 26 19:29:53 2015 +0200 + + 0.9.42 + + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + 2 files changed, 13 insertions(+), 1 deletion(-) + +commit 23e56e088a721863cfdef4f027fb66eecbd77457 +Author: Behdad Esfahbod +Date: Sat Jul 25 17:36:46 2015 +0200 + + Fix broken sentence + + src/hb-set-private.hh | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit 91a2e5d2878a8c0b4d4500e3d52d4fbaaf1ac0d7 +Author: Grigori Goronzy +Date: Wed Jul 8 23:28:11 2015 +0200 + + Update UCDN to upstream commit 8af93f30 + + This adds support for Unicode 8.0 and fixes a bug with wrong + properties + for ranges of codepoints. + + src/hb-ucdn.cc | 6 + + src/hb-ucdn/ucdn.h | 6 + + src/hb-ucdn/unicodedata_db.h | 2167 + +++++++++++++++++++++--------------------- + 3 files changed, 1118 insertions(+), 1061 deletions(-) + +commit 786ba45847127b9cd4d9c0c01ae0e6c61f3a8e06 +Author: Behdad Esfahbod +Date: Thu Jul 23 13:04:34 2015 +0100 + + [test] Encode Kharoshti text + + Ouch! + + .../in-tree/shaper-use/script-kharoshti/misc.txt | 72 + +++++++++++----------- + 1 file changed, 36 insertions(+), 36 deletions(-) + +commit b4231255032e243153a6f32cf8c93c158cb0bf6a +Author: Behdad Esfahbod +Date: Thu Jul 23 13:01:55 2015 +0100 + + [test] Add Batak and Buginese test texts + + test/shaping/texts/in-tree/shaper-use/MANIFEST | 2 + + .../texts/in-tree/shaper-use/script-batak/MANIFEST | 1 + + .../texts/in-tree/shaper-use/script-batak/misc.txt | 9 +++ + .../in-tree/shaper-use/script-buginese/MANIFEST | 1 + + .../in-tree/shaper-use/script-buginese/misc.txt | 70 + ++++++++++++++++++++++ + 5 files changed, 83 insertions(+) + +commit b8c159ffccad090974a2b97be0a0140fa09af132 +Author: Behdad Esfahbod +Date: Thu Jul 23 12:59:17 2015 +0100 + + [test] Remove shaper-sea texts under shaper-use + + test/shaping/texts/in-tree/MANIFEST | + 1 - + test/shaping/texts/in-tree/shaper-sea/MANIFEST | + 2 -- + test/shaping/texts/in-tree/shaper-sea/script-cham/MANIFEST | + 1 - + test/shaping/texts/in-tree/shaper-sea/script-tai-tham/MANIFEST | + 1 - + test/shaping/texts/in-tree/shaper-use/MANIFEST | + 2 ++ + .../{shaper-sea/script-cham/misc => shaper-use/script-cham}/MANIFEST + | 0 + .../{shaper-sea/script-cham/misc => shaper-use/script-cham}/misc.txt + | 0 + .../script-tai-tham/misc => shaper-use/script-tai-tham}/MANIFEST + | 0 + .../script-tai-tham/misc => shaper-use/script-tai-tham}/misc.txt + | 0 + .../script-tai-tham/misc => shaper-use/script-tai-tham}/torture.txt + | 0 + 10 files changed, 2 insertions(+), 5 deletions(-) + +commit 67ba7320cc5545baeacfcff64cea338223b9bd6d +Author: Behdad Esfahbod +Date: Thu Jul 23 12:58:21 2015 +0100 + + [test] Remove New Tai Lue texts + + New Tai Lue changed encoding to visual, boring, model. + + test/shaping/texts/in-tree/shaper-sea/MANIFEST | + 1 - + test/shaping/texts/in-tree/shaper-sea/script-new-tai-lue/MANIFEST | + 1 - + test/shaping/texts/in-tree/shaper-sea/script-new-tai-lue/misc/MANIFEST | + 1 - + test/shaping/texts/in-tree/shaper-sea/script-new-tai-lue/misc/misc.txt | + 1 - + 4 files changed, 4 deletions(-) + +commit c81d957a264539dfe3252f9a94ee066c4a44edf4 +Author: Behdad Esfahbod +Date: Thu Jul 23 12:50:48 2015 +0100 + + [test] Add tests for improved 'vert' feature + + test/shaping/Makefile.am | 1 + + .../sha1sum/191826b9643e3f124d865d617ae609db6a2ce203.ttf | Bin 0 -> + 2140 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/vertical.tests | 1 + + 5 files changed, 4 insertions(+) + +commit 8a6a16dbcb1808c7ed50f9ba320384565bbf405a +Author: Behdad Esfahbod +Date: Thu Jul 23 12:49:09 2015 +0100 + + [test] Add recently added test + + Ouch. + + test/shaping/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 895fb31c7f0201f13df5a6866b367476bc4aab2e +Author: Behdad Esfahbod +Date: Thu Jul 23 12:14:03 2015 +0100 + + [test] Support additional options to hb-shape in micro-test suite + + test/shaping/record-test.sh | 47 + ++++++++++++++++++---- + test/shaping/run-tests.sh | 9 ++++- + test/shaping/tests/arabic-fallback-shaping.tests | 2 +- + test/shaping/tests/arabic-feature-order.tests | 6 +-- + test/shaping/tests/context-matching.tests | 6 +-- + test/shaping/tests/default-ignorables.tests | 2 +- + test/shaping/tests/hangul-jamo.tests | 4 +- + test/shaping/tests/indic-joiner-candrabindu.tests | 4 +- + test/shaping/tests/indic-old-spec.tests | 4 +- + test/shaping/tests/indic-pref-blocking.tests | 4 +- + .../tests/mongolian-variation-selector.tests | 6 +-- + test/shaping/tests/zero-width-marks.tests | 4 +- + 12 files changed, 67 insertions(+), 31 deletions(-) + +commit 0f98fe88f42471eb8fb28d08d45eca9cd8303f7a +Author: Behdad Esfahbod +Date: Thu Jul 23 11:52:11 2015 +0100 + + [ot] Search globally for 'vert' feature if not found in specified + script/lang + + Fixes https://github.com/behdad/harfbuzz/issues/63 + + src/hb-ot-layout-private.hh | 9 +++++++++ + src/hb-ot-layout.cc | 22 ++++++++++++++++++++++ + src/hb-ot-map-private.hh | 7 ++++--- + src/hb-ot-map.cc | 10 ++++++++++ + src/hb-ot-shape.cc | 6 +++++- + 5 files changed, 50 insertions(+), 4 deletions(-) + +commit f327aacfa107bbef0c823ef9c3b7dfc91316040c +Author: Behdad Esfahbod +Date: Thu Jul 23 11:32:59 2015 +0100 + + [ot] Minor + + src/hb-ot-shape.cc | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +commit d78463c8016ff1852233479a1ebde30c3bb6de6e +Author: Behdad Esfahbod +Date: Thu Jul 23 10:11:35 2015 +0100 + + Minor debug output fix + + src/hb-ot-layout.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d99f50bde0e8be0866385ca6886938d2023dbd4f +Author: Behdad Esfahbod +Date: Thu Jul 23 10:08:48 2015 +0100 + + Add missing TRACE_RETURN + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2dc8e3f470d7c0b579f867605b8bf40688bc5722 +Author: Behdad Esfahbod +Date: Thu Jul 23 10:07:21 2015 +0100 + + [ot] Add missing return! + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 582069172c39326c7f94373793c656439a4c2b59 +Author: Behdad Esfahbod +Date: Wed Jul 22 18:44:59 2015 +0100 + + Add test case for deleting default ignorables with positioning + + .../sha1sum/051d92f8bc6ff724511b296c27623f824de256e9.ttf | Bin 0 -> + 2028 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/default-ignorables.tests | 1 + + 4 files changed, 3 insertions(+) + +commit 8cfbc304ee563ec96e402beed34b10b6c0950a6a +Author: Behdad Esfahbod +Date: Wed Jul 22 18:41:10 2015 +0100 + + Fix hide-default-ignorables after + f0010dfd01ef4a927b0bdc175dd4e343a8637174 + + We can't delete things before hb_ot_layout_position_finish(). So, + just zero the advance before it, and remove later. + + src/hb-ot-shape.cc | 25 +++++++++++++++++++------ + 1 file changed, 19 insertions(+), 6 deletions(-) + +commit 2dbd3d29d6548bd96fd976606ed689fac8ad8817 +Author: Behdad Esfahbod +Date: Wed Jul 22 18:28:39 2015 +0100 + + Fix hide-ignorables if font doesn't have space glyph + + Was broken by 82b521aeb7cc73879b44ca4278d6fa8b4347527f, as we have + positioning data by then and can't use the output buffer. Ouch! + + src/hb-buffer-private.hh | 18 ------------------ + src/hb-ot-shape.cc | 44 + +++++++++++++++++++++++++++++++++++--------- + 2 files changed, 35 insertions(+), 27 deletions(-) + +commit 4ba796b26ee62de0d2830a550f3aa3b4aecf6f59 +Author: Behdad Esfahbod +Date: Wed Jul 22 17:41:31 2015 +0100 + + Refactor _hb_glyph_info_is_default_ignorable() + + src/hb-ot-layout-gsubgpos-private.hh | 3 +-- + src/hb-ot-layout-private.hh | 4 +++- + src/hb-ot-shape.cc | 9 +++------ + 3 files changed, 7 insertions(+), 9 deletions(-) + +commit f0010dfd01ef4a927b0bdc175dd4e343a8637174 +Author: Behdad Esfahbod +Date: Wed Jul 22 17:36:23 2015 +0100 + + [ot] Hide default-ignorables before finishing off positioning + + For example, fixes the following sequence with Arial XP: + 628 25cc 651 25cc 64e 3a 20 628 651 34f 64e + 628 25cc 64e 25cc 651 3a 20 628 64e 34f 651 + + Discovered as part of: + https://bugs.freedesktop.org/show_bug.cgi?id=85873 + + src/hb-ot-shape.cc | 125 + +++++++++++++++++++++++++++-------------------------- + 1 file changed, 63 insertions(+), 62 deletions(-) + +commit 376d587f36b4ff10342ee6ca3bacd73532ea44c8 +Author: Behdad Esfahbod +Date: Wed Jul 22 16:51:12 2015 +0100 + + Implement more granular cluster-merging + + TODO: Documentation. + + Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=71445 + + NEWS | 8 +++++++ + src/hb-buffer-private.hh | 1 + + src/hb-buffer.cc | 46 + ++++++++++++++++++++++++++++++++++----- + src/hb-buffer.h | 12 ++++++++++ + src/hb-ot-shape-complex-hangul.cc | 13 +++++------ + src/hb-ot-shape.cc | 7 ++++++ + util/options.cc | 1 + + util/options.hh | 3 +++ + 8 files changed, 77 insertions(+), 14 deletions(-) + +commit a60e2cfa395718cde48eb81f43adc27b4a92e117 +Author: Behdad Esfahbod +Date: Wed Jul 22 15:49:08 2015 +0100 + + [ot] Don't rely on cluster numbers for ensure_native_direction() + + src/hb-ot-shape.cc | 19 ++++++++++++++++++- + 1 file changed, 18 insertions(+), 1 deletion(-) + +commit 701112dad9f6e690b253f1e64f4e7e549f5ae65f +Author: Behdad Esfahbod +Date: Wed Jul 22 15:42:20 2015 +0100 + + [ot] Simplify form_clusters() + + src/hb-buffer-private.hh | 9 ++++++++- + src/hb-buffer.cc | 7 ++----- + src/hb-ot-shape.cc | 11 +++++++++-- + 3 files changed, 19 insertions(+), 8 deletions(-) + +commit 7b8b63adc5e0389fc4cf2720ef7e5804ab6c29cc +Author: Behdad Esfahbod +Date: Wed Jul 22 15:24:26 2015 +0100 + + [ot] Don't mirror character if font doesn't support mirrored + character! + + src/hb-ot-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 97d7c3a100e2673279f066540229d229aaf0df78 +Author: Behdad Esfahbod +Date: Wed Jul 22 14:28:25 2015 +0100 + + [graphite2] Fix bunch of stuff + + Based on patch from Martin Hosken, with review from Jonathan and I. + + src/hb-graphite2.cc | 82 + +++++++++++++++++++++++++++++++++++------------------ + 1 file changed, 54 insertions(+), 28 deletions(-) + +commit ea7f8414e34d4b5efc7b98974637c08f75440f0e +Author: Behdad Esfahbod +Date: Wed Jul 22 13:53:45 2015 +0100 + + [graphite2] Enlarge buffer for output glyphs! + + src/hb-graphite2.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 9cd59db1af47ff511edf251949d58b82673cf704 +Author: Behdad Esfahbod +Date: Wed Jul 22 13:27:06 2015 +0100 + + [USE] Implement topographical features for non-Arabic-joining scripts + + This works per-syllable as per the spec, but we think it should be per + spacing/base/??? glyph instead. + + src/hb-ot-shape-complex-use.cc | 87 + ++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 80 insertions(+), 7 deletions(-) + +commit ecb0b24ef3f8177e7c789f45a2e858bd67e31be3 +Author: Behdad Esfahbod +Date: Wed Jul 22 12:02:09 2015 +0100 + + Use foreach_cluster in Indic shaper + + src/hb-ot-shape-complex-indic.cc | 90 + +++++++++------------------------------- + 1 file changed, 19 insertions(+), 71 deletions(-) + +commit 56f71ff98890fc4fd13e8d9743dc34c4b9407309 +Author: Behdad Esfahbod +Date: Wed Jul 22 11:58:11 2015 +0100 + + Use foreach_syllable in Myanmar shaper + + src/hb-ot-shape-complex-myanmar.cc | 62 + ++++++++------------------------------ + 1 file changed, 12 insertions(+), 50 deletions(-) + +commit ac596511a8c9eeaeb455ca16b5b9c5f1b9923b3a +Author: Behdad Esfahbod +Date: Wed Jul 22 11:54:02 2015 +0100 + + Add foreach_syllable + + Use it in USE. + + src/hb-ot-layout-private.hh | 24 ++++++++ + src/hb-ot-shape-complex-use.cc | 129 + +++++++++++++---------------------------- + 2 files changed, 64 insertions(+), 89 deletions(-) + +commit 8ba9e689680f7685c04cfe7c6019222bdf0c52b0 +Author: Behdad Esfahbod +Date: Wed Jul 22 11:16:01 2015 +0100 + + [USE] Do Arabic-like shaping + + src/hb-ot-shape-complex-use.cc | 77 + ++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 75 insertions(+), 2 deletions(-) + +commit 9daf2dfb6bd5683fd951bdf166c8b87938257e52 +Author: Behdad Esfahbod +Date: Wed Jul 22 10:32:30 2015 +0100 + + Add hb-ot-shape-complex-arabic-private.hh + + src/Makefile.am | 1 + + src/hb-ot-shape-complex-arabic-private.hh | 50 + +++++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-arabic.cc | 37 +++++++++++++---------- + 3 files changed, 73 insertions(+), 15 deletions(-) + +commit a51a661fe1dcfdd3a274a6be6ad741c68d430c8c +Author: Behdad Esfahbod +Date: Tue Jul 21 18:24:21 2015 +0100 + + [USE] Only reorder the first component of a split left mark + + src/hb-ot-shape-complex-use.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit a08a278b15c7e57a1d0a783f2bc877471b9d8229 +Author: Behdad Esfahbod +Date: Tue Jul 21 18:09:40 2015 +0100 + + [USE] Don't compose split matras + + Same logic as in Indic shaper. + + src/hb-ot-shape-complex-use.cc | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +commit 21cb08a417f1203523191192d6a342e8cd0ea14c +Author: Behdad Esfahbod +Date: Tue Jul 21 17:47:06 2015 +0100 + + Remove unused SEA shaper + + src/Makefile.am | 4 - + src/hb-ot-shape-complex-sea-machine.rl | 102 --------- + src/hb-ot-shape-complex-sea.cc | 380 + --------------------------------- + 3 files changed, 486 deletions(-) + +commit db1e9cdd41ff7c97c29b4d9b64b2351ed0ef0403 +Author: Behdad Esfahbod +Date: Tue Jul 21 17:46:06 2015 +0100 + + Retire SEA shaper in favor of USE + + src/hb-ot-shape-complex-private.hh | 25 +++---------------------- + 1 file changed, 3 insertions(+), 22 deletions(-) + +commit 87dde9c64753dea4017f11a7734e7528b8eecac0 +Author: Behdad Esfahbod +Date: Tue Jul 21 17:31:43 2015 +0100 + + [USE] Only use USE shaper if script system is not DFLT + + Same logic as Indic and SEA. + + src/hb-ot-shape-complex-private.hh | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +commit 29832d797ff2f3a96721dd44f2f03a83fb2e8dda +Author: Behdad Esfahbod +Date: Tue Jul 21 17:24:18 2015 +0100 + + Route misc untested scripts through USE shaper instead of Indic + + These were never tested with Indic shaper, and indeed wouldn't + work there + because they didn't have their viramas and other config defined. + They are + all also supported by MS through USE, so route them there. + + src/hb-ot-shape-complex-private.hh | 91 + +++++--------------------------------- + 1 file changed, 11 insertions(+), 80 deletions(-) + +commit 40c4a991c7ea18017273ff8993eecc3953869e69 +Author: Behdad Esfahbod +Date: Tue Jul 21 17:14:54 2015 +0100 + + [USE] Implement dotted-circle + + This makes USE feature-complete as far as the Indic-like features + are concerned. + + src/hb-ot-shape-complex-use-machine.rl | 10 ++++++++++ + src/hb-ot-shape-complex-use.cc | 18 +++++++++++++++--- + 2 files changed, 25 insertions(+), 3 deletions(-) + +commit 7ce03ebe7c525919ce22d9094480847ff1b3c2b2 +Author: Behdad Esfahbod +Date: Tue Jul 21 16:55:26 2015 +0100 + + [USE] Move pref + + src/hb-ot-shape-complex-use-machine.rl | 9 +++++---- + src/hb-ot-shape-complex-use-private.hh | 9 +++++---- + src/hb-ot-shape-complex-use.cc | 24 ++++++++++++++++++++++-- + 3 files changed, 32 insertions(+), 10 deletions(-) + +commit 2d4b62ead931b13f95f5dc0e5b740d997a8d1a8e +Author: Behdad Esfahbod +Date: Tue Jul 21 16:46:37 2015 +0100 + + [USE] Fix-up variation selectors and word joiner in table + + src/gen-use-table.py | 7 ++++++- + src/hb-ot-shape-complex-use-table.cc | 34 + +++++++++++++++++++++++----------- + 2 files changed, 29 insertions(+), 12 deletions(-) + +commit ad7178227f16abc17456f122deac1508031cbbc3 +Author: Behdad Esfahbod +Date: Tue Jul 21 16:43:27 2015 +0100 + + [USE] Use a couple warnings + + src/gen-use-table.py | 20 ++++----- + src/hb-ot-shape-complex-use-table.cc | 82 + ++++++++++++++++++------------------ + 2 files changed, 51 insertions(+), 51 deletions(-) + +commit a85c4da9b1750c2f994f9f85226a3e755fafe50b +Author: Behdad Esfahbod +Date: Tue Jul 21 16:07:10 2015 +0100 + + [USE] Move rphf + + src/hb-ot-shape-complex-use.cc | 105 + ++++++++++++++--------------------------- + 1 file changed, 35 insertions(+), 70 deletions(-) + +commit 5b5617e0664e59770910d04d15175f643a5ffb73 +Author: Behdad Esfahbod +Date: Tue Jul 21 15:52:15 2015 +0100 + + Add FLAG_UNSAFE() + + Unused right now. + + src/hb-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit f8160a495966c790b79134a9f9382b6545f8c733 +Author: Behdad Esfahbod +Date: Tue Jul 21 15:50:02 2015 +0100 + + Add FLAG_SAFE() for values known to be small-enough + + And add check to FLAG() + + src/hb-ot-shape-complex-arabic.cc | 2 +- + src/hb-ot-shape-complex-indic.cc | 12 ++++++------ + src/hb-ot-shape-complex-myanmar.cc | 2 +- + src/hb-private.hh | 5 +++-- + src/hb-unicode-private.hh | 2 +- + 5 files changed, 12 insertions(+), 11 deletions(-) + +commit 366aeaad006b230481a3c08ab4d239fb6b64fef8 +Author: Behdad Esfahbod +Date: Tue Jul 21 15:45:48 2015 +0100 + + Add note re ASSERT_STATIC_EXPR_ZERO() + + src/hb-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit d6adca9fbbbd6fc7c8906121b50c3930fbe2de8e +Author: Behdad Esfahbod +Date: Tue Jul 21 15:17:27 2015 +0100 + + Remove unused macro ASSERT_STATIC_EXPR() + + src/hb-ot-shape-complex-arabic-win1256.hh | 4 ++-- + src/hb-ot-shape-complex-indic-private.hh | 2 -- + src/hb-private.hh | 1 - + 3 files changed, 2 insertions(+), 5 deletions(-) + +commit 1025e1a9e7785ac67cc90d05b02862e38b3e6026 +Author: Behdad Esfahbod +Date: Tue Jul 21 15:05:35 2015 +0100 + + Use unsigned in FLAG() + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cf59c7589c2b4064f4b9f4936115f830089a8ee7 +Author: Behdad Esfahbod +Date: Tue Jul 21 14:51:45 2015 +0100 + + [USE] Use use_category() for rphf/pref memory + + src/hb-ot-shape-complex-use.cc | 63 + +++++++++++++++--------------------------- + 1 file changed, 22 insertions(+), 41 deletions(-) + +commit 595936ec25e9c0924851bd1aa1af5eed3723b54f +Author: Behdad Esfahbod +Date: Tue Jul 21 14:15:35 2015 +0100 + + [USE] Hook of rphf and pref custom processing + + Still no reordering. + + src/hb-ot-layout-private.hh | 8 ++ + src/hb-ot-shape-complex-use.cc | 181 + +++++++++++++++++++++++++++++++++++++++-- + 2 files changed, 181 insertions(+), 8 deletions(-) + +commit ba72801325e4bd58f7597938d4409762c9fa530c +Author: Behdad Esfahbod +Date: Tue Jul 21 11:57:23 2015 +0100 + + [USE] Add CGJ to table + + src/gen-use-table.py | 13 ++++++++++--- + src/hb-ot-shape-complex-use-table.cc | 1 + + 2 files changed, 11 insertions(+), 3 deletions(-) + +commit 4febed61edc5367543e5a206ae01d3393841b612 +Author: Behdad Esfahbod +Date: Tue Jul 21 10:24:32 2015 +0100 + + [USE] Set up features + + src/hb-ot-shape-complex-use.cc | 68 + +++++++++++++++++++++++------------------- + 1 file changed, 38 insertions(+), 30 deletions(-) + +commit 52a957795697085a5d379921ddd8aa6cf2f1a99d +Author: Behdad Esfahbod +Date: Tue Jul 21 10:02:04 2015 +0100 + + [USE] Hook up new scripts to USE shaper + + Don't reroute scripts that we were routing to other shapers + before (just yet). + + src/hb-ot-shape-complex-private.hh | 71 + ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 71 insertions(+) + +commit b4c0829bc18b696f140a260fa2e1089d10164519 +Author: Behdad Esfahbod +Date: Tue Jul 21 09:31:19 2015 +0100 + + [USE] Remove unused Unicode data enums from USE C++ side + + src/hb-ot-shape-complex-use-private.hh | 66 + +--------------------------------- + src/hb-ot-shape-complex-use.cc | 14 ++------ + 2 files changed, 3 insertions(+), 77 deletions(-) + +commit 44910cef626e6d03baa4d89d8fbe2c088971902d +Author: Behdad Esfahbod +Date: Mon Jul 20 18:01:10 2015 +0100 + + [USE] Finish converting Unicode positional categories to USE + + Even compiles. + + src/gen-use-table.py | 114 +++++- + src/hb-ot-shape-complex-use-table.cc | 702 + ++++++++++++++++++----------------- + 2 files changed, 467 insertions(+), 349 deletions(-) + +commit ad725552521273a1f571f04bc96a04221c3e067a +Author: Behdad Esfahbod +Date: Mon Jul 20 17:00:06 2015 +0100 + + [USE] Map from Unicode data to USE syllabic categories + + Positional sub-categories not applied yet. + + src/gen-use-table.py | 128 ++-- + src/hb-ot-shape-complex-use-table.cc | 1062 + ++++++++++++---------------------- + 2 files changed, 409 insertions(+), 781 deletions(-) + +commit 20e246e674155d5fb6527722fc3ef3accf2413df +Author: Behdad Esfahbod +Date: Mon Jul 20 15:56:19 2015 +0100 + + [USE] Start moving Unicode-to-USE mapping into Python code + + src/Makefile.am | 2 +- + src/gen-use-table.py | 176 + +++++++++++++++++++++++++++++++++-- + src/hb-ot-shape-complex-use-table.cc | 3 +- + 3 files changed, 169 insertions(+), 12 deletions(-) + +commit eb74535cc2c0d0de41e54e75bdc71825ec969523 +Author: Behdad Esfahbod +Date: Mon Jul 20 15:33:25 2015 +0100 + + [USE] Fix Number clusters + + The spec wrongly has "H" where "HN" is meant. + + src/hb-ot-shape-complex-use-machine.rl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a9663958fe861950b6f389b389f146232b2cd909 +Author: Behdad Esfahbod +Date: Mon Jul 20 14:24:55 2015 +0100 + + [USE] Start putting together the shaper body + + src/hb-ot-shape-complex-use-private.hh | 2 +- + src/hb-ot-shape-complex-use.cc | 339 + +++++++++++++++++++++++++++++++++ + 2 files changed, 340 insertions(+), 1 deletion(-) + +commit e0eabd7f67462ac34fbfc749d897be478fbd1224 +Author: Behdad Esfahbod +Date: Mon Jul 20 13:30:51 2015 +0100 + + [USE] Put a Ragel machine together + + Grammar from the spec! + + src/hb-ot-shape-complex-use-machine.rl | 169 + +++++++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-use-private.hh | 160 + +++++++++++++++++++++++++++++++ + 2 files changed, 329 insertions(+) + +commit fd74b939b176f47d34d34b3d33e2a09d255c2d9e +Author: Behdad Esfahbod +Date: Mon Jul 20 13:30:45 2015 +0100 + + Minor + + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5e5c8560cca3cb9c6be90c7c18ecb77d5cca0c0f +Author: Behdad Esfahbod +Date: Mon Jul 20 12:01:20 2015 +0100 + + [USE] Minor optimization of USE table + + src/gen-use-table.py | 2 +- + src/hb-ot-shape-complex-use-table.cc | 30 ++++++++++++------------------ + 2 files changed, 13 insertions(+), 19 deletions(-) + +commit 14b12f92a9ef7db57c5252ef0442239319ce4bca +Author: Behdad Esfahbod +Date: Mon Jul 20 11:57:44 2015 +0100 + + [USE] Add Kharoshti test data from Unicode proposal + + test/shaping/texts/in-tree/MANIFEST | 1 + + test/shaping/texts/in-tree/shaper-use/MANIFEST | 1 + + .../in-tree/shaper-use/script-kharoshti/MANIFEST | 1 + + .../in-tree/shaper-use/script-kharoshti/misc.txt | 36 + ++++++++++++++++++++++ + 4 files changed, 39 insertions(+) + +commit c48ff288522f33dc6c78520de0a0a74306630895 +Author: Behdad Esfahbod +Date: Mon Jul 20 11:46:17 2015 +0100 + + [USE] Build Universal Shaping Engine data table from Unicode 8 files + + src/gen-use-table.py | 35 +- + src/hb-ot-shape-complex-use-table.cc | 1016 + ++++++++++++++++++++++++++++++++++ + 2 files changed, 1032 insertions(+), 19 deletions(-) + +commit e2c95116e1423f83a692d6170553d0cc95733d24 +Author: Behdad Esfahbod +Date: Mon Jul 20 11:32:48 2015 +0100 + + [USE] Add Universal Shaping Engine to Makefile + + src/Makefile.am | 23 +++- + src/gen-use-table.py | 237 + +++++++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-use-machine.rl | 0 + src/hb-ot-shape-complex-use-private.hh | 0 + src/hb-ot-shape-complex-use-table.cc | 0 + src/hb-ot-shape-complex-use.cc | 0 + 6 files changed, 254 insertions(+), 6 deletions(-) + +commit 41a29af8053782e3a9c6a96a394bd76ef6d42099 +Author: Behdad Esfahbod +Date: Wed Jul 15 01:39:57 2015 +0100 + + Update Arabic shaping table for Unicode 8.0 + + src/hb-ot-shape-complex-arabic-table.hh | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +commit 64a2726e2c6efce4379a7609024ec21eb4b5e4dc +Author: Behdad Esfahbod +Date: Wed Jul 15 01:36:39 2015 +0100 + + Add Unicode 8.0 scripts + + Based on https://bugzilla.mozilla.org/show_bug.cgi?id=1183209 + + src/hb-common.cc | 3 +++ + src/hb-common.h | 7 +++++++ + 2 files changed, 10 insertions(+) + +commit 9ae156b76820d9079bae062e7e38c34a386d9bd2 +Author: Behdad Esfahbod +Date: Sun Jul 5 22:43:17 2015 +0100 + + Fix pragma usage + + https://bugs.freedesktop.org/show_bug.cgi?id=91228 + + Commit cdcdfe61b97a0a48ccf834b6d924d187da9609be changed two `#pragma + message` to `#pragma error` in hb-unicode.cc, however MSVC uses + #error, + just like the #else branch. `#pragma error` is an unknown pragma so + MSVC does not fail the build because of it, which I believe was the + intention of that commit. + + If it's meant to be an #error, then the #ifdef for _MSC_VER can be + removed entirely. + + src/hb-unicode.cc | 5 ----- + src/hb-warning.cc | 10 ---------- + 2 files changed, 15 deletions(-) + +commit 8ad89f057d737ccbc6f411e9ebcf11b8130a50bb +Author: ThePhD +Date: Tue Jun 23 09:09:24 2015 -0400 + + Spelling words is not my strong point. + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e0a828ecbd708757d67977f7e92a6f4c1b0b92fd +Author: ThePhD +Date: Tue Jun 23 09:07:17 2015 -0400 + + Back to using regular `strdup`, with an `hb-private.hh` fix that + special-cases VC++'s + definition and usage of the words + + src/hb-common.cc | 2 +- + src/hb-private.hh | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit 8e545d59610211261e684c10158b9e5df6fae24d +Author: ThePhD +Date: Mon Jun 22 22:29:04 2015 -0400 + + Fix all VC++ warnings and errors in the current commit's builds. + + src/hb-common.cc | 4 ++-- + src/hb-fallback-shape.cc | 2 +- + src/hb-ot-layout.cc | 2 +- + src/hb-ot-map.cc | 2 +- + src/hb-ot-shape-complex-hangul.cc | 2 +- + src/hb-ot-shape-complex-hebrew.cc | 2 +- + src/hb-ot-shape-complex-indic.cc | 4 ++-- + src/hb-ot-shape-normalize.cc | 6 +++--- + src/hb-ot-shape.cc | 2 +- + 9 files changed, 13 insertions(+), 13 deletions(-) + +commit 5f13bbd9d4b0970851626e2ce3cf4ecb3cfde801 +Author: Behdad Esfahbod +Date: Fri Jun 19 13:31:49 2015 -0700 + + When removing default-ignorables, merge clusters + + Fixes test-shape, and: + https://code.google.com/p/chromium/issues/detail?id=497578 + + src/hb-buffer-private.hh | 2 ++ + src/hb-buffer.cc | 36 ++++++++++++++++++++++++++++++++++-- + src/hb-ot-shape.cc | 2 +- + 3 files changed, 37 insertions(+), 3 deletions(-) + +commit 82b521aeb7cc73879b44ca4278d6fa8b4347527f +Author: Behdad Esfahbod +Date: Fri Jun 19 11:57:57 2015 -0700 + + Rewrite hide_default_ignorables + + Separate the loops for the two cases of replacing with space + and deleting. For deleting, use the out-buffer machinery. + + Needed for upcoming cluster merge fix. + + src/hb-buffer-private.hh | 18 ++++++++++++++ + src/hb-ot-shape.cc | 65 + +++++++++++++++++++++++++++++------------------- + 2 files changed, 57 insertions(+), 26 deletions(-) + +commit b3a2f6afbac1956b65f29a17b9dc896e86135329 +Author: Behdad Esfahbod +Date: Thu Jun 18 17:15:33 2015 -0700 + + [test] Add test for cluster merging + + Based on test from + https://code.google.com/p/chromium/issues/detail?id=497578 + + Currently fails. Basically, if there's a default_ignorable at the + start of text, and font has no space glyph, we remove the + default_ignorable, + and that makes the first char in text to correspond to no cluster. + + Fix coming. + + test/api/test-shape.c | 43 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 43 insertions(+) + +commit a6446d44e6d04e1eeea994682e29f9cb6265f7f6 +Author: Behdad Esfahbod +Date: Thu Jun 18 11:14:56 2015 -0700 + + 0.9.41 + + NEWS | 10 ++++++++++ + configure.ac | 2 +- + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit cd042fc8c4a3984c3647cd22a27c34f00636f6e8 +Author: Behdad Esfahbod +Date: Thu Jun 18 10:55:13 2015 -0700 + + [util] Disable hb-fc-list for now + + Until I figure out what to do about the API, and finalize + the tool. + + util/Makefile.am | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +commit 351f68f4e01a107f62e4eb3458d7c7ae379939fb +Author: Behdad Esfahbod +Date: Fri Jun 12 17:46:06 2015 -0700 + + [bindings] Fix hb_language_get_default() and hb_ot_tag_to_language() + + Part of https://github.com/behdad/harfbuzz/issues/91 + + src/hb-common.cc | 2 +- + src/hb-ot-tag.cc | 9 +++++++++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +commit f0c80060763475aa34a18ecbef600b6811855cb6 +Author: Behdad Esfahbod +Date: Fri Jun 12 17:37:41 2015 -0700 + + [TravisCI] Hook up Coverity + + First try... + + .travis.yml | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit 8ac446908ca75bea989414a0f551a6da8885bf52 +Author: Behdad Esfahbod +Date: Fri Jun 12 17:29:05 2015 -0700 + + Add Coverity Scan badge + + README | 1 + + 1 file changed, 1 insertion(+) + +commit a5e4f6d6088f6ed37fb1d68d3682b8eb4c9b46fe +Author: Behdad Esfahbod +Date: Wed Jun 10 10:57:46 2015 -0700 + + Fix warnings: "member call on null pointer of type" + + https://bugzilla.mozilla.org/show_bug.cgi?id=1167119 + + src/hb-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 16dac7eccf04bb357e95a8e4c18c8418dcfb4030 +Author: Behdad Esfahbod +Date: Wed Jun 3 12:07:46 2015 -0700 + + Fix build + + util/options.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8dacb7f8b46c70f22b70c78e0a8efc3309137650 +Author: Behdad Esfahbod +Date: Wed Jun 3 11:53:42 2015 -0700 + + Add include check to hb-ot-font.h + + src/hb-ot-font.h | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 37c8daf724add4a41a06385e571277d137dc2a2f +Merge: f1b44303 01c3a885 +Author: Behdad Esfahbod +Date: Mon Jun 1 13:27:37 2015 -0700 + + Merge pull request #111 from brawer/since + + Fix "Since:" tags + +commit 01c3a88543850c87483fd8671044df53b368c520 +Author: Sascha Brawer +Date: Mon Jun 1 13:22:01 2015 +0200 + + Fix "Since:" tags + + Based on data from http://upstream-tracker.org/versions/harfbuzz.html + Resolves #103 + + src/hb-buffer.cc | 32 +++++++++++++++++------------ + src/hb-common.cc | 4 ++-- + src/hb-face.cc | 12 +++++------ + src/hb-font.cc | 14 ++++++------- + src/hb-font.h | 4 ++-- + src/hb-ft.cc | 4 ++-- + src/hb-glib.cc | 3 +++ + src/hb-gobject-structs.h | 18 +++++++++++++++++ + src/hb-ot-font.cc | 3 +++ + src/hb-ot-layout.cc | 30 ++++++++++++++++++++++++++++ + src/hb-ot-shape.cc | 6 ++++++ + src/hb-set.cc | 52 + ++++++++++++++++++++++++------------------------ + src/hb-shape-plan.cc | 18 ++++++++--------- + src/hb-shape.cc | 8 ++++---- + src/hb-unicode.cc | 6 +++--- + src/hb-unicode.h | 31 ++++++++++++++++++++++++++--- + 16 files changed, 168 insertions(+), 77 deletions(-) + +commit f1b44303df0712b433e35e1e1e75115c353b279e +Author: Behdad Esfahbod +Date: Thu May 21 14:00:15 2015 -0700 + + Fix unary minus operator applied to unsigned int + + Applying unary minus operator to unsigned int causes the following + warning on MSVS: + + warning C4146: unary minus operator applied to unsigned type, + result still unsigned + + Based on patch from Koji Ishi. + + Fixes https://github.com/behdad/harfbuzz/pull/110 + + src/hb-ot-font.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1ae6cdb365c15405500d4f50ec98016dde23a26b +Author: Behdad Esfahbod +Date: Tue May 19 17:42:30 2015 -0700 + + [gobject] Remove hb_language_t workarounds for g-i shortcomings + + Using latest gobject-introspection, I don't seem to be having this + problem anymore: + + https://bugzilla.gnome.org/show_bug.cgi?id=707656 + + Removing that kludge makes language_t behave more like the way I + expect it + in Python. + + Also fixes: + https://github.com/behdad/harfbuzz/issues/91 + + src/hb-gobject-structs.cc | 1 - + src/hb-gobject-structs.h | 8 -------- + 2 files changed, 9 deletions(-) + +commit ece434fa0fec6754e5164d881c1e967376729eca +Author: Behdad Esfahbod +Date: Tue May 19 17:20:58 2015 -0700 + + [gobject] Macroize value types + + Fixes user_data_t + + src/hb-gobject-structs.cc | 73 + +++++++++++------------------------------------ + 1 file changed, 17 insertions(+), 56 deletions(-) + +commit 9df099b4837df722e738675af318efcc9ac39a78 +Author: Behdad Esfahbod +Date: Mon May 18 18:37:06 2015 -0700 + + [ft] Don't set *glyph in get_glyph() if glyph not found + + src/hb-ft.cc | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +commit ff0f210519bcb0e44d4b986f7eef2004383cd344 +Author: Behdad Esfahbod +Date: Mon May 18 14:16:28 2015 -0700 + + [util] Minor + + util/ansi-print.cc | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +commit fbecde3d5c5c6d5af315140e4966dc850388ad63 +Merge: 58015215 74139f98 +Author: Behdad Esfahbod +Date: Thu May 7 10:46:42 2015 -0700 + + Merge pull request #105 from ebraminio/master + + Fix Travis CI config to pass again + +commit 74139f9839f69ea3e7a1d17627f52fea6c06d58a +Author: Ebrahim Byagowi +Date: Thu May 7 13:09:32 2015 +0000 + + Fix Travis CI config to pass again + + .travis.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 58015215321a76d68df8e0d51039904a67291108 +Author: Behdad Esfahbod +Date: Wed May 6 00:40:31 2015 -0700 + + Add note re OpenType 1.7 language tags + + src/hb-ot-tag.cc | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +commit f6266ad291d7686d5e110255ace5f2ff9e70bf38 +Author: Roozbeh Pournader +Date: Tue May 5 22:31:19 2015 -0700 + + [minor] Remove comment about Navajo OpenType code. + + Apparently the code is already standardized: + https://www.microsoft.com/typography/otspec/languagetags.htm + + src/hb-ot-tag.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 42b00118eae46a5183e885e89e0856f41361f57e +Merge: c60f3c8e cfeb0562 +Author: Behdad Esfahbod +Date: Tue May 5 14:49:47 2015 -0700 + + Merge pull request #102 from roozbehp/master + + Add OpenType language tag 'NAV ' for Navajo. + +commit c60f3c8e1156fe7328d42851013cca97333c3bf7 +Author: Behdad Esfahbod +Date: Mon May 4 23:10:32 2015 -0700 + + [README.python] Add package name for gobject-introspection on Ubuntu + + README.python | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 82010a4bdb32248deb1337a3357dfae5b203c48d +Author: Behdad Esfahbod +Date: Mon May 4 23:09:51 2015 -0700 + + [travis] Comment out gobject-introspection again + + Apparently the version on Travis is 1.32.0, while we require 1.34.0. + + .travis.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8a254bdd29a99eb91b37e9e540179a1a01f77605 +Author: Behdad Esfahbod +Date: Mon May 4 19:22:11 2015 -0700 + + [travis] Build with introspection enabled + + .travis.yml | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit be66ec5373634234f221ace9cfed45d76b87f20e +Author: Behdad Esfahbod +Date: Thu Apr 30 18:27:13 2015 -0400 + + Use TRUE/FALSE instead of true/false in docs + + src/hb-shape.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit d055e1fc781c123f38d321846937965ef794257e +Author: Khaled Hosny +Date: Wed Jan 8 02:28:55 2014 +0200 + + Some attempt into initial hb-shape documentation + + Very anaemic, needs to descripe the format understood by + hb_feature_from_string() etc., but it is just start. + + src/hb-shape.cc | 70 + ++++++++++++++++++++++++++++++++++++++------------------- + src/hb-shape.h | 3 --- + 2 files changed, 47 insertions(+), 26 deletions(-) + +commit 81bedda58cfc15f1987aa1952290cf9d87b4d074 +Author: Behdad Esfahbod +Date: Thu Apr 30 13:04:16 2015 -0400 + + New API: hb_buffer_reverse_range() + + src/hb-buffer.cc | 17 +++++++++++++++++ + src/hb-buffer.h | 4 ++++ + 2 files changed, 21 insertions(+) + +commit cfeb0562ebd8804dad731625153549eafeb78213 +Author: Roozbeh Pournader +Date: Wed Apr 29 09:32:42 2015 -0700 + + Add OpenType language tag 'NAV ' for Navajo. + + The code is not standardized yet, but is used in some Google fonts. + + src/hb-ot-tag.cc | 1 + + 1 file changed, 1 insertion(+) + +commit f724cc351640ee075a9867ef42df32cf5e0ef3b7 +Author: Jonathan Kew +Date: Thu Apr 23 12:45:02 2015 +0100 + + Don't apply Arabic shaping to vertical text. + + src/hb-ot-shape-complex-private.hh | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 97942420bbee1bc6953d5f805621066301fa17ca +Author: Behdad Esfahbod +Date: Thu Apr 23 18:56:24 2015 -0700 + + Update check-libstdc++ for clang + + src/check-libstdc++.sh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 8f0a4d67143ccdef0b5a6ac99fb9b680c3a2f69c +Author: Behdad Esfahbod +Date: Thu Apr 23 14:32:33 2015 -0700 + + [test] Ignor 'n' and 'i' in hb-unicode-encode + + Allows accepting uniXXXX format. + + test/shaping/hb_test_tools.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 39851ce84efd30f6d0570324ff8f3808a01b813b +Author: Behdad Esfahbod +Date: Tue Apr 21 19:23:27 2015 -0700 + + [coretext] Oops; fix issue number for previous commit + + src/hb-coretext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 24f17afeafd40ff77177ed42c9007a0f34fcbb78 +Author: Behdad Esfahbod +Date: Tue Apr 21 19:21:32 2015 -0700 + + [coretext] Fix positioning with trailing whitespace + + Fixes https://code.google.com/p/chromium/issues/detail?id=476913 + + src/hb-coretext.cc | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit dba482fc4458776ffebdeb2d34b970b4223fa8fd +Author: Behdad Esfahbod +Date: Fri Apr 17 13:08:08 2015 -0700 + + [ot-font] Accept MS Symbol cmap if nothing else found + + src/hb-ot-font.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 3029e8b59d1667dc6a53355be89a2b55d7089b88 +Author: Behdad Esfahbod +Date: Tue Apr 14 13:32:22 2015 -0700 + + Revert "Add MSVC pragma for UTF-8 source code" + + This reverts commit 89cbd4d9533011fb5487caa99a0cd58923e7cf59. + + See discussion: + https://bugzilla.gnome.org/show_bug.cgi?id=747772 + + src/hb-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 820505a186ff60e4bae9d717fe4d7ab2390e6fef +Author: Behdad Esfahbod +Date: Mon Apr 13 23:51:45 2015 -0700 + + Whitespace + + util/options.cc | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) + +commit 76d57331117be8e0c2d4a2aee8341969b62b6888 +Merge: 89cbd4d9 9ee176ee +Author: Behdad Esfahbod +Date: Mon Apr 13 23:40:35 2015 -0700 + + Merge pull request #86 from cpfair/hb-shape-output-help-improvement + + Improve hb-shape/hb-view's help text w.r.t. output options + +commit 89cbd4d9533011fb5487caa99a0cd58923e7cf59 +Author: Behdad Esfahbod +Date: Mon Apr 13 12:27:08 2015 -0700 + + Add MSVC pragma for UTF-8 source code + + Not sure we have any right now; motivated by this: + https://bugzilla.gnome.org/show_bug.cgi?id=747772 + + src/hb-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 713f99ff6138b4149d9fd382f9af3ace01ee0da5 +Merge: 1086f21e 22524a51 +Author: Behdad Esfahbod +Date: Fri Apr 10 14:34:05 2015 -0700 + + Merge pull request #99 from khaledhosny/introspection-fixes2 + + More ntrospection fixes + +commit 22524a514f6609a2bc009b6035f6b5b932c719c7 +Author: Khaled Hosny +Date: Fri Apr 10 18:14:45 2015 +0200 + + [bindings] Fix hb_buffer_get_segment_properties + + Annotate the output parameter. + + src/hb-buffer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1086f21e546e2435d9da6024fd6afa7a36ba3707 +Merge: 125cb083 fe97b65a +Author: Behdad Esfahbod +Date: Fri Apr 10 12:21:04 2015 -0700 + + Merge branch 'hb-fc' + +commit 125cb08345a7f27e565329d37093b1a60a41a403 +Merge: e8fd8393 855a5d7c +Author: Behdad Esfahbod +Date: Fri Apr 10 12:19:57 2015 -0700 + + Merge pull request #98 from KonstantinRitt/WEC2013 + + Fix build on WEC2013 + +commit 04f89e8f7dfdb882e8c98afb613cba3f1d02ed7d +Author: Khaled Hosny +Date: Fri Apr 10 17:49:01 2015 +0200 + + [bindings] Fix ownership of returned hb_language_t + + It should not be freed by the caller. + + src/hb-buffer.cc | 2 +- + src/hb-common.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 855a5d7cb8f585bf66dd18cb480b8c3feef62480 +Author: Konstantin Ritt +Date: Fri Apr 10 17:18:01 2015 +0400 + + Fix build on WEC2013 + + Based on patch from Björn Breitmeyer + + src/hb-private.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit fe97b65a54a416229e28b1c931e5e01ca19f31d3 +Author: Behdad Esfahbod +Date: Wed Aug 6 16:49:51 2014 -0400 + + [utils] Add hb-fc-list + + This is a tool that lists all fonts that can render a given string. + It uses hb_shape() to do so, and as such is aware of HarfBuzz's + normalizer. + + configure.ac | 19 +++++ + util/Makefile.am | 15 ++++ + util/hb-fc-list.c | 222 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + util/hb-fc.cc | 149 ++++++++++++++++++++++++++++++++++++ + util/hb-fc.h | 46 +++++++++++ + 5 files changed, 451 insertions(+) + +commit eb0bf3ae6688b7e98a706df2ad2714c071d77e22 +Author: Behdad Esfahbod +Date: Wed Aug 6 15:36:41 2014 -0400 + + Relax inert checks + + Previously, when creating an object from inert inputs (eg: + "hb_font_create(hb_face_get_empty())") we returned the inert + empty object. This is not helpful as there are legitimate + usecases to do that. + + We now never return the inert object unless allocation failed. + + Tests are revised to reflect. + + src/hb-face.cc | 4 ++-- + src/hb-font.cc | 4 +--- + src/hb-shape-plan.cc | 7 +++++-- + test/api/test-font.c | 10 +++++----- + test/api/test-object.c | 34 +++++++++++++++++----------------- + 5 files changed, 30 insertions(+), 29 deletions(-) + +commit e8fd83932a75cfbaa4638a757868915ebfac3c1f +Author: Behdad Esfahbod +Date: Thu Apr 9 15:52:26 2015 -0700 + + [util/hb-view] Fix rendering with all combinations of negative scales + + util/view-cairo.cc | 90 + ++++++++++++++++++++++++++++-------------------------- + util/view-cairo.hh | 2 -- + 2 files changed, 47 insertions(+), 45 deletions(-) + +commit 69d5af93169ea2d87276b65d43c889a359d5d81e +Author: Behdad Esfahbod +Date: Thu Apr 9 15:17:16 2015 -0700 + + [util] Minor + + util/view-cairo.cc | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit a664810e38b479e05ea32cac263cb5730629f9d8 +Author: Behdad Esfahbod +Date: Thu Apr 9 15:04:42 2015 -0700 + + [util] Accept comma as well as space when separating components + of args + + Applies to --font-size and --margin. + + Hopefully the scanf usage here doesn't have compatibility issues + (star being counted in the return value, etc). + + util/options.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9c974360febcfd67247107352425fe8590d9d452 +Author: Behdad Esfahbod +Date: Thu Apr 9 12:04:14 2015 -0700 + + Minor rename + + src/hb-atomic-private.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit f3b170bdd970e31e9dbfed94c07c3cda41269aed +Author: Behdad Esfahbod +Date: Wed Apr 8 16:26:24 2015 -0700 + + Minor + + src/hb-common.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2958f2c147fc6327175b51a4eaca694263e34ac9 +Author: Behdad Esfahbod +Date: Wed Apr 8 16:26:16 2015 -0700 + + Fixup + + src/hb-atomic-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit b931e0b0ceeab0e4819d9c4b838c1a1eb87b52e4 +Author: Behdad Esfahbod +Date: Wed Apr 8 14:39:00 2015 -0700 + + Fix warnings + + Part of https://github.com/behdad/harfbuzz/pull/68 + + src/hb-ot-font.cc | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 22 +++++++++++----------- + 2 files changed, 13 insertions(+), 13 deletions(-) + +commit cdcdfe61b97a0a48ccf834b6d924d187da9609be +Author: Behdad Esfahbod +Date: Wed Apr 8 13:25:04 2015 -0700 + + Err, instead of warn, if mutex / atomic / unicode funcs are missing + + Hopefully this results in fewer badly built HarfBuzz integrations. + + src/hb-unicode.cc | 8 ++++---- + src/hb-warning.cc | 22 ++++++++-------------- + 2 files changed, 12 insertions(+), 18 deletions(-) + +commit fc3c59a1d746c5280f6216a94fdc1be3e826051f +Author: Behdad Esfahbod +Date: Wed Apr 8 13:03:27 2015 -0700 + + Fix unused var warnings + + src/hb-ot-layout-gpos-table.hh | 1 - + src/hb-ot-layout-gsub-table.hh | 1 - + 2 files changed, 2 deletions(-) + +commit 3f174cd020b7762fae96f20ce14fc9e9abec748f +Author: Konstantin Ritt +Date: Sat Mar 28 00:49:33 2015 +0400 + + Minor refactoring to the atomics implementation + + s/atomic_int/atomic_int_impl/ and s/atomic_ptr/atomic_ptr_impl/ + to bring it in par with hb_mutex_impl_t, then re-introduce + hb_atomic_int_t as a wrapper around hb_atomic_int_impl_t. + + In hb_reference_count_t, make it clear the non-atomic get and set + are intentional due to nature of the cases they are used in + (comparison to -1 and the debug output/tracing). + + src/hb-atomic-private.hh | 86 + +++++++++++++++++++++++++++++++----------------- + src/hb-mutex-private.hh | 4 ++- + src/hb-object-private.hh | 21 ++++++------ + 3 files changed, 69 insertions(+), 42 deletions(-) + +commit 24930d544ee9e247e4cf6a5f6d5207ba9d7a3ddc +Author: Behdad Esfahbod +Date: Wed Apr 8 12:52:06 2015 -0700 + + Minor + + src/hb-mutex-private.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 45a8b46f478d4aa63ae5df74b6bb28ebdd7521ac +Author: Behdad Esfahbod +Date: Wed Apr 8 12:49:38 2015 -0700 + + Allow implementing atomic and mutex ops in config + + Motivated by + https://github.com/behdad/harfbuzz/pull/92 + + src/hb-atomic-private.hh | 6 +++++- + src/hb-mutex-private.hh | 7 ++++++- + 2 files changed, 11 insertions(+), 2 deletions(-) + +commit 3fe4e92bc5ff09d84c6763cedf06ce80d15a5fb2 +Author: Behdad Esfahbod +Date: Wed Apr 8 12:49:23 2015 -0700 + + Minor + + src/hb-set-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 9868749abe468130d89c80a2501847a83acb4579 +Author: Behdad Esfahbod +Date: Mon Apr 6 14:51:31 2015 -0700 + + [test] Use /usr/bin/env python instead of /usr/bin/python + + Bug 76494 - #!/usr/bin/python in testsuite + + https://bugs.freedesktop.org/show_bug.cgi?id=76494 + + test/shaping/hb-diff | 2 +- + test/shaping/hb-diff-colorize | 2 +- + test/shaping/hb-diff-filter-failures | 2 +- + test/shaping/hb-diff-ngrams | 2 +- + test/shaping/hb-diff-stat | 2 +- + test/shaping/hb-manifest-read | 2 +- + test/shaping/hb-manifest-update | 2 +- + test/shaping/hb-unicode-decode | 2 +- + test/shaping/hb-unicode-encode | 2 +- + test/shaping/hb-unicode-prettyname | 2 +- + test/shaping/hb_test_tools.py | 2 +- + 11 files changed, 11 insertions(+), 11 deletions(-) + +commit bfcddd32a674dd19fca1bf521e95466a0eec5179 +Merge: ce01ad7c 363ceec3 +Author: Behdad Esfahbod +Date: Mon Apr 6 14:41:32 2015 -0700 + + Merge pull request #93 from ebraminio/archpy3 + + Make hb_test_tools.py compatible with python 3 + +commit ce01ad7c2f5a259030f4dbec746f85522aa9c3f9 +Author: Behdad Esfahbod +Date: Wed Apr 1 11:05:59 2015 -0700 + + MSVC 2015 supports snprintf and not _snprintf + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 560718862f0bd994b62361652d6fd558c4182e2a +Author: Behdad Esfahbod +Date: Wed Apr 1 11:04:33 2015 -0700 + + Move WinCE define to better place + + src/hb-private.hh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 363ceec3fb0c9566db5a59da31e508f69dea1e92 +Author: Ebrahim Byagowi +Date: Mon Mar 30 03:27:14 2015 +0430 + + Make hb_test_tools.py compatible with python 3 + + On ArchLinux, /usr/bin/python is linked to python 3 so + HarfBuzz `make check` is broken there. + + This makes hb_test_tools.py compatible with python 3 while + no breaking it on python 2. + + test/shaping/hb_test_tools.py | 44 + ++++++++++++++++++++++++------------------- + 1 file changed, 25 insertions(+), 19 deletions(-) + +commit aee685086c8fde6f6c4590e483a177c19f222540 +Author: Behdad Esfahbod +Date: Thu Mar 26 14:13:53 2015 -0400 + + Fix VC++ /analyze warnings + + out\debug\hb-buffer-deserialize-text.rl(47) : warning C6001: Using + uninitialized memory 'pos'. + + src/hb-buffer-deserialize-text.rl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8886ab430ca68539cb318e175647e9f6973718b0 +Merge: e3671b8f a394bb66 +Author: Behdad Esfahbod +Date: Sun Mar 22 16:18:57 2015 -0400 + + Merge pull request #90 from khaledhosny/introspection-fixes + + [bindings] Fix *_from_string functions + +commit a394bb66707184c995fe2d08c80e98220e6ec0b0 +Author: Khaled Hosny +Date: Sun Mar 22 20:29:10 2015 +0200 + + [bindings] Fix *_from_string functions + + Without the element-type they will be getting garbage, at least with + Python. + + src/hb-common.cc | 8 ++++---- + src/hb-font.cc | 2 +- + src/hb-shape.cc | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +commit e3671b8f8bb339e8a563a9da9cd5069073200fec +Author: Behdad Esfahbod +Date: Fri Mar 20 18:03:02 2015 -0400 + + 0.9.40 + + NEWS | 8 ++++++++ + configure.ac | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit 9e401f6890f2bea1d11914bca436c2230f8d0f1b +Author: Behdad Esfahbod +Date: Fri Mar 20 16:08:38 2015 -0400 + + Fix reverse_range() for empty range + + Fixes coretext notdef loop consisting of all default_ignorable glyphs + + https://code.google.com/p/chromium/issues/detail?id=464755 + + src/hb-buffer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7481bd49d56d4e814ab1f85fc2df8bf934d520f4 +Author: Behdad Esfahbod +Date: Wed Mar 4 15:47:25 2015 -0800 + + Fix previous commit + + I misunderstood how which works. + + autogen.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6763e21afb77b250ad4416ff921d46c63ea12443 +Author: Behdad Esfahbod +Date: Wed Mar 4 15:43:05 2015 -0800 + + Accept glibtoolize as libtoolize + + Of course, we don't really run it, autoreconf does. We just + err if neither is available. glibtoolize is the name it is + shipped under on OS X. Reported by Adam. + + autogen.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 02a04e6afb1a76894f3723a467716607970d95d3 +Author: Behdad Esfahbod +Date: Wed Mar 4 12:32:03 2015 -0800 + + 0.9.39 + + NEWS | 10 ++++++++++ + configure.ac | 2 +- + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit 98e3ea8e34c798ce003e946c9a150bb41be9d09b +Author: Behdad Esfahbod +Date: Wed Mar 4 12:03:39 2015 -0800 + + Fix hb-uniscribe build + + src/hb-ot-name-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8ac345e5c0ed0aad6547592ea0839aabfb4ba980 +Author: Behdad Esfahbod +Date: Mon Mar 2 16:06:55 2015 -0800 + + Fix reverse_range() to only reverse alt array if positions are used + + In hb-coretext, when we were using scratch buffer for book-keeping, + a reverse_range() caused by the notdef-insertion loop could mess up + our log_clusters. Ouch! + + src/hb-buffer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1e03d7ac83f3e17aafed1e37390d9ff8394e36da +Author: Behdad Esfahbod +Date: Thu Feb 26 13:58:32 2015 -0800 + + Better error message if libtool is not installed + + Fixes https://github.com/behdad/harfbuzz/pull/88 + + autogen.sh | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit 6c918e2997fb82e89485f2b50bee2bf4fcd70592 +Author: Behdad Esfahbod +Date: Thu Feb 26 13:55:34 2015 -0800 + + Clean up gtk-doc.make + + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 5ec5875acb12cf07447c9ebfb03212601368dfc4 +Author: Behdad Esfahbod +Date: Thu Feb 26 13:53:05 2015 -0800 + + Install git.mk in docs/ + + docs/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit d146678d103425b3da7ef393bc6d66f6ba4c5593 +Author: Behdad Esfahbod +Date: Thu Feb 26 13:52:50 2015 -0800 + + Update git.mk from upstream + + git.mk | 35 ++++++++++++++++++++++++++++------- + 1 file changed, 28 insertions(+), 7 deletions(-) + +commit 5f541f8f7be82f29b77b481827deb212e12d53e4 +Author: Behdad Esfahbod +Date: Sat Feb 21 16:51:17 2015 +0300 + + Minor refactoring + + src/hb-private.hh | 44 ++++++++++++++++++++++++++++---------------- + 1 file changed, 28 insertions(+), 16 deletions(-) + +commit ef79bdf73bbfde1bfaa222834809d105ab7755b3 +Author: Behdad Esfahbod +Date: Sat Feb 21 16:49:15 2015 +0300 + + Minor + + src/hb-ot-layout-common-private.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 68e04afbb1e1073c47474f7a4d6d2cacf7057f6f +Author: Behdad Esfahbod +Date: Sat Feb 21 16:30:28 2015 +0300 + + Typo + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 55553699b38d6481fbfacd0a32fc266e55553b34 +Author: Behdad Esfahbod +Date: Sat Feb 21 16:29:08 2015 +0300 + + Minor + + src/hb-private.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit 5175300fbaf4ff19b7d38c14c86331bb614b0390 +Author: Behdad Esfahbod +Date: Sat Feb 21 12:50:01 2015 +0300 + + [layout] Fix comparison of GlyphID and hb_codepoint_t + + Before, the IntType::cmp functions providing this and was truncating + the hb_codepoint_t to 16bits before comparison. I have no idea how + this was never discovered, and I'm too lazy to try to reproduce this + with Pango (which uses non-16bit codepoint numbers for missing + glyphs). + + src/hb-open-type-private.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 7cce809cb11e0ce65dbdab899779ece3dc337763 +Author: Behdad Esfahbod +Date: Sat Feb 21 12:41:08 2015 +0300 + + Remove unused (and wrong as of a few commits ago) cmp() function + + src/hb-open-type-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 8e3d4bae033bdec649676da26cfc3eb7610832a8 +Author: Behdad Esfahbod +Date: Sat Feb 21 12:31:59 2015 +0300 + + Minor + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f47cf1f12dd1fa3cd3aa84502139caca9d469af8 +Author: Behdad Esfahbod +Date: Sat Feb 21 11:45:22 2015 +0300 + + Minor + + src/hb-ot-layout.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 640b66c6348653bfd7cf88ea9caa2133c0eb949f +Author: Behdad Esfahbod +Date: Thu Feb 19 17:30:05 2015 +0300 + + [layout] If lookup has only one subtable, move the forward loop down + to subtable + + I was hoping to see a nice speedup, but it resulted in a very + minor one. + + src/hb-ot-layout.cc | 33 ++++++++++++++++++++++++++++++++- + 1 file changed, 32 insertions(+), 1 deletion(-) + +commit e2f50f2a7ebf9882ea89dc3f0c740e7fce964e37 +Author: Behdad Esfahbod +Date: Thu Feb 19 17:15:05 2015 +0300 + + [layout] Add apply_forward / apply_backward + + src/hb-ot-layout.cc | 69 + +++++++++++++++++++++++++++++++++++------------------ + 1 file changed, 46 insertions(+), 23 deletions(-) + +commit 1d4a328472f094c0d75a062f6e176c6b1875cfdc +Author: Behdad Esfahbod +Date: Thu Feb 19 11:33:30 2015 +0300 + + [layout] Remove unneeded return value from apply() + + src/hb-ot-layout.cc | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +commit bbdd6fd21cc2e079defff7cb17c3eb8eff3f9e09 +Author: Behdad Esfahbod +Date: Thu Feb 19 17:03:02 2015 +0300 + + Minor simpilfy BEInt + + src/hb-open-type-private.hh | 25 ++----------------------- + 1 file changed, 2 insertions(+), 23 deletions(-) + +commit 88a399acdc0fcb060803da0e7db56de2866981e3 +Author: Behdad Esfahbod +Date: Thu Feb 19 16:57:12 2015 +0300 + + Optimize IntType comparison to avoid branches for 16bit numbers + + src/hb-open-type-private.hh | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit 37de2d533126245774417234e3536fcfb24f3a6b +Author: Behdad Esfahbod +Date: Thu Feb 19 16:55:51 2015 +0300 + + Minor simplify IntType + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bd047d3b7f04d551c0a26bc0ce9b9d61481e34e1 +Author: Behdad Esfahbod +Date: Thu Feb 19 10:47:18 2015 +0300 + + [layout] Minor + + src/hb-ot-layout-gpos-table.hh | 6 ++++++ + src/hb-ot-layout-gsub-table.hh | 6 ++++++ + src/hb-ot-layout.cc | 4 ++-- + 3 files changed, 14 insertions(+), 2 deletions(-) + +commit b9d3f60520c022dc952e65a66eb138d1f7cae2e1 +Author: Behdad Esfahbod +Date: Thu Feb 19 10:42:41 2015 +0300 + + [layout] Minor + + src/hb-ot-layout.cc | 15 ++++----------- + 1 file changed, 4 insertions(+), 11 deletions(-) + +commit 1a2322134a5d7bba990da28baf893b35879a5a7a +Author: Behdad Esfahbod +Date: Thu Feb 19 10:40:23 2015 +0300 + + [layout] Don't check glyph props against lookup flags when recursing + + Shouldn't be needed. I have a hard time imagining this breaking any + legitimate use case. + + src/hb-ot-layout-gpos-table.hh | 10 +--------- + src/hb-ot-layout-gsub-table.hh | 10 +--------- + 2 files changed, 2 insertions(+), 18 deletions(-) + +commit 095a1257cc3cc56b044b4cd842a92f0d0f933a50 +Author: Behdad Esfahbod +Date: Thu Feb 19 10:29:41 2015 +0300 + + [layout] Port sanitize() to use dispatch() + + Needed some rework of Extension table. Hopefully I got it right, and + the new template usage doesn't break any compilers... + + src/hb-open-type-private.hh | 5 ++- + src/hb-ot-layout-gpos-table.hh | 82 + +---------------------------------- + src/hb-ot-layout-gsub-table.hh | 72 ++----------------------------- + src/hb-ot-layout-gsubgpos-private.hh | 84 + ++++++++++++------------------------ + 4 files changed, 37 insertions(+), 206 deletions(-) + +commit 758fb20630f84c3d373cda37974b88f16c02995e +Author: Behdad Esfahbod +Date: Wed Feb 18 13:45:03 2015 +0300 + + Remove unused macro + + src/hb-ot-shape-complex-arabic-win1256.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 40c58923cbf689c465f9b65334c455a9b7f71ab0 +Author: Behdad Esfahbod +Date: Wed Feb 18 13:18:46 2015 +0300 + + [layout] Refactor Lookup::dispatch() + + src/hb-ot-layout-common-private.hh | 20 ++++++++++++++++++++ + src/hb-ot-layout-gpos-table.hh | 12 +----------- + src/hb-ot-layout-gsub-table.hh | 12 +----------- + src/hb-ot-layout-gsubgpos-private.hh | 6 ------ + 4 files changed, 22 insertions(+), 28 deletions(-) + +commit 70366f5d19df2e654f0933474fecf1aa16e27812 +Author: Behdad Esfahbod +Date: Wed Feb 18 13:09:54 2015 +0300 + + [layout] Refactor get_subtable() + + src/hb-ot-layout-common-private.hh | 12 ++++++++++++ + src/hb-ot-layout-gpos-table.hh | 4 ++-- + src/hb-ot-layout-gsub-table.hh | 6 +++--- + 3 files changed, 17 insertions(+), 5 deletions(-) + +commit f72f326aea6d1e93f63040730f7aecd401676c1c +Author: Behdad Esfahbod +Date: Tue Feb 17 19:18:07 2015 +0300 + + Minor + + src/hb-ot-layout-gpos-table.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 8e36ccfd4f076888076ca176c055c18104af03b6 +Author: Behdad Esfahbod +Date: Tue Feb 17 19:15:34 2015 +0300 + + [layout] Use dispatch() for add_coverage() + + src/hb-ot-layout-gpos-table.hh | 12 ++---------- + src/hb-ot-layout-gsub-table.hh | 12 ++---------- + src/hb-ot-layout-gsubgpos-private.hh | 12 ++++++++++-- + 3 files changed, 14 insertions(+), 22 deletions(-) + +commit 50b8dc79daffc7ef671dd5eedfea47f8d5e946f4 +Author: Behdad Esfahbod +Date: Tue Feb 17 18:14:17 2015 +0300 + + [layout] Add may_dispatch() + + No functional change right now. + + src/hb-ot-layout-gpos-table.hh | 7 +++++++ + src/hb-ot-layout-gsub-table.hh | 6 ++++++ + src/hb-ot-layout-gsubgpos-private.hh | 12 ++++++++++++ + 3 files changed, 25 insertions(+) + +commit de2118ed7a998a1df9b28fd1be96b4af89ed82c3 +Author: Behdad Esfahbod +Date: Tue Feb 17 17:27:44 2015 +0300 + + Make sanitize() a const method + + This makes a lot of code safer. We only try modifying the object + in one + place, after making sure it's safe to do so. So, do a const_cast<> in + that one place... + + src/hb-open-file-private.hh | 15 +++-- + src/hb-open-type-private.hh | 51 +++++++++++------ + src/hb-ot-cmap-table.hh | 35 ++++++++---- + src/hb-ot-head-table.hh | 6 +- + src/hb-ot-hhea-table.hh | 3 +- + src/hb-ot-hmtx-table.hh | 3 +- + src/hb-ot-layout-common-private.hh | 58 ++++++++++++------- + src/hb-ot-layout-gdef-table.hh | 30 ++++++---- + src/hb-ot-layout-gpos-table.hh | 108 + +++++++++++++++++++++++------------ + src/hb-ot-layout-gsub-table.hh | 58 ++++++++++++------- + src/hb-ot-layout-gsubgpos-private.hh | 65 +++++++++++++-------- + src/hb-ot-layout-jstf-table.hh | 12 ++-- + src/hb-ot-maxp-table.hh | 6 +- + src/hb-ot-name-table.hh | 6 +- + 14 files changed, 296 insertions(+), 160 deletions(-) + +commit 6759ed95a3bec2874826376b68ebff19ba277ef2 +Author: Behdad Esfahbod +Date: Tue Feb 17 16:05:30 2015 +0300 + + Minor + + src/hb-ot-layout-gpos-table.hh | 6 ++---- + src/hb-ot-layout-gsub-table.hh | 6 ++---- + 2 files changed, 4 insertions(+), 8 deletions(-) + +commit 6b599dac1f814a3c900300241d4c492a8f8b66d2 +Author: Behdad Esfahbod +Date: Tue Feb 17 16:04:07 2015 +0300 + + Remove unnecessary check in sanitize + + src/hb-ot-layout-gpos-table.hh | 2 -- + src/hb-ot-layout-gsub-table.hh | 2 -- + 2 files changed, 4 deletions(-) + +commit 365576d246949f9d587e90cf0539dc0381e4d0a3 +Author: Behdad Esfahbod +Date: Thu Jan 29 13:59:42 2015 +0100 + + [layout] Allocate iters in the context + + Can be further optimized, but I think I didn't break anything. + + Saves another 3% off Roboto shaping. + + src/hb-ot-layout-gpos-table.hh | 18 ++++++------------ + src/hb-ot-layout-gsubgpos-private.hh | 21 +++++++++++++-------- + src/hb-ot-shape-fallback.cc | 2 +- + 3 files changed, 20 insertions(+), 21 deletions(-) + +commit 514564f5444b8ad2f210b1e3d7d66378f7275317 +Author: Behdad Esfahbod +Date: Thu Jan 29 13:48:48 2015 +0100 + + [layout] Move skippy_iter setup from constructor into init() + + src/hb-ot-layout-gpos-table.hh | 18 ++++++++++++------ + src/hb-ot-layout-gsubgpos-private.hh | 28 +++++++++++++++------------- + src/hb-ot-shape-fallback.cc | 3 ++- + 3 files changed, 29 insertions(+), 20 deletions(-) + +commit b051be542a8945ec14b0192bbc285f3e1a78c8f1 +Author: Behdad Esfahbod +Date: Thu Jan 29 13:40:39 2015 +0100 + + [lookup] Add skippy_iter.reset() + + Towards reducing the cost of initializing skippy_iter() + + src/hb-ot-layout-gpos-table.hh | 18 ++++++++++++------ + src/hb-ot-layout-gsubgpos-private.hh | 27 ++++++++++++++++++--------- + src/hb-ot-shape-fallback.cc | 3 ++- + 3 files changed, 32 insertions(+), 16 deletions(-) + +commit 2cecc38c7cf49b2cf697efa7e974ceee7055f2c5 +Author: Behdad Esfahbod +Date: Thu Jan 29 13:32:05 2015 +0100 + + [layout] Shuffle code around + + src/hb-ot-layout-gsubgpos-private.hh | 111 + ++++++++++++++++++----------------- + 1 file changed, 56 insertions(+), 55 deletions(-) + +commit 696266981df5ef6c62ad0115133dad1d6c1d9acc +Author: Behdad Esfahbod +Date: Thu Jan 29 13:08:41 2015 +0100 + + [layout] Merge forward and backward iterators + + src/hb-ot-layout-gpos-table.hh | 12 +++--- + src/hb-ot-layout-gsubgpos-private.hh | 71 + ++++++++---------------------------- + src/hb-ot-shape-fallback.cc | 2 +- + 3 files changed, 23 insertions(+), 62 deletions(-) + +commit 1f038eec3c0dd6331036f795614fe1ddcbf613b0 +Author: Behdad Esfahbod +Date: Thu Jan 29 13:05:25 2015 +0100 + + [layout] Fix backward reject() + + Has no functional effect since reject was never used with + match_glyph_data. + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 37d13acd8d414a4b53fac0152addfadecf755cd4 +Author: Behdad Esfahbod +Date: Thu Jan 29 11:38:01 2015 +0100 + + [layout] Remove some unnecessary checks in skippy + + src/hb-ot-layout-gpos-table.hh | 3 --- + src/hb-ot-layout-gsubgpos-private.hh | 9 ++------- + 2 files changed, 2 insertions(+), 10 deletions(-) + +commit baa14e18148d3f5493f78b4fe9e0c835a01f50f7 +Author: Behdad Esfahbod +Date: Thu Jan 29 11:08:43 2015 +0100 + + [lookup] Don't initialize skippy if coverage match fails + + Currently: + + - Initializing skippy is very expensive, + + - Our lookup accelerator (using set-digests) can be very ineffecite, + + As such, we end up many times initializing skippy but then failing + coverage check. Reordering fixes that. + + When, later, we fix our accelerator to have truly small false-positive + rate (for example by using the frozen-sets), then we might want to + reorder these checks such that we wouldn't calculate coverage number + if skippy is going to fail. + + This shows a 5% speedup with Roboto already. + + src/hb-ot-layout-gpos-table.hh | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +commit 7788993bc19bf122f1e143ab64cc1da2ed1865a3 +Author: Behdad Esfahbod +Date: Wed Jan 28 23:01:12 2015 -0800 + + [layout] Use setter method to set c->lookup_props + + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit f4ee48fd7b312550faf9b0be4cd1b2f2849dd08d +Author: Behdad Esfahbod +Date: Wed Jan 28 22:53:54 2015 -0800 + + [layout] Remove unused wrapper method + + src/hb-ot-layout-gsubgpos-private.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit 7b7129c7a997def599fb4d2ba05fda40d27aed20 +Author: Behdad Esfahbod +Date: Wed Jan 28 21:46:07 2015 -0800 + + Add hb_frozen_set_t + + I experimented with replacing use of hb_set_digest_t with this new + hb_frozen_set_t, hoping to get a huge speedup for busy lookups + (like kern lookup in Roboto), but I only got 6% speendup in Roboto + and 4% in NotoNastaliqUrduDraft :(. + + src/hb-set-private.hh | 57 + ++++++++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 56 insertions(+), 1 deletion(-) + +commit 241eac9559465fa79f396570af4e87f455b7e9d5 +Author: Behdad Esfahbod +Date: Wed Jan 28 20:55:42 2015 -0800 + + Hide internals of lookup accelerators + + src/hb-ot-layout-gsub-table.hh | 5 +++-- + src/hb-ot-layout-private.hh | 5 +++++ + src/hb-ot-layout.cc | 6 +++--- + 3 files changed, 11 insertions(+), 5 deletions(-) + +commit e2d4e8480d85436a3acad8145acac345ed593f5a +Author: Behdad Esfahbod +Date: Wed Jan 28 20:29:48 2015 -0800 + + [util] Add convenience "make lib" target + + util/Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +commit faaae64bf28abdcdd15185374bc09a3809794118 +Merge: 7888a6b0 9768e651 +Author: Behdad Esfahbod +Date: Wed Feb 25 15:34:34 2015 -0800 + + Merge pull request #85 from KonstantinRitt/define_inline + + Fix build with MSVC on CE + +commit 9ee176ee978e6668c4faf00028811ce70979122e +Author: Collin Fair +Date: Sat Feb 14 09:59:44 2015 -0500 + + Stop hb-shape docs leaking into hb-view + + util/options.cc | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +commit 952b8dbdf61da9b4814e09ad3c1b9b76483bef5c +Author: Collin Fair +Date: Sat Feb 14 09:44:00 2015 -0500 + + 'All' of the above, not 'each' + + util/options.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9e867b64467c46eea5cc9b1d5a9404a1221bbbfc +Author: Collin Fair +Date: Sat Feb 14 09:32:04 2015 -0500 + + Remove reference to --help-output-content in --help-output (as + --help-output-format's options aren't available in hb-view) + + util/options.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1d55ffeb66381889f11ebb9039ca4ec2ca5efbab +Author: Collin Fair +Date: Sat Feb 14 09:29:35 2015 -0500 + + Add serialization syntax documentation. Clarify naming and wording + in --help-output/--help-format + + util/options.cc | 30 ++++++++++++++++-------------- + 1 file changed, 16 insertions(+), 14 deletions(-) + +commit 9768e651be0561f07d6f38c3ed8bc5ee04882990 +Author: Konstantin Ritt +Date: Sat Feb 14 00:58:51 2015 +0400 + + Fix build with MSVC on CE + + This code is C++ only. There isn't a single C++ compiler that fails to + understand the "inline" keyword, since it's required by C++98. Any + compiler older than C++98 is likely to choke on the template usage + further down, so this isn't necessary. + + Moreover, the C++ standard says you cannot define macros. + [lib.macro.names] says "Nor shall such a translation unit define + macros + for names lexically identical to keywords." -- technically, it's a + promise that the Standard Library headers won't do it, the wording + means + that the entire translation unit won't do it, which implies no source + can do it. + + MSVC complains about it: + fatal error C1189: #error : The C++ Standard Library forbids + macroizing + keywords. Enable warning C4005 to find the forbidden macro. + + Author: Thiago Macieira + + src/hb-private.hh | 10 ---------- + 1 file changed, 10 deletions(-) + +commit 7888a6b07a9922cedd3e0d235959058e0011357b +Author: Behdad Esfahbod +Date: Wed Jan 28 12:40:40 2015 -0800 + + [ft] Handle negative scales with vertical writing + + src/hb-ft.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 982d94eaa2a377616f22f39427e5ed9f1ce43263 +Author: Behdad Esfahbod +Date: Wed Jan 28 10:51:33 2015 -0800 + + [coretext] Don't generate notdef glyph for default-ignorables + + As discovered on Chrome Mac: + https://code.google.com/p/chromium/issues/detail?id=452326 + + src/hb-coretext.cc | 2 ++ + src/hb-ot-shape.cc | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit 6917a045fd8d16952cad75fda8b291b11e1d3564 +Author: Behdad Esfahbod +Date: Wed Jan 28 10:43:32 2015 -0800 + + [coretext] Unbreak glyph positioning in presence of notdef runs + + As discovered on Chrome Mac: + https://code.google.com/p/chromium/issues/detail?id=452326 + + This was originally broken in: + + commit 5a0eed3b50629be4826e4e9428f2c3255195395d + Author: Behdad Esfahbod + Date: Mon Aug 11 23:47:16 2014 -0400 + + [coretext] Implement vertical shaping + + src/hb-coretext.cc | 35 +++++++++++++++++++++++++++-------- + 1 file changed, 27 insertions(+), 8 deletions(-) + +commit 1eff4350239b0768e1042b52db9fb1c0d266f96a +Author: Behdad Esfahbod +Date: Tue Jan 27 12:26:04 2015 -0800 + + Minor optimization + + src/hb-ot-shape-normalize.cc | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 675956aca01fc4e005a338af43d1c1f4f938abd1 +Author: Konstantin Ritt +Date: Tue Jan 27 11:23:07 2015 +0400 + + Do not leak hb_language_t on hb_language_item_t destruction + + src/hb-common.cc | 1 + + 1 file changed, 1 insertion(+) + +commit b306f9674a599da50754d24fa5aefcb6bba04420 +Author: Konstantin Ritt +Date: Tue Jan 27 20:08:41 2015 +0400 + + Minor improvement to HB_SHAPER_DATA_DESTROY + + src/hb-shaper-private.hh | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 61820bc4ca1f02433db4be7c81f27cf97e2bd519 +Author: Behdad Esfahbod +Date: Mon Jan 26 14:25:52 2015 -0800 + + [API] Add hb_buffer_add_latin1() + + This is by no ways to promote non-Unicode encodings. This is an entry + point that takes Unicode codepoints that happen to all be the first + 256 characters and hence fit in 8bit strings. This is useful eg + in Chrome + where strings that can fit in 8bit are implemented that way, and this + avoids copying into UTF-8 or UTF-16. + + Perhaps we should rename this to hb_buffer_add_codepoints8(). + I'm also + curious if anyone would be really interested in + hb_buffer_add_codepoints16(). + + Please discuss! + + src/hb-buffer.cc | 36 +++++++++++++++++++++++++------- + src/hb-buffer.h | 8 ++++++++ + src/hb-utf-private.hh | 57 + ++++++++++++++++++++++++++++++++++++++------------- + 3 files changed, 80 insertions(+), 21 deletions(-) + +commit 78c6e86c04f12154c88b9f9264d0bd50b721699b +Author: Behdad Esfahbod +Date: Mon Jan 26 14:08:36 2015 -0800 + + Fix hb_buffer_add_codepoints to actually NOT validate + + src/hb-buffer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 70c25ee215635db23eb0757641bd372940c0d85d +Merge: 28f5e0b2 f3537b62 +Author: Behdad Esfahbod +Date: Sun Jan 25 13:06:03 2015 -0800 + + Merge pull request #81 from KonstantinRitt/fixes/build/win8phone + + winrt_buildfixes + +commit f3537b620b0a7392ea27f01f465c5ba79459c858 +Author: Konstantin Ritt +Date: Sun Jan 25 09:50:51 2015 +0400 + + Move some code around + + Just to keep Windows specific workarounds in a single place. + + src/hb-private.hh | 25 ++++++++++++------------- + 1 file changed, 12 insertions(+), 13 deletions(-) + +commit afb62d88d78cacb6b881aaf329a654fd32f5ae29 +Author: Konstantin Ritt +Date: Sun Jan 25 08:16:26 2015 +0400 + + Do not define MemoryBarrier on WinCE + + There is a _HBMemoryBarrier() wrapper function that emulates + MemoryBarrier() behavior when it is not defined. + + src/hb-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 7db326a15b173c0d101adc608bf551a628c65dcd +Author: Konstantin Ritt +Date: Sun Jan 25 08:13:24 2015 +0400 + + Fix build on WinRT + + There is no environment (like WinCE) and the basic version + of InitializeCriticalSection is unsupported. + + https://codereview.qt-project.org/#/c/92496/ + + src/hb-mutex-private.hh | 4 ++++ + src/hb-private.hh | 2 ++ + 2 files changed, 6 insertions(+) + +commit 28f5e0b2f41670617bd778660364bbd58b1b68f2 +Author: Behdad Esfahbod +Date: Fri Jan 23 12:45:35 2015 -0800 + + 0.9.38 + + NEWS | 23 +++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 24 insertions(+), 1 deletion(-) + +commit a319d0777b746a2bbe5cd5a206172f1580da3379 +Author: Behdad Esfahbod +Date: Fri Jan 23 12:44:24 2015 -0800 + + [ft] Handle negative x_scale / y_scale + + src/hb-ft.cc | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +commit b0b38bb892473d9a65e06dd3b4713da39f92bef9 +Author: Behdad Esfahbod +Date: Wed Jan 21 19:19:33 2015 -0800 + + [coretext] Fix positioning of notdef + + src/hb-coretext.cc | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +commit 70622e5089c01ea16fd9deed11cb39d43145c121 +Author: Behdad Esfahbod +Date: Wed Jan 21 18:50:57 2015 -0800 + + [coretext] Fix scaling + + Before we were not accounting for possible differences in x_scale and + y_scale, as well as the signs of those. All should be in good shape + now. + + src/hb-coretext.cc | 26 +++++++++++++++++++------- + 1 file changed, 19 insertions(+), 7 deletions(-) + +commit 221ba02b0816584a02471037edae7cec9c1b8acc +Author: Behdad Esfahbod +Date: Wed Jan 21 16:42:09 2015 -0800 + + [coretext] Use vertical advance for notdef in vertical direction + + src/hb-coretext.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 7988da24c507ee310772f72cc5bcfd3c0a1187a0 +Author: Behdad Esfahbod +Date: Wed Jan 21 18:33:50 2015 -0800 + + Add convenience make target "make lib" in src/ + + src/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +commit 31d48dd919e3b4a0bec5ede384f76db9b44f4d71 +Author: Behdad Esfahbod +Date: Wed Jan 21 01:57:44 2015 -0800 + + Add README.python + + README.python | 26 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) + +commit ca1c2813dd0b082a8c418bd3edd3f6cba97bd5f0 +Author: Behdad Esfahbod +Date: Wed Jan 21 01:51:48 2015 -0800 + + [bindings] Add README.python + + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit cd4eb96abb90a84b42e9b288e39bad759e4411a0 +Author: Behdad Esfahbod +Date: Tue Jan 20 12:30:45 2015 -0800 + + [util] Add --font-size to hb-shape + + Also makes hb-view to use 8 bits of subpixel precision and shape at + requested size, instead of always shaping at upem and scaling results. + + util/hb-ot-shape-closure.cc | 2 +- + util/hb-shape.cc | 2 +- + util/hb-view.cc | 5 ++++- + util/helper-cairo.cc | 16 ++++++++-------- + util/helper-cairo.hh | 5 ++--- + util/main-font-text.hh | 4 ++-- + util/options.cc | 44 + +++++++++++++++++++++++++++++++++++++++++--- + util/options.hh | 16 ++++++++++++---- + util/view-cairo.cc | 2 +- + util/view-cairo.hh | 8 ++++---- + 10 files changed, 76 insertions(+), 28 deletions(-) + +commit 5789ca69d7464bab5fa0c5bdf404f3afaa490faf +Author: Behdad Esfahbod +Date: Fri Jan 9 14:22:01 2015 -0800 + + [util] Minor + + util/options.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 67dfa8c7c2f2e9040a9c60c680f739ada4a35fb5 +Author: Behdad Esfahbod +Date: Mon Jan 19 17:00:31 2015 -0800 + + When matching second glyph of kerning pairs, use bsearch + + Roboto has glyphs (like 'F') that have 200 kerning pairs. + Add a handcoded bsearch instead of previous linear search. + + This doesn't show much speedup though, apparently we spend the + bulk of the time somewhere before here. + + src/hb-ot-layout-gpos-table.hh | 21 ++++++++++++++++----- + 1 file changed, 16 insertions(+), 5 deletions(-) + +commit e9f5c65be027eb7759ab819e267e24dff3b017b6 +Author: Behdad Esfahbod +Date: Mon Jan 19 14:42:11 2015 -0800 + + [bindings] Minor + + src/sample.py | 2 ++ + 1 file changed, 2 insertions(+) + +commit 3704628d1f124234324b5f2bdd5fdd61c14c7801 +Merge: 1aaa7d67 5eb939dd +Author: Behdad Esfahbod +Date: Mon Jan 19 16:15:00 2015 -0800 + + Merge pull request #77 from roozbehp/master + + Change New Tai Lue shaping engine from SEA to default + +commit 5eb939ddfe9ef217da2e48d7d0f1f4b7501714ad +Author: Roozbeh Pournader +Date: Sun Jan 18 14:30:08 2015 -0800 + + Change New Tai Lue shaping engine from SEA to default + + This is to reflect the UTC decision to change the encoding model of + New Tai Lue from logical to visual to be similar to Thai, Lao, and + Tai Viet: http://www.unicode.org/L2/L2014/14250.htm#141-C26 + + The visual encoding is already the current practice of encoding New + Tai Lue on the web anyway: + http://www.unicode.org/L2/L2014/14195-newtailue.txt + + Fixes behdad/harfbuzz#66. + + src/hb-ot-shape-complex-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1aaa7d6799b42b392dd191d3c12011721ef99e74 +Author: Behdad Esfahbod +Date: Sat Jan 17 20:16:56 2015 -0800 + + [indic] Fix out-of-bounds access + + src/gen-indic-table.py | 2 +- + src/hb-ot-shape-complex-indic-table.cc | 36 + +++++++++++++++++----------------- + 2 files changed, 19 insertions(+), 19 deletions(-) + +commit 238d6a38f2ceb7d8dceec9365a823f032b3b9f7d +Author: Behdad Esfahbod +Date: Wed Jan 7 10:51:44 2015 -0800 + + [bindings] Update sample.py + + src/sample.py | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 2cd5323531dcd800549b2cb1cb51d708e72ab2d8 +Author: Behdad Esfahbod +Date: Tue Jan 6 19:16:38 2015 -0800 + + [bindings] Use hb_glib_blob_create() in sample + + hb_blob_create() is considered C-only API. + + src/hb-blob.cc | 8 ++++---- + src/sample.py | 19 +++++++++---------- + 2 files changed, 13 insertions(+), 14 deletions(-) + +commit 0ef179e2dc040c13497af847b8c1cec846dbdbf9 +Author: Behdad Esfahbod +Date: Tue Jan 6 16:58:33 2015 -0800 + + [glib] Add hb_glib_blob_create() that takes GBytes + + src/hb-glib.cc | 11 +++++++++++ + src/hb-glib.h | 3 +++ + 2 files changed, 14 insertions(+) + +commit b91904a40da6287f84bc79de60674fa57232ec09 +Author: Behdad Esfahbod +Date: Tue Jan 6 15:43:14 2015 -0800 + + [bindings] Replace deprecated allow-none with optional and nullable + + src/hb-blob.cc | 4 ++-- + src/hb-shape.cc | 2 +- + src/hb-unicode.cc | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit 81a31f3eff44a85bb2160d51156a01a18f0a97df +Author: Behdad Esfahbod +Date: Tue Jan 6 15:37:31 2015 -0800 + + [bindings] Make sample Python 2/3 compatible + + src/sample.py | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +commit b632e7997d9cb6e4782cab6d8c62e8e5edaa4cb0 +Author: Behdad Esfahbod +Date: Tue Jan 6 14:05:26 2015 -0800 + + Fix up gobject-introspection a bit + + Minimal shaping works now! + + src/hb-blob.cc | 6 +++--- + src/hb-buffer.cc | 2 +- + src/sample.py | 34 ++++++++++++++++++++++++++++------ + 3 files changed, 32 insertions(+), 10 deletions(-) + +commit 3d1a666a8629a8502a2bcf23ab943e2b39a0da92 +Author: Behdad Esfahbod +Date: Mon Jan 5 14:43:13 2015 -0800 + + Remove hardcoded ICU include paths. + + ICU exports them using LOCAL_EXPORT_C_INCLUDE_DIRS. + + https://android-review.googlesource.com/#/c/121311/ + + Android.mk | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 8cb41cb9508eb1bb6319e92f900cfe5e8a131be3 +Merge: 365c03fc fb85d618 +Author: Behdad Esfahbod +Date: Sun Jan 4 20:32:18 2015 -0800 + + Merge pull request #76 from cpeterso/cpeterso/Wunused-function + + Add #ifdef HB_USE_ATEXIT to fix -Wunused-function warnings + +commit fb85d618f5883458bacf0ecb0894772291a2d738 +Author: Chris Peterson +Date: Sun Jan 4 19:31:10 2015 -0800 + + Add #ifdef HB_USE_ATEXIT to fix -Wunused-function warnings + + src/hb-common.cc | 2 +- + src/hb-ft.cc | 4 +++- + src/hb-shape.cc | 4 +++- + src/hb-shaper.cc | 4 +++- + 4 files changed, 10 insertions(+), 4 deletions(-) + +commit 365c03fc2bcdb4098314a0e123c46018fb882586 +Merge: c36c4a99 d1897a98 +Author: Behdad Esfahbod +Date: Sat Jan 3 21:55:30 2015 -0800 + + Merge pull request #75 from cpeterso/cpeterso/Wunused-value + + Fix hb_atomic_ptr_cmpexch -Wunused-value warnings + +commit d1897a98d8da40cffb57c07099a9a93cfeaacc36 +Author: Chris Peterson +Date: Sat Jan 3 19:46:19 2015 -0800 + + Fix hb_atomic_ptr_cmpexch -Wunused-value warnings + + src/hb-common.cc | 2 +- + src/hb-icu.cc | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +commit c36c4a9924609df648e62e47fa017b19b844fd98 +Author: Behdad Esfahbod +Date: Fri Jan 2 14:09:23 2015 -0800 + + Add missing va_end() + + Fixes https://github.com/behdad/harfbuzz/pull/74 + + util/options.cc | 1 + + 1 file changed, 1 insertion(+) + +commit f34aaba8687a20794835e2dc878c52d1b53e6f85 +Author: Behdad Esfahbod +Date: Sun Dec 28 18:56:15 2014 -0800 + + [ft] Don't set font ppem + + For discussion see: + + http://lists.freedesktop.org/archives/harfbuzz/2012-April/001905.html + + Over time we have had added NO_HINTING all over the place in hb-ft. + Finish it off. + Not setting ppem on hb-font disables get_contour_point() calls which + is good anyway. + + See comments in the commit. + + src/hb-ft.cc | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 350f3a02ce225e5d78db8ac96de1351ff9f96dd5 +Author: Behdad Esfahbod +Date: Sun Dec 28 17:44:26 2014 -0800 + + [ft] Add hb_ft_face_create_referenced() and + hb_ft_font_create_referenced() + + When I originally wrote hb-ft, FreeType objects did not support + reference + counting. As such, hb_ft_face_create() and hb_ft_font_create() had a + "destroy" callback and client was responsible for making sure + FT_Face is + kept around as long as the hb-font/face are alive. + + However, since this was not clearly documented, some clienets didn't + correctly did that. In particular, some clients assumed that + it's safe + to destroy FT_Face and then hb_face_t. This, indeed, used to work, + until + 45fd9424c723f115ca98995b8f8a25185a6fc71d, which make face destroy + access + font tables. + + Now, I fixed that issue in 395b35903e052aecc97d0807e4f813c64c0d2b0b + since + the access was not needed, but the problem remains that not all + clients + handle this correctly. See: + + https://bugs.freedesktop.org/show_bug.cgi?id=86300 + + Fortunately, FT_Reference_Face() was added to FreeType in 2010, + and so we + can use it now. Originally I wanted to change hb_ft_face_create() and + hb_ft_font_create() to reference the face if destroy==NULL was + passed in. + That would improve pretty much all clients, with little undesired + effects. + Except that FreeType itself, when compiled with HarfBuzz support, + calls + hb_ft_font_create() with destroy==NULL and saves the resulting + hb-font on + the ft-face (why does it not free it immediately?). Making hb-face + reference ft-face causes a cycling reference there. At least, + that's my + current understanding. + + At any rate, a cleaner approach, even if it means all clients will + need a + change, is to introduce brand new API. Which this commit does. + + Some comments added to hb-ft.h, hoping to make future clients + make better + choices. + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=75299 + + configure.ac | 4 ++-- + src/hb-ft.cc | 32 ++++++++++++++++++++++++++++++++ + src/hb-ft.h | 59 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- + 3 files changed, 92 insertions(+), 3 deletions(-) + +commit 9a3b74884b2e41c7040611030f4336f13d18fd3e +Author: Behdad Esfahbod +Date: Sun Dec 28 17:27:39 2014 -0800 + + Remove redundant check for FT_Face_GetCharVariantIndex + + We require FreeType >= 2.8.3. This symbol was introduced earlier + than that. + + configure.ac | 9 +-------- + src/hb-ft.cc | 2 -- + 2 files changed, 1 insertion(+), 10 deletions(-) + +commit 1226b2e930aa456cc05bbe621c96f4286a95cff6 +Author: Behdad Esfahbod +Date: Sun Dec 28 17:04:23 2014 -0800 + + Fix FreeType version check + + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit affacf2f37db767ab8df7f2db6cd9e0e9b0a2b8a +Author: Behdad Esfahbod +Date: Sun Dec 28 16:20:31 2014 -0800 + + [ft] Open blob in READONLY mode + + HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE is deprecated and fairly + useless now. + + src/hb-ft.cc | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +commit 395b35903e052aecc97d0807e4f813c64c0d2b0b +Author: Behdad Esfahbod +Date: Sun Dec 28 16:03:26 2014 -0800 + + Avoid accessing layout tables at face destruction + + "Fixes" https://bugs.freedesktop.org/show_bug.cgi?id=86300 + + Based on discussion someone else who had a similar issue, most + probably + the user is releasing FT_Face before destructing hb_face_t / + hb_font_t. + While that's a client bug, and while we can (and should) use FreeType + refcounting to help avoid that, it happens that we were accessing + the table when we didn't really have to. Avoid that. + + src/hb-ot-layout-private.hh | 3 +-- + src/hb-ot-layout.cc | 4 ++-- + src/hb-ot-shape-complex-arabic-fallback.hh | 2 +- + 3 files changed, 4 insertions(+), 5 deletions(-) + +commit 7d5e7613ced3dd39d05df83ca7e8952cbecd68f6 +Author: Behdad Esfahbod +Date: Thu Dec 18 18:22:21 2014 -0800 + + Fail blob creation if length overflows or is too large + + Fail if blob start plus length overflows; or if blob length + is greater than 2GB. It takes a while for fonts to get to that + size. In the mean time, it protects against bugs like this: + + http://www.icu-project.org/trac/ticket/11450 + + Also avoids some weird issues with 32bit vs 64bit systems + as we accept length as unsigned int. As such, a length of + -1 will cause overflow on 32bit machines, but happily + accepted on a 64bit machine. Avoid that. + + src/hb-blob.cc | 5 ++++- + test/api/test-blob.c | 3 +++ + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit d5a5052098b0aa79ff55c235e61a9db477c4120f +Author: Behdad Esfahbod +Date: Thu Dec 18 18:09:41 2014 -0800 + + Assert that blob length doesn't overflow address. + + This will crash now, if blob was created with wrong length. + Check for that coming next commit. + + src/hb-open-type-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 66e37409b3bc1eddc86704ae26d9176677ce6aa6 +Author: Behdad Esfahbod +Date: Wed Dec 17 12:09:17 2014 -0800 + + 0.9.37 + + NEWS | 8 ++++++++ + configure.ac | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit 093c520de506aec74f3fb1e195c0ca85813424dd +Author: Behdad Esfahbod +Date: Fri Dec 12 21:07:53 2014 -0800 + + [otlayout] Mark variables that are C arrays as opposed to OT::ArrayOf + + src/hb-ot-layout-gpos-table.hh | 24 +++++++-------- + src/hb-ot-layout-gsubgpos-private.hh | 60 + ++++++++++++++++++------------------ + 2 files changed, 42 insertions(+), 42 deletions(-) + +commit 9df0a520306a491f973d42965597bfda6023e508 +Author: Behdad Esfahbod +Date: Fri Dec 12 20:54:28 2014 -0800 + + [otlayout] Avoid invalid access with Context format 3 + + src/hb-ot-layout-gsubgpos-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 295ef1dd5229f47d8e0eb5b4eb48c90a6b470073 +Author: Behdad Esfahbod +Date: Fri Dec 12 20:43:18 2014 -0800 + + [ot] Debug get_coverage + + src/hb-ot-layout-gsubgpos-private.hh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 00f6a8e334ec4c586e4e633a95b411ccb50306d3 +Author: Behdad Esfahbod +Date: Fri Dec 12 20:36:49 2014 -0800 + + [ot] Print format in dispatch trace + + src/hb-ot-layout-gpos-table.hh | 16 ++++++++-------- + src/hb-ot-layout-gsub-table.hh | 14 +++++++------- + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- + 3 files changed, 19 insertions(+), 19 deletions(-) + +commit 5c7d6f02d71362c2b192a7d96e6181977682921c +Author: Behdad Esfahbod +Date: Fri Dec 12 20:28:49 2014 -0800 + + Minor + + src/hb-private.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 153beebba9b76901b8b62b90ba0dc69462ae2090 +Author: Behdad Esfahbod +Date: Fri Dec 12 19:46:09 2014 -0800 + + [ot] Make sure all toplevel tables have tableTag + + src/hb-open-file-private.hh | 2 ++ + src/hb-ot-hhea-table.hh | 2 ++ + src/hb-ot-hmtx-table.hh | 2 ++ + 3 files changed, 6 insertions(+) + +commit 282b13f9b4d86b091714de7fbddc94b3e3ff3d91 +Author: Behdad Esfahbod +Date: Fri Dec 12 19:32:46 2014 -0800 + + [sanitize] Improve debug output some more + + src/hb-open-type-private.hh | 30 ++++++++++++++++-------------- + 1 file changed, 16 insertions(+), 14 deletions(-) + +commit 0766ee1f4e6046598a2e8fb1b167c3942b4a87a0 +Author: Behdad Esfahbod +Date: Fri Dec 12 18:23:20 2014 -0800 + + [sanitize] Improve debug output + + src/hb-open-type-private.hh | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +commit e6f80fa1044243898c402ec6a59d6c1b5420be53 +Author: Behdad Esfahbod +Date: Wed Dec 10 12:05:24 2014 -0800 + + [indic] Allow ZWJ/ZWNJ before SM + + In Oriya, a ZWJ/ZWNJ might be added before candrabindu to encourage + or stop ligation of the candrabindu. This is clearly specified in + the Unicode section on Oriya. Allow it there. Note that Uniscribe + doesn't allow this. + + Micro tests added using Noto Sans Oriya draft. + + No changes in numbers. Currently at: + + BENGALI: 353725 out of 354188 tests passed. 463 failed (0.130722%) + DEVANAGARI: 707307 out of 707394 tests passed. 87 failed (0.0122987%) + GUJARATI: 366349 out of 366457 tests passed. 108 failed (0.0294714%) + GURMUKHI: 60732 out of 60747 tests passed. 15 failed (0.0246926%) + KANNADA: 951190 out of 951913 tests passed. 723 failed (0.0759523%) + KHMER: 299070 out of 299124 tests passed. 54 failed (0.0180527%) + MALAYALAM: 1048147 out of 1048334 tests passed. 187 failed + (0.0178378%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271662 out of 271847 tests passed. 185 failed (0.068053%) + TAMIL: 1091753 out of 1091754 tests passed. 1 failed (9.15957e-05%) + TELUGU: 970555 out of 970573 tests passed. 18 failed (0.00185457%) + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + test/shaping/Makefile.am | 1 + + .../sha1sum/5028afb650b1bb718ed2131e872fbcce57828fff.ttf | Bin 0 -> + 4720 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/indic-joiner-candrabindu.tests | 2 ++ + 6 files changed, 6 insertions(+), 1 deletion(-) + +commit c0e95abc5f3f14121483b71f10837828a3a1d73a +Author: Behdad Esfahbod +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +Date: Wed Aug 13 12:39:34 2014 -0400 + + 0.9.35 + + NEWS | 29 +++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 30 insertions(+), 1 deletion(-) + +commit 20076cc41e673c31305fcb58d37b3b292fd35f83 +Author: Behdad Esfahbod +Date: Tue Aug 12 19:26:35 2014 -0400 + + [coretext] Add version guards for kCTLanguageAttributeName + + src/hb-coretext.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 1b3011c27df531875d432e909ae6b77f115c5017 +Author: Behdad Esfahbod +Date: Tue Aug 12 19:17:19 2014 -0400 + + [coretext] Pass buffer language to CoreText + + src/hb-coretext.cc | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit 3eb6a4dbf25b11fce5e0e426e89f7457887aeca0 +Author: Behdad Esfahbod +Date: Tue Aug 12 19:10:33 2014 -0400 + + [coretext] Minor + + src/hb-coretext.cc | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 08acfe0d3a1d8223a9fa0696703fff63d6c2ea8b +Author: Behdad Esfahbod +Date: Tue Aug 12 18:57:08 2014 -0400 + + [hb-coretext] Fix cluster order of notdef runs in RTL text + + src/hb-coretext.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 30eed75de24ac0b6648a72d98d10bb24a563d7ef +Author: Behdad Esfahbod +Date: Tue Aug 12 17:15:09 2014 -0400 + + [shape-plan] Fix typo! + + The only effect is, if shaper_list was not NULL and no shaper + was found, + we now don't insert anything into cache and return earlier. + + src/hb-shape-plan.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dc9aba6fc53898acd7281b118cec0355d61b1df2 +Author: Behdad Esfahbod +Date: Tue Aug 12 17:14:36 2014 -0400 + + [shape-plan] Better debug messages + + src/hb-shape-plan.cc | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +commit e956c65bf724a8403471362288d2361361b6ac58 +Author: Behdad Esfahbod +Date: Tue Aug 12 17:03:27 2014 -0400 + + [shape-plan] Simplify macro + + src/hb-shape-plan.cc | 22 ++++++++-------------- + 1 file changed, 8 insertions(+), 14 deletions(-) + +commit 29e25550ce8fee3fecc42d20a45ce9c212dc59df +Author: Behdad Esfahbod +Date: Tue Aug 12 17:02:59 2014 -0400 + + Fix gcc warning + + src/hb-private.hh | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 8d5eebc0c6ada01128c6ee384340efdbef7ba29d +Author: Behdad Esfahbod +Date: Tue Aug 12 16:50:22 2014 -0400 + + [shape-plan] Fix shape-plan caching with more than one requested + shaper + + Wasn't breaking out of loop, ouch! + + http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1246370.html + + src/hb-shape-plan.cc | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit bc3d0dc60104f1cda465a5e8ba5b40ed5bec70b9 +Author: Behdad Esfahbod +Date: Tue Aug 12 16:49:18 2014 -0400 + + [shape-plan] Add debug tracing + + src/hb-shape-plan.cc | 26 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) + +commit 81b8d9777b9c38c7e6408591763a4cac6de18e4b +Author: Behdad Esfahbod +Date: Tue Aug 12 15:49:47 2014 -0400 + + [coretext] Fix buffer resizing + + Was very broken. Now fixed and tested. + + src/hb-coretext.cc | 17 +++++++++++++---- + 1 file changed, 13 insertions(+), 4 deletions(-) + +commit c3e924fb9e0e2d4003790817655efd9c5688c7e1 +Author: Behdad Esfahbod +Date: Tue Aug 12 14:25:11 2014 -0400 + + [coretext] Rewind scratch-allocated arrays when not needed anymore + + src/hb-coretext.cc | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +commit 8fd4d70b1450d7261a35ab3dea1c70baea2e5c99 +Author: Behdad Esfahbod +Date: Tue Aug 12 13:12:31 2014 -0400 + + [wince] Two more Windows CE fixes + + Report has it that it builds (and works) now: + + https://codereview.qt-project.org/#/c/92087/ + + src/hb-mutex-private.hh | 2 +- + src/hb-private.hh | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit fd0001d7dbe6ede99a9f87f96f231ffb53303be8 +Author: Behdad Esfahbod +Date: Tue Aug 12 10:32:41 2014 -0400 + + [coretext] Compare CGFont and PS name, if CTFont didn't match + + See comments. + + Fixes vertical text. CoreText backend is in very good shape now! + + Also see: + 5a0eed3b50629be4826e4e9428f2c3255195395d + 25f4fb9b56bb3f8bec821571c78f8829e40daa54 + + Fixes http://github.com/behdad/harfbuzz/pull/36 + + src/hb-coretext.cc | 54 + ++++++++++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 48 insertions(+), 6 deletions(-) + +commit 5a0eed3b50629be4826e4e9428f2c3255195395d +Author: Behdad Esfahbod +Date: Mon Aug 11 23:47:16 2014 -0400 + + [coretext] Implement vertical shaping + + Currently doesn't work though, we detect font fallback. Apparently + matching on ct_font is not safe for this. Looks like commit + 25f4fb9b56bb3f8bec821571c78f8829e40daa54 wasn't enough after all. + + src/hb-coretext.cc | 127 + ++++++++++++++++++++++++++++++++++------------------- + 1 file changed, 81 insertions(+), 46 deletions(-) + +commit 1b55077f03758e49f93b8bc1de678e96ea58718c +Author: Behdad Esfahbod +Date: Mon Aug 11 20:45:12 2014 -0400 + + [coretext] Remove unnecessary alt_size + + Wasn't needed after a6b8dc87421de33746b0b14d86d2d1532aec02af. + + src/hb-coretext.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 10b1104d791a0b0103c6bbb083b5819f2b7d328d +Author: Behdad Esfahbod +Date: Mon Aug 11 20:02:45 2014 -0400 + + [coretext] Use CFRunStatus + + Assert that all runs had expected direction, and take hint for + non-monotone clusters. + + src/hb-coretext.cc | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +commit fd1a6aa8d029c701b1532efa59ce901109cfc216 +Author: Behdad Esfahbod +Date: Mon Aug 11 20:01:37 2014 -0400 + + [coretext] Minor + + src/hb-coretext.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 130856c705641aa681307b5b51b5fb84e295f382 +Author: Behdad Esfahbod +Date: Mon Aug 11 19:16:26 2014 -0400 + + [coretext] Remove debug printf! + + src/hb-coretext.cc | 1 - + 1 file changed, 1 deletion(-) + +commit b5fbc3b8f560235d014c62e49220574ffcf89349 +Author: Behdad Esfahbod +Date: Mon Aug 11 18:40:01 2014 -0400 + + API: Do not clear buffer-flags in hb_buffer_clear_contents() + + After 763e5466c0a03a7c27020e1e2598e488612529a7, one doesn't + need to set flags for different pieces of text. The flags now + are something the client sets up once, depending on how it + actually uses the buffer. As such, don't clear it in + clear_contents(). + + Tests updated. + + src/hb-buffer-private.hh | 4 +--- + src/hb-buffer.cc | 4 ++-- + test/api/test-buffer.c | 15 ++++++++++++--- + 3 files changed, 15 insertions(+), 8 deletions(-) + +commit 104484cefeca03d95837bba5f39178693c86ce8a +Author: Behdad Esfahbod +Date: Mon Aug 11 18:23:43 2014 -0400 + + Minor + + src/hb-common.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 4acce77db7dd588ba277779c4997b0256ebe426e +Author: Behdad Esfahbod +Date: Mon Aug 11 17:46:50 2014 -0400 + + [coretext] Pass buffer direction to CoreText + + Have to use a CTTypesetter for this. + + src/hb-coretext.cc | 26 ++++++++++++++++++++++---- + 1 file changed, 22 insertions(+), 4 deletions(-) + +commit 5ec45dd37caa8a87ce2689a66272ba8a343fe6ba +Author: Behdad Esfahbod +Date: Mon Aug 11 17:46:12 2014 -0400 + + [coretext] Minor + + It's hard to handle all possible NULL returns from CoreText. Add one + more... + + src/hb-coretext.cc | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 624a299b829ccf9864dd2f3001b1a49476e96b4a +Author: Behdad Esfahbod +Date: Mon Aug 11 15:29:18 2014 -0400 + + [coretext] Attach marks to base clusters + + Fixes https://githu.com/behdad/harfbuzz/issues/49 + to the extent that it can be fixed. + + src/hb-coretext.cc | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +commit 3c41ccb5358b0be6cc68d49f436d2cb1792cd5e5 +Author: Behdad Esfahbod +Date: Mon Aug 11 15:11:59 2014 -0400 + + [coretext] Use input clusters + + Before, this shaper was returning UTF-16 cluster indices instead of + returning whatever cluster values the user had had set up in the + buffer. + Ouch! + + src/hb-coretext.cc | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit a6b8dc87421de33746b0b14d86d2d1532aec02af +Author: Behdad Esfahbod +Date: Mon Aug 11 15:08:19 2014 -0400 + + [coretext] Fix buffer resize handling + + We can't really resize buffer and continue in this shaper as we are + using the scratch buffer for string_ref and log_cluster. Restructure + shaper to retry from (almost) scratch. + + src/hb-buffer-private.hh | 3 + + src/hb-coretext.cc | 428 + ++++++++++++++++++++++++++--------------------- + 2 files changed, 238 insertions(+), 193 deletions(-) + +commit 9b3c60c88b118f01610ae7a608b138f79f2dc7be +Author: Behdad Esfahbod +Date: Mon Aug 11 13:25:43 2014 -0400 + + [coretext] Always compute log_clusters + + To be used soon. + + src/hb-coretext.cc | 24 +++++++++++------------- + 1 file changed, 11 insertions(+), 13 deletions(-) + +commit 15c633dd1f412f9ef839d80a8f7af35e7ea48fbc +Author: Behdad Esfahbod +Date: Mon Aug 11 13:42:42 2014 -0400 + + Minor + + src/hb-graphite2.cc | 4 ++-- + src/hb-uniscribe.cc | 6 ++---- + 2 files changed, 4 insertions(+), 6 deletions(-) + +commit 9ce067c77524a9ffc77ceabcba5e7dab36fd39de +Author: Behdad Esfahbod +Date: Mon Aug 11 02:04:38 2014 -0400 + + [coretext] Simplify cluster mapping + + src/hb-coretext.cc | 41 +++++++++++++++++------------------------ + 1 file changed, 17 insertions(+), 24 deletions(-) + +commit 49f7fb63761e4ca9936990fb90a77fd3600f5ad2 +Author: Behdad Esfahbod +Date: Sun Aug 10 19:19:38 2014 -0400 + + [coretext] Minor + + src/hb-coretext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 25f4fb9b56bb3f8bec821571c78f8829e40daa54 +Author: Behdad Esfahbod +Date: Sun Aug 10 19:05:25 2014 -0400 + + [coretext] Fix fallback detection + + Fixes http://github.com/behdad/harfbuzz/pull/36 + + src/hb-coretext.cc | 29 ++++++++++++++++++++--------- + 1 file changed, 20 insertions(+), 9 deletions(-) + +commit 77a7a53acef7de355116d488e7d64ff1d7e9e9e1 +Author: Behdad Esfahbod +Date: Sun Aug 10 18:59:47 2014 -0400 + + [coretext] Fix last range + + Test with: + + hb-view /Library/Fonts/Zapfino.ttf ZapfinoZapfino --features=-dlig[7:] + --shaper=coretext + + src/hb-coretext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c2b151d95262a8dc2d2ce94e19ab0ef5b0c8f98d +Author: Behdad Esfahbod +Date: Sun Aug 10 18:52:07 2014 -0400 + + Fix hb_in_range() for types smaller than int + + As exercised by hb-coretext .notdef code. + + src/hb-private.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 26a963b9cb4af3119177f277a2d48a5d537458fb +Author: Behdad Esfahbod +Date: Sun Aug 10 18:04:50 2014 -0400 + + [wince] Try to fix some stuff on Windows CE + + Based on errors seen here: + http://testresults.qt-project.org/ci/QtBase_dev_Integration/build_03837/wince70embedded-armv4i-msvc2008_Windows_7/log.txt.gz + + Fully untested. + + src/hb-private.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 92aeee3f040c2c32cbf70b27bd6954535388c870 +Author: Behdad Esfahbod +Date: Sun Aug 10 17:42:19 2014 -0400 + + Minor + + src/hb-coretext.cc | 4 ++-- + src/hb-uniscribe.cc | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit b9993d8d6d332994dfbd29e99ff8043622003417 +Author: Behdad Esfahbod +Date: Sun Aug 10 17:40:24 2014 -0400 + + [coretext] Fix assert on Yosemite + + Apparently those functions documented as sometimes returning NULL + actually exercise that right in OS X 10.10 Yosemite. The scratch + was too small for that. I *think* I fixed it, but haven't tested + as I don't have Yosemite. + + src/hb-coretext.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 087733dd66e17297ef0e53680fafe42c84884104 +Author: Behdad Esfahbod +Date: Fri Apr 18 11:21:08 2014 -0700 + + [coretext] Use CGFont as face_data + + src/hb-coretext.cc | 26 +++++++++----------------- + 1 file changed, 9 insertions(+), 17 deletions(-) + +commit d277c3d7eee1fd4fb41c38255e5c4df539353e89 +Author: Behdad Esfahbod +Date: Thu Aug 7 15:38:52 2014 -0400 + + [arabic] Bug 82306 - Mandaic had errors in its Unicode Joining_Type + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=82306 + + src/hb-ot-shape-complex-arabic-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 38fb30d7420a4b01f99cee31baa8c3990a1d1c5f +Author: Behdad Esfahbod +Date: Wed Aug 6 13:34:49 2014 -0400 + + Use atexit() only if it's safe to call from shared library + + Apparently they are not (advertised as?) safe on BSD systems. + We ignore the case of static libraries. + + Whitelisted on glibc, Android, and MSVC / mingw. + + https://bugs.freedesktop.org/show_bug.cgi?id=82246 + + src/hb-common.cc | 4 ++-- + src/hb-ft.cc | 2 +- + src/hb-private.hh | 25 +++++++++++++++++++++++++ + src/hb-shape.cc | 2 +- + src/hb-shaper.cc | 2 +- + src/hb-uniscribe.cc | 2 +- + 6 files changed, 31 insertions(+), 6 deletions(-) + +commit d5e61470fa8e5046c35a79988e00e012ae4fff0f +Author: Behdad Esfahbod +Date: Tue Aug 5 14:19:01 2014 -0400 + + [arabic] Fix fallback shaping regression + + Was broken in 615d00ea252739da57edbd980ff27e573. + + Fixes https://github.com/behdad/harfbuzz/pull/48 + + Micro-test added. + + src/hb-ot-shape-complex-arabic.cc | 4 ++-- + test/shaping/Makefile.am | 1 + + test/shaping/fonts/sha1sum/MANIFEST | 1 + + .../sha1sum/df768b9c257e0c9c35786c47cae15c46571d56be.ttf | Bin 0 -> + 6332 bytes + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/arabic-fallback-shaping.tests | 1 + + 6 files changed, 6 insertions(+), 2 deletions(-) + +commit 91c2c0fd2b0f660d79744b3dfaf39ab86883e96b +Author: Behdad Esfahbod +Date: Sat Aug 2 19:24:55 2014 -0400 + + 0.9.34 + + NEWS | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 54 insertions(+), 1 deletion(-) + +commit d7c850f8037d2701366008eb8c2a527c9d40abde +Author: Behdad Esfahbod +Date: Sat Aug 2 17:46:38 2014 -0400 + + [uniscribe] Minor + + src/hb-uniscribe.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 8f3eebf7ee4005f9a8efaafcb7f4058cc0a3756e +Author: Behdad Esfahbod +Date: Sat Aug 2 17:18:46 2014 -0400 + + Make sure gsubgpos buffer vars are available during fallback_position + + Add buffer var allocation asserts to a few key places. + + src/hb-ot-layout-gpos-table.hh | 4 ++-- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-private.hh | 15 +++++++++++++++ + src/hb-ot-shape-complex-arabic-fallback.hh | 2 +- + src/hb-ot-shape-fallback.cc | 2 ++ + src/hb-ot-shape-normalize.cc | 2 ++ + src/hb-ot-shape.cc | 3 +++ + 7 files changed, 26 insertions(+), 4 deletions(-) + +commit 2053f369f84676f197ac41ea654a318c48922abd +Author: Behdad Esfahbod +Date: Sat Aug 2 16:31:16 2014 -0400 + + Disable 'liga' for vertical text + + The reason we turned it on is because Kazuraki uses it. But that's + not reason enough. Until the OpenType spec gets its act together re + adding design-direction to lookups, this is better user experience. + + src/hb-ot-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 763e5466c0a03a7c27020e1e2598e488612529a7 +Author: Behdad Esfahbod +Date: Sat Aug 2 16:17:44 2014 -0400 + + Make it easier to use HB_BUFFER_FLAG_BOT/EOT + + Previously, we expected users to provide BOT/EOT flags when the + text *segment* was at paragraph boundaries. This meant that for + clients that provide full paragraph to HarfBuzz (eg. Pango), they + had code like this: + + hb_buffer_set_flags (hb_buffer, + (item_offset == 0 ? HB_BUFFER_FLAG_BOT : 0) | + (item_offset + item_length == paragraph_length + ? + HB_BUFFER_FLAG_EOT : 0)); + + hb_buffer_add_utf8 (hb_buffer, + paragraph_text, paragraph_length, + item_offset, item_length); + + After this change such clients can simply say: + + hb_buffer_set_flags (hb_buffer, + HB_BUFFER_FLAG_BOT | HB_BUFFER_FLAG_EOT); + + hb_buffer_add_utf8 (hb_buffer, + paragraph_text, paragraph_length, + item_offset, item_length); + + Ie, HarfBuzz itself checks whether the segment is at the beginning/end + of the paragraph. Clients that only pass item-at-a-time to HarfBuzz + continue not setting any flags whatsoever. + + Another way to put it is: if there's pre-context text in the buffer, + HarfBuzz ignores the BOT flag. If there's post-context, it ignores + EOT flag. + + src/hb-ot-shape-complex-arabic.cc | 40 + +++++++++++++++++++-------------------- + src/hb-ot-shape.cc | 1 + + 2 files changed, 20 insertions(+), 21 deletions(-) + +commit 0a5ae9336231c4d189e1682e4fd9c9c4552b8bbf +Merge: ac53443f 6ab6be32 +Author: Behdad Esfahbod +Date: Sat Aug 2 15:00:34 2014 -0400 + + Merge branch 'win1256' + +commit 6ab6be32c5857ce3344021ad2996e80b2a8c8f99 +Author: Behdad Esfahbod +Date: Sat Aug 2 14:58:38 2014 -0400 + + [arabic/win1256] Remove unused MultipleSubst macros + + src/hb-ot-shape-complex-arabic-win1256.hh | 12 ------------ + 1 file changed, 12 deletions(-) + +commit abfa4252cce1c56c472693dcd8400cd97ededd2f +Author: Behdad Esfahbod +Date: Fri Aug 1 19:05:33 2014 -0400 + + [arabic/win1256] Really fix lam-alef this time + + https://bugzilla.mozilla.org/show_bug.cgi?id=1045139#c26 + https://github.com/behdad/harfbuzz/commit/b276e897d17519a2c28f79d024904ac2bdd86bcf#commitcomment-7243499 + + src/hb-ot-shape-complex-arabic-fallback.hh | 2 +- + src/hb-ot-shape-complex-arabic-win1256.hh | 49 + +++++++++--------------------- + 2 files changed, 15 insertions(+), 36 deletions(-) + +commit 55977f2a462b7fa1248eab3787053dc82320d3e5 +Author: Behdad Esfahbod +Date: Fri Aug 1 16:14:33 2014 -0400 + + [arabic/win1256] Hook up lamMedi lookup + + Restructure lookup array to accommodate. + + https://bugzilla.mozilla.org/show_bug.cgi?id=1045139#c18 + + src/hb-ot-shape-complex-arabic-fallback.hh | 26 + ++++++++++---------------- + src/hb-ot-shape-complex-arabic-win1256.hh | 1 + + 2 files changed, 11 insertions(+), 16 deletions(-) + +commit e839e2523e64fd0cf21929f6a45e2facd59c7917 +Author: Behdad Esfahbod +Date: Fri Aug 1 16:09:31 2014 -0400 + + [arabic/win1256] Fix TEH MARBUTA final form + + https://bugzilla.mozilla.org/show_bug.cgi?id=1045139#c18 + + src/hb-ot-shape-complex-arabic-win1256.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit a2de193220ee2839125594bd1a60b5b66ab4598e +Author: Behdad Esfahbod +Date: Thu Jul 31 18:21:05 2014 -0400 + + [arabic/win1256] Fix shaping of JEEM, HAH, and KHAH + + https://bugzilla.mozilla.org/show_bug.cgi?id=1045139#c16 + + src/hb-ot-shape-complex-arabic-win1256.hh | 22 ++++++++++++---------- + 1 file changed, 12 insertions(+), 10 deletions(-) + +commit 1789ccb1dd56af6117eac00e633eff94860ba252 +Author: Behdad Esfahbod +Date: Thu Jul 31 11:04:00 2014 -0400 + + [arabic/win1256] Remove GCC'ism + + The table can now compile independently too. If we cannot make + it work + on MSVC, we can always generate the data and distribute it. + + The code now compiles cleanly with: + + gcc -c -xc -std=c99 -Werror -pedantic + hb-ot-shape-complex-arabic-win1256.hh + g++ -c -xc -std=c++1x -Werror -pedantic + hb-ot-shape-complex-arabic-win1256.hh + + See: + https://github.com/behdad/harfbuzz/commit/a97f537cec209649302899975d76ca2b2661da7a#commitcomment-7218736 + + src/hb-ot-shape-complex-arabic-fallback.hh | 4 +- + src/hb-ot-shape-complex-arabic-win1256.hh | 123 + +++++++++++++++++------------ + 2 files changed, 75 insertions(+), 52 deletions(-) + +commit f28b1c823db2ad56fed356ef864a7508d23048b8 +Author: Behdad Esfahbod +Date: Wed Jul 30 02:15:44 2014 -0400 + + [arabic] Implement Windows-1256 private shaping + + Bug 1045139 - The Arabic text with "MS Sans Serif" font is rendered + bad + https://bugzilla.mozilla.org/show_bug.cgi?id=1045139 + + This is only enabled on Windows platforms, and requires support from + Uniscribe to work. But for clients that do hook up to Uniscribe, this + fixes shaping of Windows-1256-encoded bitmap fonts like "MS Sans + Serif". + + The code and table together have just less than a 1kb footprint when + enabled. + + UNTESTED. I might even have broken regular Arabic fallback shaping. + + src/Makefile.am | 1 + + src/check-includes.sh | 2 +- + src/hb-ot-shape-complex-arabic-fallback.hh | 125 +++++++++-- + src/hb-ot-shape-complex-arabic-win1256.hh | 328 + +++++++++++++++++++++++++++++ + 4 files changed, 442 insertions(+), 14 deletions(-) + +commit ac53443f1cea83ed43a4e41a9fdb91902f7fae7b +Author: Behdad Esfahbod +Date: Thu Jul 31 18:51:37 2014 -0400 + + [hangul] Don't apply 'calt' + + See comments. + + Micro-test added. + + src/hb-ot-shape-complex-hangul.cc | 11 + ++++++++++- + test/shaping/Makefile.am | 1 + + .../sha1sum/757ebd573617a24aa9dfbf0b885c54875c6fe06b.ttf | Bin 0 -> + 1804 bytes + .../sha1sum/7e14e7883ed152baa158b80e207b66114c823a8b.ttf | Bin 0 -> + 1644 bytes + test/shaping/fonts/sha1sum/MANIFEST | 2 ++ + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/hangul-jamo.tests | 11 + +++++++++++ + 7 files changed, 25 insertions(+), 1 deletion(-) + +commit 8292f96b2be173ebceb1b54426c271cfeaecd633 +Author: Behdad Esfahbod +Date: Thu Jul 31 18:33:11 2014 -0400 + + [test] Fix record-test.sh + + test/shaping/record-test.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 88911e8cc765c26e502503a3a00ac7f17973f3d9 +Author: Behdad Esfahbod +Date: Tue Jul 29 19:47:26 2014 -0400 + + Minor + + src/hb-ot-shape-complex-arabic-fallback.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 9e834e29e0b657f0555df1ab9cea79ff7abcf08d +Author: Behdad Esfahbod +Date: Sat Jul 26 20:34:01 2014 -0400 + + [hebrew] Zero mark advance by GDEF late + + Seems to be what Uniscribe does. + + At this point I think it's work checking our default... + + Fixes Bug 76767 - Zeroing of advance of 2nd component of multiple + substitution with SBL Hebrew + https://bugs.freedesktop.org/show_bug.cgi?id=76767 + + Micro-test added. + + src/hb-ot-shape-complex-hebrew.cc | 2 +- + .../sha1sum/8454d22037f892e76614e1645d066689a0200e61.ttf | Bin 0 -> + 6068 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/zero-width-marks.tests | 1 + + 4 files changed, 3 insertions(+), 1 deletion(-) + +commit 6f2d9ba52a6d1e3fc200da1ef0e85ba020fcd0dc +Author: Behdad Esfahbod +Date: Sat Jul 26 19:17:44 2014 -0400 + + Add old-Myanmar shaper + + Looks like Unsicribe responds to the 'mymr' tag by zeroing marks + GDEF_LATE instead of generic-shaper UNICODE_LATE. Implement that. + + Fixes + Bug 81775 - Incorrect Rendering with harfbuzz-ng myanmar unicode + https://bugs.freedesktop.org/show_bug.cgi?id=81775 + + Micro-test added based on Padauk. + + src/hb-ot-shape-complex-myanmar.cc | 18 + ++++++++++++++++++ + src/hb-ot-shape-complex-private.hh | 5 +++-- + test/shaping/Makefile.am | 1 + + test/shaping/fonts/sha1sum/MANIFEST | 1 + + .../bb9473d2403488714043bcfb946c9f78b86ad627.ttf | Bin 0 -> + 3440 bytes + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/zero-width-marks.tests | 1 + + 7 files changed, 25 insertions(+), 2 deletions(-) + +commit 595d2b96c37de8147489dc5e0ddcc4ab1ad3eea9 +Author: Behdad Esfahbod +Date: Sat Jul 26 18:44:15 2014 -0400 + + Minor + + src/hb-ot-shape-complex-indic.cc | 1 + + src/hb-ot-shape.cc | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit fe6788bc570d77d5b3aafc68efd51ca6b80499b1 +Author: Behdad Esfahbod +Date: Fri Jul 25 12:40:56 2014 -0400 + + Typo + + src/hb-common.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0de25d4184d2d92b1a2ebb6fa054275aaae4c316 +Author: Behdad Esfahbod +Date: Fri Jul 25 12:35:03 2014 -0400 + + [util] Note CSS compatibility in --help-features + + util/options.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 6e69200a2aadbc6bba35ffb4a058c14286b84f46 +Author: Behdad Esfahbod +Date: Fri Jul 25 12:30:47 2014 -0400 + + Fix snprintf() format + + Patch from Maks Naumov. + Fixes https://github.com/behdad/harfbuzz/pull/22 + + src/hb-shape.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 5c5cdbbdf8be231c433e21b050a6c6991d327b61 +Author: Behdad Esfahbod +Date: Fri Jul 25 12:21:49 2014 -0400 + + Make sure broken feature strings are not partially parsed + + If user doesn't check hb_feature_from_string() return value, we + don't want them to end up see the partially-parsed feature. + + src/hb-shape.cc | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +commit a795fe637846e0d9561d2f7cdd84cfafd58b23a7 +Author: Behdad Esfahbod +Date: Fri Jul 25 12:15:33 2014 -0400 + + Allow quotation marks around feature tag in hb_feature_from_string() + + With this, I believe we accept CSS feature strings completely. + + src/hb-shape.cc | 24 +++++++++++++++++++++--- + 1 file changed, 21 insertions(+), 3 deletions(-) + +commit 3f6461847412e78bcddc8eba97200f3afcde869a +Author: Behdad Esfahbod +Date: Fri Jul 25 12:04:27 2014 -0400 + + Allow space at the end of feature string with values, eg 'dlig=1 ' + + src/hb-shape.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit f31f7d2259dd8edffc070af55938cb7aa23514c1 +Author: Behdad Esfahbod +Date: Fri Jul 25 12:03:52 2014 -0400 + + Minor + + src/hb-shape.cc | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 60cb18a5dea2d30793f89e80995bb729c014864a +Author: Behdad Esfahbod +Date: Fri Jul 25 12:01:22 2014 -0400 + + Allow on/off in hb_feature_from_string() + + We now allow things like "dlig on" / "dlig=on". + + src/hb-shape.cc | 26 ++++++++++++++++++++++++-- + 1 file changed, 24 insertions(+), 2 deletions(-) + +commit d9e618eca9e01c2eb6db65504af3f73be370a1e7 +Author: Behdad Esfahbod +Date: Fri Jul 25 11:56:01 2014 -0400 + + Remove duplicate definition of ISALNUM + + It's defined in hb-private.h already. + + src/hb-shape.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit 2ee5f665ded86147acedc400153c0b3a90fe07c6 +Author: Behdad Esfahbod +Date: Fri Jul 25 11:53:46 2014 -0400 + + Fix parsing of features like "- liga" (with the space) + + src/hb-shape.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e15fa7a8cffbe6a67b1048d7b87b7df77d8b1686 +Author: Behdad Esfahbod +Date: Fri Jul 25 11:44:35 2014 -0400 + + Do not require the '=' in hb_feature_from_string() + + Towards accepting CSS font-feature-settings strings. + + src/hb-shape.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit f4fe9baefdb7e0ff9946f88b6f4b55738fa30cdf +Author: Behdad Esfahbod +Date: Fri Jul 25 11:39:55 2014 -0400 + + Reject tags longer than 4 chars in hb_feature_from_string() + + src/hb-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7e8c38954649c0bf2e6051d84ca08dce090ec169 +Author: Behdad Esfahbod +Date: Fri Jul 25 11:18:11 2014 -0400 + + Minor warnings fixes + + Some systems insist on -Wmissing-field-initializers. We have + too many, + by design. Fix a few easy ones. + + src/hb-open-type-private.hh | 2 +- + src/hb-ot-layout-private.hh | 2 +- + src/hb-private.hh | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit fc0daafab0336b847ac14682e581a8838f36a0bf +Author: Behdad Esfahbod +Date: Wed Jul 23 16:48:51 2014 -0400 + + [indic] Handle old-spec Malayalam reordering with final Halant + + See comment. + + Micro-tests added. + + src/hb-ot-shape-complex-indic.cc | 28 + +++++++++++++++++---- + test/shaping/Makefile.am | 1 + + .../270b89df543a7e48e206a2d830c0e10e5265c630.ttf | Bin 0 -> 3428 bytes + .../57a9d9f83020155cbb1d2be1f43d82388cbecc88.ttf | Bin 0 -> 2272 bytes + test/shaping/fonts/sha1sum/MANIFEST | 2 ++ + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/indic-old-spec.tests | 2 ++ + .../indic/script-malayalam/misc/misc.txt | 1 + + 8 files changed, 30 insertions(+), 5 deletions(-) + +commit d6d349d17898529ecdf8217a54987a3e9f81ce05 +Author: Behdad Esfahbod +Date: Wed Jul 23 11:38:49 2014 -0400 + + Give CC to gir-scanner + + From: + https://github.com/Alexpux/MINGW-packages/blob/master/mingw-w64-harfbuzz/0001-give-cc-to-gir-scanner.all.patch + + src/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 8c1bdb46facb79cfca5ebfea9a7e467b40337f47 +Author: Behdad Esfahbod +Date: Tue Jul 22 17:56:43 2014 -0400 + + 0.9.33 + + NEWS | 10 ++++++++++ + configure.ac | 2 +- + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit d218bdb26b226fbf68331eb586b24460c061313d +Author: Behdad Esfahbod +Date: Tue Jul 22 18:01:46 2014 -0400 + + Fix test runner under Windows + + test/shaping/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3f310dc0cae9015c45ba642b9b83d5695c807aad +Author: Behdad Esfahbod +Date: Tue Jul 22 16:26:27 2014 -0400 + + Disallow changing settings on immutable face + + Ouch! + + src/hb-face.cc | 8 ++++---- + src/hb-font.cc | 4 ++-- + src/hb-unicode.cc | 2 +- + 3 files changed, 7 insertions(+), 7 deletions(-) + +commit 0fc0a1022854324261fea8893678a3e9fd9443eb +Author: Behdad Esfahbod +Date: Mon Jul 21 11:12:54 2014 -0400 + + [win] Fix Cygwin build + + https://github.com/behdad/harfbuzz/commit/db308280488c2ee11ba865a9922eb6a0c1abeef3#commitcomment-7077778 + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1132a7dd0ecf1c425078e39e5471330bace42659 +Author: Behdad Esfahbod +Date: Sun Jul 20 01:17:40 2014 -0400 + + Add HB_TAG_MAX_SIGNED / _HB_SCRIPT_MAX_VALUE_SIGNED + + To make C language police happy. + + src/hb-common.h | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) + +commit df99976398a53521e0228541055dcaee8f5ba87f +Author: Behdad Esfahbod +Date: Sat Jul 19 17:31:23 2014 -0400 + + [gobject] Skip _HB_SCRIPT_MAX_VALUE + + Fixes https://github.com/behdad/harfbuzz/pull/38 + + src/hb-common.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f1a8d50a87edfb8147aa1bec732ed7ccbfef2877 +Author: Behdad Esfahbod +Date: Sat Jul 19 16:52:32 2014 -0400 + + [win] Don't define visibility attribtue under Cygwin + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9c77027d645142794c3ff1590a96bb151c3f2e91 +Author: Behdad Esfahbod +Date: Sat Jul 19 16:37:22 2014 -0400 + + [win] Turn STRICT on for including windows.h + + src/hb-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit db308280488c2ee11ba865a9922eb6a0c1abeef3 +Author: Behdad Esfahbod +Date: Sat Jul 19 16:32:04 2014 -0400 + + [win] Consolidate windows.h include tips and tricks + + src/hb-atomic-private.hh | 4 ---- + src/hb-mutex-private.hh | 1 - + src/hb-private.hh | 12 ++++++++++++ + src/hb-uniscribe.cc | 3 --- + src/hb-uniscribe.h | 3 --- + 5 files changed, 12 insertions(+), 11 deletions(-) + +commit f26d59d4684be3419c976d781b6dbc956248e3bb +Author: Behdad Esfahbod +Date: Sat Jul 19 16:10:21 2014 -0400 + + More fixing MemoryBarrier() on Mingw32 + + Set requested windows header to Vista. See discussion: + + https://github.com/behdad/harfbuzz/commit/fbb2847f541389f40718af71c4945024ae177ab2#commitcomment-7054700 + + src/hb-atomic-private.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit 00a57eb4b50fd894dc68c6525a5bbebf0ebc30e4 +Author: Behdad Esfahbod +Date: Fri Jul 18 14:42:50 2014 -0400 + + [test] Remove unused micro-font + + .../9d64156923a1b9fed1e05f74599c16563eca42d9.ttf | Bin 81968 -> + 0 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 - + 2 files changed, 1 deletion(-) + +commit ed29b15f5d0d9e7b40143926ca7d40bf645f67e9 +Author: Behdad Esfahbod +Date: Fri Jul 18 14:37:49 2014 -0400 + + [test] Add more Mongolian variation selector tests + + From + https://code.google.com/p/chromium/issues/detail?id=393896 + + .../9d64156923a1b9fed1e05f74599c16563eca42d9.ttf | Bin 0 -> + 81968 bytes + test/shaping/fonts/sha1sum/MANIFEST | 2 ++ + .../bb29ce50df2bdba2d10726427c6b7609bf460e04.ttf | Bin 0 -> + 74856 bytes + test/shaping/tests/mongolian-variation-selector.tests | 1 + + .../shaper-arabic/script-mongolian/misc/MANIFEST | 1 + + .../script-mongolian/misc/variation-selectors.txt | 8 ++++++++ + 6 files changed, 12 insertions(+) + +commit 385cf37cf084198e3aedb4354a7b025938a9f11b +Author: Behdad Esfahbod +Date: Thu Jul 17 18:22:07 2014 -0400 + + Fix hb_in_range() unused-var warning on Windows + + src/hb-private.hh | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit e3b42f1af409c073b819bfc696024ccb1f1da63f +Author: Behdad Esfahbod +Date: Thu Jul 17 17:13:54 2014 -0400 + + [arabic] Disable 'cswh' again + + Ouch! + + src/hb-ot-shape-complex-arabic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 66f30915b185727a0041c998641edb550eb8a7fc +Author: Behdad Esfahbod +Date: Thu Jul 17 16:05:47 2014 -0400 + + 0.9.32 + + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + 2 files changed, 13 insertions(+), 1 deletion(-) + +commit 82f4d9d53f348f41b14b877c1ac77c0372c49caa +Author: Behdad Esfahbod +Date: Thu Jul 17 15:57:37 2014 -0400 + + [arabic] Add note re disabled 'cswh' + + src/hb-ot-shape-complex-arabic.cc | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 615d00ea252739da57edbd980ff27e573f88ee7e +Author: Behdad Esfahbod +Date: Thu Jul 17 13:36:09 2014 -0400 + + [arabic] Apply init/medi/isol/fini/... in separate stages + + Follows the order of the Arabic/Syriac specs. Also don't stop + between rlig and calt in non-Arabic scripts. + + Micro-tests for Arabic and Mongolian added for the latter. + + src/hb-ot-shape-complex-arabic.cc | 56 + +++++++++++++-------- + test/shaping/Makefile.am | 2 + + .../813c2f8e5512187fd982417a7fb4286728e6f4a8.ttf | Bin 0 -> 3428 bytes + .../8a9fea2a7384f2116e5b84a9b31f83be7850ce21.ttf | Bin 0 -> 3428 bytes + test/shaping/fonts/sha1sum/MANIFEST | 3 ++ + .../a919b33197965846f21074b24e30250d67277bce.ttf | Bin 0 -> 12560 bytes + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/arabic-feature-order.tests | 3 ++ + 8 files changed, 43 insertions(+), 22 deletions(-) + +commit d21e997035b16e9807dfb29c3605abb93f92f1ee +Author: Behdad Esfahbod +Date: Thu Jul 17 15:27:46 2014 -0400 + + [test] Make record_test understand cmdline args to hb-shape + + test/shaping/record-test.sh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 7cd33f230441093dbfb1fec48f8c580ee8d9ef71 +Author: Behdad Esfahbod +Date: Thu Jul 17 14:22:11 2014 -0400 + + Micro optimization + + src/hb-fallback-shape.cc | 36 + +++++++++++++++++++----------------- + src/hb-ot-shape-complex-arabic.cc | 19 +++++++++++-------- + src/hb-ot-shape-complex-indic.cc | 15 ++++++++++----- + src/hb-ot-shape-complex-myanmar.cc | 7 +++++-- + src/hb-ot-shape-complex-sea.cc | 7 +++++-- + src/hb-ot-shape-fallback.cc | 30 ++++++++++++++++-------------- + src/hb-ot-shape.cc | 18 ++++++++++++------ + 7 files changed, 78 insertions(+), 54 deletions(-) + +commit 164c13d73f67fdddba28e6409d76b4903e8ffab3 +Author: Behdad Esfahbod +Date: Thu Jul 17 14:16:38 2014 -0400 + + Another try to fix Mongolian free variation selectors + + This reverts bf029281 and fixes it properly. That commit + was not enough as it was only inheriting the shaping_action + for prev_action, but not curr_action. + + Micro-test added. + + https://code.google.com/p/chromium/issues/detail?id=393896 + + src/hb-ot-shape-complex-arabic.cc | 24 + +++++++++++++++------ + src/hb-unicode-private.hh | 3 ++- + test/shaping/fonts/sha1sum/MANIFEST | 1 + + .../ef86fe710cfea877bbe0dbb6946a1f88d0661031.ttf | Bin 0 -> 2748 bytes + .../tests/mongolian-variation-selector.tests | 1 + + 5 files changed, 22 insertions(+), 7 deletions(-) + +commit 5209c505061130854a2bfea8849928ade3ee92f3 +Author: Behdad Esfahbod +Date: Thu Jul 17 12:23:44 2014 -0400 + + Revert "Show U+FFFD REPLACEMENT CHARACTER for invalid Unicode + codepoints" + + We now handle U+FFFD replacement in hb_buffer_add_utf*(). Any other + manipulation can happen in user callbacks. No need for this. + + https://github.com/behdad/harfbuzz/commit/efe74214bbb68eaa3d7621e73869b5d58210107e#commitcomment-7039404 + + This reverts commit efe74214bbb68eaa3d7621e73869b5d58210107e. + + Conflicts: + src/hb-ot-shape-normalize.cc + + src/hb-ot-shape-normalize.cc | 7 ------- + 1 file changed, 7 deletions(-) + +commit 9e7c720100e432b43564ed5ff12f3175ca2ed74a +Author: Dominik Röttsches +Date: Thu Jul 17 14:40:34 2014 +0300 + + Fix CoreText build after a8b89a09f6d3a34 + + src/hb-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit a4d643755a531c82ab91e1e43d6bb0b7bd46453a +Author: Behdad Esfahbod +Date: Wed Jul 16 20:15:45 2014 -0400 + + Minor + + src/hb-utf-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a18897f87ce2c6048c3a0339074924b2232e2b95 +Author: Behdad Esfahbod +Date: Wed Jul 16 16:02:15 2014 -0400 + + 0.9.31 + + NEWS | 29 +++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 30 insertions(+), 1 deletion(-) + +commit 976c8f455221eb599d1c446eafd88d51d7d2aa65 +Author: Behdad Esfahbod +Date: Wed Jul 16 15:34:20 2014 -0400 + + New API: hb_buffer_[sg]et_replacement_codepoint() + + With this change, we now by default replace broken UTF-8/16/32 bits + with U+FFFD. This can be changed by calling new API on the buffer. + Previously the replacement value used to be (hb_codepoint_t)-1. + + Note that hb_buffer_clear_contents() does NOT reset the replacement + character. + + See discussion here: + + https://github.com/behdad/harfbuzz/commit/6f13b6d62daae4989e3cc2fe4b168e5c59650964 + + New API: + + hb_buffer_set_replacement_codepoint() + hb_buffer_get_replacement_codepoint() + + src/hb-buffer-private.hh | 1 + + src/hb-buffer.cc | 45 + ++++++++++++++++++++++++++++++++++++++++++--- + src/hb-buffer.h | 15 ++++++++++++++- + src/hb-utf-private.hh | 34 ++++++++++++++++++++-------------- + test/api/test-buffer.c | 26 +++++++++++++++----------- + 5 files changed, 92 insertions(+), 29 deletions(-) + +commit bcba8b45024e1eca8be77ca2657de1dc44dbf8fb +Author: Behdad Esfahbod +Date: Wed Jul 16 14:59:04 2014 -0400 + + New API hb_buffer_add_codepoints() + + Like hb_buffer_add_utf32, but doesn't do any Unicode validation. + This is like what hb_buffer_add_utf32 used to be until a couple + commits ago. + + src/hb-buffer.cc | 32 +++++++++++++++++++++++++++----- + src/hb-buffer.h | 8 ++++++++ + 2 files changed, 35 insertions(+), 5 deletions(-) + +commit 625dbf141a05f1ae81a7b8cbc529996370101284 +Author: Behdad Esfahbod +Date: Wed Jul 16 14:49:55 2014 -0400 + + [buffer] Templatize UTF-* functions + + src/hb-buffer.cc | 10 +- + src/hb-utf-private.hh | 307 + ++++++++++++++++++++++++++------------------------ + 2 files changed, 166 insertions(+), 151 deletions(-) + +commit e634fed4285ce440d277345727ed01757df6d779 +Author: Behdad Esfahbod +Date: Wed Jul 16 14:17:26 2014 -0400 + + [buffer] Validate UTF-32 input + + Same as what we do for UTF-8 and UTF-16. + + src/hb-utf-private.hh | 13 +++++++++--- + test/api/test-buffer.c | 55 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 65 insertions(+), 3 deletions(-) + +commit b98c5db32d15fcfb27ce2f6737203ce1ad124319 +Author: Behdad Esfahbod +Date: Wed Jul 16 13:44:01 2014 -0400 + + Minor refactoring + + src/hb-ot-layout-gsubgpos-private.hh | 25 ++++++------------------- + 1 file changed, 6 insertions(+), 19 deletions(-) + +commit 844f1a487d9c39724ebff20e89f6184c9a59be0b +Author: Behdad Esfahbod +Date: Wed Jul 16 13:32:51 2014 -0400 + + [tests] Add record-test.sh + + test/shaping/Makefile.am | 1 + + test/shaping/record-test.sh | 49 + +++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 50 insertions(+) + +commit 3b861421a772f52eb232ff93bd74b5a8214801ec +Author: Behdad Esfahbod +Date: Wed Jul 16 13:22:05 2014 -0400 + + Fix Mongolian Variation Selectors for fonts without GDEF + + Originally we fixed those in 79d1007a501fd63c0ba4d51038c513e6b8b94740. + However, fonts like MongolianWhite don't have GDEF, but have + IgnoreMarks + in their LigatureSubstitute init/etc features. We were synthesizing a + GDEF class of mark for Mongolian Variation Selectors and as such the + ligature lookups where not matching. Uniscribe doesn't do that. + + I tried with more sophisticated fixes, like, if there is no GDEF and + a lookup-flag mismatch happens, instead of rejecting a match, try + skipping that glyph. That surely produces some interesting behavior, + but since we don't want to support fonts missing GDEF more than + we have + to, I went for this simpler fix which is to always mark + default-ignorables as base when synthesizing GDEF. + + Micro-test added. + + Fixes rest of https://bugs.freedesktop.org/show_bug.cgi?id=65258 + + src/hb-ot-shape.cc | 13 + +++++++++++-- + .../sha1sum/37033cc5cf37bb223d7355153016b6ccece93b28.ttf | Bin 0 -> + 2780 bytes + test/shaping/fonts/sha1sum/MANIFEST | 1 + + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/mongolian-variation-selector.tests | 1 + + 5 files changed, 14 insertions(+), 2 deletions(-) + +commit 878a25375b2fdf64cf0cc30c23fca9fcd58548e8 +Author: Behdad Esfahbod +Date: Wed Jul 16 13:21:26 2014 -0400 + + Minor + + src/hb-ot-shape.cc | 1 + + src/hb-unicode-private.hh | 6 +++--- + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit ec181e50140fc65b32d6080e2f7f73bbe0269ba9 +Author: Behdad Esfahbod +Date: Wed Jul 16 13:10:03 2014 -0400 + + Minor moving around + + src/hb-ot-shape.cc | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +commit e7ce50d9eb6e3678f731b10dfeb308ffc478af8d +Author: Behdad Esfahbod +Date: Wed Jul 16 12:30:39 2014 -0400 + + [indic] Fix access past end of array + + src/hb-ot-shape-complex-indic.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 73e23b0acfd2948d500321769035c56c9e072d77 +Author: Behdad Esfahbod +Date: Tue Jul 15 18:43:49 2014 -0400 + + Whitespace + + src/hb-ot-layout-gsubgpos-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit f27be105afb86b337c7d940badc5a6462f0b58bb +Author: Behdad Esfahbod +Date: Fri Jul 11 18:15:34 2014 -0400 + + [Android.mk] Actually remove static library + + Android.mk | 26 -------------------------- + 1 file changed, 26 deletions(-) + +commit 96b80e9bcc4796eedac09d284dc8cc0439ced6ba +Author: Behdad Esfahbod +Date: Fri Jul 11 17:00:12 2014 -0400 + + [Android.mk] Remove static library, add note re how to build + + Android.mk | 41 +++++++++++++++++++++++++++++++++++++---- + 1 file changed, 37 insertions(+), 4 deletions(-) + +commit b7bc0b671d2d568cb64b647dad2ca866a4e0183b +Author: Behdad Esfahbod +Date: Fri Jul 11 16:20:28 2014 -0400 + + Simplify / speed up UTF-8 code + + src/hb-utf-private.hh | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +commit af2490c0959daa0fe7f32a8b3b3a3699c7fc5f48 +Author: Behdad Esfahbod +Date: Fri Jul 11 16:10:58 2014 -0400 + + Only accept well-formed UTF-8 sequences + + Enable tests that were disabled before, and adjust one test, + and add more tests. + + src/hb-utf-private.hh | 93 + +++++++++++++++++++++++++++++++++----------------- + test/api/test-buffer.c | 9 +++-- + 2 files changed, 68 insertions(+), 34 deletions(-) + +commit 7323d385cc758c06671cb38239d240eb517b28bc +Author: Behdad Esfahbod +Date: Fri Jul 11 15:10:05 2014 -0400 + + Simplify hb_utf_prev<16> to call hb_utf_next<16> + + src/hb-utf-private.hh | 23 ++++++++--------------- + 1 file changed, 8 insertions(+), 15 deletions(-) + +commit c09a607a842fdd7b33e2c57e8af96d21ff091acd +Author: Behdad Esfahbod +Date: Fri Jul 11 15:05:36 2014 -0400 + + Use hb_in_range() for arabic and indic tables + + Though, looks like gcc was smart enough to produce the same code + before... + + src/gen-arabic-table.py | 18 +- + src/gen-indic-table.py | 10 +- + src/hb-ot-shape-complex-arabic-table.hh | 420 + ++++++++++++++++---------------- + src/hb-ot-shape-complex-indic-table.cc | 88 +++---- + 4 files changed, 268 insertions(+), 268 deletions(-) + +commit 7627100f428ac0ec8509d961d368d2d25d8f0b6e +Author: Behdad Esfahbod +Date: Fri Jul 11 14:54:42 2014 -0400 + + Mark unsigned integer literals with the u suffix + + Simplifies hb_in_range() calls as the type can be inferred. + The rest is obsessiveness, I admit. + + src/hb-buffer-serialize.cc | 2 +- + src/hb-common.cc | 4 +- + src/hb-coretext.cc | 16 +-- + src/hb-open-file-private.hh | 4 +- + src/hb-open-type-private.hh | 2 +- + src/hb-ot-cmap-table.hh | 4 +- + src/hb-ot-head-table.hh | 6 +- + src/hb-ot-hhea-table.hh | 2 +- + src/hb-ot-layout-common-private.hh | 14 +-- + src/hb-ot-layout-gdef-table.hh | 8 +- + src/hb-ot-layout-gpos-table.hh | 24 ++-- + src/hb-ot-layout-gsub-table.hh | 6 +- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-ot-layout-jstf-table.hh | 2 +- + src/hb-ot-layout-private.hh | 4 +- + src/hb-ot-layout.h | 6 +- + src/hb-ot-map-private.hh | 8 +- + src/hb-ot-maxp-table.hh | 4 +- + src/hb-ot-shape-complex-arabic-fallback.hh | 2 +- + src/hb-ot-shape-complex-hangul.cc | 36 +++--- + src/hb-ot-shape-complex-hebrew.cc | 134 ++++++++++----------- + src/hb-ot-shape-complex-indic.cc | 182 + ++++++++++++++--------------- + src/hb-ot-shape-complex-myanmar.cc | 56 ++++----- + src/hb-ot-shape-complex-sea.cc | 8 +- + src/hb-ot-shape-complex-thai.cc | 84 ++++++------- + src/hb-ot-shape-fallback.cc | 40 +++---- + src/hb-ot-shape-normalize.cc | 2 +- + src/hb-ot-shape.cc | 6 +- + src/hb-ot-tag.cc | 18 +-- + src/hb-unicode-private.hh | 40 +++---- + src/hb-uniscribe.cc | 14 +-- + src/hb-utf-private.hh | 16 +-- + 32 files changed, 378 insertions(+), 378 deletions(-) + +commit a8b89a09f6d3a3466282aae07fd65e143f9f8f83 +Author: Behdad Esfahbod +Date: Fri Jul 11 14:18:01 2014 -0400 + + Simplify hb_in_range() + + It's both faster and produces smaller code. Now I feel stupid for + not writing it this way before. + + src/hb-private.hh | 16 ++++++---------- + 1 file changed, 6 insertions(+), 10 deletions(-) + +commit db8934faa1854dafaf4c4ce34d1818e12f67ef52 +Author: Behdad Esfahbod +Date: Fri Jul 11 13:58:36 2014 -0400 + + Simplify hb_utf_prev<8> to call hb_utf_next<8> + + src/hb-utf-private.hh | 24 ++++-------------------- + 1 file changed, 4 insertions(+), 20 deletions(-) + +commit efe74214bbb68eaa3d7621e73869b5d58210107e +Author: Behdad Esfahbod +Date: Fri Jul 11 11:59:48 2014 -0400 + + Show U+FFFD REPLACEMENT CHARACTER for invalid Unicode codepoints + + Only if the font doesn't support it. Ie, this gives the user to + use non-Unicode codepoints as private values and return a meaningful + glyph for them. But if it's invalid and font callback doesn't + like it, and if font has U+FFFD, show that instead. + + Font functions that do not want this automatic replacement to + happen should return true from get_glyph() if unicode > 0x10FFFF. + + Replaces https://github.com/behdad/harfbuzz/pull/27 + + src/hb-ot-shape-normalize.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 6f13b6d62daae4989e3cc2fe4b168e5c59650964 +Author: Behdad Esfahbod +Date: Thu Jul 10 19:31:40 2014 -0400 + + When parsing UTF-16, generate invalid codepoint for lonely low + surrogate + + Test passes now. + + src/hb-utf-private.hh | 42 ++++++++++++++++++++++++++++-------------- + 1 file changed, 28 insertions(+), 14 deletions(-) + +commit 24b2ba9dfa7c35769cd843a07079ef88fa594bf8 +Author: Behdad Esfahbod +Date: Thu Jul 10 19:31:16 2014 -0400 + + [test-buffer] Add test for lonely low-surrogate + + Currenty fails. Ouch! + + test/api/test-buffer.c | 1 + + 1 file changed, 1 insertion(+) + +commit 6334495ac1ee0a86228e67794b7a41ee91146f3b +Author: Behdad Esfahbod +Date: Thu Jul 10 19:22:07 2014 -0400 + + Use zh-Hans / zh-Hant when converting OT language tag to hb_language_t + + src/hb-ot-tag.cc | 15 +++------------ + test/api/test-ot-tag.c | 6 +++--- + 2 files changed, 6 insertions(+), 15 deletions(-) + +commit f381e320df795a9d73ac81499f8ed8c311bcb2f0 +Author: Behdad Esfahbod +Date: Thu Jul 10 19:20:35 2014 -0400 + + Fix lang matching logic + + Previous code was broken logically, but harmless. + + src/hb-ot-tag.cc | 2 +- + test/api/test-ot-tag.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit ee5350d667f3a9644667202597694581f2cf657d +Author: Behdad Esfahbod +Date: Thu Jul 10 19:06:45 2014 -0400 + + Accept BCP 47 zh-Hans / zh-Hant language tags + + src/hb-ot-tag.cc | 27 ++++++++++++++++++--------- + test/api/test-ot-tag.c | 3 +++ + 2 files changed, 21 insertions(+), 9 deletions(-) + +commit 431540286794e023ec5eafd5eeedc008d4f31b4c +Author: Behdad Esfahbod +Date: Thu Jul 10 17:37:26 2014 -0400 + + [Android.mk] Add note re static library + + Android.mk | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 5b4131eb1c670c20fd9a45a5617c64060a505ef5 +Author: Behdad Esfahbod +Date: Wed Jul 9 19:09:08 2014 -0400 + + [Android.mk] Update for new ICU + + https://android-review.googlesource.com/#/c/100722/1/Android.mk + + Android.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ab28196c9557a63971a56915aa6f98bb5803bd1b +Author: Behdad Esfahbod +Date: Wed Jul 9 18:18:06 2014 -0400 + + [Android.mk] Re-enable ICU unicode funcs + + Android.mk | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +commit ea001374b86c4f1b24246c08a3d66d2a0e95a827 +Author: Behdad Esfahbod +Date: Wed Jul 9 17:28:43 2014 -0400 + + 0.9.30 + + NEWS | 17 +++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 18 insertions(+), 1 deletion(-) + +commit 8b16ff12590200afb08e8821e3f14d2fdf8efbda +Author: Behdad Esfahbod +Date: Wed Jul 9 17:40:52 2014 -0400 + + [uniscribe] Fix build after recent changes to Offset + + src/hb-ot-name-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 73f7f8919ea1f09b8c5b29f231ac84105cde2145 +Author: Behdad Esfahbod +Date: Wed Jul 9 17:17:18 2014 -0400 + + Define _POSIX_C_SOURCE only if it is not defined + + Fixes https://github.com/behdad/harfbuzz/pull/45 + + src/hb-blob.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 6bd5646f1b865a76304a67e03a6161afcfef293f +Author: Behdad Esfahbod +Date: Wed Jul 9 17:07:06 2014 -0400 + + [tests] Remove bash'ish + + Apparently on travis-ci, bash is linked to dash, which doesn't + understand "let". Failing tests were not being noticed. See eg: + + https://travis-ci.org/behdad/harfbuzz/jobs/29544211 + + Don't rely on bash. + + test/shaping/run-tests.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0afedaa96c81b63774a4a0ef9b4cb4995d24ec9e +Author: Behdad Esfahbod +Date: Wed Jul 9 17:00:48 2014 -0400 + + [util/hb-shape] Fix crash; oops + + util/hb-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0cd94491b99aed438ad79a55cdfced8d1b657179 +Author: Behdad Esfahbod +Date: Wed Jul 9 16:51:38 2014 -0400 + + [ucdn] Update to Unicode 7.0.0 data + + From http://github.com/behdad/ucdn + + src/hb-ucdn.cc | 23 + + src/hb-ucdn/README | 1 + + src/hb-ucdn/ucdn.c | 2 +- + src/hb-ucdn/ucdn.h | 27 + + src/hb-ucdn/unicodedata_db.h | 3711 + ++++++++++++++++++++++-------------------- + 5 files changed, 2039 insertions(+), 1725 deletions(-) + +commit 9d4ede3a97fff544a5ec2a671e49a92a79645b61 +Author: Behdad Esfahbod +Date: Wed Jul 9 16:19:55 2014 -0400 + + [Android.mk] Update source list + + Android.mk | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 7e1ab1f6d812a55f75d4844f7981d5604481049c +Author: Behdad Esfahbod +Date: Wed Jul 9 16:13:40 2014 -0400 + + [Android.mk] Whitespace + + Android.mk | 26 ++++++-------------------- + 1 file changed, 6 insertions(+), 20 deletions(-) + +commit 5c6695c42470e0a15e9029ebe8ecbebf3fa4f95b +Author: Behdad Esfahbod +Date: Wed Jul 9 16:07:12 2014 -0400 + + [Android.mk] Remove -lpthread; we build with -DHB_NO_MT + + Android.mk | 3 --- + 1 file changed, 3 deletions(-) + +commit 9109f1e944dd4bd4ae8057b75c8a31e9d31797aa +Author: Behdad Esfahbod +Date: Tue Jul 8 20:02:29 2014 -0400 + + [util/hb-shape] Accept an empty output-format that would skip output + + Useful for benchmarking, to avoid buffer serialization overhead (which + seems to by far dominate shaping!) + + util/hb-shape.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 8656408572c2685f278a3b742ee69c767c29788c +Author: Behdad Esfahbod +Date: Tue Jul 8 18:10:20 2014 -0400 + + [util] Fix hb-view rendering with --font-funcs=ot + + util/helper-cairo.cc | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + +commit 8650def73500204b79c651f58b1be3f94a41973d +Author: Behdad Esfahbod +Date: Sat Jul 5 15:50:18 2014 -0400 + + [util] Add option to set font function implementation to use + + Supports ft and ot right now. hb-view currently not rendering + with ot. + Will fix after some clean up. + + util/options.cc | 76 + ++++++++++++++++++++++++++++++++++++++++++++++++++------- + util/options.hh | 21 ++++++++++++++++ + 2 files changed, 88 insertions(+), 9 deletions(-) + +commit 2306ad46dce1c53b0b1bfabdc04d70e3b99eabb7 +Author: Behdad Esfahbod +Date: Fri Jul 4 18:09:29 2014 -0400 + + [util] Fix memory issue + + util/options.cc | 6 ++---- + util/options.hh | 9 +++++++++ + 2 files changed, 11 insertions(+), 4 deletions(-) + +commit 14a4a9d649798d32c31f79b4045a885626dffc7f +Author: Behdad Esfahbod +Date: Tue Jul 1 15:51:54 2014 -0400 + + Add Roozbeh to AUTHORS + + He's been my shadow for all Indic-related changes in the last + few months. + + AUTHORS | 1 + + 1 file changed, 1 insertion(+) + +commit 68f724484b1663255ee249481624e552d2e2313f +Author: Behdad Esfahbod +Date: Mon Jun 30 15:46:53 2014 -0400 + + [indic] Remove some more now-unused special-cases + + src/hb-ot-shape-complex-indic.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit e79c9489802f99dc7eb8b4c2765c4c71b5f80e60 +Author: Behdad Esfahbod +Date: Mon Jun 30 15:39:39 2014 -0400 + + [indic] Remove special-casing of U+1CF2,1CF3 + + These were introduced in a498565cedf0441ae723c5e5969f637d792a15e7, + but IndicSyllabicCategory has had the correct value already, so the + special code was never needed. + + src/hb-ot-shape-complex-indic.cc | 6 ------ + 1 file changed, 6 deletions(-) + +commit d743ce78e10758b7dbaf0cfd191309e5ef646881 +Author: Behdad Esfahbod +Date: Mon Jun 30 15:24:02 2014 -0400 + + [indic-table] Update to Unicode 7.0 data + + Touch code just enough to preserve previous syllable structure + and functionality as closely as possible. Many further cleanups + coming later. + + src/gen-indic-table.py | 4 + + src/hb-ot-shape-complex-indic-private.hh | 23 +- + src/hb-ot-shape-complex-indic-table.cc | 468 + ++++++++++++++++++++++--------- + src/hb-ot-shape-complex-indic.cc | 21 -- + src/hb-ot-shape-complex-myanmar.cc | 2 - + 5 files changed, 355 insertions(+), 163 deletions(-) + +commit 5fa21b3ab7175f55f89cb194b544d5d4bd06a481 +Author: Behdad Esfahbod +Date: Mon Jun 30 14:30:54 2014 -0400 + + [indic-table] Fix category frequency counts in comments + + src/gen-indic-table.py | 2 +- + src/hb-ot-shape-complex-indic-table.cc | 46 + +++++++++++++++++----------------- + 2 files changed, 24 insertions(+), 24 deletions(-) + +commit 5c4e3e9a57b6b735e7d72cbd5f4070cf024d7015 +Author: Behdad Esfahbod +Date: Mon Jun 30 14:25:18 2014 -0400 + + Whitespace + + src/hb-ot-shape-complex-indic-private.hh | 76 + ++++++++++++++++---------------- + 1 file changed, 38 insertions(+), 38 deletions(-) + +commit af528b6674bccac3efd13f8b33fcdc6aeb178f4c +Author: Behdad Esfahbod +Date: Fri Jun 27 18:07:00 2014 -0400 + + Fix typo; ouch! + + src/hb-ot-cmap-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7d4ada66c96a748ce92f8e8edac149361c3dc829 +Author: Behdad Esfahbod +Date: Fri Jun 27 17:30:59 2014 -0400 + + Mark unsed members with a "Z" suffix + + There may be more. There are members that are by definition + redundant or reserved and not needed, NOT what we *currently* + don't use. + + I'm sure there's more... + + src/hb-open-file-private.hh | 6 +++--- + src/hb-ot-cmap-table.hh | 24 ++++++++++++------------ + src/hb-ot-layout-common-private.hh | 2 +- + 3 files changed, 16 insertions(+), 16 deletions(-) + +commit 23afcff1d14e57f5ce30a4100698d4f2dc530958 +Author: Behdad Esfahbod +Date: Fri Jun 27 17:22:36 2014 -0400 + + [ot-font] Implement Unicode variation selectors + + src/hb-ot-font.cc | 20 +++++++++++++++++++- + 1 file changed, 19 insertions(+), 1 deletion(-) + +commit a5a4736916b6035e6413d4619f9e7287e683d51b +Author: Behdad Esfahbod +Date: Fri Jun 27 17:03:22 2014 -0400 + + [cmap] Implement subtable format 14 + + src/hb-ot-cmap-table.hh | 147 + +++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 133 insertions(+), 14 deletions(-) + +commit 586b60622c33878f9ca4826b4ef07369d32bf039 +Author: Behdad Esfahbod +Date: Fri Jun 27 15:39:47 2014 -0400 + + Minor: final bits of cleanup + + src/hb-open-type-private.hh | 1 + + src/hb-ot-layout-common-private.hh | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit 51d9ba09bc78188ec87218aef5232e80568c1712 +Author: Behdad Esfahbod +Date: Fri Jun 27 15:27:15 2014 -0400 + + Minor + + src/hb-open-type-private.hh | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit 3084767e92483c669f38319f153c498e9a6b92c7 +Author: Behdad Esfahbod +Date: Fri Jun 27 15:24:35 2014 -0400 + + Minor: Remove LongArrayOf + + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 4 ---- + 2 files changed, 1 insertion(+), 5 deletions(-) + +commit 41ea59495032e712fa6f801350ee00d5f00b5724 +Author: Behdad Esfahbod +Date: Fri Jun 27 15:23:18 2014 -0400 + + Minor: Remove LongSortedArrayOf + + src/hb-open-type-private.hh | 4 ---- + src/hb-ot-cmap-table.hh | 2 +- + 2 files changed, 1 insertion(+), 5 deletions(-) + +commit bb6ecf2ce5c2679c298741af17836a22e1d68121 +Author: Behdad Esfahbod +Date: Fri Jun 27 15:13:44 2014 -0400 + + Minor: Remove LongOffsetArrayOf and LongOffsetLongArrayOf + + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 8 -------- + src/hb-ot-layout-gdef-table.hh | 2 +- + 3 files changed, 2 insertions(+), 10 deletions(-) + +commit 99d281712390fd54e523b2f0580d10445457ec2f +Author: Behdad Esfahbod +Date: Fri Jun 27 15:12:52 2014 -0400 + + Minor: Remove GenericOffset + + src/hb-open-type-private.hh | 13 +++++-------- + src/hb-ot-layout-common-private.hh | 8 ++++---- + 2 files changed, 9 insertions(+), 12 deletions(-) + +commit 9da552dcc5b89b3bbbe5a55fb7c543222382e12a +Author: Behdad Esfahbod +Date: Fri Jun 27 15:09:42 2014 -0400 + + Minor: Remove some GenericXXX templates + + src/hb-open-type-private.hh | 32 +++++++++++--------------------- + src/hb-ot-cmap-table.hh | 4 ++-- + src/hb-ot-layout-common-private.hh | 2 +- + 3 files changed, 14 insertions(+), 24 deletions(-) + +commit 36073ede5b52bd1231622cbacd1bee6b82696d81 +Author: Behdad Esfahbod +Date: Fri Jun 27 14:48:54 2014 -0400 + + Minor: Reorder template parameter order + + src/hb-open-type-private.hh | 14 +++++++------- + src/hb-ot-cmap-table.hh | 2 +- + 2 files changed, 8 insertions(+), 8 deletions(-) + +commit 0394ec1bfbd7806cbe9fc809b34f96f8d12ffbf2 +Author: Behdad Esfahbod +Date: Fri Jun 27 14:40:35 2014 -0400 + + Minor: Introduce GenericOffset + + src/hb-open-type-private.hh | 16 ++++++---------- + 1 file changed, 6 insertions(+), 10 deletions(-) + +commit 0d1b3419a7bbfd18ab8fed1abd3a41dec11e8d97 +Author: Behdad Esfahbod +Date: Thu Jun 26 19:13:34 2014 -0400 + + Minor: Use template parameter default values for OffsetTo + + src/hb-open-type-private.hh | 13 +++++-------- + 1 file changed, 5 insertions(+), 8 deletions(-) + +commit 546b1adcdce2d3592843938b0b81ff32e67b0b83 +Author: Behdad Esfahbod +Date: Thu Jun 26 19:10:21 2014 -0400 + + Minor: Use template parameter default values for hb_prealloced_array_t + + src/hb-private.hh | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit 911ca38645bd51764e7859bc482319e8f6d2f710 +Author: Behdad Esfahbod +Date: Tue Jun 24 10:20:36 2014 -0600 + + Add back API removed recently + + Add hb_ot_layout_language_get_required_feature_index() again, which + is used in Pango. This was removed in + da132937989acb4d8ca9bd41c79f98750e7dda30 in favor of + hb_ot_layout_language_get_required_feature(). + + API changes: + + - Added hb_ot_layout_language_get_required_feature_index back. + + src/hb-ot-layout.cc | 15 +++++++++++++++ + src/hb-ot-layout.h | 7 +++++++ + 2 files changed, 22 insertions(+) + +commit 89e4946929a8cd2359c7d76fa9272d5604243002 +Author: Behdad Esfahbod +Date: Sun Jun 22 11:32:13 2014 -0600 + + Add new IndicSyllabicCategory short forms for Unicode 7.0 + + src/gen-indic-table.py | 4 ++++ + 1 file changed, 4 insertions(+) + +commit dcee838e89c2863c2fda4e8f098e720637e02335 +Author: Behdad Esfahbod +Date: Sun Jun 22 11:29:59 2014 -0600 + + Minor + + src/gen-arabic-table.py | 2 +- + src/gen-indic-table.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit f2ad86e6053fa87ab188c36edc3d98c92324c049 +Author: Behdad Esfahbod +Date: Sat Jun 21 15:31:10 2014 -0600 + + [indic-table-gen] Minor + + src/gen-indic-table.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 2ec62279aab8c2263f17ffbc7c6f74304674f9a8 +Author: Behdad Esfahbod +Date: Sat Jun 21 15:25:59 2014 -0600 + + [indic-table] Update to Unicode 6.3.0 + + Was from 6.2.0. It's a no-op. Committing for the record. + + src/hb-ot-shape-complex-indic-table.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 5d4d7384efa97a30893ad28b9ad9a994722de12c +Author: Behdad Esfahbod +Date: Sat Jun 21 14:53:21 2014 -0600 + + Minor: format + + src/hb-ot-shape-complex-arabic.cc | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 44243ae5902cc420e6bf6ec2fca2584ba93ff2fb +Author: Behdad Esfahbod +Date: Sat Jun 21 14:19:34 2014 -0600 + + [arabic-table] Update to Unicode 7.0 + + Old table was from 6.2. Remove hard-coded Mongolian and Phags-pa + data. + This completes support for new scripts Manichian and Psaltar Pahlavi. + + src/hb-ot-shape-complex-arabic-table.hh | 72 + ++++++++++++++++++++++++++++----- + src/hb-ot-shape-complex-arabic.cc | 22 ---------- + 2 files changed, 63 insertions(+), 31 deletions(-) + +commit cd86ab9b4f4d7bd4f563be64a83714fc8fb395d7 +Author: Behdad Esfahbod +Date: Sat Jun 21 14:10:38 2014 -0600 + + [arabic-table] Add ZWJ/ZWNJ now that table is segmented + + src/gen-arabic-table.py | 2 -- + src/hb-ot-shape-complex-arabic-table.hh | 12 +++++++++++- + src/hb-ot-shape-complex-arabic.cc | 5 ----- + 3 files changed, 11 insertions(+), 8 deletions(-) + +commit 2390d9b67e1dfeccd3f0850d1304c52b54817ca0 +Author: Behdad Esfahbod +Date: Sat Jun 21 14:07:00 2014 -0600 + + [arabic-table] Further tune + + In anticipation of Unicode 7.0 data coming in the next commit. + + src/gen-arabic-table.py | 10 ++++++--- + src/hb-ot-shape-complex-arabic-table.hh | 38 + +++++++++++++++------------------ + 2 files changed, 24 insertions(+), 24 deletions(-) + +commit a133e6067aaebc494c0156b5fac7f4a879e12dbe +Author: Behdad Esfahbod +Date: Fri Jun 20 18:01:34 2014 -0400 + + [indic-table] Minor + + src/gen-indic-table.py | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit b900fa2c8cc088dbcbdbf90bfdf8764f9ee1c96a +Author: Behdad Esfahbod +Date: Fri Jun 20 17:59:43 2014 -0400 + + [arabic-table] Use segmented table + + No functional change. + + src/gen-arabic-table.py | 82 + +++++++++++++++++++++++---------- + src/hb-ot-shape-complex-arabic-table.hh | 53 ++++++++++++++------- + src/hb-ot-shape-complex-arabic.cc | 8 ++-- + 3 files changed, 97 insertions(+), 46 deletions(-) + +commit c2e113404640bf9b8bac469d0803ac946e77964f +Author: Behdad Esfahbod +Date: Fri Jun 20 17:57:03 2014 -0400 + + [indic-table] Make output stable + + src/gen-indic-table.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 55abfbd2ac1626af16151298a0837b837d0796df +Author: Behdad Esfahbod +Date: Fri Jun 20 16:47:43 2014 -0400 + + [indic-table] Minor + + No output change. + + src/gen-indic-table.py | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +commit f88670749006991282bcc4e8b6218487295ca670 +Author: Behdad Esfahbod +Date: Fri Jun 20 16:30:10 2014 -0400 + + [arabic-table] Don't write comments + + No functional change. + + src/gen-arabic-table.py | 20 +- + src/hb-ot-shape-complex-arabic-table.hh | 710 + ++------------------------------ + 2 files changed, 38 insertions(+), 692 deletions(-) + +commit 200dfe3eb10feda2ad25940338b08011f4757ca4 +Author: Behdad Esfahbod +Date: Fri Jun 20 16:20:59 2014 -0400 + + [arabic-table] Use short names for values + + No functional change. + + src/gen-arabic-table.py | 16 +- + src/hb-ot-shape-complex-arabic-table.hh | 1386 + ++++++++++++++++--------------- + 2 files changed, 716 insertions(+), 686 deletions(-) + +commit 3f5327a41efcf50f64d9498ef3dfd6875ef6a5ab +Author: Behdad Esfahbod +Date: Fri Jun 20 16:17:42 2014 -0400 + + [arabic-table] Read Blocks.txt and shuffle code around + + No functional change. + + src/Makefile.am | 2 +- + src/gen-arabic-table.py | 80 + +++++++++++++++++++-------------- + src/hb-ot-shape-complex-arabic-table.hh | 30 ++++++++----- + 3 files changed, 67 insertions(+), 45 deletions(-) + +commit 171f970e4f72d9fe1af30eab32b96906ee4a14f5 +Author: Behdad Esfahbod +Date: Fri Jun 20 15:25:30 2014 -0400 + + [indic-table] Black-list Thai, Lao, and Tibetan + + We don't need Indic table for those. + + src/gen-indic-table.py | 3 ++ + src/hb-ot-shape-complex-indic-table.cc | 94 + +++++++--------------------------- + 2 files changed, 21 insertions(+), 76 deletions(-) + +commit 65ac2dae4f284f563b2dc476a21e2b5a48124de8 +Author: Behdad Esfahbod +Date: Fri Jun 20 15:12:49 2014 -0400 + + [indic-table] Speed up lookup + + src/gen-indic-table.py | 22 +++++++++--- + src/hb-ot-shape-complex-indic-table.cc | 61 + +++++++++++++++++++++++----------- + 2 files changed, 59 insertions(+), 24 deletions(-) + +commit 64442a3f4c5c7be08893454742cad6bfe73cb8d7 +Author: Behdad Esfahbod +Date: Fri Jun 20 14:58:53 2014 -0400 + + [indic-table] Fix compiler warning + + src/gen-indic-table.py | 4 +--- + src/hb-ot-shape-complex-indic-table.cc | 4 +--- + 2 files changed, 2 insertions(+), 6 deletions(-) + +commit 0436e1d50527497ebe5053b51a34ce6590276249 +Author: Behdad Esfahbod +Date: Fri Jun 20 14:56:22 2014 -0400 + + [indic-table] Make table more compact by not covering full blocks + + -#define indic_offset_total 4416 + +#define indic_offset_total 3816 + + -}; /* Table occupancy: 60% */ + +}; /* Table occupancy: 69% */ + + src/gen-indic-table.py | 24 ++++-- + src/hb-ot-shape-complex-indic-table.cc | 150 + +++++++++------------------------ + 2 files changed, 57 insertions(+), 117 deletions(-) + +commit 190a251479b3cfc68871ff1daf9a9d1abe3f86e6 +Author: Behdad Esfahbod +Date: Fri Jun 20 14:41:39 2014 -0400 + + [indic-table] Remove block range from data table + + No functional change. + + src/gen-indic-table.py | 4 +- + src/hb-ot-shape-complex-indic-table.cc | 102 + ++++++++++++++++----------------- + 2 files changed, 54 insertions(+), 52 deletions(-) + +commit 2b051c6057920c564c13c5d6a3e6dca93446fa12 +Author: Behdad Esfahbod +Date: Fri Jun 20 14:09:57 2014 -0400 + + Rename HB_VERSION_CHECK and hb_version_check to "atleast" + + HB_VERSION_CHECK's comparison was originally written wrongly + by mistake. When API tests were written, they were also written + wrongly to pass given the wrong implementation... Sigh. + + Given the purpose of this API, there's no point in fixing it + without renaming it. As such, rename. + + API changes: + + HB_VERSION_CHECK -> HB_VERSION_ATLEAST + hb_version_check -> hb_version_atleast + + docs/reference/harfbuzz-sections.txt | 4 ++-- + src/hb-common.cc | 10 +++++----- + src/hb-version.h.in | 10 +++++----- + test/api/test-version.c | 29 +++++++++++++++-------------- + 4 files changed, 27 insertions(+), 26 deletions(-) + +commit cabfa538ed4b1355326fa8de05f7209dda1c1c7a +Author: Behdad Esfahbod +Date: Fri Jun 20 13:51:21 2014 -0400 + + Adjust unused doc symbols + + docs/reference/harfbuzz-sections.txt | 19 +++++++++++++++++-- + src/hb-ot-shape.h | 21 ++++++++++----------- + 2 files changed, 27 insertions(+), 13 deletions(-) + +commit da132937989acb4d8ca9bd41c79f98750e7dda30 +Author: Jonathan Kew +Date: Sun Apr 27 14:05:24 2014 +0100 + + Rework handling of requiredFeature to solve problem with rlig in + arial.ttf from winxp + + https://bugzilla.mozilla.org/show_bug.cgi?id=986802 + Fixes https://github.com/behdad/harfbuzz/pull/39 + + API Change: + + -hb_ot_layout_language_get_required_feature_index + +hb_ot_layout_language_get_required_feature + + New API takes an extra pointer argument. Pass NULL in to get + behavior of previous API. + + Reworked by behdad + + src/hb-ot-layout-gsubgpos-private.hh | 4 +-- + src/hb-ot-layout.cc | 29 ++++++++++++--------- + src/hb-ot-layout.h | 11 ++++---- + src/hb-ot-map.cc | 50 + ++++++++++++++++++++++++++---------- + src/main.cc | 4 +-- + 5 files changed, 64 insertions(+), 34 deletions(-) + +commit df554af99db390e42d378983bb3fcf583477a1d7 +Author: Behdad Esfahbod +Date: Thu Jun 19 15:39:18 2014 -0400 + + Rename search() to bsearch() and lsearch() + + Such that the complexity of the algorithm used is clear at + call site. + + src/hb-open-type-private.hh | 4 ++-- + src/hb-ot-cmap-table.hh | 14 +++++++------- + src/hb-ot-layout-common-private.hh | 9 +++++---- + 3 files changed, 14 insertions(+), 13 deletions(-) + +commit fb8cc86ff99c08064ac58a559bb66cc340693b92 +Author: Behdad Esfahbod +Date: Thu Jun 19 15:30:18 2014 -0400 + + Rename sort() to qsort() + + In an effort to make the algorithm used clear. + + src/hb-coretext.cc | 4 ++-- + src/hb-ot-map.cc | 4 ++-- + src/hb-private.hh | 8 ++++---- + src/hb-uniscribe.cc | 4 ++-- + 4 files changed, 10 insertions(+), 10 deletions(-) + +commit 577ca4814314c374824cac736996b9cdd4f9d11f +Author: Behdad Esfahbod +Date: Wed Jun 18 12:29:23 2014 -0400 + + [unicode7] Update list of Default_Ignorable codepoints + + src/hb-unicode-private.hh | 66 + +++++++++++++++++++++-------------------------- + 1 file changed, 30 insertions(+), 36 deletions(-) + +commit 7cfee3827636f0dff7df5c8975a4fadd1b4bfbd5 +Author: Behdad Esfahbod +Date: Mon Apr 28 15:09:30 2014 -0700 + + [unicode7] Route Manichaean and Psalter Pahlavi through Arabic shaper + + Still needs update to joining table to fully work. + + src/hb-ot-shape-complex-private.hh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit a4a7899cd93fb9d1bc2163a4bbabfa733ee5bd52 +Author: Behdad Esfahbod +Date: Mon Apr 28 15:06:42 2014 -0700 + + [unicode7] Mark right-to-left scripts + + src/hb-common.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 62587bfc5178a447ef66d88eab7412a7efe84692 +Author: Behdad Esfahbod +Date: Mon Apr 28 15:07:21 2014 -0700 + + [unicode7] Declare Unicode 7 scripts + + src/hb-common.h | 21 +++++++++------------ + 1 file changed, 9 insertions(+), 12 deletions(-) + +commit dc61294aa93d36d0c5d187d4a692560a7cb46444 +Author: Behdad Esfahbod +Date: Mon Apr 28 14:58:28 2014 -0700 + + [unicode7] Add missing ISO 15924 tags + + src/hb-common.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 7526373e70bc4c2e2072da36babf9399fcf483b8 +Author: Behdad Esfahbod +Date: Tue Jun 17 11:45:26 2014 -0400 + + [coretext] Remove unused var + + src/hb-coretext.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit 798e4185bc71b1a63528e6b0af236d4c964ec607 +Author: Jonathan Kew +Date: Tue Jun 10 13:10:30 2014 +0100 + + When zeroing mark widths for LTR, also adjust offset... + + ...so that they overstrike preceding glyph. + + https://github.com/behdad/harfbuzz/pull/43 + + src/hb-ot-shape.cc | 50 + +++++++++++++++++++++++++++++++++++++++----------- + 1 file changed, 39 insertions(+), 11 deletions(-) + +commit 80f7405a5208f88b8615aa4ce4c54ffeb16f04f8 +Author: Jonathan Kew +Date: Tue Jun 10 13:10:02 2014 +0100 + + [Thai] set the correct general category on Nikhahit when decomposing + Sara-Am. + + src/hb-ot-shape-complex-thai.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 1d634cbb4b0338e1c2841127a72c5fac3a2a5ca1 +Author: Behdad Esfahbod +Date: Fri Jun 6 17:55:02 2014 -0400 + + Fix base-position when 'pref' is NOT formed + + If pre-base reordering Ra is NOT formed (or formed and then + broken up), we should consider that Ra as base. This is + observable when there's a left matra or dotreph that positions + before base. + + Now, it might be that we shouldn't do this if the Ra happend + to form a below form. We can't quite deduce that right now... + + Micro test added. Also at: + + https://code.google.com/a/google.com/p/noto-alpha/issues/detail?id=186#c29 + + src/hb-ot-shape-complex-indic.cc | 28 + +++++++++++++++++++-- + test/shaping/fonts/sha1sum/MANIFEST | 5 ++++ + .../e207635780b42f898d58654b65098763e340f5c7.ttf | Bin 0 -> 3000 bytes + test/shaping/tests/indic-pref-blocking.tests | 3 ++- + 4 files changed, 33 insertions(+), 3 deletions(-) + +commit 04dc52fa15f5b7f9eb5f448ea43e7ef1b2269e88 +Author: Behdad Esfahbod +Date: Fri Jun 6 17:28:38 2014 -0400 + + [indic] Recover OT_H undergone ligation and multiplication + + Sometimes font designers form half/pref/etc consonant forms + unconditionally and then undo that conditionally. Try to + recover the OT_H classification in those cases. + + No test number changes expected. + + src/hb-ot-layout-private.hh | 8 ++++++++ + src/hb-ot-shape-complex-indic.cc | 21 +++++++++++++++++++++ + 2 files changed, 29 insertions(+) + +commit 39c8201f8e361e8c0f23f07bf20124ccadc6086c +Author: Behdad Esfahbod +Date: Fri Jun 6 17:19:35 2014 -0400 + + [indic] Improve base re-finding + + No test numbers change. + + src/hb-ot-shape-complex-indic.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit c04d5f0dd24d0ed9560fb9aebb5561ce946743c3 +Author: Behdad Esfahbod +Date: Fri Jun 6 17:02:39 2014 -0400 + + [indic] Minor + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 824d00dce483d0f4030c0cac253f994810e10f32 +Author: Behdad Esfahbod +Date: Mon Jun 9 14:17:33 2014 -0400 + + Fix commit 3f38c1137b6219a646da141b08463ffa922d4e35 + + Previous commit was not compiling with clang. + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 3f38c1137b6219a646da141b08463ffa922d4e35 +Author: Behdad Esfahbod +Date: Fri Jun 6 16:03:40 2014 -0400 + + Don't use -mstructure-size-boundary=8 on clang arm + + As in building for Android / iPhone. Only set it if + struct{char} alignment is not 1. + + NOT tested on an actual Arm architecture. Guess we'll know + when this makes it to people's build bots. + + configure.ac | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 0ff74b09d2ccf7a9ea0f0b463d8b6d819c86c837 +Author: Behdad Esfahbod +Date: Thu Jun 5 21:55:23 2014 -0400 + + Add missing test file. Oops + + test/shaping/tests/indic-pref-blocking.tests | 1 + + 1 file changed, 1 insertion(+) + +commit 832a6f99b34f334b1e82b8e3a7ad137e823d203c +Author: Behdad Esfahbod +Date: Wed Jun 4 16:57:42 2014 -0400 + + [indic] Don't reorder reph/pref if ligature was expanded + + Normally if you want to, say, conditionally prevent a 'pref', you + would use blocking contextual matching. Some designers instead + form the 'pref' form, then undo it in context. To detect that + we now also remember glyphs that went through MultipleSubst. + + In the only place that this is used, Uniscribe seems to only care + about the "last" transformation between Ligature and Multiple + substitions. Ie. if you ligate, expand, and ligate again, it + moves the pref, but if you ligate and expand it doesn't. That's + why we clear the MULTIPLIED bit when setting LIGATED. + + Micro-test added. Test: U+0D2F,0D4D,0D30 with font from: + + [1] + https://code.google.com/a/google.com/p/noto-alpha/issues/detail?id=186#c29 + + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 20 + ++++++++++++++++---- + src/hb-ot-layout-private.hh | 16 + +++++++++++++++- + src/hb-ot-shape-complex-indic.cc | 4 ++-- + test/shaping/Makefile.am | 5 ++++- + .../226bc2deab3846f1a682085f70c67d0421014144.ttf | Bin 0 -> 2828 bytes + test/shaping/tests/MANIFEST | 1 + + 7 files changed, 39 insertions(+), 9 deletions(-) + +commit b5be2317201774c84470167767ad83c8637cad5b +Author: Behdad Esfahbod +Date: Thu Jun 5 19:00:22 2014 -0400 + + [gsub] Adjust single-length ligature subst to act like single subst + + src/hb-ot-layout-gsub-table.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit aae69451dfbf2e3671c555c234f788c194302818 +Author: Behdad Esfahbod +Date: Thu Jun 5 18:54:44 2014 -0400 + + [gsub] Minor shuffling + + src/hb-ot-layout-gsub-table.hh | 29 ++++++++++++++++------------- + 1 file changed, 16 insertions(+), 13 deletions(-) + +commit b6b304f12be917b7449b3ac9409069fcd4a27d95 +Author: Behdad Esfahbod +Date: Thu Jun 5 17:12:54 2014 -0400 + + [ot] Add TODO re zero-len MultipleSubst sequences + + src/hb-ot-layout-gsub-table.hh | 9 +++++++++ + src/hb-ot-layout-gsubgpos-private.hh | 4 +++- + 2 files changed, 12 insertions(+), 1 deletion(-) + +commit f1a72fe7bf863535ec09b559cc0bd878fd0799f2 +Author: Behdad Esfahbod +Date: Wed Jun 4 19:00:29 2014 -0400 + + [ot-font] Fix cmap EncodingRecord cmp order + + src/hb-ot-cmap-table.hh | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +commit ce34f0b07e5324ed52e6e2c43000c2b09ee010d4 +Author: Behdad Esfahbod +Date: Wed Jun 4 18:57:46 2014 -0400 + + [ot-font] Use binary search for format12 cmap subtable + + src/hb-open-type-private.hh | 4 ++++ + src/hb-ot-cmap-table.hh | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit 257d1adfa1b3422c511c55e641840a6e31ec6008 +Author: Behdad Esfahbod +Date: Wed Jun 4 18:47:55 2014 -0400 + + [ot-font] Work around broken cmap subtable format 4 length + + Roboto was hitting this. FreeType also has pretty much the + same code for this, in ttcmap.c:tt_cmap4_validate(): + + /* in certain fonts, the `length' field is invalid and goes */ + /* out of bound. We try to correct this here... */ + if ( table + length > valid->limit ) + { + if ( valid->level >= FT_VALIDATE_TIGHT ) + FT_INVALID_TOO_SHORT; + + length = (FT_UInt)( valid->limit - table ); + } + + src/hb-ot-cmap-table.hh | 22 ++++++++++++++++++---- + 1 file changed, 18 insertions(+), 4 deletions(-) + +commit 51f563579b94e1ee23ced9bbcc7dd3341535ce72 +Author: Behdad Esfahbod +Date: Wed Jun 4 18:42:32 2014 -0400 + + Move try_set to sanitize context + + src/hb-open-type-private.hh | 22 ++++++++++------------ + src/hb-ot-layout-common-private.hh | 2 +- + 2 files changed, 11 insertions(+), 13 deletions(-) + +commit 500737e8e16dce5248aff394899bb3761a9c3bbf +Author: Behdad Esfahbod +Date: Wed Jun 4 18:17:29 2014 -0400 + + [ot-font] Don't select a Null cmap subtable + + Can happen either in broken fonts, or as a result of sanitize(). + + src/hb-ot-cmap-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dac86026a6bae5a8a03cfe885bf93f32e5f48614 +Author: Behdad Esfahbod +Date: Tue Jun 3 17:57:00 2014 -0400 + + Fix some cppcheck warnings + + Bug 77800 - cppcheck reports + + src/hb-common.cc | 4 +++- + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-private.hh | 2 +- + src/hb-shape-plan.cc | 4 ++-- + 4 files changed, 7 insertions(+), 5 deletions(-) + +commit c306410cab368a27c1941a2625d3b475edeaac04 +Author: Behdad Esfahbod +Date: Tue Jun 3 16:59:41 2014 -0400 + + Bug 77732 - Fix unused typedef warning for ASSERT_STATIC with GCC 4.8 + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ae2b854eab7f1c48e56751c987a714c2c18d6eb6 +Author: Behdad Esfahbod +Date: Tue Jun 3 16:59:09 2014 -0400 + + Move code around + + src/hb-private.hh | 134 + ++++++++++++++++++++++++++---------------------------- + 1 file changed, 65 insertions(+), 69 deletions(-) + +commit 17c3b809f42aec34d83dba2e6229ad85804bebae +Author: Behdad Esfahbod +Date: Mon Jun 2 15:08:18 2014 -0400 + + [indic] Treat U+A8E0..A8F1 as OT_A instead of OT_VD + + Apparently they can intermix with other OT_A. + + Test: U+0915,A8E2,1CD0 + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6ae13f257c3986517c097fa666ab9f58bdc918b5 +Author: Behdad Esfahbod +Date: Fri May 30 17:38:14 2014 -0400 + + [graphite2] Fix cluster mapping + + Patch from Martin Hosken. I expect this to fix the following bugs: + + https://bugs.freedesktop.org/show_bug.cgi?id=75076 + https://bugzilla.gnome.org/show_bug.cgi?id=723582 + https://bugzilla.redhat.com/show_bug.cgi?id=998812 + + src/hb-graphite2.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 5875ad9c467b39d00ad4d98fd425179c701e6fd0 +Author: Behdad Esfahbod +Date: Thu May 29 15:48:16 2014 -0400 + + 0.9.29 + + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + 2 files changed, 13 insertions(+), 1 deletion(-) + +commit 7977ca17aac34b9ab10622928bed8afa2177f16a +Author: Behdad Esfahbod +Date: Thu May 29 15:34:26 2014 -0400 + + [indic] Allow decimal and Brahmi digits as placeholders + + Tests: U+0967,0951 U+0031,093F + + src/hb-ot-shape-complex-indic.cc | + 4 ++++ + .../texts/in-tree/shaper-indic/indic/script-devanagari/misc/misc.txt | + 2 ++ + 2 files changed, 6 insertions(+) + +commit e8b5d64039614ecce472eda1a7a603736da25d86 +Author: Behdad Esfahbod +Date: Thu May 29 15:18:27 2014 -0400 + + [indic] Do NOT allow reph formation on placeholders + + Only allow it on DOTTED CIRCLE. No effect on test numbers. + + Test: U+0930,094D,00A0 + + src/hb-ot-shape-complex-indic-machine.rl | + 2 +- + .../in-tree/shaper-indic/indic/script-devanagari/misc/dottedcircle.txt | + 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 52b562a6a058131c0103aaa5404d053e6465bb23 +Author: Behdad Esfahbod +Date: Tue May 27 18:18:23 2014 -0400 + + [indic] Clean up a bit + + No functional change intended. + + src/hb-ot-shape-complex-indic.cc | 17 +++++------------ + 1 file changed, 5 insertions(+), 12 deletions(-) + +commit 3bf652b90783e8244c153739585d95dc4162efb4 +Author: Behdad Esfahbod +Date: Tue May 27 18:07:26 2014 -0400 + + [indic] Treat U+002D and U+2010..2014 as placeholders + + src/hb-ot-shape-complex-indic.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit e0de95f40244924cb8f9f7abca7f53117044a0eb +Author: Behdad Esfahbod +Date: Tue May 27 17:58:34 2014 -0400 + + [indic] Treat U+00D7 MULTIPLICATION SIGN as placeholder + + src/hb-ot-shape-complex-indic.cc | 1 + + 1 file changed, 1 insertion(+) + +commit cf78dd483cbe1759a8ecb731879e041a53ba9bb3 +Author: Behdad Esfahbod +Date: Tue May 27 17:53:37 2014 -0400 + + [indic/myanmar] Rename OT_NBSP to OT_PLACEHOLDER + + src/hb-ot-shape-complex-indic-machine.rl | 4 ++-- + src/hb-ot-shape-complex-indic-private.hh | 6 +++--- + src/hb-ot-shape-complex-indic.cc | 4 ++-- + src/hb-ot-shape-complex-myanmar.cc | 2 +- + 4 files changed, 8 insertions(+), 8 deletions(-) + +commit 186ece94c8838e95db240d3e7c3ce415da6be81e +Author: Behdad Esfahbod +Date: Tue May 27 17:49:45 2014 -0400 + + [myanmar] Use OT_NBSP instead of OT_DOTTEDCIRCLE for OT_GB + + No functional change. + + src/hb-ot-shape-complex-myanmar-machine.rl | 2 +- + src/hb-ot-shape-complex-myanmar.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit cf71d28c380819cb0f7f0f22f6ff9e4aa881a2b8 +Author: Behdad Esfahbod +Date: Tue May 27 17:47:43 2014 -0400 + + [indic/myanmar] Refactor a few macros + + src/hb-ot-shape-complex-indic-private.hh | 12 ++++++++++++ + src/hb-ot-shape-complex-indic.cc | 10 ---------- + src/hb-ot-shape-complex-myanmar.cc | 6 ------ + 3 files changed, 12 insertions(+), 16 deletions(-) + +commit 2307268e01d27a999b56a2f573dfcee8b2a7949b +Author: Behdad Esfahbod +Date: Tue May 27 17:39:01 2014 -0400 + + [indic] Treat U+0A72..0A73 like regular consonants + + Unicode 6.x IndicSyllableCategory categorizes them as + placeholders, but they can subjoin. + + src/hb-ot-shape-complex-indic.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit e9b2a4cfe593bdbe9288571635ba26ac42ede987 +Author: Behdad Esfahbod +Date: Fri May 23 15:49:10 2014 -0400 + + [indic] Support U+1CED + + src/hb-ot-shape-complex-indic.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit d19f8e85702a1e473efe2f02027984dcc127602a +Author: Behdad Esfahbod +Date: Fri May 23 15:45:50 2014 -0400 + + [indic] Support U+A8F2..A8F7,1CE9..1CEC,1CEE..1CF1 + + src/hb-ot-shape-complex-indic.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit ddbdfcbf1c10eed0a7b81b29fee99f1bd22113e5 +Author: Behdad Esfahbod +Date: Fri May 23 15:39:55 2014 -0400 + + [indic] Simplify grammar + + No functional change. + + src/hb-ot-shape-complex-indic-machine.rl | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 4e9b1f662b23966e67c548b86afeff2bec9b0eb7 +Author: Behdad Esfahbod +Date: Fri May 23 15:38:42 2014 -0400 + + [indic] Always start new syllable for Avagraha + + In fact, the previous grammar was ambigious. No functional + change. + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9f9bd9bf31161660214b8b39a78cdafbb79db1be +Author: Behdad Esfahbod +Date: Fri May 23 15:33:13 2014 -0400 + + [indic] Rename avagraha cluster to symbol cluster + + In anticipation of adding more characters to that class of clusters. + + src/hb-ot-shape-complex-indic-machine.rl | 10 +++++----- + src/hb-ot-shape-complex-indic-private.hh | 4 ++-- + src/hb-ot-shape-complex-indic.cc | 14 +++++++------- + 3 files changed, 14 insertions(+), 14 deletions(-) + +commit a498565cedf0441ae723c5e5969f637d792a15e7 +Author: Behdad Esfahbod +Date: Thu May 22 19:39:56 2014 -0400 + + [indic] Support U+1CF2,U+1CF3 + + src/hb-ot-shape-complex-indic.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit ecb98babbaa065940b40ca8954a454f0e2cdcff0 +Author: Behdad Esfahbod +Date: Thu May 22 19:36:21 2014 -0400 + + [indic] Support U+1CE2..U+1CE8 + + src/hb-ot-shape-complex-indic.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 37bf2c9224e32fdc99c20158c6dc0a4602ec1292 +Author: Behdad Esfahbod +Date: Thu May 22 19:35:17 2014 -0400 + + Minor + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 131e17ff9ae792cafa7a500043acb373802ee872 +Author: Behdad Esfahbod +Date: Thu May 22 19:32:51 2014 -0400 + + [indic] Support U+1CF5,1CF6 + + src/hb-ot-shape-complex-indic.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 72ead0cc72dac4d1c985ead065bb820f93f14a1d +Author: Behdad Esfahbod +Date: Thu May 22 19:12:10 2014 -0400 + + [indic] Treat U+1CE1 as a tone-mark too + + It's spacing, but otherwise the same as the other ones. + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e848bfae7c975a6fae434daf8e3db4d69914df9f +Author: Behdad Esfahbod +Date: Thu May 22 18:50:34 2014 -0400 + + [indic] Recategorize U+A8E0..A8F1 as OT_VD + + Up to two of them come after all OT_A characters. + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + src/hb-ot-shape-complex-indic.cc | 10 ++++++---- + 2 files changed, 7 insertions(+), 5 deletions(-) + +commit c519536c34c842304da558dd4a9e3844fc261b20 +Author: Behdad Esfahbod +Date: Thu May 22 18:43:14 2014 -0400 + + [indic] Allow up to three tone marks + + According to Roozbeh, there are valid combinations in Unicode + proposals for up to three. Previously we were allowing up to two. + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c11fc6833980fce6d70c5ae0c6623de97a3eb30a +Author: Behdad Esfahbod +Date: Thu May 22 18:41:49 2014 -0400 + + [indic] Support more extended Devanagari tone marks + + Also adjust U+0953,0954 handling. + + src/hb-ot-shape-complex-indic.cc | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +commit 26c836e53d55a2e2d4c17fd9ea1884eec33ce015 +Author: Behdad Esfahbod +Date: Wed May 21 18:35:48 2014 -0400 + + [indic] Handle "Cantillation marks for the Samaveda" + + src/hb-ot-shape-complex-indic.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 29531128f2f4342d537817746863705df80efe4b +Author: Behdad Esfahbod +Date: Thu May 15 14:04:02 2014 -0600 + + [indic] Improve reph formation of Sinhala and Telugu + + Sinhala and Telugu use "explicit" reph. That is, the reph is + formed by + a Ra,H,ZWJ sequence. Previously, upon detecting this sequence, + we were + checking checking whether the 'rphf' feature applies to the first two + glyphs of the sequence. This is how the Microsoft fonts are designed. + However, testing with Noto shows that apparently Uniscribe also forms + the reph if the lookup ligates all three glyphs. So, try both + sequences. + + Doesn't affect test results for Sinhala or Telugu. + + https://code.google.com/a/google.com/p/noto-alpha/issues/detail?id=232 + + src/hb-ot-shape-complex-indic.cc | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit 8c703f13bf8b4b276093b1c42cd3759e34b6787f +Author: Oleg Oshmyan +Date: Wed May 14 22:10:09 2014 +0100 + + Fix build with --coretext on older OS X + + Fixes https://github.com/behdad/harfbuzz/pull/40 + + src/hb-coretext.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 439b05867c0856a81fa8f9bea3a7465b4b4bdd91 +Author: Behdad Esfahbod +Date: Wed May 14 16:44:39 2014 -0600 + + [myanmar] Allow MedialYa+Asat in the grammar + + The grammar in the OT spec, and the existing Windows implementation + seem to be confused around where to allow Asat around the medial + consonants. + + The previous grammar for medial group was allowing an Asat after + the medial group only if there was a medial Wa or Ha, but not if + there was only a medial Ya. This doesn't make sense to me and + sounds reversed, as both medial Wa and Ha are below marks while + Asat is an above mark. An Asat can come before the medial group + already (in fact, multiple ones can. Why?!). The medial Ya + however is a spacing mark and according to Roozbeh it's valid + to want an Asat on the medial Ya instead of the base, so it looks + to me like we want to allow an Asat after the medial group if + there *was* a Ya but not if there wasn't any. Not wanting to + produce dotted-circle where Windows is not, this commit changes + the grammar to allow one Asat after the medial group no matter + what comes in the group. + + Test: U+1002,103A,103B vs U+1002,103B,103A + + src/hb-ot-shape-complex-myanmar-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0a017ce169d791c9aea56671fe5837961e0a3c09 +Author: Behdad Esfahbod +Date: Wed May 14 16:44:16 2014 -0600 + + Add tests for Myanmar Asat+MedialYa and MedialYa+Asat sequences + + One of them currently produces dotted-circle. Fix and detailed + message coming. + + test/shaping/texts/in-tree/shaper-myanmar/script-myanmar/misc/misc.txt | + 2 ++ + 1 file changed, 2 insertions(+) + +commit c95587618c88d187be64f923033dae151cf820be +Author: Behdad Esfahbod +Date: Wed May 14 00:42:18 2014 -0400 + + [ot] Minor note re cmap subtable format 2 and 8 + + src/hb-ot-cmap-table.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit b7878cd58ea9a67236e1e0228c35b5b03ec4ff9c +Author: Behdad Esfahbod +Date: Tue May 13 21:47:51 2014 -0400 + + [ot] Implement cmap subtable format 0 + + src/hb-open-type-private.hh | 3 ++- + src/hb-ot-cmap-table.hh | 32 ++++++++++++++++++++++++++++++++ + 2 files changed, 34 insertions(+), 1 deletion(-) + +commit ca7b77431d1e0aaa803722be8be85a368a385f47 +Author: Behdad Esfahbod +Date: Tue May 13 21:26:34 2014 -0400 + + [ot] Factor out code between cmap sutable format 12 and 13 + + src/hb-ot-cmap-table.hh | 43 +++++++++++++------------------------------ + 1 file changed, 13 insertions(+), 30 deletions(-) + +commit 94759e8219ed08392573bae948a8135e16b8e0d0 +Author: Behdad Esfahbod +Date: Tue May 13 21:17:28 2014 -0400 + + [ot] Factor out code between cmap subtable format 6 and 10 + + src/hb-ot-cmap-table.hh | 49 + ++++++++++--------------------------------------- + 1 file changed, 10 insertions(+), 39 deletions(-) + +commit 1a8ffc512987c1ff1b4896549f80b145c85454a8 +Author: Behdad Esfahbod +Date: Tue May 13 21:06:39 2014 -0400 + + Minor + + src/hb-blob.h | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 91bbfca87527fa14d6ebec86b087f2a989381872 +Author: Behdad Esfahbod +Date: Mon May 12 18:19:29 2014 -0400 + + [ot] Implement cmap subtable formats 6 and 10 + + src/hb-ot-cmap-table.hh | 77 + +++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 74 insertions(+), 3 deletions(-) + +commit d294a2cb165c4f20daa5624969067c51eb9aef58 +Author: Behdad Esfahbod +Date: Mon May 12 17:58:31 2014 -0400 + + [ot] Implement cmap subtable format 13 + + src/hb-ot-cmap-table.hh | 47 + +++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 41 insertions(+), 6 deletions(-) + +commit 0d75793fae95ed9f6b8522ae3af4fcdf397d8c36 +Author: Behdad Esfahbod +Date: Mon May 12 17:51:15 2014 -0400 + + [ot] Implement cmap subtable format 12 + + src/hb-ot-cmap-table.hh | 63 + +++++++++++++++++++++++++++++++++++++++++++++++-- + src/hb-ot-font.cc | 5 ++++ + 2 files changed, 66 insertions(+), 2 deletions(-) + +commit 3608a6847e7b7eb4206df049158513a085810afd +Author: Behdad Esfahbod +Date: Mon May 12 13:46:29 2014 -0400 + + [ot] Hook up cmap table to hb_ot_font_funcs() + + src/hb-ot-cmap-table.hh | 10 +++++++--- + src/hb-ot-font.cc | 33 +++++++++++++++++++-------------- + 2 files changed, 26 insertions(+), 17 deletions(-) + +commit c8a47452993b9dee6854bfc866aca4a20142696f +Author: Behdad Esfahbod +Date: Fri May 9 19:55:51 2014 -0400 + + [ot] Implement cmap subtable format 4 + + src/hb-ot-cmap-table.hh | 52 + +++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 52 insertions(+) + +commit 4719621f20dfd6a0377c650a7b4df223c18dc143 +Author: Behdad Esfahbod +Date: Fri May 9 16:09:11 2014 -0400 + + Minor + + src/hb-open-type-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 41ca1fbebf61cf26e1e0e4b11f4a5b52fb7d88a9 +Author: Behdad Esfahbod +Date: Fri May 9 15:35:56 2014 -0400 + + [ot] Start implementing cmap table + + src/Makefile.am | 1 + + src/hb-ot-cmap-table.hh | 171 + ++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-font.cc | 1 + + 3 files changed, 173 insertions(+) + +commit c7074b8798048324cb8850c55908ce77fc33d11e +Author: Behdad Esfahbod +Date: Thu May 8 18:24:31 2014 -0400 + + [otlayout] Add GenericArrayOf::search() + + src/hb-open-type-private.hh | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit 40a479797add42fa42b78d4267920ef75bfb6b9a +Author: Behdad Esfahbod +Date: Thu May 8 18:21:04 2014 -0400 + + [otlayout] Add GenericSortedArrayOf + + src/hb-open-type-private.hh | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit 0ddecabc6de205b121bec31fbf670f37cc9454ef +Author: Behdad Esfahbod +Date: Thu May 1 16:01:40 2014 -0700 + + [main] Minor improvement to output + + src/main.cc | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit 79ecdc3f9525212053d2bc88a5541c41697159da +Author: Behdad Esfahbod +Date: Mon Apr 28 14:24:23 2014 -0700 + + 0.9.28 + + NEWS | 13 +++++++++++++ + configure.ac | 2 +- + 2 files changed, 14 insertions(+), 1 deletion(-) + +commit 6faff8e4132197ba06f0e685b82efe35b546cf64 +Author: Behdad Esfahbod +Date: Mon Apr 28 14:29:39 2014 -0700 + + Add static storage classifier to inline functions + + Before we were just relying on the compiler inlining them and not + leaving a trace in our public API. Try to fix. Hopefully not + breaking anyone's build. + + src/hb-open-type-private.hh | 22 +++++++++++----------- + src/hb-ot-layout-gpos-table.hh | 4 ++-- + src/hb-ot-layout-gsub-table.hh | 6 +++--- + src/hb-ot-layout-private.hh | 36 ++++++++++++++++++------------------ + src/hb-ot-map-private.hh | 10 +++++----- + src/hb-private.hh | 2 +- + 6 files changed, 40 insertions(+), 40 deletions(-) + +commit 9c9411839bb89d0a1a83120af0982c60e0e393d9 +Author: Behdad Esfahbod +Date: Mon Apr 28 12:38:25 2014 -0700 + + [tibetan] Reorder PADMA sign to occur after other below marks + + Based on suggestion from Andrew Glass. + + Test: U+0F40,0FC6,0F83 + + src/hb-unicode-private.hh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 659cd3c5b470ff9724ce5e53fedd1fea3e7512c4 +Author: Behdad Esfahbod +Date: Mon Apr 28 12:43:42 2014 -0700 + + [test] Add test case for Tibetan sign PADMA + + Currently fails. + + test/shaping/texts/in-tree/shaper-tibetan/script-tibetan/misc/misc.txt | + 1 + + 1 file changed, 1 insertion(+) + +commit ee703bc3ef740c300718fca7a12c050c322dce19 +Author: Behdad Esfahbod +Date: Mon Apr 28 12:43:18 2014 -0700 + + Reshuffle test data + + test/shaping/texts/in-tree/MANIFEST | + 3 +++ + test/shaping/texts/in-tree/shaper-default/MANIFEST | + 3 --- + .../in-tree/{shaper-default => shaper-hangul}/script-hangul/MANIFEST + | 0 + .../{shaper-default => shaper-hangul}/script-hangul/misc/MANIFEST + | 0 + .../{shaper-default => shaper-hangul}/script-hangul/misc/misc.txt + | 0 + .../in-tree/{shaper-default => shaper-hebrew}/script-hebrew/MANIFEST + | 0 + .../{shaper-default => shaper-hebrew}/script-hebrew/misc/MANIFEST + | 0 + .../script-hebrew/misc/diacritics.txt | + 0 + .../in-tree/{shaper-default => shaper-tibetan}/script-tibetan/MANIFEST + | 0 + .../{shaper-default => shaper-tibetan}/script-tibetan/misc/MANIFEST + | 0 + .../{shaper-default => shaper-tibetan}/script-tibetan/misc/misc.txt + | 0 + 11 files changed, 3 insertions(+), 3 deletions(-) + +commit b082ef373cefb35dd98b5f2f0b677ccc7806f51e +Author: Behdad Esfahbod +Date: Fri Apr 25 11:48:10 2014 -0700 + + Typo + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 828e109c7aac3389cc3b89ea1f13388aefb63804 +Author: Behdad Esfahbod +Date: Fri Apr 18 16:53:34 2014 -0700 + + [indic] Fix-up zero-context matching + + commit b5a0f69e47ace468b06e21cf069a18ddcfcf6064 + Author: Behdad Esfahbod + Date: Thu Oct 17 18:04:23 2013 +0200 + + [indic] Pass zero-context=false to would_substitute for newer + scripts + + For scripts without an old/new spec distinction, use + zero-context=false. + This changes behavior in Sinhala / Khmer, but doesn't seem + to regress. + This will be useful and used in Javanese. + + The *intention* was to change zero-context from true to false for + scripts that + don't have old-vs-new specs. However, checking the code, looks + like we + essentially change zero-context to always be true; ie. we only + changed things + for old-spec, and we broke them. That's what causes this bug: + + https://bugs.freedesktop.org/show_bug.cgi?id=76705 + + The root of the bug is here: + + /* Use zero-context would_substitute() matching for new-spec of + the main + * Indic scripts, but not for old-spec or scripts with one spec + only. */ + bool zero_context = indic_plan->config->has_old_spec || + !indic_plan->is_old_spec; + + Note that is_old_spec itself is: + + indic_plan->is_old_spec = indic_plan->config->has_old_spec && + ((plan->map.chosen_script[0] & 0x000000FF) != '2'); + + It's easy to show that zero_context is now always true. What we + really meant was: + + bool zero_context = indic_plan->config->has_old_spec && + !indic_plan->is_old_spec; + + Ie, "&&" instead of "||". We made this change supposedly to make + Javanese + work. But apparently we got it working regardless! So I'm going + to fix this + to only change the logic for old-spec and not touch other cases. + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 66c6a48b6ce9dab6375ba1a23d7e450d6974852a +Author: Behdad Esfahbod +Date: Mon Apr 14 15:55:42 2014 -0700 + + Add HB_NO_MERGE_CLUSTERS + + Disables any cluster-merging. Added for testing purposes while + we investigate what kind of API to add for this. + + src/hb-buffer.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 897c7b804d6817470a364ba31b1719555b12f751 +Author: Behdad Esfahbod +Date: Thu Apr 10 16:27:13 2014 -0700 + + Add Khmer test for U+17DD + + .../shaper-indic/south-east-asian/script-khmer/misc/other-marks.txt + | 1 + + 1 file changed, 1 insertion(+) + +commit 50a00535ccac538bbf93358fd2d2442e4c12542f +Author: Behdad Esfahbod +Date: Thu Apr 10 16:03:29 2014 -0700 + + Require gobject-introspection 1.34.0 + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=75384 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5fd996c4a4049a75c6d9e964f1a81c00ff191893 +Author: Behdad Esfahbod +Date: Wed Apr 9 16:38:26 2014 -0700 + + Further adjust check-defs and check-symbols for mipsel + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=74491 + + src/check-defs.sh | 2 +- + src/check-symbols.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 75ec6d0bc5ca0170c73e4d1099a898d38d8f85c0 +Author: Behdad Esfahbod +Date: Wed Apr 9 16:33:32 2014 -0700 + + Tighten up check-static-inits.sh check + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=74490 + + src/check-static-inits.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 110ec0714a11b9417eed82f7d25b85c9dc7b6df4 +Author: Behdad Esfahbod +Date: Tue Apr 8 17:32:08 2014 -0700 + + Typo + + src/hb-blob.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0682ddd05c22a400ff5ce97d4ea4b52a18b845ae +Author: Behdad Esfahbod +Date: Tue Apr 8 16:03:35 2014 -0700 + + [indic] Support U+17DD KHMER SIGN ATTHACAN + + As requested by Martin Hosken on the list. + + src/hb-ot-shape-complex-indic.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 05870ed62edd8728d6d732f60d6b7e149d45e6f4 +Author: Primiano Tucci +Date: Wed Apr 2 11:35:27 2014 +0100 + + Use __aarch64__ for 64-bit ARM detection, not __arm64__ + + Many GCC versions don't define __arm64__ + + src/hb-atomic-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 04d894e89795041b2055dc172744a018644f2bca +Author: Behdad Esfahbod +Date: Tue Mar 25 12:11:32 2014 -0700 + + Minor + + src/hb-ot-layout-gsubgpos-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 903648437c180c7b039801cdb0672e0f8e14afd4 +Author: Behdad Esfahbod +Date: Mon Mar 24 14:26:36 2014 -0700 + + Start fleshing out builtin font functions + + src/Makefile.am | 3 +- + src/hb-glib.cc | 2 +- + src/hb-icu.cc | 2 +- + src/hb-ot-font.cc | 260 + ++++++++++++++++++++++++++++++++++++ + src/{hb-tt-font.cc => hb-ot-font.h} | 56 ++------ + src/hb-ot-hhea-table.hh | 2 +- + src/hb-ot-hmtx-table.hh | 2 +- + src/hb-ot.h | 1 + + util/Makefile.am | 4 +- + util/options.cc | 4 + + 10 files changed, 283 insertions(+), 53 deletions(-) + +commit 343a0e4e747d93eeeb724c5d585f5ba036a0df84 +Author: Behdad Esfahbod +Date: Fri Mar 21 14:37:27 2014 -0700 + + Add "make built-sources" + + src/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit e9853f33d1f53d4d69ee0fa340ce9225a5ed17ca +Author: Behdad Esfahbod +Date: Fri Mar 21 12:53:08 2014 -0700 + + One more fix for build without gtk-doc + + Fixes https://github.com/behdad/harfbuzz/pull/35 + + autogen.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b96af03c20e46105982b3608b608614403540661 +Author: Konstantin Ritt +Date: Thu Mar 20 16:01:30 2014 +0200 + + Fix build with --coretext on iOS + + On iOS CoreText and CoreGraphics are stand-alone frameworks + + configure.ac | 23 +++++++++++++++++++---- + src/hb-coretext.h | 8 +++++++- + 2 files changed, 26 insertions(+), 5 deletions(-) + +commit ea5e8a02eb83ad19f3009b0008893f77ce113118 +Author: Behdad Esfahbod +Date: Wed Mar 19 15:38:02 2014 -0700 + + [util] Plug minor leak + + util/hb-shape.cc | 6 +++--- + util/helper-cairo.cc | 21 ++++++++++++--------- + util/helper-cairo.hh | 2 +- + util/options.cc | 6 +++++- + util/options.hh | 6 +++--- + 5 files changed, 24 insertions(+), 17 deletions(-) + +commit 09732cc6695b8e41ba6cdcd4058a4f7cad90167a +Author: Behdad Esfahbod +Date: Wed Mar 19 12:00:17 2014 -0700 + + Remove dead warning + + src/hb-unicode.cc | 9 +++++++-- + src/hb-warning.cc | 11 ----------- + 2 files changed, 7 insertions(+), 13 deletions(-) + +commit b934b0f9d1b39fc7a06c812bea3d79ca5424e278 +Author: Behdad Esfahbod +Date: Wed Mar 19 11:52:40 2014 -0700 + + Yet another try to make build without gtk-doc succeed + + autogen.sh | 1 + + docs/reference/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit a7a5be090dd9cc39605853e8994eb417550939d4 +Author: Behdad Esfahbod +Date: Wed Mar 19 11:39:23 2014 -0700 + + Another try to make gtk-doc optional + + docs/reference/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ba8c9d92935ea351970a80d0d3441858ad4cf33f +Author: Dominik Röttsches +Date: Tue Mar 18 14:39:03 2014 +0200 + + 0.9.27 + + NEWS | 16 ++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 17 insertions(+), 1 deletion(-) + +commit a949cd329e49d2c0ad6f1e023f324790d886dafe +Author: Behdad Esfahbod +Date: Sun Mar 16 20:22:42 2014 -0700 + + Don't use "register" storage class specifier + + Fixes warnings. + https://bugzilla.mozilla.org/show_bug.cgi?id=984081 + + src/hb-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 0082dbeae6c25a7859960b7e791a540ad04246d9 +Author: jfkthame +Date: Sun Mar 16 08:25:17 2014 +0000 + + wrap definition of free_langs() with HAVE_ATEXIT + + ...to avoid an unused function warning; see mozilla bug + https://bugzilla.mozilla.org/show_bug.cgi?id=984081. + + src/hb-common.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit a9e25e90a4ca05746fda4a598ad698db1d2c5c1a +Author: Behdad Esfahbod +Date: Fri Mar 14 19:55:46 2014 -0700 + + [coretext] Add hb_coretext_face_create() + + Not tested. + + src/hb-coretext.cc | 57 + +++++++++++++++++++++++++++++++++++++++++++++--------- + src/hb-coretext.h | 4 ++++ + 2 files changed, 52 insertions(+), 9 deletions(-) + +commit c79865f90f62309dc64c8d3f2f503ec2aa4b7ec1 +Author: Behdad Esfahbod +Date: Fri Mar 14 19:37:55 2014 -0400 + + [coretext] Add coretext_aat shaper + + This is a higher-priority shaper than default shaper ("ot"), but + only picks up fonts that have AAT "morx"/"mort" table. + + Note that for this to work the font face's get_table() implementation + should know how to return the full font blob. + + Based on patch from Konstantin Ritt. + + src/hb-coretext.cc | 94 + +++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-coretext.h | 4 +++ + src/hb-shaper-list.hh | 4 +++ + 3 files changed, 102 insertions(+) + +commit af1aa362cacc652ab8ffda05a5d98a3ff5430439 +Author: Behdad Esfahbod +Date: Fri Mar 14 15:52:47 2014 -0700 + + If HAVE_ICU_BUILTIN is defined, use hb-icu Unicode callbacks + + Useful for Android / Chrome / etc when ICU is built in the same + library as harfbuzz itself. + + src/hb-unicode.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 853daf857f231c9ce0277a78abff1241150ea903 +Author: Behdad Esfahbod +Date: Fri Mar 14 15:49:18 2014 -0700 + + Remove old cruft + + src/hb-shaper-list.hh | 6 ------ + 1 file changed, 6 deletions(-) + +commit 2a473338da1538efa4ff14ae9e4aba8dd50f9b0f +Author: Behdad Esfahbod +Date: Mon Mar 10 15:04:46 2014 -0700 + + Add Myanmar test case from OpenType Myanmar spec + + test/shaping/texts/in-tree/shaper-myanmar/script-myanmar/misc/MANIFEST | + 1 + + .../shaping/texts/in-tree/shaper-myanmar/script-myanmar/misc/otspec.txt | + 2 ++ + 2 files changed, 3 insertions(+) + +commit 158985908981189a2fd4d15275a641286fc770fe +Author: Behdad Esfahbod +Date: Mon Mar 10 14:57:55 2014 -0700 + + Minor + + test/shaping/texts/in-tree/shaper-myanmar/script-myanmar/misc/MANIFEST + | 1 - + test/shaping/texts/in-tree/shaper-sea/script-tai-tham/misc/MANIFEST + | 1 + + .../script-myanmar => shaper-sea/script-tai-tham}/misc/torture.txt + | 0 + 3 files changed, 1 insertion(+), 1 deletion(-) + +commit bb8ffb581b89cf27fb8e0743b81bbda21654233e +Author: Behdad Esfahbod +Date: Tue Mar 4 13:03:51 2014 -0800 + + Use AM_MISSING_PROG for ragel and git + + Makefile.am | 4 ++-- + configure.ac | 2 ++ + src/Makefile.am | 2 +- + 3 files changed, 5 insertions(+), 3 deletions(-) + +commit a82165248cddb720576464b8e59a986491d3f2e9 +Author: Behdad Esfahbod +Date: Tue Feb 18 15:53:56 2014 -0500 + + Only do fallback Hebrew composition if no GPOS 'mark' available + + Apparently some modern fonts have proper GPOS mark positioning + tables, but undesirable precomposed forms! See thread + "Hebrew composition to presentation forms" and: + + http://tex.stackexchange.com/questions/156775/having-trouble-with-vowel-positioning-in-ezra-sil-xelatex + + Test case: U+fb1d,05d9,05b4 + + src/hb-ot-shape-complex-hebrew.cc | 2 +- + src/hb-ot-shape-private.hh | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit b456d42bf68c4374f71f09867e375a51c7f2b3ed +Author: Behdad Esfahbod +Date: Tue Feb 11 17:29:40 2014 -0500 + + Allow bootstrapping without gtk-doc + + Seems like configure.ac is already able to handle it. + + autogen.sh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 1eacde00cc8c57a08fb74276e3530844ef463d67 +Author: Luis de Bethencourt +Date: Thu Feb 6 23:20:47 2014 -0500 + + check hb_set_is_emtpy in test-set.c + + test/api/test-set.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit db068d81cda180a91638e5539984f8139aff49c6 +Author: Werner Lemberg +Date: Mon Feb 10 10:38:56 2014 -0500 + + typo in ucdn's Makefile.am + + src/hb-ucdn/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fbb2847f541389f40718af71c4945024ae177ab2 +Author: Behdad Esfahbod +Date: Wed Feb 5 08:22:06 2014 -0500 + + Improve MemoryBarrier() implementation + + See thread "[HarfBuzz] compilation error of 0.9.26 with MinGW" + started by Werner. + + src/hb-atomic-private.hh | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 189bf23bfc90405d8bdc70bf3d6d3ffec38b470c +Author: Behdad Esfahbod +Date: Thu Jan 30 15:14:58 2014 -0500 + + 0.9.26 + + NEWS | 20 ++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 21 insertions(+), 1 deletion(-) + +commit 7691a154e50f8c8c77bbd94787686262955bf5d4 +Author: Jonathan Kew +Date: Wed Jan 29 14:07:58 2014 +0000 + + Ensure hb_script_t can safely hold any hb_tag_t value it's given. + + Fixes https://github.com/behdad/harfbuzz/pull/21 + + src/hb-common.h | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit c29993a181c2139eaec97b5f6225824040ca3ac9 +Author: Behdad Esfahbod +Date: Tue Jan 28 17:29:42 2014 -0500 + + [coretext] Handle surrogate pairs when generating notdef glyphs + + Fixes github.com/behdad/harfbuzz/pull/19 + + src/hb-coretext.cc | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +commit 748b2782e4898420003a3bbc041dcccbe9e3edc2 +Author: Behdad Esfahbod +Date: Tue Jan 28 17:10:05 2014 -0500 + + [coretext] Minor optimization + + src/hb-coretext.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 24e6b11f12788500182715a64d4771a22c5b7525 +Author: Konstantin Ritt +Date: Tue Jan 28 18:16:01 2014 +0200 + + Fix double destruction in case of OOM + + src/hb-graphite2.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 083225916a19f6d67017523af87386933bd9ecdc +Author: Konstantin Ritt +Date: Wed Jan 22 20:31:30 2014 +0200 + + Micro optimizations + + src/hb-ot-layout-gpos-table.hh | 28 +++++++++++++++++----------- + 1 file changed, 17 insertions(+), 11 deletions(-) + +commit c9522de2335e4ef5fe65a72745c10943827a8da2 +Author: Konstantin Ritt +Date: Wed Jan 22 21:07:13 2014 +0200 + + Make it possible to disable the fallback shaper at configure time + + The OT shaper supersedes the fallback shaper in every case + and the latter become an extra weight for 99.9% of users. + + configure.ac | 6 ++++++ + src/Makefile.am | 5 ++++- + src/hb-shaper-list.hh | 2 ++ + 3 files changed, 12 insertions(+), 1 deletion(-) + +commit 6775da3a7c07db6c032cf429dc199d471948db56 +Author: Behdad Esfahbod +Date: Thu Jan 23 14:18:49 2014 -0500 + + Fix clang warning 'private field 'xxx' is not used + + Fixes https://github.com/behdad/harfbuzz/pull/16 + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 62299826f4905e080b9497bce335e093b287494e +Author: Behdad Esfahbod +Date: Thu Jan 23 14:11:03 2014 -0500 + + Fix typo in _hb_buffer_serialize_glyphs_text() + + Fixes https://github.com/behdad/harfbuzz/pull/17 + + src/hb-buffer-serialize.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ae23c24c32f474a34484ee78bc177ad31fa5e6d0 +Author: Behdad Esfahbod +Date: Wed Jan 22 11:03:02 2014 -0500 + + [arabic] Disable 'cswh' by default + + I believe Windows 8 disables it, and spec update dated + Jan 2014 also clearly says it's disabled by default: + + http://www.microsoft.com/typography/OpenTypeDev/arabic/intro.htm#features + + src/hb-ot-shape-complex-arabic.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 08cf5d75ef0c75095173dec822ccb07defaaa6c2 +Author: Behdad Esfahbod +Date: Wed Jan 22 07:53:55 2014 -0500 + + [ot] Don't try to compose if normalization is off + + src/hb-ot-shape-normalize.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 0596343bfeb80ad6b19d459654edf7dfded6affe +Merge: 62cb28df 83d7e791 +Author: Behdad Esfahbod +Date: Wed Jan 22 04:43:51 2014 -0800 + + Merge pull request #13 from jfkthame/hangul-shaper + + Tone-mark reordering and improved Old Hangul support + +commit 62cb28dfc668cae9cbff826229bde2271e157927 +Author: Jonathan Kew +Date: Mon Jan 20 14:23:08 2014 +0000 + + fixup for 64-bit windows build + + src/hb-uniscribe.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 83d7e7915a5eaa8ff4c7014c319844e7dffd8225 +Author: Jonathan Kew +Date: Mon Jan 20 19:49:47 2014 +0000 + + [hangul] Fix ordering of dotted circle with Hangul tone mark (reported + by Dohyun Kim). + + src/hb-ot-shape-complex-hangul.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit deef1862657d55b7ae8d45f4eecbe45c80785c4e +Author: Jonathan Kew +Date: Mon Jan 20 10:38:27 2014 +0000 + + [hangul] Don't force zero-width for marks - this is not wanted for + the Jamo Filler glyphs. + + src/hb-ot-shape-complex-hangul.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 391934db0a171aeb2057ebcd4a38ed81621e7393 +Author: Jonathan Kew +Date: Mon Jan 20 10:37:32 2014 +0000 + + [unicode] Exclude the Jamo Filler characters from Default_Ignorable, + as some fonts want these to be visible/spacing glyphs. + + src/hb-unicode-private.hh | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +commit 7244b3fc3bf9757dd094709d36bea68682264e20 +Author: Jonathan Kew +Date: Mon Jan 20 10:35:51 2014 +0000 + + [hangul] Reorder Hangul tone mark to beginning of syllable, unless + font implements it using a zero-width glyph. + + src/hb-ot-shape-complex-hangul.cc | 59 + ++++++++++++++++++++++++++++++++++++++- + 1 file changed, 58 insertions(+), 1 deletion(-) + +commit 103436838df3a77552d3d33fc4bd80f09d9bf079 +Author: Jonathan Kew +Date: Mon Jan 20 10:35:07 2014 +0000 + + [hangul] Apply the appropriate *jmo features to decomposed + syllables, including Old Hangul sequences that don't have Unicode + compositions. Merge clusters in decomposed syllables. + + src/hb-ot-shape-complex-hangul.cc | 197 + +++++++++++++++++++++++++++++++------- + 1 file changed, 165 insertions(+), 32 deletions(-) + +commit 8fc1f7fe74a25bf8549f5edd79c7da6b720eb064 +Author: Behdad Esfahbod +Date: Thu Jan 2 17:04:04 2014 +0800 + + [ot/hangul] Don't decompose Hangul even when combining marks present + + As discussed on + https://github.com/behdad/harfbuzz/pull/10#issuecomment-31442030 + + src/hb-ot-shape-complex-hangul.cc | 2 +- + src/hb-ot-shape-normalize-private.hh | 1 + + src/hb-ot-shape-normalize.cc | 24 +++++++++++++----------- + 3 files changed, 15 insertions(+), 12 deletions(-) + +commit 64426ec73a987bfe1e71a293ee195f268897e8d6 +Author: Behdad Esfahbod +Date: Thu Jan 2 14:33:10 2014 +0800 + + [ot] Simplify composing + + Not tested. Ouch. + + src/hb-ot-shape-normalize.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 8de20b1e8a1c4d2081f64e695045e6e4da7ce144 +Author: Behdad Esfahbod +Date: Thu Jan 2 14:30:45 2014 +0800 + + Add font->has_glyph() + + src/hb-font-private.hh | 6 ++++++ + src/hb-ot-shape-complex-hangul.cc | 14 ++++++-------- + src/hb-ot-shape.cc | 3 +-- + 3 files changed, 13 insertions(+), 10 deletions(-) + +commit f6298e55ae0f0f23f66935226f78afb98320ea78 +Author: Behdad Esfahbod +Date: Thu Jan 2 14:23:56 2014 +0800 + + [fallback] Minor + + src/hb-fallback-shape.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 29ea403d67e29c2d531c1f613ce3d69e60f078f6 +Author: Behdad Esfahbod +Date: Thu Jan 2 14:20:00 2014 +0800 + + [hangul] Fix decomposition logic + + Seems to be working now. + + src/hb-ot-shape-complex-hangul.cc | 19 ++++++++----------- + 1 file changed, 8 insertions(+), 11 deletions(-) + +commit bdb20dafc3f737923da3dca0c832fdf4ab8daabc +Author: Behdad Esfahbod +Date: Thu Jan 2 14:04:30 2014 +0800 + + [hangul] Fix decomposition + + Part of https://github.com/behdad/harfbuzz/pull/10 + + src/hb-ot-shape-complex-hangul.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 32478656ce6e7926c3ad481511f02187ca743af6 +Author: Behdad Esfahbod +Date: Thu Jan 2 14:01:56 2014 +0800 + + [hangul] Tighten up character categories + + I had tried to expand to fill the blocks, but that sounds wrong in + retrospect. + + src/hb-ot-shape-complex-hangul.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f14bb7de631b20e2868fb62e5311cd0d9e24bb49 +Author: Behdad Esfahbod +Date: Tue Dec 31 16:49:15 2013 +0800 + + [ot] Separate out hebrew and tibetan shapers from default + + Now default shaper is truly no-op. + + src/Makefile.am | 2 + + src/hb-ot-shape-complex-default.cc | 161 + +--------------------------------- + src/hb-ot-shape-complex-hebrew.cc | 172 + +++++++++++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-private.hh | 17 +++- + src/hb-ot-shape-complex-tibetan.cc | 61 +++++++++++++ + 5 files changed, 251 insertions(+), 162 deletions(-) + +commit 6300cd72539284ca294ee8286bbbb7f9c72af320 +Author: Behdad Esfahbod +Date: Tue Dec 31 16:38:47 2013 +0800 + + [ot] Define HB_OT_SHAPE_ZERO_WIDTH_MARKS_DEFAULT + + src/hb-ot-shape-complex-default.cc | 2 +- + src/hb-ot-shape-complex-hangul.cc | 2 +- + src/hb-ot-shape-complex-private.hh | 4 +++- + src/hb-ot-shape-complex-thai.cc | 2 +- + 4 files changed, 6 insertions(+), 4 deletions(-) + +commit 3d6ca0d32e5c6597acfcf59301cb1905586ddb52 +Author: Behdad Esfahbod +Date: Tue Dec 31 16:04:35 2013 +0800 + + [ot] Simplify normalization_preference again + + No shaper has more than one behavior re this, so no need for + a callback. + + src/hb-ot-shape-complex-arabic.cc | 2 +- + src/hb-ot-shape-complex-default.cc | 8 +------- + src/hb-ot-shape-complex-hangul.cc | 2 +- + src/hb-ot-shape-complex-indic.cc | 8 +------- + src/hb-ot-shape-complex-myanmar.cc | 9 +-------- + src/hb-ot-shape-complex-private.hh | 7 +------ + src/hb-ot-shape-complex-sea.cc | 9 +-------- + src/hb-ot-shape-complex-thai.cc | 2 +- + src/hb-ot-shape-normalize.cc | 4 +--- + 9 files changed, 9 insertions(+), 42 deletions(-) + +commit c98b7183f7dc453d5bac1f2503017cded317a495 +Author: Behdad Esfahbod +Date: Tue Dec 31 15:55:40 2013 +0800 + + [ot] Add Hangul shaper + + Not exhaustively tested, but I think I got the intended logic + right. + + The logic can perhaps be simplified. Maybe we should disabled + normalization with this shaper. Then again, for now focusing on + correctness. + + src/Makefile.am | 1 + + src/hb-ot-shape-complex-default.cc | 13 --- + src/hb-ot-shape-complex-hangul.cc | 232 + +++++++++++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-private.hh | 10 +- + src/hb-private.hh | 6 + + 5 files changed, 240 insertions(+), 22 deletions(-) + +commit 15f67048e45853ad4069fd4334e132bc3db4d2c4 +Author: Behdad Esfahbod +Date: Fri Dec 27 19:33:28 2013 -0500 + + Reorder Tai Tham SAKOT to ensure it comes after any tone marks + + src/hb-unicode-private.hh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 3216e44feb7b97f44620b51e197425a80a41cdb7 +Author: Behdad Esfahbod +Date: Mon Dec 23 14:39:23 2013 -0500 + + [uniscribe] Fix scratch-buffer accounting + + src/hb-uniscribe.cc | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +commit beeb12c9af4e0e66378cd36cf3dbb1560763a8e3 +Author: Behdad Esfahbod +Date: Sun Dec 22 22:53:27 2013 -0500 + + Add TODO item + + src/hb-ot-shape.h | 1 + + 1 file changed, 1 insertion(+) + +commit fbd4acc58a4bb501625b482bd318be9764ff8e02 +Author: Luis de Bethencourt +Date: Sun Dec 22 08:02:11 2013 -0500 + + Clean ht-ob headers + + src/Makefile.am | 1 + + src/hb-ot-layout.h | 5 ----- + src/hb-ot-shape.h | 53 + +++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot.h | 9 +-------- + 4 files changed, 55 insertions(+), 13 deletions(-) + +commit 5497a8a274a7066c0230c850baadef681785c8bb +Author: Behdad Esfahbod +Date: Sun Dec 22 20:48:53 2013 -0500 + + Cache various masks on the shape plan + + src/hb-ot-shape-fallback.cc | 6 ++---- + src/hb-ot-shape-private.hh | 15 +++++++++++++++ + src/hb-ot-shape.cc | 26 +++++++------------------- + 3 files changed, 24 insertions(+), 23 deletions(-) + +commit 02f909664fa24a7ccf7cf73d75d1d3426aaaae7d +Author: Behdad Esfahbod +Date: Sun Dec 22 19:35:27 2013 -0500 + + Minor correction to kern mask checking + + src/hb-ot-shape-fallback.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a7e8bbb080aef318b16750ca1771d0d3af3d0ae9 +Author: Behdad Esfahbod +Date: Sun Dec 22 19:33:35 2013 -0500 + + Minor fraction mask setting improvement + + src/hb-ot-map-private.hh | 2 -- + src/hb-ot-shape.cc | 8 +++++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 76fff252a96b4357b5e71694d5201daef822aa60 +Author: Behdad Esfahbod +Date: Sun Dec 22 17:55:59 2013 -0500 + + Don't form fractions if only one of numr/dnom exist + + src/hb-ot-shape.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 3aeee519f0b82df5263974945ae852badc4dbded +Author: Behdad Esfahbod +Date: Sun Dec 22 16:17:54 2013 -0500 + + Bug 72698 - Automatically support frac / numr / dnom + + When seeing U+2044 FRACTION SLASH in the text, find decimal + digits (Unicode General Category Decimal_Number) around it, + and mark the pre-slash digits with 'numr' feature, the post-slash + digits with 'dnom' feature, and the whole sequence with 'frac' + feature. + + This beautifully renders fractions with major Windows fonts, + and any other font that implements those features (numr/dnom is + enough for most fonts.) + + Not the fastest way to do this, but good enough for a start. + + src/hb-ot-shape.cc | 51 + +++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 51 insertions(+) + +commit 014f369ec98fdbb3e7a2ef68aea2c4e017e7b680 +Author: Behdad Esfahbod +Date: Sun Dec 22 16:15:30 2013 -0500 + + Add XXX note + + src/hb-ot-map-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 739325178aba00ea5526c6a54ce588a79e5d45e2 +Author: Behdad Esfahbod +Date: Sat Dec 21 00:18:18 2013 -0500 + + Initialize masks before mirroring + + We were throwing away the rtlm feature mask set during + mirroring... + + src/hb-ot-shape.cc | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +commit d507f6b5b7a052f4d0eb9ba4ec88fd2e3d6f64b4 +Author: Luis de Bethencourt +Date: Mon Dec 16 15:48:44 2013 -0500 + + Have Gtk-Doc ignore UCDN files + + docs/reference/Makefile.am | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit d688475ea9cd236bc9b9e0153489fac0025f07f0 +Author: Behdad Esfahbod +Date: Thu Dec 12 13:21:57 2013 -0500 + + Minor + + util/options.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 2a8c49ade07a0bd4f2c9543f4bd129da82083ea0 +Author: Behdad Esfahbod +Date: Wed Dec 11 20:22:28 2013 -0500 + + Remove unnecessary includes + + src/hb-blob.cc | 1 - + src/hb-buffer-private.hh | 1 - + src/hb-common.cc | 2 -- + src/hb-face-private.hh | 1 - + src/hb-face.cc | 1 - + src/hb-font-private.hh | 1 - + src/hb-font.cc | 1 - + src/hb-graphite2.cc | 2 -- + src/hb-open-type-private.hh | 2 -- + src/hb-ot-layout-private.hh | 2 -- + src/hb-ot-shape-normalize-private.hh | 2 -- + src/hb-ot-tag.cc | 1 - + src/hb-set-private.hh | 1 - + src/hb-shape-plan-private.hh | 1 - + src/hb-tt-font.cc | 2 -- + src/hb-unicode-private.hh | 2 -- + 16 files changed, 23 deletions(-) + +commit 2646aec1e67cd6e09f5f7859c9d5898917acc2d5 +Author: Behdad Esfahbod +Date: Thu Dec 5 18:19:35 2013 -0500 + + Drop required automake version back to 1.11.3 + + Work around broken automake-1.13 changes. + + configure.ac | 3 ++- + test/shaping/Makefile.am | 7 +++++++ + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit 860fc9aa7b4c49a1d50e64cfdf4d4dffadb7aa8f +Author: Behdad Esfahbod +Date: Wed Dec 4 20:06:59 2013 -0500 + + 0.9.25 + + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + 2 files changed, 13 insertions(+), 1 deletion(-) + +commit adb039554de0c98a4121f26423bec8df09a62e61 +Author: Behdad Esfahbod +Date: Wed Dec 4 20:10:02 2013 -0500 + + Minor + + util/view-cairo.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 95d18a7cab480712d8c95a587ac2a8fdcbec5e71 +Author: Behdad Esfahbod +Date: Wed Dec 4 20:01:22 2013 -0500 + + [git.mk] Update + + git.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d913f98d88098fc0f4163dfbc54d8ca9ebe9dd81 +Author: Behdad Esfahbod +Date: Wed Dec 4 19:59:48 2013 -0500 + + Require automake 1.13 + + Fix tests build. + + https://bugs.freedesktop.org/show_bug.cgi?id=71353 + + configure.ac | 2 +- + test/shaping/Makefile.am | 19 ++++++++++++++----- + 2 files changed, 15 insertions(+), 6 deletions(-) + +commit 205bf834d80f81471f0c3da4f400e60ce3a533dc +Author: Behdad Esfahbod +Date: Mon Dec 2 20:41:41 2013 -0500 + + Revert "Karen" language mapping back to what it was before + + https://bugzilla.mozilla.org/show_bug.cgi?id=941470 + + src/hb-ot-tag.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f47b9219546edcfdeb3991ee27f6d9ba455c3e08 +Author: Behdad Esfahbod +Date: Mon Dec 2 05:57:27 2013 -0500 + + Fix unsafe shape_plan->face dependency + + src/hb-ot-shape-private.hh | 2 +- + src/hb-shape-plan-private.hh | 2 +- + src/hb-shape-plan.cc | 12 +++--------- + 3 files changed, 5 insertions(+), 11 deletions(-) + +commit c704a8700e169885f1d9cbab93544d85aa4358e9 +Author: Behdad Esfahbod +Date: Mon Dec 2 05:42:04 2013 -0500 + + [util] Fix uninitialized memory access + + util/view-cairo.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 260a3198f44a4ece60864b6f6caab2ee756ad762 +Author: Behdad Esfahbod +Date: Mon Dec 2 05:39:39 2013 -0500 + + [util] Plug leak + + util/options.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit ca8d96c8ba33ce581684cbc07936a3696b6c83d9 +Author: Jonathan Kew +Date: Mon Dec 2 05:22:00 2013 -0500 + + cache shape plans even if (global) user features are set + + src/hb-shape-plan-private.hh | 3 +++ + src/hb-shape-plan.cc | 59 + ++++++++++++++++++++++++++++++++++++++++---- + 2 files changed, 57 insertions(+), 5 deletions(-) + +commit 8ffa528f28a24ae85952ad1c1b0206e736bcfeab +Author: Behdad Esfahbod +Date: Mon Dec 2 05:17:14 2013 -0500 + + Add note about unsafe shape_plan->face + + Will fix by removing shape_plan->face completely. + + src/hb-shape-plan.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit aec468f01e866c99e65a8f764a792c74c96840d7 +Author: Behdad Esfahbod +Date: Fri Nov 29 19:21:58 2013 -0500 + + [coretext] Add TODO + + src/hb-coretext.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 58cc233e8b5fdc9dce603acc1b968540a2dea3e1 +Author: Behdad Esfahbod +Date: Fri Nov 29 19:17:42 2013 -0500 + + [coretext] Cleanup + + src/hb-coretext.cc | 27 ++++++++++++++++----------- + 1 file changed, 16 insertions(+), 11 deletions(-) + +commit c8213c6198abff97822e29a6d565722cfbb43832 +Author: Khaled Hosny +Date: Fri Nov 29 19:01:56 2013 -0500 + + [coretext] Avoid font fallback with CoreText shaper + + CoreText does automatic font fallback (AKA "cascading") for + characters + not supported by the requested font, and provides no way to turn + it off, + so detect if the returned run uses a font other than the requested one + and fill in the buffer with .notdef glyphs instead of random indices + glyph from a different font. + + src/hb-coretext.cc | 35 +++++++++++++++++++++++++++++++++++ + 1 file changed, 35 insertions(+) + +commit 63bae73aefb0e5988ef6975f1ed38e040e50e91d +Author: Behdad Esfahbod +Date: Tue Nov 26 22:57:24 2013 -0500 + + [fallback] Add TODO note + + src/hb-fallback-shape.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit e1ebf01d0cf3df55bb9137136e2d0c9630e7bd78 +Author: Behdad Esfahbod +Date: Tue Nov 26 18:00:35 2013 -0500 + + Minor + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a182dbc9e4e51fa7990c4aea3eaa425a061b29c7 +Author: Behdad Esfahbod +Date: Tue Nov 26 17:53:41 2013 -0500 + + Minor + + src/hb-ot-layout-common-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 9174a9db5c4e01284143ed8bd318ce9454535987 +Author: Behdad Esfahbod +Date: Mon Nov 25 18:10:38 2013 -0500 + + [myanmar] Allow punctuation clusters + + The spec and Uniscribe don't allow these, but UTN#11 + specifically says the sequence U+104B,U+1038 is valid. + As such, allow all "P V" sequences. There's about + eight sequences that match that structure, but Roozbeh + thinks it's fine to allow all of them. + + Test case: U+104B, U+1038 + + https://bugs.freedesktop.org/show_bug.cgi?id=71947 + + src/hb-ot-shape-complex-myanmar-machine.rl | 3 +++ + src/hb-ot-shape-complex-myanmar.cc | 19 ++++++++++++++++++- + 2 files changed, 21 insertions(+), 1 deletion(-) + +commit 096b71e8ef0c1443f3f86069d5416b887af6e9e7 +Author: Behdad Esfahbod +Date: Mon Nov 25 18:03:34 2013 -0500 + + [myanmar] Mark U+104E MYANMAR SYMBOL AFOREMENTIONED as Consonant + + The spec and Uniscribe treat it as consonant in the grammar, but + it's not in IndicSyllableCategory.txt, so fix up. + + Test sequence: U+1004,U+103A,U+1039,U+104E + + https://bugs.freedesktop.org/show_bug.cgi?id=71948 + + src/hb-ot-shape-complex-myanmar.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit d2da5e0b4b4ffc1722403ffb90b8777cfa1cd174 +Author: Behdad Esfahbod +Date: Mon Nov 25 17:50:07 2013 -0500 + + [myanmar] Relax pwo-tone group a bit + + This is broken sequence according to OpenType spec, Uniscribe, + and current HarfBuzz implementation. But Roozbeh says this + is a valid sequence, so allow it. There are multiple + "(DB As?)?" constructs in the grammar, but Roozbeh thinks only + this one needs changing. + + Test case: 1014,1063,103A + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=71949 + + src/hb-ot-shape-complex-myanmar-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9af91ca8ffee4a8d2804eff5d380b4f9749414d1 +Author: Behdad Esfahbod +Date: Mon Nov 25 17:47:19 2013 -0500 + + Add more Myanmar test cases + + All three are broken right now according to Roozbeh. + + https://bugs.freedesktop.org/show_bug.cgi?id=71947 + https://bugs.freedesktop.org/show_bug.cgi?id=71948 + https://bugs.freedesktop.org/show_bug.cgi?id=71949 + + .../shaping/texts/in-tree/shaper-myanmar/script-myanmar/misc/misc.txt | + 4 ++++ + 1 file changed, 4 insertions(+) + +commit 08c2d27d35093e07142168665139274ac99395e8 +Author: Roozbeh Pournader +Date: Sat Nov 23 21:39:31 2013 -0800 + + Added support for several new languages + + Based on research into latest SIL and Windows fonts, pulling in + the latest OpenType language tag proposal from Microsoft, and updating + to latest language tags and names from ISO 639. + + src/hb-ot-tag.cc | 314 + +++++++++++++++++++++++++++++++++++++++++++------------ + 1 file changed, 247 insertions(+), 67 deletions(-) + +commit 05511acd198d0c2157cdb41e1d36eac0b8075357 +Author: Roozbeh Pournader +Date: Sat Nov 23 15:19:07 2013 -0800 + + Added language tags for S'gaw Karen and Khamti + + Tags based on support in Windows 8.1's 'Myanmar Text' font. + + src/hb-ot-tag.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 0bb31e4497523442fbb26bbd55b194ab70205ca4 +Author: Behdad Esfahbod +Date: Wed Nov 20 14:21:07 2013 -0500 + + Bug 71845 - Use 64-bit cmpexch on ARM64 iOS + + src/hb-atomic-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 02c6c8cd6e8c93b63c75b25de6bf76bb45755bb4 +Author: Behdad Esfahbod +Date: Fri Nov 15 13:05:38 2013 -0500 + + Set buffer content type to INVALID in hb_buffer_set_length(0) + + Previously we were only setting this in hb_buffer_clear_contents(), + but set_length(0) is a valid way to reinitialize buffer to use with + new text. + + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit 6300694f6e531593e7e932000f9540b0367940b8 +Author: Behdad Esfahbod +Date: Wed Nov 13 14:54:07 2013 -0500 + + 0.9.24 + + NEWS | 8 ++++++++ + configure.ac | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit 061cb4649342b005fb1de93abae25e889cc560bd +Author: Behdad Esfahbod +Date: Wed Nov 13 14:50:25 2013 -0500 + + Use long alignment for scratch buffer + + Fixes last of scratch alignment warnings in hb-coretext. + + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 68c372ed2eac76a6d347811293fe2ba2fd6a1eed +Author: Behdad Esfahbod +Date: Wed Nov 13 14:44:01 2013 -0500 + + More scratch-buffer cleanup + + src/hb-buffer-private.hh | 3 ++- + src/hb-buffer.cc | 10 +++++----- + src/hb-coretext.cc | 5 ++--- + src/hb-graphite2.cc | 2 +- + src/hb-uniscribe.cc | 30 ++++++++++++++---------------- + 5 files changed, 24 insertions(+), 26 deletions(-) + +commit 8fcadb9cf9418345610e3f4e38c28c12b768b589 +Author: Behdad Esfahbod +Date: Wed Nov 13 14:33:57 2013 -0500 + + [coretext] More scratch buffer fixes + + src/hb-coretext.cc | 25 +++++++++++++------------ + 1 file changed, 13 insertions(+), 12 deletions(-) + +commit 16f175cb2e081e605fe7f9cd01bbe8c24380278a +Author: Behdad Esfahbod +Date: Tue Nov 12 17:22:49 2013 -0500 + + Fix scratch-buffer alignment warnings + + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 9 +++++---- + src/hb-coretext.cc | 17 ++++++++++------- + src/hb-graphite2.cc | 28 +++++++++++++++++----------- + src/hb-private.hh | 3 +++ + src/hb-uniscribe.cc | 29 +++++++++++++++++------------ + 6 files changed, 53 insertions(+), 35 deletions(-) + +commit c7c4ccf8a1e784b6f8798388a219dda9a26fbd93 +Author: Behdad Esfahbod +Date: Tue Nov 12 15:41:22 2013 -0500 + + [travis] Enable graphite2 + + .travis.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 83408cf804a6908873c41b70bb7c43448e66ddd2 +Author: Behdad Esfahbod +Date: Wed Nov 6 14:46:04 2013 -0500 + + Fix llvm warnings on Mac + + Patch from Scott Fleischman. Warnings were: + + harfbuzz/src/hb-font-private.hh:121:42: Implicit conversion loses + integer precision: 'long long' to 'hb_position_t' (aka 'int') + harfbuzz/src/hb-font-private.hh:126:42: Implicit conversion loses + integer precision: 'long long' to 'hb_position_t' (aka 'int') + harfbuzz/src/hb-font-private.hh:400:85: Implicit conversion loses + integer precision: 'long long' to 'hb_position_t' (aka 'int') + harfbuzz/src/hb-ot-layout-common-private.hh:1115:37: Implicit + conversion + loses integer precision: 'long long' to 'int' + harfbuzz/src/hb-ft.cc:421:97: Implicit conversion loses integer + precision: 'unsigned long long' to 'int' + harfbuzz/src/hb-ft.cc:422:97: Implicit conversion loses integer + precision: 'unsigned long long' to 'int' + + src/hb-font-private.hh | 6 +++--- + src/hb-ft.cc | 4 ++-- + src/hb-ot-layout-common-private.hh | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +commit 333cc6e2d11831bcd2370723456e678574d570ec +Author: Behdad Esfahbod +Date: Wed Oct 30 17:30:11 2013 +0000 + + [otlayout] Remove unused is_inplace() + + Patch from Jonathan Kew. + + src/hb-ot-layout-gpos-table.hh | 6 -- + src/hb-ot-layout-gsub-table.hh | 56 ------------ + src/hb-ot-layout-gsubgpos-private.hh | 159 + ----------------------------------- + 3 files changed, 221 deletions(-) + +commit 176fd17d02ac183af32a0e710ec32d25c9322021 +Author: Behdad Esfahbod +Date: Wed Oct 30 17:27:24 2013 +0000 + + Bug 70971 - Signed/unsigned compiler warnings on windows + + Patch from Emil Eklund. + + src/hb-buffer-serialize.cc | 8 ++++---- + src/hb-ot-map.cc | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 3d436d325edccc0f3dd820e06e3d529cc8f3eca4 +Author: Behdad Esfahbod +Date: Mon Oct 28 21:00:37 2013 +0100 + + [otlayout] Reset ccc when marking glyph as letter + + src/hb-ot-layout-gsubgpos-private.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit b9d0077ac1a8e8a62ee15c64ad302f7976e23bdd +Author: Behdad Esfahbod +Date: Mon Oct 28 20:44:03 2013 +0100 + + Fix win32 testing + + test/shaping/Makefile.am | 1 + + test/shaping/run-tests.sh | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit dce79c2bd747d398bdf2f4b171b0ba9b5b951f72 +Author: Behdad Esfahbod +Date: Mon Oct 28 20:26:40 2013 +0100 + + 0.9.23 + + NEWS | 10 ++++++++++ + configure.ac | 2 +- + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit 2e990a3d722c10d1eefdc4c5ccbdaa384625c3fd +Author: Behdad Esfahbod +Date: Mon Oct 28 20:23:07 2013 +0100 + + Make "make distcheck" happy + + configure.ac | 2 +- + test/shaping/Makefile.am | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit 6ffc007b61402c9d1d4de368deed4971a10ed00b +Author: Behdad Esfahbod +Date: Mon Oct 28 19:26:02 2013 +0100 + + [otlayout] Optimize inplace + + See thread started by Jonathan with subject "an optimization for + complex + fonts". + + src/hb-ot-layout.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 71b4c999a511bf018acaf48a45e070470c0daf12 +Author: Behdad Esfahbod +Date: Mon Oct 28 00:20:59 2013 +0100 + + Revert "Zero marks by GDEF for Tibetan" + + This reverts commit d5bd0590ae2fbc7b0dee86385a565aef00ffb835. + + The reasoning behind that logic was flawed and made under + a misunderstanding of the original problem, and caused + regressions as reported by Jonathan Kew in thread titled + "tibetan marks" in Oct 2013. Apparently I have had fixed + the original problem with this commit: + + 7e08f1258da229dfaf7e1c4b5c41e5bb83906cb0 + + So, revert the faulty commit and everything seems to be in good + shape. + + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + src/hb-ot-shape-complex-arabic.cc | 10 +++------- + src/hb-ot-shape-complex-default.cc | 17 +---------------- + src/hb-ot-shape-complex-indic.cc | 8 +------- + src/hb-ot-shape-complex-myanmar.cc | 15 +++++---------- + src/hb-ot-shape-complex-private.hh | 8 ++------ + src/hb-ot-shape-complex-sea.cc | 14 ++++---------- + src/hb-ot-shape-complex-thai.cc | 9 +-------- + src/hb-ot-shape.cc | 4 ++-- + 9 files changed, 21 insertions(+), 68 deletions(-) + +commit 9596b2bf569dae6fbe268803e3cb248001f10954 +Author: Behdad Esfahbod +Date: Mon Oct 28 00:09:05 2013 +0100 + + Pass CPPFLAGS=-Werror to Travis-CI + + We want default gcc / clang warnings to fail the CI build. + + .travis.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c77d1ade6898cea161f0709c5c5a912e14aff951 +Author: Behdad Esfahbod +Date: Sun Oct 27 23:52:26 2013 +0100 + + Fix warnings + + test/api/test-blob.c | 2 +- + util/helper-cairo-ansi.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit c2bc818706df56022c8bb922df2b741cb120f7e4 +Author: Behdad Esfahbod +Date: Sun Oct 27 23:36:35 2013 +0100 + + Work with old and new glib + + Avoids "deprecated" warnings. + + src/test-buffer-serialize.cc | 7 +++++-- + src/test-size-params.cc | 7 +++++-- + src/test-would-substitute.cc | 7 +++++-- + src/test.cc | 7 +++++-- + util/options.cc | 4 ++-- + util/options.hh | 4 ++++ + util/view-cairo.hh | 4 ++++ + 7 files changed, 30 insertions(+), 10 deletions(-) + +commit 46a863d91dbcc9a4c796e3715ea3828939f4d941 +Author: Behdad Esfahbod +Date: Sun Oct 27 23:24:50 2013 +0100 + + [indic] Adjust pref reordering logic + + For Javanese (pref_len == 1) only reorder if it didn't ligate. That's + sensible, and what the spec says. For other Indic (pref_len > 1) + only reorder if ligated. + + Doesn't change any test numbers. + + src/hb-ot-shape-complex-indic.cc | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit 6b03e3c724ec6cd255f4a323bf4aa7d8c93a056e +Author: Behdad Esfahbod +Date: Sun Oct 27 21:04:55 2013 +0100 + + Optimize fallback kerning + + Patch from Jonathan Kew. "These changes seem to yield a small but + just-about-measurable improvement with old fonts that lack GPOS + kerning." + + src/hb-ot-shape-fallback.cc | 47 + ++++++++++++++++++++++++++++----------------- + 1 file changed, 29 insertions(+), 18 deletions(-) + +commit 133eeba6a32769ec1a7520e7c8a0d2eb1ad986f8 +Author: Behdad Esfahbod +Date: Sun Oct 27 00:24:59 2013 +0200 + + Minor + + See: + https://github.com/prezi/harfbuzz-js/pull/1/files#r7032397 + + src/hb-common.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a74f0de225c403998212e2618dcf9452bc5b590d +Author: Behdad Esfahbod +Date: Thu Oct 24 11:46:33 2013 +0200 + + [indic] Fix CM2, really + + Followup from 6e613f3365bf4e9fd778758c53e7de00c64beca1. + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6e613f3365bf4e9fd778758c53e7de00c64beca1 +Author: Behdad Esfahbod +Date: Wed Oct 23 23:34:13 2013 +0200 + + Fix "shift count >= width of type" issue + + src/hb-ot-shape-complex-indic-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ac8cd511911c7dca6222d14fa758bff75d601567 +Author: Behdad Esfahbod +Date: Fri Oct 18 19:33:09 2013 +0200 + + Refactor + + src/hb-ot-layout-gpos-table.hh | 120 + ++++++++++++++++++++++------------------- + src/hb-ot-layout.cc | 31 +++++------ + src/hb-ot-shape-normalize.cc | 29 +++++----- + src/hb-ot-shape.cc | 82 ++++++++++++++++------------ + 4 files changed, 145 insertions(+), 117 deletions(-) + +commit 0f3fe37fccfb540437adf13dd580f2c5164a0b1f +Author: Behdad Esfahbod +Date: Fri Oct 18 19:14:22 2013 +0200 + + Comment + + src/hb-ot-layout-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit ddce2d8df6fed9c033f1f13e235666680c5beb67 +Author: Behdad Esfahbod +Date: Fri Oct 18 18:07:11 2013 +0200 + + [indic] Improve positioning of post-base bells and whistles + + Bug 58714 - Kannada u+0cb0 u+200d u+0ccd u+0c95 u+0cbe does not + provide + same results as Windows8 + https://bugs.freedesktop.org/show_bug.cgi?id=58714 + + Test with U+0CB0,U+200D,U+0CCD,U+0C95,U+0CBF and tunga.ttf. + + Improves some scripts. Improves Bengali too, but numbers + are up because we produce better results than Uniscribe for some + sequences now. + + New numbers: + BENGALI: 353724 out of 354188 tests passed. 464 failed (0.131004%) + DEVANAGARI: 707307 out of 707394 tests passed. 87 failed (0.0122987%) + GUJARATI: 366349 out of 366457 tests passed. 108 failed (0.0294714%) + GURMUKHI: 60732 out of 60747 tests passed. 15 failed (0.0246926%) + KANNADA: 951190 out of 951913 tests passed. 723 failed (0.0759523%) + KHMER: 299070 out of 299124 tests passed. 54 failed (0.0180527%) + MALAYALAM: 1048140 out of 1048334 tests passed. 194 failed + (0.0185056%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271662 out of 271847 tests passed. 185 failed (0.068053%) + TAMIL: 1091753 out of 1091754 tests passed. 1 failed (9.15957e-05%) + TELUGU: 970555 out of 970573 tests passed. 18 failed (0.00185457%) + + src/hb-ot-shape-complex-indic.cc | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +commit d5bd0590ae2fbc7b0dee86385a565aef00ffb835 +Author: Behdad Esfahbod +Date: Fri Oct 18 16:44:54 2013 +0200 + + Zero marks by GDEF for Tibetan + + See: + http://lists.freedesktop.org/archives/harfbuzz/2013-April/003101.html + + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + src/hb-ot-shape-complex-arabic.cc | 10 +++++++--- + src/hb-ot-shape-complex-default.cc | 17 ++++++++++++++++- + src/hb-ot-shape-complex-indic.cc | 8 +++++++- + src/hb-ot-shape-complex-myanmar.cc | 15 ++++++++++----- + src/hb-ot-shape-complex-private.hh | 8 ++++++-- + src/hb-ot-shape-complex-sea.cc | 14 ++++++++++---- + src/hb-ot-shape-complex-thai.cc | 9 ++++++++- + src/hb-ot-shape.cc | 4 ++-- + 9 files changed, 68 insertions(+), 21 deletions(-) + +commit bf029281b1b0f854f671969ab40eac3046a111bd +Author: Behdad Esfahbod +Date: Fri Oct 18 16:20:13 2013 +0200 + + Bug 65258 - [...] Mongolian with free variation selector + + src/hb-ot-shape-complex-arabic.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 0193649ce4ca78b8e2835a50bd51ee594cffe34e +Author: Behdad Esfahbod +Date: Fri Oct 18 16:08:53 2013 +0200 + + [otfallback] Don't shift down above-marks too much + + This seems to generate much better, almost-perfect, positioning for + Arabic as well as Latin above marks. + + src/hb-ot-shape-fallback.cc | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit dba9580237da788275b1ab5fe6be75c8a3f359b9 +Author: Behdad Esfahbod +Date: Fri Oct 18 15:57:36 2013 +0200 + + [otfallback] Never fallback-position a below-mark upwards + + Test with WinXP times.ttf and U+05D9,U+05B5. + + src/hb-ot-shape-fallback.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 8177da29ad07d8fa444ce07003fa65cd31a2776b +Author: Behdad Esfahbod +Date: Fri Oct 18 15:50:29 2013 +0200 + + Minor + + src/hb-ot-shape-fallback.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c16012e9019ec59c2200a3cc29b8a37ea70eda70 +Author: Behdad Esfahbod +Date: Fri Oct 18 02:27:00 2013 +0200 + + [indic] Add Javanese support! + + Seems to be working just fine! + + src/hb-ot-shape-complex-indic-machine.rl | 14 ++++++------ + src/hb-ot-shape-complex-indic-private.hh | 37 + ++++++++++++++++---------------- + src/hb-ot-shape-complex-indic.cc | 9 ++++++-- + 3 files changed, 34 insertions(+), 26 deletions(-) + +commit 755b44cce6dc23376a3cf0212893609231fa4967 +Author: Behdad Esfahbod +Date: Fri Oct 18 11:17:42 2013 +0200 + + [ft] Round metrics instead of truncate + + Lohit-Punjabi has a upem of 769! We were losing one unit in our + code, and FreeType is losing another one... Test with U+0A06. + Has an advance of 854 in the font. We were producing 852. + Now we do 853, which is what FreeType is telling us. + + src/hb-ft.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 9a49351cc2625de16a73e0e153d3097ef6c7cc0f +Author: Behdad Esfahbod +Date: Fri Oct 18 02:14:53 2013 +0200 + + [indic] Swith pref logic to use _hb_glyph_info_substituted() + + See comments from caveat! Seems to work fine. + + This is useful for Javanese which has an atomically encoded pre-base + reordering Ra which should only be reordered if it was substituted + by the pref feature. + + src/hb-ot-shape-complex-indic.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit f175aa33c5e94397c60648ac0697c80f5fe0dcb7 +Author: Behdad Esfahbod +Date: Fri Oct 18 02:07:44 2013 +0200 + + [indic] Fix compiler warnings + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 857027341423f15fd6084c7563cc355b06e7cbdd +Author: Behdad Esfahbod +Date: Fri Oct 18 01:11:05 2013 +0200 + + [otlayout] Add _hb_glyph_info_substituted() + + Currently unused. + + src/hb-ot-layout-private.hh | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit a1f7b2856184959e965c9c2b80363f9f46d486a7 +Author: Behdad Esfahbod +Date: Fri Oct 18 01:09:08 2013 +0200 + + [otlayout] Switch over from old is_a_ligature() to IS_LIGATED + + Impact should be minimal and positive. + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-ot-layout-private.hh | 12 +++++++++--- + src/hb-ot-shape-complex-indic.cc | 4 ++-- + src/hb-ot-shape-complex-myanmar.cc | 2 +- + src/hb-ot-shape.cc | 2 +- + 5 files changed, 14 insertions(+), 8 deletions(-) + +commit 09675a8115b9d77261c33940401aa919cede8662 +Author: Behdad Esfahbod +Date: Fri Oct 18 01:05:58 2013 +0200 + + [otlayout] Add HB_OT_LAYOUT_GLYPH_PROPS_LIGATED + + Currently unused. + + src/hb-ot-layout-gsubgpos-private.hh | 15 ++++++++++----- + src/hb-ot-layout-private.hh | 5 ++++- + 2 files changed, 14 insertions(+), 6 deletions(-) + +commit 05ad6b50ac0a1b9a8da10d2ee2238068b7811e7d +Author: Behdad Esfahbod +Date: Fri Oct 18 00:45:59 2013 +0200 + + [otlayout] Add HB_OT_LAYOUT_GLYPH_PROPS_SUBSTITUTED + + Currently unused. + + src/hb-ot-layout-gsubgpos-private.hh | 5 +++-- + src/hb-ot-layout-private.hh | 10 ++++++---- + 2 files changed, 9 insertions(+), 6 deletions(-) + +commit 101303dbf7cf15d044bf2518f14b3aec65970fea +Author: Behdad Esfahbod +Date: Fri Oct 18 00:42:39 2013 +0200 + + [otlayout] More shuffling around + + src/hb-ot-layout-gpos-table.hh | 16 +++---- + src/hb-ot-layout-gsub-table.hh | 13 +++-- + src/hb-ot-layout-gsubgpos-private.hh | 8 ++-- + src/hb-ot-layout-private.hh | 92 + ++++++++++++++++++++++++++++++++---- + src/hb-ot-shape.cc | 8 ++-- + 5 files changed, 102 insertions(+), 35 deletions(-) + +commit 91689de2603e4151e2a2d3a3852c61667f0c6264 +Author: Behdad Esfahbod +Date: Fri Oct 18 00:21:59 2013 +0200 + + [otlayout] Add _hb_glyph_info_set_glyph_props() + + No functional change. + + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + src/hb-ot-layout-private.hh | 9 +++++++++ + src/hb-ot-shape.cc | 8 +++++--- + 4 files changed, 17 insertions(+), 6 deletions(-) + +commit a0161746589934e93c3b115814bbd81f56ab962f +Author: Behdad Esfahbod +Date: Fri Oct 18 00:06:30 2013 +0200 + + [otlayout] Simplify set_class() usage + + src/hb-ot-layout-gsubgpos-private.hh | 31 ++++++++++++++++++------------- + 1 file changed, 18 insertions(+), 13 deletions(-) + +commit 3ddf892b5328b74afb6e7d9da727d8771ca5d288 +Author: Behdad Esfahbod +Date: Fri Oct 18 00:02:43 2013 +0200 + + [otlayout] Renaming + + src/hb-ot-layout-gpos-table.hh | 18 +++++++------- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 36 +++++++++++++-------------- + src/hb-ot-layout-private.hh | 48 + +++++++++++++++++++++--------------- + src/hb-ot-shape-complex-indic.cc | 5 ++-- + src/hb-ot-shape-complex-myanmar.cc | 2 +- + src/hb-ot-shape-fallback.cc | 8 +++--- + src/hb-ot-shape.cc | 2 +- + 8 files changed, 65 insertions(+), 56 deletions(-) + +commit 2e96d2c6ee34142375373be07217c9953e7822cc +Author: Behdad Esfahbod +Date: Thu Oct 17 21:16:20 2013 +0200 + + [otlayout] More shuffling + + src/hb-ot-layout-private.hh | 252 + +++++++++++++++++++++++--------------------- + 1 file changed, 130 insertions(+), 122 deletions(-) + +commit 469524692bd0a258b28e63294c984e677a9c2477 +Author: Behdad Esfahbod +Date: Thu Oct 17 21:01:57 2013 +0200 + + [otlayout] Code shuffling + + src/hb-ot-layout-private.hh | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 11fb16cb849285a178d9e80991b1d60a960326ee +Author: Behdad Esfahbod +Date: Thu Oct 17 20:57:57 2013 +0200 + + Use unsigned enums for mask types + + src/hb-buffer.h | 16 ++++++++-------- + src/hb-ot-layout-private.hh | 8 ++++---- + 2 files changed, 12 insertions(+), 12 deletions(-) + +commit 03058c3d1e8c18858c1e0b0c738ce9d299f2787a +Author: Behdad Esfahbod +Date: Thu Oct 17 20:55:34 2013 +0200 + + [otlayout] Remove two unused HB_OT_LAYOUT_GLYPH_PROPS_* values + + src/hb-ot-layout-gdef-table.hh | 1 - + src/hb-ot-layout-gsub-table.hh | 3 ++- + src/hb-ot-layout-private.hh | 7 +++++-- + 3 files changed, 7 insertions(+), 4 deletions(-) + +commit 941b6992042e7b73b3a2aab1448383adf33bef28 +Author: Behdad Esfahbod +Date: Thu Oct 17 20:47:33 2013 +0200 + + [otlayout] Remove unused HB_OT_LAYOUT_GLYPH_PROPS_UNCLASSIFIED + + src/hb-ot-layout-gdef-table.hh | 7 +++++-- + src/hb-ot-layout-private.hh | 10 ++++------ + 2 files changed, 9 insertions(+), 8 deletions(-) + +commit 8f9ec92dfce5c469fb85ad301296b5dde1b2ab0a +Author: Behdad Esfahbod +Date: Thu Oct 17 19:52:47 2013 +0200 + + [indic] Adjust Javanese base algorithm + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 49901862e36e1c153835877a9f1183729333bbbe +Author: Behdad Esfahbod +Date: Thu Oct 17 19:48:51 2013 +0200 + + [otlayout] Guard against use of ReverseChain through Context + + src/hb-ot-layout-gsub-table.hh | 4 +++- + src/hb-ot-layout.cc | 4 ++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +commit 74f4bbf0560a5fd2d295e100e96f0c6c7033e852 +Author: Behdad Esfahbod +Date: Thu Oct 17 19:07:53 2013 +0200 + + [indic] Towards supporting atomicly-encoded prebase-reorderings + + src/hb-ot-shape-complex-indic.cc | 65 + ++++++++++++++++++++++++---------------- + 1 file changed, 40 insertions(+), 25 deletions(-) + +commit efed40b975110d78c9c505441e7e17a8c13e85c8 +Author: Behdad Esfahbod +Date: Thu Oct 17 18:50:11 2013 +0200 + + [indic] Minor refactoring of reph handling + + src/hb-ot-shape-complex-indic.cc | 14 ++++++++------ + src/hb-ot-shape-complex-sea.cc | 2 +- + 2 files changed, 9 insertions(+), 7 deletions(-) + +commit 684fe59ff858a0ecba71b3ed80378afb0b8bbb48 +Author: Behdad Esfahbod +Date: Thu Oct 17 18:30:06 2013 +0200 + + [indic] Minor refactoring of would_substitute() + + src/hb-ot-shape-complex-indic.cc | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +commit 321df83fb4f0b8a5310888129cb70bfda8ae0c96 +Author: Behdad Esfahbod +Date: Thu Oct 17 18:16:14 2013 +0200 + + Route Buginese through the SEA shaper + + Both Indic and SEA seem to do it just fine, but SEA is much + simpler. + + src/hb-ot-shape-complex-private.hh | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit b5a0f69e47ace468b06e21cf069a18ddcfcf6064 +Author: Behdad Esfahbod +Date: Thu Oct 17 18:04:23 2013 +0200 + + [indic] Pass zero-context=false to would_substitute for newer scripts + + For scripts without an old/new spec distinction, use + zero-context=false. + This changes behavior in Sinhala / Khmer, but doesn't seem to regress. + This will be useful and used in Javanese. + + src/hb-ot-shape-complex-indic.cc | 35 +++++++++++++++++++---------------- + 1 file changed, 19 insertions(+), 16 deletions(-) + +commit c4e71ff36d1f86a6ea56539728a964d97217e2b6 +Author: Behdad Esfahbod +Date: Thu Oct 17 17:04:47 2013 +0200 + + [indic] Clean up Khmer and Sinhala base finding algorithm + + src/hb-ot-shape-complex-indic.cc | 24 +++++++++++------------- + 1 file changed, 11 insertions(+), 13 deletions(-) + +commit e10453e6fb2544724ccd7ddfdbb9de90ef9274ce +Author: Behdad Esfahbod +Date: Thu Oct 17 16:49:06 2013 +0200 + + [indic] Add BASE_POS_LAST_SINHALA + + Previously we planted this into the mode used for Khmer. There's not + really much in common between the two, so separate again. + + src/hb-ot-shape-complex-indic.cc | 21 +++++++++++++++++++-- + 1 file changed, 19 insertions(+), 2 deletions(-) + +commit 9ac6b01e0cd8e2d66dfc727157f45b615bc77109 +Author: Behdad Esfahbod +Date: Thu Oct 17 16:27:38 2013 +0200 + + [indic] Adjust Sinhala cluster merging under uniscribe + + Similar to 190c8f2b60af0851bf692f653c1604cfbf0561a5 but for + Sinhala. + + src/hb-ot-shape-complex-indic.cc | 23 ++++++++++++++++------- + 1 file changed, 16 insertions(+), 7 deletions(-) + +commit 3c3df9cba13fec2c35e0e7ae587d9699ac0c37f5 +Author: Behdad Esfahbod +Date: Thu Oct 17 13:58:31 2013 +0200 + + [otlayout] Minor + + src/hb-ot-layout-gsubgpos-private.hh | 62 + +++++++++++++++++++----------------- + 1 file changed, 33 insertions(+), 29 deletions(-) + +commit 6cc136f7531a45e71ea08a7dc8a2187172cb813d +Author: Behdad Esfahbod +Date: Thu Oct 17 13:55:48 2013 +0200 + + [otlayout] Minor + + src/hb-ot-layout-gsubgpos-private.hh | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +commit ba6ddc421e5e440231c2ece2db1363f8e6d2ecbf +Author: Behdad Esfahbod +Date: Thu Oct 17 13:52:51 2013 +0200 + + [otlayout] Increase MAX_CONTEXT_LENGTH + + It's cheap. + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e714fe6d6a2633494cb1fa7170a32ca2638cbb51 +Author: Behdad Esfahbod +Date: Thu Oct 17 13:49:51 2013 +0200 + + [otlayout] Simplify ligate_input() + + Shouldn't change behavior at all, but is faster / more robust. + + src/hb-ot-layout-gsub-table.hh | 16 +++++++--------- + src/hb-ot-layout-gsubgpos-private.hh | 17 +++++++---------- + 2 files changed, 14 insertions(+), 19 deletions(-) + +commit 6b2abdcd203204131f3017ca85c91de9d43959cd +Author: Behdad Esfahbod +Date: Thu Oct 17 13:15:43 2013 +0200 + + [indic] Improve clusters in presence of reph + + src/hb-ot-shape-complex-indic.cc | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit 42d0f55cbc68285e22d713df7062e520af708c82 +Author: Behdad Esfahbod +Date: Thu Oct 17 13:05:05 2013 +0200 + + [indic] Apply calt,clig in the same stage as presentation features + + Whic means these twp are applied per-syllable now. Apparently + in some Khmer fonts the clig interacts with presentation features. + + Test case: U+1781,U+17D2,U+1789,U+17BB,U+17C6 with Mondulkiri-R.ttf + should produce one big ligature. + + src/hb-ot-shape-complex-indic.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit ae9a5834df477006686421d494b55a1569789327 +Author: Behdad Esfahbod +Date: Thu Oct 17 12:24:55 2013 +0200 + + [indic] Fix pref vs blwf interaction + + If a glyph can be both blwf and pref, we were wrongly sorting it + in the post position instead of below position. + + src/hb-ot-shape-complex-indic.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit c7dacac02cfe8526eaf131ce6c5e7b6df7ca2ccd +Author: Behdad Esfahbod +Date: Thu Oct 17 12:20:24 2013 +0200 + + [indic] Don't apply blwf before base under old-spec mode + + Test case: U+09AC,U+09CD,U+09A6 with Lohit-Bengali 2.5.3. + + src/hb-ot-shape-complex-indic.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit da72042c52ed3cc0ee19d3eabb8db7c7dd34d3ed +Author: Behdad Esfahbod +Date: Thu Oct 17 12:01:50 2013 +0200 + + [otlayout] Fix up recent Context matching change + + Commit 6b65a76b40522a4f57a6fedcbdfc5a4d736f1d3c. "end" was becoming + negative. Was trigerred by Lohit-Kannada 2.5.3 and the sequence: + U+0CB0,U+200D,U+0CBE,U+0CB7,U+0CCD,U+0C9F,U+0CCD,U+0CB0,U+0C97,U+0CB3 + Two glyphs were being duplicated. + + src/hb-buffer.cc | 7 ++++++- + src/hb-ot-layout-gsubgpos-private.hh | 3 ++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +commit 1a7de1ba9876b0554c758acbc6459366d9d98a5d +Author: Behdad Esfahbod +Date: Wed Oct 16 19:55:06 2013 +0200 + + [indic] Improve Avagraha support in machine + + src/hb-ot-shape-complex-indic-machine.rl | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 3756efaf4e14ec3b5b1def700a1b5985f162372b +Author: Behdad Esfahbod +Date: Wed Oct 16 19:06:29 2013 +0200 + + [indic] Misc harmless fixes! + + First, we were abusing OT_VD instead of OT_A. Fix that + but moving OT_A in the grammar where it belongs (which + is different from what the spec says). + + Also, only allow medial consonants after all other + consonants. This doesn't affect any current character. + + Finally, fix Halant attachment in presence of medial + consonants. Again, this currently doesn't affect any + sequence. + + I lied. There's Gurmukhi U+0A75 which is Consonant_Medial. + Uniscribe allows one of those in each of these positions: + before matras, after matras and before syllable modifiers, + and after syllable modifiers! We currently just allow + unlimited numbers of it, before matras. + + src/hb-ot-shape-complex-indic-machine.rl | 8 ++++---- + src/hb-ot-shape-complex-indic-private.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 11 ++++++----- + 3 files changed, 11 insertions(+), 10 deletions(-) + +commit c52ddab72e025d1bee8274c8f3416208b12f68f1 +Author: Behdad Esfahbod +Date: Wed Oct 16 13:42:38 2013 +0200 + + [arabic] Make ZWJ prevent ligatures instead of facilitating it + + Unicode 6.2.0 Section 16.2 / Figure 16.3 says: + + "For backward compatibility, between Arabic characters a ZWJ acts just + like the sequence , preventing a ligature from forming + instead of requesting the use of a ligature that would not normally be + used. As a result, there is no plain text mechanism for requesting the + use of a ligature in Arabic text." + + As such, we flip internal zwj to zwnj flags for GSUB matching, which + means it will block ligation in all features, unless the font + explicitly matches U+200D glyph. This doesn't affect joining + behavior. + + src/hb-ot-layout-private.hh | 6 ++++++ + src/hb-ot-shape-complex-arabic.cc | 18 ++++++++++++++++++ + 2 files changed, 24 insertions(+) + +commit 1a31f9f820c4538015ddaf4ca2b790649c5997ed +Author: Behdad Esfahbod +Date: Wed Oct 16 13:42:18 2013 +0200 + + [otlayout] Minor + + src/hb-ot-layout-private.hh | 23 +++++++++++++++-------- + 1 file changed, 15 insertions(+), 8 deletions(-) + +commit 28d5daec948e1a24f13e492ce301aeb9abff37c8 +Author: Behdad Esfahbod +Date: Wed Oct 16 12:32:12 2013 +0200 + + [indic] More granular post-base cluster merging! + + src/hb-ot-shape-complex-indic.cc | 45 + ++++++++++++++++++++++++++++++++++------ + 1 file changed, 39 insertions(+), 6 deletions(-) + +commit 9cb59d460e80d769087045535a8d54ec9ed7985c +Author: Behdad Esfahbod +Date: Wed Oct 16 11:34:07 2013 +0200 + + [indic] Fix cluster merging of left matras + + The merge_clusters there was totally broken. + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 190c8f2b60af0851bf692f653c1604cfbf0561a5 +Author: Behdad Esfahbod +Date: Wed Oct 16 11:33:18 2013 +0200 + + [indic] Adjust cluster merging under uniscribe mode for Tamil + + Apparently Uniscribe Tamil shaper doesn't ship chubby clusters + for Tamil. Adjust to that. + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 5c558877da5db8c734ba072f01e5e4797876619c +Author: Behdad Esfahbod +Date: Wed Oct 16 11:14:15 2013 +0200 + + [indic] Allow up to two syllable modifiers + + Bug 70509 - Candrabindu+Visarga doesn't work in Devanagari + https://bugs.freedesktop.org/show_bug.cgi?id=70509 + + We categorize both bindus and visarga as syllable-modifiers. + OT spec doesn't actually say what characters go in the syllable + modifier category, and allows one. We just allow up to two now. + + Test case: U+0930,U+0941,U+0901,U+0903 + + Uniscribe currently doesn't support that and produces a + dotted circle. + + src/hb-ot-shape-complex-indic-machine.rl | + 2 +- + .../texts/in-tree/shaper-indic/indic/script-devanagari/misc/misc.txt | + 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit f5299eff5c0065d6329cd536c0ac339abea085b0 +Author: Behdad Esfahbod +Date: Tue Oct 15 18:13:07 2013 +0200 + + [indic] Simplify reph logic + + *Shouldn't* break anything. + + src/hb-ot-shape-complex-indic.cc | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +commit 65a929b1c033e91919c931b495a775f76b6dcbb3 +Author: Behdad Esfahbod +Date: Tue Oct 15 18:08:05 2013 +0200 + + [indic] If Malayalam dot-reph formed a ligature, don't move it + + Rachana-0.6 implements dot-reph by ligation, so we shouldn't move it. + Uniscribe doesn't either. Test case: + + U+0D4E,U+0D1A,U+0D4D,U+0D1A,U+0D4D + + src/hb-ot-shape-complex-indic.cc | 23 + ++++++++++++++++------ + .../indic/script-malayalam/misc/dot-reph.txt | 3 +++ + 2 files changed, 20 insertions(+), 6 deletions(-) + +commit a01cbf6cbe0021722302cfb58fb638a0a2427b26 +Author: Behdad Esfahbod +Date: Tue Oct 15 16:37:53 2013 +0200 + + [indic] Harmless reordering of Khmer features! + + src/hb-ot-shape-complex-indic.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit c46f406973024051877e867b93614942ff80c107 +Author: Behdad Esfahbod +Date: Tue Oct 15 16:24:21 2013 +0200 + + [tests] Remove Myanmar micro-font and test + + .../sha1sum/ceadd106a8205214fbe7337ef9de32a862b59762.ttf | Bin 3040 -> + 0 bytes + test/shaping/tests/context-matching.tests | 1 - + 2 files changed, 1 deletion(-) + +commit eb10233b267909dee0245f126000e117f3b21c35 +Author: Behdad Esfahbod +Date: Tue Oct 15 15:26:44 2013 +0200 + + [indic] Apply 'kern' for all scripts except for Khmer in Uniscribe + mode + + Seems to better match Uniscribe. + + Note: NotoSansTelugu-Regular has kern feature, so this fixes most + of the + positioning failures there, except for the kern pairs blocked by a + (non-)joiner, in which case we (correctly) kern, but Uniscribe + doesn't. + + src/hb-ot-shape-complex-indic.cc | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit 30145272a7d428bc62a903388bd7be43f4da7fc3 +Author: Behdad Esfahbod +Date: Tue Oct 15 13:47:27 2013 +0200 + + [indic] Don't apply presentation features across syllables + + More like Uniscribe... We still allow user-defined features to + work across syllables, but not pres,blws,abs,psts,etc. + + This "regressed" Sinhala numbers by 11. These are cases were + there's Consonant followed by Ra,Halant,ZWJ at the of text. + The Ra,Halant,ZWJ ends up forming reph, which is wrong... + But before we were also ligating that reph with the previous + consonant. That's even more wrong. That's also what Uniscribe + does. + + Current numbers: + + BENGALI: 353732 out of 354188 tests passed. 456 failed (0.128745%) + DEVANAGARI: 707307 out of 707394 tests passed. 87 failed (0.0122987%) + GUJARATI: 366349 out of 366457 tests passed. 108 failed (0.0294714%) + GURMUKHI: 60732 out of 60747 tests passed. 15 failed (0.0246926%) + KANNADA: 951030 out of 951913 tests passed. 883 failed (0.0927606%) + KHMER: 299070 out of 299124 tests passed. 54 failed (0.0180527%) + MALAYALAM: 1048140 out of 1048334 tests passed. 194 failed + (0.0185056%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271655 out of 271847 tests passed. 192 failed (0.070628%) + TAMIL: 1091753 out of 1091754 tests passed. 1 failed (9.15957e-05%) + TELUGU: 970555 out of 970573 tests passed. 18 failed (0.00185457%) + + src/hb-ot-shape-complex-indic.cc | 21 + +++++++++++++++++---- + .../shaper-indic/indic/script-sinhala/misc/misc.txt | 1 + + 2 files changed, 18 insertions(+), 4 deletions(-) + +commit 3c7b3641cfb00f2c4dcc0768b9854e4f4410d15f +Author: Behdad Esfahbod +Date: Tue Oct 15 11:21:01 2013 +0200 + + [indic] Handle Avagraha + + It can come either at the end(ish!) of the syllable, or independently. + When independent, it accepts a few bits and pieces. + + src/hb-ot-shape-complex-indic-machine.rl | 5 ++++- + src/hb-ot-shape-complex-indic-private.hh | 5 +++-- + src/hb-ot-shape-complex-indic.cc | 14 + +++++++++++++- + .../shaper-indic/indic/script-devanagari/misc/misc.txt | 1 + + .../in-tree/shaper-indic/indic/script-telugu/misc/misc.txt | 1 + + 5 files changed, 22 insertions(+), 4 deletions(-) + +commit 5e7432b8172473aa4dda3d51a79add9e97c2d2c1 +Author: Behdad Esfahbod +Date: Tue Oct 15 12:28:23 2013 +0200 + + [myanmar] Apply abvm/blwm + + src/hb-ot-shape-complex-myanmar.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 8acbb6be271817c12d2ee0066b355e2fb0f9a934 +Author: Behdad Esfahbod +Date: Tue Oct 15 12:15:49 2013 +0200 + + [indic] Some scripts like blwf applied to pre-base characters + + ...while some don't! + + Improved Bengali, Devanagari, Gurmukhi, Malayalam. + + Updated numbers: + + BENGALI: 353732 out of 354188 tests passed. 456 failed (0.128745%) + DEVANAGARI: 707307 out of 707394 tests passed. 87 failed (0.0122987%) + GUJARATI: 366349 out of 366457 tests passed. 108 failed (0.0294714%) + GURMUKHI: 60732 out of 60747 tests passed. 15 failed (0.0246926%) + KANNADA: 951030 out of 951913 tests passed. 883 failed (0.0927606%) + KHMER: 299070 out of 299124 tests passed. 54 failed (0.0180527%) + MALAYALAM: 1048134 out of 1048334 tests passed. 200 failed + (0.0190779%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271666 out of 271847 tests passed. 181 failed (0.0665816%) + TAMIL: 1091753 out of 1091754 tests passed. 1 failed (9.15957e-05%) + TELUGU: 970555 out of 970573 tests passed. 18 failed (0.00185457%) + + src/hb-ot-shape-complex-indic.cc | 33 ++++++++++++++++++++------------- + 1 file changed, 20 insertions(+), 13 deletions(-) + +commit 2c85a3df0983f28aed77a0ea3bf2417ef65d4b84 +Author: Behdad Esfahbod +Date: Mon Oct 14 19:41:52 2013 +0200 + + Fix issue with automake + + test/shaping/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6b65a76b40522a4f57a6fedcbdfc5a4d736f1d3c +Author: Behdad Esfahbod +Date: Mon Oct 14 18:51:39 2013 +0200 + + [otlayout] Fix (Chain)Context recursion! + + Previously we only supported recursive sublookups with + ascending indices. We were also not correctly handling + non-1-to-1 recursed lookups. + + Fix all that! + + Fixes the three tests in test/shaping/tests/context-matching.tests, + which were derived from NotoSansBengali and NotoSansDevanagari + among others. + + src/hb-buffer-private.hh | 4 + + src/hb-buffer.cc | 46 ++++++++++ + src/hb-ot-layout-common-private.hh | 1 + + src/hb-ot-layout-gsub-table.hh | 1 + + src/hb-ot-layout-gsubgpos-private.hh | 157 + +++++++++++++++++------------------ + 5 files changed, 127 insertions(+), 82 deletions(-) + +commit 841e20d083aec8d814cd8d90aa6ab60127c0d1f2 +Author: Behdad Esfahbod +Date: Mon Oct 14 18:47:51 2013 +0200 + + Add test suite for shaping results + + The new test suite runs tests included under + hb/test/shaping/tests/*.tests, which themselves reference + font files stored by sha1sum under hb/test/shaping/fonts/sha1sum. + The fonts are produced using a subsetter to only include glyphs + needed to run the test. + + Four initial tests are added for (Chain)Context matching, + of which three currently fail. + + test/shaping/Makefile.am | 10 +++++- + .../4cce528e99f600ed9c25a2b69e32eb94a03b4ae8.ttf | Bin 0 -> 1320 bytes + .../ceadd106a8205214fbe7337ef9de32a862b59762.ttf | Bin 0 -> 3040 bytes + .../d629e7fedc0b350222d7987345fe61613fa3929a.ttf | Bin 0 -> 1768 bytes + .../f499fbc23865022234775c43503bba2e63978fe1.ttf | Bin 0 -> 3564 bytes + test/shaping/run-tests.sh | 34 + +++++++++++++++++++++ + test/shaping/tests/MANIFEST | 1 + + test/shaping/tests/context-matching.tests | 4 +++ + 8 files changed, 48 insertions(+), 1 deletion(-) + +commit e2dab69291a5d86fc90a8c273c458c16574eafb5 +Author: Behdad Esfahbod +Date: Mon Oct 14 16:44:44 2013 +0200 + + Minor + + test/shaping/hb_test_tools.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4e6e53db5da0a5da87ae732c3f9d01babf4ae6c2 +Author: Behdad Esfahbod +Date: Mon Oct 14 13:06:36 2013 +0200 + + [otlayout] "Minor" + + src/hb-ot-layout.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 9326d48e4309901e7e0b0e15230936a21ee3df72 +Author: Behdad Esfahbod +Date: Thu Oct 10 20:04:42 2013 +0200 + + Don't use g_mapped_file_unref() + + Was introduced in glib 2.22. + + src/test-buffer-serialize.cc | 2 +- + src/test-size-params.cc | 2 +- + src/test-would-substitute.cc | 2 +- + src/test.cc | 2 +- + util/options.cc | 4 ++-- + 5 files changed, 6 insertions(+), 6 deletions(-) + +commit e152d1a27891bd1d9d46a9c028c026843bad384a +Author: Behdad Esfahbod +Date: Thu Oct 3 15:09:37 2013 -0400 + + 0.9.22 + + NEWS | 13 +++++++++++++ + configure.ac | 2 +- + 2 files changed, 14 insertions(+), 1 deletion(-) + +commit 27674b4bb351e501373bd9994e4ba6546e465cf7 +Author: Behdad Esfahbod +Date: Thu Oct 3 14:54:50 2013 -0400 + + [OTLayout] Protect against out-of-range lookup indices + + Filter them out when compiling map. + + src/hb-ot-layout.cc | 17 +++++++++++++++++ + src/hb-ot-layout.h | 5 +++++ + src/hb-ot-map.cc | 8 +++++++- + 3 files changed, 29 insertions(+), 1 deletion(-) + +commit 6b4fdded94b7efb96c6e41cca4350878ed859ff1 +Author: Behdad Esfahbod +Date: Mon Sep 30 13:48:19 2013 -0400 + + Update git.mk + + git.mk | 20 +++++++++++++------- + 1 file changed, 13 insertions(+), 7 deletions(-) + +commit 2a2b5b89ef3a606ba2996bc89fd1c577a6c98f40 +Author: M1cha +Date: Mon Sep 30 08:55:52 2013 +0000 + + Cleanup Android.mk + - use common src files for both static and shared libs + - remove empty LOCAL_SHARED_LIBRARIES + + Android.mk | 58 + +++++++++++++++++----------------------------------------- + 1 file changed, 17 insertions(+), 41 deletions(-) + +commit 622bc3d829cab84c3a4148b88f2c91fee491ef39 +Merge: 3d2c4f0c d583df1e +Author: Behdad Esfahbod +Date: Sun Sep 29 13:31:58 2013 -0700 + + Merge pull request #4 from amarullz/master + + Add build static library on Android.mk + +commit 3d2c4f0c2ff8fab4262988aad65b170e5b479b20 +Author: Behdad Esfahbod +Date: Fri Sep 27 17:06:29 2013 -0400 + + Fix hiding of default_ignorables if font doesn't have space glyph + + Based on patch from Jonathan Kew. See discussion on the list. + + src/hb-ot-shape.cc | 40 ++++++++++++++++++++++++++++++---------- + 1 file changed, 30 insertions(+), 10 deletions(-) + +commit d583df1e78003f8f1039ad72331bf877b13d1ae5 +Author: Ahmad Amarullah +Date: Fri Sep 27 19:04:32 2013 +0700 + + Add build static library on Android.mk + + Use UCDN instead ICU + HAVE Freetype + + Android.mk | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 50 insertions(+) + +commit 078de49ca10285f6cd1452abd40f831a17af5d1a +Author: Behdad Esfahbod +Date: Thu Sep 26 18:26:43 2013 -0400 + + [util] Don't use g_array_unref() + + Was introduced in glib 2.22. + + util/view-cairo.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 48360ec03b225dfec5f90bc5cb93122203d2dd6b +Author: Behdad Esfahbod +Date: Thu Sep 26 16:48:42 2013 -0400 + + Bug 68990 - test-common fails on i686-linux + + Fix use-after-end-of-scope. + + src/hb-common.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit b61f97d544ce43d85f5fe93e682c324e042c0770 +Author: Behdad Esfahbod +Date: Mon Sep 16 22:07:22 2013 -0400 + + 0.9.21 + + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + 2 files changed, 13 insertions(+), 1 deletion(-) + +commit 2af826296315d89f3a433952903c5968e56044ea +Author: Behdad Esfahbod +Date: Mon Sep 16 21:49:56 2013 -0400 + + Improve library checks + + src/Makefile.am | 1 + + src/check-defs.sh | 44 ++++++++++++++++++++++++++++++++++++++++++++ + src/check-symbols.sh | 37 ++++++++++++------------------------- + 3 files changed, 57 insertions(+), 25 deletions(-) + +commit 882edce48e507a1c76c908ec2db04aac218b67d6 +Author: Behdad Esfahbod +Date: Fri Sep 13 20:36:43 2013 -0400 + + [graphite2] Fix include + + src/hb-graphite2.cc | 5 ++--- + src/hb-graphite2.h | 2 ++ + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit ace5c7eb4c2302a6a7eb3576e6dbc3bc026e569c +Author: Behdad Esfahbod +Date: Fri Sep 13 20:34:42 2013 -0400 + + [introspection] hb-ft annotations + + src/hb-face.cc | 2 +- + src/hb-ft.cc | 30 +++++++++++++++++++++++++++++- + 2 files changed, 30 insertions(+), 2 deletions(-) + +commit a8949df48780e680e03b9afbbafb3628a0acef52 +Author: Behdad Esfahbod +Date: Fri Sep 13 20:23:51 2013 -0400 + + [introspection] Annotate Unicode / font callbacks + + Should move these out of the public header... + + We're "clean" of introspection warnings now. Remaining ones are about + graphite2 / freetype types not being introspectable. + + src/hb-blob.cc | 4 +- + src/hb-face.cc | 2 +- + src/hb-font.cc | 4 +- + src/hb-font.h | 132 + +++++++++++++++++++++++++++++++++++++++++++++++++++++-- + src/hb-unicode.h | 106 ++++++++++++++++++++++++++++++++++++++++---- + 5 files changed, 231 insertions(+), 17 deletions(-) + +commit 4b011094d5e90cf93df2891e47aeab1bffad5bbf +Author: Behdad Esfahbod +Date: Fri Sep 13 20:17:42 2013 -0400 + + Move code around + + I believe I didn't break anything... + + src/hb-ot-shape.cc | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +commit 4878db218202ed804c9f76edb7e4aa220de8a8d8 +Author: Behdad Esfahbod +Date: Thu Sep 12 20:56:32 2013 -0400 + + Remove contrib/ Python hand-coded binding stuff + + gobject-introspection coming together. + + contrib/README | 2 - + contrib/python/README | 10 -- + contrib/python/lib/fontconfig.pyx | 47 --------- + contrib/python/lib/harfbuzz.pyx | 213 + -------------------------------------- + contrib/python/scripts/hbtestfont | 116 --------------------- + contrib/python/setup.py | 39 ------- + 6 files changed, 427 deletions(-) + +commit e478ebe4d3f74dc271ffe88680fd29f6b1924c93 +Author: Behdad Esfahbod +Date: Thu Sep 12 20:53:07 2013 -0400 + + [introspection] Add sample.py + + src/sample.py | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit dfdbe7f932daffcf73911ff4e4a36f749164d960 +Author: Behdad Esfahbod +Date: Thu Sep 12 20:52:20 2013 -0400 + + [introspection] Make hb_blob_create() introspectable + + src/Makefile.am | 2 ++ + src/hb-blob.cc | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit 085d4291a9f253a4b8e2eec8003ac11d02a9394f +Author: Behdad Esfahbod +Date: Thu Sep 12 17:14:33 2013 -0400 + + [introspection] Disable constructors for now + + Since our types are not associated with their methods, marking + constructors makes them inaccessible from bindings. Undo for now. + + src/hb-blob.cc | 2 +- + src/hb-buffer.cc | 2 +- + src/hb-face.cc | 2 +- + src/hb-font.cc | 4 ++-- + src/hb-set.cc | 2 +- + src/hb-shape-plan.cc | 2 +- + src/hb-unicode.cc | 2 +- + 7 files changed, 8 insertions(+), 8 deletions(-) + +commit 6c48f20eea22c6e686416ab4ec8388be3e8cd0b5 +Author: Behdad Esfahbod +Date: Mon Sep 9 15:43:10 2013 -0400 + + [otlayout] Add structs for JSTF table + + src/Makefile.am | 1 + + src/hb-ot-head-table.hh | 2 +- + src/hb-ot-hhea-table.hh | 2 +- + src/hb-ot-hmtx-table.hh | 2 +- + src/hb-ot-layout-gdef-table.hh | 2 +- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-jstf-table.hh | 229 + +++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-layout.cc | 1 + + src/hb-ot-layout.h | 1 + + src/hb-ot-maxp-table.hh | 2 +- + src/hb-ot-name-table.hh | 2 +- + src/main.cc | 2 +- + 13 files changed, 241 insertions(+), 9 deletions(-) + +commit 70303cf23b22647bf641be22c8650310128322a9 +Author: Behdad Esfahbod +Date: Fri Sep 6 17:35:57 2013 -0400 + + [docs/introspection] Some more annotations + + src/hb-common.cc | 151 + ++++++++++++++++++++++++++++++++++++++++++++++++++-- + src/hb-font.cc | 16 +++--- + src/hb-version.h.in | 19 ------- + 3 files changed, 155 insertions(+), 31 deletions(-) + +commit 288f2899979bcc9e68f8115cb76e3271ed0e17bc +Author: Behdad Esfahbod +Date: Fri Sep 6 15:40:22 2013 -0400 + + [docs/introspection] More annotations + + src/hb-blob.cc | 63 +++--- + src/hb-buffer-serialize.cc | 63 ++++++ + src/hb-buffer.cc | 307 ++++++++++++++++++++++++++- + src/hb-face.cc | 171 +++++++++++++++ + src/hb-font-private.hh | 4 +- + src/hb-font.cc | 504 + ++++++++++++++++++++++++++++++++++++++++++++- + src/hb-set.cc | 2 +- + src/hb-shape-plan.cc | 104 ++++++++++ + src/hb-shape.cc | 56 +++++ + src/hb-unicode.cc | 128 ++++++++++++ + 10 files changed, 1355 insertions(+), 47 deletions(-) + +commit 17905c54f1bab9e6dfe13f59f5ec208de12832f7 +Author: Behdad Esfahbod +Date: Fri Sep 6 16:57:01 2013 -0400 + + [introspection] Work around g-i limitation with hb_language_t + + src/hb-gobject-structs.cc | 15 +++++++++++---- + src/hb-gobject-structs.h | 8 ++++++++ + 2 files changed, 19 insertions(+), 4 deletions(-) + +commit cd361c3cbe4a288e3019b9a029f44e4c5f24436c +Author: Behdad Esfahbod +Date: Fri Sep 6 16:20:21 2013 -0400 + + Minor change to hb_language_t + + Let me know if this breaks anyone's anything. + + src/hb-common.cc | 2 +- + src/hb-common.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 20cbc1f8eb0811e6cefa3be3550e80df9c372782 +Author: Behdad Esfahbod +Date: Fri Sep 6 15:29:22 2013 -0400 + + Annotate hb-set a bit; add HB_SET_VALUE_INVALID + + src/hb-set-private.hh | 20 +++-- + src/hb-set.cc | 244 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-set.h | 2 + + src/hb-version.h.in | 6 +- + test/api/test-set.c | 26 +++--- + 5 files changed, 276 insertions(+), 22 deletions(-) + +commit c44b81833d5bfb9a926d348a76463314c3ec2018 +Author: Behdad Esfahbod +Date: Fri Sep 6 15:13:16 2013 -0400 + + Whitespace + + src/hb-buffer.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit ae9dc717d37d58efdd3fabbe4a9c3c2bf9dc3568 +Author: Behdad Esfahbod +Date: Thu Sep 5 16:40:37 2013 -0400 + + [gtk-doc] Pass source files to gtk-doc + + docs/reference/Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 5f512017ba615ba6ac8e5da2ea0c57a72db2c26b +Author: Behdad Esfahbod +Date: Wed Sep 4 18:28:39 2013 -0400 + + [docs] Document a few symbols + + src/hb-blob.cc | 160 + +++++++++++++++++++++++++++++++++++++++++++++++++++- + src/hb-buffer.cc | 78 ++++++++++++++++++++++++- + src/hb-version.h.in | 17 ++++++ + 3 files changed, 251 insertions(+), 4 deletions(-) + +commit e0dbf99b4497be305d689a528282fd37214e7f1c +Author: Behdad Esfahbod +Date: Thu Sep 5 16:00:47 2013 -0400 + + [introspection] Pass source files to scanner + + src/Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 5a5350b39b81e0128d36ebc81307a6d698a4dc50 +Author: Behdad Esfahbod +Date: Tue Sep 3 20:11:01 2013 -0400 + + Revert "Round when scaling values" + + This reverts commit 10f964623f003c70f6bdd33423420abda3820ce0. + + See discussion with Khaled Hosny on mailing list. In short, since + integers here can be negative, and int division is "round towards + zero", proper rounding should take sign into account. Just skip + doing it again, has been serving us well before. + + TODO | 2 ++ + src/hb-font-private.hh | 6 +----- + 2 files changed, 3 insertions(+), 5 deletions(-) + +commit 74ff41c3a573bdf74b60623065eb92a49f055893 +Author: Behdad Esfahbod +Date: Tue Sep 3 20:09:14 2013 -0400 + + Minor + + Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit 63dd4b0ac2076fe9cc3dfe5d31ef3616d4ed01e5 +Author: Behdad Esfahbod +Date: Tue Sep 3 20:01:40 2013 -0400 + + [gtk-doc] Remove hack for deleting tmpl/ + + This was introduced in 029f46bde7e39094d3decb46525e91a97c5cc02c + and was in fact a bug in gtk-doc master: + + https://bugzilla.gnome.org/show_bug.cgi?id=707426 + + docs/reference/Makefile.am | 5 ----- + 1 file changed, 5 deletions(-) + +commit 213001aa99003422199245e96878f9fe348c55b4 +Author: Behdad Esfahbod +Date: Tue Sep 3 20:00:16 2013 -0400 + + [build] Fix EXTRA_DIST + + I was under the impression that EXTRA_DISTs will happen regardless of + automake conditionals. Apparently I was wrong. + + src/Makefile.am | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 1e994a8fcc94dfea42a6cbfe23a401142d79a1a6 +Author: Behdad Esfahbod +Date: Tue Sep 3 18:11:47 2013 -0400 + + [gtk-doc] Copy makefile + + autogen.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 81a007ffad683e53f12093a0c9e30112106f415d +Author: Behdad Esfahbod +Date: Fri Aug 30 19:45:13 2013 -0400 + + [TODO] Update + + TODO | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit a2a28235e8131a1e1d4b8c3d0933df5cf056bbc6 +Author: Behdad Esfahbod +Date: Fri Aug 30 19:38:47 2013 -0400 + + [gtk-doc] Generate version.xml from configure + + Even though this is not what autoconf recommends, it reduces doc + rebuilds when version doesn't change but configure changes. + + configure.ac | 1 + + docs/reference/Makefile.am | 11 +++-------- + docs/reference/version.xml.in | 1 + + 3 files changed, 5 insertions(+), 8 deletions(-) + +commit ac1b723917d9b8f247a350f8d3e1bc5d1e472073 +Author: Behdad Esfahbod +Date: Fri Aug 30 19:32:10 2013 -0400 + + Remove hb-old and hb-icu-le test shapers + + They've been disabled for a while and no one cared. We're past + the point to need them for testing, and if we ever need to + resurrect them again, well, they're in git graveyard somewhere. + + configure.ac | 23 +- + src/Makefile.am | 28 +- + src/hb-icu-le.cc | 265 -- + src/hb-icu-le/COPYING | 2 - + src/hb-icu-le/FontTableCache.cpp | 91 - + src/hb-icu-le/FontTableCache.h | 48 - + src/hb-icu-le/Makefile.am | 25 - + src/hb-icu-le/PortableFontInstance.cpp | 275 -- + src/hb-icu-le/PortableFontInstance.h | 119 - + src/hb-icu-le/README | 3 - + src/hb-icu-le/cmaps.cpp | 200 -- + src/hb-icu-le/cmaps.h | 87 - + src/hb-icu-le/letest.h | 63 - + src/hb-icu-le/license.html | 51 - + src/hb-icu-le/sfnt.h | 453 --- + src/hb-old.cc | 410 --- + src/hb-old/COPYING | 24 - + src/hb-old/Makefile.am | 56 - + src/hb-old/README | 7 - + src/hb-old/harfbuzz-arabic.c | 1150 ------ + src/hb-old/harfbuzz-buffer-private.h | 107 - + src/hb-old/harfbuzz-buffer.c | 383 -- + src/hb-old/harfbuzz-buffer.h | 102 - + src/hb-old/harfbuzz-external.h | 106 - + src/hb-old/harfbuzz-gdef-private.h | 135 - + src/hb-old/harfbuzz-gdef.c | 1163 ------ + src/hb-old/harfbuzz-gdef.h | 140 - + src/hb-old/harfbuzz-global.h | 125 - + src/hb-old/harfbuzz-gpos-private.h | 729 ---- + src/hb-old/harfbuzz-gpos.c | 6094 + -------------------------------- + src/hb-old/harfbuzz-gpos.h | 155 - + src/hb-old/harfbuzz-greek.c | 447 --- + src/hb-old/harfbuzz-gsub-private.h | 483 --- + src/hb-old/harfbuzz-gsub.c | 4329 ----------------------- + src/hb-old/harfbuzz-gsub.h | 148 - + src/hb-old/harfbuzz-hangul.c | 268 -- + src/hb-old/harfbuzz-hebrew.c | 187 - + src/hb-old/harfbuzz-impl.c | 84 - + src/hb-old/harfbuzz-impl.h | 135 - + src/hb-old/harfbuzz-indic.cpp | 1868 ---------- + src/hb-old/harfbuzz-khmer.c | 642 ---- + src/hb-old/harfbuzz-myanmar.c | 511 --- + src/hb-old/harfbuzz-open-private.h | 102 - + src/hb-old/harfbuzz-open.c | 1433 -------- + src/hb-old/harfbuzz-open.h | 288 -- + src/hb-old/harfbuzz-shaper-all.cpp | 37 - + src/hb-old/harfbuzz-shaper-private.h | 159 - + src/hb-old/harfbuzz-shaper.cpp | 996 ------ + src/hb-old/harfbuzz-shaper.h | 265 -- + src/hb-old/harfbuzz-stream-private.h | 81 - + src/hb-old/harfbuzz-stream.c | 114 - + src/hb-old/harfbuzz-stream.h | 51 - + src/hb-old/harfbuzz-tibetan.c | 249 -- + src/hb-old/harfbuzz.h | 38 - + 54 files changed, 2 insertions(+), 25532 deletions(-) + +commit b94243d6a9457864ad8ef3ad47ad01985b138862 +Author: Behdad Esfahbod +Date: Fri Aug 30 18:41:33 2013 -0400 + + [g-i] Rename library from harfbuzz to HarfBuzz + + src/Makefile.am | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit f730b5d1e2369762952481f1a2d3db26a2b48015 +Author: Behdad Esfahbod +Date: Thu Aug 29 15:53:33 2013 -0400 + + 0.9.20 + + NEWS | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 49 insertions(+), 1 deletion(-) + +commit b0e03508bad04d7dcf2c50ac81f6261425b34c5f +Author: Behdad Esfahbod +Date: Thu Aug 29 15:56:32 2013 -0400 + + Dist with gobject and introspection enabled + + Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit e4ce6745e15eab33ed693874e7a56981f4d6f79a +Author: Behdad Esfahbod +Date: Thu Aug 29 15:56:16 2013 -0400 + + [gtk-doc] Fix build without gobject + + docs/reference/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 263372f15ffdf4c0e4386133f64ff389ba73de33 +Author: Behdad Esfahbod +Date: Wed Aug 28 13:43:54 2013 -0400 + + Remove gtk-doc.make + + It's copied by gtk-docize. + + gtk-doc.make | 302 + ----------------------------------------------------------- + 1 file changed, 302 deletions(-) + +commit 79d754efeef89543d51775b110e8bd49cf7e699b +Author: Behdad Esfahbod +Date: Wed Aug 28 13:43:35 2013 -0400 + + Fix build + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 71ef22b04d466803076af1da6763fecab95ce5bb +Author: Behdad Esfahbod +Date: Wed Aug 28 12:52:55 2013 -0400 + + Turn hb-gobject, and introspection off by default + + Also enable bootstrapping without them. + + configure.ac | 39 ++++++++++++++++++++++++++++++++++----- + src/Makefile.am | 5 +++-- + 2 files changed, 37 insertions(+), 7 deletions(-) + +commit d8f507099b9ae5f0c643fb8dddbb069df6f62a94 +Author: Behdad Esfahbod +Date: Mon Aug 26 21:26:24 2013 -0400 + + Hookup harfbuzz-gobject to introspection + + src/Makefile.am | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +commit 71439a8c7ae9df25193bc3ad0f203117d2884a19 +Author: Behdad Esfahbod +Date: Mon Aug 26 20:56:58 2013 -0400 + + [gobject] Flesh out hb-gobject + + Move it to new harfbuzz-gobject library. Implement enums and + boxed types for object-types. Still have to do boxed types for + value types. + + configure.ac | 12 ++++- + docs/reference/Makefile.am | 12 ++++- + docs/reference/harfbuzz-docs.xml | 3 ++ + docs/reference/harfbuzz-sections.txt | 48 +++++++++++++++++++- + src/Makefile.am | 48 +++++++++++++------- + src/harfbuzz-gobject.pc.in | 12 +++++ + src/hb-gobject-enums.cc.tmpl | 11 +++-- + src/hb-gobject-enums.h.tmpl | 55 +++++++++++++++++++++++ + src/hb-gobject-structs.cc | 84 + +++++++++++++++++++++++++++------- + src/hb-gobject-structs.h | 87 + ++++++++++++++++++++++++++++++++++++ + src/hb-gobject.h | 38 ++-------------- + 11 files changed, 333 insertions(+), 77 deletions(-) + +commit 23027f7611b53b594e4b4008e916e42b5154f6ac +Author: Behdad Esfahbod +Date: Thu Aug 22 19:03:21 2013 -0400 + + [introspection] Enable gobject-introspection again + + configure.ac | 7 ++++--- + src/Makefile.am | 49 ++++++++++++++++++++++++++++--------------------- + 2 files changed, 32 insertions(+), 24 deletions(-) + +commit 757a7a9018577dcc399be03dc45a59589585d2fb +Author: Behdad Esfahbod +Date: Wed Aug 28 12:35:13 2013 -0400 + + [uniscribe] Fixed build with wide chars + + https://github.com/blinkseb/harfbuzz/commit/f65dafa4138e1fb4395bf646fa33bb01a86a7e9a + + src/hb-uniscribe.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4dc798de19c767b91fd3025c85593fa6809d1340 +Author: Behdad Esfahbod +Date: Mon Aug 26 20:39:00 2013 -0400 + + Add hb-deprecated.h, and rename a couple enum values + + Add deprecated alias for old name. + + src/Makefile.am | 1 + + src/hb-buffer.cc | 4 ++-- + src/hb-buffer.h | 8 +++---- + src/hb-common.h | 5 ----- + src/hb-deprecated.h | 51 + ++++++++++++++++++++++++++++++++++++++++++++ + src/hb.h | 1 + + src/test-buffer-serialize.cc | 2 +- + test/api/test-buffer.c | 2 +- + util/Makefile.am | 1 + + util/hb-shape.cc | 2 +- + util/options.hh | 2 +- + 11 files changed, 64 insertions(+), 15 deletions(-) + +commit 2e3a07abdf97b0ad2105c3a52f3ff0e0b60b29c4 +Author: Behdad Esfahbod +Date: Mon Aug 26 18:49:07 2013 -0400 + + Separate face source code from font + + Makes documentation / introspection easier. + + Android.mk | 1 + + docs/reference/harfbuzz-docs.xml | 1 + + docs/reference/harfbuzz-sections.txt | 6 +- + src/Makefile.am | 3 + + src/hb-face-private.hh | 108 ++++++++++++ + src/hb-face.cc | 311 + +++++++++++++++++++++++++++++++++++ + src/hb-face.h | 117 +++++++++++++ + src/hb-font-private.hh | 67 +------- + src/hb-font.cc | 269 ------------------------------ + src/hb-font.h | 75 +-------- + src/hb.h | 1 + + 11 files changed, 549 insertions(+), 410 deletions(-) + +commit d3490761e11ae308fbd8aaf02059653f579035c5 +Author: Behdad Esfahbod +Date: Mon Aug 26 21:15:29 2013 -0400 + + Improve check-includes.sh + + src/check-includes.sh | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 381f2fb5e664715d67ffc9a234b0fd8aa540fada +Author: Behdad Esfahbod +Date: Mon Aug 26 19:20:38 2013 -0400 + + Minor + + docs/reference/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ac1f09b53e2c5d14c874e4d9f1b25b03ea1d1c44 +Author: Behdad Esfahbod +Date: Mon Aug 26 18:50:12 2013 -0400 + + [gtk-doc] Fix maintainer-clean rule + + docs/reference/Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 38b8b40526a85f33521542e24d1e0c82588efc85 +Author: Behdad Esfahbod +Date: Tue Aug 27 11:44:09 2013 -0400 + + Fix possible snprintf OOM + + https://bugzilla.redhat.com/show_bug.cgi?id=1001645 + + src/hb-buffer-serialize.cc | 14 +++++++------- + src/hb-font-private.hh | 3 ++- + src/hb-shape.cc | 6 +++--- + 3 files changed, 12 insertions(+), 11 deletions(-) + +commit d22548c0e362cc9447557440af9ecbb11badfa78 +Author: Behdad Esfahbod +Date: Mon Aug 26 18:46:21 2013 -0400 + + [check-*] Minor + + src/check-c-linkage-decls.sh | 4 ++-- + src/check-header-guards.sh | 4 ++-- + src/check-includes.sh | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +commit 029f46bde7e39094d3decb46525e91a97c5cc02c +Author: Behdad Esfahbod +Date: Mon Aug 26 18:11:07 2013 -0400 + + [gtk-doc] Remove tmpl in make maintainer-clean + + docs/reference/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +commit dddf990c3687a47297eafc82b54fa96842e68003 +Author: Behdad Esfahbod +Date: Mon Aug 26 17:58:25 2013 -0400 + + [git.mk] Update + + git.mk | 17 +++++++++++++---- + 1 file changed, 13 insertions(+), 4 deletions(-) + +commit 700a15fe4b80da9c67befd85ae10a166f5b65962 +Author: Behdad Esfahbod +Date: Mon Aug 26 17:49:36 2013 -0400 + + Add HB_DISABLE_DEPRECATED + + That moment that you have to accept that you made API mistakes... + + docs/reference/Makefile.am | 2 +- + docs/reference/harfbuzz-sections.txt | 8 +++++--- + src/hb-common.h | 4 +++- + 3 files changed, 9 insertions(+), 5 deletions(-) + +commit ddc456a519a9a59e96f9d7fcad988369e0a8842b +Author: Behdad Esfahbod +Date: Mon Aug 26 17:34:18 2013 -0400 + + [travis] Add graphite2 + + .travis.yml | 1 + + 1 file changed, 1 insertion(+) + +commit f7c72b42efb8d42859023659fd2e3d589523436d +Author: Anthony Carrico +Date: Sun Feb 24 13:00:33 2013 -0500 + + [gtk-doc] Initial setup + + Initial setup of gtk-doc. Straight forward setup following the gtk-doc + instructions. Ignore some troublesome types in src/hb-gobject.h. To + build use "./autogen.sh --enable-gtk-doc" then "make". Docs are in + harfbuzz/docs/reference/html/index.html. + + .travis.yml | 10 +- + Makefile.am | 7 +- + autogen.sh | 7 + + configure.ac | 7 +- + docs/Makefile.am | 1 + + docs/reference/Makefile.am | 109 +++++++++ + docs/reference/harfbuzz-docs.xml | 61 +++++ + docs/reference/harfbuzz-overrides.txt | 0 + docs/reference/harfbuzz-sections.txt | 431 + ++++++++++++++++++++++++++++++++++ + gtk-doc.make | 302 ++++++++++++++++++++++++ + src/Makefile.am | 2 +- + src/hb-gobject.h | 3 +- + 12 files changed, 931 insertions(+), 9 deletions(-) + +commit 3409fb1c767118067cf7edfb97068936b6f4b717 +Author: Behdad Esfahbod +Date: Wed Aug 21 17:22:21 2013 -0400 + + [uniscribe] Ask Uniscribe to return shaping results in logical order + + See discussion on the list in the thread "Arabic presentation forms + and the uniscribe backend". + + Based on patch from Jonathan Kew. + + src/hb-uniscribe.cc | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +commit 1d05fdd09fa271b641f30a2138171e6fafcd8db7 +Author: Behdad Esfahbod +Date: Tue Aug 20 13:22:21 2013 -0400 + + [uniscribe] Print run info + + src/hb-uniscribe.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 3613696b57225111507a3f4263f5fa6937d0bc72 +Author: Behdad Esfahbod +Date: Mon Aug 12 00:33:28 2013 -0400 + + [coretext] Fully support user features + + Based on patch from Jonathan Kew and data from Apple. + + It's not working correctly though, and I suspect I'm hitting a bug in + CoreText. When I do this: + + hb-shape /Library/Fonts/Zapfino.ttf ZapfinoZapfino --shaper coretext \ + --features=-liga + + I expect both ligatures to turn off, but only the second one does: + + [Z_a_p_f_i_n_o=0+2333|Z=7+395|a=8+285|p_f=9+433|i=11+181|n=12+261|o=13+250] + + whereas if I disable 'dlig' instead of 'liga', both are turned off. + Smells... + + Doesn't resolve conflicting feature settings. + + src/hb-coretext.cc | 446 + +++++++++++++++++++++++++++++++++++++++++++++++----- + src/hb-uniscribe.cc | 2 +- + 2 files changed, 404 insertions(+), 44 deletions(-) + +commit 54e6f6c588a164f7de62ff88b3eff4f25adb8f17 +Author: Behdad Esfahbod +Date: Fri Aug 9 14:34:54 2013 -0400 + + Clean up list of Unicode scripts + + Rename HB_SCRIPT_CANADIAN_ABORIGINAL to HB_SCRIPT_CANADIAN_SYLLABICS + and a macro for the old name. + + src/hb-common.h | 277 + ++++++++++++++++++++----------------- + src/hb-glib.cc | 2 +- + src/hb-ot-shape-complex-private.hh | 2 + + src/hb-ucdn.cc | 2 +- + test/api/test-unicode.c | 2 +- + 5 files changed, 153 insertions(+), 132 deletions(-) + +commit 7cd4a715848c44be9aec6b6b622cfc2a60b1a5a9 +Author: Behdad Esfahbod +Date: Fri Aug 9 09:41:48 2013 -0400 + + Update TODO + + TODO | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 515a0ac81e531c95b1bb7f1a3c5df73a9e64b14f +Author: Behdad Esfahbod +Date: Fri Aug 9 09:40:59 2013 -0400 + + Fix compiler warning + + src/hb-ot-layout-common-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 10f964623f003c70f6bdd33423420abda3820ce0 +Author: Behdad Esfahbod +Date: Fri Aug 9 09:40:01 2013 -0400 + + Round when scaling values + + Doesn't matter for most users since they should be working in a + fixed sub-pixel scale anyway (ie. 22.10, 26.6, 16.16, etc). + + TODO | 2 -- + src/hb-font-private.hh | 6 +++++- + 2 files changed, 5 insertions(+), 3 deletions(-) + +commit df8f70ae5de6181d56efa3f076f14e4d52119a5e +Author: Behdad Esfahbod +Date: Fri Aug 9 09:35:10 2013 -0400 + + Minor + + src/hb-font-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ce8badf1808f9fbdd9a22e9215c7475d3afde5ed +Author: Behdad Esfahbod +Date: Fri Aug 9 09:31:06 2013 -0400 + + Minor + + src/hb-font-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d71c0df2d17f4590d5611239577a6cb532c26528 +Author: Behdad Esfahbod +Date: Fri Aug 9 09:28:32 2013 -0400 + + Remove vrt2, vkrn, vpal, and valt from default vertical features + + See thread by John Dagget on the list. + + TODO | 2 -- + src/hb-ot-shape.cc | 9 --------- + 2 files changed, 11 deletions(-) + +commit a782a5e9a37c8733ac2830410a514d38635b543a +Author: Behdad Esfahbod +Date: Wed Aug 7 21:08:54 2013 -0400 + + [coretext] Start adding support for features + + Unlike AAT, looks like with CoreText very few OT features can + be mapped. + :( + + src/hb-coretext.cc | 65 + +++++++++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 54 insertions(+), 11 deletions(-) + +commit bdd8873fd8ae5c794018f6edac242b0a8b62ff31 +Author: Behdad Esfahbod +Date: Wed Aug 7 17:58:25 2013 -0400 + + Revert "[Indic] don't apply 'calt' by default in Indic shaper" + + This reverts commit 952121007c6f6f374e4cf1734ebcfe2d2d71c71c. + + In light of discussion on the mailing list... + + src/hb-ot-shape-complex-indic.cc | 4 ---- + 1 file changed, 4 deletions(-) + +commit 9a175914d72187d0c3f50ddad50c9569649c3072 +Author: Behdad Esfahbod +Date: Wed Aug 7 17:26:13 2013 -0400 + + [uniscribe] Support feature ranges + + As Khaled pointed out, right now setting any features, turns kern + and possibly other features off. + + src/hb-uniscribe.cc | 232 + ++++++++++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 199 insertions(+), 33 deletions(-) + +commit 627af695e48ef10b6e634c34b723f7e7013467f6 +Author: Behdad Esfahbod +Date: Tue Aug 6 16:53:56 2013 -0400 + + More git.mk updates + + git.mk | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 722252743d59e4cd53cb71720d823ea00b708ad8 +Author: Behdad Esfahbod +Date: Tue Aug 6 15:19:23 2013 -0400 + + Update git.mk + + git.mk | 37 +++++++++++++++++++++++-------------- + 1 file changed, 23 insertions(+), 14 deletions(-) + +commit 38d5c58d23fce38221689cda98cea1c3e42ed615 +Author: Behdad Esfahbod +Date: Tue Aug 6 14:45:36 2013 -0400 + + [uniscribe] Half-support user features + + Turning features on globally works now. + + src/hb-uniscribe.cc | 54 + ++++++++++++++++++++++++++++++++++++++++++----------- + 1 file changed, 43 insertions(+), 11 deletions(-) + +commit 639afdc690c681a302080239a1967ce735ba5be5 +Author: Behdad Esfahbod +Date: Tue Aug 6 14:28:12 2013 -0400 + + Minor + + src/hb-private.hh | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +commit 952121007c6f6f374e4cf1734ebcfe2d2d71c71c +Author: Jonathan Kew +Date: Tue Aug 6 10:36:14 2013 -0400 + + [Indic] don't apply 'calt' by default in Indic shaper + + src/hb-ot-shape-complex-indic.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 625678436c29100eef82d87e635b251030a18f60 +Author: Behdad Esfahbod +Date: Mon Aug 5 22:44:18 2013 -0400 + + Fix glyph closure with class==0 + + As reported by cibu. Untested. + + src/hb-ot-layout-common-private.hh | 29 +++++++++++++++++++++++++++++ + 1 file changed, 29 insertions(+) + +commit 580d5eb93af5bbbc64994b626d5e011e2c256d74 +Author: Behdad Esfahbod +Date: Sun Aug 4 16:55:21 2013 -0400 + + Don't apply 'dlig' by default + + Windows 8 doesn't, and the spec will be fixed. + + src/hb-ot-shape-complex-arabic.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 48382e2f41499a91181bea0acc5792989d2485bb +Author: Behdad Esfahbod +Date: Tue Jul 30 18:25:39 2013 -0400 + + Minor + + src/hb-ot-layout-common-private.hh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit c461371419d186811d4bfc768e26535f48a807f4 +Author: Behdad Esfahbod +Date: Tue Jul 30 14:48:23 2013 -0400 + + [CoreText] Don't leak the CTLine object (and everything that hangs + off it) + + Patch from Jonathan Kew. + + src/hb-coretext.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 5fbc952524ac8840f007dc0136823a4ab6e25f70 +Author: Behdad Esfahbod +Date: Mon Jul 29 14:34:40 2013 -0400 + + Fix glyph name printing in hb-ot-shape-closure + + util/hb-ot-shape-closure.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6fadd9dd7cc220f131c29946285831635afc8044 +Author: Behdad Esfahbod +Date: Fri Jul 26 10:33:06 2013 -0400 + + Apply 'mark' to Myanmar + + According to Andrew Glass: "The issue with Myanmar feature was + fixed via a servicing patch as soon as Windows 8 became available." + + src/hb-ot-shape-complex-myanmar.cc | 11 ----------- + 1 file changed, 11 deletions(-) + +commit 86522e493d071f395b5abf64289232bf8867ac29 +Author: Behdad Esfahbod +Date: Mon Jul 22 19:07:53 2013 -0400 + + Fix glyph closure recursion! + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 74439d0aa10184451adc6c6469f5119be352ecbb +Author: Behdad Esfahbod +Date: Mon Jul 22 19:02:29 2013 -0400 + + Minor + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8b427c78efa988ed27a2a394146d73f59688707b +Author: Behdad Esfahbod +Date: Mon Jul 22 10:57:05 2013 -0400 + + [uniscribe] Sanitize font file + + src/hb-uniscribe.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 12ff69df21ac91ae21860db7000d9f9973d3da1a +Author: Behdad Esfahbod +Date: Mon Jul 22 10:52:12 2013 -0400 + + [uniscribe] Handle TTC when renaming font + + src/hb-uniscribe.cc | 31 ++++++++++++++++++------------- + 1 file changed, 18 insertions(+), 13 deletions(-) + +commit 05bad3b8c25a89bc0f20f99f9215e492f48f03fe +Author: Behdad Esfahbod +Date: Sun Jul 21 17:05:02 2013 -0400 + + [uniscribe] Use OT::* types + + src/hb-open-type-private.hh | 10 ++++- + src/hb-ot-name-table.hh | 4 +- + src/hb-uniscribe.cc | 107 + +++++++++++++++++++++++--------------------- + 3 files changed, 66 insertions(+), 55 deletions(-) + +commit bdeea605fe597bff4430eaae3317189bb81ec76e +Author: Behdad Esfahbod +Date: Sun Jul 21 16:22:10 2013 -0400 + + [uniscribe] Move name generation into separate function + + src/hb-uniscribe.cc | 34 ++++++++++++++++++++++------------ + 1 file changed, 22 insertions(+), 12 deletions(-) + +commit 73f947e2a7bc5b29d731da2e9d1fafe958be839e +Author: Behdad Esfahbod +Date: Sun Jul 21 16:16:35 2013 -0400 + + [uniscribe] Use blob to pass data around + + src/hb-uniscribe.cc | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +commit 8ac2e88deff3d069c19fd59d0fbbfb88a762b113 +Author: Behdad Esfahbod +Date: Sun Jul 21 16:06:49 2013 -0400 + + [uniscribe] Use unique font name + + When installing per-process fonts using AddFontMemResourceEx(), + if a font with the same family name is already installed, sometimes + that one gets used. Which is problematic for us. As such, we + now mangle the font to install a new 'name' table with a unique + name, which we then use to choose the font. + + Patch from Jonathan Kew. + + configure.ac | 2 +- + src/hb-uniscribe.cc | 136 + ++++++++++++++++++++++++++++++++++++++++++++-------- + 2 files changed, 116 insertions(+), 22 deletions(-) + +commit 8751de50831338ce550601c34c17d152ad89c1fd +Author: Behdad Esfahbod +Date: Thu Jul 18 16:29:50 2013 -0400 + + Followup fix for 3f9e2dced298c3d00f31b2dfc38685bb071a3a22 + + During GSUB, if a ligation happens, subsequence context input matching + matches the new indexing. During GPOS however, the indices never + change. So just go one by one. + + Fixes 'dist' positioning with mmrtext.ttf and the following sequence: + + U+1014,U+1039,U+1011,U+1014,U+1039,U+1011,U+1014,U+1039,U+1011 + + Reported by Jonathan Kew. + + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 2b78d67e9f38f77086fbd9c3fd6f1c8c73927a51 +Author: Behdad Esfahbod +Date: Tue Jul 16 16:06:27 2013 -0400 + + 0.9.19 + + NEWS | 11 +++++++++++ + configure.ac | 2 +- + 2 files changed, 12 insertions(+), 1 deletion(-) + +commit e509d35cf1160f1449bc736b9445cdf61ab81d06 +Author: Behdad Esfahbod +Date: Thu Jul 11 14:56:45 2013 -0400 + + [ft] hb_ft_get_glyph_from_name fails for the name of glyph id 0 + + Based on patch from Jonathan Kew, as reported on the mailing list. + + src/hb-ft.cc | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 29b596ac67806c44441e65f3ece227df0fe2bb63 +Author: Behdad Esfahbod +Date: Mon Jul 8 08:37:15 2013 -0600 + + [uniscribe] Fix buffer allocation + + Email from Jonathan Kew: + + My cygwin build kept aborting on certain test words when run with the + uniscribe backend. Turned out this was caused by a bug in the + allocation + of scratch buffers in hb-uniscribe.cc. + + Commit 2a17f9568d9724e045d2c1d660e007f3acd747d9 introduced a new line + + ALLOCATE_ARRAY (SCRIPT_VISATTR, vis_attr, glyphs_size); + + but it failed to account for this in the computation of glyphs_size + (the number of glyphs for which scratch buffer space is available), + with the result that the vis_clusters array ends up overrunning the + end of the scratch buffer and clobbering the beginning of the buffer's + info[]. + + AFAICS, the vis_attr array is not actually used, so the simple fix is + to remove the line that allocates it. (If/when we -do- need to use + vis_attr for something, we'll need to add another term to the earlier + calculation of glyphs_size.) + + With this patch, the uniscribe backend runs reliably again. + + JK + + src/hb-uniscribe.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 9245e98742667dfffe06523e8051beda1bc04811 +Author: Behdad Esfahbod +Date: Wed Jun 26 20:57:58 2013 -0400 + + [Indic] Add Javanese config + + We should add for other scripts too, send me the virama codepoint + and script name... + + src/hb-ot-shape-complex-indic.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 5f85c80a07dd2d18348824866bf4e984ac711a24 +Author: Behdad Esfahbod +Date: Wed Jun 26 20:14:18 2013 -0400 + + [OT] Collect requiredFeature only if features are not provided + + As per Werner's report on the list. + + src/hb-ot-layout.cc | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +commit 3f9e2dced298c3d00f31b2dfc38685bb071a3a22 +Author: Behdad Esfahbod +Date: Wed Jun 26 19:46:55 2013 -0400 + + Fix contextual lookup recursion indexing + + See email thread "Skipping Control for Attaching Marks using OpenType" + from earlier this month. + + src/hb-ot-layout-gsubgpos-private.hh | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +commit f5da11e0fa5adf8f782883dc5c30d8faaafc9c27 +Merge: 79d1007a 89312b74 +Author: Behdad Esfahbod +Date: Sat Jun 22 08:04:05 2013 -0700 + + Merge pull request #3 from LogosBible/master + + Destroy lookups before blobs. + +commit 89312b7417c0198a0635ca6b7e8ea11f6af2a4f8 +Author: Bradley Grainger +Date: Fri Jun 21 15:02:18 2013 -0700 + + Destroy lookups before blobs. + + 'layout->gsub' may depend on data owned by 'layout->gsub_blob', + so it must + be deinitialized before the blob is destroyed. + + src/hb-ot-layout.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 79d1007a501fd63c0ba4d51038c513e6b8b94740 +Author: Behdad Esfahbod +Date: Thu Jun 13 19:01:07 2013 -0400 + + If variation selector is not consumed by cmap, pass it on to GSUB + + This changes the semantics of get_glyph() callback and expect that + callbacks return false if the requested variant is not available, and + then we will call them back with variation_selector=0 and will retain + the glyph for the selector in the glyph stream. + + Apparently most Mongolian fonts implement the Mongolian Variation + Selectors using GSUB, not cmap. + + https://bugs.freedesktop.org/show_bug.cgi?id=65258 + + Note that this doesn't fix the Mongolian shaping yet, because the way + that's implemented is that the, say, 'init' feature ligates the letter + and the variation-selector. However, since currently the variation + selector doesn't have the 'init' mask on, it will not be matched... + + src/hb-ft.cc | 3 +-- + src/hb-ot-shape-normalize.cc | 14 ++++++++++++-- + 2 files changed, 13 insertions(+), 4 deletions(-) + +commit c7a84917208528040aaf9ad0a9a0b26aabeabc9c +Author: Behdad Esfahbod +Date: Thu Jun 6 20:17:32 2013 -0400 + + Skip over multiple variation selectors in a row + + src/hb-ot-shape-normalize.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 7235f33f9e5e031622a00a84f4b2e98f16803579 +Author: Behdad Esfahbod +Date: Mon Jun 10 14:39:51 2013 -0400 + + Fix misc warnings reported by cppcheck + + https://bugs.freedesktop.org/show_bug.cgi?id=65544 + + src/hb-common.cc | 2 +- + src/hb-coretext.cc | 3 --- + src/hb-font-private.hh | 17 +++++++++++------ + src/hb-private.hh | 2 +- + src/hb-shape.cc | 2 +- + test/api/test-font.c | 1 - + util/ansi-print.cc | 1 + + util/hb-ot-shape-closure.cc | 5 +++-- + util/hb-shape.cc | 5 ++++- + util/shape-consumer.hh | 6 ++++-- + util/view-cairo.hh | 6 ++++-- + 11 files changed, 30 insertions(+), 20 deletions(-) + +commit 570bcccd3f41b9aecd51765a401299833a6d8ebd +Author: Behdad Esfahbod +Date: Mon Jun 10 13:56:51 2013 -0400 + + Fix PKG_CHECK_MODULES usage + + Oops. + + Bug 65246 - Fix build without graphite2 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 270cfd7a9c01dfb1b1789929f020943ad63aca99 +Author: Behdad Esfahbod +Date: Thu Jun 6 18:57:15 2013 -0400 + + Fix PKG_CHECK_MODULES usage + + Bug 65246 - Fix build without graphite2 + + If we don't provide ACTION-IF-NOT-FOUND, configure aborts if it can't + find the libraries. We handle that ourselves so we don't want the + macro to abort. + + configure.ac | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 2fd0e02706857bcaf61bf5151657eac96cfa73b9 +Author: Behdad Esfahbod +Date: Thu Jun 6 17:16:01 2013 -0400 + + Minor + + src/Makefile.am | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit b4c5c52944a44ba863a22a53035ff561af7318ca +Author: Chun-wei Fan +Date: Mon Jun 3 17:55:29 2013 +0800 + + util/ansi-print.cc: Use fallback implementation for lround on MSVC + + Unfortuately Visual Studio (still) does not support the C99 function + lround, so provide a fallback implementation for it. + + util/ansi-print.cc | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit a4446b10bfe0a9e7236bf941fa69a96697939e11 +Author: Behdad Esfahbod +Date: Mon Jun 3 18:39:14 2013 -0400 + + Fix build for C89 compilers + + test/api/test-buffer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4ddf937242048c4a044ada4559e26664a0c09b48 +Author: Behdad Esfahbod +Date: Mon Jun 3 18:36:26 2013 -0400 + + Remove unnecessary stdint.h include + + src/hb-ucdn/ucdn.c | 1 - + 1 file changed, 1 deletion(-) + +commit 93a04b8b5e6d8067cb925fdf532aadc24c1d4861 +Author: Chun-wei Fan +Date: Mon Jun 3 17:49:37 2013 +0800 + + hb-uniscribe.cc: Re-enable build under Visual Studio + + -Declare hinstLib at the top of block + -Fix the definitions of the typedefs of ScriptItemizeOpenType, + ScriptShapeOpenType and ScriptPlaceOpenType + + src/hb-uniscribe.cc | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 280e52ae95df0cbee0bb305f5354381bc1d563f4 +Author: Behdad Esfahbod +Date: Thu May 30 18:04:24 2013 -0400 + + Fix ChangeLog regen + + Makefile.am | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit c1824daefa1253507636e4bfdf46374f835f10b3 +Author: Behdad Esfahbod +Date: Wed May 29 15:30:54 2013 -0400 + + Update TODO + + TODO | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 2966d3603259430800cb5880491d28a1c5ea2314 +Author: Behdad Esfahbod +Date: Tue May 28 17:34:37 2013 -0400 + + Fix test build + + test/api/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 6873f6cc42aa1405e71be903bd0f39a7a15320ce +Author: Behdad Esfahbod +Date: Tue May 28 17:33:16 2013 -0400 + + Minor + + TODO | 2 -- + 1 file changed, 2 deletions(-) + +commit 4014aa4e53bddb29d939a168bd733942d3683732 +Author: Behdad Esfahbod +Date: Tue May 28 17:28:59 2013 -0400 + + 0.9.18 + + NEWS | 28 ++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 29 insertions(+), 1 deletion(-) + +commit d70be29831bb99e34fe18744129088f45d5b2023 +Author: Behdad Esfahbod +Date: Tue May 28 17:23:56 2013 -0400 + + Fix dist + + src/Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 22ce0961742df0a213f2cc86ca3d5a72453c00b1 +Author: Behdad Esfahbod +Date: Tue May 28 17:18:30 2013 -0400 + + Generate harfbuzz-icu.pc + + Currently it only works with ICU that has .pc files. I'll + wait till someone complains before fixing it for icu-config + systems. + + Makefile.am | 3 --- + configure.ac | 5 ++--- + harfbuzz.pc.in | 11 ----------- + src/Makefile.am | 13 +++++++++++++ + src/harfbuzz-icu.pc.in | 13 +++++++++++++ + src/harfbuzz.pc.in | 11 +++++++++++ + 6 files changed, 39 insertions(+), 17 deletions(-) + +commit d9afa111330771461b6182ada9f4edd68bcfce77 +Author: Behdad Esfahbod +Date: Tue May 28 15:27:40 2013 -0400 + + Build hb-icu into libharfbuzz-icu.so + + src/Makefile.am | 29 +++++++++++++++-------------- + src/hb-unicode.cc | 2 +- + test/api/Makefile.am | 1 + + 3 files changed, 17 insertions(+), 15 deletions(-) + +commit 7d395c2a255a44fd0d65365ea9b525dba70c062c +Author: Behdad Esfahbod +Date: Tue May 28 15:25:06 2013 -0400 + + Minor + + test/api/test-c.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 2a17f9568d9724e045d2c1d660e007f3acd747d9 +Author: Behdad Esfahbod +Date: Tue May 28 13:10:51 2013 -0400 + + Bug 55494 - ScriptItemizeOpenType doesn't exists under Windows XP + + Fallback to older API if OpenType variants are not available. + + configure.ac | 14 +-- + src/hb-uniscribe.cc | 322 + +++++++++++++++++++++++++++++++++++++++++++--------- + 2 files changed, 271 insertions(+), 65 deletions(-) + +commit f8087ffbadc83a15d59367ba82976eae675736a7 +Author: Behdad Esfahbod +Date: Mon May 27 19:43:48 2013 -0400 + + Add --with-cairo + + configure.ac | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +commit 82eddfe5d658ef791d6ef6a566401c50601dfb1c +Author: Behdad Esfahbod +Date: Mon May 27 19:33:36 2013 -0400 + + Add --with-freetype + + Defaults to auto. + + configure.ac | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit 5e25eb77a49e7f95b6a6d540b26d60d430f89d4c +Author: Behdad Esfahbod +Date: Mon May 27 19:30:48 2013 -0400 + + Default glib to auto again + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit eb63e786f37468867c81707504128cf8a4016e5b +Author: Behdad Esfahbod +Date: Mon May 27 19:29:09 2013 -0400 + + Add --with-coretext + + Defaults to no. + + configure.ac | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit ab2af17bc6faa8394656e6e82948dc3e9f437626 +Author: Behdad Esfahbod +Date: Mon May 27 19:27:43 2013 -0400 + + Add --with-uniscribe + + Defaults to no. + + configure.ac | 55 +++++++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 39 insertions(+), 16 deletions(-) + +commit 58db2c2542717858acbdf480b3f19a8aef4918cd +Author: Behdad Esfahbod +Date: Mon May 27 19:10:33 2013 -0400 + + Disable UCDN if glib is available + + We only want UCDN if we don't have any other Unicode provider. + I'm going to remove ICU from the list of default Unicode providers + as part of moving hb-icu into its own library. As such, the only + providers will be UCDN and glib. + + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +commit ca65326cbd49b48792c4e3125af6c5006364f194 +Author: Behdad Esfahbod +Date: Mon May 27 19:09:50 2013 -0400 + + Minor + + configure.ac | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 7ae14973ecb4614a83769d2bbd01f33d8474ffc0 +Author: Behdad Esfahbod +Date: Mon May 27 19:06:50 2013 -0400 + + Disable icu_le shaper + + Will add a way to enable it later. + + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 7e6ebf76236cc5ea69302e68186bdf8166d04a98 +Author: Behdad Esfahbod +Date: Mon May 27 19:05:23 2013 -0400 + + Remove icu-config fallback for icu_le shaper + + Bug 64878 - compile error with ICU but not ICU + + configure.ac | 18 ------------------ + 1 file changed, 18 deletions(-) + +commit 932b7471479c639244051b4dbae678e7d47ae99f +Author: Behdad Esfahbod +Date: Mon May 27 19:04:40 2013 -0400 + + Bug 65053 - Add configure option to enable/disable ICU support + + configure.ac | 46 ++++++++++++++++++++++++++++------------------ + 1 file changed, 28 insertions(+), 18 deletions(-) + +commit cf2c1c7eb81b54a344ed5cf36d5fbd3cd297eed1 +Author: Behdad Esfahbod +Date: Mon May 27 18:54:30 2013 -0400 + + Disable hb-old shaper + + Will add proper way to enable it later. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5a78d23f255a649353044af8e5df315f62907b7f +Author: Behdad Esfahbod +Date: Mon May 27 18:47:58 2013 -0400 + + Bug 65054 - Add configure option to enable/disable Graphite2 + + Add --with-graphite2. Defaults to off. + + configure.ac | 20 +++++++++++++++----- + 1 file changed, 15 insertions(+), 5 deletions(-) + +commit 61e7775fa75c7c1bdc29a6992c8c215897364600 +Author: Behdad Esfahbod +Date: Mon May 27 18:24:56 2013 -0400 + + Remove hb-icu dependency from hb-icu-le shaper + + src/hb-icu-le.cc | 33 +++++++++++++++++++++++++++++---- + 1 file changed, 29 insertions(+), 4 deletions(-) + +commit 7e08f1258da229dfaf7e1c4b5c41e5bb83906cb0 +Author: Behdad Esfahbod +Date: Mon May 27 14:48:34 2013 -0400 + + Don't zero advance of mark-non-mark ligatures + + If there's a mark ligating forward with non-mark, they were + inheriting the GC of the mark and later get advance-zeroed. + Don't do that if there's any non-mark glyph in the ligature. + + Sample test: U+1780,U+17D2,U+179F with Kh-Metal-Chrieng.ttf + + Also: + Bug 58922 - Issue with mark advance zeroing in generic shaper + + src/hb-ot-layout-gsubgpos-private.hh | 4 ++++ + src/hb-ot-layout-private.hh | 6 ++++++ + 2 files changed, 10 insertions(+) + +commit cf059ac69d10d9eb09f0d2a29b1bd989647bd800 +Author: Behdad Esfahbod +Date: Fri May 24 15:28:11 2013 -0400 + + [icu_le] Support non-BMP text + + src/hb-icu-le.cc | 35 ++++++++++++++++++++++++++++------- + 1 file changed, 28 insertions(+), 7 deletions(-) + +commit a447c528e68cabc9ca6e24e2c436f3d605ef9aaa +Author: Behdad Esfahbod +Date: Thu May 23 17:05:39 2013 -0400 + + [icu_le] A bit better scaling + + src/hb-icu-le.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit fb502a22787f4110472771ef771619342e64577a +Merge: b9408d24 9d9e72e9 +Author: Behdad Esfahbod +Date: Thu May 23 15:54:52 2013 -0400 + + Merge commit '9d9e72e94e7914f82ce62a304e7242f79c13edaf' + +commit b9408d24f3029f5287b17779235b1c750ff5158a +Author: Behdad Esfahbod +Date: Thu May 23 15:43:02 2013 -0400 + + [icu_le] Fix scaling + + Seems to work... + + src/hb-icu-le.cc | 2 ++ + src/hb-icu-le/PortableFontInstance.cpp | 23 +++++++++++++++-------- + src/hb-icu-le/PortableFontInstance.h | 9 ++++++++- + 3 files changed, 25 insertions(+), 9 deletions(-) + +commit 601526392dec5d8432f147c91658ba50ed6a4322 +Author: Behdad Esfahbod +Date: Tue May 21 17:22:13 2013 -0400 + + Copy stdint.h boilerplate to ucdn + + src/hb-ucdn/ucdn.h | 24 +++++++++++++++++++++++- + 1 file changed, 23 insertions(+), 1 deletion(-) + +commit f1b02f4f3c0db9fbfa6747188429df828b000010 +Author: Behdad Esfahbod +Date: Mon May 20 09:23:58 2013 -0400 + + 0.9.17 + + NEWS | 8 ++++++++ + configure.ac | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit d785fa0c45f7f25f5e5f352b933a5f6fa29be5c0 +Author: Behdad Esfahbod +Date: Mon May 20 09:18:52 2013 -0400 + + Minor refactoring + + src/hb-ot-shape.cc | 54 + ++++++++++++++++++++++++++++-------------------------- + 1 file changed, 28 insertions(+), 26 deletions(-) + +commit 127daf15e0b2f509ebd29a104236c8b38884efb0 +Author: Behdad Esfahbod +Date: Mon May 20 09:11:35 2013 -0400 + + Arabic mark width-zeroing regression + + Mozilla Bug 873902 - Display Arabic text with diacritics is bad + https://bugzilla.mozilla.org/show_bug.cgi?id=873902 + + src/hb-ot-shape-complex-arabic.cc | 2 +- + src/hb-ot-shape-complex-default.cc | 2 +- + src/hb-ot-shape-complex-myanmar.cc | 2 +- + src/hb-ot-shape-complex-private.hh | 6 ++++-- + src/hb-ot-shape-complex-thai.cc | 2 +- + src/hb-ot-shape.cc | 36 + ++++++++++++++++++++++++++++-------- + 6 files changed, 36 insertions(+), 14 deletions(-) + +commit fa3d0a0ce60a9fcf2b7f906dec916463b1319eda +Author: Behdad Esfahbod +Date: Tue May 14 15:30:55 2013 -0400 + + Bug 64476 - Typo in hb_set_t.get_min() + + Fixes previous commit's test. + + src/hb-set-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dfbd115e6c1a86a5f1b8d15200672f1e9410b5de +Author: Behdad Esfahbod +Date: Tue May 14 15:30:17 2013 -0400 + + [test] Add test for hb_set_get_min() bug + + Failing now. + + Bug 64476 - Typo in hb_set_t.get_min() + + test/api/test-set.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 9d9e72e94e7914f82ce62a304e7242f79c13edaf +Author: Behdad Esfahbod +Date: Fri May 3 18:10:10 2013 -0400 + + [OTLayout] Use is_inplace() when flipping buffers + + src/hb-ot-layout.cc | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit 45f3d980c9503bd94e64f6e3f67f97688347d00c +Author: Behdad Esfahbod +Date: Fri May 3 17:49:44 2013 -0400 + + [OTLayout] Merge / templateize apply_string() + + src/hb-ot-layout-gpos-table.hh | 25 --------------- + src/hb-ot-layout-gsub-table.hh | 48 ---------------------------- + src/hb-ot-layout.cc | 72 + ++++++++++++++++++++++++++++++++++++++++-- + 3 files changed, 69 insertions(+), 76 deletions(-) + +commit e015b8f2187d1102b9c34d1a63504e7b05ee20ee +Author: Behdad Esfahbod +Date: Fri May 3 17:34:29 2013 -0400 + + [OTLayout] Minor + + src/hb-ot-layout-gpos-table.hh | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 780cd930a974165d76dbf7a87701d11b7f15db06 +Author: Behdad Esfahbod +Date: Fri May 3 17:33:16 2013 -0400 + + [OTLayout] Minor + + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout.cc | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit 2e0c44f4bedd3e24c731c0e9e23358e9a4891a35 +Author: Behdad Esfahbod +Date: Wed Apr 24 16:42:05 2013 -0400 + + [OTLayout] Add is_inplace() method to GSUB + + src/hb-ot-layout-gpos-table.hh | 8 +- + src/hb-ot-layout-gsub-table.hh | 58 ++++++++++++- + src/hb-ot-layout-gsubgpos-private.hh | 158 + +++++++++++++++++++++++++++++++++++ + 3 files changed, 222 insertions(+), 2 deletions(-) + +commit bac1dd6a0ff4d4fae4254506d38ae662b7e9dda7 +Author: Behdad Esfahbod +Date: Thu May 2 18:52:24 2013 -0400 + + [OTLayout] Refactor a bit more + + src/hb-ot-layout-gsubgpos-private.hh | 10 +-- + src/hb-ot-layout-private.hh | 26 ++++---- + src/hb-ot-layout.cc | 100 + ++++++++++++++--------------- + src/hb-ot-map-private.hh | 7 +- + src/hb-ot-shape-complex-arabic-fallback.hh | 7 +- + src/hb-ot-shape-fallback.cc | 3 +- + 6 files changed, 78 insertions(+), 75 deletions(-) + +commit d2c96819de9a7428b65ef0adf794416224221f36 +Author: Behdad Esfahbod +Date: Thu May 2 18:18:24 2013 -0400 + + Move code around + + src/hb-ot-layout.cc | 52 + ++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-map.cc | 43 ------------------------------------------- + 2 files changed, 52 insertions(+), 43 deletions(-) + +commit 45fd9424c723f115ca98995b8f8a25185a6fc71d +Author: Behdad Esfahbod +Date: Thu May 2 18:06:51 2013 -0400 + + [OTLayout] Add hb_ot_layout_lookup_accelerator_t + + src/hb-ot-layout-private.hh | 21 +++++++++++++++++-- + src/hb-ot-layout.cc | 33 + +++++++++++++++--------------- + src/hb-ot-shape-complex-arabic-fallback.hh | 10 +++++---- + 3 files changed, 41 insertions(+), 23 deletions(-) + +commit 76ea563673d24ae1673a5aa3a21da6014479d433 +Author: Behdad Esfahbod +Date: Sat May 4 16:01:20 2013 -0400 + + [OTLayout] Add note about collect_glyphs() and recursive lookups + + src/hb-ot-layout-gsubgpos-private.hh | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit a8bf0e91f18341e1e20f4e3341fc7dcdd0c990e1 +Author: Behdad Esfahbod +Date: Fri May 3 14:45:04 2013 -0400 + + Add U+061C ARABIC LETTER MARK to Default_Ignorable + + src/hb-unicode-private.hh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 5d59f999204aedfc433ab4989664d875f96b0364 +Author: Behdad Esfahbod +Date: Thu May 2 14:44:45 2013 -0400 + + [OTLayout] Make MultipleSubst in-place for sequences of len=1 + + src/hb-ot-layout-gsub-table.hh | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +commit 54f84a6b8571ac7aaaa66f3eff562d23d69d7552 +Author: Behdad Esfahbod +Date: Thu May 2 15:27:53 2013 -0400 + + [OTLayout] Whitespace + + src/hb-ot-layout-gsub-table.hh | 56 + +++++++++++++++++++++--------------------- + 1 file changed, 28 insertions(+), 28 deletions(-) + +commit 3276c354daaff3acabecff11f8e4b5c54d53fc25 +Author: Behdad Esfahbod +Date: Thu May 2 15:16:59 2013 -0400 + + [OTLayout] Minor refactoring + + src/hb-ot-map-private.hh | 4 ++++ + src/hb-ot-map.cc | 46 + +++++++++++++++++++++++++--------------------- + 2 files changed, 29 insertions(+), 21 deletions(-) + +commit ea86efa486a5076e9bf844239bccf86d67577f88 +Author: Behdad Esfahbod +Date: Thu May 2 14:41:39 2013 -0400 + + Minor + + src/hb-ot-map-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 8b63efb6f80b2e9b2de5ec6ab24d6e15826565cb +Author: Behdad Esfahbod +Date: Thu May 2 14:29:32 2013 -0400 + + Minor + + src/hb-buffer-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 2265be0a620bc76ab65f12fedde67791beb51314 +Author: Behdad Esfahbod +Date: Thu May 2 14:25:09 2013 -0400 + + Minor + + src/hb-ot-map-private.hh | 17 ++++++++++------- + src/hb-ot-map.cc | 2 ++ + src/hb-ot-shape-private.hh | 3 +-- + 3 files changed, 13 insertions(+), 9 deletions(-) + +commit e6f19af08717a6a63ad0b5bf4bf368778edc63f0 +Author: Behdad Esfahbod +Date: Thu May 2 13:59:46 2013 -0400 + + Minor + + src/hb-set-private.hh | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +commit 6c15ddfe2b45383824b64058ae69939d002183a6 +Author: Behdad Esfahbod +Date: Tue Apr 30 11:34:00 2013 -0400 + + Renamed DEBUG to something else + + Some infrastructures use DEBUG as a generic symbol. + + src/hb-buffer.cc | 6 +++--- + src/hb-private.hh | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 00b93f6610f36d8d14ca65fb99864be6d5bdb1ea +Author: Behdad Esfahbod +Date: Mon Apr 29 13:48:49 2013 -0400 + + Fix icu linking by requesting the library searchpath from icu-config + + This is not ideal as we don't like -L/usr/lib in our linker line. + But this is only relevant to environments that don't have pkgconfig + files for ICU... + + https://github.com/behdad/harfbuzz/pull/2 + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 03adf38b22a37216dffac50d075ea9c881f1a22d +Author: Behdad Esfahbod +Date: Mon Apr 29 13:40:52 2013 -0400 + + Make both old autoconf and new automake happy + + Sigh.. + + Bug 64039 - undefined macro AM_PROG_AR + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ed79dff517bacfc87279079d5d42d079c21a0373 +Author: Behdad Esfahbod +Date: Sun Apr 21 15:39:25 2013 -0400 + + Minor + + src/hb-ot-layout-gpos-table.hh | 5 ----- + 1 file changed, 5 deletions(-) + +commit 893f57b32f01da3411b5596d59170bc340e9fa39 +Author: Behdad Esfahbod +Date: Sun Apr 21 15:21:49 2013 -0400 + + Minor renaming + + src/hb-ot-map-private.hh | 10 +++++----- + src/hb-ot-map.cc | 22 +++++++++++----------- + 2 files changed, 16 insertions(+), 16 deletions(-) + +commit 8ac3c9c0b6b8e76bce282825b9bb706c0c78c2a6 +Author: Behdad Esfahbod +Date: Sun Apr 21 15:19:38 2013 -0400 + + Rename "pause" to "stage" + + The compile() function is starting to become illegible... + + src/hb-ot-map-private.hh | 24 ++++++++++++------------ + src/hb-ot-map.cc | 38 +++++++++++++++++++------------------- + 2 files changed, 31 insertions(+), 31 deletions(-) + +commit dd0641a432691f9b6186b081c38053858c8bc5c1 +Author: Behdad Esfahbod +Date: Sun Apr 21 15:13:57 2013 -0400 + + Minor + + src/hb-ot-map.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 06a44e859328f5f1e2f6034e711b474116d22e22 +Author: Behdad Esfahbod +Date: Sun Apr 21 15:13:08 2013 -0400 + + Remove unneeded code + + We always push a pause at the end such that each lookup falls + in exactly + one pause_map_t. Now, only if I can find a better name for that... + + src/hb-ot-map-private.hh | 2 +- + src/hb-ot-map.cc | 12 +----------- + 2 files changed, 2 insertions(+), 12 deletions(-) + +commit a408d2375aa2ad96b58e56aef18e5000daf2516b +Author: Behdad Esfahbod +Date: Fri Apr 19 16:32:06 2013 -0400 + + 0.9.16 + + NEWS | 13 ++++++++++++- + configure.ac | 2 +- + 2 files changed, 13 insertions(+), 2 deletions(-) + +commit 8659c636087e433f56da458351e8b4d85fdb347c +Author: Behdad Esfahbod +Date: Fri Apr 19 14:33:17 2013 -0400 + + Hand-code bsearch in the hot inner loop. + + Saves another 3 / 4 percent with Amiri. + + src/hb-open-type-private.hh | 29 +++++++++++++++-------------- + 1 file changed, 15 insertions(+), 14 deletions(-) + +commit 797d76d07f80d796a825d850772087104e5a2575 +Author: Behdad Esfahbod +Date: Thu Apr 18 19:04:12 2013 -0400 + + Minor + + src/hb-ot-layout-common-private.hh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit e4046080c5d785c8dbf9ec9e3478ab9acc83e479 +Author: Behdad Esfahbod +Date: Wed Apr 17 23:49:54 2013 -0400 + + [util] Unbreak --show-text / --show-unicode + + util/shape-consumer.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0dc3a4e0349d28f387a3b4c60a2f51962742738e +Author: Behdad Esfahbod +Date: Wed Apr 17 23:04:03 2013 -0400 + + Obssesive optimization + + Not measurable by any means, but conceptually this is faster since + the mask matches more often than the digest. + + src/hb-ot-layout-gpos-table.hh | 4 ++-- + src/hb-ot-layout-gsub-table.hh | 8 ++++---- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit f9a611026785a80baa4cbff31ad0847beb70ca9a +Author: Behdad Esfahbod +Date: Wed Apr 17 19:01:49 2013 -0400 + + Remove HB_DEBUG_SET_DIGESTS + + Wasn't correct with the new combiner. I should add it back somehow, + but for now the digests seem to be working very well... + + src/hb-set-private.hh | 16 +--------------- + src/hb-set.cc | 14 -------------- + 2 files changed, 1 insertion(+), 29 deletions(-) + +commit f7466ee76f2bd3812209426e2c39fe517227406d +Author: Behdad Esfahbod +Date: Wed Apr 17 18:20:44 2013 -0400 + + Remove hb_set_digest_common_bits_t + + Was unused. + + src/hb-set-private.hh | 38 -------------------------------------- + 1 file changed, 38 deletions(-) + +commit 0d5798a137b52d9be7ef88c79e59f9bf01d54f3b +Author: Behdad Esfahbod +Date: Wed Apr 17 18:19:21 2013 -0400 + + Improve hb_set_digest_t + + Make Amiri rendering faster a whopping 45% again! Speends up pretty + much anything I tested. + + src/hb-set-private.hh | 28 +++++++++++++++++++++++----- + 1 file changed, 23 insertions(+), 5 deletions(-) + +commit c7851efcd3a1e5317ab4ea57535cb755bace0848 +Author: Behdad Esfahbod +Date: Wed Apr 17 17:45:39 2013 -0400 + + Templatize hb_set_digest_lowest_bits_t filter + + src/hb-set-private.hh | 21 +++++++++++++++++---- + 1 file changed, 17 insertions(+), 4 deletions(-) + +commit 0edd0fd255790471118fae1fd7a1309a2b77cf62 +Author: Behdad Esfahbod +Date: Wed Apr 17 17:26:56 2013 -0400 + + Add comment + + src/hb-set-private.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit b40f2c0372acbc51b13be5cda7dd013e74e3e11a +Author: Behdad Esfahbod +Date: Tue Apr 16 23:21:38 2013 -0400 + + Add hb_set_digest_combiner_t + + src/hb-set-private.hh | 33 ++++++++++++++++++++------------- + 1 file changed, 20 insertions(+), 13 deletions(-) + +commit 02e5e583688999c4dc04f11b3924da65f99af7e3 +Author: Behdad Esfahbod +Date: Tue Apr 16 23:13:10 2013 -0400 + + Speed up Speed up hb_set_digest_common_bits_t calcs + + Correctly this time. + + src/hb-set-private.hh | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 893991fc9d2d3a57c4c148f3a9c3b98263cf3aed +Author: Behdad Esfahbod +Date: Tue Apr 16 21:50:33 2013 -0400 + + Initialize set digests + + We were not initializing the digests properly and as a result + they were + being initialized to zero, making digest1 to never do any useful work. + + Speeds up Amiri shaping significantly. + + src/hb-ot-layout.cc | 6 ++++++ + src/hb-ot-shape-complex-arabic-fallback.hh | 4 +++- + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit 4d2813d3e980c8e6150caafa604a78cc44bf62a2 +Author: Behdad Esfahbod +Date: Tue Apr 16 21:57:21 2013 -0400 + + Print set-digest hit ratio with HB_DEBUG_SET_DIGESTS + + src/hb-set-private.hh | 13 +++++++++++++ + src/hb-set.cc | 13 +++++++++++++ + 2 files changed, 26 insertions(+) + +commit 1357c2dd120d005ceecfa83ed328d05dc634d7bc +Author: Behdad Esfahbod +Date: Tue Apr 16 21:47:40 2013 -0400 + + Revert "Speed up hb_set_digest_common_bits_t calcs" + + This reverts commit 3d1b66a35e1ab3be19335705f310b278d76d66d2. + + The calculations were buggy. It's not worth optimizing right now. + + src/hb-set-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 2b712bba3f7c459653737dfa2f7d26f17f3b9f64 +Author: Behdad Esfahbod +Date: Tue Apr 16 16:11:09 2013 -0400 + + Fix typo in unused macro + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 50067e280f381918b8e90b26df9e7bf20f98f0bd +Author: Behdad Esfahbod +Date: Thu Apr 11 16:31:01 2013 -0400 + + [util] Add --num-iterations + + Useful for profiling shapers. + + util/options.cc | 1 + + util/options.hh | 2 ++ + util/shape-consumer.hh | 15 +++++++++------ + 3 files changed, 12 insertions(+), 6 deletions(-) + +commit 08677c250767bfc2c0dd1fc934dea92984741291 +Author: Behdad Esfahbod +Date: Thu Apr 11 14:45:58 2013 -0400 + + [old] Speed up Unicode properties access in hb-old shaper + + Just to be sure it's not punishing the old shaper performance + numbers. Doesn't seem to have a measurable effect. + + src/hb-old/harfbuzz-arabic.c | 44 + +++++++++++++++++++++--------------------- + src/hb-old/harfbuzz-external.h | 18 ++++++++--------- + src/hb-old/harfbuzz-greek.c | 2 +- + src/hb-old/harfbuzz-hebrew.c | 2 +- + src/hb-old/harfbuzz-indic.cpp | 10 +++++----- + src/hb-old/harfbuzz-shaper.cpp | 6 ++++-- + src/hb-old/harfbuzz-shaper.h | 1 + + 7 files changed, 43 insertions(+), 40 deletions(-) + +commit 36a661c0a03d958b95c9ea64a435b55bcd99c3d6 +Author: Behdad Esfahbod +Date: Thu Apr 11 13:38:37 2013 -0400 + + [git.mk] Update + + git.mk | 33 ++++++++++++++++++++------------- + 1 file changed, 20 insertions(+), 13 deletions(-) + +commit ef9e02eddfc9a37d50723e96839635d79191d849 +Author: Behdad Esfahbod +Date: Tue Apr 9 14:06:54 2013 -0400 + + Minor + + src/test.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 22e47456154ca0b8173268486e56ef3a0e1e7150 +Author: Behdad Esfahbod +Date: Fri Apr 5 18:02:43 2013 -0400 + + 0.9.15 + + NEWS | 10 ++++++++++ + configure.ac | 2 +- + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit 4d4fc920496c95621d5bb4800282ea8c028cdde3 +Author: Behdad Esfahbod +Date: Fri Apr 5 17:58:25 2013 -0400 + + [git.mk] Ignore ar-lib + + git.mk | 1 + + 1 file changed, 1 insertion(+) + +commit 587e5753e088b4d0b82c74ddbde790a8369a7517 +Author: Behdad Esfahbod +Date: Fri Apr 5 12:38:58 2013 -0400 + + Add note re Hangul shaping + + src/hb-ot-shape-complex-private.hh | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +commit 269de14dda7a86a20917fa9ea6a5864929c41364 +Author: Behdad Esfahbod +Date: Thu Apr 4 23:06:54 2013 -0400 + + Don't compose Hangul jamo + + See thread "an issue regarding discrepancy between Korean and Unicode + standards" on the mailing list for the rationale. In short: Uniscribe + doesn't, so fonts are designed to work without it. + + src/hb-ot-shape-complex-default.cc | 6 ------ + src/hb-ot-shape-normalize-private.hh | 1 - + src/hb-ot-shape-normalize.cc | 11 +++++------ + 3 files changed, 5 insertions(+), 13 deletions(-) + +commit 1f970609850bb4999b94e1e11b764ab4279cbd38 +Author: Behdad Esfahbod +Date: Thu Apr 4 15:02:03 2013 -0400 + + Put back MemoryBarrier fallback implementation on MINGW32 + + This almost reverts 2761e8a632c14353f286708898be8df6ebad7407, + but only if under MINGW32, so it doesn't affect MSVC. + + src/hb-atomic-private.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit f368ba4a9edec4e297616698097546e8e6c89e53 +Author: Behdad Esfahbod +Date: Thu Apr 4 14:25:36 2013 -0400 + + [Arabic] Zero marks by GDEF, not Unicode category + + Testing shows that this is closer to what Uniscribe does. + + Reported by Khaled Hosny: + + """ + commit 568000274c8edb5f41bc4f876ce21fcc8bdaeed8 + ... + This commit is causing a regression with Amiri, the string + “هَٰذ” with + Uniscribe and HarfBuzz before this commit, gives: + + [uni0630.fina=3+965|uni0670.medi=0+600|uni064E=0@-256,0+0|uni0647.init=0+926] + + But now it gives: + + [uni0630.fina=3+965|uni0670.medi=0+0|uni064E=0@-256,0+0|uni0647.init=0+926] + + i.e. uni0670.medi is zeroed though it has a base glyph GDEF class. + """ + + The test case is U+0647,U+064E,U+0670,U+0630 with Amiri. + + src/hb-ot-shape-complex-arabic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3b80674c50b8c3133848a4034f7106b2b9bfe224 +Author: Behdad Esfahbod +Date: Thu Apr 4 12:06:46 2013 -0400 + + Bug 63107 - FTBFS on ppc64: symbols marked with 'D' on powerpc64 + instead + + src/check-symbols.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7148dc1a978610af25b4f490691a62d709c8c463 +Author: Behdad Esfahbod +Date: Tue Apr 2 14:08:53 2013 -0400 + + [graphite2] Don't crash if language is not set + + https://bugs.webkit.org/show_bug.cgi?id=113796 + + src/hb-graphite2.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a88a62f70f87563725d47b9b6824565e5d6b78ab +Author: Behdad Esfahbod +Date: Thu Mar 21 21:02:16 2013 -0400 + + Minor + + src/hb-ot-shape-normalize.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 0a2b2a505b647f6b4802750c87cd9c5f0baaadef +Author: Behdad Esfahbod +Date: Thu Mar 21 16:26:39 2013 -0400 + + Remove gthread leftovers + + We don't use gthread anymore, remove leftovers. + + configure.ac | 6 ------ + test/api/Makefile.am | 4 ++-- + test/api/hb-test.h | 3 --- + 3 files changed, 2 insertions(+), 11 deletions(-) + +commit b93de1ea085bfc0661ce3ad0e21fb5eba722c951 +Author: Behdad Esfahbod +Date: Thu Mar 21 16:25:20 2013 -0400 + + Minor + + configure.ac | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit f872a17462a75a3493623747bf3a3fbe54556c7b +Author: Behdad Esfahbod +Date: Thu Mar 21 13:38:06 2013 -0400 + + 0.9.14 + + NEWS | 14 ++++++++++++++ + configure.ac | 2 +- + 2 files changed, 15 insertions(+), 1 deletion(-) + +commit cc50bf5b13bfe88137fa7a42782872c40fb9aefb +Author: Behdad Esfahbod +Date: Tue Mar 19 06:59:40 2013 -0400 + + Remove Hangul filler characters from Default_Ignorable chars + + See discussion on mailing list. + + src/hb-unicode-private.hh | + 10 +++++++--- + .../texts/in-tree/shaper-default/script-hangul/misc/misc.txt | 1 + + 2 files changed, 8 insertions(+), 3 deletions(-) + +commit a8cf7b43fa795150ae3d42d64424bb6e0373d0b2 +Author: Behdad Esfahbod +Date: Tue Mar 19 05:53:26 2013 -0400 + + [Indic] Futher adjust ZWJ handling in Indic-like shapers + + After the Ngapi hackfest work, we were assuming that fonts + won't use presentation features to choose specific forms + (eg. conjuncts). As such, we were using auto-joiner behavior + for such features. It proved to be troublesome as many fonts + used presentation forms ('pres') for example to form conjuncts, + which need to be disabled when a ZWJ is inserted. + + Two examples: + + U+0D2F,U+200D,U+0D4D,U+0D2F with kartika.ttf + U+0995,U+09CD,U+200D,U+09B7 with vrinda.ttf + + What we do now is to never do magic to ZWJ during GSUB's main input + match for Indic-style shapers. Note that backtrack/lookahead + are still + matched liberally, as is GPOS. This seems to be an acceptable + compromise. + + As to the bug that initially started this work, that one needs to + be fixed differently: + + Bug 58714 - Kannada u+0cb0 u+200d u+0ccd u+0c95 u+0cbe does not + provide same results as Windows8 + https://bugs.freedesktop.org/show_bug.cgi?id=58714 + + New numbers: + + BENGALI: 353689 out of 354188 tests passed. 499 failed (0.140886%) + DEVANAGARI: 707305 out of 707394 tests passed. 89 failed (0.0125814%) + GUJARATI: 366349 out of 366457 tests passed. 108 failed (0.0294714%) + GURMUKHI: 60706 out of 60747 tests passed. 41 failed (0.067493%) + KANNADA: 951030 out of 951913 tests passed. 883 failed (0.0927606%) + KHMER: 299070 out of 299124 tests passed. 54 failed (0.0180527%) + LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) + MALAYALAM: 1048102 out of 1048334 tests passed. 232 failed + (0.0221304%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271666 out of 271847 tests passed. 181 failed (0.0665816%) + TAMIL: 1091753 out of 1091754 tests passed. 1 failed (9.15957e-05%) + TELUGU: 970555 out of 970573 tests passed. 18 failed (0.00185457%) + TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) + + src/hb-ot-layout-gsubgpos-private.hh | 30 + ++++++++-------------- + src/hb-ot-layout-private.hh | 4 +-- + src/hb-ot-layout.cc | 8 +++--- + src/hb-ot-map-private.hh | 8 +++--- + src/hb-ot-map.cc | 18 ++++++------- + src/hb-ot-shape-complex-arabic-fallback.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 30 + +++++++++++----------- + src/hb-ot-shape-complex-myanmar.cc | 4 +-- + src/hb-ot-shape-complex-sea.cc | 4 +-- + src/hb-ot-shape-fallback.cc | 2 +- + .../indic/script-bengali/misc/misc.txt | 1 + + .../indic/script-malayalam/misc/misc.txt | 1 + + 12 files changed, 53 insertions(+), 59 deletions(-) + +commit 8226fb56f131362db877dc4be6857c684b8fd022 +Author: Behdad Esfahbod +Date: Tue Mar 19 05:22:27 2013 -0400 + + Allow disabling ICU by using a fake icu-config script + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a1f3e8ccbfad0d1148b905ae008ba63a26090cb9 +Author: Behdad Esfahbod +Date: Mon Mar 11 20:18:49 2013 -0400 + + [travis] Install libicu + + .travis.yml | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 14cfab52daa8d22b843110f32ca09af5bbc855a6 +Author: Behdad Esfahbod +Date: Mon Mar 11 19:53:44 2013 -0400 + + Add build system fallback to icu-config + + Ubuntu doesn't (or didn't until recently?) ship icu pkg-config + files. That's quite unfortunate. Work around it. + + Bug 57608 - ICU Detection fallback for non-pkgconfig systems + + configure.ac | 37 +++++++++++++++++++++++++++++++++++++ + 1 file changed, 37 insertions(+) + +commit 190e19e6842875c7a487c66235300ee6b42fb5da +Author: Behdad Esfahbod +Date: Sat Mar 9 20:30:22 2013 -0500 + + [ft] Remove TODO items that I'm not going to fix + + src/hb-ft.cc | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +commit 392ee97431b368ee74e1b521fd539b69d2efadfb +Author: Behdad Esfahbod +Date: Sat Mar 9 20:27:55 2013 -0500 + + [ft] Remove TODO item re FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH + + That flag is redundant, deprecated, and ignored since April 2011. + From FreeType git log: + + commit 8c82ec5b17d0cfc9b0876a2d848acc207a62a25a + Author: Behdad Esfahbod + Date: Thu Apr 21 08:21:37 2011 +0200 + + Always ignore global advance. + + This makes FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH redundant, + deprecated, and ignored. The new behavior is what every + major user + of FreeType has been requesting. Global advance is broken in many + CJK fonts. Just ignoring it by default makes most sense. + + * src/truetype/ttdriver.c (tt_get_advances), + src/truetype/ttgload.c (TT_Get_HMetrics, TT_Get_VMetrics, + tt_get_metrics, compute_glyph_metrics, TT_Load_Glyph), + src/truetype/ttgload.h: Implement it. + + * docs/CHANGES: Updated. + + src/hb-ft.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit c5d91f39802078fc6f6de71940739ec4d04eca07 +Author: Behdad Esfahbod +Date: Sat Mar 9 04:34:21 2013 -0500 + + Add hb_auto_array_t + + src/hb-private.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit ee5464d17fa4c59f5adaaa13dde70dd5264dbc64 +Author: Behdad Esfahbod +Date: Sat Mar 9 01:59:30 2013 -0500 + + [OTLayout] Move code around + + src/hb-ot-layout-gpos-table.hh | 33 ++++++------ + src/hb-ot-layout-gsub-table.hh | 115 + +++++++++++++++++++++-------------------- + 2 files changed, 75 insertions(+), 73 deletions(-) + +commit 9c5a9ee967120c8a968a1160c420e03620d46c24 +Author: Behdad Esfahbod +Date: Sat Mar 9 01:55:04 2013 -0500 + + [OTLayout] Rename process() to dispatch() + + src/hb-open-type-private.hh | 2 +- + src/hb-ot-layout-gpos-table.hh | 80 + ++++++++++++++++++------------------ + src/hb-ot-layout-gsub-table.hh | 78 + +++++++++++++++++------------------ + src/hb-ot-layout-gsubgpos-private.hh | 36 ++++++++-------- + 4 files changed, 98 insertions(+), 98 deletions(-) + +commit 2761e8a632c14353f286708898be8df6ebad7407 +Author: Behdad Esfahbod +Date: Thu Mar 7 20:51:30 2013 -0500 + + [win32] Remove MemoryBarrier() fallback implementation + + I added these because the older mingw32 toolchain didn't have + MemoryBarrier(). The newer mingw-w64 toolchain however has. + As reported by John Emmas this was causing build failure with + MSVC (on glib) because of inline issues. But that reminded me + that we may be taking this path even if the system implements + MemoryBarrier as a function, which is a waste. So, just remove + it. + + src/hb-atomic-private.hh | 14 +------------- + 1 file changed, 1 insertion(+), 13 deletions(-) + +commit ea11abfc5de8bc5cf651b37c9570593eed6a8f9b +Author: Behdad Esfahbod +Date: Wed Mar 6 20:21:11 2013 -0500 + + [build] Port to newer automake recommended syntax + + test/api/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c39def9bc71559d59325a2c3282c1cec4286b2ae +Author: Behdad Esfahbod +Date: Wed Mar 6 20:20:45 2013 -0500 + + Move valgrind suppressions to the correct directory + + test/{ => api}/.valgrind-suppressions | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit a8ac1d33c731f6200ee472ab6c37a80b72770564 +Author: Behdad Esfahbod +Date: Wed Mar 6 20:05:34 2013 -0500 + + [build] Add AM_PROG_AR + + Newer automake / libtools warns otherwise. + + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +commit 5594c2d112c295147ee69215a2ce9dfd99984aa0 +Author: Behdad Esfahbod +Date: Wed Mar 6 19:37:31 2013 -0500 + + [FT] Just return if glyph name not found + + The fallback happens in higher level already. No need to do here. + + src/hb-ft.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit fb7c182bf92142540bff1ad7fb82de0d115fb2b5 +Author: Behdad Esfahbod +Date: Wed Mar 6 00:53:24 2013 -0500 + + [Indic] Minor + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8144936d072f94104242edf9e7aaa31d315b4094 +Author: Behdad Esfahbod +Date: Tue Mar 5 20:08:59 2013 -0500 + + [Indic] Work around fonts with broken new-spec tables + + See comments, and this thread: + + http://lists.freedesktop.org/archives/harfbuzz/2013-March/002990.html + + Originally reported here: + + https://code.google.com/p/chromium/issues/detail?id=96143 + + Doesn't change test suite numbers. + + src/hb-ot-shape-complex-indic.cc | 42 + +++++++++++++++++++++++++++------------- + 1 file changed, 29 insertions(+), 13 deletions(-) + +commit dfb799f57572e8123035a42a30f93c7fc4d37692 +Author: Behdad Esfahbod +Date: Tue Mar 5 17:23:33 2013 -0500 + + [travis] Oops. Run make check, not make test! + + .travis.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8bdce1cac1be9e79344c1f9a9811d98ed2e5c5fd +Author: Behdad Esfahbod +Date: Tue Mar 5 02:35:31 2013 -0500 + + Run autogen.sh, not configure, in travis-ci + + .travis.yml | 1 + + 1 file changed, 1 insertion(+) + +commit 5f705b437cb116275a8c20366e694d740bce715c +Author: Behdad Esfahbod +Date: Tue Mar 5 01:37:44 2013 -0500 + + Add .travis.yml for continuous building with travis-ci.org + + Notifications sent to IRC channel and mailing list. + + .travis.yml | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit cd54d505d1a2467a67e5ff96fe0eb101b953b265 +Author: Behdad Esfahbod +Date: Mon Mar 4 21:29:38 2013 -0500 + + Fix distcheck + + src/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit 22c625a490bbaac52ead2cd29ee49b170e6e9845 +Author: Behdad Esfahbod +Date: Mon Mar 4 20:56:15 2013 -0500 + + [git.mk] Update to commit efc928222179576270c5910416d8055dd7a97896 + + Move reusable list of files into variable definitions modules can + reuse + + Makefile.am | 22 ++++------------------ + git.mk | 59 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- + 2 files changed, 60 insertions(+), 21 deletions(-) + +commit 66f7b3509a121b8f3289ad4c4aed2b5b10a6de2e +Author: Behdad Esfahbod +Date: Mon Mar 4 18:52:12 2013 -0500 + + Add libtool m4 macros to MAINTAINERCLEANFILES + + Makefile.am | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 41732f1fe3ce856d8bb95850635034537b6ba047 +Author: Behdad Esfahbod +Date: Wed Feb 27 20:40:54 2013 -0500 + + [Indic] Help compiler put indic_features table in .rodata + + The overridden "or" operator was preventing the flag expression from + being const, and putting the table in .data instead or .rodata. + + src/hb-ot-map-private.hh | 2 ++ + src/hb-ot-shape-complex-indic.cc | 24 ++++++++++++------------ + 2 files changed, 14 insertions(+), 12 deletions(-) + +commit 778d7f844cb330289830c95431269db06ba1c969 +Author: Behdad Esfahbod +Date: Wed Feb 27 18:47:26 2013 -0500 + + [buffer] Better parse glyph names + + src/hb-buffer-deserialize-json.rl | 9 ++++++--- + src/hb-buffer-deserialize-text.rl | 5 ++++- + 2 files changed, 10 insertions(+), 4 deletions(-) + +commit 20b817ac21147e0a8edbf23ef071c2f4ce6c2b95 +Author: Behdad Esfahbod +Date: Wed Feb 27 18:39:37 2013 -0500 + + [buffer] Implement buffer deserialization for format=json + + Using a ragel machine. + + src/Makefile.am | 2 + + src/hb-buffer-deserialize-json.rl | 129 + ++++++++++++++++++++++++++++++++++++++ + src/hb-buffer-deserialize-text.rl | 52 +-------------- + src/hb-buffer-serialize.cc | 45 +++++++++++-- + src/hb-private.hh | 6 +- + src/hb-shape.cc | 2 - + src/test-buffer-serialize.cc | 4 +- + 7 files changed, 179 insertions(+), 61 deletions(-) + +commit 847794e929831750e97525137ab5e285ccd1064e +Author: Behdad Esfahbod +Date: Wed Feb 27 17:59:28 2013 -0500 + + [buffer] Implement buffer deserialization for format=text + + Using a ragel machine. + + src/Makefile.am | 2 + + src/hb-buffer-deserialize-text.rl | 169 + ++++++++++++++++++++++++++++++++++++++ + src/hb-buffer-private.hh | 3 +- + src/hb-buffer-serialize.cc | 36 +++----- + src/hb-buffer.cc | 13 ++- + src/hb-buffer.h | 2 +- + src/hb-private.hh | 5 +- + src/hb-shape.cc | 9 +- + src/test-buffer-serialize.cc | 16 +++- + 9 files changed, 221 insertions(+), 34 deletions(-) + +commit 4ee803b42a3baae4b0f295a07cb7ad591a538e4c +Author: Behdad Esfahbod +Date: Wed Feb 27 16:09:55 2013 -0500 + + [buffer] Fix serializing of buffer with invalid direction + + src/hb-buffer-serialize.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e54dd26300f50eb19907a9d39269a363279b3e07 +Author: Behdad Esfahbod +Date: Wed Feb 27 13:01:02 2013 -0500 + + [buffer] Start implementing buffer deserialization + + src/Makefile.am | 12 ++++- + src/hb-buffer-serialize.cc | 64 ++++++++++++++++++++++-- + src/hb-buffer.h | 2 +- + src/test-buffer-serialize.cc | 114 + +++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 187 insertions(+), 5 deletions(-) + +commit bcc8f32b4c46cd73f591924c64a6f63df6eaf9e7 +Author: Behdad Esfahbod +Date: Wed Feb 27 12:02:42 2013 -0500 + + [buffer] Minor + + src/hb-buffer-serialize.cc | 10 +++++++--- + src/hb-buffer.h | 4 ++-- + 2 files changed, 9 insertions(+), 5 deletions(-) + +commit d3e14aafff60e1314d0ef66e42cdde6bf949bb66 +Author: Behdad Esfahbod +Date: Wed Feb 27 11:06:36 2013 -0500 + + [buffer] Move buffer serialization code to a new file + + Android.mk | 1 + + src/Makefile.am | 1 + + src/hb-buffer-serialize.cc | 251 + +++++++++++++++++++++++++++++++++++++++++++++ + src/hb-buffer.cc | 228 ---------------------------------------- + 4 files changed, 253 insertions(+), 228 deletions(-) + +commit 8da51112696ec8641d7dd9184b7ab1dd48458813 +Author: Behdad Esfahbod +Date: Wed Feb 27 17:48:31 2013 -0500 + + Minor + + src/hb-shape.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 94789fd6012125acc8426dd88df97f03b0948ea5 +Author: Behdad Esfahbod +Date: Tue Feb 26 21:22:37 2013 -0500 + + [Indic] Sort pre-base reordering consonants with post-forms + + Before, we were marking them as below-form for initial reordering. + However, there is a rule that says "post consonants should follow + below consonsnts" for base determination purposes. Malayalam has + port-form YA/VA, and RA is pre-base. As such, for a sequence like + YA,Virama,YA,Virama,RA, the correct base is at index 0. But + because the code was seeing RA as a below-base, it was stopping at + the second YA as base, instead of jumping it as a post-base. + + By treating prebase-reordering consonants like post-forms, this + is fixed. + + MALAYALAM went down from 351 to 265. Other numbers didn't change: + + BENGALI: 353686 out of 354188 tests passed. 502 failed (0.141733%) + DEVANAGARI: 707305 out of 707394 tests passed. 89 failed (0.0125814%) + GUJARATI: 366262 out of 366457 tests passed. 195 failed (0.0532122%) + GURMUKHI: 60706 out of 60747 tests passed. 41 failed (0.067493%) + KANNADA: 950680 out of 951913 tests passed. 1233 failed (0.129529%) + KHMER: 299074 out of 299124 tests passed. 50 failed (0.0167155%) + LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) + MALAYALAM: 1048069 out of 1048334 tests passed. 265 failed + (0.0252782%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271539 out of 271847 tests passed. 308 failed (0.113299%) + TAMIL: 1091753 out of 1091754 tests passed. 1 failed (9.15957e-05%) + TELUGU: 970555 out of 970573 tests passed. 18 failed (0.00185457%) + TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6d69a2cec158061ef097c488d08813c9503824b8 +Author: Behdad Esfahbod +Date: Tue Feb 26 19:35:50 2013 -0500 + + [tests] Add Malayalam tests frim cibu + + .../indic/script-malayalam/misc/MANIFEST | 1 + + .../indic/script-malayalam/misc/cibu.txt | 188 + +++++++++++++++++++++ + 2 files changed, 189 insertions(+) + +commit 1edc6b97b67363d55cfb5914c991ae54d42a6440 +Author: Behdad Esfahbod +Date: Tue Feb 26 15:01:45 2013 -0500 + + Update Android.mk + + Android.mk | 3 +++ + 1 file changed, 3 insertions(+) + +commit 05d5d3cd63ba2fadfdb62190dd24ef80ee3df40c +Author: Behdad Esfahbod +Date: Mon Feb 25 23:57:51 2013 -0500 + + Fix "comparison between signed and unsigned" warnings + + Patch from Jonathan Kew. + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 07a52b62115f10caea5c2d174a4272eb9ddb2284 +Author: Behdad Esfahbod +Date: Mon Feb 25 19:09:57 2013 -0500 + + Give up sanitizing after 100 edit requests + + Such fonts are *definitely* really broken. Give up. + Limits time spent in sanitize for extremely / deliberately broken + fonts. For example, two fonts with these md5sum / names: + + 9343f0a1b8c84b8123e7d201cae62ffd.ttf + eb8c978547f09d368fc204194fb34688.ttf + + were spending over a second in sanitize! Not anymore. + + src/hb-open-type-private.hh | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 29ff25481584e20a2fa39195f295c8eb4bf3bad0 +Author: Behdad Esfahbod +Date: Mon Feb 25 19:04:56 2013 -0500 + + Add HB_DEBUG_VERBOSE + + Only affects the verbosity of function name printing right now. + + src/hb-private.hh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 05686b5f697ed40dd21b330d044c3c286461fb26 +Author: Behdad Esfahbod +Date: Mon Feb 25 18:19:20 2013 -0500 + + 0.9.13 + + NEWS | 29 +++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 30 insertions(+), 1 deletion(-) + +commit 9e5ac7b8c02c86a4f28c79173a5237503eaa7115 +Author: Behdad Esfahbod +Date: Mon Feb 25 17:54:10 2013 -0500 + + Fix blob test to match c3ba49b6fa1865e8318926eaa6c0f2063d1053bb + + test/api/test-blob.c | 57 + ++++++++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 51 insertions(+), 6 deletions(-) + +commit c3ba49b6fa1865e8318926eaa6c0f2063d1053bb +Author: Behdad Esfahbod +Date: Mon Feb 25 17:06:35 2013 -0500 + + Always create sub-blobs in MEMORY_MODE_READONLY + + This fixes a design bug with sanitize and sub-blobs that can + cause crashes. Jonathan and I found and debugged this issue + when we tested a corrupt font with the md5sum / filename: + ea395483d37af0cb933f40689ff7b60a. Two hours of intense + debugging we found out that the font has overlapping GSUB/GPOS + tables, and as such, sanitizing the second table can modify + the first one, which can cause all kinds of undefined behavior. + + The correct way to fix this is to make sure sub-blobs are + always created readonly, since we consider the parent blob + to be a shared resource and can't modify it, even if it *is* + writable. + + This essentially makes the READONLY_MAY_MAKE_WRITABLE mode + unused... Maybe we should simply remove / deprecate it. + + src/hb-blob.cc | 2 +- + src/hb-blob.h | 26 ++++++++++++++++++++++++++ + 2 files changed, 27 insertions(+), 1 deletion(-) + +commit 57542d7f411c71d9b8110ce6f64090b2c0f6a925 +Author: Behdad Esfahbod +Date: Thu Feb 21 15:54:05 2013 -0500 + + Minor + + src/hb-ot-layout-private.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit d46606e119b48dcca375d6313abd0f93ba5d09c3 +Author: Behdad Esfahbod +Date: Thu Feb 21 15:39:57 2013 -0500 + + Port TrueType-kerning to use skippy iterator + + It skips joiners and default ignorables now. Skips marks too, + but only + if there is proper GDEF classes for marks. + + src/hb-ot-shape-fallback.cc | 50 + +++++++++++++++++++++++++-------------------- + 1 file changed, 28 insertions(+), 22 deletions(-) + +commit 722e8b857eafc52e07dee5d9b253b88ed5c5c8ed +Author: Behdad Esfahbod +Date: Thu Feb 21 15:37:51 2013 -0500 + + Fixup previous commit + + Was not decreasing num_items. Ouch! + + src/hb-ot-layout-gsubgpos-private.hh | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit ba87b8fc89bf745068ccd19264a2631ea0904846 +Author: Behdad Esfahbod +Date: Thu Feb 21 15:23:39 2013 -0500 + + Move code around + + src/hb-ot-shape-fallback-private.hh | 5 +++++ + src/hb-ot-shape-fallback.cc | 40 + +++++++++++++++++++++++++++++++++++++ + src/hb-ot-shape.cc | 38 + +---------------------------------- + 3 files changed, 46 insertions(+), 37 deletions(-) + +commit 2b2a6e8944144755ab641f2842e36d9a847719f3 +Author: Behdad Esfahbod +Date: Thu Feb 21 15:07:03 2013 -0500 + + [OTLayout] Correctly skip Default_Ignorable when match_func not set + + When a match_func was not set on the matcher_t object (ie. from GPOS), + then the Default_Ignorables (including joiners) were never skipped. + This meant that they were not skipped as they should during GPOS + matching. Fix that. + + A few Indic numbers have "regressed": BENGALI and DEVANAGARI went + up from 290 and 58 respectively, but in both cases new results are + superior to Uniscribe, as they apply GPOS when we weren't (and + Uniscribe isn't) before. + BENGALI: 353686 out of 354188 tests passed. 502 failed (0.141733%) + DEVANAGARI: 707305 out of 707394 tests passed. 89 failed (0.0125814%) + GUJARATI: 366262 out of 366457 tests passed. 195 failed (0.0532122%) + GURMUKHI: 60706 out of 60747 tests passed. 41 failed (0.067493%) + KANNADA: 950680 out of 951913 tests passed. 1233 failed (0.129529%) + KHMER: 299074 out of 299124 tests passed. 50 failed (0.0167155%) + LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) + MALAYALAM: 1047983 out of 1048334 tests passed. 351 failed + (0.0334817%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271539 out of 271847 tests passed. 308 failed (0.113299%) + TAMIL: 1091753 out of 1091754 tests passed. 1 failed (9.15957e-05%) + TELUGU: 970555 out of 970573 tests passed. 18 failed (0.00185457%) + TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) + + src/hb-ot-layout-gsubgpos-private.hh | 32 + ++++++++++++++++++++++---------- + 1 file changed, 22 insertions(+), 10 deletions(-) + +commit ff93ac8cb24cbc3d9dc1a2bfb0faa88950f4a507 +Author: Behdad Esfahbod +Date: Thu Feb 21 14:51:40 2013 -0500 + + Minor + + src/hb-ot-layout-gsubgpos-private.hh | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit e0486fc1affd3796fb8f664e2e7fc208f1d2106c +Author: Behdad Esfahbod +Date: Tue Feb 19 00:58:10 2013 -0500 + + [tests] Add Myanmar torture tests from Martin Hosken + + .../shaper-myanmar/script-myanmar/misc/MANIFEST | 1 + + .../shaper-myanmar/script-myanmar/misc/torture.txt | 23 + ++++++++++++++++++++++ + 2 files changed, 24 insertions(+) + +commit a3df9a7bf87aeba7a3d6110cd5e01a65bd0b16d0 +Author: Behdad Esfahbod +Date: Tue Feb 19 00:50:46 2013 -0500 + + Minor + + Moving files around + + test/shaping/texts/in-tree/MANIFEST | + 2 -- + test/shaping/texts/in-tree/shaper-default/MANIFEST | + 2 ++ + .../in-tree/{script-default => shaper-default/script-hangul}/MANIFEST + | 0 + .../{script-default => shaper-default/script-hangul}/misc/MANIFEST + | 0 + .../{shaper-hangul => shaper-default}/script-hangul/misc/misc.txt + | 0 + .../script-hangul => shaper-default/script-tibetan}/MANIFEST | + 0 + .../script-hangul => shaper-default/script-tibetan}/misc/MANIFEST + | 0 + .../{script-default => shaper-default/script-tibetan}/misc/misc.txt + | 0 + test/shaping/texts/in-tree/shaper-hangul/MANIFEST | + 1 - + 9 files changed, 2 insertions(+), 3 deletions(-) + +commit b1f440759161cb5a54e1b1b910f3a8383b8e8472 +Author: Behdad Esfahbod +Date: Sun Feb 17 12:12:37 2013 -0500 + + [SEA] Fix order of pre-base reordering Ra and left matras + + The code was confused because it was expecting left matra to have + POS_PRE_M, like we do in the Myanmar shaper, but that is not what + we were doing in this shaper. Rewrite to rely on category only. + + Test case: U+AA06,U+AA34,U+AA2F + + src/hb-ot-shape-complex-sea.cc | 13 + +++++++------ + .../texts/in-tree/shaper-sea/script-cham/misc/misc.txt | 1 + + 2 files changed, 8 insertions(+), 6 deletions(-) + +commit 99fa9ea020f26ed2697f38a7690ee1e1b5d946c4 +Author: Behdad Esfahbod +Date: Fri Feb 15 11:47:24 2013 -0500 + + Minor + + src/hb-ot-layout-gsub-table.hh | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 27589620ba2dcf356fd7fa21cd80221a07803202 +Author: Behdad Esfahbod +Date: Fri Feb 15 11:47:09 2013 -0500 + + [OTLayout] Remove unused code + + src/hb-open-type-private.hh | 5 ----- + 1 file changed, 5 deletions(-) + +commit ebb77b9c5e357ff7c9badb0f4bf1c3a965c3e91d +Author: Behdad Esfahbod +Date: Fri Feb 15 09:33:10 2013 -0500 + + Remove TODO items that don't make sense + + The spec says those features need to be disabled by default. + + TODO | 2 -- + 1 file changed, 2 deletions(-) + +commit c2a1cdc4c4cc51f4680ebc4ec2c462cb660f9492 +Author: Behdad Esfahbod +Date: Fri Feb 15 09:27:02 2013 -0500 + + [Arabic] Fix shaping of left-joining 'Phags-Pa U+A872 + + This is the first character in Unicode to have Arabic left-joining + behavior. Update the machine to recognize that. + + Test case: U+A840,U+A872,U+A840. + + src/hb-ot-shape-complex-arabic.cc | 40 + +++++++++++++++++++-------------------- + 1 file changed, 19 insertions(+), 21 deletions(-) + +commit 05ac87813d17d9ebbfa315eee3f80f25b53135c5 +Author: Behdad Esfahbod +Date: Fri Feb 15 09:26:41 2013 -0500 + + [tests] Add Syriac Alaph shaping test cases + + .../shaper-arabic/script-syriac/misc/MANIFEST | 1 + + .../shaper-arabic/script-syriac/misc/alaph.txt | 98 + ++++++++++++++++++++++ + 2 files changed, 99 insertions(+) + +commit c462b32dcb883a7aca066af24c4d28c7a2b7fa28 +Author: Behdad Esfahbod +Date: Fri Feb 15 07:51:47 2013 -0500 + + Disable automatic segment properties guessing + + Before, if one called hb_shape() without setting script, language, and + direction on the buffer, hb_shape() was calling + hb_buffer_guess_segment_properties() on the user's behalf to guess + these. + + This is very dangerous, since any serious user of HarfBuzz must set + these properly (specially important is direction). So now, we don't + guess properties by default. People not setting direction will get + an abort() now. If the old behavior is desired (fragile, good for + simple testing only), users can call + hb_buffer_guess_segment_properties() on the buffer just before calling + hb_shape(). + + src/hb-fallback-shape.cc | 1 - + src/hb-ot-shape.cc | 2 -- + src/hb-shape.cc | 2 -- + util/options.hh | 1 + + 4 files changed, 1 insertion(+), 5 deletions(-) + +commit 7abddbb47a489aaac8e76ac6e700cd815739b1d2 +Author: Behdad Esfahbod +Date: Fri Feb 15 07:46:57 2013 -0500 + + Add assertions for a couple programmer errors + + src/hb-shape-plan.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 038c98f6866fe1177b04bd2ae3bb461b2f0fd1ed +Author: Behdad Esfahbod +Date: Fri Feb 15 07:41:07 2013 -0500 + + Allow disabling of TrueType kerning + + Responds to the same feature tag that GPOS kerning does: + 'kern' for horizontal and 'vkrn' for vertical. + + TODO | 2 -- + src/hb-ot-shape.cc | 55 + ++++++++++++++++++++++++++++++++++-------------------- + 2 files changed, 35 insertions(+), 22 deletions(-) + +commit 398238a2526d322eb79e255c24634a275473920f +Author: Behdad Esfahbod +Date: Fri Feb 15 07:40:10 2013 -0500 + + Fix partial disabling of default-on features + + Surprisingly, if user ever tried to turn a default feature off + partially + (say, disable liga for a range), the feature was being turned off + globally! Fixed now. + + src/hb-ot-map.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit cb90b1bbe6d27ca6968b70d2dbfea7ab7fb73293 +Author: Behdad Esfahbod +Date: Fri Feb 15 07:02:08 2013 -0500 + + [OTLayout] Respect syllable boundaries for backtrack/lookahead + matching + + Originally we meant to match backtrack/lookahead across syllable + boundaries. But a bug in the code meant that this was NOT done for + backtrack. We "fixed" that in + 2c7d0b6b80d412de3fddd443ed1a485ea1cbb03c, + but that broke Myanmar shaping. + + We now believe that for Indic-like shapers (which is where syllables + are + used), all basic shaping forms should be fully contained within their + syllables, so now we limit backtrack/lookahead matching to the + syllable + too. Unbreaks Myanmar. + + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ee9c3a17d0bf263c5eee479fd778db97cff8e189 +Author: Behdad Esfahbod +Date: Fri Feb 15 06:22:26 2013 -0500 + + Minor refactoring + + src/hb-ot-shape-complex-myanmar.cc | 36 + ++++++++++-------------------------- + src/hb-ot-shape-complex-sea.cc | 37 + ++++++++++--------------------------- + src/hb-ot-shape.cc | 17 ++++++----------- + 3 files changed, 26 insertions(+), 64 deletions(-) + +commit cfc507c5432e6327e8484b07b9e091212653bc92 +Author: Behdad Esfahbod +Date: Thu Feb 14 10:40:12 2013 -0500 + + [Indic-like] Disable automatic joiner handling for basic shaping + features + + Not for Arabic, but for Indic-like scripts. ZWJ/ZWNJ have special + meanings in those scripts, so let font lookups take full control. + + This undoes the regression caused by automatic-joiners handling + introduced two commits ago. + + We only disable automatic joiner handling for the "basic shaping + features" of Indic, Myanmar, and SEAsian shapers. The "presentation + forms" and other features are still applied with automatic-joiner + handling. + + This change also changes the test suite failure statistics, such that + a few scripts show more "failures". The most affected is Kannada. + However, upon inspection, we believe that in most, if not all, of the + new failures, we are producing results superior to Uniscribe. Hard to + count those! + + Here's an example of what is fixed by the recent joiner-handling + changes: + + https://bugs.freedesktop.org/show_bug.cgi?id=58714 + + New numbers, for future reference: + + BENGALI: 353892 out of 354188 tests passed. 296 failed (0.0835714%) + DEVANAGARI: 707336 out of 707394 tests passed. 58 failed (0.00819911%) + GUJARATI: 366262 out of 366457 tests passed. 195 failed (0.0532122%) + GURMUKHI: 60706 out of 60747 tests passed. 41 failed (0.067493%) + KANNADA: 950680 out of 951913 tests passed. 1233 failed (0.129529%) + KHMER: 299074 out of 299124 tests passed. 50 failed (0.0167155%) + LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) + MALAYALAM: 1047983 out of 1048334 tests passed. 351 failed + (0.0334817%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271539 out of 271847 tests passed. 308 failed (0.113299%) + TAMIL: 1091753 out of 1091754 tests passed. 1 failed (9.15957e-05%) + TELUGU: 970555 out of 970573 tests passed. 18 failed (0.00185457%) + TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) + + src/hb-ot-layout-gsubgpos-private.hh | 35 + +++++++++++++++++++----------- + src/hb-ot-layout-private.hh | 6 +++-- + src/hb-ot-layout.cc | 10 +++++---- + src/hb-ot-map-private.hh | 12 ++++++---- + src/hb-ot-map.cc | 32 + +++++++++++++++++++++------ + src/hb-ot-shape-complex-arabic-fallback.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 29 +++++++++++++------------ + src/hb-ot-shape-complex-myanmar.cc | 4 ++-- + src/hb-ot-shape-complex-sea.cc | 4 ++-- + 9 files changed, 85 insertions(+), 49 deletions(-) + +commit 0b45479198d61d5135dad771e9c68408eb13f930 +Author: Behdad Esfahbod +Date: Thu Feb 14 10:46:52 2013 -0500 + + [OTLayout] Add fine-grained control over ZWJ matching + + Not used yet. Next commit... + + src/hb-ot-layout-gsubgpos-private.hh | 10 ++++++++-- + src/hb-ot-layout-private.hh | 11 +++++++++-- + 2 files changed, 17 insertions(+), 4 deletions(-) + +commit 607feb7cff0e50f8738d2e49ca463fc9d7d494de +Author: Behdad Esfahbod +Date: Thu Feb 14 07:43:13 2013 -0500 + + [OTLayout] Ignore default-ignorables when matching GSUB/GPOS + + When matching lookups, be smart about default-ignorable characters. + In particular: + + Do nothing specific about ZWNJ, but for the other default-ignorables: + + If the lookup in question uses the ignorable character in a sequence, + then match it as we used to do. However, if the sequence match will + fail because the default-ignorable blocked it, try skipping the + ignorable character and continue. + + The most immediate thing it means is that if Lam-Alef forms a + ligature, + then Lam-ZWJ-Alef will do to. Finally! + + One exception: when matching for GPOS, or for backtrack/lookahead of + GSUB, we ignore ZWNJ too. That's the right thing to do. + + It certainly is possible to build fonts that this feature will result + in undesirable glyphs, but it's hard to think of a real-world case + that that would happen. + + This *does* break Indic shaping right now, since Indic Unicode has + specific rules for what ZWJ/ZWNJ mean, and skipping ZWJ is breaking + those rules. That will be fixed in upcoming commits. + + src/hb-ot-layout-gpos-table.hh | 1 + + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 279 + ++++++++++++++++++++++++----------- + src/hb-ot-layout-private.hh | 45 ++++++ + src/hb-ot-shape-private.hh | 44 ------ + 5 files changed, 237 insertions(+), 134 deletions(-) + +commit ec5448667b30ad662401c2b4f5fc0da524c013fd +Author: Behdad Esfahbod +Date: Thu Feb 14 11:25:10 2013 -0500 + + Add hb_ot_map_feature_flags_t + + Code cleanup. No (intended) functional change. + + src/hb-ot-map-private.hh | 29 +++++++++++++++++--- + src/hb-ot-map.cc | 24 ++++++++--------- + src/hb-ot-shape-complex-arabic.cc | 4 +-- + src/hb-ot-shape-complex-indic.cc | 55 + +++++++++++++++++++------------------- + src/hb-ot-shape-complex-myanmar.cc | 4 +-- + src/hb-ot-shape-complex-sea.cc | 2 +- + src/hb-ot-shape.cc | 6 +++-- + 7 files changed, 74 insertions(+), 50 deletions(-) + +commit e7ffcfafb1108801ac504f18f820e497226bf07f +Author: Behdad Esfahbod +Date: Thu Feb 14 11:05:56 2013 -0500 + + Clean-up add_bool_feature + + src/hb-ot-map-private.hh | 4 ++-- + src/hb-ot-shape-complex-arabic.cc | 16 ++++++++-------- + src/hb-ot-shape-complex-default.cc | 2 +- + src/hb-ot-shape-complex-indic.cc | 8 ++++---- + src/hb-ot-shape-complex-myanmar.cc | 8 ++++---- + src/hb-ot-shape-complex-sea.cc | 8 ++++---- + src/hb-ot-shape.cc | 10 +++++----- + 7 files changed, 28 insertions(+), 28 deletions(-) + +commit e7562f53fe6a506d2c6d59d6688e4fa468bba462 +Author: Behdad Esfahbod +Date: Thu Feb 14 11:05:36 2013 -0500 + + Fix compile warnings for ragel-generated machines + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + src/hb-ot-shape-complex-myanmar-machine.rl | 2 +- + src/hb-ot-shape-complex-sea-machine.rl | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 4e51df73a337f7232a7dfa85df78a4f19b24771b +Author: Behdad Esfahbod +Date: Thu Feb 14 07:42:42 2013 -0500 + + [OTLayout] Remove unused function + + src/hb-ot-layout-gsubgpos-private.hh | 5 ----- + 1 file changed, 5 deletions(-) + +commit 8820bb235b1f63e4d93c8a2f5c08b44d89e06b78 +Author: Behdad Esfahbod +Date: Thu Feb 14 07:41:03 2013 -0500 + + [OTLayout] Port apply_lookup to skippy_iter + + src/hb-ot-layout-gsubgpos-private.hh | 50 + +++++++++++++++++++++++++----------- + 1 file changed, 35 insertions(+), 15 deletions(-) + +commit dfca269f069dae2f99990dac24da15d316eccb9f +Author: Behdad Esfahbod +Date: Thu Feb 14 07:20:52 2013 -0500 + + [OTLayout] Port ligate_input to skippy_iter + + src/hb-ot-layout-gsubgpos-private.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 7e53415c2d8859e8b5948a2edb38c39a8f78b825 +Author: Behdad Esfahbod +Date: Thu Feb 14 06:24:30 2013 -0500 + + [OTLayout] Minor fix for apply_lookup() + + Should NOT change behavior, since first glyph is a match. + + src/hb-ot-layout-gsubgpos-private.hh | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +commit 6880f7e19d44c50e45ecb86d26381aad956d9acb +Author: Behdad Esfahbod +Date: Wed Feb 13 12:17:25 2013 -0500 + + [OTLayout] Make table type known to apply context + + src/hb-ot-layout-gsubgpos-private.hh | 5 ++++- + src/hb-ot-layout.cc | 4 ++-- + src/hb-ot-shape-complex-arabic-fallback.hh | 2 +- + 3 files changed, 7 insertions(+), 4 deletions(-) + +commit 2c7d0b6b80d412de3fddd443ed1a485ea1cbb03c +Author: Behdad Esfahbod +Date: Wed Feb 13 12:10:08 2013 -0500 + + [OTLayou] Unbreak backtrack matching + + Was introduced by 28b9d502bb69a8045818d5f6113ded9c59a56bd7. + + src/hb-ot-layout-gsubgpos-private.hh | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit c074ebc466dcc9bcc0d8a5dd7e942dea974ff718 +Author: Behdad Esfahbod +Date: Wed Feb 13 11:22:42 2013 -0500 + + [OTLayout] Minor refactoring + + src/hb-ot-layout-gpos-table.hh | 9 ++++++--- + src/hb-ot-layout-gsubgpos-private.hh | 30 +++++++++++++++++------------- + 2 files changed, 23 insertions(+), 16 deletions(-) + +commit 407fc12466ef460d0edf11b89f0d04c4d724875f +Author: Behdad Esfahbod +Date: Wed Feb 13 11:13:06 2013 -0500 + + [OTLayout] Remove bogus caching of glyph property + + src/hb-ot-layout-gpos-table.hh | 21 ++++++++----------- + src/hb-ot-layout-gsub-table.hh | 7 +++---- + src/hb-ot-layout-gsubgpos-private.hh | 40 + ++++++++++++++---------------------- + 3 files changed, 26 insertions(+), 42 deletions(-) + +commit 6b1e3502e23c110dd810f854ba021f83baab1548 +Author: Behdad Esfahbod +Date: Wed Feb 13 11:02:54 2013 -0500 + + Remember ZWNJ + + To be used in upcoming changes. + + src/hb-ot-shape-private.hh | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit 1f91c39677f840a1f630696d16d083060069abf5 +Author: Behdad Esfahbod +Date: Wed Feb 13 09:38:40 2013 -0500 + + Indent + + src/hb-ot-shape-complex-indic.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit a0cb9f33ee064628debe8e848094dfd661334640 +Author: Behdad Esfahbod +Date: Wed Feb 13 09:26:55 2013 -0500 + + [Indic] Improve base finding in final_reordering + + Fixes 5 Malayalam failures! + + MALAYALAM: 1048016 out of 1048334 tests passed. 318 failed + (0.0303338%) + + src/hb-ot-shape-complex-indic.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 126f39cd16cea87b2696f66467c83a585bd4c2cf +Author: Behdad Esfahbod +Date: Wed Feb 13 08:29:21 2013 -0500 + + Add more dot-reph tests + + .../shaper-indic/indic/script-malayalam/misc/dot-reph.txt | + 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit f22b7e77783fa2f44365e0fe6413c4474c07048d +Author: Behdad Esfahbod +Date: Wed Feb 13 07:32:46 2013 -0500 + + [Indic] Track base position when reordering things + + Ouch, how did things ever work without this?! The added test that + has a + dot-reph as well as a pre-base reordering Ra perfectly demonstrates + the + bug (tested with Nirmala font from Win8 for example). Testing + suggests + that Win8 shaper has the *exact* same bug / behavior that we used to + have. Odd. + + src/hb-ot-shape-complex-indic.cc | + 6 ++++++ + .../in-tree/shaper-indic/indic/script-malayalam/misc/dot-reph.txt | 1 + + 2 files changed, 7 insertions(+) + +commit bc11de144c0a7a95fa0945aa7f053d8117af282a +Author: Behdad Esfahbod +Date: Wed Feb 13 05:59:06 2013 -0500 + + [SEA] Don't zero any mark advances + + Keep the logic simple, easier to explain to font developers. + + src/hb-ot-shape-complex-sea.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0291a6528685f1f593707655943fb2360579cb9e +Author: Behdad Esfahbod +Date: Wed Feb 13 05:57:24 2013 -0500 + + Further adjust mark advance zeroing + + This is a followup to 568000274c8edb5f41bc4f876ce21fcc8bdaeed8. + Looks like in the Latin shaper, Uniscribe zeroes all Unicode NSM + advances *after* GPOS, not before. Match that. + + Can be tested using DejaVu Sans Mono, since that font has GPOS + rules to zero the mark advances on its own. + + src/hb-ot-shape.cc | 33 +++++++++++++++++++++++---------- + 1 file changed, 23 insertions(+), 10 deletions(-) + +commit 85c51ec2e1d518019e32801ae38659c74fc20d80 +Author: Behdad Esfahbod +Date: Tue Feb 12 18:17:39 2013 -0500 + + [Indic] Fix Eyelash Ra with old Devanagari spec + + src/hb-ot-shape-complex-indic.cc | 32 ++++++++++++++++++++++++++++++++ + 1 file changed, 32 insertions(+) + +commit cc5f24cde079b451799562b3af7ce06d932cbe6b +Author: Behdad Esfahbod +Date: Tue Feb 12 18:17:12 2013 -0500 + + [tests] Add tests for Devanagary Eyelash Ra + + Currently broken with Sanskrit 2003 font. + + .../texts/in-tree/shaper-indic/indic/script-devanagari/misc/MANIFEST | + 1 + + .../in-tree/shaper-indic/indic/script-devanagari/misc/eyelash.txt | + 3 +++ + 2 files changed, 4 insertions(+) + +commit 63e48bc33b68f940c351af623a55a4cf650db102 +Author: Behdad Esfahbod +Date: Tue Feb 12 17:57:49 2013 -0500 + + [Indic] Apply 'blwf' before 'half' + + This reverts 167b625d988b74572d6b2f646c285b666b650d49. It didn't + matter before, but that's going to change with next commit. + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 70d656571194d2bd32671244530edbe159722cec +Author: Behdad Esfahbod +Date: Tue Feb 12 18:01:21 2013 -0500 + + [Indic] Apply 'vatu' before 'cjct' + + This essentially reverts 1d6846db9ebf84561bb30a4e48c6c43184914099, + but that commit is from way back when. We should be better + following the spec order now again. + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 64bb2ae857cfda35dd71c7f1e962722069674ec6 +Author: Behdad Esfahbod +Date: Tue Feb 12 16:29:25 2013 -0500 + + Didn't mean to push this out + + Ouch! + + test/shaping/hb_test_tools.py | 1 - + 1 file changed, 1 deletion(-) + +commit f9b660534c269d2257d6b5e8ec2173ee71668f2f +Author: Behdad Esfahbod +Date: Tue Feb 12 16:13:56 2013 -0500 + + [Myanmar] Use master Indic table for syllable data + + src/hb-ot-shape-complex-myanmar.cc | 144 + +++++++++---------------------------- + test/shaping/hb_test_tools.py | 1 + + 2 files changed, 35 insertions(+), 110 deletions(-) + +commit f60793e854393c32337a483c5d1700bf17d767fd +Author: Behdad Esfahbod +Date: Tue Feb 12 15:45:59 2013 -0500 + + [tests] Add Cham sample + + test/shaping/texts/in-tree/shaper-sea/script-cham/misc/misc.txt | 1 + + 1 file changed, 1 insertion(+) + +commit e2aab4b5db88c368c11cee81368b9ad41399e585 +Author: Behdad Esfahbod +Date: Tue Feb 12 15:35:32 2013 -0500 + + Improve checks for setmode() + + As reported by Jonathan, OS X has setmode() that is something other + than what setmode() is on Win32. So, limit invocation to Windows + platforms only. + + configure.ac | 4 ++-- + util/options.cc | 4 ++-- + util/options.hh | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +commit a6c1e040e594faeefd61b456ef995c7886cdea78 +Author: Behdad Esfahbod +Date: Tue Feb 12 15:31:58 2013 -0500 + + Improve check for Windows platforms + + Instead of checking for compiler, check for platform. + + src/hb-atomic-private.hh | 2 +- + src/hb-mutex-private.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 9e1f80ab3eea4a74cdaa6a390e4925a479ece1c5 +Author: Behdad Esfahbod +Date: Tue Feb 12 15:28:21 2013 -0500 + + [SEA] Treat Consonant_Final like Consonant_Medial + + src/hb-ot-shape-complex-indic-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bab02d339f39ed5168daaef9461227f78e596a2f +Author: Behdad Esfahbod +Date: Tue Feb 12 15:26:45 2013 -0500 + + Rename HB_OT_INDIC_OPTIONS env var to HB_OPTIONS + + The Myanmar shaper now respects the uniscribe-bug-compatibility + option too. + + src/hb-common.cc | 20 ++++++++++++-- + src/hb-ot-shape-complex-indic.cc | 53 + ++++---------------------------------- + src/hb-ot-shape-complex-myanmar.cc | 7 ++--- + src/hb-private.hh | 29 +++++++++++++++++++++ + 4 files changed, 54 insertions(+), 55 deletions(-) + +commit 3a83d33ec0b1be6f5992816ff5ebb0f43c8dff00 +Author: Behdad Esfahbod +Date: Tue Feb 12 12:14:10 2013 -0500 + + Add South-East Asian shaper + + Handles Tai Tham, Cham, and New Tai Lue for now. + + src/Makefile.am | 12 +- + src/gen-indic-table.py | 9 +- + src/hb-ot-shape-complex-indic-private.hh | 241 +------------ + ...table.hh => hb-ot-shape-complex-indic-table.cc} | 9 +- + src/hb-ot-shape-complex-indic.cc | 239 ++++++++++++ + src/hb-ot-shape-complex-myanmar.cc | 2 +- + src/hb-ot-shape-complex-private.hh | 28 +- + src/hb-ot-shape-complex-sea-machine.rl | 102 ++++++ + src/hb-ot-shape-complex-sea.cc | 400 + +++++++++++++++++++++ + test/shaping/texts/in-tree/MANIFEST | 1 + + .../in-tree/shaper-indic/south-east-asian/MANIFEST | 1 - + test/shaping/texts/in-tree/shaper-myanmar/MANIFEST | 1 + + test/shaping/texts/in-tree/shaper-sea/MANIFEST | 3 + + .../script-cham}/MANIFEST | 0 + .../script-cham}/misc/MANIFEST | 0 + .../in-tree/shaper-sea/script-cham/misc/misc.txt | 1 + + .../in-tree/shaper-sea/script-new-tai-lue/MANIFEST | 1 + + .../shaper-sea/script-new-tai-lue/misc/MANIFEST | 1 + + .../script-new-tai-lue/misc/misc.txt | 0 + .../in-tree/shaper-sea/script-tai-tham/MANIFEST | 1 + + .../shaper-sea/script-tai-tham/misc/MANIFEST | 1 + + .../shaper-sea/script-tai-tham/misc/misc.txt | 2 + + 22 files changed, 792 insertions(+), 263 deletions(-) + +commit fb960212063016656dfaba83f072c81d1efc3202 +Author: Behdad Esfahbod +Date: Tue Feb 12 10:33:58 2013 -0500 + + Minor test reshufflings + + test/shaping/texts/in-tree/MANIFEST + | 1 + + .../{shaper-indic/south-asian/script-tibetan => script-default}/MANIFEST + | 0 + .../south-asian/script-tibetan => script-default}/misc/MANIFEST + | 0 + .../south-asian/script-tibetan => script-default}/misc/misc.txt + | 0 + test/shaping/texts/in-tree/shaper-indic/MANIFEST + | 1 - + test/shaping/texts/in-tree/shaper-indic/south-asian/MANIFEST + | 1 - + test/shaping/texts/in-tree/shaper-indic/south-east-asian/MANIFEST + | 1 - + .../texts/in-tree/shaper-indic/south-east-asian/script-thai/MANIFEST + | 1 - + .../in-tree/shaper-indic/south-east-asian/script-thai/misc/MANIFEST + | 0 + 9 files changed, 1 insertion(+), 4 deletions(-) + +commit 5676d5d52784e16068ae483103d59111a8081854 +Author: Behdad Esfahbod +Date: Tue Feb 12 10:31:14 2013 -0500 + + [Indic] Make sure New Tai Lue works! + + src/hb-ot-shape-complex-private.hh | 12 + ++++++++---- + .../texts/in-tree/shaper-indic/south-east-asian/MANIFEST | 1 + + .../south-east-asian/script-new-tai-lue/MANIFEST | 1 + + .../south-east-asian/script-new-tai-lue/misc/MANIFEST | 1 + + .../south-east-asian/script-new-tai-lue/misc/misc.txt | 1 + + 5 files changed, 12 insertions(+), 4 deletions(-) + +commit 568000274c8edb5f41bc4f876ce21fcc8bdaeed8 +Author: Behdad Esfahbod +Date: Tue Feb 12 09:44:57 2013 -0500 + + Adjust mark advance-width zeroing logic for Myanmar + + Before, we were zeroing advance width of attached marks for + non-Indic scripts, and not doing it for Indic. + + We have now three different behaviors, which seem to better + reflect what Uniscribe is doing: + + - For Indic, no explicit zeroing happens whatsoever, which + is the same as before, + + - For Myanmar, zero advance width of glyphs marked as marks + *in GDEF*, and do that *before* applying GPOS. This seems + to be what the new Win8 Myanmar shaper does, + + - For everything else, zero advance width of glyphs that are + from General_Category=Mn Unicode characters, and do so + before applying GPOS. This seems to be what Uniscribe does + for Latin at least. + + With these changes, positioning of all tests matches for Myanmar, + except for the glitch in Uniscribe not applying 'mark'. See preivous + commit. + + src/hb-ot-layout-gpos-table.hh | 12 ++++-------- + src/hb-ot-layout-private.hh | 3 +-- + src/hb-ot-layout.cc | 4 ++-- + src/hb-ot-shape-complex-arabic.cc | 2 +- + src/hb-ot-shape-complex-default.cc | 2 +- + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape-complex-myanmar.cc | 2 +- + src/hb-ot-shape-complex-private.hh | 9 ++++++++- + src/hb-ot-shape-complex-thai.cc | 2 +- + src/hb-ot-shape.cc | 31 +++++++++++++++++++++++++++++-- + 10 files changed, 49 insertions(+), 20 deletions(-) + +commit 99749ca8e0c4c8dbea4620f07c4d0e6d1515cc65 +Author: Behdad Esfahbod +Date: Tue Feb 12 09:44:35 2013 -0500 + + [Myanmar] Add note re Uniscribe NOT applying 'mark' + + src/hb-ot-shape-complex-myanmar.cc | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +commit b8427801381180da9611b2e3e0f0b3514274de81 +Author: Behdad Esfahbod +Date: Mon Feb 11 17:02:17 2013 -0500 + + Minor + + src/hb-atomic-private.hh | 2 +- + src/hb-mutex-private.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 419c933ed1b5d97c7561546536ef5810a7b0ebd0 +Author: Behdad Esfahbod +Date: Mon Feb 11 16:16:16 2013 -0500 + + [Myanmar] Fix handling of Punctuation and Symbol types + + Testing with "clusters" now on par with testing without them. 15 + failures both. + + src/hb-ot-shape-complex-myanmar.cc | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit 0572c1410a9cb0ac5dd5dc84a8034698cc5c4892 +Author: Behdad Esfahbod +Date: Mon Feb 11 16:06:02 2013 -0500 + + [Myanmar] Fixup handling of joiners and GB characters + + src/hb-ot-shape-complex-myanmar-machine.rl | 6 ++---- + src/hb-ot-shape-complex-myanmar.cc | 19 +++++++++++++++++-- + 2 files changed, 19 insertions(+), 6 deletions(-) + +commit 1c8654ead41ca746d577549c92d2a41c594ab639 +Author: Behdad Esfahbod +Date: Mon Feb 11 14:27:02 2013 -0500 + + [Myanmar] Prevent reordering between Asat and Dot below + + Implemented as a hack for now. Myanmar failures down from 23 to 15. + + MYANMAR: 1123868 out of 1123883 tests passed. 15 failed (0.00133466%) + + The remaining 15 cases are all where the syllable is wrong according + to + the OpenType spec. We insert dottedcircle. Uniscribe fails to + do that, + but it also fails to reorder the prebase-reordering medial-Ra. So it + gets it wrong. + + src/hb-unicode-private.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit bed687f886b8def06642ad986648e9149a935add +Author: Behdad Esfahbod +Date: Mon Feb 11 14:24:03 2013 -0500 + + Shuffle test data around + + test/shaping/texts/in-tree/MANIFEST + | 1 + + test/shaping/texts/in-tree/shaper-indic/south-east-asian/MANIFEST + | 1 - + .../in-tree/shaper-indic/south-east-asian/script-thai/misc/MANIFEST + | 1 - + .../south-east-asian => shaper-myanmar}/script-myanmar/MANIFEST + | 0 + .../south-east-asian => shaper-myanmar}/script-myanmar/misc/MANIFEST + | 0 + .../south-east-asian => shaper-myanmar}/script-myanmar/misc/misc.txt + | 0 + .../south-east-asian => shaper-myanmar}/script-myanmar/misc/utn11.txt + | 0 + test/shaping/texts/in-tree/shaper-thai/script-thai/misc/MANIFEST + | 1 + + .../south-east-asian => shaper-thai}/script-thai/misc/misc.txt + | 0 + 9 files changed, 2 insertions(+), 2 deletions(-) + +commit 98628cac9f733f2674d6409954cddb7d0634c233 +Author: Behdad Esfahbod +Date: Mon Feb 11 13:36:23 2013 -0500 + + Add Win8-style Myanmar shaper + + Myanmar failures down from 51% to 0.00204648%! + + MYANMAR: 1123860 out of 1123883 tests passed. 23 failed (0.00204648%) + + src/Makefile.am | 14 +- + src/hb-ot-shape-complex-indic.cc | 2 - + src/hb-ot-shape-complex-myanmar-machine.rl | 127 ++++++ + src/hb-ot-shape-complex-myanmar.cc | 599 + +++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-private.hh | 5 +- + 5 files changed, 740 insertions(+), 7 deletions(-) + +commit 1df56449586bd32275a6fa69dcadd5fb77a84f82 +Author: Behdad Esfahbod +Date: Mon Feb 11 14:17:54 2013 -0500 + + Minor + + src/hb-ot-shape-complex-indic.cc | 3 --- + 1 file changed, 3 deletions(-) + +commit 54f7b4d9ec13f8454aa298534da318c023fa3c63 +Author: Behdad Esfahbod +Date: Mon Feb 11 13:27:17 2013 -0500 + + [OTLayout] Respect lookup-flags skipping over non-mark glyphs + + Before, when matching ligatures, we never skipping over base / liga + glyphs even if that was what the LookupFlags asked for. + + Fixed now. We carefully reviewed all instances of this, and + tested with + Amiri as well as some Indic scripts, and are confident that this + should + NOT break anyone's fonts. It's also how Uniscribe does it, from what + we can tell. + + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 25 ++++++++++--------------- + 2 files changed, 11 insertions(+), 16 deletions(-) + +commit 9082efc4aacb34de8574d6a4a3c037987df58bd8 +Author: Behdad Esfahbod +Date: Mon Feb 11 13:14:15 2013 -0500 + + [OTLayout] s/mark_skipping/skipping/ + + In aticipation of upcoming changes. + + src/hb-ot-layout-gpos-table.hh | 12 ++++++------ + src/hb-ot-layout-gsubgpos-private.hh | 28 ++++++++++++++-------------- + 2 files changed, 20 insertions(+), 20 deletions(-) + +commit 9621e0ba294c9cc6d458bbf632e63e92fda71e10 +Author: Behdad Esfahbod +Date: Mon Feb 11 06:58:27 2013 -0500 + + [Indic] Fix bug introduced in 8b217f5ac54aa0dcbba2dd6d59aa89dde33e56c2 + + Was breaking reph formation logic when the Ra is the only consonant. + Devanagari regression fixed. Down to 57 failures again. Ouch. + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6e74c64211b6aaac48bae8c87f9420d8dc03fd93 +Author: Behdad Esfahbod +Date: Mon Feb 11 06:50:17 2013 -0500 + + Improve normalization heuristic + + Before, for most scripts, we were not trying to recompose two + characters + if the second one had ccc=0. That fails for Myanmar where U+1026 + decomposes to U+1025,U+102E, both of which have ccc=0. However, we do + want to try to recompose those. We now check whether the second is a + mark, using general category instead. + + At the same time, remove optimization that was conflicting with this. + + [Let the Ngapi hackfest begin!] + + src/hb-ot-shape-normalize.cc | 39 +++++++++++++-------------------------- + 1 file changed, 13 insertions(+), 26 deletions(-) + +commit 614242efb043f2ed78916377138d456279a20a54 +Author: Behdad Esfahbod +Date: Wed Feb 6 23:45:27 2013 -0500 + + Revert "Include config.h.in in tree" + + This reverts commit 01013a0f5c58d5d54a37e5b4d6692e0bbd4baf80. + + Conflicts: + config.h.in + + Same argument as previous commit. + + Makefile.am | 1 + + config.h.in | 153 + ------------------------------------------------------------ + 2 files changed, 1 insertion(+), 153 deletions(-) + +commit adff3778155facb7b149ce66ab7d573368e048de +Author: Behdad Esfahbod +Date: Wed Feb 6 23:43:27 2013 -0500 + + Revert "[Indic] Import ragel-generated Indic machine in git" + + This reverts commit fab7a71f110ed646745d54b23284537c50058c21. + + Conflicts: + src/hb-ot-shape-complex-indic-machine.hh + + Keeping that generated file in-tree causes problems with processes + like + tinderbox that automatically fetch and build harfbuzz. It's harder + to + bootstrap harfbuzz now (as was previously), but I'm willing to + give this + another chance and see how it goes. + + autogen.sh | 6 + + src/Makefile.am | 1 + + src/hb-ot-shape-complex-indic-machine.hh | 1443 + ------------------------------ + 3 files changed, 7 insertions(+), 1443 deletions(-) + +commit 5898fa94d12b19686f649104bd6efe8daa1ba0c9 +Author: Behdad Esfahbod +Date: Wed Feb 6 15:29:07 2013 -0500 + + Don't use $(ENV) + + As reported by Peter Breitenlohner: + + I think this is a very bad idea because ENV is used to specify + a startup + file to be read by some/all shells. + + test/api/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 52d66c26a2102bd1a49463b8e8f04612598f8ac1 +Author: Behdad Esfahbod +Date: Mon Feb 4 23:31:24 2013 -0500 + + Add color-tests automake option + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9de5f98f363d96f308adc33f1c2286e5c33117de +Author: Behdad Esfahbod +Date: Mon Feb 4 23:28:22 2013 -0500 + + Bug 60035 - intermittent make install failure on hb-version.h + + src/Makefile.am | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit 6c1e8b614cfd6ed016fba6bf20af1e422e79eb71 +Author: Behdad Esfahbod +Date: Mon Feb 4 23:24:16 2013 -0500 + + Bug 59637 - check-exported-symbols.sh & check-internal-symbols.sh + fail on mips/mipsel + + src/check-symbols.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bafdf3d983dcc277d6e7e322277c0bb25b41a173 +Author: Behdad Esfahbod +Date: Mon Feb 4 23:06:50 2013 -0500 + + Merge check-internal-symbols.sh and check-exported-symbols.sh + + src/Makefile.am | 3 +- + src/check-internal-symbols.sh | 34 + ---------------------- + ...{check-exported-symbols.sh => check-symbols.sh} | 16 ++++++++-- + 3 files changed, 14 insertions(+), 39 deletions(-) + +commit ceeae30f47b9d628484ae398bc38f3f60ee8eab4 +Author: Behdad Esfahbod +Date: Thu Jan 31 19:27:36 2013 -0500 + + Really fix setmode this time + + Thanks to Khaled for spotting it. + + util/options.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7cba8a673b4b436a737fc4ffe85dc84ddd2bf41f +Author: Behdad Esfahbod +Date: Thu Jan 31 18:37:10 2013 -0500 + + Fixup previous commit + + Now, it looks like this breaks Cygwin again. Have to figure out + what's + going on. + + util/options.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit bc76449f51f20491a4540b4f240f5a3e0dcb20fe +Author: Behdad Esfahbod +Date: Thu Jan 31 18:18:05 2013 -0500 + + Use setmode() instead of _setmode() + + Looks like Cygwin / MSVC declare it that way, and it still works on + MinGW32 cross. + + config.h.in | 6 +++--- + configure.ac | 2 +- + util/options.cc | 2 +- + util/options.hh | 2 +- + 4 files changed, 6 insertions(+), 6 deletions(-) + +commit e9171af55cc6a402eb20db4ea74c86a0b1e70e85 +Author: Behdad Esfahbod +Date: Tue Jan 29 22:45:00 2013 -0500 + + Bug 60053 - hb-common.cc:181:6: warning: ‘void free_langs()’ + defined but not used + + src/hb-common.cc | 2 +- + src/hb-ft.cc | 2 +- + src/hb-shape.cc | 2 +- + src/hb-shaper.cc | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit 09b5393874e56fcfd63a92d28e6c1c2ddeee0942 +Author: Behdad Esfahbod +Date: Fri Jan 18 17:10:47 2013 -0600 + + 0.9.12 + + NEWS | 7 +++++++ + configure.ac | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) + +commit eb45c0a2fbaeeb34e77a2935934e8d1302728ec8 +Author: Behdad Esfahbod +Date: Wed Jan 16 22:07:50 2013 -0600 + + Minor + + src/hb-ot-layout.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 52c8d1226f3509276b11a1fadbd29e5363c0ecd7 +Author: Behdad Esfahbod +Date: Mon Jan 14 13:51:46 2013 -0600 + + Minor + + src/hb-blob.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f88d3bd7e407d332bb04688344c54756d24128c9 +Author: Behdad Esfahbod +Date: Mon Jan 14 00:33:58 2013 -0600 + + Fix build with Sun compiler + + src/hb-blob.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 08b29c08094097f1c23ec53b10084bc390cea833 +Author: Behdad Esfahbod +Date: Mon Jan 14 00:32:12 2013 -0600 + + Revert "Minor" + + This reverts commit 0a492357016bc9a614d2a726f2006c10af68ca58. + + Enables code on more compilers. + + src/hb-warning.cc | 33 ++++++++++++++++++++++++++++++--- + 1 file changed, 30 insertions(+), 3 deletions(-) + +commit e78463211e7d85f237bd55afab7e8e5dae42346c +Author: Behdad Esfahbod +Date: Mon Jan 14 00:27:21 2013 -0600 + + Fix linking with non-gcc compilers + + configure.ac | 2 ++ + src/Makefile.am | 6 +++++- + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit de649f07f1f8fdeb998a0b049759f4f7363e25d2 +Author: Behdad Esfahbod +Date: Mon Jan 14 00:26:43 2013 -0600 + + Fix residuals from fontconfig changes + + src/hb-atomic-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit cf81fb3624466b9df2250b58b27a92187c5b5b5c +Author: Behdad Esfahbod +Date: Thu Jan 10 09:06:34 2013 -0600 + + 0.9.11 + + NEWS | 14 ++++++++++++++ + configure.ac | 2 +- + 2 files changed, 15 insertions(+), 1 deletion(-) + +commit 2dcb333f52492018816f0d5d67a47634a612e49c +Author: Behdad Esfahbod +Date: Thu Jan 10 01:17:59 2013 -0600 + + Add atomic ops for Solaris + + Based on fontconfig patch from Raimund Steger. + + config.h.in | 5 ++++- + configure.ac | 27 +++++++++++++++++++++++++-- + src/hb-atomic-private.hh | 12 ++++++++++++ + 3 files changed, 41 insertions(+), 3 deletions(-) + +commit 69fd6e157c7ec83a5d5d8731fc14675ce4509b09 +Author: Behdad Esfahbod +Date: Thu Jan 10 00:03:36 2013 -0600 + + Fix crasher during multi-thread shaper data creation + + Sample crash: + + 0 _hb_graphite2_shaper_face_data_destroy (data=0xffffffffffffffff) + at ../../src/hb-graphite2.cc:129 + 1 0x00007ffff4271d7d in hb_graphite2_shaper_face_data_ensure ( + face=) at ../../src/hb-shaper-list.hh:35 + 2 hb_shape_plan_plan (shaper_list=, + num_user_features=0, + user_features=0x0, shape_plan=0xf7b490) at + ../../src/hb-shaper-list.hh:35 + 3 hb_shape_plan_create (face=, props=, + user_features=0x0, num_user_features=0, shaper_list=) + at ../../src/hb-shape-plan.cc:108 + 4 0x00007ffff4272c93 in hb_shape_plan_create_cached (face=0x10cf2b0, + props=0x11980d8, user_features=0x0, num_user_features=, + shaper_list=0x0) at ../../src/hb-shape-plan.cc:283 + + src/hb-shaper-private.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit ecd454b3cd75050e0c95e1d2aa55744559338ec8 +Author: Behdad Esfahbod +Date: Tue Jan 8 18:09:46 2013 -0600 + + [Indic] In old-spec shaping, don't move viramas around if seq ends + with one + + For example: u0c9a u0ccd u0c9a u0ccd with Lohit. See: + + https://bugs.freedesktop.org/show_bug.cgi?id=59118 + + src/hb-ot-shape-complex-indic.cc | + 7 ++++--- + .../texts/in-tree/shaper-indic/indic/script-kannada/misc/misc.txt | 1 + + 2 files changed, 5 insertions(+), 3 deletions(-) + +commit e95e031b5682809488cc965883e15404cb9cfb6a +Author: Behdad Esfahbod +Date: Tue Jan 8 16:15:46 2013 -0600 + + [GPOS] If an Anchor offset is NULL, return false + + If in a MarkPos table, a base has no anchor for a particular mark + class, + return NULL such that the subsequent subtables get a chance at it. + + Test case: + hb-shape ./EBGaramond12-Regular.otf ἂ --features="ss20","smcp" + + src/hb-open-type-private.hh | 14 ++++++++++++-- + src/hb-ot-layout-gpos-table.hh | 10 ++++++++-- + 2 files changed, 20 insertions(+), 4 deletions(-) + +commit e5dbf39900fa63051f64cc447a6742665cbee339 +Author: Behdad Esfahbod +Date: Mon Jan 7 17:34:24 2013 -0600 + + Bug 58638 - Building fails with ICU due to not passing required flags + + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +commit 1172dc736280566426eb6dade1a886b2a0ca9aa4 +Author: Behdad Esfahbod +Date: Mon Jan 7 16:46:37 2013 -0600 + + Rename hb_buffer_clear() to hb_buffer_clear_contents() + + The previous name was clashing with harfbuzz.old. There are systems + that need to link both... + + Clash-free now again. + + src/hb-buffer.cc | 2 +- + src/hb-buffer.h | 2 +- + test/api/test-buffer.c | 2 +- + util/options.hh | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit 7b912c1936c3e8a7df27a30782ca127d0a83822d +Author: Behdad Esfahbod +Date: Fri Jan 4 01:25:27 2013 -0600 + + Remove a few unnecessary const's + + Apparently helps with MSVC compilation. + + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 34e6c3e3e452bdf6f93df565a70453a6e74d4c6e +Author: Behdad Esfahbod +Date: Thu Jan 3 00:14:24 2013 -0600 + + 0.9.10 + + NEWS | 24 ++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 25 insertions(+), 1 deletion(-) + +commit f0c82410dbe800cb6429ba4aa7cfd9f5a11cc70c +Author: Behdad Esfahbod +Date: Thu Jan 3 00:07:16 2013 -0600 + + [OTLayout] Always collect default language system in collect_lookups + + Not sure if this is the most desired behavior. It's the most easily + defined though. + + src/hb-ot-layout.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 15e9e4e1ddaad655988144e7a56a765e8adf8782 +Author: Behdad Esfahbod +Date: Thu Jan 3 00:04:40 2013 -0600 + + [OTLayout] Fix feature iteration in collect_lookups + + Previous logic was just wrong. + + src/hb-ot-layout.cc | 46 ++++++++++++++++++++++++++++++++-------------- + 1 file changed, 32 insertions(+), 14 deletions(-) + +commit 733e8c0d7bf0765884f2cc953c8edcd7ab7fb49b +Author: Behdad Esfahbod +Date: Thu Jan 3 00:00:23 2013 -0600 + + [OTLayout] Whitespace + + src/hb-ot-layout.cc | 82 + ++++++++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 68 insertions(+), 14 deletions(-) + +commit d37ae38047bee12639741af9bb083b857fab950d +Author: Behdad Esfahbod +Date: Wed Jan 2 23:57:36 2013 -0600 + + [OTLayout] Handle required_feature_index in collect_lookups + + src/hb-ot-layout.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 11fba79ee9383eb995ddf7eb924dd64c67e2df63 +Author: Behdad Esfahbod +Date: Wed Jan 2 23:36:37 2013 -0600 + + [OTLayout] Fix various introspection issues with ClassDef's + + As reported by Jonathan Kew. + + src/hb-ot-layout-gsubgpos-private.hh | 19 +++++++++++++++---- + 1 file changed, 15 insertions(+), 4 deletions(-) + +commit e81aff9ef785be28751aab1fcd484af550656181 +Author: Behdad Esfahbod +Date: Wed Jan 2 23:22:54 2013 -0600 + + [tests] Finish test-set.c + + All passing now. + + test/api/test-set.c | 373 + +++++++++++++++++++++------------------------------- + 1 file changed, 149 insertions(+), 224 deletions(-) + +commit 7b1b720a8da69b68b775ce17104a40d55401b7ef +Author: Behdad Esfahbod +Date: Wed Jan 2 23:02:59 2013 -0600 + + Protect sets in-error from further modication + + Fixes test-set.c + + src/hb-set-private.hh | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit 8165f2765b93e99577ecc79b7956ae38c614bc78 +Author: Behdad Esfahbod +Date: Wed Jan 2 22:50:36 2013 -0600 + + [tests] Start adding tests for hb-set.h + + Fails now. Fixing. + + TODO | 2 - + src/hb-set-private.hh | 6 + + src/hb-set.cc | 9 +- + src/hb-set.h | 3 + + test/api/Makefile.am | 1 + + test/api/test-set.c | 312 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + 6 files changed, 330 insertions(+), 3 deletions(-) + +commit b9d28f696c433b94c5ffbad8d7c87cf3acff4056 +Author: Behdad Esfahbod +Date: Wed Jan 2 22:49:58 2013 -0600 + + [tests] Add set object to test-object.c + + test/api/test-object.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit 11d2956553f0d4a0086166a04ffc352fcfacf56e +Author: Behdad Esfahbod +Date: Wed Jan 2 17:41:27 2013 -0600 + + Minor + + src/hb-atomic-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 596740db04e7c1dadae0d8be6e401089fcaffc2d +Author: Behdad Esfahbod +Date: Fri Dec 21 19:41:04 2012 -0500 + + [Indic] Insert dottedcircle after a lone Malayalam dot-reph + + src/hb-ot-shape-complex-indic-machine.hh | 1617 + ++++++++++++++++-------------- + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + src/hb-ot-shape-complex-indic.cc | 13 +- + 3 files changed, 881 insertions(+), 751 deletions(-) + +commit 3cdce6497b2b9aeb2841bf077daa9dd9b196429d +Author: Behdad Esfahbod +Date: Fri Dec 21 16:54:22 2012 -0500 + + Remove TODO that I don't intend to fix + + TODO | 1 - + 1 file changed, 1 deletion(-) + +commit 6f69fa283e0a488da811df78bc83c41ed248b688 +Author: Behdad Esfahbod +Date: Fri Dec 21 16:51:15 2012 -0500 + + Minor + + src/hb-shape.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f4abcbfc628718bb276363746440df06e7658f6e +Author: Behdad Esfahbod +Date: Fri Dec 21 16:48:51 2012 -0500 + + Minor + + src/hb-buffer.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4a765f092d71bb4adeb468c004987a9121d39db5 +Author: Behdad Esfahbod +Date: Fri Dec 21 16:48:47 2012 -0500 + + Minor + + util/hb-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9815a88111072aa51e78e258c5f660993b47d4df +Author: Behdad Esfahbod +Date: Fri Dec 21 16:46:53 2012 -0500 + + [util] List supported output formats in --help output + + util/hb-shape.cc | 6 +++--- + util/helper-cairo.cc | 2 +- + util/helper-cairo.hh | 1 + + util/options.cc | 9 ++++++++- + util/options.hh | 5 ++++- + util/view-cairo.hh | 2 +- + 6 files changed, 18 insertions(+), 7 deletions(-) + +commit f95a87b7b813f588c7910ad4785ee68bb452e864 +Author: Behdad Esfahbod +Date: Fri Dec 21 16:35:28 2012 -0500 + + [util] List supported output formats in hb-view + + TODO | 1 - + util/helper-cairo.cc | 30 +++++++++++++++++++++++++++++- + 2 files changed, 29 insertions(+), 2 deletions(-) + +commit 6bad092aa87bc3e6bbf0b9faf07693e6ebbe55f2 +Author: Behdad Esfahbod +Date: Fri Dec 21 16:01:52 2012 -0500 + + [util] Default to "text" output format in hb-shape + + If you say: + + hb-shape font.ttf text --output-file out.txt + + This was previously failing: + + Unknown output format `txt'; supported formats are: TEXT / JSON + + Now we simply fallback to TEXT if no explicit format was requested. + + util/hb-shape.cc | 11 ++++++++--- + util/options.hh | 5 +++++ + 2 files changed, 13 insertions(+), 3 deletions(-) + +commit 8b217f5ac54aa0dcbba2dd6d59aa89dde33e56c2 +Author: Behdad Esfahbod +Date: Fri Dec 21 15:48:32 2012 -0500 + + [Indic] Reorder Malayalam dot-reph to after base + + Test sequence is simple: U+0D4E,U+0D15. The doth-reph should be + reordered to after the Ka. + + https://bugzilla.redhat.com/show_bug.cgi?id=799565 + + src/hb-ot-shape-complex-indic.cc | 13 + ++++++++++--- + .../shaper-indic/indic/script-malayalam/misc/MANIFEST | 1 + + .../shaper-indic/indic/script-malayalam/misc/dot-reph.txt | 1 + + 3 files changed, 12 insertions(+), 3 deletions(-) + +commit 742c4ee97e1311e000ebcdf9f33361c4dc6400a4 +Author: Behdad Esfahbod +Date: Fri Dec 21 15:35:03 2012 -0500 + + Minor + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 94afeb6ebe27534fc80d7173cc6f67375c3aaca6 +Author: Behdad Esfahbod +Date: Fri Dec 21 11:54:50 2012 -0500 + + Add Android.mk + + Android.mk | 74 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + Makefile.am | 1 + + 2 files changed, 75 insertions(+) + +commit d16ddbcbbee39b07a028776995c635119fe3cd98 +Author: Behdad Esfahbod +Date: Thu Dec 20 01:02:36 2012 -0500 + + Add build confirmation notice to configure + + configure.ac | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + +commit e24d8dab749a1a796e7484e18572da5f7a733bd4 +Author: Behdad Esfahbod +Date: Wed Dec 19 15:23:02 2012 -0500 + + [TODO] Remove done items + + TODO | 7 ------- + 1 file changed, 7 deletions(-) + +commit 044d38527664d933c18c751c38fcf6fb4b5f888e +Author: Behdad Esfahbod +Date: Wed Dec 19 13:00:16 2012 -0500 + + Bug 58498 - Tests fail with gold linker on ARM + + src/check-exported-symbols.sh | 2 +- + src/check-internal-symbols.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit b68b86daf1a8478b86aeae44a8c39a606ed873cb +Author: Behdad Esfahbod +Date: Tue Dec 18 20:39:40 2012 -0500 + + Use C++ linker if ICU is disabled + + Bug 54948 - Undefined symbols: "operator delete(void*)" "operator + new(unsigned long)" "___cxa_pure_virtual" + + src/Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 1ffd23cb47a61465d52a7aeebb9c1b676e7c9a7e +Author: Behdad Esfahbod +Date: Mon Dec 17 23:29:15 2012 -0500 + + [OTLayout] Limit alternate-location FeatureParams to 'size' feature + + src/hb-ot-layout-common-private.hh | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit efe252e6000558f78075adadb2a3dba25ab67c04 +Author: Behdad Esfahbod +Date: Mon Dec 17 23:21:05 2012 -0500 + + [OTLayout] Fix 'size' featureParams implementation + + Looks at alternate location now. + + src/hb-ot-layout-common-private.hh | 133 + ++++++++++++++++++++++++++++--------- + src/hb-ot-layout.cc | 93 ++++---------------------- + 2 files changed, 117 insertions(+), 109 deletions(-) + +commit e77b4425746ac9eb407ca4e742d962f1955971b4 +Author: Behdad Esfahbod +Date: Mon Dec 17 18:42:59 2012 -0500 + + [OTLayout] Fix tracing + + src/hb-open-type-private.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 9b54562d63f1a9e0e5b33d71c32bd1588759ebf1 +Author: Behdad Esfahbod +Date: Mon Dec 17 13:55:36 2012 -0500 + + [OTLayout] Towards correct FeatureParams handling + + src/hb-open-type-private.hh | 8 +++++++- + src/hb-ot-layout-common-private.hh | 25 +++++++++++++++++++++++-- + 2 files changed, 30 insertions(+), 3 deletions(-) + +commit 87e43b7f2be25840748f920ca33ff553833da45f +Author: Behdad Esfahbod +Date: Fri Dec 14 17:48:23 2012 -0500 + + [OTLayout] Wire tag and list start all the way to Feature + + To fix FeatureParam issues. No actual fix yet, just plumbing. + + src/hb-ot-layout-common-private.hh | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +commit 85bc44b90a19c6a669ed567a9cd8513448600afe +Author: Behdad Esfahbod +Date: Wed Dec 12 11:38:49 2012 -0500 + + [OTLayout] More 'size' feature sanity checking + + We still don't look for the old incorrect place of the featureParams. + I'll wait till someone actually complains about it... + + src/hb-ot-layout.cc | 99 + ++++++++++++++++++++++++++++++++++++++++++----------- + 1 file changed, 79 insertions(+), 20 deletions(-) + +commit 0bae50a36f3022f9bb6b2c001c191eeaaa4ef954 +Author: Behdad Esfahbod +Date: Tue Dec 11 16:01:31 2012 -0500 + + [OTLayout] Add FeatureParamsCharacterVariants struct + + No API yet. + + src/hb-ot-layout-common-private.hh | 52 + +++++++++++++++++++++++++++++++++++--- + 1 file changed, 49 insertions(+), 3 deletions(-) + +commit bd61bc13ea8ff350ada5449b2cfeb612e66ecafa +Author: Behdad Esfahbod +Date: Tue Dec 11 16:00:43 2012 -0500 + + [OTLayout] Add UINT24 type + + src/hb-open-type-private.hh | 33 ++++++++++++++++++++++----------- + src/hb-private.hh | 4 ++++ + 2 files changed, 26 insertions(+), 11 deletions(-) + +commit 9cf7f9d4f61741932570afbefdee5edf61f79ae4 +Author: Behdad Esfahbod +Date: Tue Dec 11 14:31:13 2012 -0500 + + Make test-size-params write size in points + + src/test-size-params.cc | 18 ++++-------------- + 1 file changed, 4 insertions(+), 14 deletions(-) + +commit 372fe2b67b1757e809bf33e1e9055a00c5bed304 +Author: Behdad Esfahbod +Date: Tue Dec 11 14:30:57 2012 -0500 + + [OTLayout] Make hb_ot_layout_get_size_params() do some checks + + src/hb-ot-layout.cc | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit 875a5cbc9c37f4264241c43b80afad2628eab749 +Author: Behdad Esfahbod +Date: Tue Dec 11 14:17:01 2012 -0500 + + [OTLayout] Change hb_ot_layout_get_params() API + + And add implementation for StylisticSet UINameID. No API yet. + + src/hb-ot-layout-common-private.hh | 85 + ++++++++++++++++++++++++++++++++++++-- + src/hb-ot-layout.cc | 28 +++++++++---- + src/hb-ot-layout.h | 8 +++- + src/test-size-params.cc | 9 +++- + 4 files changed, 115 insertions(+), 15 deletions(-) + +commit 5e7e52ddf2b0c4fbc9d933d24336100368d39a5c +Author: Behdad Esfahbod +Date: Mon Dec 10 17:44:22 2012 -0500 + + [uniscribe] Enable Uniscribe backend only if it has + ScriptShapeOpenType() + + Bug 55494 - ScriptItemizeOpenType doesn't exists under Windows XP + + config.h.in | 6 ------ + configure.ac | 14 +++++++++++++- + 2 files changed, 13 insertions(+), 7 deletions(-) + +commit d41c0c955b8ad9b52191ca47e1f3b1bfe606deb1 +Author: Behdad Esfahbod +Date: Mon Dec 10 16:41:20 2012 -0500 + + Update config template + + config.h.in | 4 ---- + 1 file changed, 4 deletions(-) + +commit c48a04e5ea899b82465a0f3f2cfdcffb3bf38f61 +Author: John Ralls +Date: Mon Dec 10 16:24:24 2012 -0500 + + [coretext] Better test for CoreText + + Instead of checking for ApplicationServices.h, which is present in all + versions of MacOSX, check for CTFontRef, a CoreText basic type. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0e9f0f3e5f16a45951423a1229af42dc2fd798c3 +Author: Behdad Esfahbod +Date: Mon Dec 10 15:25:21 2012 -0500 + + Fix atomic ops on iOS + + Patch from John Ralls. + + src/hb-atomic-private.hh | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 5f9569c1391c65d7addff363ad6e5ec9b087f01a +Author: Behdad Esfahbod +Date: Mon Dec 10 13:38:42 2012 -0500 + + Make older MSVC happy + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 071d5b831e6de5f3b24160dc77b139cb040ab886 +Author: Behdad Esfahbod +Date: Mon Dec 10 00:57:00 2012 -0500 + + Work around missing OSAtomicCompareAndSwapPtrBarrier() on OS X 10.4 + + Not sure how to handle iOS. + + src/hb-atomic-private.hh | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit e923e6487b25ab86f6f629af480b291e8e5407b5 +Author: Behdad Esfahbod +Date: Sun Dec 9 19:39:40 2012 -0500 + + [coretext] Fixed typo + + Oops. Thanks Khaled for catching this. + + src/hb-coretext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9a8395824bf51c2ff2cfe0887ecad52b3d2c02e2 +Author: Behdad Esfahbod +Date: Sun Dec 9 18:47:36 2012 -0500 + + [coretext] Add hb_coretext_face_get_cg_font() + + Not sure if it's useful, but it was missing. + + src/hb-coretext.cc | 20 ++++++++++++++------ + src/hb-coretext.h | 3 +++ + 2 files changed, 17 insertions(+), 6 deletions(-) + +commit 86112356885fde32163882b6c9dd19a494304f7a +Author: Behdad Esfahbod +Date: Sun Dec 9 18:47:09 2012 -0500 + + [coretext] Remove hack around GlyphID + + We not namespace our types, so the hack is not needed anymore. + + src/hb-coretext.cc | 4 ---- + 1 file changed, 4 deletions(-) + +commit 8e58459aeb949591bb5bca340ef9bdd5cfd54e47 +Author: Behdad Esfahbod +Date: Sun Dec 9 18:45:47 2012 -0500 + + [graphite2] "Update to new API" + + Part of patch from Martin Hosken. I believe he knows what he's doing + :). + + src/hb-graphite2.cc | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +commit a5a4ab3846ef06769784e6469d76eace35e68805 +Author: Behdad Esfahbod +Date: Sun Dec 9 18:44:41 2012 -0500 + + [graphite2] Add hb_graphite2_face_get_gr_face and + hb_graphite2_font_get_gr_font + + Based on patch from Martin Hosken. I believe it returns NULL if the + font doesn't have graphite tables, but have not tested. + + src/hb-graphite2.cc | 14 ++++++++++++++ + src/hb-graphite2.h | 8 +++++++- + 2 files changed, 21 insertions(+), 1 deletion(-) + +commit 737ba156442f723d126c7c58c73729786b67c17a +Author: Behdad Esfahbod +Date: Sun Dec 9 18:43:03 2012 -0500 + + [graphite2] Preload all tables + + Part of patch from Martin Hosken. + + src/hb-graphite2.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0ae6dbf1b4de8a0326b8a2f201597427cecfb6db +Author: Behdad Esfahbod +Date: Sun Dec 9 18:37:38 2012 -0500 + + Minor + + src/hb-uniscribe.cc | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) + +commit 3fe5c159d3532f8ce8a85d217a00681225dd8ed1 +Author: Behdad Esfahbod +Date: Sun Dec 9 18:20:19 2012 -0500 + + Remove excess return + + Oops! + + src/hb-uniscribe.cc | 1 - + 1 file changed, 1 deletion(-) + +commit ba2d543004573e8e4e56df70b7fe2a66a42bc83f +Author: Behdad Esfahbod +Date: Sat Dec 8 19:28:41 2012 -0500 + + Update OT language tags + + Patch from Roozbeh Pournader. + + src/hb-ot-tag.cc | 212 + +++++++++++++++++++++++++++++-------------------------- + 1 file changed, 110 insertions(+), 102 deletions(-) + +commit aba38173c6b464c2884b73ef6cd4577d4efcebbc +Author: Behdad Esfahbod +Date: Wed Dec 5 19:54:48 2012 -0500 + + Minor + + src/hb-ot-tag.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 61865745e35eb60aeb59968e7826e37059090780 +Author: Behdad Esfahbod +Date: Wed Dec 5 19:42:10 2012 -0500 + + Fix test with gold linker + + Bug 57633 - Symbol tests should ignore __bss_start, _edata, _end + + src/check-exported-symbols.sh | 2 +- + src/check-internal-symbols.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit b71b0bd9ee64feadd7289e195bc58f6361ce707a +Author: Behdad Esfahbod +Date: Wed Dec 5 19:20:31 2012 -0500 + + [Indic] Add link to Sinhala split matra section of the Sinhala spec + + src/hb-ot-shape-complex-indic.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 9a34a50daac3563464e0031f377e85f0c704f2d6 +Author: Behdad Esfahbod +Date: Wed Dec 5 19:18:18 2012 -0500 + + Fix build with C++11 + + util/options.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 0beb66e3a61ae8bb1fa66e54b1ff1abb2f8711e9 +Author: Behdad Esfahbod +Date: Wed Dec 5 18:46:04 2012 -0500 + + Fix warnings + + src/hb-fallback-shape.cc | 10 +++++----- + src/hb-glib.cc | 2 +- + src/hb-icu-le.cc | 6 +++--- + src/hb-old.cc | 14 +++++++------- + src/hb-open-type-private.hh | 4 +--- + src/hb-ot-layout-gsubgpos-private.hh | 24 ++++++++++++------------ + src/hb-ot-shape-complex-arabic-fallback.hh | 4 ++-- + src/hb-ot-shape-complex-arabic.cc | 2 +- + src/hb-ot-shape-complex-indic-machine.hh | 2 +- + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + src/hb-ot-shape-complex-indic.cc | 6 +++--- + src/hb-ot-shape-complex-thai.cc | 2 +- + src/hb-ot-shape-fallback.cc | 4 ++-- + src/hb-private.hh | 8 ++++---- + src/hb-ucdn.cc | 27 + +++++++++++++++------------ + src/hb-utf-private.hh | 4 ++-- + 16 files changed, 61 insertions(+), 60 deletions(-) + +commit c6408a1009d2370fbdcfa694898819d99d53c3df +Author: Behdad Esfahbod +Date: Wed Dec 5 17:36:52 2012 -0500 + + 0.9.9 + + NEWS | 8 ++++++++ + configure.ac | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit 130bb3f6144afe5c88bb5b4e4c98e7cba03b1e26 +Author: Behdad Esfahbod +Date: Wed Dec 5 16:49:47 2012 -0500 + + Rename VOID and void_t to have HarfBuzz prefix + + Fixes build on Windows. Ouch! + + src/hb-ot-layout-gsubgpos-private.hh | 22 +++++++++++----------- + src/hb-private.hh | 12 ++++++------ + 2 files changed, 17 insertions(+), 17 deletions(-) + +commit 4a350d0eb25db60d95638664c892d4c8dacf050b +Author: Behdad Esfahbod +Date: Tue Dec 4 17:13:09 2012 -0500 + + [OTLayout] Reuse context in collect_glyphs() recursion + + src/hb-ot-layout-gsubgpos-private.hh | 19 +++++++++++++++---- + 1 file changed, 15 insertions(+), 4 deletions(-) + +commit 8303593ba1db06e402eab52df47f21f13049112d +Author: Behdad Esfahbod +Date: Tue Dec 4 17:08:41 2012 -0500 + + Minor + + Use pointers instead of references, in preparation for upcoming + change. + + src/hb-ot-layout-gpos-table.hh | 28 +++++++++++++------------- + src/hb-ot-layout-gsub-table.hh | 30 ++++++++++++++-------------- + src/hb-ot-layout-gsubgpos-private.hh | 38 + ++++++++++++++++++------------------ + 3 files changed, 48 insertions(+), 48 deletions(-) + +commit 1bcfa06d1173f219809542a7380ce77f1c907bec +Author: Behdad Esfahbod +Date: Tue Dec 4 16:58:09 2012 -0500 + + [OTLayout] Don't recurse in collect_glyphs() for GPOS + + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 4 ++++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit b5e04c7dc6b78e311d1a14f1f808fac76a64c889 +Author: Behdad Esfahbod +Date: Tue Dec 4 15:57:02 2012 -0500 + + [ucdn] Match upstream changes + + src/hb-ucdn/ucdn.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit a52f51b21635c626f6e5ccdba505c4df19bcff2c +Author: Behdad Esfahbod +Date: Tue Dec 4 15:43:38 2012 -0500 + + 0.9.8 + + NEWS | 16 ++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 17 insertions(+), 1 deletion(-) + +commit 7babfe5a7904c26060c5b8441ca1bf23e1444f35 +Author: Behdad Esfahbod +Date: Tue Dec 4 00:35:54 2012 +0200 + + Move object mutext into the user-data array + + We are not using it for anything lse it seems. + + src/hb-common.cc | 12 ++---------- + src/hb-object-private.hh | 24 ++++++++++-------------- + 2 files changed, 12 insertions(+), 24 deletions(-) + +commit a1900114770952778563dd6f3bc79334b0ca8df5 +Author: Behdad Esfahbod +Date: Tue Dec 4 00:29:35 2012 +0200 + + Remove unused functions + + src/hb-object-private.hh | 20 -------------------- + 1 file changed, 20 deletions(-) + +commit 88b7564183ae1cf59500b13c7e48756fe200c7cd +Author: Behdad Esfahbod +Date: Sun Dec 2 19:14:29 2012 +0200 + + "Update" to Unicode 6.2.0 tables + + Nothing changed... + + src/hb-ot-shape-complex-arabic-table.hh | 4 ++-- + src/hb-ot-shape-complex-indic-table.hh | 12 ++++++------ + 2 files changed, 8 insertions(+), 8 deletions(-) + +commit 4ab99fb8c363cfc6a4f5952e69a19757f0cab344 +Author: Behdad Esfahbod +Date: Fri Nov 30 15:02:04 2012 +0200 + + Minor + + src/hb-ot-layout.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6748b96d27477b35dd69129e55d861259d66bf9f +Author: Behdad Esfahbod +Date: Fri Nov 30 12:02:21 2012 +0200 + + Minor + + src/hb-ot-layout.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 624933f67642997ee0a46d5acea285362e837142 +Author: Behdad Esfahbod +Date: Fri Nov 30 11:46:35 2012 +0200 + + Add Persian test cases from Mehran Mehr + + test/shaping/texts/in-tree/shaper-arabic/script-arabic/MANIFEST | 1 + + .../in-tree/shaper-arabic/script-arabic/language-persian/MANIFEST | 1 + + .../shaper-arabic/script-arabic/language-persian/mehran.txt | + 8 ++++++++ + 3 files changed, 10 insertions(+) + +commit 0f3f5299047e3cfc4d1202fee83d484b871279ad +Author: Behdad Esfahbod +Date: Fri Nov 30 09:06:59 2012 +0200 + + Add test-size-params + + Eventually this will become part of a yet-to-be-written hb-ot cmdline + tool. + + src/Makefile.am | 10 ++++- + src/test-size-params.cc | 98 + +++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 107 insertions(+), 1 deletion(-) + +commit 8465a05a89742295d4b009a9b4442eb0a899fd80 +Author: Behdad Esfahbod +Date: Fri Nov 30 08:46:43 2012 +0200 + + Fix hb_buffer_guess_segment_properties() for empty buffer + + Was causing assertion failure in shape_plan(). + + src/hb-buffer.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e75943de803f571b7ad2cf2f777119753a209656 +Author: Behdad Esfahbod +Date: Fri Nov 30 08:38:24 2012 +0200 + + [OTLayout] Fix collect_glyphs() recursion in ContextFormat3 + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3038ae6adbb61e55d6c665dea0c5271e0c9f0ed8 +Author: Behdad Esfahbod +Date: Fri Nov 30 08:24:13 2012 +0200 + + [OTLayout] Minor + + src/hb-ot-layout-gpos-table.hh | 4 ---- + src/hb-ot-layout-gsub-table.hh | 4 ---- + src/hb-ot-layout.cc | 4 ++-- + 3 files changed, 2 insertions(+), 10 deletions(-) + +commit 0dff11f6bfbda444a153ca75ff2b947f94e9b3c5 +Author: Behdad Esfahbod +Date: Fri Nov 30 08:14:20 2012 +0200 + + [OTLayout] Look for any 'size' feature, not only in DFLT script + + The old code doesn't work with all fonts, as Khaled has reported. + + src/hb-ot-layout.cc | 14 +++++--------- + 1 file changed, 5 insertions(+), 9 deletions(-) + +commit e9ad71dee845407da74ccacfbb53ad7ededf07fd +Author: Behdad Esfahbod +Date: Fri Nov 30 08:10:26 2012 +0200 + + [OTLayout] Rename hb_ot_layout_position_get_size() to + hb_ot_layout_get_size_params() + + src/hb-ot-layout.cc | 4 ++-- + src/hb-ot-layout.h | 7 ++++--- + 2 files changed, 6 insertions(+), 5 deletions(-) + +commit f18ff5a84d9fe859c40a7a0c9a207cb40df0e84a +Author: Behdad Esfahbod +Date: Fri Nov 30 08:07:06 2012 +0200 + + [OTLayout] Return correct value from recursion + + Commit 4c4e8f0e754b79ac6190d21878eaaf0b790c7579 broke contextual + lookups + by making the recurse() function always return false. + + Reported by Khaled. Test case: لا in Amiri. + + src/hb-ot-layout-gsubgpos-private.hh | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit f54cce3c6a0432268ce159dbe6c5c6b7f583b87a +Author: Behdad Esfahbod +Date: Mon Nov 26 14:02:31 2012 +0200 + + [OTLayout] Implement 'size' feature + + src/hb-ot-layout-common-private.hh | 36 + ++++++++++++++++++++++++++++++++++-- + src/hb-ot-layout.cc | 31 +++++++++++++++++++++++++++++++ + src/hb-ot-layout.h | 5 +++++ + 3 files changed, 70 insertions(+), 2 deletions(-) + +commit 2dc1141d7d0a9f5818862b09d6b9cfe0a27f1fc1 +Author: Behdad Esfahbod +Date: Sat Nov 24 19:16:34 2012 -0500 + + [OTLayout] Remove operator() from ClassDef + + src/hb-ot-layout-common-private.hh | 2 -- + src/hb-ot-layout-gpos-table.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- + 3 files changed, 6 insertions(+), 8 deletions(-) + +commit b67881b171a7cf865af58df146da52fc1e27b160 +Author: Behdad Esfahbod +Date: Sat Nov 24 19:13:55 2012 -0500 + + [OTLayout] Remove operator() from Coverage + + src/hb-ot-layout-common-private.hh | 2 -- + src/hb-ot-layout-gdef-table.hh | 4 ++-- + src/hb-ot-layout-gpos-table.hh | 24 ++++++++++++------------ + src/hb-ot-layout-gsub-table.hh | 24 ++++++++++++------------ + src/hb-ot-layout-gsubgpos-private.hh | 16 ++++++++-------- + 5 files changed, 34 insertions(+), 36 deletions(-) + +commit a88e7160217b9f44e4e5b4b814d0ca98c457ee40 +Author: Behdad Esfahbod +Date: Sat Nov 24 02:31:02 2012 -0500 + + [OTLayout] Implement hb_ot_layout_collect_lookups() + + Untested. + + src/hb-ot-layout.cc | 97 + +++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-layout.h | 4 +-- + 2 files changed, 98 insertions(+), 3 deletions(-) + +commit 1ea375da446bf68f705a70ce4a480db9fb9d13f3 +Author: Behdad Esfahbod +Date: Sat Nov 24 02:05:52 2012 -0500 + + [OTLayout] Only collect output glyphs during recursion in + collect_glyphs() + + src/hb-ot-layout-gsubgpos-private.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit f1b12781d279a73b5754afee31e930b5cd87aac6 +Author: Behdad Esfahbod +Date: Sat Nov 24 01:55:34 2012 -0500 + + [OTLayout] Implement ChainContext collect_glyphs() + + All of collect_glyphs() complete and untested now. + + src/hb-ot-layout-gsubgpos-private.hh | 103 + ++++++++++++++++++++++++++++++++--- + 1 file changed, 96 insertions(+), 7 deletions(-) + +commit cdd756b9f40665a201f5c4e65a87b9a27c390601 +Author: Behdad Esfahbod +Date: Sat Nov 24 01:38:41 2012 -0500 + + [OTLayout] Implement GPOS collect_glyphs() + + src/hb-ot-layout-gpos-table.hh | 95 + +++++++++++++++++++++++++++++++++++++++++- + src/hb-ot-layout.cc | 9 ++-- + 2 files changed, 99 insertions(+), 5 deletions(-) + +commit 4c4e8f0e754b79ac6190d21878eaaf0b790c7579 +Author: Behdad Esfahbod +Date: Sat Nov 24 01:13:20 2012 -0500 + + [OTLayout] Reuse apply context for recursion + + src/hb-ot-layout-gpos-table.hh | 7 ++++++- + src/hb-ot-layout-gsub-table.hh | 7 ++++++- + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- + 3 files changed, 16 insertions(+), 6 deletions(-) + +commit 53a69f49e58ef4c4226958e0496fc22455ee6c87 +Author: Behdad Esfahbod +Date: Sat Nov 24 01:03:05 2012 -0500 + + [OTLayout] Remove unused members + + src/hb-ot-layout-gsubgpos-private.hh | 3 --- + 1 file changed, 3 deletions(-) + +commit d0a5233785eb327c4080432f597fe470a1046af3 +Author: Behdad Esfahbod +Date: Fri Nov 23 18:54:59 2012 -0500 + + [OTLayout] Implement Context::collect_glyphs() + + src/hb-ot-layout-gsubgpos-private.hh | 122 + +++++++++++++++++++++++++++++++---- + 1 file changed, 111 insertions(+), 11 deletions(-) + +commit 26514d51b6669f092d9ccb7523443a5ece74169a +Author: Behdad Esfahbod +Date: Fri Nov 23 18:13:48 2012 -0500 + + [OTLayout] More collect_glyphs() + + src/hb-ot-layout-gpos-table.hh | 6 ++--- + src/hb-ot-layout-gsub-table.hh | 32 +++++++++++++++------- + src/hb-ot-layout-gsubgpos-private.hh | 51 + ++++++++++++++++++++++++++++++++---- + 3 files changed, 71 insertions(+), 18 deletions(-) + +commit c6fb843f2a1c26322c6f4c85d1589f01a9e7a2ef +Author: Behdad Esfahbod +Date: Fri Nov 23 18:04:08 2012 -0500 + + [OTLayout] Templatize process_recurse_func + + src/hb-ot-layout-gpos-table.hh | 10 ++++++++++ + src/hb-ot-layout-gsub-table.hh | 8 +++++--- + 2 files changed, 15 insertions(+), 3 deletions(-) + +commit 9b34677f362fb0ef5a7cb8a284a9e06d1a4cc03b +Author: Behdad Esfahbod +Date: Fri Nov 23 17:55:40 2012 -0500 + + [OTLayout] Clean up closure() a bit + + src/hb-ot-layout-gsub-table.hh | 29 ++++++++++++++--------------- + src/hb-ot-layout-gsubgpos-private.hh | 7 ++++--- + src/hb-ot-layout.cc | 6 +++++- + 3 files changed, 23 insertions(+), 19 deletions(-) + +commit adf7758a27a11fb1a8a14a2673867589437d22a3 +Author: Behdad Esfahbod +Date: Fri Nov 23 17:32:00 2012 -0500 + + Improve debug log format in presence of templates + + src/hb-private.hh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 2c53bd3c3ec4f81eff126c5bf84b7f2ddf2f0fef +Author: Behdad Esfahbod +Date: Fri Nov 23 17:29:05 2012 -0500 + + [OTLayout] Start porting sanitize() to process() + + src/hb-open-type-private.hh | 12 +++++++++++- + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- + 2 files changed, 15 insertions(+), 5 deletions(-) + +commit f48ec0e83432c038b50d9715a38ba1469e82e1e4 +Author: Behdad Esfahbod +Date: Fri Nov 23 17:23:41 2012 -0500 + + [OTLayout] Add process() tracing + + src/hb-ot-layout-gpos-table.hh | 60 + ++++++++++++++++++++---------------- + src/hb-ot-layout-gsub-table.hh | 51 +++++++++++++++++------------- + src/hb-ot-layout-gsubgpos-private.hh | 17 +++++----- + 3 files changed, 72 insertions(+), 56 deletions(-) + +commit ed2e13594479c6ed7909401509962ea2f03f9a6e +Author: Behdad Esfahbod +Date: Fri Nov 23 17:10:40 2012 -0500 + + [OTLayout] More Extension templatizing + + src/hb-ot-layout-gpos-table.hh | 11 ----------- + src/hb-ot-layout-gsub-table.hh | 11 ----------- + src/hb-ot-layout-gsubgpos-private.hh | 12 ++++++++++-- + 3 files changed, 10 insertions(+), 24 deletions(-) + +commit 7dddd4e72bc35be962d93dc1b76c7e26c63aaa6d +Author: Behdad Esfahbod +Date: Fri Nov 23 17:04:55 2012 -0500 + + [OTLayout] More templatizing Extension + + src/hb-ot-layout-gpos-table.hh | 7 +------ + src/hb-ot-layout-gsub-table.hh | 9 ++------- + src/hb-ot-layout-gsubgpos-private.hh | 10 +++++++++- + 3 files changed, 12 insertions(+), 14 deletions(-) + +commit 653eeb26450053b731b46346606931f5ae88db72 +Author: Behdad Esfahbod +Date: Fri Nov 23 16:57:36 2012 -0500 + + Make Extension a template + + src/hb-ot-layout-gpos-table.hh | 11 +---------- + src/hb-ot-layout-gsub-table.hh | 11 +---------- + src/hb-ot-layout-gsubgpos-private.hh | 7 +++++++ + 3 files changed, 9 insertions(+), 20 deletions(-) + +commit 08f1eede1bbc01ece2adf89847614a0670e50443 +Author: Behdad Esfahbod +Date: Fri Nov 23 16:51:43 2012 -0500 + + Minor + + src/hb-ot-layout-gpos-table.hh | 19 ++----------------- + src/hb-ot-layout-gsub-table.hh | 19 ++----------------- + 2 files changed, 4 insertions(+), 34 deletions(-) + +commit 2c9d6485a1f89c11f84e720d3c7978dc11a5039a +Author: Behdad Esfahbod +Date: Fri Nov 23 16:49:19 2012 -0500 + + More tracing fixup + + src/hb-private.hh | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit a1733db1c6ff40aae71fa142a12b1fea7b53dd37 +Author: Behdad Esfahbod +Date: Fri Nov 23 16:40:04 2012 -0500 + + [OTLayout] Start adding process() tracing + + src/hb-ot-layout-gsubgpos-private.hh | 44 + +++++++++++++++++++++++++++--------- + src/hb-private.hh | 6 +++-- + 2 files changed, 37 insertions(+), 13 deletions(-) + +commit 73c18ae1b982a4e65086afe5177afa79e721e2c0 +Author: Behdad Esfahbod +Date: Fri Nov 23 15:34:11 2012 -0500 + + Cleanup + + src/hb-ot-layout-gsubgpos-private.hh | 16 ++++------------ + 1 file changed, 4 insertions(+), 12 deletions(-) + +commit be218c688cbb037a99c8c64bb835f3c980040c0b +Author: Behdad Esfahbod +Date: Fri Nov 23 15:32:14 2012 -0500 + + Pass this object to trace macros + + src/hb-open-file-private.hh | 10 +-- + src/hb-open-type-private.hh | 34 +++++----- + src/hb-ot-head-table.hh | 2 +- + src/hb-ot-hhea-table.hh | 2 +- + src/hb-ot-hmtx-table.hh | 2 +- + src/hb-ot-layout-common-private.hh | 36 +++++------ + src/hb-ot-layout-gdef-table.hh | 20 +++--- + src/hb-ot-layout-gpos-table.hh | 80 +++++++++++------------ + src/hb-ot-layout-gsub-table.hh | 122 + +++++++++++++++++------------------ + src/hb-ot-layout-gsubgpos-private.hh | 100 ++++++++++++++-------------- + src/hb-ot-maxp-table.hh | 2 +- + src/hb-ot-name-table.hh | 6 +- + 12 files changed, 208 insertions(+), 208 deletions(-) + +commit 902cc8aca0b3ff25eeee50b3a84d729e31731ef3 +Author: Behdad Esfahbod +Date: Fri Nov 23 15:06:59 2012 -0500 + + [OTLayout] Start unbreaking tracing + + src/hb-open-type-private.hh | 37 + +++++++++++++++++++++--------------- + src/hb-ot-layout-gsubgpos-private.hh | 37 + +++++++++++++++++++++++++----------- + src/hb-private.hh | 30 +++++++++++++++++++---------- + 3 files changed, 68 insertions(+), 36 deletions(-) + +commit dabe698fcbeb02911128b17aa8e3b2d864795960 +Author: Behdad Esfahbod +Date: Fri Nov 23 14:21:35 2012 -0500 + + Minor + + src/hb-open-type-private.hh | 5 ----- + src/hb-ot-layout-gsubgpos-private.hh | 10 ++++------ + src/hb-private.hh | 27 +++++++++++++++++++++++++-- + 3 files changed, 29 insertions(+), 13 deletions(-) + +commit c779d82b2fc801eec0d349a106c0e860448fcf4e +Author: Behdad Esfahbod +Date: Fri Nov 23 14:07:24 2012 -0500 + + Fix warnings + + src/hb-ot-layout-gpos-table.hh | 2 -- + src/hb-ot-layout-gsub-table.hh | 8 +++----- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-private.hh | 2 +- + 4 files changed, 5 insertions(+), 9 deletions(-) + +commit 81822528efc63d867cb2343a8ff7af64fac1c70d +Author: Behdad Esfahbod +Date: Fri Nov 23 13:27:16 2012 -0500 + + Minor + + src/hb-open-type-private.hh | 6 ++++++ + src/hb-ot-layout-gsubgpos-private.hh | 3 --- + 2 files changed, 6 insertions(+), 3 deletions(-) + +commit 1d67ef980f35ae30d4f8975f65ee07b8cc5deeea +Author: Behdad Esfahbod +Date: Thu Nov 22 16:47:53 2012 -0500 + + Move code around + + src/hb-ot-layout-gsubgpos-private.hh | 44 + ++++++++++++++++++------------------ + 1 file changed, 22 insertions(+), 22 deletions(-) + +commit ec35a72a44301934b8f123ab2833f59d8c875a09 +Author: Behdad Esfahbod +Date: Thu Nov 22 16:05:59 2012 -0500 + + [OTLayout] Port apply() operator to process() template + + src/hb-ot-layout-gpos-table.hh | 117 + ++++------------------------------- + src/hb-ot-layout-gsub-table.hh | 108 + +++----------------------------- + src/hb-ot-layout-gsubgpos-private.hh | 99 +++++++++++++---------------- + src/hb-ot-layout.cc | 2 +- + 4 files changed, 65 insertions(+), 261 deletions(-) + +commit 2005fa5340fc528c32dc2af945ad2431964a47d2 +Author: Behdad Esfahbod +Date: Thu Nov 22 14:38:10 2012 -0500 + + [OTLayout] Port would_apply() and get_coverage() to process() + templates + + src/hb-ot-layout-gpos-table.hh | 175 + +++++++++++-------------------- + src/hb-ot-layout-gsub-table.hh | 198 + ++++++++++++----------------------- + src/hb-ot-layout-gsubgpos-private.hh | 76 +++++--------- + 3 files changed, 156 insertions(+), 293 deletions(-) + +commit 44fc237b53ebfbaf8a539de16ad735d2c6afc52b +Author: Behdad Esfahbod +Date: Wed Nov 21 23:33:13 2012 -0500 + + [OTLayout] Port closure() to process() template + + src/hb-ot-layout-gsub-table.hh | 297 + ++++++++--------------------------- + src/hb-ot-layout-gsubgpos-private.hh | 209 ++++++++++++------------ + src/hb-ot-layout.cc | 10 +- + 3 files changed, 171 insertions(+), 345 deletions(-) + +commit 5be86b1bb4fbb37b50a1e2798df0c9a3a528b6b2 +Author: Behdad Esfahbod +Date: Thu Nov 22 16:26:22 2012 -0500 + + [ucdn] Make data tables const! + + src/hb-ucdn/ucdn.c | 16 ++++++++-------- + src/hb-ucdn/unicodedata_db.h | 28 ++++++++++++++-------------- + 2 files changed, 22 insertions(+), 22 deletions(-) + +commit 7c5b7fe686c9163afe2f31fbeac6f8c8512f5516 +Author: Behdad Esfahbod +Date: Thu Nov 22 14:15:08 2012 -0500 + + Fix hb_shape_plan_get_shaper() + + src/hb-shape-plan.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 4c8963576573483269b327c6465f6ec99f489e05 +Author: Behdad Esfahbod +Date: Wed Nov 21 01:20:56 2012 -0500 + + 0.9.7 + + NEWS | 86 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 87 insertions(+), 1 deletion(-) + +commit ac064a2db2b7a010d99527e183145286215aea81 +Author: Behdad Esfahbod +Date: Wed Nov 21 01:14:19 2012 -0500 + + Rename hb_set_population() to hb_set_get_population() + + src/hb-set.cc | 2 +- + src/hb-set.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 16c914c2a6efeb6999054333985b1f711e33cf94 +Author: Behdad Esfahbod +Date: Wed Nov 21 01:04:15 2012 -0500 + + [Indic] One more try at unbreaking Khmer fonts + + See comments and discussion on the list. + + src/hb-ot-shape-complex-private.hh | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +commit e8cfdd7fa8d0fb66e0a261f3547e5824897e5131 +Author: Behdad Esfahbod +Date: Fri Nov 16 19:07:06 2012 -0800 + + Start implementing collect_glyphs() operation + + Not functional yet. + + src/hb-ot-layout-gsub-table.hh | 185 + +++++++++++++++++++++++++++++++++++ + src/hb-ot-layout-gsubgpos-private.hh | 57 +++++++++++ + src/hb-ot-layout.cc | 29 ++++++ + src/hb-ot-layout.h | 4 +- + 4 files changed, 272 insertions(+), 3 deletions(-) + +commit 7d52e6601f0e695690cd168a288466746cf25300 +Author: Behdad Esfahbod +Date: Fri Nov 16 18:49:54 2012 -0800 + + Whitespace + + src/hb-coretext.cc | 32 +++++----- + src/hb-icu-le.cc | 2 +- + src/hb-old.cc | 10 ++-- + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 2 +- + src/hb-ot-head-table.hh | 2 +- + src/hb-ot-hhea-table.hh | 2 +- + src/hb-ot-hmtx-table.hh | 2 +- + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gdef-table.hh | 2 +- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-ot-maxp-table.hh | 2 +- + src/hb-ot-name-table.hh | 2 +- + src/hb-ot-shape-complex-default.cc | 109 + ++++++++++++++++++----------------- + src/hb-tt-font.cc | 2 +- + 17 files changed, 87 insertions(+), 92 deletions(-) + +commit 51bb498b7b07bff4a447405b72f09b68d07a3e95 +Author: Behdad Esfahbod +Date: Fri Nov 16 14:08:05 2012 -0800 + + Minor + + src/hb-ot-shape.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 89ca8eeb83fedde06727d386369a0a39d410f12b +Author: Behdad Esfahbod +Date: Fri Nov 16 13:53:40 2012 -0800 + + Implement hb_ot_layout_get_glyphs_in_class() + + src/hb-ot-layout-common-private.hh | 24 ++++++++++++++++++++++++ + src/hb-ot-layout-gdef-table.hh | 2 ++ + src/hb-ot-layout.cc | 8 ++++++++ + src/hb-ot-layout.h | 5 ++--- + 4 files changed, 36 insertions(+), 3 deletions(-) + +commit 5a08ecf9200a6ac9b4ebb7ec5c13dcb42d8820ce +Author: Behdad Esfahbod +Date: Fri Nov 16 13:34:29 2012 -0800 + + Implement hb_ot_layout_get_glyph_class() + + src/hb-ot-layout-gdef-table.hh | 10 +++++----- + src/hb-ot-layout-gpos-table.hh | 8 ++++---- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 10 +++++----- + src/hb-ot-layout-private.hh | 10 +++++++++- + src/hb-ot-layout.cc | 6 ++++++ + src/hb-ot-layout.h | 14 ++++++-------- + src/hb-ot-shape.cc | 4 ++-- + 8 files changed, 38 insertions(+), 26 deletions(-) + +commit f9edd5d56bd219625f5b16b23eac53b4c4a8b194 +Author: Behdad Esfahbod +Date: Fri Nov 16 13:23:37 2012 -0800 + + Implement hb_shape_plan_get_shaper() + + Untested. + + src/hb-shape-plan-private.hh | 1 + + src/hb-shape-plan.cc | 7 +++++++ + src/hb-shape-plan.h | 4 +--- + 3 files changed, 9 insertions(+), 3 deletions(-) + +commit 43b653150081a2f9dc6b7481229ac4cd952575dc +Author: Behdad Esfahbod +Date: Fri Nov 16 13:12:35 2012 -0800 + + [Indic] Another try to unbreak Sinhala split matras + + Just read the comments... + + src/hb-ot-shape-complex-indic.cc | 43 + ++++++++++++++++++---- + .../indic/script-sinhala/misc/MANIFEST | 1 + + .../indic/script-sinhala/misc/split-matras.txt | 4 ++ + 3 files changed, 40 insertions(+), 8 deletions(-) + +commit 977f1740ace730dcdff8221a17f2a592c2ec7c74 +Author: Behdad Esfahbod +Date: Fri Nov 16 13:10:07 2012 -0800 + + Unbreak tests + + src/hb-ot-layout.h | 14 +++++++------- + src/hb-shape-plan.h | 2 +- + 2 files changed, 8 insertions(+), 8 deletions(-) + +commit eba312c8d1b2bbe8cb9b6414e843e78d2c521aa4 +Author: Behdad Esfahbod +Date: Fri Nov 16 12:39:23 2012 -0800 + + Plumbing to get shape plan and font into complex decompose function + + So we can handle Sinhala split matras smartly... Coming soon. + + src/hb-ot-shape-complex-default.cc | 6 ++-- + src/hb-ot-shape-complex-indic.cc | 14 ++++----- + src/hb-ot-shape-complex-private.hh | 16 +++++------ + src/hb-ot-shape-normalize-private.hh | 22 ++++++++++++-- + src/hb-ot-shape-normalize.cc | 56 + ++++++++++++++---------------------- + src/hb-ot-shape.cc | 2 +- + 6 files changed, 61 insertions(+), 55 deletions(-) + +commit 3f82f8ff07a9d16a7c047129658c1bbedfdb5436 +Author: Behdad Esfahbod +Date: Thu Nov 15 18:45:31 2012 -0800 + + Rename hb_buffer_guess_properties() to + hb_buffer_guess_segment_properties() + + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 6 +++--- + src/hb-buffer.h | 2 +- + src/hb-fallback-shape.cc | 2 +- + src/hb-ot-shape.cc | 2 +- + src/hb-shape.cc | 2 +- + 6 files changed, 8 insertions(+), 8 deletions(-) + +commit f30641038ba96e83950729b1bd9d86d2e98e46c5 +Author: Behdad Esfahbod +Date: Thu Nov 15 18:39:46 2012 -0800 + + Bunch of independent changes (ouch) + + API additions: + + hb_segment_properties_t + HB_SEGMENT_PROPERTIES_DEFAULT + hb_segment_properties_equal() + hb_segment_properties_hash() + + hb_buffer_set_segment_properties() + hb_buffer_get_segment_properties() + + hb_ot_layout_glyph_class_t + + hb_shape_plan_t + hb_shape_plan_create() + hb_shape_plan_create_cached() + hb_shape_plan_get_empty() + hb_shape_plan_reference() + hb_shape_plan_destroy() + hb_shape_plan_set_user_data() + hb_shape_plan_get_user_data() + hb_shape_plan_execute() + + hb_ot_shape_plan_collect_lookups() + + API changes: + + Rename hb_ot_layout_feature_get_lookup_indexes() to + hb_ot_layout_feature_get_lookups(). + + New header file: + + hb-shape-plan.h + + And a bunch of prototyped but not implemented stuff. Coming soon. + (Tests fail because of the prototypes right now.) + + src/Makefile.am | 2 +- + src/hb-buffer-private.hh | 37 --------------- + src/hb-buffer.cc | 45 +++++++++++++++++- + src/hb-buffer.h | 47 +++++++++++++++++-- + src/hb-ot-layout-private.hh | 8 ---- + src/hb-ot-layout.cc | 12 ++--- + src/hb-ot-layout.h | 108 + ++++++++++++++++++++++++++++++++++++++++--- + src/hb-ot-map-private.hh | 2 +- + src/hb-ot-map.cc | 15 +++--- + src/hb-ot-shape-private.hh | 11 ++++- + src/hb-ot-shape.cc | 52 ++++++++++++++------- + src/hb-ot.h | 1 + + src/hb-shape-plan-private.hh | 3 +- + src/hb-shape-plan.cc | 23 +++++++-- + src/hb-shape-plan.h | 50 +++++++++++++------- + src/hb-shaper-private.hh | 2 - + src/hb-shaper.cc | 2 +- + src/hb.h | 1 + + 18 files changed, 304 insertions(+), 117 deletions(-) + +commit 75da37dcb17aacc0be6bb006683a84aa31155938 +Author: Behdad Esfahbod +Date: Thu Nov 15 18:39:23 2012 -0800 + + Minor + + util/hb-ot-shape-closure.cc | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +commit e05a999495e6575f7cebd7f35db087d964f11ef6 +Author: Behdad Esfahbod +Date: Thu Nov 15 16:23:21 2012 -0800 + + Add hb_face_[sg]et_glyph_count() + + src/hb-font-private.hh | 9 +++++++++ + src/hb-font.cc | 29 ++++++++++++++++++++++++++++- + src/hb-font.h | 7 +++++++ + 3 files changed, 44 insertions(+), 1 deletion(-) + +commit aec89de5641fbe1c3031d63dd5f40ec99bf2a538 +Author: Behdad Esfahbod +Date: Thu Nov 15 16:15:42 2012 -0800 + + Add / modify set API a bit + + src/hb-ot-shape.cc | 2 +- + src/hb-set-private.hh | 35 ++++++++++++++++-- + src/hb-set.cc | 86 + ++++++++++++++++++++++++++++++--------------- + src/hb-set.h | 55 +++++++++++++++++++---------- + util/hb-ot-shape-closure.cc | 2 +- + 5 files changed, 128 insertions(+), 52 deletions(-) + +commit c54599ad269380c7aa28d885fcfd660fc2c10a7b +Author: Behdad Esfahbod +Date: Thu Nov 15 16:14:23 2012 -0800 + + Minor + + src/hb-buffer.cc | 2 +- + src/hb-buffer.h | 8 +++----- + 2 files changed, 4 insertions(+), 6 deletions(-) + +commit d1aa143ca434fe272de21d2002768c83387b583b +Author: Behdad Esfahbod +Date: Thu Nov 15 15:38:08 2012 -0800 + + [Thai] Remove U+0E2C from "AC" consonants + + WinXP doesn't include it. + + src/hb-ot-shape-complex-thai.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 362a990b2246f5448ecb9d600761f710aea7d42d +Author: Behdad Esfahbod +Date: Thu Nov 15 14:57:31 2012 -0800 + + Rename hb_ot_layout_would_substitute_lookup() and + hb_ot_layout_substitute_closure_lookup() + + To match upcoming API. + + src/hb-ot-layout-private.hh | 2 +- + src/hb-ot-layout.cc | 8 ++++---- + src/hb-ot-layout.h | 4 ++-- + src/hb-ot-map.cc | 2 +- + src/hb-ot-shape-complex-indic.cc | 2 +- + src/test-would-substitute.cc | 2 +- + 6 files changed, 10 insertions(+), 10 deletions(-) + +commit a4bef84e375b090c1bc7e4221b8e0ee435dfcbba +Author: Behdad Esfahbod +Date: Thu Nov 15 13:29:51 2012 -0800 + + [util] Make hb-shape err if output-format is not understood + + And list supported formats. + + util/hb-shape.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 3cec819d39e45470d03085bb6fa132882cc85943 +Author: Behdad Esfahbod +Date: Thu Nov 15 13:15:39 2012 -0800 + + Make the OT shaper default, even if CoreText or Uniscribe is enabled + + src/hb-shaper-list.hh | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +commit 072ae7a982bf640804eee0b41525e7c328806bf5 +Author: Behdad Esfahbod +Date: Thu Nov 15 13:14:12 2012 -0800 + + Add hb_buffer_serialize_list_formats() + + src/hb-buffer.cc | 6 ++++++ + src/hb-buffer.h | 3 +++ + 2 files changed, 9 insertions(+) + +commit f9edf1672511c3bcc3796cc79578ffea43b2bda1 +Author: Behdad Esfahbod +Date: Thu Nov 15 12:14:09 2012 -0800 + + Add buffer serialization / deserialization API + + Two output formats for now: TEXT, and JSON. For example: + + hb-shape --output-format=json + + Deserialization API is added, but not implemented yet. + + src/hb-buffer.cc | 222 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-buffer.h | 42 +++++++++++ + util/hb-shape.cc | 21 +++++- + util/options.cc | 57 +++++--------- + util/options.hh | 7 +- + 5 files changed, 304 insertions(+), 45 deletions(-) + +commit fd0de881f4fc004da6f36d50a91d0e62f8eb4d8c +Author: Behdad Esfahbod +Date: Thu Nov 15 10:47:14 2012 -0800 + + Avoid C++ undefined behavior + + https://bugzilla.mozilla.org/show_bug.cgi?id=810823 + + src/hb-open-type-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f41dc2d35b23220d59d38990bb66f1cbd66a55b3 +Author: Behdad Esfahbod +Date: Thu Nov 15 10:36:43 2012 -0800 + + Fix undefined behavior in Indic dottedcircle + + Chromium Issue 158998: Conditional jump in harfbuzz-ng + http://code.google.com/p/chromium/issues/detail?id=158998 + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1eb3e94fe99a072ce422e60ac4d4d89ef489b08a +Author: Behdad Esfahbod +Date: Wed Nov 14 17:25:03 2012 -0800 + + [Thai] Implement PUA-based fallback shaping + + As explained here: + + http://linux.thai.net/~thep/th-otf/shaping.html + + Our output now matches Uniscribe for old fonts (eg. XP Tahoma) with no + Thai GSUB table. + + src/hb-ot-shape-complex-thai.cc | 217 + ++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 217 insertions(+) + +commit 851784f8372004e0a40b698c0cdc2d7db8629aa2 +Author: Behdad Esfahbod +Date: Wed Nov 14 16:24:05 2012 -0800 + + Improve shaper selection + + src/hb-ot-map-private.hh | 8 ++++---- + src/hb-ot-map.cc | 6 ++++-- + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape-complex-private.hh | 13 ++++++++----- + src/hb-ot-shape-complex-thai.cc | 24 ++++++++++++++++++++++-- + 5 files changed, 39 insertions(+), 14 deletions(-) + +commit f3584d3a3a627e38dfd7769975a670db340d2a48 +Author: Behdad Esfahbod +Date: Wed Nov 14 15:55:17 2012 -0800 + + Add test cases for Thai PUA shaping + + .../texts/in-tree/shaper-thai/script-thai/misc/MANIFEST | 1 + + .../in-tree/shaper-thai/script-thai/misc/pua-shaping.txt | + 11 +++++++++++ + 2 files changed, 12 insertions(+) + +commit 43f04a7456419153cb03e610a825056a47824780 +Author: Behdad Esfahbod +Date: Wed Nov 14 15:51:54 2012 -0800 + + Move Thai shaper into a separate file + + src/Makefile.am | 3 +- + ...plex-misc.cc => hb-ot-shape-complex-default.cc} | 114 + ----------------- + src/hb-ot-shape-complex-thai.cc | 141 + +++++++++++++++++++++ + 3 files changed, 143 insertions(+), 115 deletions(-) + +commit ba82325b7a6311b787ae47f41a56964e2f2cba9f +Author: Behdad Esfahbod +Date: Wed Nov 14 15:36:53 2012 -0800 + + Add note re 'Phags-pa letter U+A872, which is Joining_Type=L + + src/hb-ot-shape-complex-arabic.cc | 1 + + 1 file changed, 1 insertion(+) + +commit d469fadce8290c7dda559c5927dd19df65f91c1a +Author: Behdad Esfahbod +Date: Wed Nov 14 15:07:36 2012 -0800 + + [Indic] Exchange abort() for assert() + + src/hb-ot-shape-complex-indic.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 0f80a89de99293ddbf0b8b815fe360677d057e38 +Author: Behdad Esfahbod +Date: Wed Nov 14 15:05:19 2012 -0800 + + Don't route Kharoshthi through the Indic shaper + + It's a simple, right-to-left, script. + + src/hb-ot-shape-complex-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e67072bb179a5c17db04075de74215597fb43c82 +Author: Behdad Esfahbod +Date: Wed Nov 14 15:00:53 2012 -0800 + + [Indic] Handle overstruck matra position + + src/hb-ot-shape-complex-indic-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 7e99e4f0740e47efda5882604954cb7d12700a4b +Author: Behdad Esfahbod +Date: Wed Nov 14 14:09:46 2012 -0800 + + Reposition Lao marks + + Lao marks are center-aligned, unlike Thai ones. + + src/hb-ot-shape-fallback.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 865745b5b87236651f5663cae3461db9cb505eed +Author: Behdad Esfahbod +Date: Wed Nov 14 13:48:26 2012 -0800 + + Don't do fallback positioning for Indic and Thai shapers + + src/hb-ot-shape-complex-arabic.cc | 1 + + src/hb-ot-shape-complex-indic.cc | 1 + + src/hb-ot-shape-complex-misc.cc | 2 ++ + src/hb-ot-shape-complex-private.hh | 1 + + src/hb-ot-shape.cc | 20 +++++--------------- + 5 files changed, 10 insertions(+), 15 deletions(-) + +commit 981748cb2e9b48b77177b19ec1f972cab7afda89 +Author: Behdad Esfahbod +Date: Wed Nov 14 13:38:16 2012 -0800 + + [Indic] If Khmer fonts have a 'liga' feature, use generic shaper + + Seems to produce more coherent results than trying the Indic shaper on + them. I'm looking at you, Kh-* fonts... + + src/hb-ot-shape-complex-private.hh | 21 +++++++++++++++++---- + 1 file changed, 17 insertions(+), 4 deletions(-) + +commit 6b19fa48621dbf36d471d5005f6ae20df350954f +Author: Behdad Esfahbod +Date: Wed Nov 14 11:38:50 2012 -0800 + + Adjust diff rule for the new hb-shape output format + + test/shaping/hb_test_tools.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dde5506fd963e3cec27c3389bb1fc092f86d1e06 +Author: Behdad Esfahbod +Date: Wed Nov 14 11:37:04 2012 -0800 + + [Indic] Don't move virama with left matra + + This is important for the Sinhala U+0DDA split matra since it + decomposes + to U+0DD9,U+0DCA where U+0DD9 is a left matra and U+0DCA is the + virama. + We don't want to move the virama with the left matra. + TEST: U+0D9A,U+0DDA + + Note that we were already doing this in the Uniscribe bug + compatibility + mode. We now do it all the time. + + src/hb-ot-shape-complex-indic.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 82c4d9880a2cd321f6426888511c5f0318f96ad5 +Author: Behdad Esfahbod +Date: Wed Nov 14 10:56:02 2012 -0800 + + Add Sinhala test case for split matra U+0DDA + + .../texts/in-tree/shaper-indic/indic/script-sinhala/misc/misc.txt + | 1 + + 1 file changed, 1 insertion(+) + +commit d04b12853167d756a8cccaf4154f0fd894bce6de +Author: Behdad Esfahbod +Date: Wed Nov 14 10:53:10 2012 -0800 + + Fix test + + test/api/test-buffer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 92f9bfed42f720c1fd78e795845542661aaf4f8a +Author: Behdad Esfahbod +Date: Tue Nov 13 16:50:45 2012 -0800 + + Minor + + src/hb-buffer.h | 26 ++++++++++++++------------ + 1 file changed, 14 insertions(+), 12 deletions(-) + +commit 66ac2ff32e24f0d5658ca172147613081a133847 +Author: Behdad Esfahbod +Date: Tue Nov 13 16:26:32 2012 -0800 + + API change: Remove "mask" from hb_buffer_add() + + I don't expect anybody using hb_buffer_add(), so this shouldn't break + anyone's code. + + src/hb-buffer-private.hh | 1 - + src/hb-buffer.cc | 8 +++----- + src/hb-buffer.h | 1 - + 3 files changed, 3 insertions(+), 7 deletions(-) + +commit 407f80d62589774f845ef1a6a0a7d841b09d57c6 +Author: Behdad Esfahbod +Date: Tue Nov 13 15:33:27 2012 -0800 + + [util] Add --bot / --eot / --preserve-default-ignorables + + util/options.cc | 3 +++ + util/options.hh | 12 ++++++++++++ + 2 files changed, 15 insertions(+) + +commit 78d41d8d69142ae95928b51215c0c0c5e3f5b3f0 +Author: Behdad Esfahbod +Date: Tue Nov 13 15:15:09 2012 -0800 + + Minor + + util/options.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 321f73c16efa0730c96e001d65268f4927a0f735 +Author: Behdad Esfahbod +Date: Tue Nov 13 15:12:24 2012 -0800 + + [util] Add --text-before and --text-after to hb-shape / hb-view + + Use with Arabic, for example, to see the effect on joining. + + util/hb-ot-shape-closure.cc | 4 +++- + util/main-font-text.hh | 2 +- + util/options.cc | 2 ++ + util/options.hh | 18 ++++++++++++++++-- + util/shape-consumer.hh | 6 ++++-- + 5 files changed, 26 insertions(+), 6 deletions(-) + +commit e13f8d280bafc6a6b6e31e2eee587660b8333c56 +Author: Behdad Esfahbod +Date: Tue Nov 13 15:12:06 2012 -0800 + + Fix UTF-8 backward iteration + + Ouch! + + src/hb-utf-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 5669a6cf418f3a8b9281c36e9d662d843be80433 +Author: Behdad Esfahbod +Date: Tue Nov 13 15:11:51 2012 -0800 + + [Arabic] Fix post-context handling + + Ouch! + + src/hb-ot-shape-complex-arabic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0c7df2222862122ebbdc8665a21d6771ef5e0252 +Author: Behdad Esfahbod +Date: Tue Nov 13 14:42:35 2012 -0800 + + Add buffer flags + + New API: + + hb_buffer_flags_t + + HB_BUFFER_FLAGS_DEFAULT + HB_BUFFER_FLAG_BOT + HB_BUFFER_FLAG_EOT + HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES + + hb_buffer_set_flags() + hb_buffer_get_flags() + + We use the BOT flag to decide whether to insert dottedcircle if the + first char in the buffer is a combining mark. + + The PRESERVE_DEFAULT_IGNORABLES flag prevents removal of characters + like + ZWNJ/ZWJ/... + + src/hb-buffer-private.hh | 1 + + src/hb-buffer.cc | 18 ++++++++++++++++++ + src/hb-buffer.h | 13 +++++++++++++ + src/hb-ot-shape-complex-arabic.cc | 40 + ++++++++++++++++++++------------------- + src/hb-ot-shape.cc | 9 ++++++--- + test/api/test-buffer.c | 9 +++++++++ + 6 files changed, 68 insertions(+), 22 deletions(-) + +commit 1c7e55511a870f2689680ca8f977e00879f3b3e3 +Author: Behdad Esfahbod +Date: Tue Nov 13 14:42:22 2012 -0800 + + Minor fix + + Ouch + + src/hb-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c8d4f8b0fe56ce909e3ca07f8a30cb4fb940868b +Author: Behdad Esfahbod +Date: Tue Nov 13 14:10:19 2012 -0800 + + Minor + + test/api/test-object.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 82ecaff736e245e117d70b6ec1497508c6eb08d2 +Author: Behdad Esfahbod +Date: Tue Nov 13 13:57:52 2012 -0800 + + Add hb_buffer_clear() + + Which is like _reset(), but does NOT clear unicode-funcs. + + src/hb-buffer-private.hh | 1 + + src/hb-buffer.cc | 15 +++++++++++++++ + src/hb-buffer.h | 4 ++++ + test/api/test-buffer.c | 22 +++++++++++++++++++++- + 4 files changed, 41 insertions(+), 1 deletion(-) + +commit da43a92b04929e93356ae393803ef101154d2267 +Author: Behdad Esfahbod +Date: Tue Nov 13 13:48:26 2012 -0800 + + 0.9.6 + + NEWS | 28 ++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 29 insertions(+), 1 deletion(-) + +commit 0736915b8ed789a209205fec762997af3a8af89c +Author: Behdad Esfahbod +Date: Tue Nov 13 12:35:35 2012 -0800 + + [Indic] Decompose Sinhala split matras the way old HarfBuzz / + Pango did + + Had to do some refactoring to make this happen... + + Under uniscribe bug compatibility mode, we still plit them + Uniscrie-style, but Jonathan and I convinced ourselves that there + is no + harm doing this the Unicode way. This change makes that happen, and + unbreaks free Sinhala fonts. + + src/hb-ot-shape-complex-arabic.cc | 2 + + src/hb-ot-shape-complex-indic.cc | 74 +++++++++- + src/hb-ot-shape-complex-misc.cc | 133 ++++++++++++++++- + src/hb-ot-shape-complex-private.hh | 28 +++- + src/hb-ot-shape-normalize-private.hh | 6 +- + src/hb-ot-shape-normalize.cc | 278 + ++++++++++------------------------- + src/hb-ot-shape.cc | 5 +- + 7 files changed, 312 insertions(+), 214 deletions(-) + +commit c8149ca85ed97112778590bc9f090f3ee0254100 +Author: Behdad Esfahbod +Date: Tue Nov 13 11:07:20 2012 -0800 + + [hb-shape] Adjust postioning output format + + 1. If there is any offset (x or y), print out both x and y offsets. + + 2. Always print out the advance in the major direction of the buffer. + Ie. even for zero-advance glyphs, print a "+0". This is more + intuitive. + + util/options.cc | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +commit 6fd5335622087e87739684f581aa9f88635ff970 +Author: Behdad Esfahbod +Date: Mon Nov 12 18:42:18 2012 -0800 + + [Indic] Update auto-generated Indic machine to reflect previous commit + + src/hb-ot-shape-complex-indic-machine.hh | 1126 + +++++++++++++++--------------- + 1 file changed, 567 insertions(+), 559 deletions(-) + +commit 9cac1338c4bc3e9034cbfa104291ed0329debefe +Author: Behdad Esfahbod +Date: Mon Nov 12 18:41:22 2012 -0800 + + [Indic] Allow Consonant_Medial's after Consonant's + + Mostly affects Myanmar, but also Tai Tham, Javanese, and Cham. The + latter three are untested (no fonts!). + + src/hb-ot-shape-complex-indic-machine.rl | 3 ++- + src/hb-ot-shape-complex-indic-private.hh | 7 ++++--- + 2 files changed, 6 insertions(+), 4 deletions(-) + +commit d187099cbab8e75f870a2bc9c23b6a1cf226905e +Author: Behdad Esfahbod +Date: Mon Nov 12 18:38:06 2012 -0800 + + [Indic] Categorize Myanmar "tone marks" as nuktas + + src/hb-ot-shape-complex-indic-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8173f23f3f16972c2e8e0a120724533100acfda2 +Author: Behdad Esfahbod +Date: Mon Nov 12 18:37:20 2012 -0800 + + [Indic] Add config for Myanmar + + src/hb-ot-shape-complex-indic.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 9e92978c8aa3d3cdab4d20c81698c56adbb3dbdd +Author: Behdad Esfahbod +Date: Mon Nov 12 18:36:10 2012 -0800 + + [Indic] Route "new" Myanmar tag through the Indic shaper + + Windows 8 adds a Myanmar shaper using the 'mym2' tag. Route that + through the Indic shaper. It's still very broken, but at least this + does NOT break old-style Myanmar shaping using the generic shaper. + + src/hb-ot-shape-complex-private.hh | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 5ab3855f8106158ee7e68797e8c35e63e9216e5d +Author: Behdad Esfahbod +Date: Mon Nov 12 18:27:42 2012 -0800 + + Choose shaper based on chosen OT script tag + + For Arabic and Indic shapers, if the font doesn't have a script system + for the script, use default shaper. + + Make an exception for Arabic script since we have fallback logic for + that one. + + src/hb-ot-map-private.hh | 4 ++++ + src/hb-ot-shape-complex-private.hh | 11 +++++++++-- + 2 files changed, 13 insertions(+), 2 deletions(-) + +commit 9b37b4c5800b158f61602d2aba8a01349e24d251 +Author: Behdad Esfahbod +Date: Mon Nov 12 18:23:38 2012 -0800 + + Make planner available to complex shaper choosing logic + + src/hb-ot-shape-complex-private.hh | 4 ++-- + src/hb-ot-shape.cc | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 6fddf2d7397411bba8a23ac535e8b851495d3105 +Author: Behdad Esfahbod +Date: Mon Nov 12 17:57:24 2012 -0800 + + Refactoring ot-map building to make chosen script available earlier + + src/hb-ot-map-private.hh | 13 ++++++++---- + src/hb-ot-map.cc | 51 + ++++++++++++++++++++++++++-------------------- + src/hb-ot-shape-private.hh | 4 ++-- + 3 files changed, 40 insertions(+), 28 deletions(-) + +commit f17ed8116e7b6429af3fa60bb43d5f4fac66eae3 +Author: Behdad Esfahbod +Date: Mon Nov 12 17:48:26 2012 -0800 + + Minor TODO + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit de796a6fb98f4deda276caa82266b7c830978e0b +Author: Behdad Esfahbod +Date: Mon Nov 12 17:27:51 2012 -0800 + + Add "new" Myanmar OT Script tag + + Windows 8 added support for Myanmar shaping using the "mym2" + script tag, + even though Windows never supported the old "mymr" tag. + + src/hb-ot-tag.cc | 2 ++ + test/api/test-ot-tag.c | 1 + + 2 files changed, 3 insertions(+) + +commit 27f52dc3f6bbb97594a44f27b180aed73d9e5608 +Author: Behdad Esfahbod +Date: Mon Nov 12 16:54:03 2012 -0800 + + Add Myanmar tests from UTN#11 + + .../south-east-asian/script-myanmar/misc/MANIFEST | 1 + + .../south-east-asian/script-myanmar/misc/utn11.txt | 34 + ++++++++++++++++++++++ + 2 files changed, 35 insertions(+) + +commit e9334ce97bb7f1de87fb211bb5a8168033629b14 +Author: Behdad Esfahbod +Date: Mon Nov 12 14:57:02 2012 -0800 + + Break build when ragel is needed and missing + + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dba186711e3f5e723f917b7104e849c4c525d3b8 +Author: Behdad Esfahbod +Date: Mon Nov 12 14:48:33 2012 -0800 + + [Indic] Make more room in the table + + To be used in upcoming commits. + + src/hb-ot-shape-complex-indic-private.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit c4be9917438c45b972ec76dc68409014110f0837 +Author: Behdad Esfahbod +Date: Mon Nov 12 14:27:33 2012 -0800 + + Typo + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 56be677781736bbedc80df6f6aaa2b5f0bc4041c +Author: Behdad Esfahbod +Date: Mon Nov 12 14:09:40 2012 -0800 + + [Indic] Port 'pref' logic to look into font tables + + ...instead of using a hardcoded list of Ra characters. + + src/hb-ot-shape-complex-indic.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit f2c0f59043c93c225274fc0c8177077d16c89d61 +Author: Behdad Esfahbod +Date: Mon Nov 12 14:02:02 2012 -0800 + + [Indic] Port reph handling logic to look into font features + + ...instead of using a hardcoded list of Ra characters. + + src/hb-ot-shape-complex-indic.cc | 48 + +++++++++++++++++++++++++--------------- + 1 file changed, 30 insertions(+), 18 deletions(-) + +commit 43149afbc0007ea075a7017c0e56056c3c0f3614 +Author: Behdad Esfahbod +Date: Mon Nov 12 13:34:17 2012 -0800 + + Route MEETEI_MAYEK through the Indic shaper + + Since it has a couple of left-"matras". + + src/hb-ot-shape-complex-private.hh | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit d0905c3400085f9c0901c558ba1b81b5039510e4 +Author: Behdad Esfahbod +Date: Mon Nov 12 13:02:20 2012 -0800 + + Minor + + src/hb-ot-head-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 365f27ab5ba025bf1be6a882ed213c695cbfed7e +Author: Behdad Esfahbod +Date: Mon Nov 12 11:16:57 2012 -0800 + + Work around older compilers + + As reported on the list: + + I am seeing a similar problem building harfbuzz 0.9.5 with Apple gcc + 4.0.1 on OS X 10.5 Leopard: + + hb-ot-layout-common-private.hh:406: error: 'struct + OT::CoverageFormat1::Iter' is private + hb-ot-layout-common-private.hh:646: error: within this context + hb-ot-layout-common-private.hh:500: error: 'struct + OT::CoverageFormat2::Iter' is private + hb-ot-layout-common-private.hh:647: error: within this context + make[4]: *** [libharfbuzz_la-hb-ot-layout.lo] Error 1 + + Also reported as happening with MSVC 2005. + + src/hb-ot-layout-common-private.hh | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 6b389ddc3623d042ded4731f4d62dc354002fdd0 +Author: Behdad Esfahbod +Date: Mon Nov 12 11:02:56 2012 -0800 + + [Indic] Don't apply 'liga' + + Uniscribe doesn't. And some fonts abuse this feature to get Indic + shaping working in non-complex applications like Adobe's apps. + + No change in numbers: + + BENGALI: 353897 out of 354188 tests passed. 291 failed (0.0821598%) + DEVANAGARI: 707337 out of 707394 tests passed. 57 failed (0.00805774%) + GUJARATI: 366440 out of 366457 tests passed. 17 failed (0.00463902%) + GURMUKHI: 60704 out of 60747 tests passed. 43 failed (0.0707854%) + KANNADA: 951046 out of 951913 tests passed. 867 failed (0.0910798%) + KHMER: 299074 out of 299124 tests passed. 50 failed (0.0167155%) + LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) + MALAYALAM: 1048011 out of 1048334 tests passed. 323 failed + (0.0308108%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271666 out of 271847 tests passed. 181 failed (0.0665816%) + TAMIL: 1091754 out of 1091754 tests passed. 0 failed (0%) + TELUGU: 970557 out of 970573 tests passed. 16 failed (0.00164851%) + TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) + + src/hb-ot-shape-complex-indic.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit d05ac7dc3f2949e85f1fe996315b31b7aae370fe +Author: Behdad Esfahbod +Date: Mon Nov 12 10:26:50 2012 -0800 + + Fix hb-ft glyph name for broken fonts that return empty glyph names + + src/hb-ft.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3bc22eb7b843c77706bb13fc332009097f247813 +Author: Behdad Esfahbod +Date: Mon Nov 12 10:07:28 2012 -0800 + + Minor + + util/options.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4899801155cc0fef7a8aa58c33ac2d30ba34bcc3 +Author: Behdad Esfahbod +Date: Thu Nov 8 15:08:26 2012 -0800 + + U+A872 PHAGS-PA SUPERFIXED LETTER RA is "Right"-Joining + + src/hb-ot-shape-complex-arabic.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 22a685836a59d1c02914761c02d3852810b83ec5 +Author: Behdad Esfahbod +Date: Mon Nov 5 15:20:10 2012 -0800 + + Adjust Mongolian shaping + + For U+1880..U+1886 Uniscribe thinks they are non-joining. + For U+1887 Uniscribe thinks it's joining, but looks wrong to me. + For now, match Uniscribe. + + src/hb-ot-shape-complex-arabic.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit e6b86c8519f894bf7fe18d5c143276521fcacece +Author: Behdad Esfahbod +Date: Mon Nov 5 15:18:49 2012 -0800 + + Add test for non-joining Mongolian letters + + For U+1880..U+1886 Uniscribe thinks they are non-joining. + For U+1887 Uniscribe thinks it's joining, but looks wrong to me. + + .../texts/in-tree/shaper-arabic/script-mongolian/misc/MANIFEST | 1 + + .../in-tree/shaper-arabic/script-mongolian/misc/non-joining.txt | + 8 ++++++++ + 2 files changed, 9 insertions(+) + +commit c26a52fbe62e5ba4d0e1e2ba13bfb6ceb3f773dc +Author: Behdad Esfahbod +Date: Sun Nov 4 16:48:45 2012 -0800 + + Minor + + src/hb-ot-shape-fallback.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f60d3ed35d94f1adcfd73ca05d03d7e81fb5de03 +Author: Behdad Esfahbod +Date: Sun Nov 4 16:44:47 2012 -0800 + + Minor + + src/hb-set-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f5e55754f962184d2fb7dcab837cdba56e8c7731 +Author: Behdad Esfahbod +Date: Fri Nov 2 13:53:18 2012 -0700 + + Add Tifinagh test data + + test/shaping/texts/in-tree/shaper-default/MANIFEST | 2 ++ + .../texts/in-tree/shaper-default/script-tifinagh/MANIFEST | 1 + + .../in-tree/shaper-default/script-tifinagh/misc/MANIFEST | 1 + + .../in-tree/shaper-default/script-tifinagh/misc/misc.txt | + 11 +++++++++++ + 4 files changed, 15 insertions(+) + +commit 10a33296e674ee84b9ed2df25cf373de7d020b8d +Author: Behdad Esfahbod +Date: Fri Nov 2 13:38:55 2012 -0700 + + Minor + + src/hb-ot-tag.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit c21498afd857e78230f761ee5c9e73adece89dd0 +Author: Behdad Esfahbod +Date: Fri Nov 2 10:21:26 2012 -0700 + + Add Mongolian and 'Phags-pa joining test cases + + test/shaping/texts/in-tree/shaper-arabic/MANIFEST | 1 + + .../in-tree/shaper-arabic/script-mongolian/misc/misc.txt | 3 +++ + .../texts/in-tree/shaper-arabic/script-phags-pa/MANIFEST | 1 + + .../in-tree/shaper-arabic/script-phags-pa/misc/MANIFEST | 1 + + .../in-tree/shaper-arabic/script-phags-pa/misc/misc.txt | 14 + ++++++++++++++ + 5 files changed, 20 insertions(+) + +commit 3ba7bc14ea652d27639f34109e51a497a678a54a +Author: Behdad Esfahbod +Date: Thu Nov 1 20:05:04 2012 -0700 + + Implement 'Phags-pa shaping + + Through the Arabic shaper. It's similar to Mongolian. + + src/hb-ot-shape-complex-arabic.cc | 15 ++++++++++++--- + src/hb-ot-shape-complex-private.hh | 4 +--- + 2 files changed, 13 insertions(+), 6 deletions(-) + +commit 431bef2e16c7888ca3960f5797432d3a20903550 +Author: Behdad Esfahbod +Date: Thu Nov 1 16:26:01 2012 -0700 + + Minor build fix + + test/api/Makefile.am | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit da70111ab234e8b740ce6fb1789a1809fbec0c44 +Author: Behdad Esfahbod +Date: Wed Oct 31 13:45:30 2012 -0700 + + Don't clear buffer pre-context if no new context is being provided + + Patch from Jonathan Kew. + + Part of fixing: + + Mozilla Bug 801410 - avoid inserting dotted-circle for run-initial + Unicode combining characters in "simple" scripts such as Latin + + https://bugzilla.mozilla.org/show_bug.cgi?id=801410 + + src/hb-buffer.cc | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit 0bc7a38463bfb37f12efeb1b8cb2024cf4a347bc +Author: Behdad Esfahbod +Date: Mon Oct 29 22:02:45 2012 -0700 + + [OT] Fix ReverseChainingSubst + + We should make it clear that we don't want output buffer in this case, + otherwise buffer->backtrack_len() would be wrong. + + src/hb-buffer-private.hh | 1 + + src/hb-buffer.cc | 13 +++++++++++++ + src/hb-ot-layout-gsub-table.hh | 1 + + 3 files changed, 15 insertions(+) + +commit 2616689d159024d2b1cb1e68f9936b2129bf9be6 +Author: Behdad Esfahbod +Date: Mon Oct 29 21:51:56 2012 -0700 + + More tracing fixups + + src/hb-ot-layout-gsubgpos-private.hh | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +commit 937f8d3871863b8b1ed1d8900cf41999d92ba30f +Author: Behdad Esfahbod +Date: Mon Oct 29 21:49:33 2012 -0700 + + [Arabic] Enable dlig and mset for Arabic + + That's what the spec says, and what Uniscribe does. + + src/hb-ot-shape-complex-arabic.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 911ed096980630fd4a37bf2024036daae13a6056 +Author: Behdad Esfahbod +Date: Mon Oct 29 19:42:19 2012 -0700 + + Ignore gid0 in test results + + test/shaping/hb_test_tools.py | 1 + + 1 file changed, 1 insertion(+) + +commit bc513add7999baf32f126ceebbd318105ee66985 +Author: Behdad Esfahbod +Date: Mon Oct 29 19:03:55 2012 -0700 + + Add missing TRACE_RETURN + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 10b88d89ef1efcfddbbfabd3669399b472c8a900 +Author: Behdad Esfahbod +Date: Mon Oct 29 18:18:24 2012 -0700 + + Add Ethiopic test case + + This sequence: U+120B,U+135F,U+120B with the Nyala font from Win7 + exposes a GPOS bug in Uniscribe, in that the positioned mark is + wrongly + moved as a result a following kern. + + This is the one "failure" in the Ethiopic test suite :-). + + ETHIOPIC: 118900 out of 118901 tests passed. 1 failed (0.000841036%) + + test/shaping/texts/in-tree/shaper-default/script-ethiopic/MANIFEST | + 1 + + test/shaping/texts/in-tree/shaper-default/script-ethiopic/misc/MANIFEST | + 1 + + test/shaping/texts/in-tree/shaper-default/script-ethiopic/misc/misc.txt | + 1 + + 3 files changed, 3 insertions(+) + +commit 88d3c98e309e14c3115825d1d8d40d0b3eec2d97 +Author: Behdad Esfahbod +Date: Mon Oct 29 16:27:02 2012 -0700 + + [Indic] Position pre-base reordering Ra after Chillus in Malayalam + + The logic for pre-base reordering follows the left matra logic. + We had an exception for Malayalam/Tamil in the left matra + repositioning + which was not reflected in pre-base reordering. + + Malayalam failures down from 337 to 323. + + BENGALI: 353996 out of 354285 tests passed. 289 failed (0.0815727%) + DEVANAGARI: 707339 out of 707394 tests passed. 55 failed (0.00777502%) + GUJARATI: 366489 out of 366506 tests passed. 17 failed (0.0046384%) + GURMUKHI: 60769 out of 60809 tests passed. 40 failed (0.0657797%) + KANNADA: 951086 out of 951913 tests passed. 827 failed (0.0868777%) + KHMER: 299106 out of 299124 tests passed. 18 failed (0.00601757%) + LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) + MALAYALAM: 1048011 out of 1048334 tests passed. 323 failed + (0.0308108%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271726 out of 271847 tests passed. 121 failed (0.0445103%) + TAMIL: 1091837 out of 1091837 tests passed. 0 failed (0%) + TELUGU: 970558 out of 970573 tests passed. 15 failed (0.00154548%) + TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) + + src/hb-ot-shape-complex-indic.cc | 35 +++++++++++++++++++++-------------- + 1 file changed, 21 insertions(+), 14 deletions(-) + +commit 21bf796954678d02f136709cade43adef6f8f42b +Author: Behdad Esfahbod +Date: Mon Oct 29 14:21:09 2012 -0700 + + Add missed file + + src/hb-ucdn/COPYING | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit 01013a0f5c58d5d54a37e5b4d6692e0bbd4baf80 +Author: Behdad Esfahbod +Date: Mon Oct 29 10:56:04 2012 -0700 + + Include config.h.in in tree + + I typically don't like including generating files in tree. + But like to + make an exception for this, since this forms the canonical list of + options one would need to go through when building with alternative + build systems. + + Makefile.am | 1 - + config.h.in | 160 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 160 insertions(+), 1 deletion(-) + +commit 02ed52169ad3bb48f4989f721b0c6572e064a712 +Author: Behdad Esfahbod +Date: Sun Oct 28 21:26:19 2012 -0700 + + Improve license information + + COPYING | 2 ++ + src/hb-icu-le/COPYING | 2 ++ + src/hb-icu-le/Makefile.am | 2 +- + src/hb-ucdn/Makefile.am | 2 +- + src/hb-ucdn/README | 7 +++++++ + 5 files changed, 13 insertions(+), 2 deletions(-) + +commit 4c1d9244617e472464722e64d2cdbc1f9e8827f6 +Author: Behdad Esfahbod +Date: Sun Oct 28 20:27:25 2012 -0700 + + Minor + + src/hb-icu-le.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 38b015e57ffa75d3b078a368c23685beb7c3f946 +Author: Behdad Esfahbod +Date: Sun Oct 28 20:11:47 2012 -0700 + + Fix hb_buffer_set_length(buffer, 0) + + Was causing invalid realloc()s. + + src/hb-buffer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b7115b63be72e109b51f538ba581aed1017b2d55 +Author: Behdad Esfahbod +Date: Sun Oct 28 20:11:42 2012 -0700 + + Add XXX + + src/hb-icu-le.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 71ee1f24503cd066ffc1a36cc5dd9a3c1d1a6dfd +Author: Behdad Esfahbod +Date: Sun Oct 28 19:18:11 2012 -0700 + + Port to ICU LayoutEngine C API + + Incidentally, this makes it not crash with icu-le-hb anymore... + I'm not smart / stupid enough to spend two more days debugging C++ + linking issues, and this is ABI-stable at least. + + src/hb-icu-le.cc | 31 ++++++++++++++++--------------- + 1 file changed, 16 insertions(+), 15 deletions(-) + +commit 0144f05e57088b30ac894cdae8b04b265d4dfbe7 +Author: Behdad Esfahbod +Date: Fri Oct 26 13:48:06 2012 -0700 + + Remove unused members + + src/hb-icu-le/PortableFontInstance.h | 3 --- + 1 file changed, 3 deletions(-) + +commit cf3afd8979b1db76d437f428cbd51cb363e0d18e +Author: Behdad Esfahbod +Date: Thu Oct 25 16:32:54 2012 -0700 + + Rename and revamp is_zero_width() to be is_default_ignorable() + + That's really the logic desired. Except that MONGOLIAN VOWEL + SEPARATOR + is not default_ignorable but it really should be. Reported to + Unicode. + + Based on suggestion from Konstantin Ritt. + + src/hb-fallback-shape.cc | 2 +- + src/hb-ot-shape-private.hh | 4 +-- + src/hb-ot-shape.cc | 2 +- + src/hb-unicode-private.hh | 90 + +++++++++++++++++++++++++++++----------------- + 4 files changed, 62 insertions(+), 36 deletions(-) + +commit a724139e641bf1592b1ff786a75a9de2ea8163cf +Author: Behdad Esfahbod +Date: Wed Oct 24 14:02:15 2012 -0700 + + Update TODO + + TODO | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +commit 13c058472913b7b6d689f9022226079da65420b0 +Author: Behdad Esfahbod +Date: Sun Oct 14 18:37:09 2012 -0500 + + 0.9.5 + + NEWS | 23 +++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 24 insertions(+), 1 deletion(-) + +commit fecdfa95daf4916695f23e7dab89ab363be11b89 +Author: Behdad Esfahbod +Date: Sun Oct 7 17:19:58 2012 -0400 + + Fixup hb_ot_shape_closure() + + Broke it when merged cmap mapping and normalizer. Ouch! + + src/hb-ot-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2d1dcb3ce3354c2d5e2b4d1d291beb8d23cdea22 +Author: Behdad Esfahbod +Date: Sun Oct 7 17:13:46 2012 -0400 + + Mark debug message functions static + + src/hb-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 9947bd6daffb5ec76b67536575e7617ba4f10b1e +Author: Behdad Esfahbod +Date: Tue Oct 2 20:44:43 2012 -0400 + + Update UCDN to upstream commit + 3f159c87824230b59af56e40e2db32caf6afa51a + + - Unicode 6.2.0 goodness, + - Unassigned codepoints now have correct properties. Passes test + suite. + + src/hb-ucdn/unicodedata_db.h | 1966 + ++++++++++++++++++++++-------------------- + 1 file changed, 1036 insertions(+), 930 deletions(-) + +commit 32dbfcf763d1ae497d3c95de986a83441331678f +Author: Behdad Esfahbod +Date: Tue Oct 2 17:42:13 2012 -0400 + + Fix visibility of UCDN symbols + + src/hb-ucdn.cc | 2 -- + src/hb-ucdn/ucdn.h | 19 +++++++++++++++++++ + 2 files changed, 19 insertions(+), 2 deletions(-) + +commit 3f33f0d1f2603f22e86adffe3c3836136ba5e5fd +Author: Behdad Esfahbod +Date: Tue Oct 2 16:03:18 2012 -0400 + + Import UCDN into source tree + + https://github.com/grigorig/ucdn + + configure.ac | 11 +- + src/Makefile.am | 7 + + src/hb-ucdn.cc | 207 ++ + src/hb-ucdn/Makefile.am | 18 + + src/hb-ucdn/README | 33 + + src/hb-ucdn/ucdn.c | 282 +++ + src/hb-ucdn/ucdn.h | 290 +++ + src/hb-ucdn/unicodedata_db.h | 4648 + ++++++++++++++++++++++++++++++++++++++++++ + src/hb-unicode.cc | 3 + + 9 files changed, 5498 insertions(+), 1 deletion(-) + +commit 0e292eb2a2abbac152eeea2060e58b7a66449745 +Author: Behdad Esfahbod +Date: Tue Oct 2 14:59:00 2012 -0400 + + Remove Glib thread-safety support + + Now that we have pthread detection in configure, we don't need Glib + anymore. Glib will only be a Unicode data provider. + + configure.ac | 8 ++++---- + src/hb-atomic-private.hh | 13 ------------- + src/hb-mutex-private.hh | 20 -------------------- + 3 files changed, 4 insertions(+), 37 deletions(-) + +commit 66efe896483c58f3ef9bd218c02bb7ea604f68ee +Author: Behdad Esfahbod +Date: Tue Oct 2 14:55:32 2012 -0400 + + Check for pthreads + + configure.ac | 7 +++++++ + src/Makefile.am | 5 +++++ + 2 files changed, 12 insertions(+) + +commit 10a8162dddb8b39ae130fe5bb7d1819471fa7e06 +Author: Behdad Esfahbod +Date: Tue Oct 2 14:46:34 2012 -0400 + + Add ax_pthread.m4 + + m4/ax_pthread.m4 | 309 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 309 insertions(+) + +commit 8ac34bc6ff1d0646503a45659b1846d8cf9c0603 +Author: Behdad Esfahbod +Date: Tue Oct 2 14:46:04 2012 -0400 + + Add pkg.m4 to git repo + + m4/pkg.m4 | 157 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 157 insertions(+) + +commit c7afac0aa6e51e6a49ebf13f72537398698c9e49 +Author: Behdad Esfahbod +Date: Tue Oct 2 14:44:47 2012 -0400 + + Add AC_CONFIG_MACRODIR + + Makefile.am | 2 ++ + configure.ac | 2 ++ + 2 files changed, 4 insertions(+) + +commit f2eb3fa9dca8d21fae20c9b9dddad3245df74a05 +Author: Behdad Esfahbod +Date: Tue Sep 25 21:35:35 2012 -0400 + + [OT] Only insert dottedcircle if at the beginning of paragraph + + If the first char in the run is a combining mark, but there is text + before the run, don't insert dottedcircle. + + Part of addressing: + https://bugzilla.redhat.com/show_bug.cgi?id=858736 + + src/hb-ot-shape.cc | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit bdc2fc8294da7f374701aafe9f5a82d60633946f +Author: Behdad Esfahbod +Date: Tue Sep 25 21:32:35 2012 -0400 + + [Arabic] Respect Arabic joining from neighboring context + + Now we respect Arabic joining across runs. + + src/hb-ot-shape-complex-arabic.cc | 31 +++++++++++++++++++++++++++++-- + 1 file changed, 29 insertions(+), 2 deletions(-) + +commit 05207a79e0ae1769c5feaebe3fd99bdf9cfcf834 +Author: Behdad Esfahbod +Date: Tue Sep 25 17:44:53 2012 -0400 + + [buffer] Save pre/post textual context + + To be used for a variety of purposes. We save up to five characters + in each direction. No public API changes, everything is taken care + of already. All clients need to do is to call hb_buffer_add_utf* with + the full text + segment info (or at least some context) instead of + just passing in the segment. + + Various operations (hb_buffer_reset, hb_buffer_set_length, + hb_buffer_add*) automatically reset the relevant contexts. + + src/hb-buffer-private.hh | 13 ++++++++++++- + src/hb-buffer.cc | 44 + ++++++++++++++++++++++++++++++++++++++++---- + src/hb-buffer.h | 2 +- + 3 files changed, 53 insertions(+), 6 deletions(-) + +commit 89ac39dbbe028e6379f64392f2e590e3f1fdd847 +Author: Behdad Esfahbod +Date: Tue Sep 25 13:59:24 2012 -0400 + + Add hb_utf_prev() + + src/hb-utf-private.hh | 71 + +++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 69 insertions(+), 2 deletions(-) + +commit 70ea4ac6887c7057113d714a98e55738b6196562 +Author: Behdad Esfahbod +Date: Tue Sep 25 12:30:16 2012 -0400 + + Slightly optimize UTF-8 parsing + + src/hb-utf-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4445e5e2ecc257a5d0fa2f2715bb7181a47346da +Author: Behdad Esfahbod +Date: Tue Sep 25 12:26:12 2012 -0400 + + [buffer] Cleanup / optimize UTF-16 parsing a bit + + src/hb-utf-private.hh | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit 1f66c3c1a0eb869c0d85a015235313177e0cec62 +Author: Behdad Esfahbod +Date: Tue Sep 25 11:42:16 2012 -0400 + + Add hb_utf_strlen() + + Speeds up UTF-8 parsing by calling strlen(). + + src/hb-buffer.cc | 13 ++----------- + src/hb-utf-private.hh | 22 ++++++++++++++++++++++ + 2 files changed, 24 insertions(+), 11 deletions(-) + +commit 7f19ae7b9f806a2e35206b2ad41651c5f80b2537 +Author: Behdad Esfahbod +Date: Tue Sep 25 11:22:28 2012 -0400 + + [buffer] Templatize UTF handling + + Also move UTF routines into a separate file, to be reused from shapers + that need it. + + src/Makefile.am | 1 + + src/hb-buffer.cc | 157 + +++++++++++++------------------------------------- + src/hb-utf-private.hh | 113 ++++++++++++++++++++++++++++++++++++ + 3 files changed, 155 insertions(+), 116 deletions(-) + +commit 0e0a4da9b7677a09e00d27313236e1f333864dd6 +Author: Behdad Esfahbod +Date: Tue Sep 25 11:09:04 2012 -0400 + + [buffer] Towards template'izing different UTF adders + + src/hb-buffer.cc | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +commit 7d37280600c157f3c4eae8746e99511702a58e8f +Author: Behdad Esfahbod +Date: Tue Sep 25 11:04:41 2012 -0400 + + Minor + + src/hb-buffer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 54d5da4ee9d902ff36473cec558137eef8f23825 +Author: Behdad Esfahbod +Date: Tue Sep 25 10:50:41 2012 -0400 + + Remove unused indic.cc + + src/Makefile.am | 6 +----- + src/indic.cc | 51 --------------------------------------------------- + 2 files changed, 1 insertion(+), 56 deletions(-) + +commit fab7a71f110ed646745d54b23284537c50058c21 +Author: Behdad Esfahbod +Date: Mon Sep 24 21:51:13 2012 -0400 + + [Indic] Import ragel-generated Indic machine in git + + I don't expect ragel to be creating too much noise in its generated + output, and including this in-tree helps users right now. We can + revisit this later if it proved to be too much trouble. + + autogen.sh | 6 - + src/Makefile.am | 1 - + src/hb-ot-shape-complex-indic-machine.hh | 1314 + ++++++++++++++++++++++++++++++ + 3 files changed, 1314 insertions(+), 7 deletions(-) + +commit 20a840c7cd08069720050782b4533cde505df09a +Author: Behdad Esfahbod +Date: Mon Sep 24 20:23:00 2012 -0400 + + Use a C++ linker on Windows + + On Windows we don't care whether or not we link to libstdc++. + Seems to fix build with mingw32 on msys, as reported by Werner. + + src/Makefile.am | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit eb7669a38072b66eef3bd905a93c4815bef3f0e5 +Author: Behdad Esfahbod +Date: Tue Sep 18 19:42:06 2012 -0400 + + Better autofoo + + src/Makefile.am | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit d00f7d83750258eff915a3826700c4819e63e481 +Author: Behdad Esfahbod +Date: Mon Sep 17 20:59:09 2012 -0400 + + Fix dependencies + + src/Makefile.am | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 811eefe225d20b20f1de20c6e62a0ebd6d89102a +Author: Behdad Esfahbod +Date: Mon Sep 10 09:56:27 2012 -0400 + + Return NULL, not false + + Oh well... + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 166b5cf7ec2d37fb54a909c437ccdec1edaf37aa +Author: Behdad Esfahbod +Date: Fri Sep 7 14:55:07 2012 -0400 + + [Indic] Find syllables before any features are applied + + With FreeSerif, it seems that the 'ccmp' feature does ligature + substituttions. That was then causing syllable match failures. + We now + find syllables before any features have been applied. + + Test sequence: U+0D9A,U+0DCA,U+200D,U+0DBB,U+0DCF + + src/hb-ot-shape-complex-indic-machine.rl | 4 +- + src/hb-ot-shape-complex-indic.cc | 56 + +++++++++++++++------- + .../indic/script-sinhala/misc/misc.txt | 1 + + 3 files changed, 43 insertions(+), 18 deletions(-) + +commit 96fdc04e5c6daafce3d45e7508418e4db94df44c +Author: Behdad Esfahbod +Date: Thu Sep 6 22:26:16 2012 -0400 + + Add hb_buffer_[sg]et_content_type + + And hb_buffer_content_type_t and enum values. + + TODO | 1 + + src/hb-buffer-private.hh | 2 ++ + src/hb-buffer.cc | 34 ++++++++++++++++++++++++++++++++++ + src/hb-buffer.h | 14 ++++++++++++++ + src/hb-shape.cc | 5 +++++ + 5 files changed, 56 insertions(+) + +commit e30ebd2794b37bd8ec716a258d5cb017fb1dfadc +Author: Behdad Esfahbod +Date: Thu Sep 6 22:09:06 2012 -0400 + + Add hb_feature_to/from_string() + + TODO | 4 +- + src/hb-common.cc | 9 +++ + src/hb-common.h | 6 +- + src/hb-shape.cc | 168 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-shape.h | 13 +++++ + util/options.cc | 132 ++----------------------------------------- + 6 files changed, 201 insertions(+), 131 deletions(-) + +commit f67917161bbe317a33d6407fbc62ebffcafe7154 +Author: Behdad Esfahbod +Date: Thu Sep 6 17:22:31 2012 -0400 + + [OT] Do per-ligature-component fallback mark positioning + + With this in place, you can remove GDEF/GSUB/GPOS tables from Arabic + fonts and still get per-component marks positioned on + oh-yeah-fallback-formed LAM-ALEF ligatures with marks in between + the LAM + and ALEF. + + Now *that*'s pretty cool, if a bit anachronistic... + + src/hb-ot-shape-fallback.cc | 43 + ++++++++++++++++++++++++++++++++++++------- + 1 file changed, 36 insertions(+), 7 deletions(-) + +commit 525c6855783a018d52867b9ece2ee90868ff1f91 +Author: Behdad Esfahbod +Date: Thu Sep 6 16:02:07 2012 -0400 + + [OT] Make fallback mark positioning more robust + + ...with clusters spanning multiple base characters. + + src/hb-ot-shape-fallback.cc | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit 5d502443f5a07cbd0aa860dd71a0fa4ea8b6ff9f +Author: Behdad Esfahbod +Date: Thu Sep 6 15:29:29 2012 -0400 + + [old] Clear offset array + + src/hb-old.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 9433c218b4853442dd9ad53d0588a837a33dbf1e +Author: Behdad Esfahbod +Date: Thu Sep 6 14:27:15 2012 -0400 + + [OT] Simplify fallback positioning condition + + src/hb-ot-shape-fallback.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 028a1706f898bfcee0d14acfba47ebe1de09f0c4 +Author: Behdad Esfahbod +Date: Thu Sep 6 14:25:48 2012 -0400 + + Refactor common macro + + src/hb-ot-shape-fallback.cc | 5 +---- + src/hb-ot-shape-normalize.cc | 5 +---- + src/hb-ot-shape.cc | 5 +---- + src/hb-unicode-private.hh | 9 +++++++++ + 4 files changed, 12 insertions(+), 12 deletions(-) + +commit 07cfbe21b511056d5c3c75cbfe84e4e982c3e8fb +Author: Behdad Esfahbod +Date: Thu Sep 6 01:16:39 2012 -0400 + + [OT] Streamline Arabic fallback shaping table + + src/gen-arabic-table.py | 6 +- + src/hb-ot-shape-complex-arabic-fallback.hh | 2 +- + src/hb-ot-shape-complex-arabic-table.hh | 266 + ++++++++++++++--------------- + 3 files changed, 137 insertions(+), 137 deletions(-) + +commit 82f6b6f388b801a1483854cb56a2cadbb94e0f2b +Author: Behdad Esfahbod +Date: Thu Sep 6 01:12:50 2012 -0400 + + Minor + + src/hb-ot-shape-complex-arabic-fallback.hh | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +commit fabd3113a98c5f4114f48920fa7ea38bd65a8d32 +Author: Behdad Esfahbod +Date: Wed Sep 5 22:19:28 2012 -0400 + + [OT] Port Arabic fallback shaping to synthetic GSUB + + All of init/medi/fina/isol and rlig implemented. + + Let there be dragons... ⻯ + + src/Makefile.am | 1 + + src/hb-open-type-private.hh | 69 +++++--- + src/hb-ot-layout-common-private.hh | 9 +- + src/hb-ot-layout-gsub-table.hh | 11 +- + src/hb-ot-map-private.hh | 6 + + src/hb-ot-map.cc | 1 + + src/hb-ot-shape-complex-arabic-fallback.hh | 252 + +++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-arabic.cc | 158 ++++++------------ + src/hb-ot-shape.cc | 7 +- + src/hb-private.hh | 11 +- + 10 files changed, 369 insertions(+), 156 deletions(-) + +commit f0b8ed1b6dd9f1d2b9084c101a6fc5dee0cc22a8 +Author: Behdad Esfahbod +Date: Wed Sep 5 17:32:57 2012 -0400 + + [Indic] Allow "H,ZWJ,M" + + Uniscribe accepts a Halant,ZWJ before matras. Allow that. + + BENGALI down from 295 to 291 + DEVANAGARI down from 69 to 57 + GUJARATI down from 19 to 17 + KANNADA down from 871 to 867 + MALAYALAM down from 340 to 337 + TELUGU down from 20 to 16 + + Currently at: + + BENGALI: 353897 out of 354188 tests passed. 291 failed (0.0821598%) + DEVANAGARI: 707337 out of 707394 tests passed. 57 failed (0.00805774%) + GUJARATI: 366440 out of 366457 tests passed. 17 failed (0.00463902%) + GURMUKHI: 60704 out of 60747 tests passed. 43 failed (0.0707854%) + KANNADA: 951046 out of 951913 tests passed. 867 failed (0.0910798%) + KHMER: 299077 out of 299124 tests passed. 47 failed (0.0157125%) + LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) + MALAYALAM: 1047997 out of 1048334 tests passed. 337 failed + (0.0321462%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271666 out of 271847 tests passed. 181 failed (0.0665816%) + TAMIL: 1091754 out of 1091754 tests passed. 0 failed (0%) + TELUGU: 970557 out of 970573 tests passed. 16 failed (0.00164851%) + TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4ed717ef61813fa16cf74f2874848e9feb81568f +Author: Behdad Esfahbod +Date: Wed Sep 5 17:21:17 2012 -0400 + + [Indic] Relax grammar + + Now that we insert dotted-circle, tests break more easily when + our indic + machine breaks. + + In particular, a few Devanagari tests were having sequences like + "C,H,ZWJ,N", and because of the ZWJ the Nukta does NOT get reordered + to + before the Halant as the grammar used to expect... Fixup. + + Another case is as simple as "C,ZWJ,SM". + + Fixes 10 out of 79 failures: + + DEVANAGARI: 707325 out of 707394 tests passed. 69 failed (0.00975411%) + + src/hb-ot-shape-complex-indic-machine.rl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit aa7141efe49991a1160489106984e95163fe2ab8 +Author: Behdad Esfahbod +Date: Wed Sep 5 15:54:21 2012 -0400 + + [Indic] Fix Khmer syllable-final coeng-consonant + + Brings down Khmer failures from 162 to 47. + + KHMER: 299077 out of 299124 tests passed. 47 failed (0.0157125%) + + Also rebaselined some of the test files that had only-inherited lines. + Removing those, the stats are: + + BENGALI: 353893 out of 354188 tests passed. 295 failed (0.0832891%) + DEVANAGARI: 707315 out of 707394 tests passed. 79 failed (0.0111678%) + GUJARATI: 366438 out of 366457 tests passed. 19 failed (0.00518478%) + GURMUKHI: 60704 out of 60747 tests passed. 43 failed (0.0707854%) + KANNADA: 951042 out of 951913 tests passed. 871 failed (0.0915%) + KHMER: 299077 out of 299124 tests passed. 47 failed (0.0157125%) + LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) + MALAYALAM: 1047994 out of 1048334 tests passed. 340 failed + (0.0324324%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271666 out of 271847 tests passed. 181 failed (0.0665816%) + TAMIL: 1091754 out of 1091754 tests passed. 0 failed (0%) + TELUGU: 970553 out of 970573 tests passed. 20 failed (0.00206064%) + TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) + + Still some regressions, but some of the more egregious cases are + addressed. + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit efb8d3eb713bca7cbfca41380a012bdb4d380e5c +Author: Behdad Esfahbod +Date: Wed Sep 5 15:50:47 2012 -0400 + + Fixup test failure reporting + + After we implemented dotted-circle, we were still ignoring any tests + that had dottedcircle in it for any of the shapers. That meant + that if + we wrongly outputted dottedcircle, the test was being ignored. Ouch! + + Fixing that shows regressions across the board. Most are Uniscribe + bugs: NOT inserting dotted-circle when it should. Some are arou + machine bugs. This is in fact a nice way to catch Indic-machine + deficiencies and when I fix the regressions, our clusters should be + much closer to Uniscribe. For now, we regressed from: + + BENGALI: 353997 out of 354285 tests passed. 288 failed (0.0812905%) + DEVANAGARI: 707339 out of 707394 tests passed. 55 failed (0.00777502%) + GUJARATI: 366489 out of 366506 tests passed. 17 failed (0.0046384%) + GURMUKHI: 60769 out of 60809 tests passed. 40 failed (0.0657797%) + KANNADA: 951086 out of 951913 tests passed. 827 failed (0.0868777%) + KHMER: 299106 out of 299124 tests passed. 18 failed (0.00601757%) + LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) + MALAYALAM: 1048104 out of 1048416 tests passed. 312 failed + (0.0297592%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271747 out of 271847 tests passed. 100 failed (0.0367854%) + TAMIL: 1091837 out of 1091837 tests passed. 0 failed (0%) + TELUGU: 970558 out of 970573 tests passed. 15 failed (0.00154548%) + TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) + + To: + + BENGALI: 353990 out of 354285 tests passed. 295 failed (0.0832663%) + DEVANAGARI: 707315 out of 707394 tests passed. 79 failed (0.0111678%) + GUJARATI: 366447 out of 366506 tests passed. 59 failed (0.016098%) + GURMUKHI: 60707 out of 60809 tests passed. 102 failed (0.167738%) + KANNADA: 951042 out of 951913 tests passed. 871 failed (0.0915%) + KHMER: 298962 out of 299124 tests passed. 162 failed (0.0541581%) + LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) + MALAYALAM: 1048074 out of 1048416 tests passed. 342 failed + (0.0326206%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271666 out of 271847 tests passed. 181 failed (0.0665816%) + TAMIL: 1091835 out of 1091837 tests passed. 2 failed (0.000183178%) + TELUGU: 970553 out of 970573 tests passed. 20 failed (0.00206064%) + TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) + + Investigating. + + test/shaping/hb_test_tools.py | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 27bd55bd2ca599d501f10c2fae81861137517e46 +Author: Behdad Esfahbod +Date: Wed Sep 5 15:11:14 2012 -0400 + + [Indic] Tamil does not have half-forms either + + The Win7 Tamil font does not realy on this behavior, but the WinXP + version does. Handle Tamil like Malayalam: Matras always move to + before base. + + WinXP Tamil failures went down from 168964 (15.4752%) to 167 + (0.0152953%) (two orders of magnitude reduction!). + + Included in this is a minor fixup that actually fixed a few tests + with non-Tamil too. Numbers at: + + BENGALI: 353997 out of 354285 tests passed. 288 failed (0.0812905%) + DEVANAGARI: 707339 out of 707394 tests passed. 55 failed (0.00777502%) + GUJARATI: 366489 out of 366506 tests passed. 17 failed (0.0046384%) + GURMUKHI: 60769 out of 60809 tests passed. 40 failed (0.0657797%) + KANNADA: 951086 out of 951913 tests passed. 827 failed (0.0868777%) + KHMER: 299106 out of 299124 tests passed. 18 failed (0.00601757%) + LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) + MALAYALAM: 1048104 out of 1048416 tests passed. 312 failed + (0.0297592%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271747 out of 271847 tests passed. 100 failed (0.0367854%) + TAMIL: 1091837 out of 1091837 tests passed. 0 failed (0%) + TELUGU: 970558 out of 970573 tests passed. 15 failed (0.00154548%) + TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) + + src/hb-ot-shape-complex-indic.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 87b75d0a4aa03fe7a03e3bf7baf8ece131aec1bb +Author: Behdad Esfahbod +Date: Tue Sep 4 23:06:38 2012 -0400 + + [OT] Allow adding features with fallback implementation + + src/hb-ot-map-private.hh | 7 ++++--- + src/hb-ot-map.cc | 6 ++++-- + 2 files changed, 8 insertions(+), 5 deletions(-) + +commit 1d3947a6bda6986c9c7d993589053051c119cc81 +Author: Behdad Esfahbod +Date: Tue Sep 4 22:42:17 2012 -0400 + + Minor + + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit b3b89b66586897a69b410ef02e7434691de84ae6 +Author: Behdad Esfahbod +Date: Tue Sep 4 21:13:17 2012 -0400 + + [OT] Add SubstLookup serialize API + + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 65 + +++++++++++++++++++++++++++++++++++++- + 2 files changed, 65 insertions(+), 2 deletions(-) + +commit 715e03bc21d6adaa8e1f647235843839dc47dad1 +Author: Behdad Esfahbod +Date: Tue Sep 4 20:10:17 2012 -0400 + + Minor + + src/hb-open-type-private.hh | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +commit 652d1e0d64e47313ead2fc8318d1236f0e0d80ca +Author: Behdad Esfahbod +Date: Tue Sep 4 20:00:44 2012 -0400 + + [OT] Start adding Lookup-level serialize API + + src/hb-ot-layout-common-private.hh | 20 +++++++++++++++++++- + 1 file changed, 19 insertions(+), 1 deletion(-) + +commit a930c68e9c50aade78c1eb0eef075c9c117e4ef6 +Author: Behdad Esfahbod +Date: Tue Sep 4 18:17:57 2012 -0400 + + [OT] More serialize. Implements all basic GSUB subtables + + src/hb-open-type-private.hh | 53 +++++++++++++++- + src/hb-ot-layout-common-private.hh | 8 ++- + src/hb-ot-layout-gsub-table.hh | 125 + +++++++++++++++++++++++++++++-------- + 3 files changed, 156 insertions(+), 30 deletions(-) + +commit 1b38b4e817d871b9549be65af6030bd0eea7f775 +Author: Behdad Esfahbod +Date: Tue Sep 4 18:17:21 2012 -0400 + + Minor + + src/hb-ot-layout-gsub-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f7e81ce0b882aa942ae33c787e741c5e8e5a0173 +Author: Behdad Esfahbod +Date: Tue Sep 4 15:32:37 2012 -0400 + + 0.9.4 + + NEWS | 18 ++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 19 insertions(+), 1 deletion(-) + +commit 2bd9fe359839a653f7caae534bf768af1735f155 +Author: Behdad Esfahbod +Date: Tue Sep 4 15:15:19 2012 -0400 + + Refactor + + src/hb-ot-layout-gpos-table.hh | 7 ++----- + src/hb-ot-layout-gsub-table.hh | 16 +++++----------- + src/hb-ot-layout-gsubgpos-private.hh | 13 +++---------- + src/hb-ot-layout.cc | 23 +++++++++++++++++------ + src/hb-ot-shape-complex-arabic.cc | 4 +--- + 5 files changed, 28 insertions(+), 35 deletions(-) + +commit a5ddd9e31cd7906c4b559aa5b2fafdae4b9c8935 +Author: Behdad Esfahbod +Date: Tue Sep 4 14:55:00 2012 -0400 + + [OT] Really fix possible NULL dereference this time + + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- + src/hb-ot-layout.cc | 6 +++--- + src/hb-ot-shape-complex-arabic.cc | 4 +++- + 3 files changed, 10 insertions(+), 8 deletions(-) + +commit 29416833584d7831ece84aaeada6f5ebba7828c0 +Author: Behdad Esfahbod +Date: Mon Sep 3 23:31:14 2012 -0400 + + [OT] Implement serialize() for AlternateSubst + + src/hb-ot-layout-gsub-table.hh | 33 +++++++++++++++++++++++++++++++++ + 1 file changed, 33 insertions(+) + +commit 1f07e3382a1608b054cbf88b89fef74f6c485434 +Author: Behdad Esfahbod +Date: Mon Sep 3 23:28:34 2012 -0400 + + [OT] Implement serialize() for MultiSubst + + src/hb-open-type-private.hh | 10 ++++++++++ + src/hb-ot-layout-gsub-table.hh | 43 + ++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 53 insertions(+) + +commit 4912030dfba740c822e200d33cbb5c6dbbeaf79e +Author: Behdad Esfahbod +Date: Mon Sep 3 20:58:03 2012 -0400 + + Minor + + src/hb-open-type-private.hh | 4 ++-- + src/hb-ot-layout-gsub-table.hh | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit f8fa2b5cf67b02d74514dec7885d03de73ec7349 +Author: Behdad Esfahbod +Date: Mon Sep 3 20:19:46 2012 -0400 + + Fix possible NULL dereference + + As reported by Kenichi Ishibashi. + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4b312fb288faa383a2c5bd3be0428f0e58e02699 +Author: Behdad Esfahbod +Date: Sat Sep 1 21:56:06 2012 -0400 + + [OT] Remove serialize alignment + + Will reintroduce in a different way when we actually need it. + + src/hb-open-type-private.hh | 24 +++++++++++------------- + 1 file changed, 11 insertions(+), 13 deletions(-) + +commit c61be03d6df122f18eebda3b29e42c9e768d45b9 +Author: Behdad Esfahbod +Date: Sat Sep 1 21:43:38 2012 -0400 + + [OT] A bit more serialize + + src/hb-open-type-private.hh | 14 +++++++++++++ + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 43 + ++++++++++++++++++++++++++++++++++++-- + 3 files changed, 56 insertions(+), 3 deletions(-) + +commit abcc5ac1fde1c493e4055dd2f27b8aade7713156 +Author: Behdad Esfahbod +Date: Sat Sep 1 21:30:17 2012 -0400 + + [OT] Improve serialize syntax + + For some definition of improvement... + + src/hb-open-type-private.hh | 6 ++++-- + src/hb-ot-layout-gsub-table.hh | 3 +-- + 2 files changed, 5 insertions(+), 4 deletions(-) + +commit bc5be24014371ceb811b9ffd37062ede63d87bb1 +Author: Behdad Esfahbod +Date: Sat Sep 1 20:48:22 2012 -0400 + + [OT] Restart work on serialize() + + src/hb-open-type-private.hh | 39 ++++++++++++++++++------ + src/hb-ot-layout-common-private.hh | 61 + +++++++++++++++++++------------------- + src/hb-ot-layout-gsub-table.hh | 13 ++++++++ + 3 files changed, 73 insertions(+), 40 deletions(-) + +commit 6912e476dd92639c3ddf07ca51c8d4a262c8b3a5 +Author: Behdad Esfahbod +Date: Sat Sep 1 20:38:45 2012 -0400 + + [OT] Insert dotted-circle for run-initial marks + + Unfortunately if the font has GPOS and 'mark' feature does + not position mark on dotted-circle, our inserted dotted-circle + will not get the mark repositioned to itself. Uniscribe cheats + here. + + If there is no GPOS however, the fallback positioning kicks in + and sorts this out. + + I'm not willing to address the first case. + + src/hb-ot-shape.cc | 32 ++++++++++++++++++++++++++++++++ + 1 file changed, 32 insertions(+) + +commit 1d581ec384bc1780995e32e1c44103af57596eda +Author: Behdad Esfahbod +Date: Sat Sep 1 20:06:26 2012 -0400 + + [OT] Fallback-position ccc=0 Thai / Lao marks + + Not perfect, but so is fallback positioning in 2012... + + src/hb-ot-shape-fallback.cc | 56 + +++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 46 insertions(+), 10 deletions(-) + +commit 3992b5ec4cb43d114d87ff7ee2b992bcf819c9cd +Author: Behdad Esfahbod +Date: Sat Sep 1 19:20:41 2012 -0400 + + Move code around + + src/hb-ot-shape-fallback-private.hh | 5 ++++ + src/hb-ot-shape-fallback.cc | 46 + +++++++++++++++++++++++++------------ + src/hb-ot-shape-private.hh | 6 +++++ + src/hb-ot-shape.cc | 4 ++++ + 4 files changed, 46 insertions(+), 15 deletions(-) + +commit b85800f9de8976a7418ef9df467d3080c6ab0199 +Author: Behdad Esfahbod +Date: Fri Aug 31 18:12:01 2012 -0400 + + [Indic] Implement dotted-circle insertion for broken clusters + + No panic, we reeally insert dotted circle when it's absolutely broken. + + Fixes most of the dotted-circle cases against Uniscribe. (for + Devanagari + fixes 80% of them, for Khmer 70%; the rest look like Uniscribe being + really bogus...) + + I had to make a decision. Apparently Uniscribe adds one dotted circle + to each broken character. I tried that, but that goes wrong + easily with + split matras. So I made it add only one dotted circle to an entire + broken syllable tail. As in: "if there was a dotted circle here, this + would have formed a correct cluster." That works better for split + stuff, and I like it more. + + src/hb-buffer-private.hh | 1 + + src/hb-buffer.cc | 10 +++++ + src/hb-ot-shape-complex-indic-machine.rl | 4 +- + src/hb-ot-shape-complex-indic-private.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 67 + +++++++++++++++++++++++++++++--- + src/hb-ot-shape-normalize-private.hh | 1 + + src/hb-ot-shape-normalize.cc | 11 +++--- + 7 files changed, 83 insertions(+), 13 deletions(-) + +commit 327d14ef188396006d54af976506ab6f8bb2869a +Author: Behdad Esfahbod +Date: Fri Aug 31 16:49:34 2012 -0400 + + [Indic] Start adding dotted-circle instrastructure + + src/hb-ot-shape-complex-indic-machine.rl | 19 +++++++------ + src/hb-ot-shape-complex-indic.cc | 46 + +++++++++++++++++++++++++++++--- + 2 files changed, 51 insertions(+), 14 deletions(-) + +commit 1be368e96fb7de8c77bf992874e0d5bd6b272ebe +Author: Behdad Esfahbod +Date: Fri Aug 31 16:29:17 2012 -0400 + + Minor + + src/hb-buffer-private.hh | 16 +++++++++++++++- + src/hb-buffer.cc | 15 --------------- + 2 files changed, 15 insertions(+), 16 deletions(-) + +commit 784f29d061a2939562eca0c4943feb01174aee00 +Author: Behdad Esfahbod +Date: Fri Aug 31 14:06:26 2012 -0400 + + Minor + + src/hb-ot-shape.cc | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 5a7f18767a87a3f07269d0814f984a98f86ab852 +Author: Behdad Esfahbod +Date: Thu Aug 30 22:53:29 2012 -0400 + + [OT] Better fallback-position Thai / Lao ccc!=0 marks + + src/hb-ot-shape-fallback.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 9f2348de58f0f85593027378169bc03c4dd64e59 +Author: Behdad Esfahbod +Date: Wed Aug 29 21:08:59 2012 -0400 + + [OT] Add serialize() for Coverage + + src/hb-open-type-private.hh | 34 +++++++++++++++++---- + src/hb-ot-layout-common-private.hh | 62 + ++++++++++++++++++++++++++++++++++++++ + 2 files changed, 90 insertions(+), 6 deletions(-) + +commit e901b954c6ec44ac3ae7fb3c326e6e7a40718e4b +Author: Behdad Esfahbod +Date: Wed Aug 29 20:26:08 2012 -0400 + + [OT] Start adding serialize() API + + src/hb-open-type-private.hh | 77 + +++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 77 insertions(+) + +commit 965c280de09b49d711cb78d629da321c802084de +Author: Behdad Esfahbod +Date: Wed Aug 29 13:59:16 2012 -0400 + + Add HB_BUFFER_ASSERT_VAR + + To be used in places we access buffer vars... + + src/hb-buffer-private.hh | 3 +++ + src/hb-buffer.cc | 16 ++++++++++++++++ + 2 files changed, 19 insertions(+) + +commit 0ccf9b64736559a230425fd131c9eb8aa3048221 +Author: Behdad Esfahbod +Date: Wed Aug 29 11:53:26 2012 -0400 + + Move code around + + src/hb-ot-shape.cc | 21 ++++++++++----------- + 1 file changed, 10 insertions(+), 11 deletions(-) + +commit 2fcbbdb41a322f54b61d9ce983ab54434504c5ed +Author: Behdad Esfahbod +Date: Wed Aug 29 11:11:54 2012 -0400 + + Port Arabic fallback ligating to share code with GSUB + + This will eventually allow us to skip marks, as well as (fallback) + attach marks to ligature components of fallback-shaped Arabic. + That would be pretty cool. I kludged GDEF props in, so mark-skipping + works, but the produced ligature id/components will be cleared later + by substitute_start() et al. + + Perhaps using a synthetic table for Arabic fallback shaping was + a better + idea. The current approach has way too many layering violations... + + src/hb-ot-layout-gsubgpos-private.hh | 4 ++ + src/hb-ot-shape-complex-arabic.cc | 72 + ++++++++++++++++++++++++------------ + src/hb-ot-shape.cc | 4 +- + 3 files changed, 56 insertions(+), 24 deletions(-) + +commit 5e399a8a45bddb49e06e2ca39df1ed04398c0aff +Author: Behdad Esfahbod +Date: Wed Aug 29 10:40:49 2012 -0400 + + Minor + + src/hb-ot-layout-gsub-table.hh | 1 - + src/hb-ot-layout-gsubgpos-private.hh | 1 - + 2 files changed, 2 deletions(-) + +commit a177d027d1d0ad9539e30ed75d8652e0e8da20ff +Author: Behdad Esfahbod +Date: Tue Aug 28 23:18:22 2012 -0400 + + [GSUB] Move ligation logic over + + src/hb-ot-layout-gsub-table.hh | 78 + ++++------------------------------- + src/hb-ot-layout-gsubgpos-private.hh | 80 + ++++++++++++++++++++++++++++++++++++ + 2 files changed, 89 insertions(+), 69 deletions(-) + +commit 191fa885d9e0a2dce92dd8727cddd18495e62409 +Author: Behdad Esfahbod +Date: Tue Aug 28 22:58:55 2012 -0400 + + [GSUB] Merge Ligature and context input matching + + Looks better now... + + TODO | 4 -- + src/hb-ot-layout-gsub-table.hh | 71 + +++++++----------------------------- + src/hb-ot-layout-gsubgpos-private.hh | 29 ++++++++++++++- + 3 files changed, 40 insertions(+), 64 deletions(-) + +commit 93814ca7dc2a7251f861c1c47ba155ba6e6bdf19 +Author: Behdad Esfahbod +Date: Tue Aug 28 22:24:51 2012 -0400 + + Start converging Ligature and match_input + + src/hb-ot-layout-gsub-table.hh | 58 + +++++++++++++++++---------------- + src/hb-ot-layout-gsubgpos-private.hh | 62 + ++++++++++++++++++++++++++++-------- + 2 files changed, 78 insertions(+), 42 deletions(-) + +commit 2eef71737ea29ffadbb5a2be4a898b44f53f66ac +Author: Behdad Esfahbod +Date: Tue Aug 28 19:16:38 2012 -0400 + + [hb-icu-le] Add visbility + + src/hb-icu-le/FontTableCache.h | 6 +++++- + src/hb-icu-le/PortableFontInstance.cpp | 39 + ---------------------------------- + src/hb-icu-le/PortableFontInstance.h | 7 ++++-- + src/hb-icu-le/cmaps.cpp | 2 +- + src/hb-icu-le/cmaps.h | 5 ++++- + src/hb-icu-le/letest.h | 14 ++++++++++++ + src/hb-icu-le/sfnt.h | 6 +++++- + 7 files changed, 34 insertions(+), 45 deletions(-) + +commit d59e28e49204ed609d8a1bf3c0f21ab5fc178337 +Author: Behdad Esfahbod +Date: Tue Aug 28 19:08:36 2012 -0400 + + Minor + + src/Makefile.am | 6 +++++- + src/check-libstdc++.sh | 2 +- + src/check-static-inits.sh | 4 ++-- + 3 files changed, 8 insertions(+), 4 deletions(-) + +commit af169d2813ff8075288cd4a7811f0715e4fea3da +Author: Behdad Esfahbod +Date: Tue Aug 28 19:08:22 2012 -0400 + + Minor + + src/hb-icu-le/PortableFontInstance.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 52ff2681d88886e2165ced397966ba29c2073583 +Author: Behdad Esfahbod +Date: Tue Aug 28 18:03:35 2012 -0400 + + Use VisualStudio-style atomic intrinsics on mingw32 + + src/hb-atomic-private.hh | 25 ++++++++++++++++++------- + 1 file changed, 18 insertions(+), 7 deletions(-) + +commit 7c8e844d92aa604fc4b396343721ea90eb83adb8 +Author: Behdad Esfahbod +Date: Tue Aug 28 17:57:49 2012 -0400 + + Use namespace for OpenType tables + + Avoids USHORT, SHORT, ULONG, LONG clashes with Windows API. + + src/hb-font.cc | 12 ++--- + src/hb-open-file-private.hh | 4 ++ + src/hb-open-type-private.hh | 9 ++-- + src/hb-ot-head-table.hh | 4 ++ + src/hb-ot-hhea-table.hh | 5 ++ + src/hb-ot-hmtx-table.hh | 6 +++ + src/hb-ot-layout-common-private.hh | 5 ++ + src/hb-ot-layout-gdef-table.hh | 4 ++ + src/hb-ot-layout-gpos-table.hh | 4 ++ + src/hb-ot-layout-gsub-table.hh | 4 ++ + src/hb-ot-layout-gsubgpos-private.hh | 4 ++ + src/hb-ot-layout-private.hh | 12 +++-- + src/hb-ot-layout.cc | 91 + ++++++++++++++++++------------------ + src/hb-ot-maxp-table.hh | 4 ++ + src/hb-ot-name-table.hh | 4 ++ + src/hb-uniscribe.cc | 8 ++-- + src/main.cc | 2 + + 17 files changed, 117 insertions(+), 65 deletions(-) + +commit dc5df5af6b349c3d9e4ab876864d9dec8096401f +Author: Behdad Esfahbod +Date: Tue Aug 28 16:31:23 2012 -0400 + + Revert "Minor" + + This reverts commit 3e0a03978b91994bb7fa7922593cbdfc50878dfc. + + I know remember why that line is there :). + + src/hb-ot-shape-complex-arabic.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 3e0a03978b91994bb7fa7922593cbdfc50878dfc +Author: Behdad Esfahbod +Date: Mon Aug 27 17:10:02 2012 -0400 + + Minor + + src/hb-ot-shape-complex-arabic.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 667218a5b134728863a318c73070f4e323590bbd +Author: Behdad Esfahbod +Date: Mon Aug 27 17:00:44 2012 -0400 + + Minor + + src/hb-ot-shape-fallback.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 30dd62251fcd04c2cbaa9b979d47ddbf62c6d460 +Author: Behdad Esfahbod +Date: Mon Aug 27 16:54:34 2012 -0400 + + Only fallback-position glyphs if we have the ccc + + Previously, ccc=0 Thai / Lao marks were being + mispositioned. Don't touch them. + + src/hb-ot-shape-fallback.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e1ba62811a61afb046d349e578cd141363c7fb34 +Author: Behdad Esfahbod +Date: Mon Aug 27 16:28:05 2012 -0400 + + Center unknown marks horizontally + + src/hb-ot-shape-fallback.cc | 1 + + 1 file changed, 1 insertion(+) + +commit a4e75e4128751bb902117abc1a59dce4f2147672 +Author: Behdad Esfahbod +Date: Mon Aug 27 15:54:15 2012 -0400 + + Minor + + test/shaping/hb_test_tools.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 23b0e9d7dc801e11640979af3c2b00649a519bb1 +Author: Behdad Esfahbod +Date: Sun Aug 26 14:30:18 2012 -0400 + + [Indic] Fix switch + + D'oh. Was working by pure chance :)). + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ae4d4e1de6b4512576080e95896383887b30982f +Author: Behdad Esfahbod +Date: Sun Aug 26 14:27:44 2012 -0400 + + Bug 53815 - CoreText backend doesn't link + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ec0e46376a2afec4ff7606f95582b0ec49c2a44a +Author: Behdad Esfahbod +Date: Fri Aug 24 00:44:53 2012 -0400 + + Remove TODO items + + TODO | 4 ---- + 1 file changed, 4 deletions(-) + +commit 56e878ab875ff06d74702145e380e198be967bd6 +Author: Behdad Esfahbod +Date: Fri Aug 24 00:41:51 2012 -0400 + + [graphite2] Cleanup scratch buffer allocation + + src/hb-graphite2.cc | 77 + ++++++++++++++++++++++++++++++----------------------- + 1 file changed, 44 insertions(+), 33 deletions(-) + +commit 2f7586c6229096143ca0a96712a27416ee0d3c85 +Author: Behdad Esfahbod +Date: Thu Aug 23 23:59:55 2012 -0400 + + [icu-le] Implement icu layout engine shaper + + configure.ac | 2 +- + src/hb-icu-le.cc | 113 + +++++++++++++++++++++++++++++++++++++++++++++----- + src/hb-icu-le/cmaps.h | 1 - + src/hb-shaper-list.hh | 4 ++ + 4 files changed, 108 insertions(+), 12 deletions(-) + +commit ba7f6c3797e5b440557bacd9b666bf09713dca76 +Author: Behdad Esfahbod +Date: Thu Aug 23 21:52:44 2012 -0400 + + [icu-le] Hook up to hb_face_t + + src/hb-icu-le.cc | 17 +++- + src/hb-icu-le/FontTableCache.cpp | 34 ++++---- + src/hb-icu-le/FontTableCache.h | 9 ++- + src/hb-icu-le/PortableFontInstance.cpp | 144 + +++------------------------------ + src/hb-icu-le/PortableFontInstance.h | 21 ++--- + src/hb-icu-le/README | 1 + + 6 files changed, 57 insertions(+), 169 deletions(-) + +commit e96bb36995b2a5321b4d32bb11906e1701aaf115 +Author: Behdad Esfahbod +Date: Thu Aug 23 21:37:51 2012 -0400 + + [icu-le] Actually use the FontTableCache + + src/hb-icu-le/PortableFontInstance.cpp | 25 ++++++++----------------- + 1 file changed, 8 insertions(+), 17 deletions(-) + +commit 7d242364ea647f655a7092bda25f9a10774c57f5 +Author: Behdad Esfahbod +Date: Thu Aug 23 21:23:41 2012 -0400 + + [icu-le] Start adding a icu-layout-engine backend + + Import PortableFontInstance and add shaper stub. + + configure.ac | 9 + + src/Makefile.am | 8 + + src/hb-icu-le.cc | 111 ++++++++ + src/hb-icu-le/FontTableCache.cpp | 91 +++++++ + src/hb-icu-le/FontTableCache.h | 41 +++ + src/hb-icu-le/Makefile.am | 25 ++ + src/hb-icu-le/PortableFontInstance.cpp | 436 + ++++++++++++++++++++++++++++++++ + src/hb-icu-le/PortableFontInstance.h | 117 +++++++++ + src/hb-icu-le/README | 2 + + src/hb-icu-le/cmaps.cpp | 200 +++++++++++++++ + src/hb-icu-le/cmaps.h | 85 +++++++ + src/hb-icu-le/letest.h | 49 ++++ + src/hb-icu-le/license.html | 51 ++++ + src/hb-icu-le/sfnt.h | 449 + +++++++++++++++++++++++++++++++++ + 14 files changed, 1674 insertions(+) + +commit b5584ee4be46b47e1678acf28426970a6d670b4f +Author: Behdad Esfahbod +Date: Thu Aug 23 16:26:07 2012 -0400 + + [Indic] For old-spec, match non-zero context + + Fixes consonant-position with old-spec Malayalam. Uniscribe seem + to be + doing this. Fixes below-base La (eg. Pa,H,La) with AnjaliNewLipi.ttf. + Doesn't regress new-spec or other scripts. + + src/hb-ot-shape-complex-indic.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit d9b204d3d24cde165167714728bf380267903d6a +Author: Behdad Esfahbod +Date: Thu Aug 23 16:22:28 2012 -0400 + + [GSUB] Allow non-zero-context matching in would_apply() + + To be used in the next patch. + + src/hb-ot-layout-gsubgpos-private.hh | 6 ++++-- + src/hb-ot-layout-private.hh | 3 ++- + src/hb-ot-layout.cc | 14 ++++++++------ + src/hb-ot-layout.h | 7 ++++--- + src/hb-ot-map.cc | 12 ++---------- + src/hb-ot-shape-complex-indic.cc | 2 +- + src/test-would-substitute.cc | 2 +- + 7 files changed, 22 insertions(+), 24 deletions(-) + +commit 1f2bb172fe9a173ecfd61054f1fdd850943ef059 +Author: Behdad Esfahbod +Date: Thu Aug 23 16:10:37 2012 -0400 + + Revert "[Indic/GSUB] Ignore context when matching would_apply()" + + This reverts commit 24dd4e56743c6ce5e01cb710ca9e01b3e527af58. + + Oops. My bad. The change _regressed_ Malayalam test suite, not + improved it. I'll redo it, differentiating between old-spec and + new-spec cases. + + src/hb-ot-layout-gsubgpos-private.hh | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +commit 24dd4e56743c6ce5e01cb710ca9e01b3e527af58 +Author: Behdad Esfahbod +Date: Thu Aug 23 15:47:10 2012 -0400 + + [Indic/GSUB] Ignore context when matching would_apply() + + The MS Indic specs say "...all classifications are determined + ... using + context-free substitutions." However, testing shows that MS's + Malayalam + shapers (both old and new), "match" even if there is no zero-context + rule. + We follow. + + Fixes below-base La (eg. Pa,H,La) with AnjaliNewLipi.ttf (old spec). + Moreover, test suite Malayalam failures are down to 312 from 875! No + change in other scripts. + + Current numbers: + + BENGALI: 353996 out of 354285 tests passed. 289 failed (0.0815727%) + DEVANAGARI: 707339 out of 707394 tests passed. 55 failed (0.00777502%) + GUJARATI: 366489 out of 366506 tests passed. 17 failed (0.0046384%) + GURMUKHI: 60769 out of 60809 tests passed. 40 failed (0.0657797%) + KANNADA: 951086 out of 951913 tests passed. 827 failed (0.0868777%) + KHMER: 299106 out of 299124 tests passed. 18 failed (0.00601757%) + LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) + MALAYALAM: 1047541 out of 1048416 tests passed. 875 failed + (0.0834592%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271726 out of 271847 tests passed. 121 failed (0.0445103%) + TAMIL: 1091837 out of 1091837 tests passed. 0 failed (0%) + TELUGU: 970558 out of 970573 tests passed. 15 failed (0.00154548%) + TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) + + src/hb-ot-layout-gsubgpos-private.hh | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 6732d62e78b13842ead9549c97bede25c73976cb +Author: Behdad Esfahbod +Date: Thu Aug 23 15:19:45 2012 -0400 + + [Indic] Implement pre-base reordering Ra for old-spec Malayalam + + Fixes Pa,H,Ra sequence with AnjaliNewLipi.ttf. + + src/hb-ot-shape-complex-indic.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 80cd92326f8a3f48a7821e720e8ecb2072e73286 +Author: Behdad Esfahbod +Date: Thu Aug 23 12:06:14 2012 -0400 + + [Indic] Only apply basic features per-syllable + + Free up syllables and let features work across syllables for the + presentation forms features and GPOS. + + Fixed: + - 1 GURMUKHI test (remains 40) + - 12 KHMER tests (remains 18) + - 11 SINHALA tests (remains 121) + + Regresses: + - 5 MALAYALAM tests (up to 312) + + Current numbers: + + BENGALI: 353996 out of 354285 tests passed. 289 failed (0.0815727%) + DEVANAGARI: 707339 out of 707394 tests passed. 55 failed (0.00777502%) + GUJARATI: 366489 out of 366506 tests passed. 17 failed (0.0046384%) + GURMUKHI: 60769 out of 60809 tests passed. 40 failed (0.0657797%) + KANNADA: 951086 out of 951913 tests passed. 827 failed (0.0868777%) + KHMER: 299106 out of 299124 tests passed. 18 failed (0.00601757%) + LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) + MALAYALAM: 1048104 out of 1048416 tests passed. 312 failed + (0.0297592%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271726 out of 271847 tests passed. 121 failed (0.0445103%) + TAMIL: 1091837 out of 1091837 tests passed. 0 failed (0%) + TELUGU: 970558 out of 970573 tests passed. 15 failed (0.00154548%) + TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) + + src/hb-ot-shape-complex-indic.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit df5d5c68f3a5cab17bf4a429802a1a1a834c3456 +Author: Behdad Esfahbod +Date: Thu Aug 23 09:33:30 2012 -0400 + + Whitespace + + src/hb-ot-layout-gpos-table.hh | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +commit 7fe00d15da20193ca94a8ead9aee60df24074a9e +Author: Behdad Esfahbod +Date: Sat Aug 18 13:59:46 2012 -0400 + + Release 0.9.3 + + NEWS | 16 ++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 17 insertions(+), 1 deletion(-) + +commit 7068e534c4ef7ed2eb7ef8e1370fd4a449556ce8 +Author: Behdad Esfahbod +Date: Sat Aug 18 13:56:10 2012 -0400 + + Fix ChangeLog generation rule + + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2f1747ed7d28148807ad07eb8e22db3ab5c54966 +Author: Behdad Esfahbod +Date: Thu Aug 16 11:46:46 2012 -0400 + + Add comment + + src/hb-ot-shape-complex-arabic.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit bd08d5d126aa878d1dbf7bfd4b1a764c170cd9ad +Author: Behdad Esfahbod +Date: Thu Aug 16 11:35:50 2012 -0400 + + [OT] Fix Arabic shaper OOB access + + https://bugzilla.mozilla.org/show_bug.cgi?id=782908 + + src/hb-ot-shape-complex-arabic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b161bfc4f6f2db0edea780b95b798ff7b559cf33 +Author: Behdad Esfahbod +Date: Thu Aug 16 08:09:44 2012 -0400 + + [configure] Cleanup check for ICU + + Check for upstream-provided 'icu-uc' pkgconfig package. + + configure.ac | 21 +-------------------- + 1 file changed, 1 insertion(+), 20 deletions(-) + +commit daf0731865f91da960446928667d4095bde471ea +Author: Behdad Esfahbod +Date: Thu Aug 16 07:32:59 2012 -0400 + + [ICU] Fix includes + + As reported by Steven Loomis, including uversion.h works everywhere. + + src/hb-icu.cc | 6 ------ + 1 file changed, 6 deletions(-) + +commit a67ba9c0fe6798a3500af9f4acee8d678f5144ee +Author: Behdad Esfahbod +Date: Wed Aug 15 18:52:17 2012 -0400 + + Whitespace + + src/hb-old/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9fe76051f7003d6b6a10486c5595bf1a4dbf5fe6 +Author: Behdad Esfahbod +Date: Wed Aug 15 17:24:28 2012 -0400 + + [NEWS] Fix date + + Oops! + + NEWS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 45c1383cc7315f89c23c0ed388b99e87224884e7 +Author: Behdad Esfahbod +Date: Tue Aug 14 09:33:18 2012 -0400 + + Minor + + src/hb-coretext.cc | 8 ++++---- + src/hb-fallback-shape.cc | 8 ++++---- + src/hb-graphite2.cc | 8 ++++---- + src/hb-uniscribe.cc | 8 ++++---- + 4 files changed, 16 insertions(+), 16 deletions(-) + +commit 4ac4c6f2e12ddc8bf5e750671321458218b6e0c8 +Author: Behdad Esfahbod +Date: Mon Aug 13 10:52:52 2012 -0400 + + Fix ICU build with older ICUs + + src/hb-icu.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 883cbf5ed79d2b60191f803a5ee3f3e4496f3441 +Author: Behdad Esfahbod +Date: Sun Aug 12 17:11:27 2012 -0400 + + Minor + + contrib/README | 2 ++ + 1 file changed, 2 insertions(+) + +commit b7a4d37d0b162f2222b65d09b9271b8c636086f8 +Author: Behdad Esfahbod +Date: Sat Aug 11 21:32:23 2012 -0400 + + minor + + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +commit d5045a5f4017631a4660f985fe451c5a64c42ca0 +Author: Behdad Esfahbod +Date: Sat Aug 11 21:26:25 2012 -0400 + + [ICU] Use new normalizer2 compose/decompose API + + It's considerably faster than the fallback implementation we had + previously! + + src/hb-buffer.cc | 9 +++--- + src/hb-glib.cc | 26 +++++++--------- + src/hb-icu.cc | 75 + +++++++++++++++++++++++++++++++++++++---------- + src/hb-unicode-private.hh | 13 ++------ + src/hb-unicode.cc | 35 ++++++++++++++++++++-- + src/hb-warning.cc | 8 ----- + 6 files changed, 110 insertions(+), 56 deletions(-) + +commit 2b73a1f112c489c2553743c08dc03cd89f60cb2d +Author: Behdad Esfahbod +Date: Sat Aug 11 19:17:54 2012 -0400 + + Add TODO + + TODO | 1 + + 1 file changed, 1 insertion(+) + +commit 9f9f04c2229227bb0712166e824157bbbf5cef80 +Author: Behdad Esfahbod +Date: Sat Aug 11 18:34:13 2012 -0400 + + [OT] Unbreak Thai shaping and fallback Arabic shaping + + The merger of normalizer and glyph-mapping broke shapers that + modified text stream. Unbreak them by adding a new preprocess_text + shaping stage that happens before normalizing/cmap and disallow + setup_mask modification of actual text. + + src/hb-ot-shape-complex-arabic.cc | 42 + ++++++++++++++++++++++++++++---------- + src/hb-ot-shape-complex-indic.cc | 1 + + src/hb-ot-shape-complex-misc.cc | 12 ++++++----- + src/hb-ot-shape-complex-private.hh | 15 +++++++++++--- + src/hb-ot-shape.cc | 3 +++ + 5 files changed, 54 insertions(+), 19 deletions(-) + +commit e9f28a38f54b98fa59f9159ccaaa3be6027e1378 +Author: Behdad Esfahbod +Date: Sat Aug 11 18:20:28 2012 -0400 + + [OT] Add shape_plan to Arabic shaper + + src/hb-ot-shape-complex-arabic.cc | 82 + +++++++++++++++++++++++++-------------- + 1 file changed, 53 insertions(+), 29 deletions(-) + +commit 344cc56698a8c84c4c1a05a71d829e5171aa3a60 +Author: Behdad Esfahbod +Date: Sat Aug 11 17:36:23 2012 -0400 + + Add TODO + + TODO | 4 ++++ + 1 file changed, 4 insertions(+) + +commit daf13afb0801740dcc7900c4af190e24b80a05c0 +Author: Behdad Esfahbod +Date: Fri Aug 10 16:38:44 2012 -0400 + + [OT] Implement fallback mark positioning for "double" combining marks + + src/hb-ot-shape-fallback.cc | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit d345313104d9e3c8a8533ccdebd74e0648d0bee3 +Author: Behdad Esfahbod +Date: Fri Aug 10 16:34:04 2012 -0400 + + [OT] Fix fallback mark positioning with left-to-right text + + Ouch! + + src/hb-ot-shape-fallback.cc | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +commit e297ee4acd6f9d950f8542fc6ad71fd580b69284 +Author: Behdad Esfahbod +Date: Fri Aug 10 14:49:37 2012 -0400 + + Bump version to 0.9.2 + + A *real* release this time, with NEWS, ChangeLog, etc. + + AUTHORS | 8 ++++ + COPYING | 9 ++-- + Makefile.am | 13 +++--- + NEWS | 136 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + THANKS | 7 +++ + configure.ac | 4 +- + 6 files changed, 165 insertions(+), 12 deletions(-) + +commit 6efe1200b97cefe019857b0b5951a4a87deeb02b +Author: Behdad Esfahbod +Date: Fri Aug 10 13:49:32 2012 -0400 + + Bump version to 0.9.1 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 206ab6057303273590a3d005660e075bdcee0f5f +Author: Behdad Esfahbod +Date: Fri Aug 10 09:06:30 2012 -0400 + + [test] Move around + + test/shaping/texts/in-tree/shaper-arabic/script-arabic/MANIFEST | + 2 +- + .../texts/in-tree/shaper-arabic/script-arabic/language-urdu/MANIFEST | + 1 + + .../shaper-arabic/script-arabic/{ => language-urdu}/crulp/MANIFEST + | 0 + .../script-arabic/{ => language-urdu}/crulp/ligatures/2grams.txt + | 0 + .../script-arabic/{ => language-urdu}/crulp/ligatures/3grams.txt + | 0 + .../script-arabic/{ => language-urdu}/crulp/ligatures/4grams.txt + | 0 + .../script-arabic/{ => language-urdu}/crulp/ligatures/5grams.txt + | 0 + .../script-arabic/{ => language-urdu}/crulp/ligatures/6grams.txt + | 0 + .../script-arabic/{ => language-urdu}/crulp/ligatures/7grams.txt + | 0 + .../script-arabic/{ => language-urdu}/crulp/ligatures/8grams.txt + | 0 + .../script-arabic/{ => language-urdu}/crulp/ligatures/LICENSE + | 0 + .../script-arabic/{ => language-urdu}/crulp/ligatures/MANIFEST + | 0 + .../script-arabic/{ => language-urdu}/crulp/ligatures/README | + 0 + .../script-arabic/{ => language-urdu}/crulp/ligatures/SOURCES + | 0 + 14 files changed, 2 insertions(+), 1 deletion(-) + +commit 7a484c601e0958533eb85a6902296733c39537fe +Author: Behdad Esfahbod +Date: Fri Aug 10 09:05:29 2012 -0400 + + [test] Add Urdu ligature sequences from CRULP + + .../in-tree/shaper-arabic/script-arabic/MANIFEST | 1 + + .../shaper-arabic/script-arabic/crulp/MANIFEST | 1 + + .../script-arabic/crulp/ligatures/2grams.txt | 601 ++ + .../script-arabic/crulp/ligatures/3grams.txt | 3415 +++++++++++ + .../script-arabic/crulp/ligatures/4grams.txt | 6316 + ++++++++++++++++++++ + .../script-arabic/crulp/ligatures/5grams.txt | 5029 + ++++++++++++++++ + .../script-arabic/crulp/ligatures/6grams.txt | 1542 +++++ + .../script-arabic/crulp/ligatures/7grams.txt | 354 ++ + .../script-arabic/crulp/ligatures/8grams.txt | 26 + + .../script-arabic/crulp/ligatures/LICENSE | 3 + + .../script-arabic/crulp/ligatures/MANIFEST | 7 + + .../script-arabic/crulp/ligatures/README | 16 + + .../script-arabic/crulp/ligatures/SOURCES | 4 + + 13 files changed, 17315 insertions(+) + +commit f4cb4762986a28634fa7de9b706f9d37859b881e +Author: Behdad Esfahbod +Date: Fri Aug 10 03:51:44 2012 -0400 + + [OT] Slightly adjust normalizer + + The change is very subtle. If we have a single-char cluster that + decomposes to three or more characters, then try recomposition, in + case the farther mark may compose with the base. + + src/hb-ot-shape-normalize.cc | 81 + +++++++++++++++++++++++++++++--------------- + 1 file changed, 54 insertions(+), 27 deletions(-) + +commit 07d682806349aee81f53114778ce0beb23909ed7 +Author: Behdad Esfahbod +Date: Fri Aug 10 03:28:50 2012 -0400 + + Minor + + src/hb-ot-shape-normalize.cc | 25 ++++++++----------------- + src/hb-ot-shape.cc | 2 +- + 2 files changed, 9 insertions(+), 18 deletions(-) + +commit b00321ea78793d9b3592b5173a9800e6322424fe +Author: Behdad Esfahbod +Date: Thu Aug 9 22:33:32 2012 -0400 + + [OT] Avoid calling get_glyph() twice + + Essentially move the glyph mapping to normalization process. + The effect on Devanagari is small (but observable). Should be more + observable in simple text, like ASCII. + + src/hb-ot-shape-normalize-private.hh | 2 + + src/hb-ot-shape-normalize.cc | 76 + +++++++++++++++++++++++++----------- + src/hb-ot-shape.cc | 44 ++++++++++----------- + 3 files changed, 77 insertions(+), 45 deletions(-) + +commit 12c0875eafa4bd92db650e5acca046d99594d1e6 +Author: Behdad Esfahbod +Date: Thu Aug 9 22:00:53 2012 -0400 + + [OT] Remove redundant check + + src/hb-ot-shape.cc | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit 5c60b70c89b4e0a6512d9fd1ab5394dd76feb742 +Author: Behdad Esfahbod +Date: Thu Aug 9 21:58:07 2012 -0400 + + [OT] More code shuffling around + + Preparing for merging map_glyphs() and normalize(). + + src/hb-ot-shape.cc | 167 + +++++++++++++++++++++++++++-------------------------- + 1 file changed, 86 insertions(+), 81 deletions(-) + +commit cd0c6e148f6d078b364370cb2f808b793b921be2 +Author: Behdad Esfahbod +Date: Thu Aug 9 21:48:55 2012 -0400 + + Shuffle buffer variable allocations around + + To room for more allocations, coming. + + src/hb-ot-layout-private.hh | 6 +++--- + src/hb-ot-shape-complex-arabic.cc | 2 +- + src/hb-ot-shape-complex-indic-private.hh | 4 ++-- + src/hb-ot-shape-complex-private.hh | 5 ++--- + src/hb-ot-shape-private.hh | 4 ++-- + 5 files changed, 10 insertions(+), 11 deletions(-) + +commit 8d1eef3f32fb539de2a72804fa3834acc18daab5 +Author: Behdad Esfahbod +Date: Thu Aug 9 21:31:52 2012 -0400 + + Minor + + src/hb-ot-shape-normalize.cc | 50 + +++++++++++++++++++++++++++----------------- + 1 file changed, 31 insertions(+), 19 deletions(-) + +commit 56c9e7c004e802ddcb8c704346026f1d7a812f9f +Author: Behdad Esfahbod +Date: Thu Aug 9 21:12:30 2012 -0400 + + Fill out combining class resetting for fallback shaping + Thai/Lao/Tibetan + + src/hb-ot-shape-fallback.cc | 38 +++++++++++++++++++++++++++++++++++++- + src/hb-unicode-private.hh | 7 ++++--- + src/hb-unicode.cc | 2 +- + 3 files changed, 42 insertions(+), 5 deletions(-) + +commit a321e1d51e0e7fa02738410e8d6e77c841bc6b13 +Author: Behdad Esfahbod +Date: Thu Aug 9 18:30:34 2012 -0400 + + Revert "Reject lookups with no subTable" + + This reverts commit 30ec9002d84e8b49290e782e6192069821ffa942. + + See previous commit. + + src/hb-ot-layout-common-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 2eaf482b371034ce6ebfaedee98049b036fd3493 +Author: Behdad Esfahbod +Date: Thu Aug 9 18:30:05 2012 -0400 + + Revert "[GSUB/GPOS] Reject Context/ChainContext lookups with zero + input" + + This reverts commit 0981068b75710397f08e0d2d776a0a2ea68d7117. + + I was confused. Even if we access coverage[0] unconditionally, + we don't + need bound checks since the array machinary already handles that. + + src/hb-ot-layout-gsubgpos-private.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit a02d86484be870615297abfc7be9f94645434762 +Author: Behdad Esfahbod +Date: Wed Aug 8 18:04:29 2012 -0400 + + Add check-exported-symbols.sh + + And misc linking fixes. + + src/Makefile.am | 1 + + src/check-exported-symbols.sh | 40 + ++++++++++++++++++++++++++++++++++++++++ + src/check-internal-symbols.sh | 2 +- + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape.cc | 6 +++--- + 5 files changed, 46 insertions(+), 5 deletions(-) + +commit 4c8ac4f47e95d2b266b2f64e75c55af8233b6b91 +Author: Behdad Esfahbod +Date: Wed Aug 8 17:44:19 2012 -0400 + + Misc minor fixes + + src/check-internal-symbols.sh | 10 +-- + src/hb-font-private.hh | 29 +++++++- + src/hb-font.cc | 63 +++++++--------- + src/hb-font.h | 2 +- + src/hb-graphite2.cc | 4 +- + src/hb-old.cc | 2 +- + src/hb-ot-layout.cc | 6 +- + src/hb-ot-shape-fallback.cc | 10 +-- + src/hb-ot-shape.cc | 2 +- + src/hb-shape-plan.cc | 2 +- + src/hb-shape-plan.h | 2 +- + src/hb-tt-font.cc | 166 + +----------------------------------------- + 12 files changed, 72 insertions(+), 226 deletions(-) + +commit 560d68af8168d1baff607b9616a3590af70fe9ec +Author: Behdad Esfahbod +Date: Wed Aug 8 17:16:01 2012 -0400 + + Use a export-file for Windows builds + + Apparently even that doesn't make check-internal-symbols.sh happy with + mingw32. Going to disable that for DLLs again, but hopefully the + export-file is doing *something*. + + configure.ac | 14 +++++++++++++- + src/Makefile.am | 22 +++++++++++++++++++++- + src/hb-buffer.h | 4 ++-- + 3 files changed, 36 insertions(+), 4 deletions(-) + +commit f8751cf8e0a16125d63a88da65fdbfa76a19453f +Author: Behdad Esfahbod +Date: Wed Aug 8 17:15:44 2012 -0400 + + [hb-old] speed-up build + + src/hb-old/harfbuzz-external.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 5f4c52867ce67faa15f5d26b59c18c8d068e9261 +Author: Behdad Esfahbod +Date: Wed Aug 8 16:53:37 2012 -0400 + + Minor + + src/hb-ot-layout.h | 1 - + 1 file changed, 1 deletion(-) + +commit fe2b8a7777ab1c84980424ede713cb0d6701f987 +Author: Behdad Esfahbod +Date: Wed Aug 8 15:27:14 2012 -0400 + + Minor + + TODO | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7e7d245b332306949a19c628bacd920717434769 +Author: Behdad Esfahbod +Date: Wed Aug 8 15:23:48 2012 -0400 + + Make default_language threadsafe + + src/hb-common.cc | 15 +++++---------- + 1 file changed, 5 insertions(+), 10 deletions(-) + +commit 06b192c458010c847362d809673209c87ea29949 +Author: Behdad Esfahbod +Date: Wed Aug 8 15:23:45 2012 -0400 + + Minor + + src/hb-common.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 37191ede7583fdb864db32a8f4d90956657926c7 +Author: Behdad Esfahbod +Date: Wed Aug 8 14:59:09 2012 -0400 + + Minor + + src/hb-common.h | 4 ++-- + src/hb-icu.h | 1 - + 2 files changed, 2 insertions(+), 3 deletions(-) + +commit 6d9a329a8a0f11f4b175e407de59c55924de1ef6 +Author: Behdad Esfahbod +Date: Wed Aug 8 14:48:41 2012 -0400 + + Adjust a couple source checks + + src/check-internal-symbols.sh | 4 ++-- + src/check-static-inits.sh | 10 ++++++++-- + 2 files changed, 10 insertions(+), 4 deletions(-) + +commit 9c929abdcfef44c0193a2917b20981df37ade21c +Author: Behdad Esfahbod +Date: Wed Aug 8 14:33:37 2012 -0400 + + Minor renaming + + src/Makefile.am | + 4 ++-- + ...sition-fallback-private.hh => hb-ot-shape-fallback-private.hh} | + 8 ++++---- + src/{hb-ot-shape-position-fallback.cc => hb-ot-shape-fallback.cc} | + 4 ++-- + src/hb-ot-shape.cc | + 4 ++-- + 4 files changed, 10 insertions(+), 10 deletions(-) + +commit 801298b590effd768607bb532dc83c73ba65d16b +Author: Behdad Esfahbod +Date: Wed Aug 8 14:26:36 2012 -0400 + + Fix cast + + https://bugs.freedesktop.org/show_bug.cgi?id=53233 + + src/hb-buffer-private.hh | 10 ++++++---- + src/hb-shape-plan.cc | 4 ++-- + 2 files changed, 8 insertions(+), 6 deletions(-) + +commit 21756934a15e31dc243e2b6d80adec5752477652 +Author: Behdad Esfahbod +Date: Wed Aug 8 01:20:45 2012 -0400 + + [OT] Implement fallback positioning + + Implemented for Arabic, Hebrew, and generic marks. + Activated if no GPOS table present. + + src/hb-font.h | 3 +- + src/hb-ft.cc | 3 +- + src/hb-old.cc | 2 +- + src/hb-ot-shape-position-fallback.cc | 237 + ++++++++++++++++++++++++++++++++++- + src/hb-unicode-private.hh | 81 ++++++++++++ + src/hb-unicode.cc | 107 ++++++---------- + 6 files changed, 356 insertions(+), 77 deletions(-) + +commit fb56e7628362a73e20f7f0b49fe31e802dc01f4f +Author: Behdad Esfahbod +Date: Tue Aug 7 23:44:47 2012 -0400 + + [hb-old] Fix warnings + + src/hb-old/harfbuzz-shaper.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +commit affaf8a0e5aa38e5820455f789eebf916e02eb7b +Author: Behdad Esfahbod +Date: Tue Aug 7 22:41:38 2012 -0400 + + [OT] Start adding fallback positioning + + Used when there is no GPOS. + + src/Makefile.am | 2 ++ + src/hb-ot-shape-position-fallback-private.hh | 39 +++++++++++++++++++++++ + src/hb-ot-shape-position-fallback.cc | 47 + ++++++++++++++++++++++++++++ + src/hb-ot-shape.cc | 23 +++----------- + 4 files changed, 93 insertions(+), 18 deletions(-) + +commit 7e4920fd1577987bf6804f67765e22a84983e057 +Author: Behdad Esfahbod +Date: Tue Aug 7 22:32:23 2012 -0400 + + Minor + + src/hb-ot-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 472f229a63f0d1bb21b02179ef430b7698df8f12 +Author: Behdad Esfahbod +Date: Tue Aug 7 22:25:24 2012 -0400 + + [GSUB] Generalize would_apply() + + Fixes logic also, where before we were always matching if + glyphs_len==1 + and a ligature started with the glyph. + + src/hb-ot-layout-gsub-table.hh | 26 ++++++++++++++++++++----- + src/hb-ot-layout-gsubgpos-private.hh | 37 + ++++++++++++++++++------------------ + src/hb-ot-layout.cc | 3 +-- + 3 files changed, 40 insertions(+), 26 deletions(-) + +commit 6f3a300138f659020c21c3e08b7981c78df5f332 +Author: Behdad Esfahbod +Date: Tue Aug 7 22:13:25 2012 -0400 + + Add hb_font_glyph_from/to_string + + src/hb-font-private.hh | 43 + +++++++++++++++++++++++++++++++++++++++++++ + src/hb-font.cc | 24 ++++++++++++++++++++---- + src/hb-font.h | 11 +++++++++++ + src/hb-private.hh | 16 ++++++++++++++++ + src/test-would-substitute.cc | 11 ++++++++++- + util/options.cc | 2 +- + 6 files changed, 101 insertions(+), 6 deletions(-) + +commit eb56f6ae96260c5b4bcd4e1dfb7ab733a230f3a8 +Author: Behdad Esfahbod +Date: Tue Aug 7 21:44:25 2012 -0400 + + Minor + + src/hb-mutex-private.hh | 1 + + src/hb-uniscribe.cc | 1 + + src/hb-uniscribe.h | 2 ++ + 3 files changed, 4 insertions(+) + +commit f4e48adcdd4315ce09e755f87a0f801d88194f42 +Author: Behdad Esfahbod +Date: Tue Aug 7 21:12:49 2012 -0400 + + [OT] Apply 'rclt' feature in horizontal mode + + 'rclt' is "Required Contextual Forms" being proposed by Microsoft. + It's like 'calt', but supposedly always on. We apply 'calt' anyway, + and now apply this too. + + src/hb-ot-shape.cc | 1 + + 1 file changed, 1 insertion(+) + +commit b1914b8bd08ecdea79930dda7e3bb2ae9e6134a1 +Author: Behdad Esfahbod +Date: Tue Aug 7 16:57:48 2012 -0400 + + Fix warnings + + src/hb-icu.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 0f8881d6bbf6cd59938315eeff9b71cfc736aa4e +Author: Behdad Esfahbod +Date: Tue Aug 7 16:57:02 2012 -0400 + + More refactoring + + src/hb-ot-shape-normalize.cc | 161 + +++++++++++++++++++++++++++++++++++++++++- + src/hb-unicode-private.hh | 164 + +------------------------------------------ + 2 files changed, 162 insertions(+), 163 deletions(-) + +commit 428dfcab6634ff264570a0a5d715efb8048c3db5 +Author: Behdad Esfahbod +Date: Tue Aug 7 16:51:48 2012 -0400 + + Minor refactoring + + src/hb-ot-shape-normalize.cc | 27 +++++++++++++++++++++++---- + 1 file changed, 23 insertions(+), 4 deletions(-) + +commit 61f41849af6ff9edf8b55cf9610066d1bfb4a8df +Author: Behdad Esfahbod +Date: Tue Aug 7 16:45:27 2012 -0400 + + Add Hebrew presentation forms shaping + + Lifted from https://bugzilla.mozilla.org/show_bug.cgi?id=728866 + + src/hb-unicode-private.hh | 121 + +++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 120 insertions(+), 1 deletion(-) + +commit 32d71dc13317b322e2c5de00d767b2cb15fddd8b +Author: Behdad Esfahbod +Date: Tue Aug 7 14:11:16 2012 -0400 + + [Graphite] Minor + + src/hb-graphite2.cc | 60 + +++++++++++++++++++++++++---------------------------- + 1 file changed, 28 insertions(+), 32 deletions(-) + +commit 030ac5022e8a43b9329c26e72527bafc582ef44b +Author: Behdad Esfahbod +Date: Tue Aug 7 13:01:12 2012 -0400 + + Remove enum trailing comma + + ...again. + + src/hb-ot-shape-normalize-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 368b4e7649f9bc8c6bebf7c7ff03c9b9ec425a25 +Author: Behdad Esfahbod +Date: Mon Aug 6 23:06:04 2012 -0400 + + Minor + + src/hb-font.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit ade7459ea7c75b4f33f7cfa43dd5bdfa0c18d6d5 +Author: Behdad Esfahbod +Date: Mon Aug 6 19:42:47 2012 -0700 + + [util] Fix leaks + + src/hb-graphite2.cc | 18 ++++++++++++++---- + util/options.cc | 2 +- + util/options.hh | 2 +- + 3 files changed, 16 insertions(+), 6 deletions(-) + +commit 2fef993460dcfd94c92ab35413bdde18ad2b0ceb +Author: Behdad Esfahbod +Date: Mon Aug 6 19:35:04 2012 -0700 + + [Graphite] Fix graphite2 backend with RTL text + + Patch from Martin Hosken. + + src/hb-graphite2.cc | 33 ++++++++++++++++++--------------- + 1 file changed, 18 insertions(+), 15 deletions(-) + +commit e4992e13e19877a73ea05fc1d31005a262c685ad +Author: Behdad Esfahbod +Date: Mon Aug 6 19:25:39 2012 -0700 + + [Graphite] Port graphite2 backend to new shaper infrastructure + + src/hb-graphite2.cc | 234 + +++++++++++++++++++++++--------------------------- + src/hb-graphite2.h | 2 +- + src/hb-shaper-list.hh | 2 +- + 3 files changed, 109 insertions(+), 129 deletions(-) + +commit 66591ececfba9791de06c814f5f30131e95e5fd2 +Author: Behdad Esfahbod +Date: Mon Aug 6 17:07:19 2012 -0700 + + Remove unnecessary lifecycle bits + + We already set recount to INVALID when destroying. + This block was not necessary. + + src/hb-font.cc | 3 --- + 1 file changed, 3 deletions(-) + +commit e3320ecc1b5a7eaccc7c9370b2d1b76850f054be +Author: Behdad Esfahbod +Date: Mon Aug 6 11:44:10 2012 -0700 + + Fix compiler warnings + + configure.ac | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +commit 167b625d988b74572d6b2f646c285b666b650d49 +Author: Behdad Esfahbod +Date: Sun Aug 5 21:16:26 2012 -0700 + + [Indic] Minor, move 'blwf' after 'half' + + We don't apply them together anyway. Should not make any difference + right now. + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 048e3b596fb7fccd3fb5f48de98b6b67788f774a +Author: Behdad Esfahbod +Date: Sat Aug 4 18:04:57 2012 -0700 + + Speed up hb_set_digest_lowest_bits_t calcs + + src/hb-set-private.hh | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit 3d1b66a35e1ab3be19335705f310b278d76d66d2 +Author: Behdad Esfahbod +Date: Sat Aug 4 17:42:28 2012 -0700 + + Speed up hb_set_digest_common_bits_t calcs + + src/hb-set-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit bdc48a879a1900138d8caaa8d90fb9fe1e768d1d +Author: Behdad Esfahbod +Date: Sat Aug 4 17:08:38 2012 -0700 + + Enlarge glyph_name buffer + + Lohit Devanagari has a glyph named: + u0924_u094D.half_u0930_u094D.blwf.vatu + + util/options.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 25326c2359b0a3e25222b94acd142bc36eff78a4 +Author: Behdad Esfahbod +Date: Sat Aug 4 16:43:18 2012 -0700 + + Rewrite ARRAY_LENGTH as a template function + + Such it wouldn't apply to pointers accidentally. + + src/hb-ot-shape-complex-arabic-table.hh | 4 ++-- + src/hb-private.hh | 9 ++++++--- + 2 files changed, 8 insertions(+), 5 deletions(-) + +commit 8ba8042821e4581fe4e87419e58c823520441205 +Author: Behdad Esfahbod +Date: Fri Aug 3 18:54:54 2012 -0700 + + [Indic] Fix consonant position font lookup logic + + Oops. I broken this badly and the test suite did not notice. That + worries me. Have to investigate. + + src/hb-ot-shape-complex-indic.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit abd0c05f1f7f0546593bb2f1c4d59db12cb32e46 +Author: Behdad Esfahbod +Date: Fri Aug 3 18:45:05 2012 -0700 + + Minor + + src/test-would-substitute.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 46ee108ef80f5d4675899862698a8c34d8fcfab5 +Author: Behdad Esfahbod +Date: Fri Aug 3 18:21:13 2012 -0700 + + Fix leak + + src/hb-shape-plan.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 71baea0062da4d7f143d62da38492a0813814e49 +Author: Behdad Esfahbod +Date: Fri Aug 3 17:40:07 2012 -0700 + + [OT] Use general-category, not GDEF class, to decide to zero mark + advances + + At this point, the GDEF glyph synthesis looks pointless. Not that I + have many fonts without GDEF lying around. + + As for mark advance zeroing when GPOS not available, that also + is being + replaced by proper fallback mark positioning soon. + + src/hb-ot-shape.cc | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +commit 3a7e137a68ec8f723dc3afa89c918ca2df7ff6bf +Author: Behdad Esfahbod +Date: Fri Aug 3 17:23:40 2012 -0700 + + Dn't use gint + + src/hb-glib.cc | 4 ++-- + src/hb-icu.cc | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 11b0e20ba42bf0b17133c3e1087732802bb4f230 +Author: Behdad Esfahbod +Date: Thu Aug 2 14:21:40 2012 -0400 + + [Indic] Add per-script configuration tables + + This concludes the Indic shape_plan work. May do for Arabic also... + + src/hb-ot-shape-complex-indic-private.hh | 16 +- + src/hb-ot-shape-complex-indic.cc | 309 + +++++++++++++++---------------- + 2 files changed, 159 insertions(+), 166 deletions(-) + +commit 85fc6c483f6d734febbe39270e84701a651f01f1 +Author: Behdad Esfahbod +Date: Thu Aug 2 12:21:44 2012 -0400 + + [Indic] Move more stuff to the shape_plan + + Almost done. Need to add per-script static tables. + + src/hb-ot-shape-complex-indic-machine.rl | 4 +- + src/hb-ot-shape-complex-indic.cc | 216 + ++++++++++++++++--------------- + 2 files changed, 116 insertions(+), 104 deletions(-) + +commit 914ffaa40fcca020f65bacdd709421e9047afd83 +Author: Behdad Esfahbod +Date: Thu Aug 2 11:03:39 2012 -0400 + + [Indic] Move more repeated work into shape_plan + + src/hb-ot-shape-complex-indic.cc | 63 + ++++++++++++++++++++++++++-------------- + 1 file changed, 42 insertions(+), 21 deletions(-) + +commit a8c6da90f4c6e8d27a3a1b758a55476776d9f750 +Author: Behdad Esfahbod +Date: Thu Aug 2 10:46:34 2012 -0400 + + [OT] Add per-complex-shaper shape_plan data + + Hookup some Indic data to it. More to come. + + src/hb-ot-shape-complex-arabic.cc | 2 + + src/hb-ot-shape-complex-indic.cc | 128 + ++++++++++++++++++++++--------------- + src/hb-ot-shape-complex-misc.cc | 4 ++ + src/hb-ot-shape-complex-private.hh | 16 ++++- + src/hb-ot-shape-private.hh | 1 + + src/hb-ot-shape.cc | 23 +++++-- + 6 files changed, 113 insertions(+), 61 deletions(-) + +commit 8bb5deba9630d35878eb6edb4643ecfabf99f15f +Author: Behdad Esfahbod +Date: Thu Aug 2 10:07:58 2012 -0400 + + [OT] Pipe shape_plan down to pause_callbacks + + src/hb-ot-map-private.hh | 8 ++--- + src/hb-ot-map.cc | 11 ++++--- + src/hb-ot-shape-complex-indic-machine.rl | 4 +-- + src/hb-ot-shape-complex-indic.cc | 50 + +++++++++++++++----------------- + src/hb-ot-shape-private.hh | 6 ++++ + src/hb-ot-shape.cc | 28 ++++++++++-------- + 6 files changed, 57 insertions(+), 50 deletions(-) + +commit 3e38c0f2886c38d2f0a9d80a97a36edf2479d2c7 +Author: Behdad Esfahbod +Date: Thu Aug 2 09:44:18 2012 -0400 + + More massaging + + src/hb-ot-map-private.hh | 20 ++++++++------------ + src/hb-ot-map.cc | 17 ++++++++--------- + src/hb-ot-shape-complex-arabic.cc | 8 ++++---- + src/hb-ot-shape-complex-indic.cc | 18 +++++++----------- + 4 files changed, 27 insertions(+), 36 deletions(-) + +commit 16c6a27b4bffc19026944c7bea9cf0a3a8ff1d8f +Author: Behdad Esfahbod +Date: Thu Aug 2 09:38:28 2012 -0400 + + [OT] Port complex_shaper to planner/plan + + src/hb-ot-shape-complex-arabic.cc | 17 ++++++++--------- + src/hb-ot-shape-complex-indic.cc | 19 ++++++++----------- + src/hb-ot-shape-complex-misc.cc | 20 ++++++++------------ + src/hb-ot-shape-complex-private.hh | 32 +++++++++++--------------------- + src/hb-ot-shape-private.hh | 14 +++++++++++--- + src/hb-ot-shape.cc | 9 +++++---- + 6 files changed, 51 insertions(+), 60 deletions(-) + +commit 5393e3a62ba09fd7bcf3767b36225c8f49badb9d +Author: Behdad Esfahbod +Date: Thu Aug 2 09:24:35 2012 -0400 + + [OT] Minor refactoring + + src/hb-ot-map.cc | 4 ---- + src/hb-ot-shape-private.hh | 26 ++++++++++++++++++++++++++ + src/hb-ot-shape.cc | 26 ++------------------------ + src/hb-shape-plan.cc | 2 ++ + src/hb-shape.cc | 2 -- + 5 files changed, 30 insertions(+), 30 deletions(-) + +commit 24eacf17c801c66a2d466e8ae02b73f501a26b25 +Author: Behdad Esfahbod +Date: Thu Aug 2 08:42:11 2012 -0400 + + [Indic] Move consonant-position-setting into initial_reordering() + + src/hb-ot-shape-complex-indic.cc | 65 + +++++++++++++++++++++------------------- + 1 file changed, 35 insertions(+), 30 deletions(-) + +commit afbcc24be01a64bdb5c05c63880269145fa1d3c8 +Author: Behdad Esfahbod +Date: Thu Aug 2 08:36:40 2012 -0400 + + [GSUB] Wire the font, not just the face, down to substitute() + + We need the font for glyph lookup during GSUB pauses in Indic shaper. + Could perhaps be avoided, but at this point, we don't mean to support + separate substitute()/position() entry points (anymore), so there is + no point in not providing the font to GSUB. + + src/hb-ot-layout-gsub-table.hh | 13 +++++-------- + src/hb-ot-layout-gsubgpos-private.hh | 7 ++----- + src/hb-ot-layout-private.hh | 6 +++--- + src/hb-ot-layout.cc | 18 +++++++++--------- + src/hb-ot-map-private.hh | 15 ++++++--------- + src/hb-ot-map.cc | 8 ++++---- + src/hb-ot-shape-complex-indic.cc | 8 ++++---- + src/hb-ot-shape.cc | 6 +++--- + 8 files changed, 36 insertions(+), 45 deletions(-) + +commit b0e6a26a10ccca70ebc88a9e158a89ccfab0add5 +Author: Behdad Esfahbod +Date: Thu Aug 2 08:11:14 2012 -0400 + + [OT] Hide some API + + It was impossible to meaningfully use them from the outside these + days. + + src/hb-ot-layout-private.hh | 40 ++++++++++++++++++++++++++++++++-------- + src/hb-ot-layout.cc | 20 -------------------- + src/hb-ot-layout.h | 34 ---------------------------------- + src/hb-ot-map.cc | 8 ++++---- + 4 files changed, 36 insertions(+), 66 deletions(-) + +commit 305246744ed178f116e01498b7f9d1af6950ca30 +Author: Behdad Esfahbod +Date: Thu Aug 2 08:08:04 2012 -0400 + + Minor + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8ef3d53255ae9fbb0e46c22909e50009d1e7eeb0 +Author: Behdad Esfahbod +Date: Thu Aug 2 07:53:18 2012 -0400 + + [Indic] More refactoring of consonant position peeking in the font + + To be moved to initial_reordering next... + + src/hb-ot-shape-complex-indic.cc | 59 + ++++++++++++++++++++++++++++------------ + 1 file changed, 41 insertions(+), 18 deletions(-) + +commit 3eb6f81fd3f1e56679eec10d08f5e2303121753f +Author: Behdad Esfahbod +Date: Thu Aug 2 07:37:46 2012 -0400 + + [Indic] Refactor + + Move all the logic that needs to eventually move into the indic table + into hb-ot-shape-complex-indic-private.hh. + + src/hb-ot-shape-complex-indic-private.hh | 210 + ++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-indic.cc | 227 + ++----------------------------- + 2 files changed, 218 insertions(+), 219 deletions(-) + +commit 3614ba242fc7d338761acdda365a134706035b6d +Author: Behdad Esfahbod +Date: Thu Aug 2 07:13:55 2012 -0400 + + [Indic] Rename + + src/hb-ot-shape-complex-indic.cc | 40 + +++++++++++++++++++++------------------- + 1 file changed, 21 insertions(+), 19 deletions(-) + +commit 610e5e8f713bb2a68939b72cb2b801a7aaede4f9 +Author: Behdad Esfahbod +Date: Thu Aug 2 05:27:46 2012 -0400 + + [Indic] Streamline feature would_apply() + + Comes with some 10% speedup for Devanagari even! + + src/hb-ot-map-private.hh | 85 + +++++++++++++++++++++++++--------------- + src/hb-ot-map.cc | 18 ++++----- + src/hb-ot-shape-complex-indic.cc | 85 + +++++++++++++++++++++++----------------- + 3 files changed, 110 insertions(+), 78 deletions(-) + +commit 1d002048d5afcd45abbb09fdf0419f13b2e2265c +Author: Behdad Esfahbod +Date: Thu Aug 2 05:01:11 2012 -0400 + + [Indic] Minor + + src/hb-ot-shape-complex-indic-private.hh | 16 -------- + src/hb-ot-shape-complex-indic.cc | 64 + +++++++++++++++++++++----------- + 2 files changed, 43 insertions(+), 37 deletions(-) + +commit 6f7611375521c6d285a9aa763f2ea5cb44cd0d39 +Author: Behdad Esfahbod +Date: Thu Aug 2 04:00:31 2012 -0400 + + [GSUB/GPOS] Check array size before accessing digests + + src/hb-ot-layout-private.hh | 3 +++ + src/hb-ot-layout.cc | 32 ++++++++++++++++---------------- + 2 files changed, 19 insertions(+), 16 deletions(-) + +commit 22148b8c4af3ed296d96e969cdd47bac97b32307 +Author: Behdad Esfahbod +Date: Thu Aug 2 03:51:51 2012 -0400 + + Use Coverage digests in would_apply + + src/hb-ot-layout-gsub-table.hh | 1 + + src/hb-ot-layout-gsubgpos-private.hh | 6 +++++- + src/hb-ot-layout.cc | 4 ++-- + 3 files changed, 8 insertions(+), 3 deletions(-) + +commit 6c459c8fef85bc44f45d7b58c28a34abfb2c33fc +Author: Behdad Esfahbod +Date: Thu Aug 2 03:45:53 2012 -0400 + + Minor + + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +commit e2b8d75fa6e847ecf5c040f4e1e16a565c5d8aaf +Author: Behdad Esfahbod +Date: Wed Aug 1 22:17:48 2012 -0400 + + Use wider set digests on 64-bit archs + + src/hb-set-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 0120ce9679aab3ac936aeb18f6709529eef000a4 +Author: Behdad Esfahbod +Date: Wed Aug 1 21:56:35 2012 -0400 + + [GSUB/GPOS] Remove unused get_coverage() methods + + src/hb-ot-layout-gpos-table.hh | 11 ----------- + src/hb-ot-layout-gsub-table.hh | 11 ----------- + 2 files changed, 22 deletions(-) + +commit 1336ecdf8e4e9879b96b26ecfbf5c9ba6c49e2b9 +Author: Behdad Esfahbod +Date: Wed Aug 1 21:46:36 2012 -0400 + + [GSUB/GPOS] Use Coverage digests as gatekeeper + + Gives me a good 10% speedup for the Devanagari test case. Less so + for less lookup-intensive tests. + + For the Devanagari test case, the false positive rate of the GSUB + digest + is 4%. + + src/hb-ot-layout-gpos-table.hh | 30 +++++++++--------------------- + src/hb-ot-layout-gsub-table.hh | 35 + ++++++++++++----------------------- + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++++-- + src/hb-ot-layout-private.hh | 4 ++++ + src/hb-ot-layout.cc | 29 +++++++++++++++++++++++++---- + 5 files changed, 56 insertions(+), 50 deletions(-) + +commit a878c58a8fc1500986d713b2bcedfeb90a0087b0 +Author: Behdad Esfahbod +Date: Wed Aug 1 21:18:54 2012 -0400 + + [GSUB/GPOS] Add add_coverage() + + src/hb-ot-layout-gpos-table.hh | 18 ++++++++++++++++++ + src/hb-ot-layout-gsub-table.hh | 18 ++++++++++++++++++ + 2 files changed, 36 insertions(+) + +commit 60a3035ac5ec8227e4cc0e6708732bb139c9e0b8 +Author: Behdad Esfahbod +Date: Wed Aug 1 21:06:27 2012 -0400 + + Add hb_set_digest_t + + Implement two set digests, and one that combines the two. + + src/hb-set-private.hh | 95 + +++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 95 insertions(+) + +commit c8accf1dd2d92cc4f714393eb0ea46f69bb182a6 +Author: Behdad Esfahbod +Date: Wed Aug 1 21:05:57 2012 -0400 + + [OT] Templatize Coverage::add_coverage() + + src/hb-ot-layout-common-private.hh | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 8fbfda920e0b3bb4ab7afb732826026964b79be9 +Author: Behdad Esfahbod +Date: Wed Aug 1 19:03:46 2012 -0400 + + Inline font getters + + src/hb-fallback-shape.cc | 21 ++-- + src/hb-font-private.hh | 204 + ++++++++++++++++++++++++++++++++++++++ + src/hb-font.cc | 129 ++++-------------------- + src/hb-graphite2.cc | 6 +- + src/hb-old.cc | 10 +- + src/hb-ot-layout-gdef-table.hh | 2 +- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-shape-complex-arabic.cc | 4 +- + src/hb-ot-shape-complex-indic.cc | 6 +- + src/hb-ot-shape-normalize.cc | 12 +-- + src/hb-ot-shape.cc | 47 +++++---- + 11 files changed, 277 insertions(+), 166 deletions(-) + +commit 6adf417bc15d4524e280b284e3accd1ae647662e +Author: Behdad Esfahbod +Date: Wed Aug 1 18:07:42 2012 -0400 + + Use a lookup table for modified_combining_class + + src/hb-unicode-private.hh | 10 ++- + src/hb-unicode.cc | 213 + +++++++++++++++++++++++++++++++--------------- + src/hb-unicode.h | 4 + + 3 files changed, 157 insertions(+), 70 deletions(-) + +commit 208f70f0553d73d2908b21b9552298029482a8b9 +Author: Behdad Esfahbod +Date: Wed Aug 1 17:13:10 2012 -0400 + + Inline Unicode callbacks internally + + src/hb-buffer.cc | 2 +- + src/hb-fallback-shape.cc | 2 +- + src/hb-old.cc | 2 +- + src/hb-ot-shape-complex-misc.cc | 2 +- + src/hb-ot-shape-normalize.cc | 13 +++-- + src/hb-ot-shape-private.hh | 6 +-- + src/hb-ot-shape.cc | 4 +- + src/hb-unicode-private.hh | 112 + ++++++++++++++++++++-------------------- + src/hb-unicode.cc | 5 +- + 9 files changed, 73 insertions(+), 75 deletions(-) + +commit 7470315a3e782aa6192bbe64f7a3944266fb1521 +Author: Behdad Esfahbod +Date: Wed Aug 1 17:01:59 2012 -0400 + + Move unicode accessors around + + src/hb-unicode-private.hh | 73 + ++++++++++++++++++++++++++++++++++++++++++++++- + src/hb-unicode.cc | 65 ++++------------------------------------- + 2 files changed, 78 insertions(+), 60 deletions(-) + +commit 21fdcee00125b6e1c09f0bed3064d16ccd3a7a5d +Author: Behdad Esfahbod +Date: Wed Aug 1 16:23:44 2012 -0400 + + Add hb_unicode_combining_class_t + + src/hb-common.h | 38 +------------- + src/hb-glib.cc | 4 +- + src/hb-icu.cc | 4 +- + src/hb-unicode-private.hh | 2 +- + src/hb-unicode.cc | 11 ++-- + src/hb-unicode.h | 124 + +++++++++++++++++++++++++++++++++++++++++++++- + 6 files changed, 134 insertions(+), 49 deletions(-) + +commit 84186a64004e5dcd2ce98b564d0e0a09aa5d68b2 +Author: Behdad Esfahbod +Date: Wed Aug 1 13:32:39 2012 -0400 + + Add commentary on the compatibility decomposition in the normalizer + + src/hb-ot-shape-normalize.cc | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) + +commit 0834d952017a04c6f4599e574cb75ecf3ca27d3b +Author: Behdad Esfahbod +Date: Wed Aug 1 00:21:09 2012 -0400 + + [hb-old] Adjust mark positioning parameters + + Fallback mark positioning works now... With hb-ft and hb-view / + hb-shape at least. + + src/hb-old.cc | 10 +++++----- + src/hb-old/harfbuzz-shaper.cpp | 1 + + 2 files changed, 6 insertions(+), 5 deletions(-) + +commit 4ca743dfb8e09f9fa525061c7f1144d55f72effb +Author: Behdad Esfahbod +Date: Wed Aug 1 00:03:41 2012 -0400 + + [old] Implement fontMetrics + + src/hb-old.cc | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +commit 1e7d860613032e40a3f90e2caa2ee5ac44ab8c8c +Author: Behdad Esfahbod +Date: Tue Jul 31 23:41:06 2012 -0400 + + [GPOS] Adjust mark advance-width zeroing logic + + If there is no GPOS, zero mark advances. + + If there *is* GPOS and the shaper requests so, zero mark advances for + attached marks. + + Fixes regression with Tibetan, where the font has GPOS, and marks a + glyph as mark where it shouldn't get zero advance. + + src/hb-ot-layout-gpos-table.hh | 14 ++++++++------ + src/hb-ot-layout.cc | 4 ++-- + src/hb-ot-layout.h | 3 ++- + src/hb-ot-shape-complex-arabic.cc | 2 +- + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape-complex-misc.cc | 4 ++-- + src/hb-ot-shape-complex-private.hh | 2 +- + src/hb-ot-shape.cc | 6 ++---- + 8 files changed, 19 insertions(+), 18 deletions(-) + +commit a8842e4a448efb30f3f2f3c628d6dc4824829726 +Author: Behdad Esfahbod +Date: Tue Jul 31 23:10:11 2012 -0400 + + Remove some TODO items + + TODO | 27 --------------------------- + src/hb-shape.cc | 2 ++ + 2 files changed, 2 insertions(+), 27 deletions(-) + +commit 2bc3b9a616cedbc56ff4a915f9e3439ff3a6bf13 +Author: Behdad Esfahbod +Date: Tue Jul 31 23:08:25 2012 -0400 + + [OT] Zero mark advances if the shaper desires so + + Enabled for all shapers except for Indic. + + src/hb-ot-shape-complex-arabic.cc | 1 + + src/hb-ot-shape-complex-indic.cc | 1 + + src/hb-ot-shape-complex-misc.cc | 2 ++ + src/hb-ot-shape-complex-private.hh | 2 ++ + src/hb-ot-shape.cc | 15 +++++++++++++++ + 5 files changed, 21 insertions(+) + +commit 5fecd8b0355894ceda14b3d3c654f20c3d5e77f4 +Author: Behdad Esfahbod +Date: Tue Jul 31 22:48:38 2012 -0400 + + [OT] Synthesize glyph classes + + TODO | 2 -- + src/hb-ot-shape.cc | 20 ++++++++++++++++++-- + 2 files changed, 18 insertions(+), 4 deletions(-) + +commit 03b09214c073ce37eeb8af5218942c85b2d393df +Author: Behdad Esfahbod +Date: Tue Jul 31 22:43:58 2012 -0400 + + [GSUB] Minor + + src/hb-ot-layout-gsub-table.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit f0fc1df8fc949739b68d55948741016081b69c3a +Author: Behdad Esfahbod +Date: Tue Jul 31 22:43:32 2012 -0400 + + [hb-old] Implement getGlyphMetrics() + + Still working on it. + + src/hb-old.cc | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +commit 378d279bbf692195c4654e312dae854ab3be04cf +Author: Behdad Esfahbod +Date: Tue Jul 31 21:36:16 2012 -0400 + + Implement Unicode compatibility decompositions + + Based on patch from Philip Withnall. + https://bugs.freedesktop.org/show_bug.cgi?id=41095 + + src/hb-glib.cc | 30 +++++++++++++++++++++++++ + src/hb-icu.cc | 36 +++++++++++++++++++++++++++++- + src/hb-ot-shape-normalize.cc | 53 + +++++++++++++++++++++++++++++--------------- + src/hb-unicode-private.hh | 1 + + src/hb-unicode.cc | 27 +++++++++++++++++++++- + src/hb-unicode.h | 37 ++++++++++++++++++++++++++++++- + test/api/hb-test.h | 1 + + test/api/test-unicode.c | 50 + +++++++++++++++++++++++++++++++++++++++++ + 8 files changed, 214 insertions(+), 21 deletions(-) + +commit 321ec29cc270e7e66a529696b70b2caac553c95f +Author: Behdad Esfahbod +Date: Tue Jul 31 21:10:16 2012 -0400 + + Remove unused function + + src/hb-ot-shape-complex-indic.cc | 7 ------- + 1 file changed, 7 deletions(-) + +commit 69cc492dc120847ed00cae65ec958593ebf550c5 +Author: Behdad Esfahbod +Date: Tue Jul 31 14:51:36 2012 -0400 + + [buffer] Minor + + src/hb-buffer-private.hh | 3 ++- + src/hb-buffer.cc | 24 ++++++++++++------------ + 2 files changed, 14 insertions(+), 13 deletions(-) + +commit 693918ef8541014a5ef7dfb91c6ea0ae36d9c368 +Author: Behdad Esfahbod +Date: Mon Jul 30 21:08:51 2012 -0400 + + [OT] Streamline complex shaper enumeration + + Add a shaper class struct. + + src/hb-ot-shape-complex-arabic.cc | 37 ++++---- + src/hb-ot-shape-complex-indic.cc | 47 ++++++--- + src/hb-ot-shape-complex-misc.cc | 67 ++++++------- + src/hb-ot-shape-complex-private.hh | 179 + ++++++++++------------------------- + src/hb-ot-shape-normalize-private.hh | 4 +- + src/hb-ot-shape-private.hh | 2 +- + src/hb-ot-shape.cc | 16 ++-- + 7 files changed, 143 insertions(+), 209 deletions(-) + +commit c2e42c3db691515f3a458eb4c71fe1e6439d5620 +Author: Behdad Esfahbod +Date: Mon Jul 30 19:54:50 2012 -0400 + + Minor + + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- + src/hb-ot-layout-private.hh | 4 ++-- + 4 files changed, 9 insertions(+), 9 deletions(-) + +commit 03f67bc012f42131b36083a23efc78e1b04b828c +Author: Behdad Esfahbod +Date: Mon Jul 30 19:47:53 2012 -0400 + + More refactoring glyph class access + + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 154 + +++++++++++++++++------------------ + 3 files changed, 76 insertions(+), 82 deletions(-) + +commit 300c7307eb7943ba7416b672345506be1e27c6ba +Author: Behdad Esfahbod +Date: Mon Jul 30 19:37:44 2012 -0400 + + [OT] Don't crash if no GDEF available + + src/hb-ot-layout-gsubgpos-private.hh | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 3dcbdc2125c04c173f29f04922fc031929893f4e +Author: Behdad Esfahbod +Date: Mon Jul 30 19:31:17 2012 -0400 + + Minor + + src/hb-ot-layout.cc | 15 +++++---------- + 1 file changed, 5 insertions(+), 10 deletions(-) + +commit 05bd1b63426e07d1df7a1b40bf845dc94ab995a8 +Author: Behdad Esfahbod +Date: Mon Jul 30 19:30:01 2012 -0400 + + [GSUB/GPOS] Move glyph props matching around + + src/hb-ot-layout-gpos-table.hh | 11 ++-- + src/hb-ot-layout-gsub-table.hh | 18 +++--- + src/hb-ot-layout-gsubgpos-private.hh | 99 + +++++++++++++++++++++++++++++---- + src/hb-ot-layout-private.hh | 12 ---- + src/hb-ot-layout.cc | 104 + +++-------------------------------- + src/hb-ot-layout.h | 12 ++-- + src/hb-ot-shape.cc | 10 ++-- + 7 files changed, 127 insertions(+), 139 deletions(-) + +commit 2fca1426ca06cabbe8f027f2dc9dee9c27560c76 +Author: Behdad Esfahbod +Date: Mon Jul 30 18:46:41 2012 -0400 + + [GSUB] Don't erase glyph classes if GDEF does not have glyph classes + + src/hb-ot-layout-gsubgpos-private.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit fd42257f8c45ff8e036e1c3eb1a788a101be7ead +Author: Behdad Esfahbod +Date: Mon Jul 30 18:40:27 2012 -0400 + + Minor + + src/hb-ot-layout.cc | 29 +++++------------------------ + 1 file changed, 5 insertions(+), 24 deletions(-) + +commit 7fbbf86efe675e4c038dfc5985c24bbc544620cd +Author: Behdad Esfahbod +Date: Mon Jul 30 18:36:42 2012 -0400 + + [GSUB] Minor + + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 6 ++++++ + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit 713914d3203109a8e9213f5a1d3b384730703ce9 +Author: Behdad Esfahbod +Date: Mon Jul 30 17:54:38 2012 -0400 + + [Uniscribe] Clean up a bit + + src/hb-uniscribe.cc | 17 +++++------------ + 1 file changed, 5 insertions(+), 12 deletions(-) + +commit 301168dae77a63ee25adfb26ce2b54a708f83791 +Author: Behdad Esfahbod +Date: Mon Jul 30 17:48:04 2012 -0400 + + [CoreText] Port to shape_plan infrastructure + + src/hb-coretext.cc | 161 + ++++++++++++++++++++++++++--------------------------- + 1 file changed, 80 insertions(+), 81 deletions(-) + +commit 6cdfd14bb19d60ac3d6b20ff611408432254f273 +Author: Behdad Esfahbod +Date: Mon Jul 30 17:22:17 2012 -0400 + + Fix build on Mac + + src/hb-ot-layout-gsub-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7e34601dededd521bcef15111e39293df3d0d13d +Author: Behdad Esfahbod +Date: Mon Jul 30 14:53:41 2012 -0400 + + Unbreak Hangul jamo composition + + When we removed the separate Hangul shaper, the specific normalization + preference of Hangul was lost. Fix that. Also, the Thai shaper was + copied from Hangul, so had the fully-composed normalization behavior, + which was unnecessary. So, fix that too. + + src/hb-ot-shape-complex-arabic.cc | 2 +- + src/hb-ot-shape-complex-indic.cc | 4 +--- + src/hb-ot-shape-complex-misc.cc | 12 +++++++++--- + src/hb-ot-shape-complex-private.hh | 9 ++++----- + src/hb-ot-shape.cc | 4 +++- + 5 files changed, 18 insertions(+), 13 deletions(-) + +commit 7afb14407e59dfeaa79c33aca1ffa60e7982e349 +Author: Behdad Esfahbod +Date: Mon Jul 30 13:54:46 2012 -0400 + + [Indic] Recategorize Telugu length marks + + Fixes 8 more Telugu tests. Failures at 15 (0.00154548%). + + src/hb-unicode.cc | 8 ++++++++ + src/indic.cc | 11 ++++++++--- + 2 files changed, 16 insertions(+), 3 deletions(-) + +commit 70b3dc327232b20051b36397aa2b196ab8c62397 +Author: Behdad Esfahbod +Date: Mon Jul 30 12:40:18 2012 -0400 + + Add Hebrew test + + .../texts/in-tree/shaper-default/script-hebrew/misc/diacritics.txt + | 1 + + 1 file changed, 1 insertion(+) + +commit f2377155e35c15919af4d7db21b6edc6783146b6 +Author: Behdad Esfahbod +Date: Mon Jul 30 10:50:57 2012 -0400 + + [hb-old] Fix misc leaks + + Backport (forward-port?!) from upstream: + + commit 3ab7b37bdebf0f8773493a1fee910b151c4de30f + Author: Behdad Esfahbod + Date: Mon Jul 30 10:50:22 2012 -0400 + + Fix misc leaks + + https://bugs.freedesktop.org/show_bug.cgi?id=31992 + https://bugs.freedesktop.org/show_bug.cgi?id=31993 + https://bugs.freedesktop.org/show_bug.cgi?id=31994 + https://bugs.freedesktop.org/show_bug.cgi?id=31995 + + src/hb-old/harfbuzz-arabic.c | 12 +++++++++--- + src/hb-old/harfbuzz-gpos.c | 6 +++--- + src/hb-old/harfbuzz-gsub.c | 6 +++--- + src/hb-old/harfbuzz-tibetan.c | 1 + + 4 files changed, 16 insertions(+), 9 deletions(-) + +commit 3f4764bb56bb7e42ba8859f1905810bd2f998838 +Author: Behdad Esfahbod +Date: Mon Jul 30 10:06:42 2012 -0400 + + Don't lock user_data set during destruction if empty + + src/hb-private.hh | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 4ba647eecf0f70917ac4229af1f2dd3c62fcb7d5 +Author: Behdad Esfahbod +Date: Mon Jul 30 09:53:06 2012 -0400 + + Fix leak + + src/hb-ot-shape.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit f860366456d9e59b139a940da6d89c3c4fb9e96e +Author: Behdad Esfahbod +Date: Mon Jul 30 02:38:39 2012 -0400 + + [OT] Gain back some lost speed + + src/hb-ot-layout-private.hh | 27 +++++++++++++++- + src/hb-ot-layout.cc | 63 + ++++++++++++++++++++++++++++++++++---- + src/hb-ot-map-private.hh | 26 +++------------- + src/hb-ot-map.cc | 35 +++++++++++++++------ + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape-complex-private.hh | 5 --- + 6 files changed, 114 insertions(+), 44 deletions(-) + +commit 11f4c87d01924cac43bf40044f67838440e19e42 +Author: Behdad Esfahbod +Date: Mon Jul 30 02:36:46 2012 -0400 + + [OT] Remove hb_ot_layout_ensure() + + I didn't like it from the beginning. + + src/hb-ot-layout.cc | 9 +++++---- + src/hb-ot-layout.h | 5 ----- + 2 files changed, 5 insertions(+), 9 deletions(-) + +commit 578e42182b9b9cf15b4c5426fae36e224160cbd7 +Author: Behdad Esfahbod +Date: Mon Jul 30 02:35:07 2012 -0400 + + Minor + + src/hb-ot-layout-private.hh | 2 -- + src/hb-ot-layout.cc | 1 - + 2 files changed, 3 deletions(-) + +commit a973b5ce86051e8ef0d20df362db1a50488842ab +Author: Behdad Esfahbod +Date: Mon Jul 30 01:46:34 2012 -0400 + + [GSUB] Further adjustments to mark-attachment vs ligation interaction + + The d1d69ec52e75a78575b620a1c456d528b6078170 change broke Kannada + badly, + since it was ligating consonants, pushing matra out, and then ligating + with the matra. Adjust for that. See comments. + + src/hb-ot-layout-gsub-table.hh | + 11 ++++++++--- + .../in-tree/shaper-indic/indic/script-kannada/misc/misc.txt | 1 + + 2 files changed, 9 insertions(+), 3 deletions(-) + +commit 0aef425e25e2c58445157057f17ef18f695c5240 +Author: Behdad Esfahbod +Date: Mon Jul 30 00:55:15 2012 -0400 + + [GSUB] Minor + + src/hb-ot-layout-gpos-table.hh | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +commit d1d69ec52e75a78575b620a1c456d528b6078170 +Author: Behdad Esfahbod +Date: Mon Jul 30 00:51:47 2012 -0400 + + [GSUB] Don't ligate glyphs attached to different components of + ligatures + + This concludes the mark-attachment vs ligating interaction fixes + (for now). + + src/hb-ot-layout-gsub-table.hh | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +commit 4751dec8be05883483fd5f6b474ebd22583ae566 +Author: Behdad Esfahbod +Date: Mon Jul 30 00:42:07 2012 -0400 + + Minor + + src/hb-ot-layout-private.hh | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +commit f24bcfbed1f3b4f4f6311246bd870f73ad6ba750 +Author: Behdad Esfahbod +Date: Mon Jul 30 00:39:00 2012 -0400 + + Minor + + src/hb-ot-layout-gsub-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fe20c0f84f5ff518dc471bf22ac5a83ef079eb69 +Author: Behdad Esfahbod +Date: Mon Jul 30 00:00:59 2012 -0400 + + [GSUB] Fix mark component stuff when ligatures form ligatures! + + See comments. + + Fixes https://bugzilla.gnome.org/show_bug.cgi?id=437633 + + src/hb-ot-layout-gsub-table.hh | 117 + +++++++++++++++++++++++------------ + src/hb-ot-layout-gsubgpos-private.hh | 8 --- + src/hb-ot-layout-private.hh | 8 +-- + 3 files changed, 79 insertions(+), 54 deletions(-) + +commit 2ec3ba46a3c24469096e901750e38f6ee555479a +Author: Behdad Esfahbod +Date: Sun Jul 29 22:02:24 2012 -0400 + + [GSUB/GPOS] Minor + + Start squeezing more out of lig_id/lig_comp. + + src/hb-ot-layout-gsub-table.hh | 6 +++--- + src/hb-ot-layout-private.hh | 35 +++++++++++++++++++++++++++++++---- + 2 files changed, 34 insertions(+), 7 deletions(-) + +commit ef6e9cec3399e4f63f4b662abd77cf6d4683e8a3 +Author: Behdad Esfahbod +Date: Sun Jul 29 21:35:22 2012 -0400 + + Fixup bb0e4ba3e9c5a407fc5d73c914e429d24d336380 + + src/hb-shape-plan.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cb3d34063154bf164c61eeba41c6166b0bd304fb +Author: Behdad Esfahbod +Date: Sun Jul 29 20:37:38 2012 -0400 + + [GSUB] Don't set new lig_id on mark ligatures + + If two marks form a ligature, retain their previous lig_id, such that + the mark ligature can attach to ligature components... + + Fixes https://bugzilla.gnome.org/show_bug.cgi?id=676343 + + In fact, I noticed that we should not let ligatures form between + glyphs + coming from different components of a previous ligature. For example, + if the sequence is: LAM,SHADDA,LAM,FATHA,HEH, the LAM,LAM,HEH form a + ligature, putting SHADDA and FATHA next to eachother. However, + it would + be wrong to ligate them. Uniscribe has this bug also. + + src/hb-ot-layout-gsub-table.hh | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +commit 97a201becf936f62046914b568e5763e27ee936e +Author: Behdad Esfahbod +Date: Sun Jul 29 20:31:36 2012 -0400 + + Add Arabic tests for mark ligature component attachments + + .../script-arabic/misc/diacritics/MANIFEST | 1 + + .../misc/diacritics/ligature-components.txt | 18 + ++++++++++++++++++ + 2 files changed, 19 insertions(+) + +commit a15b70a81a609f024083cb04f9819483f4d5cab7 +Author: Behdad Esfahbod +Date: Sun Jul 29 20:09:22 2012 -0400 + + [hb-old] Fix cluster formation in RTL + + Unlike Uniscribe, hb-old returns glyphs in logical order, so the logic + does not need to duplicated for RTL. + + src/hb-old.cc | 12 +++--------- + 1 file changed, 3 insertions(+), 9 deletions(-) + +commit 8a7e70ef65952fc16b8c1d5f1126c94d9d81e755 +Author: Behdad Esfahbod +Date: Sun Jul 29 19:56:54 2012 -0400 + + [Minor] + + src/test.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bb0e4ba3e9c5a407fc5d73c914e429d24d336380 +Author: Behdad Esfahbod +Date: Sun Jul 29 17:34:14 2012 -0400 + + Minor + + src/hb-shape-plan.cc | 2 +- + src/test-would-substitute.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit a00ad60bc0fe74bf0e11d73da563239f3392f351 +Author: Behdad Esfahbod +Date: Sat Jul 28 21:16:08 2012 -0400 + + [Uniscribe] Remove hb_uniscribe_font_ensure() + + Wasn't a huge fan of putting the burden on the user. Just remove + it and + do what we've got to do transparently. + + src/hb-uniscribe.cc | 6 +++++- + src/hb-uniscribe.h | 4 ---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 5d874d566fe5d2cc4cfaf02c79b663d8a626ca1e +Author: Behdad Esfahbod +Date: Sat Jul 28 21:05:25 2012 -0400 + + [GPOS] Fix mark-to-mark positioning when one of the marks is + a ligature + + This commit: a3313e54008167e415b72c780ca7b9cda958d07e broke + MarkMarkPos + when one of the marks itself is a ligature. That regressed 26 Tibetan + tests (up from zero!). Fix that. Tibetan back to zero. + + src/hb-ot-layout-gpos-table.hh | 27 + ++++++++++++++++------ + src/hb-ot-layout-private.hh | 5 ++-- + test/shaping/texts/in-tree/shaper-indic/MANIFEST | 1 + + .../indic/script-sinhala/misc/MANIFEST | 1 + + .../in-tree/shaper-indic/south-asian/MANIFEST | 1 + + .../south-asian/script-tibetan/MANIFEST | 1 + + .../south-asian/script-tibetan/misc/MANIFEST | 1 + + .../south-asian/script-tibetan/misc/misc.txt | 1 + + 8 files changed, 29 insertions(+), 9 deletions(-) + +commit 338fe662b50f9309bf0050dd99becb644874195b +Author: Behdad Esfahbod +Date: Sat Jul 28 18:53:01 2012 -0400 + + [GSUB] Minor + + src/hb-ot-layout-gsub-table.hh | 33 ++++++++++++++++----------------- + 1 file changed, 16 insertions(+), 17 deletions(-) + +commit e6f7479fe34fb4a7cada61d84c2ed70d1fd565c8 +Author: Behdad Esfahbod +Date: Sat Jul 28 18:34:58 2012 -0400 + + [GSUB] Simplify would-apply + + src/hb-ot-layout-gsub-table.hh | 71 + +++--------------------------------- + src/hb-ot-layout-gsubgpos-private.hh | 24 +++--------- + 2 files changed, 11 insertions(+), 84 deletions(-) + +commit dadede012e4841f9fcb70d514fdc752f3ea4663d +Author: Behdad Esfahbod +Date: Sat Jul 28 18:03:20 2012 -0400 + + Minor + + src/hb-ot-layout-common-private.hh | 7 +++---- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + 3 files changed, 5 insertions(+), 6 deletions(-) + +commit 0b99429ead05ae32b3c210cb499af401b02770a9 +Author: Behdad Esfahbod +Date: Sat Jul 28 17:31:01 2012 -0400 + + [GSUB/GPOS] Add get_coverage() and use it to speed up main loop + + And use it to speed up the hotspot by checking coverage directly in + the main loop, not 10 functions deep in. + + Gives me a solid 20% boost with Indic test suite. Less so for less + lookup-intensive scenarios. + + Remove the "fast_path" hack from before. + + src/hb-ot-layout-gpos-table.hh | 179 + ++++++++++++++++++++++++++++++----- + src/hb-ot-layout-gsub-table.hh | 166 + ++++++++++++++++++++++++++------ + src/hb-ot-layout-gsubgpos-private.hh | 26 +++++ + 3 files changed, 321 insertions(+), 50 deletions(-) + +commit 30ec9002d84e8b49290e782e6192069821ffa942 +Author: Behdad Esfahbod +Date: Sat Jul 28 17:25:20 2012 -0400 + + Reject lookups with no subTable + + src/hb-ot-layout-common-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 0981068b75710397f08e0d2d776a0a2ea68d7117 +Author: Behdad Esfahbod +Date: Sat Jul 28 17:01:59 2012 -0400 + + [GSUB/GPOS] Reject Context/ChainContext lookups with zero input + + src/hb-ot-layout-gsubgpos-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 2f87cebe1062c7007021ebd05c1664e60da80825 +Author: Behdad Esfahbod +Date: Fri Jul 27 04:02:38 2012 -0400 + + Implement shape_plan caching + + Should give us some performance boost. + + TODO | 4 ++ + src/hb-buffer-private.hh | 30 ++++++++++++++ + src/hb-font-private.hh | 6 +++ + src/hb-font.cc | 15 ++++++- + src/hb-shape-plan.cc | 100 + +++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-shape-plan.h | 7 ++++ + src/hb-shape.cc | 2 +- + 7 files changed, 162 insertions(+), 2 deletions(-) + +commit e9eb9503e97044222f843daacfa47e26e51312b7 +Author: Behdad Esfahbod +Date: Fri Jul 27 03:16:22 2012 -0400 + + Add default_shaper_list to shape_plan + + src/hb-shape-plan-private.hh | 1 + + src/hb-shape-plan.cc | 2 ++ + 2 files changed, 3 insertions(+) + +commit 3b7c4e270694ed962e2a2839e44f2a59c26b326c +Author: Behdad Esfahbod +Date: Fri Jul 27 03:12:23 2012 -0400 + + Don't fail choosing shaper on planning failure + + Shapers have a chance to reject a font in face shaper_data creation. + No need to allow failing during planning. + + src/hb-shape-plan.cc | 17 ++++++----------- + 1 file changed, 6 insertions(+), 11 deletions(-) + +commit cfe9882610489e1b917e09a74dfbf6bbba2e4a57 +Author: Behdad Esfahbod +Date: Fri Jul 27 03:06:30 2012 -0400 + + Add hb_ot_layout_ensure() and hb_uniscribe_font_ensure() + + src/hb-ot-layout.cc | 7 +++++++ + src/hb-ot-layout.h | 6 ++++++ + src/hb-shape-plan.cc | 22 ++-------------------- + src/hb-shaper-private.hh | 18 ++++++++++++++++++ + src/hb-uniscribe.cc | 11 +++++++++++ + src/hb-uniscribe.h | 4 ++++ + 6 files changed, 48 insertions(+), 20 deletions(-) + +commit c5b668fb9239c912d2448280a7176e331ebc9181 +Author: Behdad Esfahbod +Date: Fri Jul 27 02:49:39 2012 -0400 + + Choose one shaper per plan + + src/hb-shape-plan-private.hh | 2 +- + src/hb-shape-plan.cc | 19 +++++++++---------- + 2 files changed, 10 insertions(+), 11 deletions(-) + +commit e82061e8db922f0ddbefd5a184ee2f9f967b9a05 +Author: Behdad Esfahbod +Date: Fri Jul 27 02:29:32 2012 -0400 + + Move ot shaper completely to shape_plan + + src/hb-ot-shape-private.hh | 6 -- + src/hb-ot-shape.cc | 181 + +++++++++++++++++++++------------------------ + src/hb-uniscribe.cc | 2 +- + 3 files changed, 84 insertions(+), 105 deletions(-) + +commit ea278d3895fe0c92801d692cd71d8d9f1de7c048 +Author: Behdad Esfahbod +Date: Fri Jul 27 02:12:28 2012 -0400 + + Partially switch ot shaper to shape_plan + + src/hb-buffer-private.hh | 1 + + src/hb-buffer.cc | 1 - + src/hb-font-private.hh | 2 -- + src/hb-font.cc | 22 ++++++++++++++-------- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 4 ++-- + src/hb-ot-layout-private.hh | 1 + + src/hb-ot-layout.cc | 9 ++++++--- + src/hb-ot-shape.cc | 3 ++- + src/hb-shape-plan.cc | 11 +++++++++++ + src/hb-shaper-private.hh | 3 ++- + 11 files changed, 40 insertions(+), 19 deletions(-) + +commit b6b7ba1313bf686e6ed567183466104c90504a67 +Author: Behdad Esfahbod +Date: Fri Jul 27 01:26:11 2012 -0400 + + Switch old and uniscribe backends to shape_plan + + src/hb-old.cc | 80 ++------------------------ + src/hb-shape.cc | 5 ++ + src/hb-shaper-impl-private.hh | 3 +- + src/hb-shaper-private.hh | 4 -- + src/hb-uniscribe.cc | 130 + ++++++++++++------------------------------ + 5 files changed, 48 insertions(+), 174 deletions(-) + +commit c32c096a429da3e64896cf42ff5ab8c775d3c2ec +Author: Behdad Esfahbod +Date: Fri Jul 27 01:13:53 2012 -0400 + + Switch to shape_plan + + Not optimized yet. Eats babies. And no shaper uses the shape_plan. + + src/hb-shape-plan.cc | 37 +++++++++++++++++++++++++++++++++++-- + src/hb-shape-plan.h | 8 ++++++++ + src/hb-shape.cc | 27 ++++----------------------- + 3 files changed, 47 insertions(+), 25 deletions(-) + +commit 5b95c148cc485f79fd7018bc4520b4cb5f728a18 +Author: Behdad Esfahbod +Date: Thu Jul 26 23:46:53 2012 -0400 + + Start implementing shape_plan + + src/hb-fallback-shape.cc | 4 ++- + src/hb-font-private.hh | 4 +++ + src/hb-old.cc | 4 ++- + src/hb-ot-shape.cc | 4 ++- + src/hb-shape-plan-private.hh | 7 ++++ + src/hb-shape-plan.cc | 76 + ++++++++++++++++++++++++++++++++++++++++++-- + src/hb-shape.cc | 4 +++ + src/hb-shaper-private.hh | 4 +-- + src/hb-uniscribe.cc | 4 ++- + 9 files changed, 103 insertions(+), 8 deletions(-) + +commit bd26b4d21f59312805d294f46f15182adbcc47da +Author: Behdad Esfahbod +Date: Thu Jul 26 22:05:39 2012 -0400 + + Minor + + src/Makefile.am | 1 + + src/hb-fallback-shape.cc | 3 +- + src/hb-old.cc | 3 +- + src/hb-ot-shape.cc | 3 +- + src/hb-shape-plan-private.hh | 2 +- + src/hb-shape-plan.cc | 2 + + src/hb-shape.cc | 98 ++++---------------------------------- + src/hb-shaper-private.hh | 16 ++++++- + src/hb-shaper.cc | 109 + +++++++++++++++++++++++++++++++++++++++++++ + src/hb-uniscribe.cc | 3 +- + 10 files changed, 145 insertions(+), 95 deletions(-) + +commit 027857d0412477fb4427dcb8a8c45287c272e143 +Author: Behdad Esfahbod +Date: Thu Jul 26 17:34:25 2012 -0400 + + Start adding a unified shaper access infrastructure + + Add global shape_plan. Unused so far. + + src/Makefile.am | 15 +- + src/hb-coretext-private.hh | 42 ----- + src/hb-coretext.cc | 6 +- + src/hb-fallback-shape.cc | 62 ++++++- + src/hb-font-private.hh | 12 ++ + src/hb-font.cc | 15 +- + src/hb-old.cc | 109 +++++++++--- + src/hb-ot-shape-private.hh | 8 - + src/hb-ot-shape.cc | 60 ++++++- + ...aphite2-private.hh => hb-shape-plan-private.hh} | 28 +++- + src/hb-shape-plan.cc | 85 ++++++++++ + ...b-fallback-shape-private.hh => hb-shape-plan.h} | 39 +++-- + src/hb-shape.cc | 48 +----- + ...scribe-private.hh => hb-shaper-impl-private.hh} | 20 ++- + src/{hb-old-private.hh => hb-shaper-list.hh} | 30 ++-- + src/hb-shaper-private.hh | 81 +++++++++ + src/hb-uniscribe.cc | 186 + +++++++++++++-------- + 17 files changed, 608 insertions(+), 238 deletions(-) + +commit fa2dfcd560444d8c54b6349ee106134d3536f79b +Author: Behdad Esfahbod +Date: Thu Jul 26 16:06:16 2012 -0400 + + Fix visibility warnings with MinGW32 + + src/hb-old/harfbuzz-global.h | 17 +++++++++++------ + src/hb-old/harfbuzz-impl.h | 6 +++++- + 2 files changed, 16 insertions(+), 7 deletions(-) + +commit ac2085d4b391b0a72473ecac3dd6c22efe66833f +Author: Jonathan Kew +Date: Thu Jul 26 15:58:45 2012 -0400 + + [CoreText] Ensure cluster indices in output buffer are non-decreasing. + + Does not provide Uniscribe-compatible results, but should at least + avoid + breaking hb-view due to out-of-order cluster values. + + For RTL runs, ensure cluster values are non-increasing (instead of + non-decreasing). + + src/hb-coretext.cc | 37 +++++++++++++++++++++++++++++++++++++ + 1 file changed, 37 insertions(+) + +commit 441d3bb7de311d54b9f0a5210344f9a96e97e153 +Author: Behdad Esfahbod +Date: Thu Jul 26 12:01:12 2012 -0400 + + Minor + + src/hb-coretext.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 2e7f223054d310695bdb3498b2b2b5d17b6cce78 +Author: Behdad Esfahbod +Date: Wed Jul 25 19:30:15 2012 -0400 + + [hb-old] Fix Arabic cursive positioning + + Backporting from upstream: + + commit b847f24ce855d24f6822bcd9c0006905e81b94d8 + Author: Behdad Esfahbod + Date: Wed Jul 25 19:29:16 2012 -0400 + + [arabic] Fix Arabic cursive positioning + + This was clearly broken in testing. Who knows... Fixes for me. + Test with a Nastaleeq font, or with Arabic Typesetting. + + Backporting from Chromium. + + src/hb-old/harfbuzz-shaper.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9550a8c4e8b4e28be60d38c27d59253846ff9569 +Author: Behdad Esfahbod +Date: Wed Jul 25 19:22:57 2012 -0400 + + [hb-old] Fixup not-enough-space handling + + src/hb-old.cc | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +commit 91e721ea8693205f4f738bca97a5055ee75cf463 +Author: Behdad Esfahbod +Date: Wed Jul 25 19:20:34 2012 -0400 + + [hb-old] Fix clusters + + Unlike its "documentation", hb-old's log_clusters are, well, indeed + logical, not visual. Fixup. Adapted / copied from hb-uniscribe. + + src/hb-old.cc | 51 + ++++++++++++++++++++++++++++++++++---------- + src/hb-old/harfbuzz-shaper.h | 1 + + src/hb-uniscribe.cc | 5 +++-- + 3 files changed, 44 insertions(+), 13 deletions(-) + +commit a3313e54008167e415b72c780ca7b9cda958d07e +Author: Behdad Esfahbod +Date: Wed Jul 25 18:37:51 2012 -0400 + + [GPOS] Fix MarkMarkPos applied to results of MultipleSubst + + This was broken as a result of + 7b84c536c10ab90ed96a033d88e9ad232d46c5b8. + As Khaled reported, MarkMark positioning was broken with glyphs + resulting from a MultipleSubst. Fixed. Test with the ALLAH character + in Amiri. + + src/hb-ot-layout-gpos-table.hh | 10 +++++----- + src/hb-ot-layout-private.hh | 23 +++++++++++++++++++++-- + 2 files changed, 26 insertions(+), 7 deletions(-) + +commit 35bdab3cf1f0836807160e3ce93766c321b32e8c +Author: Behdad Esfahbod +Date: Wed Jul 25 11:59:52 2012 -0400 + + Minor + + src/hb-unicode-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8fe4c7405b922cf0f936a46a9baedf4885b05254 +Author: Behdad Esfahbod +Date: Tue Jul 24 21:05:12 2012 -0400 + + [hb-old] Add HarfBuzz.old shaper + + Choose using shaper name "old". + + configure.ac | 8 + + src/Makefile.am | 14 +- + src/hb-old-private.hh | 40 +++ + src/hb-old.cc | 369 ++++++++++++++++++++++++ + src/hb-old/.gitignore | 7 - + src/hb-old/Makefile.am | 2 + + src/hb-old/Makefile.in | 762 + ------------------------------------------------- + src/hb-shape.cc | 8 +- + 8 files changed, 436 insertions(+), 774 deletions(-) + +commit 5e1987005eb1b9af7a4d3d9f90c5768d8cc80015 +Author: Behdad Esfahbod +Date: Tue Jul 24 19:53:55 2012 -0400 + + [hb-old] Define Unicode funcs in terms of new HarfBuzz + + src/hb-old/Makefile.am | 4 + + src/hb-old/Makefile.in | 182 + ++++++++++++++++++++++++++++++++++++----- + src/hb-old/harfbuzz-external.h | 100 +++++++++++++--------- + 3 files changed, 224 insertions(+), 62 deletions(-) + +commit 4a31166b2853c1ec052844140e114158f47c2355 +Author: Behdad Esfahbod +Date: Tue Jul 24 19:49:48 2012 -0400 + + [hb-old] Shovel out the line-breaking / word-segmentation stuff + + src/hb-old/Makefile.am | 10 +- + src/hb-old/Makefile.in | 13 +- + src/hb-old/harfbuzz-external.h | 66 ------ + src/hb-old/harfbuzz-indic.cpp | 26 --- + src/hb-old/harfbuzz-khmer.c | 25 --- + src/hb-old/harfbuzz-myanmar.c | 28 --- + src/hb-old/harfbuzz-shaper-private.h | 12 -- + src/hb-old/harfbuzz-shaper.cpp | 403 + +++-------------------------------- + src/hb-old/harfbuzz-shaper.h | 31 --- + src/hb-old/harfbuzz-thai.c | 111 ---------- + src/hb-old/harfbuzz-tibetan.c | 26 --- + src/hb-old/harfbuzz.c | 32 --- + 12 files changed, 33 insertions(+), 750 deletions(-) + +commit 0bcbe88cf313117f739b98a11dbe698b75784e9d +Author: Behdad Esfahbod +Date: Tue Jul 24 19:38:24 2012 -0400 + + [hb-old] Add visibility attributes + + src/hb-old/harfbuzz-global.h | 10 ++++++---- + src/hb-old/harfbuzz-impl.h | 2 +- + 2 files changed, 7 insertions(+), 5 deletions(-) + +commit 6a9d43c3178c920672a84382ca3797e3c478b2b0 +Author: Behdad Esfahbod +Date: Tue Jul 24 19:21:22 2012 -0400 + + [hb-old] Remove unused header file + + src/hb-old/harfbuzz-shape.h | 199 + -------------------------------------------- + 1 file changed, 199 deletions(-) + +commit fb47209c5b3aa992faf18d1a3f78b9d7682cf62f +Author: Behdad Esfahbod +Date: Tue Jul 24 19:20:19 2012 -0400 + + [hb-old] Rename hb_buffer_* to HB_Buffer_* + + src/hb-old/harfbuzz-buffer.c | 22 +++++++++++----------- + src/hb-old/harfbuzz-buffer.h | 8 ++++---- + src/hb-old/harfbuzz-shaper.cpp | 8 ++++---- + 3 files changed, 19 insertions(+), 19 deletions(-) + +commit 1512a7357513b72e2a07dda706a176bb23d694e9 +Author: Behdad Esfahbod +Date: Tue Jul 24 19:16:56 2012 -0400 + + [hb-old] Start adding HarfBuzz-old as a new backend + + configure.ac | 1 + + src/Makefile.am | 5 + + src/hb-old/.gitignore | 7 + + src/hb-old/COPYING | 24 + + src/hb-old/Makefile.am | 56 + + src/hb-old/Makefile.in | 631 ++++ + src/hb-old/README | 7 + + src/hb-old/harfbuzz-arabic.c | 1144 +++++++ + src/hb-old/harfbuzz-buffer-private.h | 107 + + src/hb-old/harfbuzz-buffer.c | 383 +++ + src/hb-old/harfbuzz-buffer.h | 102 + + src/hb-old/harfbuzz-external.h | 151 + + src/hb-old/harfbuzz-gdef-private.h | 135 + + src/hb-old/harfbuzz-gdef.c | 1163 +++++++ + src/hb-old/harfbuzz-gdef.h | 140 + + src/hb-old/harfbuzz-global.h | 118 + + src/hb-old/harfbuzz-gpos-private.h | 729 ++++ + src/hb-old/harfbuzz-gpos.c | 6094 + ++++++++++++++++++++++++++++++++++ + src/hb-old/harfbuzz-gpos.h | 155 + + src/hb-old/harfbuzz-greek.c | 447 +++ + src/hb-old/harfbuzz-gsub-private.h | 483 +++ + src/hb-old/harfbuzz-gsub.c | 4329 ++++++++++++++++++++++++ + src/hb-old/harfbuzz-gsub.h | 148 + + src/hb-old/harfbuzz-hangul.c | 268 ++ + src/hb-old/harfbuzz-hebrew.c | 187 ++ + src/hb-old/harfbuzz-impl.c | 84 + + src/hb-old/harfbuzz-impl.h | 131 + + src/hb-old/harfbuzz-indic.cpp | 1894 +++++++++++ + src/hb-old/harfbuzz-khmer.c | 667 ++++ + src/hb-old/harfbuzz-myanmar.c | 539 +++ + src/hb-old/harfbuzz-open-private.h | 102 + + src/hb-old/harfbuzz-open.c | 1433 ++++++++ + src/hb-old/harfbuzz-open.h | 288 ++ + src/hb-old/harfbuzz-shape.h | 199 ++ + src/hb-old/harfbuzz-shaper-all.cpp | 37 + + src/hb-old/harfbuzz-shaper-private.h | 171 + + src/hb-old/harfbuzz-shaper.cpp | 1338 ++++++++ + src/hb-old/harfbuzz-shaper.h | 294 ++ + src/hb-old/harfbuzz-stream-private.h | 81 + + src/hb-old/harfbuzz-stream.c | 114 + + src/hb-old/harfbuzz-stream.h | 51 + + src/hb-old/harfbuzz-thai.c | 111 + + src/hb-old/harfbuzz-tibetan.c | 274 ++ + src/hb-old/harfbuzz.c | 32 + + src/hb-old/harfbuzz.h | 38 + + 45 files changed, 24892 insertions(+) + +commit 478fd0529b868b22905a9dedf331ac7cc9721723 +Author: Behdad Esfahbod +Date: Tue Jul 24 17:09:01 2012 -0400 + + Minor + + src/hb-unicode-private.hh | 27 ++++++++++++++------------- + 1 file changed, 14 insertions(+), 13 deletions(-) + +commit 8979a7f6f2b44ade4c0198a31ae08561b35ce009 +Author: Behdad Esfahbod +Date: Tue Jul 24 17:03:55 2012 -0400 + + [Mongolian] Remove Mongolian Vowel Separator at the end of shaping + + Results match Uniscribe now. + + src/hb-unicode-private.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit aa6d849838d5231465ae1a25a4dd5ea1e9380ff9 +Author: Jonathan Kew +Date: Tue Jul 24 15:52:32 2012 -0400 + + [CoreText] Add basic Core Text backend for comparison with our + native shaping + + Does not attempt to handle clusters in a Uniscribe- or + HarfBuzz-compatible way; + just returns the original string indexes that CT maintains. These + may even be + out-of-order in the case of reordrant glyphs. + + configure.ac | 12 ++ + src/Makefile.am | 7 + + src/hb-coretext-private.hh | 42 ++++++ + src/hb-coretext.cc | 323 + +++++++++++++++++++++++++++++++++++++++++++++ + src/hb-coretext.h | 43 ++++++ + src/hb-shape.cc | 6 + + 6 files changed, 433 insertions(+) + +commit ec8d2494694275dfbbac2dd0d33ca2894b0463d6 +Author: Behdad Esfahbod +Date: Tue Jul 24 15:40:37 2012 -0400 + + Make data members of various OpenType structs protected instead + of private + + Should fix warnings generated when building with + -Wunused-private-field. + Based on patch from Jonathan Kew. + + src/hb-open-file-private.hh | 8 +++--- + src/hb-ot-head-table.hh | 2 +- + src/hb-ot-hhea-table.hh | 2 +- + src/hb-ot-hmtx-table.hh | 2 +- + src/hb-ot-layout-common-private.hh | 14 ++++++----- + src/hb-ot-layout-gdef-table.hh | 20 +++++++-------- + src/hb-ot-layout-gpos-table.hh | 48 + ++++++++++++++++++------------------ + src/hb-ot-layout-gsub-table.hh | 30 +++++++++++----------- + src/hb-ot-layout-gsubgpos-private.hh | 32 ++++++++++++------------ + src/hb-ot-maxp-table.hh | 2 +- + src/hb-ot-name-table.hh | 2 +- + 11 files changed, 82 insertions(+), 80 deletions(-) + +commit 97aa0b738a33b73a3f9763dd2950f2dd39f596ed +Author: Behdad Esfahbod +Date: Tue Jul 24 15:02:34 2012 -0400 + + Minor const correctness shuffling + + src/hb-shape.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 6411e74caf23af7b0545f1fe54d19a1c8da895e8 +Author: Behdad Esfahbod +Date: Tue Jul 24 13:48:49 2012 -0400 + + [Indic] Reposition Gurmukhi top matras to after post + + The font is forming a post-base consonant in some samples, and + Uniscribe + positions top matra on the post-base. Do the same. + + Gurmukhi failures down from 59 to 41 (0.0674242%). + + src/hb-ot-shape-complex-indic.cc | + 2 +- + .../texts/in-tree/shaper-indic/indic/script-gurmukhi/misc/misc.txt | + 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit c3f769ba09df319fa69d04f68c57444f95eceee6 +Author: Behdad Esfahbod +Date: Tue Jul 24 13:26:32 2012 -0400 + + [Indic] Ignore Uniscribe output containing two zero-width space glyphs + + Uniscribe is buggy and sometimes /eats/ a mark next to a non-joiner. + Most of Malayalam failures where actually hitting this bug. + + Ignore test output with two zero-width space glyphs. This is a hack + until we build up the test suite infrastructure better. + + Bengali went down by 9, Devanagari by 2, Kannada by 130, Malayalm down + from 1197 to 307, Sinhala down by 16, Telugu down by 26. New stats: + + BENGALI: 353996 out of 354285 tests passed. 289 failed (0.0815727%) + DEVANAGARI: 693573 out of 693628 tests passed. 55 failed (0.00792932%) + GUJARATI: 366489 out of 366506 tests passed. 17 failed (0.0046384%) + GURMUKHI: 60750 out of 60809 tests passed. 59 failed (0.0970251%) + KANNADA: 951086 out of 951913 tests passed. 827 failed (0.0868777%) + KHMER: 299094 out of 299124 tests passed. 30 failed (0.0100293%) + MALAYALAM: 1048109 out of 1048416 tests passed. 307 failed + (0.0292823%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271715 out of 271847 tests passed. 132 failed (0.0485567%) + TAMIL: 1091837 out of 1091837 tests passed. 0 failed (0%) + TELUGU: 970550 out of 970573 tests passed. 23 failed (0.00236973%) + + test/shaping/hb_test_tools.py | + 1 + + .../texts/in-tree/shaper-indic/indic/script-malayalam/misc/misc.txt | + 2 ++ + 2 files changed, 3 insertions(+) + +commit 65c43accdc4d2082282d5cedba8514b8df0c18a2 +Author: Behdad Esfahbod +Date: Tue Jul 24 03:36:47 2012 -0400 + + [Indic] Better position left-matra in Malayalam + + Just put it before base, which is what's expected. + + Malayalam failures down from 1559 to 1197 (0.114172%). + + BENGALI: 353988 out of 354285 tests passed. 297 failed (0.0838308%) + DEVANAGARI: 693571 out of 693628 tests passed. 57 failed (0.00821766%) + GUJARATI: 366489 out of 366506 tests passed. 17 failed (0.0046384%) + GURMUKHI: 60750 out of 60809 tests passed. 59 failed (0.0970251%) + KANNADA: 950956 out of 951913 tests passed. 957 failed (0.100534%) + KHMER: 299094 out of 299124 tests passed. 30 failed (0.0100293%) + MALAYALAM: 1047219 out of 1048416 tests passed. 1197 failed + (0.114172%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271699 out of 271847 tests passed. 148 failed (0.0544424%) + TAMIL: 1091837 out of 1091837 tests passed. 0 failed (0%) + TELUGU: 970524 out of 970573 tests passed. 49 failed (0.00504856%) + + src/hb-ot-shape-complex-indic.cc | 41 + +++++++++++++++------- + .../indic/script-malayalam/misc/misc.txt | 1 + + 2 files changed, 29 insertions(+), 13 deletions(-) + +commit 88f413b56f2858d149e2fc067685aeecaea779ca +Author: Behdad Esfahbod +Date: Tue Jul 24 03:04:36 2012 -0400 + + [Indic] Implement Reph+Ya-Phalaa interaction + + The sequence Ra,H,Ya in Bengali is ambigious and Unicode encoded + that to + get Ya-Phalaa, one would place ZWJ before Halant. Ie. a ZWJ,H + sequence + requests subjoining, while a H,ZWJ requests Half form. Implement + that. + + Bengali failures go down from 377 to 297 (0.0838308%). + Gujarati is down by 4 to 17 (0.0046384%). + Kannada is down by 226 to 957 (0.100534%). + + Current status: + + BENGALI: 353988 out of 354285 tests passed. 297 failed (0.0838308%) + DEVANAGARI: 693571 out of 693628 tests passed. 57 failed (0.00821766%) + GUJARATI: 366489 out of 366506 tests passed. 17 failed (0.0046384%) + GURMUKHI: 60750 out of 60809 tests passed. 59 failed (0.0970251%) + KANNADA: 950956 out of 951913 tests passed. 957 failed (0.100534%) + KHMER: 299094 out of 299124 tests passed. 30 failed (0.0100293%) + MALAYALAM: 1046857 out of 1048416 tests passed. 1559 failed + (0.148701%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271699 out of 271847 tests passed. 148 failed (0.0544424%) + TAMIL: 1091837 out of 1091837 tests passed. 0 failed (0%) + TELUGU: 970524 out of 970573 tests passed. 49 failed (0.00504856%) + + src/hb-ot-shape-complex-indic.cc | + 10 ++++++++-- + .../in-tree/shaper-indic/indic/script-bengali/misc/reph.txt | 4 ++++ + 2 files changed, 12 insertions(+), 2 deletions(-) + +commit dff0ece11d61978c04e839501f179a5c3077f340 +Author: Behdad Esfahbod +Date: Tue Jul 24 02:30:38 2012 -0400 + + [Indic] Limit matras to 4 per syllable + + Also limit joiners. + + This limits our syllable length to a constant, and is + closer to what Uniscribe does anyway. + + Two Devanagari tests regressed, but who cares about tests with 20 + joiners in a row?! Devanagari at 57 (0.00821766%) now. + + src/hb-ot-shape-complex-indic-machine.rl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 330b329c8905a37ca88c556dea82c70d74c77458 +Author: Behdad Esfahbod +Date: Tue Jul 24 02:25:26 2012 -0400 + + [Indic] Unmark U+17D1 KHMER SIGN VIRIAM to NOT be a Virama + + Fixes another 1 Khmer failure. Down to 30 (0.0100293%) now. + + src/hb-ot-shape-complex-indic.cc | + 2 ++ + .../in-tree/shaper-indic/south-east-asian/script-khmer/misc/misc.txt | + 1 + + 2 files changed, 3 insertions(+) + +commit 6824a7194e01b77eddb95bd95a9b32e219140912 +Author: Behdad Esfahbod +Date: Tue Jul 24 02:22:18 2012 -0400 + + [Indic] Recategorize Khmer various signs as top matras + + Khmer failures down from 39 to 31 (0.0103636%). + + src/hb-ot-shape-complex-indic.cc | 23 ++++++++++------------- + 1 file changed, 10 insertions(+), 13 deletions(-) + +commit d90b8e841e0068a601c96ab184d18b0f48eec9d1 +Author: Behdad Esfahbod +Date: Tue Jul 24 02:10:20 2012 -0400 + + [Indic] Reposition Khmer prebase-reordering Ra around split matras + + In Khmer coeng model, a V,Ra can go *after* matras. If it goes + after a + split matra, it should be reordered to *before* the left part of + such matra. + + Khmer failures down from 136 to 39 (0.0130381%). + + src/hb-ot-shape-complex-indic.cc | 13 + +++++++++++++ + .../south-east-asian/script-khmer/misc/misc.txt | 4 ++++ + 2 files changed, 17 insertions(+) + +commit 0afb84c12567ac35adac657bf8be29999b8c5a50 +Author: Behdad Esfahbod +Date: Tue Jul 24 01:44:47 2012 -0400 + + [Indic] Fix minor bug in pre-base Ra positioning + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7573799126e812a047daa5f64121ec959866b3c8 +Author: Behdad Esfahbod +Date: Tue Jul 24 01:32:07 2012 -0400 + + [Indic] Position Khmer U+17CE + + Fixes another 6 Khmer failures. Now at 136 (0.0454661%). + + src/hb-ot-shape-complex-indic.cc | + 6 ++++++ + .../shaper-indic/south-east-asian/script-khmer/misc/misc.txt | 1 + + 2 files changed, 7 insertions(+) + +commit 8d00e8d0e7d10f823e6975fecaffb9d557b1a99a +Author: Behdad Esfahbod +Date: Tue Jul 24 01:04:18 2012 -0400 + + [Indic] Don't reposition Khmer Bindu + + Khmer Bindu doesn't like to move to syllable end. Leave it where it + was. + + Brings down Khmer failures from 510 to 142 (0.047572%). + + src/hb-ot-shape-complex-indic.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 2278eefcdb3dd0d492b9d07176fbecc1f0516bb7 +Author: Behdad Esfahbod +Date: Tue Jul 24 00:26:43 2012 -0400 + + [Indic] In Sinhala, form forced Reph even if no other consonant found + + Fixes another 10 Sinhala failures. Down to 148 (0.0544424%). + + src/hb-ot-shape-complex-indic.cc | + 10 +++++----- + .../in-tree/shaper-indic/indic/script-sinhala/misc/misc.txt | 1 + + 2 files changed, 6 insertions(+), 5 deletions(-) + +commit 71fd5e80ad06c8e85a1112cc89e129d6cd03f82c +Author: Behdad Esfahbod +Date: Tue Jul 24 00:21:16 2012 -0400 + + [Indic] Further adjust base algorithm for Sinhala + + Apparently if there is C,V,ZWJ,C, the first C will be base, but if + it's C,ZWJ,V,C, the second one will be. + + Note that Uniscribe implements this differently, by breaking + syllable in + the case of C,ZWJ,V,C and putting the first consonant in one syllable + and the rest in the next syllable. + + Sinhala failures down from 208 to 158 (0.0581209%). No changes to + Khmer. + + src/hb-ot-shape-complex-indic.cc | + 11 +++++++---- + .../in-tree/shaper-indic/indic/script-sinhala/misc/misc.txt | 3 +++ + 2 files changed, 10 insertions(+), 4 deletions(-) + +commit 73d71cc527d28fd5519c5d965c272ea1fb149a0e +Author: Behdad Esfahbod +Date: Tue Jul 24 00:09:12 2012 -0400 + + [Indic] End Vowel-based syllable at ZWJ + + One Devanagari test regressed, plus 10 Malayalam (at 1545 now). + + Fixed 120 Sinhala failures. Now at 208 (0.0765136%). + + src/hb-ot-shape-complex-indic-machine.rl | + 2 +- + .../texts/in-tree/shaper-indic/indic/script-sinhala/misc/misc.txt | + 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 34c215036f5fcdc7599b1ab0591b56dbb3811902 +Author: Behdad Esfahbod +Date: Mon Jul 23 23:51:29 2012 -0400 + + [Indic] Improve Sinhala base algorithm and reph positioning + + Sinhala does not have half forms. And most (all?) consonants can be + base, except when preceded by ZWJ, which would request a subjoined + form. + Hence switch the base algorithm to categorize with Khmer, start search + at start, and stop at a ZWJ. + + Also, mark all pos=base consonants after base to be subjoined. Mark + base itself to have pos=base. + + Finally, adjust Sinhala's reph position to after-main. + + Brings down Sinhala failures from 455 to 328 (0.120656%). + + src/hb-ot-shape-complex-indic.cc | 18 + +++++++++++++++++- + .../shaper-indic/indic/script-sinhala/misc/misc.txt | 1 + + 2 files changed, 18 insertions(+), 1 deletion(-) + +commit 2ec934c6c25423e7af20d909a9c698a149808ea9 +Author: Behdad Esfahbod +Date: Mon Jul 23 23:49:04 2012 -0400 + + [Indic] Change "unknown" position to end of syllable + + src/hb-ot-shape-complex-indic-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b70021f7c81a0ed08475b14b07291f662cd9f905 +Author: Behdad Esfahbod +Date: Mon Jul 23 20:18:17 2012 -0400 + + When removing zero-width marks, don't remove ligatures + + If a mark ligated, it probably should NOT be removed. + + src/hb-ot-shape.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 49c5ec51444f27f33e1eb6aa1959c61b08fa89c0 +Author: Behdad Esfahbod +Date: Mon Jul 23 20:14:13 2012 -0400 + + Minor refactoring + + src/hb-ot-layout-gsubgpos-private.hh | 32 + -------------------------------- + src/hb-ot-layout-private.hh | 35 + +++++++++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-indic.cc | 2 +- + 3 files changed, 36 insertions(+), 33 deletions(-) + +commit c3e6fdc3791168cf2b4c9412e751f187d58faa42 +Author: Behdad Esfahbod +Date: Mon Jul 23 20:11:42 2012 -0400 + + [Indic] Improve check on ligatures + + Only skip actual ligatures, not marks in-between ligature components. + + src/hb-ot-layout-gsubgpos-private.hh | 5 +++++ + src/hb-ot-shape-complex-indic.cc | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit 771a8f50289e8fa458cfc3cd84f73a380ce98077 +Author: Behdad Esfahbod +Date: Mon Jul 23 20:07:50 2012 -0400 + + [Indic] exclude ligatures when matching on Indic category + + If, say, a H,ZWJ,C ligature was formed, we don't want the code + to detec + that as a Halant. So, ignore ligatures when matching category in + final_reordering. + + Sinhala failures down from 514 to 455 (0.167374%). + + src/hb-ot-shape-complex-indic.cc | 41 + ++++++++++++---------- + .../indic/script-sinhala/misc/misc.txt | 1 + + 2 files changed, 23 insertions(+), 19 deletions(-) + +commit d1af9e82e5309158ed334ab8e21f3a3b64b9540f +Author: Behdad Esfahbod +Date: Mon Jul 23 19:55:35 2012 -0400 + + [GSUB/GPOS] Const correctness + + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit baacd090df97610e3f6d1b2a110dc67b6c6f9f5c +Author: Behdad Esfahbod +Date: Mon Jul 23 19:51:48 2012 -0400 + + [Indic] Minor refactoring + + src/hb-ot-shape-complex-indic.cc | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit c7c4de2fb9bba216e37875d79815eef55c0acc01 +Author: Behdad Esfahbod +Date: Mon Jul 23 18:25:02 2012 -0400 + + [Indic] Remove syllable length check before sorting + + We now limit syllable lengths in the machine. No need to match here. + + src/hb-ot-shape-complex-indic.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit 9fa052733eb93a3ce1205f63ff8f74cb295cbe99 +Author: Behdad Esfahbod +Date: Mon Jul 23 18:19:17 2012 -0400 + + [Indic] Limit syllables to at most five consonants + + Seems to be about what Uniscribe does. Not exactly. But close + enough. + More consonants will start a new cluster. + + A few scripts went way down in failures. In particular: + + - Devanagari failures went down from 490 to 56. + - Telugu went down from 113 to 49. + + Other scripts went down slightly or didn't change. New numbers: + + BENGALI: 353908 out of 354285 tests passed. 377 failed (0.106412%) + DEVANAGARI: 693572 out of 693628 tests passed. 56 failed (0.00807349%) + GUJARATI: 366485 out of 366506 tests passed. 21 failed (0.00572978%) + GURMUKHI: 60750 out of 60809 tests passed. 59 failed (0.0970251%) + KANNADA: 950730 out of 951913 tests passed. 1183 failed (0.124276%) + KHMER: 298613 out of 299124 tests passed. 511 failed (0.170832%) + MALAYALAM: 1046881 out of 1048416 tests passed. 1535 failed + (0.146411%) + ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) + SINHALA: 271333 out of 271847 tests passed. 514 failed (0.189077%) + TAMIL: 1091837 out of 1091837 tests passed. 0 failed (0%) + TELUGU: 970524 out of 970573 tests passed. 49 failed (0.00504856%) + + Some of the remaining Telugu and Devanagari issues seem to be + Uniscribe + eating Anusvara when placed before a non-joiner. Ouch! + + src/hb-ot-shape-complex-indic-machine.rl | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 093cd583263a5d427e3377b31585043fb55d2557 +Author: Behdad Esfahbod +Date: Mon Jul 23 14:04:42 2012 -0400 + + [Thai] Fix SARA AM handling + + Oops, thinko. + + src/hb-ot-shape-complex-misc.cc | 6 +++--- + src/hb-private.hh | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 42848453bf260b456b46a07f066e31b8c3aac2f1 +Author: Behdad Esfahbod +Date: Mon Jul 23 13:52:07 2012 -0400 + + [Thai] Reorder U+0E3A THAI VOWEL SIGN PHINTHU + + Uniscribe reorders U+0E3A to be after U+0E38 and U+0E39. We do + that by + modifying the ccc for U+0E3A. + + Fixes the two remaining Thai failures (see previous commit). + + src/hb-ot-shape-complex-misc.cc | 7 +++++++ + src/hb-unicode.cc | 6 ++++++ + .../texts/in-tree/shaper-thai/script-thai/misc/MANIFEST | 1 + + .../in-tree/shaper-thai/script-thai/misc/phinthu.txt | 16 + ++++++++++++++++ + 4 files changed, 30 insertions(+) + +commit 4a7f4f3e56f8f7640ae7337aa1b3324f31e0d4ab +Author: Behdad Esfahbod +Date: Mon Jul 23 13:15:33 2012 -0400 + + [Thai] Adjust SARA AM reordering to match Uniscribe + + Adjust the list of marks before SARA AM that get the reordering + treatment. Also adjust cluster formation to match Uniscribe. + + With Wikipedia test data, now I see: + + - For Thai, with the Angsana New font from Win7, I see 54 + failures out + of over 4M tests (0.00129107%). Of the 54, two are legitimate + reordering issues (fix coming soon), and the other 52 are simply + Uniscribe using a zero-width space char instead of an unknown + character for missing glyphs. No idea why. The missing-glyph + sequences include one that is a Thai character followed by + an Arabic + Sokun. Someone confused it with Nikhahit I assume! + + - For Lao, with the Dokchampa font from Win7, 33 tests fail out of + 54k (0.0615167%). All seem to be insignificant mark positioning + with two marks on a base. Have to investigate. + + src/hb-ot-shape-complex-misc.cc | 42 + +++++++++++++--------- + src/hb-private.hh | 6 ++++ + test/shaping/texts/in-tree/shaper-thai/MANIFEST | 1 + + .../texts/in-tree/shaper-thai/script-lao/MANIFEST | 1 + + .../in-tree/shaper-thai/script-lao/misc/MANIFEST | 1 + + .../shaper-thai/script-lao/misc/sara-am.txt | 20 +++++++++++ + .../shaper-thai/script-thai/misc/sara-am.txt | 18 +++++++++- + 7 files changed, 72 insertions(+), 17 deletions(-) + +commit 2cc933aff97916e5d0fe42883f40f0879f848e25 +Author: Behdad Esfahbod +Date: Mon Jul 23 08:22:55 2012 -0400 + + [Indic] Fix cluster formation with left-matras and conjunct forms + + Test case was: . + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e6b01a878cd2e63cb675e7e0c6ac4d83a8c10f37 +Author: Behdad Esfahbod +Date: Mon Jul 23 00:11:26 2012 -0400 + + [Indic] Further streamline cluster formation + + This should address all possible cluster misformations that I had in + mind. + + src/hb-ot-shape-complex-indic.cc | 21 ++++++++++----------- + 1 file changed, 10 insertions(+), 11 deletions(-) + +commit 7b2a7dadd6c616bbfe1d8358700cab9cee88e584 +Author: Behdad Esfahbod +Date: Sun Jul 22 23:58:55 2012 -0400 + + [Indic] Merge clusters before sorting + + This should fix any instabilities in cluster formation that we were + speculating may happen with surrounding syllables. Or most of it + perhaps. + + src/hb-ot-shape-complex-indic.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit abb3239ef92cc5dccb4638806d7ae9868b9ac9b3 +Author: Behdad Esfahbod +Date: Sun Jul 22 23:55:19 2012 -0400 + + [Indic] Update clusters for left-matra even if matra didn't move + + Fixes crashes reported with left matra under + non-uniscribe-bug-compatibilty mode. + + src/hb-ot-shape-complex-indic.cc | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit 60554f14d8dca208721f0da8b69d84b92819c54f +Author: Behdad Esfahbod +Date: Sun Jul 22 23:23:56 2012 -0400 + + [Indic] Merge in Malayalam tests + + From: + http://silpa.org.in/pub/tests/hb/ml/ml-harfbuzz-testdata.txt + + .../indic/script-malayalam/misc/misc.txt | 94 + +++++++++++----------- + 1 file changed, 46 insertions(+), 48 deletions(-) + +commit 5c7081770c7a611bbe79b451b7b86dec4fa6395d +Author: Behdad Esfahbod +Date: Sun Jul 22 23:20:27 2012 -0400 + + [Indic] Add extensive Sinhala tests + + Generated by: + http://git.savannah.gnu.org/cgit/sinhala.git/plain/utils/gen-unicode-sinhala.py + + .../indic/script-sinhala/misc/extensive.txt | 4390 + ++++++++++++++++++++ + 1 file changed, 4390 insertions(+) + +commit 2efe4707b1b449962f6e161716477d9775456c46 +Author: Behdad Esfahbod +Date: Sun Jul 22 23:17:59 2012 -0400 + + [Indic] Add Sinhala tests + + Merge tests from: + http://git.savannah.gnu.org/cgit/sinhala.git/plain/patches/icu-sinhala-rendering.txt + + .../indic/script-sinhala/misc/misc.txt | 26 + ++++++++++++++++++++-- + 1 file changed, 24 insertions(+), 2 deletions(-) + +commit 3d4c111b7a13700b2f7a0b087eb3992283295f21 +Author: Behdad Esfahbod +Date: Fri Jul 20 19:34:39 2012 -0400 + + Add a test case + + .../texts/in-tree/shaper-indic/indic/script-bengali/misc/misc.txt + | 1 + + 1 file changed, 1 insertion(+) + +commit 92a1ad7bef9efb456ab87bd63818cfbed7da3f6f +Author: Behdad Esfahbod +Date: Fri Jul 20 18:38:27 2012 -0400 + + [Indic] Stop searching for base if a post form is found before + below form + + Improves Bengali and Gurmukhi. Malayalam regressed a bit. We will + deal + with that later. + + src/hb-ot-shape-complex-indic.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 4c450c703f8e4618c587bcd7ef46dcc1f2c7947b +Author: Behdad Esfahbod +Date: Fri Jul 20 18:13:04 2012 -0400 + + [Indic] Recompose Bengali Ya,Nukta + + This is a bunch of hacks for now. + + Improves Bengali a bit. + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + src/hb-unicode.cc | 8 ++++++++ + 2 files changed, 10 insertions(+), 2 deletions(-) + +commit e9c0f152a38cb2e76650a3e43f7fdcda266af696 +Author: Behdad Esfahbod +Date: Fri Jul 20 17:05:46 2012 -0400 + + [Uniscribe] Fix script fallback + + Gurmukhi failures half now. Others changed slightly. + + src/hb-uniscribe.cc | 34 ++++++++++++++-------------------- + 1 file changed, 14 insertions(+), 20 deletions(-) + +commit 5791f329159c9863317e2b507514c29321be31a7 +Author: Behdad Esfahbod +Date: Fri Jul 20 16:26:55 2012 -0400 + + [Indic] Allow a ZWNJ after SM's + + Malayalam failures go way down. Other scripts benefitted slightly + too. + Sinhala had one or two test regressions, but... + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 34ae336f3fae93ef9372881d545c817bce383041 +Author: Behdad Esfahbod +Date: Fri Jul 20 16:17:28 2012 -0400 + + [Indic] Improve Reph AfterMain positioning + + Fixes 20 out of 48 failing Oriya tests. Failure rate down to + 0.066% now. + + src/hb-ot-shape-complex-indic.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit bdd080431a40bc941ece3230f338b94a46bd12a2 +Author: Behdad Esfahbod +Date: Fri Jul 20 16:03:09 2012 -0400 + + [Indic] Reposition Oriya Candrabindu + + Oriya failures down from 0.65% to 0.20%. + + src/hb-ot-shape-complex-indic.cc | + 1 + + .../shaping/texts/in-tree/shaper-indic/indic/script-oriya/misc/MANIFEST | + 1 + + .../texts/in-tree/shaper-indic/indic/script-oriya/misc/bindu.txt | + 2 ++ + 3 files changed, 4 insertions(+) + +commit 5f0eaaad129ff04d56b8756bebf19fbc242718c9 +Author: Behdad Esfahbod +Date: Fri Jul 20 15:47:24 2012 -0400 + + [Indic] Fix base search in final_reordering + + Fixes most Malayalam failures. Down from 1.6% to 0.38% now. Fixes a + few more in other scripts too. + + src/hb-ot-shape-complex-indic.cc | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 81202bd860e4034c18d9f80c5a4f33d9f48463a3 +Author: Behdad Esfahbod +Date: Fri Jul 20 15:10:02 2012 -0400 + + [Indic] Don't attach SM/VD to other characters + + src/hb-ot-shape-complex-indic-private.hh | 3 +++ + src/hb-ot-shape-complex-indic.cc | 38 + ++++++++++++++++++-------------- + 2 files changed, 24 insertions(+), 17 deletions(-) + +commit efb4ad735691837a52447bedc1a66a87d0d9af51 +Author: Behdad Esfahbod +Date: Fri Jul 20 14:27:38 2012 -0400 + + Fix compiler warnings + + If x is not constant, we cannot ASSERT_STATIC on it. + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f31d97e44eeb6fb141f3de928e27e033fc7b1f47 +Author: Behdad Esfahbod +Date: Fri Jul 20 14:13:35 2012 -0400 + + [Indic] Form Telugu Reph out of Ra,Virama,ZWJ + + Apparently this was approved in Feb 2012. No font yet. + + src/hb-ot-shape-complex-indic-private.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 2e193b240ec85cab0d4e2f8a375c5a7f0ef99985 +Author: Behdad Esfahbod +Date: Fri Jul 20 14:02:35 2012 -0400 + + [Indic] Don't split U+0AC9 + + Althought IndicMatraCategory.txt classifies it as Top_And_Right matra, + it does not have Unicode decomposition, and Uniscribe does not do + anything special about it either. + + Gujarati failures down from 0.672% to 0.0130966%. + + src/hb-unicode.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 30c3d5e9fc61b49c2c6ad4e744300edd6f3e0261 +Author: Behdad Esfahbod +Date: Fri Jul 20 13:56:32 2012 -0400 + + [Indic] Simplify Uniscribe cluster emulation + + Now that we break syllables on Halant,ZWNJ, this code can be + simplified. + + src/hb-ot-shape-complex-indic.cc | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +commit decf6ffca475fe01ff3151b7641f629f031137d2 +Author: Behdad Esfahbod +Date: Fri Jul 20 13:51:31 2012 -0400 + + [Indic] Minor! + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9e4f94a72cea6d65a6a7ba5a47db92e00dbfbb91 +Author: Behdad Esfahbod +Date: Fri Jul 20 13:48:03 2012 -0400 + + [Indic] Break syllables at Halant,ZWNJ + + That's really what Uniscribe does, and explains a lot of pecularities + of + Halant,ZWNJ before the base. + + Sent Telugu from 1% failures to 0.03%. Improved Kannada and Malayalam + slightly. Fixed half of Bengali, and did NOT break anything! + + src/hb-ot-shape-complex-indic-machine.rl | 5 +++-- + src/hb-ot-shape-complex-indic.cc | 5 ++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 2c372b80f6befad69e216e3f218b38640b8cc044 +Author: Behdad Esfahbod +Date: Fri Jul 20 13:37:48 2012 -0400 + + [Indic] Better check for applying 'init' + + Specifically, don't apply 'init' if previous char is a joiner. + + Fixes some more of Bengali. + + src/hb-ot-shape-complex-indic.cc | 9 +-------- + src/hb-private.hh | 3 ++- + 2 files changed, 3 insertions(+), 9 deletions(-) + +commit 34a7440b7c6c6e53394ddbdbedaad57b23f85105 +Author: Behdad Esfahbod +Date: Fri Jul 20 12:32:59 2012 -0400 + + [GPOS] Don't zero mark advances + + Fixes more of Telugu, Kannada, and Oriya. + + May break things (outside Indic...), but we cannot think of any + font relying + on this immediately. + + src/hb-ot-layout-gpos-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8ed248de77e5d2ed978e55c0ce1a11727bc9e34c +Author: Behdad Esfahbod +Date: Fri Jul 20 11:42:24 2012 -0400 + + [Indic] Minor + + src/hb-ot-shape-complex-indic.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit d0e68dbd0b9fc9a42c4280d01c8ffd9c5015d550 +Author: Behdad Esfahbod +Date: Fri Jul 20 11:25:41 2012 -0400 + + [Indic] Implement reph positioning step 5 + + Not tuned, just copied from step 2. Fixes another 0.5% of Kannada + failures. 1% to go. + + src/hb-ot-shape-complex-indic.cc | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit a9e45c32e4a0d6da33c52f8427aa694e57f52eb9 +Author: Behdad Esfahbod +Date: Fri Jul 20 11:04:15 2012 -0400 + + [Indic] Don't let ZWNJ at the end of syllable affect base search + + Fixes a few Devanagari, half of remaining Kannada failures, + quarter for + Telugu, and others slightly improved or unchanged. + + src/hb-ot-shape-complex-indic.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 20b68e699f73e6ce046c0ec143d40b3d6d48e06b +Author: Behdad Esfahbod +Date: Fri Jul 20 10:47:46 2012 -0400 + + [Indic] Apply 'cjct' globally + + Fixes 5 Devanagari failures, and no regressions. + + src/hb-ot-shape-complex-indic.cc | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +commit 51e764de441072e7c9f67de23e8ed717b9b8957d +Author: Behdad Esfahbod +Date: Fri Jul 20 10:30:24 2012 -0400 + + [Indic] Unbreak old scriptures + + Brings down failures with Lohit-Telugu from 57% to 1.40%. + + src/hb-ot-shape-complex-indic.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 900cf3d449bf36d4f8b1474590cae925fef48fc8 +Author: Behdad Esfahbod +Date: Fri Jul 20 10:18:23 2012 -0400 + + Minor + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 87cd63266e73af316b250573ef57388a0bcc9133 +Author: Behdad Esfahbod +Date: Thu Jul 19 21:17:48 2012 -0400 + + [Indic] Recategorize some Kannada right matras + + Kannada failures down from 3.5% to 2.93%. + + src/hb-ot-shape-complex-indic.cc | 2 +- + .../texts/in-tree/shaper-indic/indic/script-kannada/misc/MANIFEST | 1 + + .../shaper-indic/indic/script-kannada/misc/right-matras.txt | + 7 +++++++ + 3 files changed, 9 insertions(+), 1 deletion(-) + +commit 3604d64ced909ade91998d294a7b4b2ee14d47aa +Author: Behdad Esfahbod +Date: Thu Jul 19 21:13:04 2012 -0400 + + [Indic] Recategorize GURMUKHI ADDAK + + It's not in IndicSyllabicCategory.txt. Fixes most of Gurmukhi + failures. + Failures down from 7.7% to 0.222%! + + src/hb-ot-shape-complex-indic.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 89328581236a53ec16508b95db54c7e5315b178f +Author: Behdad Esfahbod +Date: Thu Jul 19 21:02:38 2012 -0400 + + Minor + + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 47ef931f13778b894090139a64238a5ab9ac1154 +Author: Behdad Esfahbod +Date: Thu Jul 19 20:52:44 2012 -0400 + + [buffer] Make sure out_info = info during GPOS + + src/hb-buffer.cc | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit ae63cf206291befe3920adfe015e6cd0961580e5 +Author: Behdad Esfahbod +Date: Thu Jul 19 20:45:41 2012 -0400 + + Print line number during return when tracing + + src/hb-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 5249f3aee108b0f41770d137e63a625f594418e7 +Author: Behdad Esfahbod +Date: Thu Jul 19 20:30:22 2012 -0400 + + [Indic] Unbreak Khmer + + For Khmer, all consonants are subjoining. No need to look in + the font. + We were looking in the wrong order anyway. + + src/hb-ot-shape-complex-indic.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit e0475345d5d7db8dbc8b554beedfa2435c5d7fd1 +Author: Behdad Esfahbod +Date: Thu Jul 19 20:24:14 2012 -0400 + + [Indic] Apply 'akhn' globally + + Fixes 1.5% more failures for Telugu, 2% for Kannada. + Breaks one test in Devanagari. + + src/hb-ot-shape-complex-indic.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit c87bcddb10752b407c0471ee5ac4de6f1b00b711 +Author: Behdad Esfahbod +Date: Thu Jul 19 20:03:25 2012 -0400 + + [Indic] Add failing test for Kannada + + .../texts/in-tree/shaper-indic/indic/script-kannada/misc/misc.txt + | 1 + + 1 file changed, 1 insertion(+) + +commit fa247ebe524f92fa95d344ba912f704262879c13 +Author: Behdad Esfahbod +Date: Thu Jul 19 19:52:19 2012 -0400 + + [Indic] Better position U+0CD5 + + Fixes another 5% of Kannada failures. + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f055442716ec7543ed156d4789955b19c11a5255 +Author: Behdad Esfahbod +Date: Thu Jul 19 16:20:21 2012 -0400 + + [Indic] Lookup consonant position in the font + + Fixes most failures of Oriya, and improves others a bit. + + src/hb-ot-map-private.hh | 13 ++-- + src/hb-ot-shape-complex-indic-private.hh | 105 + ------------------------------- + src/hb-ot-shape-complex-indic.cc | 63 +++++++++++++------ + 3 files changed, 54 insertions(+), 127 deletions(-) + +commit 74d1d88781e91866a52e27f391e34df03b313442 +Author: Behdad Esfahbod +Date: Thu Jul 19 16:14:23 2012 -0400 + + [GSUB] Fix would_apply() for LigatureSubst + + src/hb-ot-layout-gsub-table.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 787f7d1e9ba9ad038f24e5a1063d12c7d169ad37 +Author: Behdad Esfahbod +Date: Thu Jul 19 15:29:13 2012 -0400 + + [TODO] Minor + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit be73a5f9368136ecbdb211b96516ad0c554c8201 +Author: Behdad Esfahbod +Date: Thu Jul 19 14:59:15 2012 -0400 + + Add src/test-would-substitute tool + + src/Makefile.am | 6 +- + src/test-would-substitute.cc | 94 ++++++++++++++++++++++++++++++ + src/test.cc | 132 + +++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 231 insertions(+), 1 deletion(-) + +commit e72b360ac6381b549249b8836fa3e70b909d3437 +Author: Behdad Esfahbod +Date: Thu Jul 19 14:35:23 2012 -0400 + + Refactor / finish would_apply() operation + + Untested. + + src/hb-ot-layout-gpos-table.hh | 6 +- + src/hb-ot-layout-gsub-table.hh | 126 +++++++++---------- + src/hb-ot-layout-gsubgpos-private.hh | 233 + ++++++++++++++++++++++++++++++++++- + src/hb-ot-layout.cc | 11 ++ + src/hb-ot-layout.h | 7 ++ + 5 files changed, 308 insertions(+), 75 deletions(-) + +commit 8c973ebf0f59abb5ee920edd5d64e23d8e47ad75 +Author: Behdad Esfahbod +Date: Thu Jul 19 13:25:08 2012 -0400 + + [Indic] Implement per-script matra positioning + + Following what the spec says. + + Brings down Telugu failures from 40% to 3.75%, and Kannada failures + from + 44% to 10%. Does NOT affect other scripts' test results. + + src/hb-ot-shape-complex-indic-private.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 40 + +++++++++++++++++++++++++++++--- + src/hb-unicode.cc | 2 +- + 3 files changed, 39 insertions(+), 5 deletions(-) + +commit 8bb32458f95f13f66688e0811cc91f1bfffb867d +Author: Behdad Esfahbod +Date: Thu Jul 19 12:59:06 2012 -0400 + + [Indic] More refactoring + + src/hb-ot-shape-complex-indic-private.hh | 9 ++--- + src/hb-ot-shape-complex-indic.cc | 65 + ++++++++++++++++++++++++-------- + 2 files changed, 54 insertions(+), 20 deletions(-) + +commit 9ccc6382ba43760167c134c18c1c4ada4b8c3f22 +Author: Behdad Esfahbod +Date: Thu Jul 19 12:32:16 2012 -0400 + + [Indic] Minor refactoring + + src/hb-ot-shape-complex-indic.cc | 127 + ++++++++++++++++++++++----------------- + 1 file changed, 71 insertions(+), 56 deletions(-) + +commit f83aaa3133de5d807be267a100d6a200e8db9017 +Author: Behdad Esfahbod +Date: Thu Jul 19 12:23:23 2012 -0400 + + [Indic] Minor + + src/hb-ot-shape-complex-indic-private.hh | 42 + ++++++++++++++++++++------------ + 1 file changed, 26 insertions(+), 16 deletions(-) + +commit be8b9f5f715f6fb36b98bd33c3303f79cc068f8a +Author: Behdad Esfahbod +Date: Thu Jul 19 12:11:12 2012 -0400 + + [Indic] Start refactoring different matra positions per script + + src/hb-ot-shape-complex-indic-private.hh | 36 + +++++++++++++++++++------------- + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 2 files changed, 24 insertions(+), 16 deletions(-) + +commit deeb540a74f8d394db273145b17bf385d14d01bb +Author: Behdad Esfahbod +Date: Thu Jul 19 11:30:48 2012 -0400 + + [test] Ignore tests with DOTTED CIRCLE in the output + + test/shaping/hb_test_tools.py | 4 ++++ + 1 file changed, 4 insertions(+) + +commit b01d9b3d90e892341ee4463f2eda4600850b97d8 +Author: Behdad Esfahbod +Date: Thu Jul 19 11:25:49 2012 -0400 + + [Indic] Disallow decomposition of a couple characters + + This is a hack for now. Will be fixed when we do + complex-shaper-driven + normalization properly. + + The results with or without decomposition are the same, but Uniscribe + does not normalize, so this matches better. + + src/hb-unicode.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 422ecd2d3c198a36d07d409341cb82ea57c7ad6b +Author: Behdad Esfahbod +Date: Wed Jul 18 23:25:58 2012 -0400 + + [Indic] Accept a forced Rakar sequence at the end of syllable + + In Sinhala, Rakar is formed by Al-Lakuna,ZWJ,Ra. If you put that + at the + end of a Consonant,Matra syllable, you get a dotted-circle from + Uniscribe. Apparently adding a ZWJ before the Al-Lakuna "fixes" that. + And people have been encoding that sequence... So, allow a forced + "ZWJ,Virama,ZWJ,Ra" sequence at the of syllables. + + Fixes some 100 or more of Sinhala failures. Now at 622 only (0.23%). + + src/hb-ot-shape-complex-indic-machine.rl | + 3 ++- + .../texts/in-tree/shaper-indic/indic/script-sinhala/misc/misc.txt | + 2 ++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit 6fc1732003d71cf90d37247482772c3da884687f +Author: Behdad Esfahbod +Date: Wed Jul 18 17:49:19 2012 -0400 + + [Indic] Allow joiners on both sides of Halant at the same time + + The sequence is used in Sinhala to explicitly ask + for Rakar. Fixes two-thousand Sinhala tests. Not many left. + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 10cdc94eee2225f14c198c015256a5a0063eecad +Author: Behdad Esfahbod +Date: Wed Jul 18 17:42:34 2012 -0400 + + [Indic] In final reordering, find base, even if it disappeared + + POS_BASE can disappear if base ligated backward. Define base as last + with position not after base. + + Fixes a few hundred of Sinhala failures with Iskoola Pota. + + src/hb-ot-shape-complex-indic.cc | + 7 ++----- + .../texts/in-tree/shaper-indic/indic/script-sinhala/misc/misc.txt | 1 + + 2 files changed, 3 insertions(+), 5 deletions(-) + +commit 9c4d24a3a677a58ec59c7fb0f8b70b8aad30a032 +Author: Behdad Esfahbod +Date: Wed Jul 18 17:29:10 2012 -0400 + + [Indic] Minor + + src/hb-ot-shape-complex-indic.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 3285e107c9a83aeb552e67f9460680ff6d167d88 +Author: Behdad Esfahbod +Date: Wed Jul 18 17:22:14 2012 -0400 + + [Indic] Implement Sinhala "Al Lakuna" Reph behavior + + In Sinhala, Reph is formed only explicitly, by the presence of a ZWJ. + + src/hb-ot-shape-complex-indic-private.hh | 2 ++ + src/hb-ot-shape-complex-indic.cc | + 7 ++++++- + .../texts/in-tree/shaper-indic/indic/script-sinhala/misc/MANIFEST | 1 + + .../texts/in-tree/shaper-indic/indic/script-sinhala/misc/reph.txt | + 3 +++ + 4 files changed, 12 insertions(+), 1 deletion(-) + +commit 91cade755534c42bb826a6aefcbca8a543d94387 +Author: Behdad Esfahbod +Date: Wed Jul 18 16:50:41 2012 -0400 + + [Indic/Unicode] Decompose Sinhala split matras the way Uniscribe likes + + Makes no visual difference. + + Fixes most of the failures. Down from 15% to 1.3%! + + src/hb-unicode.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit d8942dcbb4e3249a2d78a6455c119294ed4390bc +Author: Behdad Esfahbod +Date: Wed Jul 18 16:34:10 2012 -0400 + + Apply Tibetan (global) features. + + Fixes all Tibetan failures. All 180k of them! + + Merges back Hangul into the default shaper. + + src/hb-ot-shape-complex-misc.cc | 82 + +++++++++++++++++--------------------- + src/hb-ot-shape-complex-private.hh | 7 ---- + 2 files changed, 37 insertions(+), 52 deletions(-) + +commit 552d19b7a11f7dff888587fce4d56d9f8e47e819 +Author: Behdad Esfahbod +Date: Wed Jul 18 16:00:49 2012 -0400 + + [Indic] Treat Register Shifters like Nukta + + Really this time. + + Fixes another 18 Khmer tests. + + src/hb-ot-shape-complex-indic-machine.rl | + 2 +- + src/hb-ot-shape-complex-indic.cc | + 2 -- + .../in-tree/shaper-indic/south-east-asian/script-khmer/misc/misc.txt | + 1 + + 3 files changed, 2 insertions(+), 3 deletions(-) + +commit e8cd81f76d159f3ecf808952dab24bc07782497a +Author: Behdad Esfahbod +Date: Wed Jul 18 16:00:20 2012 -0400 + + [Indic] Minor + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 69f26bf39c824d6bf5b1c0d410380cc5462ad5ca +Author: Behdad Esfahbod +Date: Wed Jul 18 15:45:43 2012 -0400 + + [Indic] Fix Matra reordering when base is at end of syllable + + For example: U+915,U+200c,U+93f + + Fixes last Tamil failure! + + src/hb-ot-shape-complex-indic.cc | + 2 +- + .../texts/in-tree/shaper-indic/indic/script-devanagari/misc/misc.txt | + 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit d16ccc4ae7aa8be460881042413fa2637929fede +Author: Behdad Esfahbod +Date: Wed Jul 18 15:43:55 2012 -0400 + + Leave one extra item at the end of buffer allocation + + Just in case, for the times we do out-of-bounds access. + + jk + + src/hb-buffer-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 075d671f1093d2e3c58f7f45568696030f1b3efd +Author: Behdad Esfahbod +Date: Wed Jul 18 15:41:53 2012 -0400 + + [Indic] Fix out-of-bounds array access + + src/hb-ot-shape-complex-indic.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit dcb527242b1eca4db1e190a7802f9cd132aaf46e +Author: Behdad Esfahbod +Date: Wed Jul 18 15:28:25 2012 -0400 + + [Indic] Allow joiners before matras + + Fixes 1 more Devanagari test! + + src/hb-ot-shape-complex-indic-machine.rl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 391cc0331749e263bdfe83a8f5f6d76f2360ee7a +Author: Behdad Esfahbod +Date: Wed Jul 18 15:10:05 2012 -0400 + + [Indic] Allow halant group in Vowel and placeholder syllables + + Fixes 2 out of 560 Devanagari failures. AND: + Fixes 1 out of 2 Tamil failures. + + src/hb-ot-shape-complex-indic-machine.rl | + 7 ++++--- + .../in-tree/shaper-indic/indic/script-devanagari/misc/misc.txt | 1 + + 2 files changed, 5 insertions(+), 3 deletions(-) + +commit ca4e3d3eab7b738c2b8e2a81696a28bca1b81495 +Author: Behdad Esfahbod +Date: Wed Jul 18 15:05:40 2012 -0400 + + [Indic] Streamline halant/joiner in grammar + + src/hb-ot-shape-complex-indic-machine.rl | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 418d00dffddd95a1f27e9be15752d494c627d45e +Author: Behdad Esfahbod +Date: Wed Jul 18 14:57:28 2012 -0400 + + [Indic] Minor + + src/hb-ot-shape-complex-indic-machine.rl | + 3 ++- + .../texts/in-tree/shaper-indic/indic/script-devanagari/misc/misc.txt | + 3 +++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit 4c3691d2a32ca7e54a54f7c08098fd96fa7af39e +Author: Behdad Esfahbod +Date: Wed Jul 18 14:23:55 2012 -0400 + + [Indic] Hopefully minor! + + Refactoring Indic machin. No semantic change. + + src/hb-ot-shape-complex-indic-machine.rl | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit e092c556fb1cf38be3cea1f4b75a0d879372dfa2 +Author: Behdad Esfahbod +Date: Wed Jul 18 14:09:25 2012 -0400 + + [Indic] Minor + + src/hb-ot-shape-complex-indic-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 14dbdd9e39d3a869fd1521000c889c347433d22b +Author: Behdad Esfahbod +Date: Wed Jul 18 13:13:03 2012 -0400 + + [Indic] Unbreak Tamil + + Tamil has only about 150 failures now! + + src/hb-ot-shape-complex-indic.cc | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +commit db8981f1e0e8625714568c6d0f11f0b317b11d0a +Author: Behdad Esfahbod +Date: Tue Jul 17 18:17:30 2012 -0400 + + [Indic] Position Khmer Robat + + It's a visual Repha. + + Still not positioning logical Repha as occurs in Malayalam. + + Another 200 Khmer failures fixed. 547 to go. That's better than + Devanagari! + + src/hb-ot-shape-complex-indic-machine.rl | 36 + +++++++++++++++++--------------- + src/hb-ot-shape-complex-indic-private.hh | 7 ++++--- + src/hb-ot-shape-complex-indic.cc | 13 ++++++++++++ + 3 files changed, 36 insertions(+), 20 deletions(-) + +commit 25bc489498ef7d0beb8fe9ab663e3f0b2f52c9c2 +Author: Behdad Esfahbod +Date: Tue Jul 17 17:53:03 2012 -0400 + + [Indic] Better categorize Register Shifters and Khmer Various signs + + Down another 500 or so Khmer failures! + + src/hb-ot-shape-complex-indic-machine.rl | 14 + +++++++------- + src/hb-ot-shape-complex-indic-private.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 8 ++++---- + .../south-east-asian/script-khmer/misc/MANIFEST | 2 ++ + .../script-khmer/misc/other-marks-invalid.txt | 4 ++++ + .../south-east-asian/script-khmer/misc/other-marks.txt | 6 ++++++ + 6 files changed, 24 insertions(+), 12 deletions(-) + +commit 39b17837b4064d59c18cebb49c1c0b5b8cc0c117 +Author: Behdad Esfahbod +Date: Tue Jul 17 17:09:29 2012 -0400 + + Add hb_buffer_normalize_glyphs() and hb-shape --normalize-glyphs + + This reorders glyphs within the cluster to a nominal order. + This should + have no visible effect on the output, but helps with testing, for + getting the same hb-shape output for visually-equal glyphs for each + cluster. + + src/hb-buffer.cc | 76 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-buffer.h | 13 ++++++++++ + src/hb-private.hh | 29 ++++++++++++++++----- + util/options.cc | 1 + + util/options.hh | 7 ++++- + 5 files changed, 118 insertions(+), 8 deletions(-) + +commit 25e302da9a712e6f1d63b0d243a8df0d326ddba3 +Author: Behdad Esfahbod +Date: Tue Jul 17 14:25:14 2012 -0400 + + [Indic] Minor + + src/hb-ot-shape-complex-indic.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 5d32690a3428fa86eb26fe5fcec943a10aa95881 +Author: Behdad Esfahbod +Date: Tue Jul 17 14:23:28 2012 -0400 + + [Indic] For scripts without Half forms, always choose first consonant + as base + + In such scripts (ie. Khmer), a ZWJ/ZWNJ shouldn't stop the search for + base. So, instead just choose the first consonant as base directly. + + Test sequence: + U+1798,200c,U+17C9,U+17D2,U+179B,U+17C1,U+17C7 + + src/hb-ot-shape-complex-indic.cc | 59 + ++++++++++++++++++++++++---------------- + 1 file changed, 35 insertions(+), 24 deletions(-) + +commit 34b57149065d96f7528aaccaa7654e956ce27e93 +Author: Behdad Esfahbod +Date: Tue Jul 17 14:09:32 2012 -0400 + + [Indic] Treat Khmer Register Shifters more like Nuktas + + Except that there may be a ZWNJ before a Register Shifter. + + src/hb-ot-shape-complex-indic-machine.rl | + 2 +- + .../in-tree/shaper-indic/south-east-asian/script-khmer/misc/misc.txt | + 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit 11e2a601b19861b05dbb2051d2d078c3cfd75b29 +Author: Behdad Esfahbod +Date: Tue Jul 17 14:02:28 2012 -0400 + + [Indic] Minor + + src/hb-ot-shape-complex-indic-machine.rl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0201e0a4649ad5b607e50bcb9605e7a5b7143812 +Author: Behdad Esfahbod +Date: Tue Jul 17 13:55:10 2012 -0400 + + [Indic] Apply 'cfar' for Khmer + + Mark stuff after a pre-base reordering Ro 'cfar'. Used in Khmer. + This allows distinguishing the following cases with MS Khmer fonts: + + U+1784,U+17D2,U+179A,U+17D2,U+1782 + U+1784,U+17D2,U+1782,U+17D2,U+179A + + src/hb-ot-shape-complex-indic.cc | 16 + ++++++++++++++-- + .../south-east-asian/script-khmer/misc/misc.txt | 2 ++ + 2 files changed, 16 insertions(+), 2 deletions(-) + +commit 55f70ebfb95083f515d9b0044a2a65ab11484bb5 +Author: Behdad Esfahbod +Date: Tue Jul 17 12:50:13 2012 -0400 + + [Indic] Position final subjoined consonants (and vowels) after matras + + In Khmer, a final subjoined consonant or independent vowel can occur + after matras. This final subjoined thing should NOT be reordered to + before the matra even though it's subjoined. + + Fixes another 1k of the Khmer failures. Not much left really. + + src/hb-ot-shape-complex-indic-private.hh | 1 + + src/hb-ot-shape-complex-indic.cc | 13 + +++++++++++++ + .../south-east-asian/script-khmer/misc/misc.txt | 2 ++ + 3 files changed, 16 insertions(+) + +commit c50ed71e9a3df1844f564de66d54b46a696c1356 +Author: Behdad Esfahbod +Date: Tue Jul 17 11:54:28 2012 -0400 + + [Indic] Recategorize Khmer coeng sign as a separate category OT_Coeng + + Amend the syllable structure to allow a final subscripted consonant + (Coeng+C) and a final subscripted independent vowel (Coeng+V). + Fixes another 2k of Khmer failures. + + src/hb-ot-shape-complex-indic-machine.rl | + 7 ++++--- + src/hb-ot-shape-complex-indic.cc | + 6 +++++- + .../shaper-indic/south-east-asian/script-khmer/misc/misc.txt | 1 + + 3 files changed, 10 insertions(+), 4 deletions(-) + +commit deb521dee4fdca8c2124cfb39a205e6269d4a70d +Author: Behdad Esfahbod +Date: Tue Jul 17 11:37:32 2012 -0400 + + [Indic] Add a separate Coeng class + + No characters recategorized yet. No semantic change. + + src/hb-ot-shape-complex-indic-machine.rl | 1 + + src/hb-ot-shape-complex-indic-private.hh | 3 ++- + src/hb-ot-shape-complex-indic.cc | 26 ++++++++++++++++---------- + 3 files changed, 19 insertions(+), 11 deletions(-) + +commit 74ccc6a1322f8c48c5f2a05f04821783c4b87a14 +Author: Behdad Esfahbod +Date: Tue Jul 17 11:16:19 2012 -0400 + + [Indic] Move Halant with after-base consonants + + Normally, we attach the Halant to the previous character and move it + with it. For after-base consonants however, the Halant "belongs" + to the + consonant after, so attach it so. + + This fixes Bengali sequences involving post-base consonant Ya, which + should ligate with the Halant to form Ya Phala, but previously a + reordered matras was blocking the ligation. + + src/hb-ot-shape-complex-indic.cc | + 11 +++++++++++ + .../in-tree/shaper-indic/indic/script-bengali/misc/misc.txt | 1 + + 2 files changed, 12 insertions(+) + +commit d5c4edcdd6df32f2f23aca44f14838b4baab4d7a +Author: Behdad Esfahbod +Date: Tue Jul 17 10:40:59 2012 -0400 + + [Indic] Apply presentation-forms features all at once + + Seems like this is what Uniscribe is doing, and does not break + any fonts + we tested (with Devanagari, Malayalam, Khmer, and Bengali), while + fixing + some Ra Phala sequences for Bengali with Vrinda. Fixes another 2% of + Bengali failures (a couple more to go). + + src/hb-ot-shape-complex-indic.cc | + 6 +++--- + .../texts/in-tree/shaper-indic/indic/script-bengali/misc/misc.txt | 1 + + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit 559f70667891a3ceeffb36f40de38a4f85868945 +Author: Behdad Esfahbod +Date: Mon Jul 16 22:43:17 2012 -0400 + + Fix MarkAttachmentType matching + + Fixes issue reported by Khaled Hosny with his Hussaini Nastaleeq font + and sequences like those added in the previous commit. + + src/hb-ot-layout.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6de103547e4a7fb34c833861713ea373cd912261 +Author: Behdad Esfahbod +Date: Mon Jul 16 22:46:06 2012 -0400 + + [test/arabic] Add Arabic tests for mark skipping + + Expose a bug with Khaled's Hussaini Nastaleeq font. + + .../shaper-arabic/script-arabic/misc/diacritics/MANIFEST | 1 + + .../script-arabic/misc/diacritics/mark-skipping.txt | + 10 ++++++++++ + 2 files changed, 11 insertions(+) + +commit ad4494759fa8bfd2497800c24fa414075ed1aa61 +Author: Behdad Esfahbod +Date: Mon Jul 16 22:40:21 2012 -0400 + + Minor + + src/hb-ot-layout.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit af92b4cc90e4184d5bdd8037c551ed482700114f +Author: Behdad Esfahbod +Date: Mon Jul 16 20:31:24 2012 -0400 + + [Indic] Disable 'kern' in Uniscribe bug compatibility mode + + Uniscribe does not apply 'kern' in the Indic module. Some of + the Khmer + fonts they ship have small adjustments in the 'kern' table. Disable + 'kern' in the Indic module under Uniscribe bug compatibility mode. + + Fixes some 10% of the Khmer failures. Remains under 3% (excluding + dotted-circle ones). + + src/hb-ot-shape-complex-indic.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit d96838ef951ce6170eb2dc576ebcba2262cf7008 +Author: Behdad Esfahbod +Date: Mon Jul 16 20:26:57 2012 -0400 + + Allow complex shapers overriding common features + + In a new callback... Currently unused by all complex shapers. + + src/hb-ot-shape-complex-arabic.cc | 6 ++++++ + src/hb-ot-shape-complex-indic.cc | 6 ++++++ + src/hb-ot-shape-complex-misc.cc | 18 ++++++++++++++++++ + src/hb-ot-shape-complex-private.hh | 30 ++++++++++++++++++++++++++++++ + src/hb-ot-shape.cc | 2 ++ + 5 files changed, 62 insertions(+) + +commit df50b8474094f0563ccfdae12c4425a51b72add6 +Author: Behdad Esfahbod +Date: Mon Jul 16 19:56:29 2012 -0400 + + [Indic] Categorize other Khmer marks + + Mark them the same as the Register Shifters for now. Need to rename + that category to something more sensible after all is settled. + + Fixes another percent of Khmer failures. Down to under 3%! + + src/hb-ot-shape-complex-indic.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 8e7b5882fb4c1921c9d030d354a9b998115cdb8c +Author: Behdad Esfahbod +Date: Mon Jul 16 17:04:46 2012 -0400 + + [Indic] Recognize pre-base reordering Ra anywhere in the syllable + + We were doing that only immediately after base. + + Fixes another percent in the Khmer failures. About three more + to go... + + src/hb-ot-shape-complex-indic.cc | 84 + ++++++++++++++++++++++------------------ + 1 file changed, 46 insertions(+), 38 deletions(-) + +commit 7d09c98a1fff97127e48eae48d380dc9fcff288e +Author: Behdad Esfahbod +Date: Mon Jul 16 16:45:22 2012 -0400 + + [Indic] Recognizer Register Shifter marks + + Fixes another 6% of the Khmer failures. + + src/hb-ot-shape-complex-indic-machine.rl | 3 ++- + src/hb-ot-shape-complex-indic-private.hh | 5 +++-- + src/hb-ot-shape-complex-indic.cc | 2 ++ + 3 files changed, 7 insertions(+), 3 deletions(-) + +commit 60da763dfac96a7931d6e6bdef8b9973bd5209ab +Author: Behdad Esfahbod +Date: Mon Jul 16 16:13:32 2012 -0400 + + [GSUB/GDEF] Guess glyph classes after substitution only if no GDEF + + Brings down Khmer failures with Daun Penh font from 36% to 20%. + + src/hb-ot-layout-gsubgpos-private.hh | 20 +++++++++++++------- + 1 file changed, 13 insertions(+), 7 deletions(-) + +commit fcdc5f1c8849a7f38d9f34f64d60c6d95d7501f7 +Author: Behdad Esfahbod +Date: Mon Jul 16 15:52:54 2012 -0400 + + [Indic] Categorize Khmer Ro + + Khmer failures down from 58% to 36%. + + src/hb-ot-shape-complex-indic-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 78818124b17691ec2c647142fdb9ae743aa03dee +Author: Behdad Esfahbod +Date: Mon Jul 16 15:49:08 2012 -0400 + + [Indic] Reoder pre-base reordering Ra + + Brings down Malayalam failures from 14% down to 3%. + + src/hb-ot-shape-complex-indic.cc | 42 + +++++++++++++++++++++++++++------------- + 1 file changed, 29 insertions(+), 13 deletions(-) + +commit 1a1dbe9a2787f226f3e43063da8eb6633438b0a0 +Author: Behdad Esfahbod +Date: Mon Jul 16 15:40:33 2012 -0400 + + [Indic] Rename + + src/hb-ot-shape-complex-indic.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 46e645ec4b59f0a278347be11f40c7df700d5bb6 +Author: Behdad Esfahbod +Date: Mon Jul 16 15:30:05 2012 -0400 + + [Indic] Start implementing pre-base reordering + + src/hb-ot-shape-complex-indic.cc | 33 ++++++++++++++++++--------------- + 1 file changed, 18 insertions(+), 15 deletions(-) + +commit 921ce5b17daf06af8e17989a3e335b9f5df20483 +Author: Behdad Esfahbod +Date: Mon Jul 16 15:26:56 2012 -0400 + + [Indic] Rename + + No semantic change. + + src/hb-ot-shape-complex-indic.cc | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +commit b504e060f008e95b1ba36c06600c9fea4f5d4808 +Author: Behdad Esfahbod +Date: Mon Jul 16 15:21:12 2012 -0400 + + [Indic] Implement After-Main Reph positioning + + Almost... + + src/hb-ot-shape-complex-indic.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 17d7de91d76406d3e92db37d9eef2fc615f06e68 +Author: Behdad Esfahbod +Date: Mon Jul 16 15:20:15 2012 -0400 + + [Indic] Apply 'pref' to pre-base reodering Ra + + No reordering yet. + + src/hb-ot-shape-complex-indic.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 362d3db8d3527d0fef260a17d2466e92a4a25425 +Author: Behdad Esfahbod +Date: Mon Jul 16 15:15:28 2012 -0400 + + [Indic] Minor + + Should not be any semantic change. In preparation for implementing + pre-base reordering Ra. + + src/hb-ot-shape-complex-indic.cc | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +commit 70fe77bb9a25922bd34f206826d8731d901fb451 +Author: Behdad Esfahbod +Date: Mon Jul 16 14:52:18 2012 -0400 + + Minor + + src/hb-ot-shape-complex-indic.cc | 44 + ++++++++++++++++++++-------------------- + 1 file changed, 22 insertions(+), 22 deletions(-) + +commit 2f903215c5da2330a37abe489a3f45f7c3fd5a09 +Author: Behdad Esfahbod +Date: Mon Jul 16 13:54:43 2012 -0400 + + Minor + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a3e04bee2c2fa648759a87e460db6b4f1b685586 +Author: Behdad Esfahbod +Date: Mon Jul 16 13:47:19 2012 -0400 + + [Indic] Reorder virama only for old Indic spec + + src/hb-ot-shape-complex-indic.cc | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +commit 0de771b72da6b342b015e3556190821547a4011d +Author: Behdad Esfahbod +Date: Mon Jul 16 13:39:36 2012 -0400 + + [Indic] Categorize Khmer consonants + + src/hb-ot-shape-complex-indic.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit d487fff266258eb1af056e9704cfb09d04251ddc +Author: Behdad Esfahbod +Date: Mon Jul 16 13:25:17 2012 -0400 + + Split matras without a Unicode decomposition + + This is a hack for now, to get us going with Khmer. This will be + refactored properly later to move the complex logic into complex + shapers. + + src/hb-unicode.cc | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +commit 8aa801a6fd1a737fa20b851edf7528bdd6635b8b +Author: Behdad Esfahbod +Date: Mon Jul 16 13:24:26 2012 -0400 + + [Indic] Adjust position for split matras + + We are going to split matras without a Unicode decompositions in a way + that the second half takes the codepoint of the whole matra. So, + position them where the second half is supposed to end up. + + src/hb-ot-shape-complex-indic-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 1feb8345a5fd92297eb6796e6dce633bafa0c76e +Author: Behdad Esfahbod +Date: Mon Jul 16 13:23:40 2012 -0400 + + [GSUB] Allow 1-to-1 ligature substitutions! + + Apparently Uniscribe allows these, and they are used in some Khmer + fonts + shipped with Windows, namely, Daun Penh. + + src/hb-ot-layout-gsub-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 29f106d7fba25e1464debd3a4831a7380d75c4c9 +Author: Behdad Esfahbod +Date: Mon Jul 16 12:05:35 2012 -0400 + + [Indic] Apply Above Forms + + src/hb-ot-shape-complex-indic.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit fa2bd9fb63d83b657373764d4b657084d8327fc9 +Author: Behdad Esfahbod +Date: Sat Jul 14 12:15:54 2012 -0400 + + Further simplify atomic ops on Visual Studio + + src/hb-atomic-private.hh | 5 ----- + 1 file changed, 5 deletions(-) + +commit 0a492357016bc9a614d2a726f2006c10af68ca58 +Author: Behdad Esfahbod +Date: Fri Jul 13 13:20:49 2012 -0400 + + Minor + + src/hb-warning.cc | 29 +++++------------------------ + 1 file changed, 5 insertions(+), 24 deletions(-) + +commit 11c4ad439ef2b39a840f397a693b1ba643f52c21 +Author: Behdad Esfahbod +Date: Fri Jul 13 11:29:31 2012 -0400 + + Add -Wcast-align + + configure.ac | 3 +++ + src/Makefile.am | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit a98d0ab18624501ee60551304f2715361ac643da +Author: Behdad Esfahbod +Date: Fri Jul 13 10:19:10 2012 -0400 + + Make sure HB_BEGIN_DECLS / HB_END_DECLS is only used in public headers + + So we can use them to switch default visibility to internal if + desired, + and use these to make only declared symbols public. + + src/check-c-linkage-decls.sh | 10 +++++++++- + src/hb-fallback-shape-private.hh | 6 ------ + src/hb-ot-shape-complex-indic-machine.rl | 4 ---- + 3 files changed, 9 insertions(+), 11 deletions(-) + +commit 5c5bc96216c9ad58243eb3ed27b253e237f08ebe +Author: Behdad Esfahbod +Date: Fri Jul 13 10:15:37 2012 -0400 + + Allow overriding HB_BEGIN_DECLS / HB_END_DECLS + + src/hb-common.h | 2 ++ + 1 file changed, 2 insertions(+) + +commit ec5f5f0f8a1d5b3ff98452175bb4450a59897620 +Author: Behdad Esfahbod +Date: Fri Jul 13 10:00:42 2012 -0400 + + Don't export inline methods + + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +commit 50a4e78b530563917eb606ff3b96dcc9eed5b3ee +Author: Behdad Esfahbod +Date: Fri Jul 13 09:48:39 2012 -0400 + + Check for exported weak symbols + + Ouch, all our C++ inline functions are being exported (weakly) + already. + Fix coming. + + src/check-internal-symbols.sh | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit b5aeb95afeb13a66177caada9f5d5ad4cddbd35f +Author: Behdad Esfahbod +Date: Fri Jul 13 09:45:54 2012 -0400 + + Make hb_in_range() static + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 271c8f89075607c689938b4f5e60323d9a1acd70 +Author: Behdad Esfahbod +Date: Fri Jul 13 09:32:30 2012 -0400 + + Minor + + src/hb-ft.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 391f1ff5d894b60bfe0f606be436ffe7e43f7455 +Author: Behdad Esfahbod +Date: Fri Jul 13 09:04:07 2012 -0400 + + Fix _InterlockedCompareExchangePointer on x86 + + src/hb-atomic-private.hh | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 2023e2b54d91924dddfd228ffdbb46021135b068 +Author: Behdad Esfahbod +Date: Wed Jul 11 19:00:30 2012 -0400 + + [ft] Disable ppem setting + + The calculations were wrong. + + FreeType makes it really hard to set size and ppem independently. + For now, disable it. Need to come up with a fix later. + + src/hb-ft.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit cdf7444505a7ae49d20f9ba6776dea92c1fde2a6 +Author: Behdad Esfahbod +Date: Wed Jul 11 18:52:39 2012 -0400 + + [ft] Use unfitted kerning if x_ppem is zero + + src/hb-ft.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 6d08c7f1b3601095f9a12630045331dd0fe75380 +Author: Behdad Esfahbod +Date: Wed Jul 11 18:01:27 2012 -0400 + + Revert "Towards templatizing common Lookup types" + + This reverts commit 727135f3a9938c1ebd5b9f5015a46c7ccc8573c5. + + This is work-in-progress. Didn't mean to push it out just yet. + + src/hb-ot-layout-gpos-table.hh | 16 ++++++---------- + src/hb-ot-layout-gsub-table.hh | 24 ++++++++++-------------- + src/hb-ot-layout-gsubgpos-private.hh | 33 + ++------------------------------- + 3 files changed, 18 insertions(+), 55 deletions(-) + +commit 552bf3a9f9651311084b7979805dbdc18c0335ca +Author: Behdad Esfahbod +Date: Wed Jul 11 16:44:51 2012 -0400 + + Bump WINNT version requested from 500 to 600 + + Since we use the OpenType versions of Uniscribe functions, we are + relying on that version of the WINNT API. Otherwise, usp10.h + will hide + those symbols. + + src/hb-uniscribe.cc | 2 +- + src/hb-uniscribe.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 9a5b421a64db1bb23d5c6ebbc3bf3f3a5513dc36 +Author: Behdad Esfahbod +Date: Wed Jul 11 16:35:04 2012 -0400 + + Fix build with no Unicode funcs implementations provided + + src/hb-unicode-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 6efe1eca660135096f05987ac0ef9b635de6cdfd +Author: Behdad Esfahbod +Date: Wed Jul 11 15:30:08 2012 -0400 + + Update git.mk to upstream + + git.mk | 58 ++++++++++++++++++++++++++++++++++++++-------------------- + 1 file changed, 38 insertions(+), 20 deletions(-) + +commit 727135f3a9938c1ebd5b9f5015a46c7ccc8573c5 +Author: Behdad Esfahbod +Date: Tue Jul 3 22:15:35 2012 -0400 + + Towards templatizing common Lookup types + + src/hb-ot-layout-gpos-table.hh | 16 ++++++++++------ + src/hb-ot-layout-gsub-table.hh | 24 ++++++++++++++---------- + src/hb-ot-layout-gsubgpos-private.hh | 33 + +++++++++++++++++++++++++++++++-- + 3 files changed, 55 insertions(+), 18 deletions(-) + +commit 1167c7bfc9e61f145e11da4881968293a4d3c0a9 +Author: Behdad Esfahbod +Date: Tue Jul 3 11:38:46 2012 -0400 + + Minor + + test/shaping/texts/in-tree/shaper-thai/MANIFEST | + 2 +- + test/shaping/texts/in-tree/shaper-thai/misc/MANIFEST | 1 - + test/shaping/texts/in-tree/shaper-thai/script-thai/MANIFEST | 1 + + test/shaping/texts/in-tree/shaper-thai/script-thai/misc/MANIFEST | 1 + + .../shaper-thai/{misc/misc.txt => script-thai/misc/sara-am.txt} | + 6 ++---- + 5 files changed, 5 insertions(+), 6 deletions(-) + +commit aa116582e69d18777448e7993078e5d6335ddfed +Author: Behdad Esfahbod +Date: Fri Jun 29 10:50:12 2012 -0400 + + Minor + + .../texts/in-tree/shaper-indic/indic/script-malayalam/misc/misc.txt + | 1 + + 1 file changed, 1 insertion(+) + +commit 1f13c7185f02ea18d4fadd2ea8ad444bea863c39 +Author: Behdad Esfahbod +Date: Wed Jun 27 10:07:27 2012 -0400 + + Add TODO item + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 12f5c0a222a2f0aebe63c0d367937a0ff985474a +Author: Behdad Esfahbod +Date: Tue Jun 26 11:16:13 2012 -0400 + + Fix check for Intel atomic ops + + configure.ac | 9 +++++---- + src/hb-atomic-private.hh | 2 +- + 2 files changed, 6 insertions(+), 5 deletions(-) + +commit 6932a41fb61ffc2901c260587b1e98ed9c2a7ea1 +Author: Behdad Esfahbod +Date: Tue Jun 26 10:46:31 2012 -0400 + + Use octal-escaped UTF-8 characters instead of plain text + + https://bugs.freedesktop.org/show_bug.cgi?id=50970 + + src/hb-private.hh | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) + +commit 8c0ea7bcb4409aaf8c96ad641f2db30003228ad0 +Author: Behdad Esfahbod +Date: Sun Jun 24 13:20:56 2012 -0400 + + Disable introspection again + + Until I figure out the build issues. Sigh... + + configure.ac | 2 +- + src/Makefile.am | 42 +++++++++++++++++++++--------------------- + 2 files changed, 22 insertions(+), 22 deletions(-) + +commit 8c5f5e6f5ec2b6a219fbdfc955f6299325a0adde +Author: Behdad Esfahbod +Date: Sun Jun 17 14:58:59 2012 -0400 + + Minor + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 49f8e0cd9a5493ae26857c43bac0711cdf47c80d +Author: Behdad Esfahbod +Date: Sat Jun 16 15:40:03 2012 -0400 + + GStaticMutex is deprecated + + src/hb-mutex-private.hh | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 5e113a4b7921ced6af2d53460a7a2f1d0185c02a +Author: Behdad Esfahbod +Date: Sat Jun 16 15:26:13 2012 -0400 + + g_thread_init() is deprecated + + test/api/hb-test.h | 2 ++ + 1 file changed, 2 insertions(+) + +commit 1bc1cb3603167f5da309336f7018c8b0608ac104 +Author: Behdad Esfahbod +Date: Sat Jun 16 15:21:55 2012 -0400 + + Make source more digestable for gobject-introspection + + src/hb-blob.cc | 2 +- + src/hb-blob.h | 2 +- + src/hb-buffer-private.hh | 4 ++-- + src/hb-buffer.h | 6 +++--- + src/hb-common.cc | 2 +- + src/hb-common.h | 4 ++-- + src/hb-font-private.hh | 6 +++--- + src/hb-font.cc | 2 +- + src/hb-font.h | 8 ++++---- + src/hb-set-private.hh | 2 +- + src/hb-set.h | 2 +- + src/hb-shape.h | 2 +- + src/hb-unicode-private.hh | 2 +- + src/hb-unicode.h | 2 +- + 14 files changed, 23 insertions(+), 23 deletions(-) + +commit 84d781e54cc75c81a06ba43fd7b1a74b8c7d9591 +Author: Behdad Esfahbod +Date: Sat Jun 16 15:21:41 2012 -0400 + + Flesh out gobject-introspection stuff a bit + + configure.ac | 1 + + src/Makefile.am | 23 +++++++++++++++++++++-- + 2 files changed, 22 insertions(+), 2 deletions(-) + +commit 49ee12ccd00870d4976339dc546c74eaf08a8fc0 +Author: Behdad Esfahbod +Date: Sat Jun 16 14:53:51 2012 -0400 + + Add TODO item + + TODO | 1 + + 1 file changed, 1 insertion(+) + +commit d3c8115d1ad09404b8970b98e6b5ab74510a35f6 +Author: Behdad Esfahbod +Date: Tue Jun 12 09:52:57 2012 -0400 + + Minor + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 2cf301968cb8c1150cead0ab909457cdd3ee2d01 +Author: Behdad Esfahbod +Date: Sat Jun 9 14:58:01 2012 -0400 + + Add hb_object_lock/unlock() + + src/hb-object-private.hh | 32 ++++++++++++++++++++++++++------ + 1 file changed, 26 insertions(+), 6 deletions(-) + +commit 6a5661f1e69c937083e8d976cb12429b99180d54 +Author: Behdad Esfahbod +Date: Sat Jun 9 03:26:16 2012 -0400 + + Ugh + + util/shape-consumer.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit f211d5c291b4c947cfd732e873627567173057e4 +Author: Behdad Esfahbod +Date: Sat Jun 9 03:11:22 2012 -0400 + + More Oops! Fix fast-path with sub-type==0 + + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + util/shape-consumer.hh | 2 ++ + 3 files changed, 4 insertions(+), 2 deletions(-) + +commit b1de6aa1f33b228afe231c8209aef90a5fa1ee5d +Author: Behdad Esfahbod +Date: Sat Jun 9 03:07:59 2012 -0400 + + Oops! + + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit b12e2549cbcd4f1ef46e66c75533686ee560f59b +Author: Behdad Esfahbod +Date: Sat Jun 9 03:05:20 2012 -0400 + + Minor + + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit faf0f20253d954cc4cfa4c967ece7573a5ddae3b +Author: Behdad Esfahbod +Date: Sat Jun 9 03:02:36 2012 -0400 + + Add sanitize() logic for fast-paths + + src/hb-ot-layout-gpos-table.hh | 15 ++++++++++++--- + src/hb-ot-layout-gsub-table.hh | 20 ++++++++++++++------ + 2 files changed, 26 insertions(+), 9 deletions(-) + +commit 4e766ff28d1fb831ded20666799787478129c07c +Author: Behdad Esfahbod +Date: Sat Jun 9 02:53:57 2012 -0400 + + Add fast-path for GPOS too + + Shaves another 3% for DejaVu Sans long Latin strings. + + src/hb-ot-layout-gpos-table.hh | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +commit 993c51915f503f74ee00eee646b67bf2e3f73596 +Author: Behdad Esfahbod +Date: Sat Jun 9 02:48:16 2012 -0400 + + Add fast-path to GSUB to check coverage + + Shaves a good 10% off DejaVu Sans with simple Latin text for me. + Now, DejaVu is very ChainContext-intensive, but it's also a very + popular font! + + src/hb-ot-layout-gsub-table.hh | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +commit f19e0b0099ec73b8fedccacff4902403f5eabc42 +Author: Behdad Esfahbod +Date: Sat Jun 9 02:26:57 2012 -0400 + + Match input before backtrack + + Makes more sense, optimization-wise. + + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 67bb9e8cea49a44be6996515e1c7d8cdc95a77e6 +Author: Behdad Esfahbod +Date: Sat Jun 9 02:02:46 2012 -0400 + + Add set add_coverage() to Coverage() + + src/hb-ot-layout-common-private.hh | 24 ++++++++++++++++++++++++ + src/hb-set-private.hh | 5 +++++ + 2 files changed, 29 insertions(+) + +commit 4952f0aa5b2f4368d9e3418252e0a1b9294cd5ee +Author: Behdad Esfahbod +Date: Sat Jun 9 01:39:11 2012 -0400 + + Minor + + src/hb-ot-layout-gsub-table.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit ad6a6f22401d6256e34521d0f52e91348c5ed4c9 +Author: Behdad Esfahbod +Date: Sat Jun 9 01:21:02 2012 -0400 + + Minor + + src/hb-ot-layout.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 46617a42133fbab151de4111a74dcbdc4e769c74 +Author: Behdad Esfahbod +Date: Sat Jun 9 01:18:58 2012 -0400 + + Fix cache implementation + + src/hb-cache-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit ce47613889aa3ff9b0067d3e51ba63cfdb139adb +Author: Behdad Esfahbod +Date: Sat Jun 9 01:10:26 2012 -0400 + + Micro-optimize + + I know... + + src/hb-ot-layout-gsubgpos-private.hh | 3 ++- + src/hb-ot-layout.cc | 46 + ++++++++++++++++++++++-------------- + 2 files changed, 30 insertions(+), 19 deletions(-) + +commit 70416de298b811ab6be53a1c67f0d2531d99cd46 +Author: Behdad Esfahbod +Date: Sat Jun 9 00:56:41 2012 -0400 + + Minor + + src/hb-open-type-private.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit 99159e52a3c9d5ae6c0fbdec64e7ed684fa70b61 +Author: Behdad Esfahbod +Date: Sat Jun 9 00:50:40 2012 -0400 + + Use linear search for small counts + + I see about 8% speedup with long strings with DejaVu Sans. + + src/hb-open-type-private.hh | 19 ++++++++++++++----- + 1 file changed, 14 insertions(+), 5 deletions(-) + +commit caf0412690542e58e23246dccc4b2fb83bd652ec +Author: Behdad Esfahbod +Date: Sat Jun 9 00:26:32 2012 -0400 + + Minor + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0f8fea71a66b1e01ee4398967db464393f478d42 +Author: Behdad Esfahbod +Date: Sat Jun 9 00:24:38 2012 -0400 + + Minor. Hide _hb_ot_layout_get_glyph_property() + + src/hb-ot-layout-private.hh | 4 ---- + src/hb-ot-layout.cc | 2 +- + 2 files changed, 1 insertion(+), 5 deletions(-) + +commit 44b8ee0c90d7b1dd91e5848114141e3186534a0f +Author: Behdad Esfahbod +Date: Sat Jun 9 00:23:24 2012 -0400 + + Minor + + src/hb-ot-layout-gpos-table.hh | 3 ++- + src/hb-ot-layout.cc | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit 7b84c536c10ab90ed96a033d88e9ad232d46c5b8 +Author: Behdad Esfahbod +Date: Fri Jun 8 22:04:23 2012 -0400 + + In MarkBase attachment, only attach to first of a MultipleSubst + sequence + + This is apparently what Uniscribe does. Test case is: + + SEEN FATHA TEH ALEF + + with Arabic Typesetting. Originally reported by Khaled Hosny. + + src/hb-ot-layout-gpos-table.hh | 7 ++++++- + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++++++ + 2 files changed, 14 insertions(+), 1 deletion(-) + +commit ec57e0c5655ced5109c4638bf802772d336448fd +Author: Behdad Esfahbod +Date: Fri Jun 8 21:47:23 2012 -0400 + + Set lig_comp for MultipleSubst components + + To be used for correct mark attachment to first component of a + MultipleSubst output. That's what Uniscribe does. + + src/hb-ot-layout-gsub-table.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit e085fcf7ca302eb7802a032197c022819e7e7074 +Author: Behdad Esfahbod +Date: Fri Jun 8 21:45:00 2012 -0400 + + Remove unused buffer->replace_glyphs_be16 + + src/hb-buffer-private.hh | 3 --- + src/hb-buffer.cc | 23 ----------------------- + src/hb-ot-layout-gsubgpos-private.hh | 8 -------- + 3 files changed, 34 deletions(-) + +commit 3ec77d6ae0510dc2c0ec64382c4948bc6e109844 +Author: Behdad Esfahbod +Date: Fri Jun 8 21:44:06 2012 -0400 + + Don't use replace_glyphs_be for MultipleSubst + + src/hb-ot-layout-gsub-table.hh | 5 ++++- + src/hb-ot-layout-gsubgpos-private.hh | 7 ++++++- + 2 files changed, 10 insertions(+), 2 deletions(-) + +commit 4b7192125ffd295091d6b3a0bdfca7011947c2ca +Author: Behdad Esfahbod +Date: Fri Jun 8 21:41:46 2012 -0400 + + Minor + + src/hb-ot-layout-gsub-table.hh | 3 ++- + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++++++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +commit 4508789f4b5e0ece5620d35598aeeb7ecbe3e3aa +Author: Behdad Esfahbod +Date: Fri Jun 8 21:32:43 2012 -0400 + + Add test for static initializers and other C++ stuff + + src/Makefile.am | 3 ++- + src/check-static-inits.sh | 33 +++++++++++++++++++++++++++++++++ + 2 files changed, 35 insertions(+), 1 deletion(-) + +commit 56bd259b9ac22dd98913c8ca2e2cf7b30b632373 +Author: Behdad Esfahbod +Date: Fri Jun 8 21:29:18 2012 -0400 + + Minor + + src/check-internal-symbols.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4538b47bf08e73e7f5cce6337df5fe154233c168 +Author: Behdad Esfahbod +Date: Fri Jun 8 21:01:45 2012 -0400 + + Remove done TODO items + + TODO | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +commit bc8357ea7b4c0d7c715aae353176434fb9460205 +Author: Behdad Esfahbod +Date: Fri Jun 8 21:01:20 2012 -0400 + + Merge clusters during normalization + + src/hb-ot-shape-normalize.cc | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +commit fe3dabc08df7501010564f8844bd4d11771cc6a4 +Author: Behdad Esfahbod +Date: Fri Jun 8 20:56:05 2012 -0400 + + Minor + + src/hb-buffer.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e88e14421a33ca5bdfd76bc0b2f801fcb6e78911 +Author: Behdad Esfahbod +Date: Fri Jun 8 20:55:21 2012 -0400 + + Use merge_clusters instead of open-coding + + src/hb-buffer.cc | 16 ++++------------ + 1 file changed, 4 insertions(+), 12 deletions(-) + +commit 330a2af3ff0e12c01b3b451357b8bdc83b2e9b47 +Author: Behdad Esfahbod +Date: Fri Jun 8 20:40:02 2012 -0400 + + Use merge_clusters when forming Unicode clusters + + src/hb-ot-shape.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit bd300df9adf955c1e69b3783c1c061876940fb8b +Author: Behdad Esfahbod +Date: Fri Jun 8 20:35:18 2012 -0400 + + Minor + + src/hb-object-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e51d2b6ed1c794ac28c5610bfd01dbc9fb383633 +Author: Behdad Esfahbod +Date: Fri Jun 8 20:33:27 2012 -0400 + + Extend into main buffer if extension hit end of out-buffer merging + clusters + + src/hb-buffer.cc | 5 +++++ + src/hb-ot-shape-complex-misc.cc | 9 --------- + 2 files changed, 5 insertions(+), 9 deletions(-) + +commit 5ced012d9f58c51d557a835593c3277e35fe3b35 +Author: Behdad Esfahbod +Date: Fri Jun 8 20:31:32 2012 -0400 + + Extend end when merging clusters in out-buffer + + src/hb-buffer.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 72c0a1878313e7232d554bc226f4c6dc01418a95 +Author: Behdad Esfahbod +Date: Fri Jun 8 20:30:03 2012 -0400 + + Extend clusters backward in out-buffer + + src/hb-buffer.cc | 8 ++++++++ + src/hb-ot-shape-complex-misc.cc | 2 -- + 2 files changed, 8 insertions(+), 2 deletions(-) + +commit cd5891493df06fdb92e1ae526d29dee8df250235 +Author: Behdad Esfahbod +Date: Fri Jun 8 20:27:53 2012 -0400 + + Extend clusters backwards, into the out-buffer too + + src/hb-buffer.cc | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 77471e037122548bfc08cacea6fbb472831c34f3 +Author: Behdad Esfahbod +Date: Fri Jun 8 20:21:02 2012 -0400 + + Clear output buffer before calling GSUB pause functions + + src/hb-ot-map.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit cafa6f372721fd6b0a7c0da68b9421d3e94931bc +Author: Behdad Esfahbod +Date: Fri Jun 8 20:17:10 2012 -0400 + + When merging clusters, extend the end + + src/hb-buffer.cc | 20 ++++++++++++++------ + 1 file changed, 14 insertions(+), 6 deletions(-) + +commit 28ce5fa454b54f728044ee12a9dbe7d016783d4a +Author: Behdad Esfahbod +Date: Fri Jun 8 20:13:56 2012 -0400 + + Merge clusters when ligating + + src/hb-ot-layout-gsub-table.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 2bb1761ccb7d300744ced6427165f4ea75ddf96c +Author: Behdad Esfahbod +Date: Fri Jun 8 19:29:44 2012 -0400 + + Minor, use next_glyph() + + src/hb-ot-layout-gsub-table.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5f68f8675e5ccaee91f5a90d86bc3b022b9a54e4 +Author: Behdad Esfahbod +Date: Fri Jun 8 19:23:43 2012 -0400 + + Minor + + src/hb-ot-shape.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 872969126756456a69bf958f3df6e56a26e57b0a +Author: Behdad Esfahbod +Date: Fri Jun 8 14:18:30 2012 -0400 + + Increase Uniscribe MAX_ITEMS + + src/hb-uniscribe.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dbffa4c83d29c689ee4cd8a1c53e84521028c711 +Author: Behdad Esfahbod +Date: Fri Jun 8 14:08:32 2012 -0400 + + Fix Uniscribe charset matching + + Previously was failing to match fonts that didn't support + CHARSET_ANSI. + + There still remains a problem with the Uniscribe backend, in that if a + font with the same family name is installed, and is newer, the native + one is preferred over the font we provide. Fixing it requires + rewriting + the name table with a unique family name... + + src/hb-uniscribe.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 82e8bd8628aeb37835fb019a71b6bdac87824b97 +Author: Behdad Esfahbod +Date: Fri Jun 8 11:48:29 2012 -0400 + + Remove unused code + + src/hb-uniscribe.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 6da9dbff21b47fb10794b8d6cb747393c9eab7dd +Author: Behdad Esfahbod +Date: Fri Jun 8 10:53:35 2012 -0400 + + Remove zero-width chars in the fallback shaper too + + src/hb-fallback-shape.cc | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +commit 68b76121f83fc9b87dc84f03e8bef38d4332734d +Author: Behdad Esfahbod +Date: Fri Jun 8 10:43:49 2012 -0400 + + Fix regressions introduced by sed. Ouch! + + Introduced in 99c2695759a6af855d565f4994bbdf220570bb48. + Broken mark-mark and mark-ligature stuff. + + src/hb-ot-layout-gpos-table.hh | 6 +++--- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 0dd86f9f6849d82d60a99e66b6928795cfb2a3c7 +Author: Behdad Esfahbod +Date: Fri Jun 8 10:23:03 2012 -0400 + + Whitespace + + src/hb-uniscribe.cc | 144 + ++++++++++++++++++++++++++-------------------------- + 1 file changed, 72 insertions(+), 72 deletions(-) + +commit 8e7beba7c3b3dea3cb3b7e280c5aab4f13b92d31 +Author: Behdad Esfahbod +Date: Fri Jun 8 10:22:06 2012 -0400 + + Fix Uniscribe clusters with direction-overriden Arabic + + src/hb-uniscribe.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit b069c3c31bfbbf160eb897c7474be9ea90ed4fc1 +Author: Behdad Esfahbod +Date: Fri Jun 8 10:10:29 2012 -0400 + + Really fix override-direction in Uniscribe + + src/hb-uniscribe.cc | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit fcd6f5326166e993b8f5222efbaffe916da98f0a +Author: Behdad Esfahbod +Date: Fri Jun 8 09:59:43 2012 -0400 + + Unbreak Uniscribe + + Oops. hb_tag_t and OPENTYPE_TAG have different endianness. Perhaps + something to add API for in hb-uniscribe.h + + src/hb-private.hh | 12 +++++++++++- + src/hb-uniscribe.cc | 8 ++++---- + 2 files changed, 15 insertions(+), 5 deletions(-) + +commit 29eac8f591fdb86f1c4fdc0a6ab63910ff286b84 +Author: Behdad Esfahbod +Date: Fri Jun 8 09:26:17 2012 -0400 + + Override direction in Uniscribe backend + + Matches OT backend now. + + src/hb-uniscribe.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1c1233e57686d77d89fe3ac1dc53de9ee60798c1 +Author: Behdad Esfahbod +Date: Fri Jun 8 09:20:53 2012 -0400 + + Make Uniscribe backend respect selected script + + src/hb-uniscribe.cc | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +commit 0bb0f5d41976ae27c5c7a51cbb82144b48315a4b +Author: Behdad Esfahbod +Date: Thu Jun 7 17:42:48 2012 -0400 + + Add note re _NullPool + + src/hb-open-type-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 2a3d911fe0ff5d6442659d3381d5b08c30ee2896 +Author: Behdad Esfahbod +Date: Thu Jun 7 17:31:46 2012 -0400 + + Fix alignment-requirement missmatch + + Detected by clang and lots of cmdline options. + + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 5 +++-- + src/hb-ot-layout-gsub-table.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 4 files changed, 7 insertions(+), 6 deletions(-) + +commit 6095de1635441af16340c7b2c5a6b4c531ec242f +Author: Behdad Esfahbod +Date: Thu Jun 7 15:48:18 2012 -0400 + + Fix clang warning with NO_MT path + + src/hb-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a18280a8ce9128fc9d75f8a367ae8ce0886a9599 +Author: Behdad Esfahbod +Date: Thu Jun 7 15:44:12 2012 -0400 + + Fix warnings produced by clang analyzer + + src/hb-icu.cc | 6 ++++-- + test/api/test-blob.c | 2 +- + test/api/test-buffer.c | 4 ++-- + util/helper-cairo.cc | 2 +- + 4 files changed, 8 insertions(+), 6 deletions(-) + +commit 7ec83051c05777c0e6e2eea6ef6c71effede9527 +Author: Behdad Esfahbod +Date: Thu Jun 7 13:32:57 2012 -0400 + + Fix warnings + + util/ansi-print.cc | 30 +++++++++++++----------------- + 1 file changed, 13 insertions(+), 17 deletions(-) + +commit 73cb02de2dd28b09d4aa76230132248215cfe83d +Author: Behdad Esfahbod +Date: Wed Jun 6 11:29:25 2012 -0400 + + Minor + + src/hb-private.hh | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +commit 79e2b4791fe95ede9a1e6b1c71ccc6e36c4fc0e5 +Author: Behdad Esfahbod +Date: Wed Jun 6 11:27:17 2012 -0400 + + Fix ASSERT_POD on clang + + As reported by bashi. Not tested. + + src/hb-private.hh | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 4282d2f3771d6510c27b62e54cc1254d6f2389b3 +Author: Behdad Esfahbod +Date: Wed Jun 6 03:42:36 2012 -0400 + + Enabled ICU again + + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +commit 6220e5fc0dad728e67a92e838d3ac275d032f2c7 +Author: Behdad Esfahbod +Date: Wed Jun 6 03:30:09 2012 -0400 + + Add ASSERT_POD for most objects + + src/hb-blob.cc | 1 + + src/hb-buffer-private.hh | 2 ++ + src/hb-font-private.hh | 3 +++ + src/hb-object-private.hh | 2 ++ + src/hb-private.hh | 2 +- + src/hb-set-private.hh | 4 +++- + src/hb-unicode-private.hh | 1 + + 7 files changed, 13 insertions(+), 2 deletions(-) + +commit a00a63b5ef503fafa87e26b517732b2214e01719 +Author: Behdad Esfahbod +Date: Wed Jun 6 03:07:01 2012 -0400 + + Add macros to check that types are POD + + configure.ac | 1 + + src/hb-open-type-private.hh | 32 ++++++++++++++++++++------------ + src/hb-private.hh | 24 ++++++++++++++++++++++++ + 3 files changed, 45 insertions(+), 12 deletions(-) + +commit 61eb60c129e865e92f6a5767a88c44a391f4d413 +Author: Behdad Esfahbod +Date: Tue Jun 5 21:14:04 2012 -0400 + + Don't link to libstdc++ + + New try. + + src/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 81a4b9fd4eb8995c5930db1df3669db93661eb52 +Author: Behdad Esfahbod +Date: Tue Jun 5 20:49:51 2012 -0400 + + Remove unused hb_static_mutex_t + + src/hb-mutex-private.hh | 11 ----------- + 1 file changed, 11 deletions(-) + +commit 4a3a9897b3698dd09c3e880b3ddd4db24c6fb460 +Author: Behdad Esfahbod +Date: Tue Jun 5 20:39:07 2012 -0400 + + Disable Intel atomic ops on mingw32 + + Apparently the configure test is not enough... + + src/hb-atomic-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0594a2448440208efa0acac9a5d8d52d43108289 +Author: Behdad Esfahbod +Date: Tue Jun 5 20:35:40 2012 -0400 + + Cleanup TRUE/FALSE vs true/false + + src/hb-atomic-private.hh | 4 +-- + src/hb-blob.cc | 28 +++++++++--------- + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 38 ++++++++++++------------- + src/hb-buffer.h | 4 +-- + src/hb-fallback-shape.cc | 2 +- + src/hb-font.cc | 22 +++++++-------- + src/hb-ft.cc | 22 +++++++-------- + src/hb-glib.cc | 16 +++++------ + src/hb-graphite2.cc | 8 +++--- + src/hb-icu.cc | 30 ++++++++++---------- + src/hb-ot-layout.cc | 28 +++++++++--------- + src/hb-ot-shape-complex-private.hh | 2 +- + src/hb-ot-shape-normalize.cc | 16 +++++------ + src/hb-ot-shape.cc | 4 +-- + src/hb-private.hh | 18 ++++-------- + src/hb-set.cc | 2 +- + src/hb-set.h | 2 +- + src/hb-shape.cc | 6 ++-- + src/hb-tt-font.cc | 12 ++++---- + src/hb-unicode.cc | 8 +++--- + src/hb-uniscribe.cc | 18 ++++++------ + src/main.cc | 2 +- + util/hb-shape.cc | 2 +- + util/helper-cairo.cc | 16 +++++------ + util/main-font-text.hh | 2 +- + util/options.cc | 58 + +++++++++++++++++++------------------- + util/options.hh | 2 +- + util/view-cairo.hh | 2 +- + 29 files changed, 185 insertions(+), 191 deletions(-) + +commit e1ac38f8dd04c29d2d4140f5a492cdaf25d72901 +Author: Behdad Esfahbod +Date: Tue Jun 5 20:31:49 2012 -0400 + + Fix inert buffer set_length() with zero + + Oops! + + src/hb-buffer.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 04bc1eebe7a304c0e6f86ab6814c65889f152602 +Author: Behdad Esfahbod +Date: Tue Jun 5 20:16:56 2012 -0400 + + Add configure tests for Intel atomic intrinsics + + configure.ac | 17 +++++++++++++++++ + src/hb-atomic-private.hh | 12 ++++++------ + src/hb-mutex-private.hh | 2 +- + 3 files changed, 24 insertions(+), 7 deletions(-) + +commit 68c75b46977beb57e35082db26be712b3cd65678 +Author: Behdad Esfahbod +Date: Tue Jun 5 19:55:46 2012 -0400 + + Shuffle + + configure.ac | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit f64b2ebf82c5f355cd95806478cd30c00b1a2731 +Author: Behdad Esfahbod +Date: Tue Jun 5 19:23:29 2012 -0400 + + Remove last static initializer + + We're free! Lazy or immediate... + + src/hb-ft.cc | 2 + + src/hb-shape.cc | 150 + ++++++++++++++++++++++++++++++++++++++++---------------- + 2 files changed, 110 insertions(+), 42 deletions(-) + +commit 4a8a529068fc380298bb05b9d878bede3e9f4da1 +Author: Behdad Esfahbod +Date: Tue Jun 5 19:17:02 2012 -0400 + + Make hb-view err if all shapers failed + + util/view-cairo.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 04aed572f112b96a6033cd6c3df7bdba5e29e93c +Author: Behdad Esfahbod +Date: Tue Jun 5 18:30:19 2012 -0400 + + Make hb-ft static-initializer free + + src/hb-common.cc | 5 ++--- + src/hb-ft.cc | 38 +++++++++++++++++++++++++++----------- + 2 files changed, 29 insertions(+), 14 deletions(-) + +commit be4560a3b5e8599cbe2b29a01a60c21c9e2b194f +Author: Behdad Esfahbod +Date: Tue Jun 5 18:14:03 2012 -0400 + + Undo default unicode-funcs to avoid static initializer again + + src/hb-buffer.cc | 2 +- + src/hb-glib.cc | 23 ++++++++++++----------- + src/hb-icu.cc | 24 +++++++++++++----------- + src/hb-unicode-private.hh | 10 +++++----- + src/hb-unicode.cc | 26 ++++++++++++++------------ + 5 files changed, 45 insertions(+), 40 deletions(-) + +commit 093171cceca63e48e735bbf05a2c11b1b7e95ef1 +Author: Behdad Esfahbod +Date: Tue Jun 5 18:00:45 2012 -0400 + + Implement lock-free hb_language_t + + Another static-initialization down. One more to go. + + src/hb-common.cc | 66 + +++++++++++++++++++++++++++++++++++++++++++++----------- + 1 file changed, 54 insertions(+), 12 deletions(-) + +commit 6843ce01be0df501ef3149a2c1c54cdfb693195d +Author: Behdad Esfahbod +Date: Tue Jun 5 17:27:20 2012 -0400 + + Add atomic-pointer functions + + Gonig to use these for lock-free linked-lists, to be used for + hb_language_t among other things. + + src/hb-atomic-private.hh | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +commit cdafe3a7d8483ac586e2c16487e2a09164e0f65c +Author: Behdad Esfahbod +Date: Tue Jun 5 16:34:49 2012 -0400 + + Add gcc intrinsics implementations for atomic and mutex + + configure.ac | 4 ++-- + src/hb-atomic-private.hh | 11 +++++++++-- + src/hb-mutex-private.hh | 51 + +++++++++++++++++++++++++++++++++++++++++------- + src/hb-object-private.hh | 4 +++- + src/hb-warning.cc | 14 ++++++------- + 5 files changed, 65 insertions(+), 19 deletions(-) + +commit d970d2899b36a2fbd002b224b8bd37b0906fdd5f +Author: Behdad Esfahbod +Date: Tue Jun 5 16:06:28 2012 -0400 + + Add gcc implementation for atomic ops + + src/hb-atomic-private.hh | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit 0e253e97af71e2a7ead153589f61fd579a247502 +Author: Behdad Esfahbod +Date: Tue Jun 5 15:37:19 2012 -0400 + + Add a mutex to object header + + Removes one more static-initialization. A few more to go. + + src/hb-common.cc | 24 +++++++++--------------- + src/hb-mutex-private.hh | 19 +++++++------------ + src/hb-object-private.hh | 36 ++++++++++++++++++++++-------------- + src/hb-private.hh | 11 +++++------ + 4 files changed, 43 insertions(+), 47 deletions(-) + +commit a2b471df821b32625d127f83b2f90e6d6a967e7e +Author: Behdad Esfahbod +Date: Tue Jun 5 15:17:44 2012 -0400 + + Remove static initializers from indic + + src/hb-ot-shape-complex-indic.cc | 50 + +++++++++++++++++++++++++++++++--------- + 1 file changed, 39 insertions(+), 11 deletions(-) + +commit f06ab8a4262c759b4723614fd28f55ee77aa8466 +Author: Behdad Esfahbod +Date: Tue Jun 5 12:31:51 2012 -0400 + + Better hide nil objects and make them const + + src/hb-blob.cc | 34 +++++++++++------------ + src/hb-buffer.cc | 39 +++++++++++++------------- + src/hb-font.cc | 70 + +++++++++++++++++++++++------------------------ + src/hb-ft.cc | 49 +++++++++++++++------------------ + src/hb-glib.cc | 25 ++++++++--------- + src/hb-icu.cc | 25 ++++++++--------- + src/hb-set.cc | 16 +++++------ + src/hb-unicode-private.hh | 11 ++++---- + src/hb-unicode.cc | 34 +++++++++++------------ + 9 files changed, 146 insertions(+), 157 deletions(-) + +commit bf93b636c4963cbc32d5fba7ace1053db6719192 +Author: Behdad Esfahbod +Date: Tue Jun 5 14:17:32 2012 -0400 + + Remove constructor from hb_prealloced_array_t + + This was causing all object types to be non-POD and have static + initializers. We don't need that! + + Now, most nil objects just moved from .bss to .data. Fixing for that + coming soon. + + src/hb-object-private.hh | 3 +++ + src/hb-private.hh | 4 +++- + src/hb-set-private.hh | 1 + + 3 files changed, 7 insertions(+), 1 deletion(-) + +commit 7037291aacb858f8090fd7d9028c196cc1a21703 +Author: Behdad Esfahbod +Date: Tue Jun 5 13:30:11 2012 -0400 + + Check for atexit() + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f1971a217424bd6db5c7072ba5cf197f318d4e47 +Author: Behdad Esfahbod +Date: Tue Jun 5 13:04:20 2012 -0400 + + Fix warnings + + src/indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b0a6e58bb3dda72dcce37d54d987591630a3db6c +Author: Behdad Esfahbod +Date: Mon Jun 4 10:21:22 2012 -0400 + + s/script-punjabi/script-gurmukhi/ + + test/shaping/texts/in-tree/shaper-indic/indic/MANIFEST | + 2 +- + .../shaper-indic/indic/{script-punjabi => script-gurmukhi}/MANIFEST + | 0 + .../indic/{script-punjabi => script-gurmukhi}/misc/MANIFEST | + 0 + .../indic/{script-punjabi => script-gurmukhi}/misc/misc.txt | + 0 + .../indic/{script-punjabi => script-gurmukhi}/utrrs/LICENSE | + 0 + .../indic/{script-punjabi => script-gurmukhi}/utrrs/MANIFEST | + 0 + .../shaper-indic/indic/{script-punjabi => script-gurmukhi}/utrrs/README + | 0 + .../indic/{script-punjabi => script-gurmukhi}/utrrs/SOURCES | + 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | + 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt + | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | + 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-GurmukhiSpecific.txt + | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt + | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | + 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt + | 0 + .../indic/{script-punjabi => script-gurmukhi}/utrrs/codepoint/MANIFEST + | 0 + .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | + 0 + .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | + 0 + .../indic/{script-punjabi => script-gurmukhi}/utrrs/gpos/MANIFEST + | 0 + .../utrrs/gsub/IndicFontFeatureGSUB.txt | + 0 + .../indic/{script-punjabi => script-gurmukhi}/utrrs/gsub/MANIFEST + | 0 + 21 files changed, 1 insertion(+), 1 deletion(-) + +commit c1885483120d4b686b2fe95b217dce7248e040b1 +Author: Behdad Esfahbod +Date: Mon Jun 4 08:56:00 2012 -0400 + + Add --verbose to hb-shape + + Just turns all --show-* options on. + + util/options.cc | 11 +++++++++++ + util/options.hh | 1 - + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit 9fc7a11469113d31d8095757c4fc038c3427d44a +Author: Behdad Esfahbod +Date: Mon Jun 4 08:28:19 2012 -0400 + + Remove comma at the end of enum + + As reported by Jonathan Kew on the list. + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3b8fd9c48f4bde368bf2d465c148b9743a9216ee +Author: Behdad Esfahbod +Date: Sun Jun 3 15:54:19 2012 -0400 + + Remove const from ref_count.ref_count + + According to Tom Hacohen this was breaking build with some compilers. + + In file included from hb-buffer-private.hh:35:0, + from hb-ot-map-private.hh:32, + from hb-ot-shape-private.hh:32, + from hb-ot-shape.cc:29: + hb-object-private.hh: In constructor + '_hb_object_header_t::_hb_object_header_t()': + hb-object-private.hh:97:8: error: uninitialized const member in + 'struct hb_reference_count_t' + hb-object-private.hh:51:25: note: 'hb_reference_count_t::ref_count' + should be initialized + In file included from hb-ot-shape.cc:33:0: + hb-set-private.hh: In constructor '_hb_set_t::_hb_set_t()': + hb-set-private.hh:37:8: note: synthesized method + '_hb_object_header_t::_hb_object_header_t()' first required here + hb-ot-shape.cc: In function 'void + hb_ot_shape_glyphs_closure(hb_font_t*, hb_buffer_t*, const + hb_feature_t*, unsigned int, hb_set_t*)': + hb-ot-shape.cc:521:12: note: synthesized method + '_hb_set_t::_hb_set_t()' first required here + + src/hb-object-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 70600dbf626808a30fb0fd8b7ae860e64d9ffe87 +Author: Behdad Esfahbod +Date: Sun Jun 3 15:52:51 2012 -0400 + + Minor + + src/hb-object-private.hh | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit ae62166519291057316a9d15cea3f1570fcb5eaf +Author: Behdad Esfahbod +Date: Sat Jun 2 12:21:19 2012 -0400 + + [util] Minor + + util/options.cc | 4 +--- + util/options.hh | 26 ++++++++++++++------------ + util/shape-consumer.hh | 4 +++- + 3 files changed, 18 insertions(+), 16 deletions(-) + +commit 5db0683a822f70c914468430cda6487cee740ae3 +Author: Behdad Esfahbod +Date: Sat Jun 2 12:13:08 2012 -0400 + + [util] Make hb-shape continue shaping other lines if shapers failed + + util/hb-ot-shape-closure.cc | 3 +++ + util/hb-shape.cc | 36 +++++++++++++++++++++++++------ + util/main-font-text.hh | 2 +- + util/options.cc | 34 ++++++++++++++++++++++------- + util/options.hh | 33 ++++++++++++++-------------- + util/shape-consumer.hh | 17 ++++++++++++--- + util/view-cairo.cc | 47 +++++++--------------------------------- + util/view-cairo.hh | 52 + +++++++++++++++++++++++++++++++++++++++------ + 8 files changed, 143 insertions(+), 81 deletions(-) + +commit 96a9ef0c9fca8d58d8dc6baf6b262d96587abee0 +Author: Behdad Esfahbod +Date: Fri Jun 1 13:46:26 2012 -0400 + + Remove tab character like other "zero-width" characters + + Uniscribe does that, this make comparing results to Uniscribe + easier. + + src/hb-unicode-private.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit cd6a5493411fea30a04466128e1a37b4d89c6a72 +Author: Behdad Esfahbod +Date: Fri Jun 1 13:45:25 2012 -0400 + + Remove unused variable + + util/hb-ot-shape-closure.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit 0558d55bac7fb9279aac859b465e7c0e3ad97492 +Author: Behdad Esfahbod +Date: Mon May 28 10:46:47 2012 -0400 + + Remove hb_atomic_int_set/get() + + We never use them in fact... + + I'm just adjusting these as I better understand the requirements of + the code and the guarantees of each operation. + + src/hb-atomic-private.hh | 8 -------- + src/hb-object-private.hh | 12 +++++------- + 2 files changed, 5 insertions(+), 15 deletions(-) + +commit 4efdffec095e19ceeb4b319d60201e84ece30fd9 +Author: Behdad Esfahbod +Date: Sun May 27 22:39:48 2012 -0400 + + Minor Malayalam test case + + From https://bugs.freedesktop.org/show_bug.cgi?id=45166 + + .../texts/in-tree/shaper-indic/indic/script-malayalam/misc/misc.txt + | 1 + + 1 file changed, 1 insertion(+) + +commit dfff5b3021016d3a472c100272fd8e2f52307860 +Author: Behdad Esfahbod +Date: Sun May 27 22:07:04 2012 -0400 + + Add Myanmar test case + + test/shaping/texts/in-tree/shaper-indic/south-east-asian/MANIFEST + | 1 + + .../texts/in-tree/shaper-indic/south-east-asian/script-myanmar/MANIFEST + | 1 + + .../in-tree/shaper-indic/south-east-asian/script-myanmar/misc/MANIFEST + | 1 + + .../in-tree/shaper-indic/south-east-asian/script-myanmar/misc/misc.txt + | 1 + + 4 files changed, 4 insertions(+) + +commit bce095524b3e69a47f8e88a2fb02d6ab537f9b0a +Author: Behdad Esfahbod +Date: Sun May 27 11:29:21 2012 -0400 + + Add hb_font_get_glyph_name() and hb_font_get_glyph_from_name() + + TODO | 1 + + src/hb-font-private.hh | 2 ++ + src/hb-font.cc | 80 + +++++++++++++++++++++++++++++++++++---------- + src/hb-font.h | 28 ++++++++++++++++ + src/hb-ft.cc | 52 ++++++++++++++++++++++++----- + util/hb-ot-shape-closure.cc | 9 ++--- + util/options.cc | 10 ++---- + 7 files changed, 142 insertions(+), 40 deletions(-) + +commit bc145658bdaeaeea0cdbd719e2756f09a2dbfb48 +Author: Behdad Esfahbod +Date: Sun May 27 10:45:57 2012 -0400 + + Warn if no Unicode functions implementation is found + + src/hb-unicode-private.hh | 1 + + src/hb-warning.cc | 13 +++++++++++++ + 2 files changed, 14 insertions(+) + +commit a3547330fa88e30a138f6f17e60d9c7d1e316622 +Author: Behdad Esfahbod +Date: Sun May 27 10:20:47 2012 -0400 + + Cleanup atomic ops on OS X + + src/hb-atomic-private.hh | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit e4b6d503c5575ddbf49249e3fef693d75ae75170 +Author: Behdad Esfahbod +Date: Sun May 27 10:11:13 2012 -0400 + + Don't use atomic ops in hb_cache_t + + We don't care about linearizability, so unprotected int read/write + are enough, no need for expensive memory barriers. It's a cache, + that's all. + + src/hb-cache-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 819faa05307aa192015f4b43d8103a35e87d6cc7 +Author: Behdad Esfahbod +Date: Sun May 27 10:09:18 2012 -0400 + + Minor + + src/hb-atomic-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 303d5850ec0516e198db241456b0cfc4899ef9c0 +Author: Behdad Esfahbod +Date: Sun May 27 10:01:13 2012 -0400 + + Fix Windows atomic get/set + + According to: + http://msdn.microsoft.com/en-us/library/65tt87y8.aspx + + MemoryBarrier() is the right macro to protect these, not + _ReadBarrier() + and/or _WriteBarrier(). + + src/hb-atomic-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8f8956a55fff95e5ad529d2f124c9528d1f4f81d +Author: Behdad Esfahbod +Date: Fri May 25 14:30:24 2012 -0400 + + [util] Add hidden --shaper that is equivalent of --shapers + + util/helper-cairo.cc | 2 +- + util/options.cc | 6 +++++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +commit 29ce446d3161b7ea5874352e5f8eb33cd59338c3 +Author: Behdad Esfahbod +Date: Fri May 25 14:17:54 2012 -0400 + + Add set iterator + + src/hb-set-private.hh | 26 +++++++++++++++++++++++--- + src/hb-set.cc | 7 +++++++ + src/hb-set.h | 11 +++++++++-- + util/hb-ot-shape-closure.cc | 8 +++++--- + 4 files changed, 44 insertions(+), 8 deletions(-) + +commit 62c3e111fce0ad34960871134c2eb6da572df303 +Author: Behdad Esfahbod +Date: Fri May 25 13:48:00 2012 -0400 + + Add set symmetric difference + + src/hb-set-private.hh | 5 +++++ + src/hb-set.cc | 7 +++++++ + src/hb-set.h | 6 ++++++ + 3 files changed, 18 insertions(+) + +commit 27aba594c90b4444c35273a38f5fedc8e09d9a88 +Author: Behdad Esfahbod +Date: Thu May 24 15:00:01 2012 -0400 + + Minor + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + src/hb-ot-shape-complex-indic.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit cde1c0114ba66a45d907e81a49bf625e0dc946b0 +Author: Behdad Esfahbod +Date: Thu May 24 10:46:39 2012 -0400 + + Fix hb_atomic_int_set() implementation for HB_NO_MT + + As pointed out by Jonathan Kew. + + src/hb-atomic-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3b9b7133bea787f787170beea073f185e36d2327 +Author: Behdad Esfahbod +Date: Wed May 23 22:00:25 2012 -0400 + + Update TODO + + TODO | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +commit ff3524c21aabf5d0d6014d1ce1b3e12ca5f0990f +Author: Behdad Esfahbod +Date: Wed May 23 21:50:43 2012 -0400 + + Add Arabic diacritics tests + + .../shaper-arabic/script-arabic/misc/MANIFEST | 2 +- + .../script-arabic/misc/diacritics/MANIFEST | 5 + + .../script-arabic/misc/diacritics/lam-alef.txt | 28 + + .../misc/diacritics/language-arabic.txt | 695 + +++++++++++++++++++++ + .../misc/diacritics/language-persian.txt | 48 ++ + .../misc/diacritics/language-urdu.txt | 188 ++++++ + .../misc/{ => diacritics}/ligature-diacritics.txt | 0 + 7 files changed, 965 insertions(+), 1 deletion(-) + +commit ed2f1363a391add41f10cff18792003583a10257 +Author: Behdad Esfahbod +Date: Tue May 22 22:12:22 2012 -0400 + + Fix substitution glyph class propagation + + The old code was doing nothing. + + Still got to find an example font+string that makes this matter, but + need this for fixing synthetic GDEF anyway. + + src/hb-ot-layout-gsub-table.hh | 10 ++++------ + src/hb-ot-layout-gsubgpos-private.hh | 23 ++++++----------------- + 2 files changed, 10 insertions(+), 23 deletions(-) + +commit a6de53664df9549a5dc93752647ea1d3bb336f7b +Author: Behdad Esfahbod +Date: Fri May 18 15:04:35 2012 -0400 + + Add CJK Compatibility Ideographs tests + + From: + http://people.mozilla.org/~jdaggett/tests/cjkcompat.html + + test/shaping/texts/in-tree/shaper-default/MANIFEST | + 3 ++- + .../in-tree/shaper-default/{script-japanese => script-han}/MANIFEST + | 0 + test/shaping/texts/in-tree/shaper-default/script-han/misc/MANIFEST | + 1 + + .../texts/in-tree/shaper-default/script-han/misc/cjk-compat.txt | + 3 +++ + test/shaping/texts/in-tree/shaper-default/script-hiragana/MANIFEST | + 1 + + .../shaper-default/{script-japanese => script-hiragana}/misc/MANIFEST + | 0 + .../{script-japanese => script-hiragana}/misc/kazuraki-liga-lines.txt + | 0 + .../{script-japanese => script-hiragana}/misc/kazuraki-liga.txt + | 0 + 8 files changed, 7 insertions(+), 1 deletion(-) + +commit 20fdb0f41d81b226e076a4830d4b0d03da31fc19 +Author: Behdad Esfahbod +Date: Thu May 17 22:04:45 2012 -0400 + + Add a lock-free cache type for int->int functions + + To be used for cmap and advance caching if desired. + + TODO | 2 ++ + src/Makefile.am | 1 + + src/hb-cache-private.hh | 72 + +++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-font.cc | 2 ++ + 4 files changed, 77 insertions(+) + +commit bd908b4f102b5ae18a3ad4a8b137994cf74b86ce +Author: Behdad Esfahbod +Date: Thu May 17 22:02:08 2012 -0400 + + Implement hb_atomic_int_set() for OS X + + src/hb-atomic-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 022a05ae90f30bcddff413022e0cd801809b5390 +Author: Behdad Esfahbod +Date: Thu May 17 21:53:24 2012 -0400 + + Minor + + src/hb-atomic-private.hh | 4 +++- + src/hb-mutex-private.hh | 4 +++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +commit 22afd66a30d01b6771405e76777306f600807bea +Author: Behdad Esfahbod +Date: Thu May 17 21:23:49 2012 -0400 + + Add hb_atomic_int_set() again + + src/hb-atomic-private.hh | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 4aa7258cb16176a89e1547fee8f86571fdd98307 +Author: Behdad Esfahbod +Date: Thu May 17 21:01:04 2012 -0400 + + Fix type conflicts on Windows without glib + + src/hb-tt-font.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit f039e79d5438a8fc4a3ec11a387bbfc0f6b83024 +Author: Behdad Esfahbod +Date: Thu May 17 20:55:12 2012 -0400 + + Don't use min/max as function names + + They can be macros on some systems. Eg. mingw32. + + src/hb-set-private.hh | 4 ++-- + src/hb-set.cc | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 34961e3198e27fa37fd4cfdad12ef86a2e9e51c2 +Author: Behdad Esfahbod +Date: Thu May 17 20:50:38 2012 -0400 + + Prefer native atomic/mutex ops to glib's + + src/hb-atomic-private.hh | 29 ++++++++++++++++------------- + src/hb-mutex-private.hh | 24 ++++++++++++++---------- + 2 files changed, 30 insertions(+), 23 deletions(-) + +commit ec3ba4b96fc4f262db1ff9f906628c32f26c9b7d +Author: Behdad Esfahbod +Date: Thu May 17 20:30:46 2012 -0400 + + Move atomic ops into their own header + + src/Makefile.am | 1 + + src/hb-atomic-private.hh | 78 + ++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-mutex-private.hh | 1 - + src/hb-object-private.hh | 52 ++------------------------------ + src/hb-warning.cc | 2 +- + 5 files changed, 82 insertions(+), 52 deletions(-) + +commit de0878395be5c72d7058faac8f64715bdd42eb3b +Author: Behdad Esfahbod +Date: Thu May 17 20:15:49 2012 -0400 + + Update TODO + + TODO | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit c87b317f0eb118e67134e8e419a6d65e0fa40d30 +Author: Behdad Esfahbod +Date: Tue May 15 23:53:18 2012 -0400 + + [util] Add hb-ot-shape-closure tool + + Computes all the glyphs that may be generated given a font and + set of Unicode characters. + + The order of the Unicode characters is irrelevant. + + Sample output: + + behdad:util 0$ ./hb-ot-shape-closure Doulos\ SIL\ Regular.ttf f + f f_f + + behdad:util 0$ ./hb-ot-shape-closure Doulos\ SIL\ Regular.ttf i + i + + behdad:util 0$ ./hb-ot-shape-closure Doulos\ SIL\ Regular.ttf fi + f f_i f_f_i f_f i + + behdad:util 0$ ./hb-ot-shape-closure DroidNaskh-Regular.ttf ب + uni0628 uni0628.init uni0628.medi uni0628.fina + + behdad:util 0$ ./hb-ot-shape-closure DroidNaskh-Regular.ttf ا + uni0627 uni0627.fina + + behdad:util 0$ ./hb-ot-shape-closure DroidNaskh-Regular.ttf با + uni0627 uni0627.fina uni0628 uni0628.init uni0628.medi uni0628.fina + + behdad:util 0$ ./hb-ot-shape-closure DroidNaskh-Regular.ttf با + --no-glyph-names + 5 6 133 134 135 136 + + configure.ac | 2 +- + util/Makefile.am | 22 ++++++--- + util/hb-ot-shape-closure.cc | 112 + ++++++++++++++++++++++++++++++++++++++++++++ + util/options.hh | 12 +++++ + 4 files changed, 140 insertions(+), 8 deletions(-) + +commit 45675e589e6ef9f81b2a4199cf33e3e7778433a8 +Author: Behdad Esfahbod +Date: Tue May 15 23:10:39 2012 -0400 + + [util] Refactor to accommodate for upcoming new tool + + util/Makefile.am | 10 +++-- + util/hb-shape.cc | 70 + +++++++++++++++------------------- + util/hb-view.cc | 8 ++-- + util/{hb-view.hh => main-font-text.hh} | 48 +++++++++++------------ + util/shape-consumer.hh | 69 + +++++++++++++++++++++++++++++++++ + 5 files changed, 135 insertions(+), 70 deletions(-) + +commit 1d6846db9ebf84561bb30a4e48c6c43184914099 +Author: Behdad Esfahbod +Date: Sun May 13 18:09:29 2012 +0200 + + [Indic] Apply vatu feature after cjct + + Testing with old Deva spec this reduces failures. + Test sequence: U+0915,U+094D,U+0930. + + src/hb-ot-shape-complex-indic.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 8caf5dcd66550351c6038b9ae7ecc5254eed64ff +Author: Behdad Esfahbod +Date: Sun May 13 17:10:18 2012 +0200 + + Minor + + util/ansi-print.cc | 67 + +++++++++++++++++++++++++++--------------------------- + 1 file changed, 33 insertions(+), 34 deletions(-) + +commit 617f4ac46f1084859d2034c08760e31e52d3bec3 +Author: Behdad Esfahbod +Date: Sun May 13 16:48:03 2012 +0200 + + Refactor + + src/hb-ot-shape-complex-indic.cc | 44 + +++++++++++++++++++++------------------- + 1 file changed, 23 insertions(+), 21 deletions(-) + +commit 5e4e21fce4b548b0b8a5951bc8f35a9f27428192 +Author: Behdad Esfahbod +Date: Sun May 13 16:46:08 2012 +0200 + + Revert "[Indic] Refactoring" + + This reverts commit 0831061efb78983b9c6e1e72574c977e56383c08. + + src/hb-ot-shape-complex-indic.cc | 28 ++++++++-------------------- + 1 file changed, 8 insertions(+), 20 deletions(-) + +commit 3f18236a03880c0960f5990dc90685f6146951a6 +Author: Behdad Esfahbod +Date: Sun May 13 16:20:10 2012 +0200 + + Fix more warnings + + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 8 ++++---- + 3 files changed, 6 insertions(+), 6 deletions(-) + +commit 9f377ed3210fe7d9f15e0c4f82020556f9a8f6f0 +Author: Behdad Esfahbod +Date: Sun May 13 16:13:44 2012 +0200 + + Fix more unused-var warnings + + src/hb-ot-shape-complex-arabic.cc | 7 +++++-- + src/hb-ot-shape-complex-indic.cc | 25 ++++++++++++++++++------- + src/hb-ot-shape-complex-misc.cc | 21 +++++++++++++++------ + src/hb-ot-shape-normalize.cc | 13 ++++++------- + src/hb-set.cc | 2 +- + 5 files changed, 45 insertions(+), 23 deletions(-) + +commit d993e72331c6c4c783b803e01e4d4a02c8e3eb77 +Author: Behdad Esfahbod +Date: Sun May 13 16:04:36 2012 +0200 + + Fix hb_face_set_index() + + src/hb-font.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 93345edcbea49bdf0e22f26b5b74a23e601dfab4 +Author: Behdad Esfahbod +Date: Sun May 13 16:01:08 2012 +0200 + + Fix warnings + + src/hb-fallback-shape.cc | 4 ++-- + src/hb-private.hh | 54 + ++++++++++++++++++++++++------------------------ + 2 files changed, 29 insertions(+), 29 deletions(-) + +commit eace47b173807d94b29a6490d0bc3c9f8f6168d1 +Author: Behdad Esfahbod +Date: Sun May 13 15:54:43 2012 +0200 + + Minor + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 99c2695759a6af855d565f4994bbdf220570bb48 +Author: Behdad Esfahbod +Date: Sun May 13 15:45:18 2012 +0200 + + Add accessort to buffer for current info, current pos, and prev info + + src/hb-buffer-private.hh | 9 ++++++++ + src/hb-ot-layout-gpos-table.hh | 44 + ++++++++++++++++++------------------ + src/hb-ot-layout-gsub-table.hh | 28 +++++++++++------------ + src/hb-ot-layout-gsubgpos-private.hh | 28 +++++++++++------------ + src/hb-ot-shape-complex-arabic.cc | 4 ++-- + src/hb-ot-shape-complex-misc.cc | 5 ++-- + src/hb-ot-shape-normalize.cc | 16 ++++++------- + src/hb-ot-shape.cc | 8 +++---- + 8 files changed, 76 insertions(+), 66 deletions(-) + +commit 6736f3c5b09af6a71935afc04248b033e171a9b2 +Author: Behdad Esfahbod +Date: Sun May 13 15:21:06 2012 +0200 + + Minor + + src/hb-ot-layout-gsubgpos-private.hh | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 5df809b655bb1318115651fd87d4555cdd9b41cb +Author: Behdad Esfahbod +Date: Sun May 13 15:17:51 2012 +0200 + + [GSUB/GPOS] Remove context_length + + The spec doesn't say contextual matching should be done this way, + and AOTS doesn't do it either. It was inherited from old HarfBuzz. + Remove it. + + src/hb-ot-layout-common-private.hh | 1 - + src/hb-ot-layout-gpos-table.hh | 3 --- + src/hb-ot-layout-gsub-table.hh | 6 ++---- + src/hb-ot-layout-gsubgpos-private.hh | 32 + +++++++++++--------------------- + 4 files changed, 13 insertions(+), 29 deletions(-) + +commit 28b9d502bb69a8045818d5f6113ded9c59a56bd7 +Author: Behdad Esfahbod +Date: Sun May 13 15:04:00 2012 +0200 + + Minor + + src/hb-ot-layout-gsubgpos-private.hh | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +commit 50f630c17ced1bd59b4da4f27728dcfbb876400a +Author: Behdad Esfahbod +Date: Sun May 13 13:03:44 2012 +0200 + + Remove ioctl checks + + Ended up not using terminal size after all. + + configure.ac | 2 +- + util/ansi-print.cc | 11 ----------- + 2 files changed, 1 insertion(+), 12 deletions(-) + +commit db0de7cd616e1e9d6fde6659e52a541477fb0148 +Author: Behdad Esfahbod +Date: Sun May 13 13:02:38 2012 +0200 + + [util] Set ansi color only on color change + + util/ansi-print.cc | 28 +++++++++++++++++++++++----- + 1 file changed, 23 insertions(+), 5 deletions(-) + +commit 912c5ff80a255edb8145b9db69e2ed828f8eab5c +Author: Behdad Esfahbod +Date: Sun May 13 12:51:02 2012 +0200 + + Reduce default margin + + util/options.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 52e7b1424a3613122e9ca30879298df42733acda +Author: Behdad Esfahbod +Date: Sun May 13 02:02:58 2012 +0200 + + [util] Make hb-view print out Unicode art if stdout is a terminal + + configure.ac | 4 +- + util/Makefile.am | 4 + + util/ansi-print.cc | 411 + ++++++++++++++++++++++++++++++++++++++++++++++ + util/ansi-print.hh | 39 +++++ + util/helper-cairo-ansi.cc | 102 ++++++++++++ + util/helper-cairo-ansi.hh | 39 +++++ + util/helper-cairo.cc | 70 +++++++- + util/options.hh | 3 + + 8 files changed, 668 insertions(+), 4 deletions(-) + +commit 8b2753ce2bea8a21ea757186d86dc4a55d8c8b0c +Author: Behdad Esfahbod +Date: Sun May 13 00:54:07 2012 +0200 + + Minor + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 30874b4819a99cc84fa39e794266685e1b8735d2 +Author: Behdad Esfahbod +Date: Sat May 12 15:54:27 2012 +0200 + + [util] Make tools default to stdin if no text is provided + + One less argument to type in typical testing workflow! + + util/hb-view.hh | 4 +++- + util/options.cc | 12 +++++------- + util/options.hh | 2 +- + 3 files changed, 9 insertions(+), 9 deletions(-) + +commit 2097951110e33fe091ed9515ae77e2683c46c889 +Author: Behdad Esfahbod +Date: Sat May 12 15:41:48 2012 +0200 + + [util] Change default font size of hb-view to 256 + + Most common usecase of hb-view is to test rendering of short words for + testing / inspection. Not having to type "--font-size 150" each time + isn't such a bad idea... + + util/options.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 737dded2e08fcc19935db51c05201a987184d337 +Author: Behdad Esfahbod +Date: Sat May 12 15:40:11 2012 +0200 + + Fix compiler warnings + + src/hb-ot-shape-complex-indic.cc | 5 ----- + 1 file changed, 5 deletions(-) + +commit f538fcb538f1decb4100ba89457eb83f2350d64b +Author: Behdad Esfahbod +Date: Sat May 12 15:34:40 2012 +0200 + + [test] Make tool usage easier by not requiring "--stdin" + + Just default to it. Added "--help" instead to get usage. + + test/shaping/hb_test_tools.py | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit a3273e30bb7ffd727ffc18af5716dfef705d3d94 +Author: Behdad Esfahbod +Date: Sat May 12 13:34:18 2012 +0200 + + [Indic] Add more Malayalam tests + + .../indic/script-malayalam/misc/misc.txt | 38 + ++++++++++++++++++++++ + 1 file changed, 38 insertions(+) + +commit 7f852b644b8143492a02edfc853114aaa23446bd +Author: Behdad Esfahbod +Date: Fri May 11 23:10:31 2012 +0200 + + Fix compiler warnings + + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape-complex-private.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit f7e8dcfd4fc377e3d786b097beb656284240456d +Author: Behdad Esfahbod +Date: Fri May 11 22:00:06 2012 +0200 + + [Indic] Unbreak Devanagari + + And this, concludes the HarfBuzz Massala Hackfest. + + I like to specially thank Jonathan Kew for doing all the decription + and + letting me get commit points. + + configure.ac | 2 +- + src/hb-ot-shape-complex-indic-private.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 6a091df9b403b147ef78f3974610dedf4ce1e08a +Author: Behdad Esfahbod +Date: Fri May 11 21:42:27 2012 +0200 + + [Indic] Disambiguate sub vs post vs above matras + + Bengali is at *just* above 5% now. + + src/hb-ot-shape-complex-indic-private.hh | 31 + +++++++++++++++---------------- + src/hb-ot-shape-complex-indic.cc | 12 ++++++------ + 2 files changed, 21 insertions(+), 22 deletions(-) + +commit 9d0d319a4a7e85d922e58fade0f40caae1c9f109 +Author: Behdad Esfahbod +Date: Fri May 11 21:36:32 2012 +0200 + + [Indic] Position Bengali Reph before matras + + src/hb-ot-shape-complex-indic.cc | 62 + +++++++++++++++++++++++----------------- + 1 file changed, 36 insertions(+), 26 deletions(-) + +commit f89367251109af235f4f0446c13c261a5a4a6f72 +Author: Behdad Esfahbod +Date: Fri May 11 21:10:03 2012 +0200 + + [Indic] Start categorizing Reph per script + + src/hb-ot-shape-complex-indic.cc | 41 + ++++++++++++++++++++++++++++++++++------ + 1 file changed, 35 insertions(+), 6 deletions(-) + +commit a913b024d84973556094fd64ce5f0b7106fcc3b5 +Author: Behdad Esfahbod +Date: Fri May 11 20:59:26 2012 +0200 + + [Indic] Apply 'init' feature for Bengali + + Error down from 20% to 7%. + + src/hb-ot-shape-complex-indic.cc | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +commit eed903b1644e087178438959664a6a57bebc398b +Author: Behdad Esfahbod +Date: Fri May 11 20:50:53 2012 +0200 + + [Indic] Refactor for the arrival of 'init' feature + + Yep, on Bengali now! + + src/hb-ot-shape-complex-indic.cc | 52 + +++++++++++++++++++++++++++------------- + 1 file changed, 36 insertions(+), 16 deletions(-) + +commit 18c06e189bd078affbb84c3bb5bb80687a227c5e +Author: Behdad Esfahbod +Date: Fri May 11 20:02:14 2012 +0200 + + [Indic] Add Uniscribe bug feature for dotted circle + + For dotted-circle independent clusters, Uniscribe does no Reph shaping + for the exact sequence Ra+Halant+25CC. Which also is the only + possible + sequence with 25CC at the end. + + src/hb-ot-shape-complex-indic-machine.rl | 4 +++- + src/hb-ot-shape-complex-indic-private.hh | 3 ++- + src/hb-ot-shape-complex-indic.cc | 20 ++++++++++++++++---- + 3 files changed, 21 insertions(+), 6 deletions(-) + +commit 5b16de97bcc4b24da4c77ca6c1a42e814d8cdbd1 +Author: Behdad Esfahbod +Date: Fri May 11 19:55:42 2012 +0200 + + [Indic] Add tests for dottedcircle + + .../in-tree/shaper-indic/indic/script-devanagari/misc/MANIFEST | 1 + + .../shaper-indic/indic/script-devanagari/misc/dottedcircle.txt | + 7 +++++++ + 2 files changed, 8 insertions(+) + +commit 0831061efb78983b9c6e1e72574c977e56383c08 +Author: Behdad Esfahbod +Date: Fri May 11 19:07:58 2012 +0200 + + [Indic] Refactoring + + src/hb-ot-shape-complex-indic.cc | 26 ++++++++++++++++++-------- + 1 file changed, 18 insertions(+), 8 deletions(-) + +commit 7ea58db311bfb0d8f804d1e9f4a1f004bd45075a +Author: Behdad Esfahbod +Date: Fri May 11 18:58:57 2012 +0200 + + Minor + + src/hb-ot-shape-complex-indic.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 9c09928989316e2befe00d52ed66e055637ccd36 +Author: Behdad Esfahbod +Date: Fri May 11 18:46:35 2012 +0200 + + [Indic] Allow multiple Consonants in Vowel/NBSP syllables + + Uniscribe allows multiple Halant+Consonant after a Vowel. + Tests: + ↦ * U+0905,U+094D,U+092B,U+094D,930,94d,930 + + src/hb-ot-shape-complex-indic-machine.rl | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 8c0aa486f31e9b6cbb31ce295573b53b0a214124 +Author: Behdad Esfahbod +Date: Fri May 11 18:13:42 2012 +0200 + + [Indic] Allow two Nuktas per consonant + + Uniscribe allows up to two nuktas per consonant and one per matra. It + does so + indepent of whether the consonant already has a nukta in it. Tests: + + * U+0916,U+093C,U+0941 + * U+0959,U+093C,U+0941 + * U+0916,U+093C,U+093C,U+0941 + * U+0959,U+093C,U+093C,U+0941 + * U+0916,U+093C,U+093C,U+093C,U+0941 + * U+0959,U+093C,U+093C,U+093C,U+0941 + * 915,93c,93c,,94d,U+0916,U+093C,U+093C,U+093e,93c,93c + + src/hb-ot-shape-complex-indic-machine.rl | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 3399a06e7033651ee926448737bdb18e553c1796 +Author: Behdad Esfahbod +Date: Fri May 11 17:54:26 2012 +0200 + + [Indic] Fix U+0952 and similar classification to match Uniscribe + + See comments. + + src/hb-ot-shape-complex-indic-machine.rl | 1 + + src/hb-ot-shape-complex-indic.cc | 16 +++++++++++----- + 2 files changed, 12 insertions(+), 5 deletions(-) + +commit 11aa3ef18dbc6ac9561bd119f5ca2c1aa1209c3a +Author: Behdad Esfahbod +Date: Fri May 11 17:30:48 2012 +0200 + + [Indic] Treat U+0951..U+0954 all similar to U+0952 + + src/hb-ot-shape-complex-indic.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 5f131d3226131df440d7f36655e57f6effcae204 +Author: Behdad Esfahbod +Date: Fri May 11 17:29:40 2012 +0200 + + [GSUB/GPOS/Indic] Apply GSUB/GPOS within syllables only + + This does not apply to the context matchings. + + This regresses tests right now. And we are not sure whether this is + the right thing to do for GPOS. But we'll figure out. + + src/hb-ot-layout-gsubgpos-private.hh | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +commit 8fd83aaf6e50c2c25002c51fee26d82847a61769 +Author: Behdad Esfahbod +Date: Fri May 11 17:18:37 2012 +0200 + + [GSUB/GPOS] Fix wrong buffer access in backward skippy mask matching + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ff24d1081af08a887895975285d7e38f5d07bc37 +Author: Behdad Esfahbod +Date: Fri May 11 17:07:08 2012 +0200 + + [Indic] Don't use syllable serial value 0 + + src/hb-ot-shape-complex-indic-machine.rl | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 892eb7878238d810a2a70f9dadbf958207bfeaa1 +Author: Behdad Esfahbod +Date: Fri May 11 16:54:40 2012 +0200 + + [Indic] Implement Uniscribe Reph+Matra+Halant bug feature + + src/hb-ot-shape-complex-indic.cc | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +commit 67ea29af49bb08ee679914076808327992cf6676 +Author: Behdad Esfahbod +Date: Fri May 11 16:51:23 2012 +0200 + + [Indic] Add example of different Uniscribe behavior + + src/hb-ot-shape-complex-indic.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit ebe29733d44fe0fa9fb30f946ab0dd7a40336a24 +Author: Behdad Esfahbod +Date: Fri May 11 16:43:12 2012 +0200 + + [Indic] Add runtime Uniscribe bug compatibility mode! + + Enable by setting envvar: + + HB_OT_INDIC_OPTIONS=uniscribe-bug-compatible + + Plus, LeftMatra+Halant "feature". + + src/hb-ot-shape-complex-indic.cc | 44 + ++++++++++++++++++++++++++++++---------- + 1 file changed, 33 insertions(+), 11 deletions(-) + +commit 616e692e2950d326b6c46aba5b5bead3cc29d315 +Author: Behdad Esfahbod +Date: Fri May 11 16:25:02 2012 +0200 + + [Indic] Add #define UNISCRIBE_BUG_COMPATIBLE 1 + + src/hb-ot-shape-complex-indic.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 6782bdae3be0357da1dadc7b806a43ceefa67a90 +Author: Behdad Esfahbod +Date: Fri May 11 16:23:43 2012 +0200 + + [Indic] Fix Left Matra + Halant reordering + + As can be seen in: U+092B,U+093F,U+094D + + src/hb-ot-shape-complex-indic.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 3c2ea9481b1028e927e615a5434ebf8edcb5f891 +Author: Behdad Esfahbod +Date: Fri May 11 16:23:38 2012 +0200 + + Minor + + src/hb-ot-shape-complex-indic.cc | 73 + ++++++++++++++++++++-------------------- + 1 file changed, 37 insertions(+), 36 deletions(-) + +commit c071b99f150a9344a2056dfeba8c613f8a5602db +Author: Behdad Esfahbod +Date: Fri May 11 16:22:46 2012 +0200 + + [Indic] Add test for Left Matra with Halant + + Uniscribe doesn't move the Halant, we do. And do a broken job of + it now. + + .../shaper-indic/indic/script-devanagari/misc/tricky-reordering.txt + | 1 + + 1 file changed, 1 insertion(+) + +commit 203d71069c45048b6dd8fa22b61fd8f2c844b4f6 +Author: Behdad Esfahbod +Date: Fri May 11 16:01:44 2012 +0200 + + [GSUB/GPOS] Check all glyph masks when matching input + + src/hb-ot-layout-gsubgpos-private.hh | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +commit 668c6046c1b3af3bd316bda0cc8636f2a5e8df42 +Author: Behdad Esfahbod +Date: Fri May 11 15:34:13 2012 +0200 + + [Indic] Apply Reph mask to all POS_REPH glyphs + + Needed for upcoming changes to GSUB/GPOS mask matching. + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4be46bade26faf13f7b4d447e9cc608e183955dc +Author: Behdad Esfahbod +Date: Fri May 11 14:39:01 2012 +0200 + + [Indic] Fix state machine to backtrack + + src/hb-ot-shape-complex-indic-machine.rl | 42 + +++++++++++++++----------------- + src/hb-private.hh | 2 ++ + 2 files changed, 21 insertions(+), 23 deletions(-) + +commit cee7187447b76b22e1bb6136d137b35ac49c3a5d +Author: Behdad Esfahbod +Date: Fri May 11 11:41:39 2012 +0200 + + [Indic] Move syllable tracking from Indic to generic layer + + This is to incorporate it into GSUB/GPOS processing. + + src/hb-ot-layout-gpos-table.hh | 1 + + src/hb-ot-layout-gsub-table.hh | 3 ++- + src/hb-ot-layout-gsubgpos-private.hh | 3 --- + src/hb-ot-layout-private.hh | 4 +--- + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + src/hb-ot-shape-complex-indic-private.hh | 1 - + src/hb-ot-shape-complex-indic.cc | 8 +++----- + src/hb-ot-shape-complex-private.hh | 13 ++++++++----- + 8 files changed, 16 insertions(+), 19 deletions(-) + +commit 3bf27a9f0e92aa31b464bd3b9fdea5933c9ae8b1 +Author: Behdad Esfahbod +Date: Fri May 11 11:17:23 2012 +0200 + + [Indic] Disable conjuncts when a ZWJ happens + + Not that the code makes any difference since the presence of ZWJ + itself + causes the ligature to fail to match anyway. + + src/hb-ot-shape-complex-indic.cc | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +commit c6d904d67db589dd6209928e56504f04f6a07756 +Author: Behdad Esfahbod +Date: Fri May 11 11:07:40 2012 +0200 + + [Indic] Fix bitops typo! + + Another 1000 down! + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 55fe2cf79b11d9a63ea33b3ee76bd0ebca345157 +Author: Behdad Esfahbod +Date: Fri May 11 03:45:28 2012 +0200 + + Make APPLY debug output print current index and codepoint + + Yay! + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7bd2b04fea5649d77d796d58b7f4918fe0378ee5 +Author: Behdad Esfahbod +Date: Fri May 11 03:40:58 2012 +0200 + + Minor + + src/hb-object-private.hh | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit cf26510dbbd8d38486e6ba423800db6427ade332 +Author: Behdad Esfahbod +Date: Fri May 11 03:35:08 2012 +0200 + + Some more... + + Done. I promise. + + src/hb-object-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 9659523ca32b0e254d0e5fe387d817208d9cb6bf +Author: Behdad Esfahbod +Date: Fri May 11 03:33:36 2012 +0200 + + More beauty in debug output! + + src/hb-private.hh | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit cf26e88a5ab477295479f5b9450c2019b6430eaa +Author: Behdad Esfahbod +Date: Fri May 11 03:16:57 2012 +0200 + + Finish off debug output beautification + + src/hb-open-type-private.hh | 58 + ++++++++++++++++++++------------------------- + 1 file changed, 26 insertions(+), 32 deletions(-) + +commit d7bba01a353efc7432c474dd8755a02db4abd2ae +Author: Behdad Esfahbod +Date: Fri May 11 02:46:26 2012 +0200 + + Only print class name in debug output if there's one available + + src/hb-private.hh | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit 85f73fa8da1fbb864aef0f3a592b1d65e24d593d +Author: Behdad Esfahbod +Date: Fri May 11 02:40:42 2012 +0200 + + Only printout class name in tracing, if one is available + + Makes debug output much more pleasant. + + src/hb-private.hh | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 98619ce4fa650c593b030d06d2f89fec83a10015 +Author: Behdad Esfahbod +Date: Fri May 11 02:34:06 2012 +0200 + + Minor + + src/hb-ot-layout-gsubgpos-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit acea183e986dd378c6f95120fe0feb0586a8ef36 +Author: Behdad Esfahbod +Date: Fri May 11 02:33:11 2012 +0200 + + Add return annotation for APPLY + + src/hb-ot-layout-gpos-table.hh | 163 + +++++++++++++++-------------------- + src/hb-ot-layout-gsub-table.hh | 114 +++++++++++------------- + src/hb-ot-layout-gsubgpos-private.hh | 83 ++++++++---------- + 3 files changed, 151 insertions(+), 209 deletions(-) + +commit 5ccfe8e2154ad0b58dabcc236bbe9478c17b02ab +Author: Behdad Esfahbod +Date: Fri May 11 02:19:41 2012 +0200 + + /Minor/ + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0ab8c8621712d33e1e91dfdb4ad0b335e3d2a3fb +Author: Behdad Esfahbod +Date: Fri May 11 01:25:34 2012 +0200 + + Annotate SANITIZE return values + + More to come, for APPLY, CLOSURE, etc. + + src/hb-open-file-private.hh | 23 ++--- + src/hb-open-type-private.hh | 49 +++++----- + src/hb-ot-head-table.hh | 4 +- + src/hb-ot-hhea-table.hh | 4 +- + src/hb-ot-hmtx-table.hh | 4 +- + src/hb-ot-layout-common-private.hh | 51 +++++----- + src/hb-ot-layout-gdef-table.hh | 48 +++++----- + src/hb-ot-layout-gpos-table.hh | 180 + ++++++++++++++++------------------- + src/hb-ot-layout-gsub-table.hh | 101 +++++++++----------- + src/hb-ot-layout-gsubgpos-private.hh | 88 ++++++++--------- + src/hb-ot-maxp-table.hh | 7 +- + src/hb-ot-name-table.hh | 17 ++-- + src/hb-private.hh | 39 ++++++-- + 13 files changed, 299 insertions(+), 316 deletions(-) + +commit 829e814ff358c5e700ba4df54932696801aa9f65 +Author: Behdad Esfahbod +Date: Fri May 11 00:52:16 2012 +0200 + + Minor + + src/hb-private.hh | 32 ++++++++++---------------------- + 1 file changed, 10 insertions(+), 22 deletions(-) + +commit 6eec6f406d2cc13dbca422e88492d3d498af02bf +Author: Behdad Esfahbod +Date: Fri May 11 00:50:38 2012 +0200 + + Code reshuffling + + src/hb-private.hh | 36 +++++++++++++++++++++++++----------- + 1 file changed, 25 insertions(+), 11 deletions(-) + +commit 1e08830b4fac3a60ae52349cab6e101d389d30cd +Author: Behdad Esfahbod +Date: Fri May 11 00:16:40 2012 +0200 + + Beautify debug output + + src/hb-open-type-private.hh | 20 ++++++------ + src/hb-private.hh | 74 + +++++++++++++++++++++++++++------------------ + 2 files changed, 55 insertions(+), 39 deletions(-) + +commit 6f4553801729a06e506ffdde7b27c72780d4bb80 +Author: Behdad Esfahbod +Date: Thu May 10 23:24:43 2012 +0200 + + More massaging trace messaging + + src/hb-open-type-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + src/hb-private.hh | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +commit b5fa37cb694b01a7df3a656710391c40dd3fcc04 +Author: Behdad Esfahbod +Date: Thu May 10 23:09:48 2012 +0200 + + Minor + + src/hb-set-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 208109703c929428c684ddcf9310b8ba780c4c31 +Author: Behdad Esfahbod +Date: Thu May 10 23:06:58 2012 +0200 + + Better trace message support infrastructure + + We have varargs in the trace interface now. To be used soon... + + src/hb-open-type-private.hh | 17 ++++------ + src/hb-ot-layout-gsubgpos-private.hh | 4 +-- + src/hb-private.hh | 64 + ++++++++++++++++++++++++++---------- + 3 files changed, 56 insertions(+), 29 deletions(-) + +commit 02b2922fbf098c8282eb23dc2c54d5829cf67024 +Author: Behdad Esfahbod +Date: Thu May 10 21:44:50 2012 +0200 + + [Indic] Towards better Reph positioning + + Fixed for Deva cases with two full-form consonants. Failures **way** + down. + Not much left to go :-). + + src/hb-ot-shape-complex-indic.cc | 111 + ++++++++++++++++++++++++++++----------- + 1 file changed, 80 insertions(+), 31 deletions(-) + +commit 74e54cf446bb979e488685e8c09eeed6b9d03c24 +Author: Behdad Esfahbod +Date: Thu May 10 21:20:37 2012 +0200 + + [Indic] Add Ra back for scripts without Reph + + We now check that the 'rphp' table exists before forming Reph, so + we don't need to comment out Ra for those scripts. + + src/hb-ot-shape-complex-indic-private.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 2b70df5cc008617453b12bafeaac50e6d61b3224 +Author: Behdad Esfahbod +Date: Thu May 10 18:38:22 2012 +0200 + + [Indic] Add note re Uniscribe clusters + + src/hb-ot-shape-complex-indic.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 21d2803133c2c424ed37a9f3d17c7fc4963e5a60 +Author: Behdad Esfahbod +Date: Thu May 10 18:34:34 2012 +0200 + + [Indic] Do clustering like Uniscribe does + + Hindi Wikipedia failures down to 6639 (0.938381%)! + + src/hb-ot-shape-complex-indic.cc | 24 ++++++++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) + +commit b20c9ebaf5176101fdfcffbe4714a2e619dd94b6 +Author: Behdad Esfahbod +Date: Thu May 10 18:31:17 2012 +0200 + + [Indic] Add test for matra group + + The spec says: "[{M}+[N]+[H]]", and that's what Uniscribe implements. + We instead do: "{M+[N]+[H]}", which means we allow Nukta and Halant + after all Matras, not just the last one. It makes more sense. + + .../texts/in-tree/shaper-indic/indic/script-devanagari/misc/MANIFEST + | 1 + + .../shaper-indic/indic/script-devanagari/misc/spec-deviations.txt + | 1 + + 2 files changed, 2 insertions(+) + +commit 8df5636968389ac7bf8620ccd091fd4872b0bbee +Author: Behdad Esfahbod +Date: Thu May 10 15:41:04 2012 +0200 + + [Indic] Reorder Reph to before the Halant after Matras + + Uniscribe doesn't do it, but we want to do as it gives the Reph the + opportunity to interact with the Matras. Test with mangal for + example. + Sequence: <0930,094d,0915,094b,094d> + In test suite already. + + src/hb-ot-shape-complex-indic.cc | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit daf3234bdc82c669302599a76d2b14f5e69989db +Author: Behdad Esfahbod +Date: Thu May 10 15:28:27 2012 +0200 + + [Indic] Don't clear the mask for Reph + + This was removing the mandatory global 1 bit in the mask and hence + disabling GPOS for Reph! + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7708ee23cbcc8c8edce13e73b6e549b77bd8c2d0 +Author: Behdad Esfahbod +Date: Thu May 10 14:48:25 2012 +0200 + + [Indic] Improve Left Matra repositioning + + Move its dependents too. + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 61a58e26a5bda16851669404fc8206896e124740 +Author: Behdad Esfahbod +Date: Thu May 10 14:43:53 2012 +0200 + + [Indic] Add tricky reordering test cases + + In the case of Consonant,LeftMatra,Halant, Uniscribe leaves the Halant + where it is, but we want to move it with the Matra as that makes more + logical sense. + + .../texts/in-tree/shaper-indic/indic/script-devanagari/misc/MANIFEST | + 1 + + .../shaper-indic/indic/script-devanagari/misc/tricky-reordering.txt | + 4 ++++ + 2 files changed, 5 insertions(+) + +commit dbb105883c6e9b83e78dc8b10766cd56b98cd7e1 +Author: Behdad Esfahbod +Date: Thu May 10 13:45:52 2012 +0200 + + [Indic] Do Reph repositioning in final reordering like the spec says + + This introduced a failure, which we tracked down to a test case + like this: + + U+092E,U+094B,U+094D,U+0930 + + The final character is a Ra that should be put in a syllable of it's + own. And we do. But it will interact with the Halant before it. So + now we finally are convinced that we have to limit features to + syllable + boundaries. That's coming after lunch! + + src/hb-ot-shape-complex-indic-private.hh | 2 - + src/hb-ot-shape-complex-indic.cc | 103 + +++++++++++++++++++------------ + 2 files changed, 64 insertions(+), 41 deletions(-) + +commit 4705a7026900e51f6430f03a73c87f2df035df92 +Author: Behdad Esfahbod +Date: Thu May 10 13:09:08 2012 +0200 + + Minor + + src/hb-ot-shape-complex-indic.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 4ac9e98d9d2ea973dd612dc4063cf78496c643a0 +Author: Behdad Esfahbod +Date: Thu May 10 12:53:53 2012 +0200 + + [Indic] Reorder left matras to be closer to base + + src/hb-ot-shape-complex-indic-private.hh | 4 --- + src/hb-ot-shape-complex-indic.cc | 50 + +++++++++++++++++++++++++++++--- + 2 files changed, 46 insertions(+), 8 deletions(-) + +commit 1a1fa8c655a082fc1439608457ba717306cc83ca +Author: Behdad Esfahbod +Date: Thu May 10 12:20:21 2012 +0200 + + [Indic] Treat the standalone cluster case reusing the consonant logic + + src/hb-ot-shape-complex-indic.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 190eb31a16178269aecaf5d2ecc9012f956749f4 +Author: Behdad Esfahbod +Date: Thu May 10 12:17:16 2012 +0200 + + [Indic] Minor + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c5306b6861cfaa50af40e8ceb058791fa06d7981 +Author: Behdad Esfahbod +Date: Thu May 10 12:07:33 2012 +0200 + + [Indic] Handle Vowel syllables + + Reusing the consonant logic! + + src/hb-ot-shape-complex-indic-private.hh | 3 +-- + src/hb-ot-shape-complex-indic.cc | 11 ++++++----- + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit 6d8e0cb74c02f6bc09cd4abe9e4bc82062e1b517 +Author: Behdad Esfahbod +Date: Thu May 10 11:41:51 2012 +0200 + + [Indic] Simplify Reph logic + + src/hb-ot-shape-complex-indic.cc | 24 +++++------------------- + 1 file changed, 5 insertions(+), 19 deletions(-) + +commit 3d25079f8d6be81b9b4b91d3a97016b8a572f571 +Author: Behdad Esfahbod +Date: Thu May 10 11:37:42 2012 +0200 + + [Indic] Don't form Reph is Ra is the only consonant in the syllable + + src/hb-ot-shape-complex-indic-private.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 10 ++++++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit b99d63ae114fb58f129562b293a8a66543d499ad +Author: Behdad Esfahbod +Date: Thu May 10 11:32:52 2012 +0200 + + [Indic] Increase max syllable length + + 20 was way too low, one could hit a syllable with 7ish consonants + with it. + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a391ff50b9a7b6ac3e58d199ea726b20ee6839bb +Author: Behdad Esfahbod +Date: Thu May 10 11:31:20 2012 +0200 + + [Indic] Adjust base after sorting + + src/hb-ot-shape-complex-indic.cc | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +commit d3637edb248162970e202e9d0671540274192844 +Author: Behdad Esfahbod +Date: Thu May 10 10:51:38 2012 +0200 + + [Indic] Don't return for long syllables. Just not sort. + + src/hb-ot-shape-complex-indic.cc | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit dfa0cade7fce3791e47eaa7edcd23da76c7a0ed0 +Author: Behdad Esfahbod +Date: Wed May 9 19:10:07 2012 +0200 + + Fix Uniscribe clusters with multiple items + + src/hb-uniscribe.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 86e5dd386a7989701da476db89be268e4ac1e219 +Author: Behdad Esfahbod +Date: Wed May 9 18:57:37 2012 +0200 + + [Indic] Don't give up syllable parsing upon junk + + src/hb-ot-shape-complex-indic-machine.rl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ef24cc8c8e2478a6352c340f4611a617646de4cc +Author: Behdad Esfahbod +Date: Wed May 9 17:56:03 2012 +0200 + + [Indic] Towards multi-cluster syllables and final reordering + + src/hb-ot-shape-complex-arabic.cc | 2 +- + src/hb-ot-shape-complex-indic-machine.rl | 21 ++++++++++----- + src/hb-ot-shape-complex-indic-private.hh | 1 + + src/hb-ot-shape-complex-indic.cc | 45 + +++++++++++++++++++++++--------- + src/hb-ot-shape-complex-private.hh | 5 ++-- + 5 files changed, 51 insertions(+), 23 deletions(-) + +commit a9844d41c6cb30d8a2d733130a0e72f51b6c81c1 +Author: Behdad Esfahbod +Date: Wed May 9 17:53:13 2012 +0200 + + Combine lig_id and lig_comp into one byte, to free up one for Indic + + src/hb-ot-layout-gpos-table.hh | 14 ++++++++------ + src/hb-ot-layout-gsub-table.hh | 11 ++++------- + src/hb-ot-layout-gsubgpos-private.hh | 26 ++++++++++++++++++++++---- + 3 files changed, 34 insertions(+), 17 deletions(-) + +commit 92332e5116271a5d96e532005fe750e7552a6cbb +Author: Behdad Esfahbod +Date: Wed May 9 17:40:00 2012 +0200 + + Minor + + src/hb-ot-shape-complex-indic.cc | 41 + ++++++++++++++++++++-------------------- + 1 file changed, 21 insertions(+), 20 deletions(-) + +commit dbccf87eef0d26838fa4bb3ae26410f6c4818836 +Author: Behdad Esfahbod +Date: Wed May 9 17:24:39 2012 +0200 + + [Indic] Make room for more reordering positions + + src/hb-ot-shape-complex-indic-private.hh | 213 + ++++++++++++++++--------------- + src/hb-ot-shape-complex-indic.cc | 12 +- + 2 files changed, 115 insertions(+), 110 deletions(-) + +commit d4480ace7fdbe48aeaf77278c032b8b2ef2ebe8e +Author: Behdad Esfahbod +Date: Wed May 9 15:56:35 2012 +0200 + + [Indic] Improve matra vs consonant ordering + + Another 1.5% down. + + src/hb-ot-shape-complex-indic-private.hh | 32 + ++++++++++++++++++++------------ + src/hb-ot-shape-complex-indic.cc | 6 +++--- + src/indic.cc | 2 +- + 3 files changed, 24 insertions(+), 16 deletions(-) + +commit 33c92e769563ec2a6c1249b57d8cac742eea6f88 +Author: Behdad Esfahbod +Date: Wed May 9 15:41:51 2012 +0200 + + [Indic] Categorize Anudatta + + src/hb-ot-shape-complex-indic.cc | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit 3943293a9942201d8fc8d59212fcc8cca5132e3d +Author: Behdad Esfahbod +Date: Wed May 9 15:27:56 2012 +0200 + + [Indic] Add joiner test cases for Devanagari + + .../indic/script-devanagari/misc/MANIFEST | 1 + + .../indic/script-devanagari/misc/joiners.txt | 19 + +++++++++++++++++++ + 2 files changed, 20 insertions(+) + +commit 19d984edaa4f86c842345a9d4150597e045e1887 +Author: Behdad Esfahbod +Date: Wed May 9 15:21:13 2012 +0200 + + [Indic] Make sure Reph jumps over all matras to the right + + Another 12 thousand failures gone! (78 to go) + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9034641333d7bfb41a0784cce72e43591faea083 +Author: Behdad Esfahbod +Date: Wed May 9 15:04:58 2012 +0200 + + [Indic] Keep Vedic signs at the right too + + src/hb-ot-shape-complex-indic.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit d1deaa2f5bd028e8076265cba92cffa4fa2834ac +Author: Behdad Esfahbod +Date: Wed May 9 15:04:13 2012 +0200 + + Replace zerowidth invisible chars with a zero-advance space glyph + + Like Uniscribe does. + + src/hb-ot-shape-complex-arabic.cc | 3 ++- + src/hb-ot-shape-complex-indic.cc | 20 ------------------- + src/hb-ot-shape-complex-private.hh | 4 ++-- + src/hb-ot-shape-normalize.cc | 25 +++++++++-------------- + src/hb-ot-shape-private.hh | 27 +++++++++++++++++++++++++ + src/hb-ot-shape.cc | 41 + +++++++++++++++++++++++++------------- + src/hb-unicode-private.hh | 38 + +++++++++++++++++++++++++++++++++++ + 7 files changed, 105 insertions(+), 53 deletions(-) + +commit 49e5da1591b8d28f01e7ff9caac9d9ac53668bba +Author: Behdad Esfahbod +Date: Wed May 9 13:23:27 2012 +0200 + + [indic] Keep the syllable modifier marks to the right + + Shaping failures on Hindi Wikipedia go down from 25% to 14%! + + src/hb-ot-shape-complex-indic.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 5b1260909350bffa3e3d06da346f9f86ce651dbb +Author: Behdad Esfahbod +Date: Wed May 9 12:37:27 2012 +0200 + + Minor + + src/hb-ot-shape-complex-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9ce939232bbce8f51e235195e3854d1e8bb961f8 +Author: Behdad Esfahbod +Date: Wed May 9 12:03:09 2012 +0200 + + Minor + + src/hb-ot-shape-complex-indic-private.hh | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 76b3409de6887c1cdd5c679939497b1b56f4554b +Author: Behdad Esfahbod +Date: Wed May 9 11:43:43 2012 +0200 + + [indic] Better Reph matching + + src/hb-ot-shape-complex-indic.cc | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) + +commit df6d45c693c417bf311e6fa49f18a8558542e525 +Author: Behdad Esfahbod +Date: Wed May 9 11:38:31 2012 +0200 + + Minor + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 412b91889d9a1ae477e8b6907d0b9a76e78a6c91 +Author: Behdad Esfahbod +Date: Wed May 9 11:07:18 2012 +0200 + + [indic] Apply Indic features in order + + src/hb-ot-shape-complex-indic.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 1ac075b227090a9ad930dcc1670236c176b27067 +Author: Behdad Esfahbod +Date: Wed May 9 11:06:47 2012 +0200 + + [indic] Apply rakaar forms + + Fixes 10% of the failures against all of Hindi Wikipedia! + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2214a03900d32710573a1b05c7665195b3129761 +Author: Behdad Esfahbod +Date: Wed May 9 09:54:54 2012 +0200 + + Add hb-diff-ngrams + + test/shaping/Makefile.am | 1 + + test/shaping/hb-diff-ngrams | 5 +++ + test/shaping/hb_test_tools.py | 71 + ++++++++++++++++++++++++++++++++++++++++--- + 3 files changed, 72 insertions(+), 5 deletions(-) + +commit 178e6dce01ad28c8708bad62ce0fb79c46e836dc +Author: Behdad Esfahbod +Date: Wed May 9 08:57:29 2012 +0200 + + Add N-gram generator + + test/shaping/hb_test_tools.py | 72 + +++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 70 insertions(+), 2 deletions(-) + +commit 98669ceb77657d60435f2cb2e3fc18272c0a2c6a +Author: Behdad Esfahbod +Date: Wed May 9 08:16:15 2012 +0200 + + Use groupby() + + test/shaping/hb_test_tools.py | 26 ++++++++------------------ + 1 file changed, 8 insertions(+), 18 deletions(-) + +commit c438a14b62433db488b5c90854a4a3934adf3305 +Author: Behdad Esfahbod +Date: Wed May 9 07:45:17 2012 +0200 + + Add hb-diff-stat + + test/shaping/Makefile.am | 1 + + test/shaping/hb-diff-stat | 5 +++++ + test/shaping/hb_test_tools.py | 22 ++++++++++++++++++++-- + 3 files changed, 26 insertions(+), 2 deletions(-) + +commit 1058d031e2046eb80331b0950eaff75c2bf608dc +Author: Behdad Esfahbod +Date: Wed May 9 07:30:07 2012 +0200 + + Make hb-diff-filter-failtures retain all test info for failed tests + + test/shaping/hb_test_tools.py | 33 ++++++++++++++++++++++++++------- + 1 file changed, 26 insertions(+), 7 deletions(-) + +commit f1eb008cc727370e1bd0dc32fdf301f62d9ff981 +Author: Behdad Esfahbod +Date: Tue May 8 23:41:41 2012 +0200 + + Add hb-diff-colorize + + Accepts --format=html now. + + test/shaping/Makefile.am | 1 + + test/shaping/hb-diff | 4 +- + test/shaping/hb-diff-colorize | 7 ++ + test/shaping/hb_test_tools.py | 158 + +++++++++++++++++++++++++----------------- + 4 files changed, 106 insertions(+), 64 deletions(-) + +commit 9155e4ffe00c96a2c14e14a300004b1038ca3a9c +Author: Behdad Esfahbod +Date: Tue May 8 22:44:21 2012 +0200 + + Cleanup diff + + Doesn't do --color anymore. That will go into a new hb-diff-colorize + tool. + + test/shaping/hb-diff | 10 +++------- + test/shaping/hb_test_tools.py | 32 ++++++++++++++++++-------------- + 2 files changed, 21 insertions(+), 21 deletions(-) + +commit 7d22135b4c3f8fb70552302bf8239df9976dddda +Author: Behdad Esfahbod +Date: Tue May 8 19:38:49 2012 +0200 + + Make hb-diff faster + + test/shaping/hb_test_tools.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit a93e238e05a2f70a6e664e5d04ba25bbd54493dc +Author: Behdad Esfahbod +Date: Tue May 8 18:55:29 2012 +0200 + + More tests + + .../texts/in-tree/shaper-arabic/script-mongolian/misc/MANIFEST | 1 + + .../texts/in-tree/shaper-arabic/script-mongolian/misc/poem.txt | 4 ++++ + .../in-tree/shaper-indic/indic/script-bengali/misc/MANIFEST | 1 + + .../in-tree/shaper-indic/indic/script-bengali/misc/reph.txt | + 10 ++++++++++ + 4 files changed, 16 insertions(+) + +commit 1a2a4a0078dda834443edd421037a4bcbad18c5e +Author: Behdad Esfahbod +Date: Sat May 5 22:38:20 2012 +0200 + + Fix warning and build issues + + As reported by Jonathan Kew on the list. + + src/hb-set-private.hh | 2 +- + src/main.cc | 9 +++++---- + 2 files changed, 6 insertions(+), 5 deletions(-) + +commit a5e39fed85e069ba1afbf90408349ad99ceb0e1d +Author: Behdad Esfahbod +Date: Wed Apr 25 00:14:46 2012 -0400 + + Minor + + src/hb-set-private.hh | 2 ++ + src/hb-set.cc | 2 ++ + 2 files changed, 4 insertions(+) + +commit 1827dc208c867e433a95237d1ed3fc7a73d1d9a7 +Author: Behdad Esfahbod +Date: Tue Apr 24 16:56:37 2012 -0400 + + Add hb_ot_shape_glyphs_closure() + + Experimental API for now. + + src/hb-ot-map-private.hh | 7 ++++--- + src/hb-ot-shape.cc | 35 +++++++++++++++++++++++++++++++++++ + src/hb-ot.h | 8 ++++++++ + src/hb-set-private.hh | 3 +++ + 4 files changed, 50 insertions(+), 3 deletions(-) + +commit bb09f0ec10216b11189b5e8584856adf0f14d1fc +Author: Behdad Esfahbod +Date: Tue Apr 24 16:02:12 2012 -0400 + + Minor + + src/hb-unicode.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit 29a7e306e30e894f7a38daf73eca9fc772c58158 +Author: Behdad Esfahbod +Date: Tue Apr 24 16:01:30 2012 -0400 + + Minor + + src/hb-ot-shape-normalize.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 585b107cdee7305920dacc83c9ee1f8eeff7afd1 +Author: Behdad Esfahbod +Date: Tue Apr 24 16:00:50 2012 -0400 + + Add test caes for a minority language using Bengali + + U+0985 BENGALI LETTER A followed by U+09D7 BENGALI AU LENGTH MARK. + According to Bobby de Vos on the mailing list, this results in + a dotted + circle with most shaping engines, but is a legitimate sequence in this + minority language. + + We reached the consensus on the list to NOT implement dotted-circle + in HarfBuzz. + + .../texts/in-tree/shaper-indic/indic/script-bengali/misc/misc.txt + | 1 + + 1 file changed, 1 insertion(+) + +commit 6c6ccaf575392f6e6bb9a15534026e4ea462705b +Author: Behdad Esfahbod +Date: Tue Apr 24 14:21:15 2012 -0400 + + Add a few more set operations + + TODO: Tests for hb_set_t. + + src/hb-set-private.hh | 54 + +++++++++++++++++++++++++++++++++++++++++++++++++- + src/hb-set.cc | 55 + +++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-set.h | 34 ++++++++++++++++++++++++++++--- + 3 files changed, 139 insertions(+), 4 deletions(-) + +commit 5caece67ab9eee322bdcdf6f4b607eadde297e56 +Author: Behdad Esfahbod +Date: Mon Apr 23 23:03:12 2012 -0400 + + Make closure() return void + + src/hb-ot-layout-gsub-table.hh | 142 +++++++++++++----------------- + src/hb-ot-layout-gsubgpos-private.hh | 165 + ++++++++++++++++++----------------- + src/hb-ot-layout.cc | 10 +-- + src/hb-ot-layout.h | 8 +- + src/hb-set-private.hh | 20 ++--- + 5 files changed, 157 insertions(+), 188 deletions(-) + +commit 0b08adb3539f2ec29682456b89c69e89ff5e9c03 +Author: Behdad Esfahbod +Date: Mon Apr 23 22:41:09 2012 -0400 + + Add hb_set_t + + TODO | 2 + + src/Makefile.am | 3 + + src/hb-ot-layout-common-private.hh | 1 + + src/hb-ot-layout-private.hh | 47 --------------- + src/hb-ot-layout.h | 2 - + src/hb-set-private.hh | 95 +++++++++++++++++++++++++++++ + src/hb-set.cc | 120 + +++++++++++++++++++++++++++++++++++++ + src/hb-set.h | 91 ++++++++++++++++++++++++++++ + src/hb.h | 1 + + 9 files changed, 313 insertions(+), 49 deletions(-) + +commit 5b93e8d94fb4c2474816304ae3f52e1c704882de +Author: Behdad Esfahbod +Date: Mon Apr 23 22:26:13 2012 -0400 + + Update copyright headers + + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit 6a9be5bd3524dc3eb1e88d1063bde2e4d8b57011 +Author: Behdad Esfahbod +Date: Mon Apr 23 22:23:17 2012 -0400 + + Rename hb_glyph_map_t to hb_set_t + + src/hb-ot-layout-common-private.hh | 16 ++++++++-------- + src/hb-ot-layout-gsubgpos-private.hh | 12 ++++++------ + src/hb-ot-layout-private.hh | 2 +- + src/hb-ot-layout.cc | 2 +- + src/hb-ot-layout.h | 4 ++-- + src/hb-ot-map-private.hh | 2 +- + src/hb-ot-map.cc | 2 +- + 7 files changed, 20 insertions(+), 20 deletions(-) + +commit a4385f0b0a6949e2ce49e6a147ad4beaa724f6c3 +Author: Behdad Esfahbod +Date: Mon Apr 23 22:20:14 2012 -0400 + + Improve clustering + + src/hb-ot-shape.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 8e3715f8a16b315c1c7dd4b256e7f68a36c53e7c +Author: Behdad Esfahbod +Date: Mon Apr 23 22:18:54 2012 -0400 + + Minor + + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 2 +- + src/hb-graphite2.cc | 5 ++--- + src/hb-ot-shape-complex-arabic.cc | 4 ++-- + src/hb-ot-shape-complex-misc.cc | 4 ++-- + 5 files changed, 8 insertions(+), 9 deletions(-) + +commit d2984a241e4819474d827b1dd5d4b6d76596b3a5 +Author: Behdad Esfahbod +Date: Mon Apr 23 17:21:14 2012 -0400 + + Add map->substitute_closure() + + src/hb-ot-map-private.hh | 3 +++ + src/hb-ot-map.cc | 15 +++++++++++++++ + 2 files changed, 18 insertions(+) + +commit 31081f7390e5130df72f89acc609ccab5dc77a48 +Author: Behdad Esfahbod +Date: Mon Apr 23 16:54:58 2012 -0400 + + Implement closure() for Context and ChainContext lookups + + src/hb-ot-layout-common-private.hh | 54 ++++++ + src/hb-ot-layout-gsubgpos-private.hh | 347 + ++++++++++++++++++++++++++++------- + src/hb-ot-layout-private.hh | 23 ++- + 3 files changed, 351 insertions(+), 73 deletions(-) + +commit c64ddab3c34897cd520d4d73a054866e649e8793 +Author: Behdad Esfahbod +Date: Mon Apr 23 15:28:35 2012 -0400 + + Flesh out closure() for GSUB + + The GSUBGPOS part still missing. + + src/hb-ot-layout-common-private.hh | 61 ++++++++++++++------ + src/hb-ot-layout-gsub-table.hh | 112 + ++++++++++++++++++++++++++++--------- + src/hb-ot-layout-private.hh | 34 +++++++++++ + src/hb-ot-layout.h | 2 +- + 4 files changed, 165 insertions(+), 44 deletions(-) + +commit 0da132bde4d576a03095d6738507954f7f85103d +Author: Behdad Esfahbod +Date: Mon Apr 23 14:21:33 2012 -0400 + + Fix Coverage iters + + src/hb-ot-layout-common-private.hh | 30 +++++++++++++++++++++--------- + 1 file changed, 21 insertions(+), 9 deletions(-) + +commit 3e32cd9570fd8b09901fb790b80365ae425f681a +Author: Behdad Esfahbod +Date: Mon Apr 23 13:20:52 2012 -0400 + + Minor + + src/hb-ot-layout-gsubgpos-private.hh | 1 - + src/hb-ot-layout.cc | 6 +++--- + src/hb-ot-layout.h | 8 ++++++++ + src/hb-private.hh | 4 +++- + 4 files changed, 14 insertions(+), 5 deletions(-) + +commit 650ac00da3d2f988197393f34d40f0ba1a0fa093 +Author: Behdad Esfahbod +Date: Mon Apr 23 13:17:09 2012 -0400 + + Minor refactoring + + src/hb-ot-layout-gpos-table.hh | 27 +++++++++++-------------- + src/hb-ot-layout-gsub-table.hh | 39 + +++++++++++++++++------------------- + src/hb-ot-layout-gsubgpos-private.hh | 8 ++------ + src/hb-ot-layout.cc | 6 ++++-- + 4 files changed, 36 insertions(+), 44 deletions(-) + +commit f94b0aa64609654497ced9c00312c9643eb69053 +Author: Behdad Esfahbod +Date: Mon Apr 23 13:04:38 2012 -0400 + + Add "closure" operation stubs to GSUB + + Filling in. + + src/hb-ot-layout-gsub-table.hh | 179 + +++++++++++++++++++++++++++++++++++ + src/hb-ot-layout-gsubgpos-private.hh | 110 ++++++++++++++++++++- + src/hb-ot-layout.cc | 8 ++ + 3 files changed, 293 insertions(+), 4 deletions(-) + +commit 7d50d502635d7c95e6bd091e7d4cc993f0853f76 +Author: Behdad Esfahbod +Date: Mon Apr 23 13:02:14 2012 -0400 + + Add Coverage iterators + + src/hb-ot-layout-common-private.hh | 59 + ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 59 insertions(+) + +commit 3ed4634ec349fa9e943ad23718c04be4dd4bba62 +Author: Behdad Esfahbod +Date: Thu Apr 19 22:34:06 2012 -0400 + + Add Indic inspection tool + + src/Makefile.am | 7 +- + src/hb-ot-shape-complex-indic-private.hh | 264 + +++++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-indic.cc | 229 + +-------------------------- + src/indic.cc | 46 ++++++ + 4 files changed, 317 insertions(+), 229 deletions(-) + +commit a06411ecf93c7e5256e363eef3ef69554896dd55 +Author: Behdad Esfahbod +Date: Thu Apr 19 22:28:25 2012 -0400 + + Minor matra renumbering + + Should have no visible effect. + + src/hb-ot-shape-complex-indic.cc | 30 +++++++++++++++++------------- + 1 file changed, 17 insertions(+), 13 deletions(-) + +commit 36608941f3cc530fea57282fa175e4cc3b4c66c6 +Author: Behdad Esfahbod +Date: Thu Apr 19 22:21:38 2012 -0400 + + Add GSUB "would_apply" API + + To be used in the Indic shaper later. Unused for now. + + src/hb-ot-layout-gsub-table.hh | 140 + ++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 138 insertions(+), 2 deletions(-) + +commit a0d4caeb91fa5e5f2090db4efc35c64ff9a64789 +Author: Behdad Esfahbod +Date: Tue Apr 17 13:42:30 2012 -0400 + + Minor + + TODO | 3 +++ + 1 file changed, 3 insertions(+) + +commit a5e40542ab9508f0ba6f822f1262d93fccb71f45 +Author: Behdad Esfahbod +Date: Tue Apr 17 12:37:19 2012 -0400 + + Make font immutable in hb_shape() + + src/hb-shape.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 3cde23664fbbe9cd2ac1b8fd5eb2ea288309cc9c +Author: Behdad Esfahbod +Date: Tue Apr 17 11:44:49 2012 -0400 + + Minor note re Graphite + + src/hb-graphite2.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 4dc2449d92308f8dd366142831c0b85bd30ea5a9 +Author: Behdad Esfahbod +Date: Tue Apr 17 11:39:48 2012 -0400 + + Fix leak in graphite + + src/hb-graphite2.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 0290bbf8611aa881daed907f22256a431250c90a +Author: Behdad Esfahbod +Date: Tue Apr 17 10:28:21 2012 -0400 + + Add another Thai test + + test/shaping/texts/in-tree/shaper-thai/misc/misc.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 9ceca3aeb14cc096f5f87660cf7351bc35073084 +Author: Behdad Esfahbod +Date: Mon Apr 16 21:05:51 2012 -0400 + + Fix ragel regexp in vowel-based syllable + + As reported by datao zhang on the mailing list. + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b870afcd1b436614af95db6dc297e54c8f03f0cd +Author: Behdad Esfahbod +Date: Mon Apr 16 21:05:11 2012 -0400 + + Rewrite ragel expression to better match the one on MS spec + + https://www.microsoft.com/typography/otfntdev/devanot/shaping.aspx + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 95cefdf96efe43a44133aa8a186155cf4e63e2b7 +Author: Behdad Esfahbod +Date: Mon Apr 16 18:08:20 2012 -0400 + + Add --utf8-clusters + + Also fix cairo cluster generation. + + util/hb-shape.cc | 8 +++++--- + util/hb-view.hh | 2 +- + util/helper-cairo.cc | 22 +++++++++++++++++----- + util/helper-cairo.hh | 3 ++- + util/options.cc | 19 ++++++++++++++----- + util/options.hh | 26 ++++++++++++++++---------- + util/view-cairo.cc | 5 +++-- + util/view-cairo.hh | 3 ++- + 8 files changed, 60 insertions(+), 28 deletions(-) + +commit effb42e5c520128bdc2e29398ed801730c5c0f52 +Author: Behdad Esfahbod +Date: Mon Apr 16 16:04:07 2012 -0400 + + Always use cairo_show_text_glyphs() + + Better catches cluster errors. + + util/view-cairo.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 799cfdd15ab369580b2283200c3aca6866214b59 +Author: Behdad Esfahbod +Date: Mon Apr 16 16:00:36 2012 -0400 + + Make page progression be right to left for vertical text + + util/view-cairo.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit a5f1834f57ea3fb254f5c7d372747de316fcc8f1 +Author: Behdad Esfahbod +Date: Mon Apr 16 15:55:13 2012 -0400 + + Apply 'liga' for vertical writing mode too + + Apparently that's what Kazuraki uses to form vertical ligatures, + which suggests that it's what Adobe does. + + src/hb-ot-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4d85252bda25cddd1fbdd744687e449888f0b5fa +Author: Behdad Esfahbod +Date: Mon Apr 16 15:54:26 2012 -0400 + + Add Japanese test data from Adobe's Kazuraki font ligatures + + test/shaping/texts/in-tree/shaper-default/MANIFEST | 1 + + .../shaper-default/script-japanese/MANIFEST | 1 + + .../shaper-default/script-japanese/misc/MANIFEST | 2 + + .../script-japanese/misc/kazuraki-liga-lines.txt | 8 ++++ + .../script-japanese/misc/kazuraki-liga.txt | 53 + ++++++++++++++++++++++ + 5 files changed, 65 insertions(+) + +commit e74616b8898b5f18d9bf82b9e81aefad056c1e36 +Author: Behdad Esfahbod +Date: Sun Apr 15 14:12:13 2012 -0400 + + Add comment + + src/hb-private.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 683b503f30bba29d57a93d7e8ac7138c2e7f49f1 +Author: Behdad Esfahbod +Date: Sat Apr 14 20:47:14 2012 -0400 + + Minor + + src/hb-ot-shape-normalize.cc | 11 +++++++++-- + src/hb-ot-shape-private.hh | 9 --------- + src/hb-ot-shape.cc | 9 ++++++++- + 3 files changed, 17 insertions(+), 12 deletions(-) + +commit b9f199c8e38cc5ed0d73845568630f3bcbdd4374 +Author: Behdad Esfahbod +Date: Sat Apr 14 20:23:58 2012 -0400 + + Move code around + + src/hb-ot-shape-private.hh | 40 ---------------------------------------- + src/hb-ot-shape.cc | 45 + +++++++++++++++++++++++++++++++++++++++++---- + 2 files changed, 41 insertions(+), 44 deletions(-) + +commit 38a83019e6a7f4aa47662fd557344f62ae001abe +Author: Behdad Esfahbod +Date: Sat Apr 14 19:40:18 2012 -0400 + + Minor + + src/hb-common.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d4adade217a61007dd2da5cd9eccf889f79a019a +Author: Behdad Esfahbod +Date: Sat Apr 14 19:23:17 2012 -0400 + + Add assert + + src/hb-ot-shape.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit fe28b997fbbeb2cfeab62ac453993ccffe3e6719 +Author: Behdad Esfahbod +Date: Sat Apr 14 19:19:26 2012 -0400 + + Add HB_DIRECTION_IS_VALID + + src/hb-common.h | 1 + + test/api/test-common.c | 7 +++++++ + 2 files changed, 8 insertions(+) + +commit 5e88aa66822ba64324b4428c9ffbe06a43b4f310 +Author: Behdad Esfahbod +Date: Sat Apr 14 18:51:50 2012 -0400 + + Remove public enum names again + + As was reported to me, glib-mkenum does not understand named enums, + so remove for now. + + src/hb-blob.h | 2 +- + src/hb-common.h | 6 +++--- + src/hb-ot-layout-private.hh | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +commit 08569c0eaab026c7122c0dc29922cf44011c4d10 +Author: Behdad Esfahbod +Date: Sat Apr 14 18:47:07 2012 -0400 + + Minor + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 4bf90f648313e35d21b427a956aa1fe762bae757 +Author: Behdad Esfahbod +Date: Thu Apr 12 17:38:23 2012 -0400 + + Make HB_DIRECTION_INVALID be zero + + This changes all the HB_DIRECTION_* enum member values, but is + nicer, in preparation for making hb_segment_properties_t public. + + src/hb-common.cc | 7 ++++--- + src/hb-common.h | 20 ++++++++++---------- + test/api/test-common.c | 9 +++++++-- + 3 files changed, 21 insertions(+), 15 deletions(-) + +commit d01402da9c756f90a84bfb1f964fd56caf2b35c3 +Author: Behdad Esfahbod +Date: Thu Apr 12 17:38:02 2012 -0400 + + Minor + + TODO | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 69b84a8f6c789726815261c2e86692de7a65d6e8 +Author: Behdad Esfahbod +Date: Thu Apr 12 15:50:40 2012 -0400 + + Fix hb-view surface size calc for vertical text + + For some reason it doesn't quite work with IranianNastaliq, but + that looks like a font issue. + + util/helper-cairo.hh | 5 +++-- + util/options.hh | 7 +++++++ + util/view-cairo.cc | 31 +++++++++++++++++++++---------- + util/view-cairo.hh | 1 + + 4 files changed, 32 insertions(+), 12 deletions(-) + +commit 6bd9b479b8b2befbb0847282e93beade197c8038 +Author: Behdad Esfahbod +Date: Thu Apr 12 14:53:53 2012 -0400 + + Hide backend-specific shape functions + + Also remove shaper_options argument to hb_shape_full(). That was + unused and for "future". Let it go. + + More shaper API coming in preparation for plan/planned API. + + configure.ac | 6 ++-- + src/Makefile.am | 11 +++---- + src/hb-fallback-shape-private.hh | 9 +++--- + src/hb-fallback-shape.cc | 9 +++--- + src/{hb-ot-shape.h => hb-graphite2-private.hh} | 30 ++++++++---------- + src/hb-graphite2.cc | 5 ++- + src/hb-graphite2.h | 7 ----- + src/hb-ot-shape-private.hh | 8 +++-- + src/hb-ot-shape.cc | 11 +++---- + src/hb-ot.h | 1 - + src/hb-shape.cc | 24 ++++++--------- + src/hb-shape.h | 1 - + src/hb-uniscribe-private.hh | 42 + ++++++++++++++++++++++++++ + src/hb-uniscribe.cc | 9 +++--- + src/hb-uniscribe.h | 7 ----- + util/options.hh | 2 +- + 16 files changed, 96 insertions(+), 86 deletions(-) + +commit c6035cf802c60f0526f421f39a55886061df94ee +Author: Behdad Esfahbod +Date: Thu Apr 12 13:23:59 2012 -0400 + + Add names to enums + + gdb was showing instead of useful stuff, so name + all our enums. + + src/hb-blob.h | 2 +- + src/hb-common.h | 6 +++--- + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gdef-table.hh | 2 +- + src/hb-ot-layout-gpos-table.hh | 5 ++--- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-private.hh | 2 +- + 7 files changed, 10 insertions(+), 11 deletions(-) + +commit d1c9eb458c843215da8df84b596bfae51fee135b +Author: Behdad Esfahbod +Date: Thu Apr 12 13:17:44 2012 -0400 + + Make it an error to include non-top-level headers + + Users should #include (or hb-ft.h, hb-glib.h, etc), but + never things like hb-shape.h directly. This makes it easier to + refactor headers later on without breaking compatibility. + + src/hb-blob.h | 4 ++++ + src/hb-buffer.h | 4 ++++ + src/hb-common.h | 4 ++++ + src/hb-font.h | 4 ++++ + src/hb-ft.h | 2 -- + src/hb-glib.h | 1 + + src/hb-gobject.h | 1 + + src/hb-graphite2.h | 5 +++-- + src/hb-icu.h | 1 + + src/hb-ot-layout.h | 8 +++++--- + src/hb-ot-shape.h | 9 +++++---- + src/hb-ot-tag.h | 6 +++++- + src/hb-ot.h | 2 ++ + src/hb-private.hh | 5 ++++- + src/hb-shape.h | 4 ++++ + src/hb-unicode.h | 4 ++++ + src/hb-uniscribe.h | 3 +-- + src/hb-version.h.in | 4 ++++ + src/hb.h | 2 ++ + 19 files changed, 58 insertions(+), 15 deletions(-) + +commit 323190c27b80cddc9b3c42d19f1f243e2acb2411 +Author: Behdad Esfahbod +Date: Thu Apr 12 12:29:10 2012 -0400 + + Minor + + src/hb-ft.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 0e3361464b00b76aa7375515163e0710a691db0c +Author: Behdad Esfahbod +Date: Thu Apr 12 10:06:52 2012 -0400 + + Fix bug with not setting Unicode props of the first character + + Fixes Mongolian shaping issue: + https://bugs.freedesktop.org/show_bug.cgi?id=45695 + + src/hb-ot-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f9746b600a6e14dbe48aabfc17df8f12a5b46b11 +Author: Behdad Esfahbod +Date: Thu Apr 12 09:59:26 2012 -0400 + + Minor + + test/shaping/texts/in-tree/shaper-arabic/script-mongolian/misc/misc.txt | + 1 - + 1 file changed, 1 deletion(-) + +commit 7470b0ff805e4ff59d23d7a1808888fafdf550eb +Author: Behdad Esfahbod +Date: Thu Apr 12 09:44:27 2012 -0400 + + Add Mongolian test case + + test/shaping/texts/in-tree/MANIFEST | + 1 + + .../texts/in-tree/shaper-arabic/script-mongolian/misc/MANIFEST | + 1 + + .../texts/in-tree/shaper-arabic/script-mongolian/misc/misc.txt | + 4 ++++ + test/shaping/texts/in-tree/shaper-thai/MANIFEST | + 1 + + test/shaping/texts/in-tree/shaper-thai/misc/MANIFEST | + 1 + + 5 files changed, 8 insertions(+) + +commit c65662b71e6160f5adfb6226d97589ca457d98b9 +Author: Behdad Esfahbod +Date: Thu Apr 12 09:31:55 2012 -0400 + + Fix left-matra positioning in Indic + + Fixes 200 failures out of previous 4290 cases in the OO.o Indic + dictionary (of ~16000 entries). + + src/hb-ot-shape-complex-indic.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 6d16403bfaa4d710d80c93298eca7211ecaa419f +Author: Behdad Esfahbod +Date: Wed Apr 11 22:04:42 2012 -0400 + + Adjust TODO + + TODO | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 029a82d81d8ffa1b6771d19018d592fec1dbc934 +Author: Behdad Esfahbod +Date: Wed Apr 11 22:00:46 2012 -0400 + + [hangul] Apply *jmo features to all Hangul chars + + This is what old HB does. Morever, fixes rendering with Win8 malgun + font. The Win7 version doesn't compose with either Uniscribe nor HB, + but Win8 version works as expected, like Uniscribe, with this change. + + Lets call Hangul done for now. + + src/hb-ot-shape-complex-misc.cc | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 3baae2440de69577d330209edb708e7d2bb2231d +Author: Behdad Esfahbod +Date: Wed Apr 11 21:54:37 2012 -0400 + + Update TODO + + TODO | 28 +++++++++++++++------------- + 1 file changed, 15 insertions(+), 13 deletions(-) + +commit a4976447cd1a1feffdecd0d501a2690716b1cf4b +Author: Behdad Esfahbod +Date: Wed Apr 11 17:48:40 2012 -0400 + + Add Hangul test + + test/shaping/texts/in-tree/shaper-hangul/script-hangul/misc/misc.txt | + 1 + + 1 file changed, 1 insertion(+) + +commit e95d912b3b0af027c4384553f95236db822e5acc +Author: Behdad Esfahbod +Date: Wed Apr 11 17:33:02 2012 -0400 + + Fix diff tool + + test/shaping/hb_test_tools.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 41ae674f6871f43d0a6e4ca67a747074d63ae576 +Author: Behdad Esfahbod +Date: Wed Apr 11 17:11:05 2012 -0400 + + Don't create hb_apply_context_t per glyph! + + I couldn't measure significant performance gains out of this; maybe + about 5% (with one million Malayalam strings). Still, not bad. + But reminds me that optimizing this codebase without profiling first + is simply not going to work. Oh well... + + src/hb-ot-layout-gpos-table.hh | 24 ++++++------------------ + src/hb-ot-layout-gsub-table.hh | 26 +++++++------------------- + src/hb-ot-layout-gsubgpos-private.hh | 22 ++++++++++++++++++++++ + 3 files changed, 35 insertions(+), 37 deletions(-) + +commit 4a1e02ef7979d58fe0c726ee7c665b2420c42ddd +Author: Behdad Esfahbod +Date: Wed Apr 11 14:37:53 2012 -0400 + + Fix shape to presentation forms font check + + As reported by Jonathan Kew on the list. + + src/hb-ot-shape-complex-arabic.cc | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 6062f5f01436b4044be729890ed00b9b62737824 +Author: Behdad Esfahbod +Date: Wed Apr 11 14:19:55 2012 -0400 + + Fix build with some compilers + + As reported by Jonathan Kew on the list. + + src/hb-ot-shape-complex-misc.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit acd88e659fdb2fa1cbf7171f0a1c7fbc81b9f298 +Author: Behdad Esfahbod +Date: Tue Apr 10 18:02:20 2012 -0400 + + In Arabic fallback shaping, check that the font has glyph for new char + + src/hb-ot-shape-complex-arabic.cc | 12 +++++++----- + src/hb-ot-shape-complex-indic.cc | 2 +- + src/hb-ot-shape-complex-misc.cc | 6 +++--- + src/hb-ot-shape-complex-private.hh | 7 ++++--- + src/hb-ot-shape.cc | 2 +- + 5 files changed, 16 insertions(+), 13 deletions(-) + +commit 7752aa73e72301a46c64c533c1e423ff5987cc05 +Author: Behdad Esfahbod +Date: Tue Apr 10 17:22:14 2012 -0400 + + Minor + + src/hb-ot-shape-private.hh | 1 - + src/hb-ot-shape.cc | 10 ---------- + 2 files changed, 11 deletions(-) + +commit 939c010211b063f78874a3b72b032c1ed9a13b87 +Author: Behdad Esfahbod +Date: Tue Apr 10 17:20:05 2012 -0400 + + Implement Arabic fallback shaping mandatory ligatures + + src/gen-arabic-table.py | 32 + ++++++++++++++++++++++---------- + src/hb-ot-shape-complex-arabic-table.hh | 28 +++++++++++++++++++--------- + src/hb-ot-shape-complex-arabic.cc | 31 + +++++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-misc.cc | 4 ++-- + 4 files changed, 74 insertions(+), 21 deletions(-) + +commit b7d04eb606800100faa11100d2adf559e297a4ee +Author: Behdad Esfahbod +Date: Tue Apr 10 16:44:38 2012 -0400 + + Do Arabic fallback shaping + + src/hb-ot-shape-complex-arabic.cc | 38 + +++++++++++++++++++++++++++++++++----- + 1 file changed, 33 insertions(+), 5 deletions(-) + +commit ae4a2b9365051c23c9a299cf76f3ab7e661999b1 +Author: Behdad Esfahbod +Date: Tue Apr 10 16:25:08 2012 -0400 + + Generate fallback Arabic shaping table + + Not hooked up yet. + + src/Makefile.am | 6 +- + src/gen-arabic-table.py | 220 + +++++++++++++++++++++++--------- + src/gen-indic-table.py | 4 +- + src/hb-ot-shape-complex-arabic-table.hh | 205 + ++++++++++++++++++++++++++++- + 4 files changed, 367 insertions(+), 68 deletions(-) + +commit 3b26f96ebe859570d14c6902afc23462bca40712 +Author: Behdad Esfahbod +Date: Tue Apr 10 10:52:07 2012 -0400 + + Add Thai shaper that does SARA AM decomposition / reordering + + That's not in the OpenType spec, but it's what MS and Adobe do. + + src/hb-buffer.cc | 1 + + src/hb-ot-shape-complex-misc.cc | 104 + ++++++++++++++++++++++++++++++++++++- + src/hb-ot-shape-complex-private.hh | 8 +++ + 3 files changed, 112 insertions(+), 1 deletion(-) + +commit 0b6d2ac6a1d04877ae4542fc2a3b920185547053 +Author: Behdad Esfahbod +Date: Tue Apr 10 10:52:03 2012 -0400 + + Minor + + TODO | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +commit e099dd6592b4ea887696330f4718efb572494d93 +Author: Behdad Esfahbod +Date: Tue Apr 10 10:47:33 2012 -0400 + + Add Thai test case for SARA AM decomposition + + test/shaping/texts/in-tree/shaper-hangul/MANIFEST | 1 + + test/shaping/texts/in-tree/shaper-thai/misc/misc.txt | 5 +++++ + 2 files changed, 6 insertions(+) + +commit 4450dc9354b18cd68980b0891b24ea8efa4f38b6 +Author: Behdad Esfahbod +Date: Sat Apr 7 22:07:23 2012 -0400 + + Move around + + test/shaping/texts/in-tree/MANIFEST + | 1 + + test/shaping/texts/in-tree/shaper-default/MANIFEST + | 1 - + .../in-tree/{shaper-default => shaper-hangul}/script-hangul/MANIFEST + | 0 + .../{shaper-default => shaper-hangul}/script-hangul/misc/MANIFEST + | 0 + .../{shaper-default => shaper-hangul}/script-hangul/misc/misc.txt + | 0 + 5 files changed, 1 insertion(+), 1 deletion(-) + +commit d4cc44716c1e098f8abbc0e495404598026ef242 +Author: Behdad Esfahbod +Date: Sat Apr 7 21:52:28 2012 -0400 + + Move code around, in prep for Thai/Lao shaper + + src/hb-buffer-private.hh | 5 +++++ + src/hb-buffer.cc | 23 +++++++++++++++++++++++ + src/hb-ot-shape-complex-indic-machine.rl | 14 +------------- + 3 files changed, 29 insertions(+), 13 deletions(-) + +commit c9a841f4452921c5361b8f5697bbff7736ce60cd +Author: Behdad Esfahbod +Date: Sat Apr 7 15:06:55 2012 -0400 + + Add simple Hangul shaper that recomposes Jamo when feasible + + Previously, we were NOT actually recomposing Hangul Jamo. We do now. + The two lines in: + + test/shaping/texts/in-tree/shaper-default/script-hangul/misc/misc.txt + + Now render the same with the UnDotum.ttf font. Previously the second + linle was rendering boxes. + + We can also start applying OpenType Jamo features later. At this + time, + I have no idea how the 'ljmo', 'vjmo', 'tjmo' features are supposed to + work. Maybe someone can explain them to me? + + src/hb-ot-shape-complex-misc.cc | 16 ++++++++++++++++ + src/hb-ot-shape-complex-private.hh | 15 +++++++++++++-- + 2 files changed, 29 insertions(+), 2 deletions(-) + +commit 968318455304804dc53045e8ba0cd4d76800c02d +Author: Behdad Esfahbod +Date: Sat Apr 7 14:57:21 2012 -0400 + + Implement normalization mode + HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_FULL + + In this mode we try composing CCC=0 with CCC=0 characters. Useful for + Hangul. + + src/hb-ot-shape-normalize.cc | 21 +++++++++++++-------- + 1 file changed, 13 insertions(+), 8 deletions(-) + +commit bec2ac4fde1ba0dd6dba02adbb836ce569a5cf6f +Author: Behdad Esfahbod +Date: Sat Apr 7 14:51:17 2012 -0400 + + Bring normalization algorithm closer to the spec + + No logical difference so far. + + src/hb-ot-shape-normalize.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit e02d9257863b49e33ab5942971266349d3c548f6 +Author: Behdad Esfahbod +Date: Sat Apr 7 14:49:13 2012 -0400 + + Flip logic around + + src/hb-ot-shape-normalize.cc | 38 +++++++++++++------------------------- + 1 file changed, 13 insertions(+), 25 deletions(-) + +commit aaa25d5f458127f53f4b5ecdeb986ae91fabbad3 +Author: Behdad Esfahbod +Date: Thu Apr 5 17:27:23 2012 -0400 + + Add Hangul test case + + Composed, and decomposed, of the same text. + + test/shaping/texts/in-tree/shaper-default/MANIFEST | + 1 + + test/shaping/texts/in-tree/shaper-default/script-hangul/MANIFEST | + 1 + + test/shaping/texts/in-tree/shaper-default/script-hangul/misc/MANIFEST | + 1 + + test/shaping/texts/in-tree/shaper-default/script-hangul/misc/misc.txt | + 2 ++ + 4 files changed, 5 insertions(+) + +commit 11138ccff71f442da1fcf64faa0e1d22e083e775 +Author: Behdad Esfahbod +Date: Thu Apr 5 17:25:19 2012 -0400 + + Add normalize mode + + In preparation for Hangul shaper. + + src/Makefile.am | 1 + + src/hb-ot-layout-common-private.hh | 1 - + src/hb-ot-shape-complex-arabic.cc | 6 +-- + src/hb-ot-shape-complex-indic.cc | 6 +-- + src/hb-ot-shape-complex-misc.cc | 8 ++-- + src/hb-ot-shape-complex-private.hh | 13 ++++--- + src/hb-ot-shape-normalize-private.hh | 46 +++++++++++++++++++++++ + src/hb-ot-shape-normalize.cc | 73 + +++++++++++++++++------------------- + src/hb-ot-shape-private.hh | 7 +--- + src/hb-ot-shape.cc | 2 +- + 10 files changed, 102 insertions(+), 61 deletions(-) + +commit 6769f21d579a354e32577ec57348e97d2cb1b438 +Author: Behdad Esfahbod +Date: Thu Apr 5 16:46:46 2012 -0400 + + More moving code around + + src/hb-ot-shape-normalize.cc | 2 +- + src/hb-ot-shape-private.hh | 8 -------- + src/hb-ot-shape.cc | 2 +- + src/hb-unicode-private.hh | 8 ++++++++ + 4 files changed, 10 insertions(+), 10 deletions(-) + +commit 2db2a566826ed4763ce69629194ec656bd48b0bd +Author: Behdad Esfahbod +Date: Thu Apr 5 16:40:37 2012 -0400 + + Move code around + + src/hb-ot-shape-private.hh | 53 + -------------------------------------------- + src/hb-unicode-private.hh | 3 +++ + src/hb-unicode.cc | 55 + ++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 58 insertions(+), 53 deletions(-) + +commit cad3821f3d5b68d490b0728bd37bd57428ec809c +Author: Behdad Esfahbod +Date: Wed Mar 7 17:13:25 2012 -0500 + + More sorting by Unicode version + + This is the most convenient way to browse scripts. + + src/hb-common.cc | 2 +- + src/hb-common.h | 2 +- + src/hb-ot-shape-complex-private.hh | 94 + ++++++++++++++++++++++++++++---------- + 3 files changed, 72 insertions(+), 26 deletions(-) + +commit 317b9504d7a4faa70dcf21e5c2aff4792dbd201a +Author: Behdad Esfahbod +Date: Wed Mar 7 16:51:29 2012 -0500 + + Minor + + src/hb-ot-shape-complex-private.hh | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit fa2673c1ee954ddbbfbfca7cced7b839d7776fc0 +Author: Behdad Esfahbod +Date: Wed Mar 7 15:52:02 2012 -0500 + + More Unicode script age annotation, and a couple more RTL scripts + + Cross-checked with Mark Davis's spreadsheet at http://goo.gl/x9ilM + + src/hb-common.cc | 8 ++++++++ + src/hb-common.h | 52 + +++++++++++++++++++++++++++++----------------------- + 2 files changed, 37 insertions(+), 23 deletions(-) + +commit 6d4016f1ba48d409800dc3281b93e5cd58c99d9f +Author: Behdad Esfahbod +Date: Wed Mar 7 15:33:14 2012 -0500 + + Make src tests pass again + + src/gen-arabic-table.py | 11 ++++++----- + src/gen-indic-table.py | 9 +++++---- + src/hb-ot-shape-complex-arabic-table.hh | 6 ++++++ + src/hb-ot-shape-complex-indic-table.hh | 4 ++++ + 4 files changed, 21 insertions(+), 9 deletions(-) + +commit 7da435f08cc406080a5ee9b1ab5351db6a93acae +Author: Behdad Esfahbod +Date: Wed Mar 7 15:20:20 2012 -0500 + + Separate Unicode 3.1 and Unicode 3.2 additions + + src/hb-common.h | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +commit f91136cb528e298651c4a8a8a1d6dc54136e09ce +Author: Behdad Esfahbod +Date: Wed Mar 7 12:56:22 2012 -0500 + + Route three Unicode 6.1 scripts through Indic shaper + + src/hb-ot-shape-complex-private.hh | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit f32c0012ad794cd2df669dfc7b0438fafbe38b2d +Author: Behdad Esfahbod +Date: Wed Mar 7 12:53:34 2012 -0500 + + Add Unicode 6.1.0 scripts + + src/hb-common.h | 9 +++++++++ + src/hb-glib.cc | 11 ++++++++++- + 2 files changed, 19 insertions(+), 1 deletion(-) + +commit 50e810cd0e55c25fddb0a2fd0861c51fbf65700e +Author: Behdad Esfahbod +Date: Wed Mar 7 12:49:08 2012 -0500 + + Lydian and Kharoshthi are right-to-left + + src/hb-common.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit a52835635e4a2a12715aff2febb561515a10cd5a +Author: Behdad Esfahbod +Date: Wed Mar 7 12:38:39 2012 -0500 + + Whitespace + + src/hb-common.h | 194 + ++++++++++++++++++++++++++++---------------------------- + 1 file changed, 97 insertions(+), 97 deletions(-) + +commit 183224684a45d7dcd7d28510d4383a7a7cb3dff3 +Author: Behdad Esfahbod +Date: Wed Mar 7 12:21:28 2012 -0500 + + Use generic shaper for Buhid + + As requested by Jonathan Kew. + + We need to devise a better mechanism to choose which scripts to + pass through the Indic shaper. Moreover, currently we are storing + data for some scripts in the Indic shaper that are not even going + through that shaper. Need to find a better way... + + src/hb-ot-shape-complex-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cdc8b491a8e7cec5082ca2ad0346c1f41fdd5c92 +Author: Behdad Esfahbod +Date: Wed Mar 7 12:08:33 2012 -0500 + + Update Indic table to Unicode 6.1 data + + src/Makefile.am | 15 +++ + src/gen-indic-table.py | 20 ++-- + src/hb-ot-shape-complex-arabic-table.hh | 35 ------- + src/hb-ot-shape-complex-indic-table.hh | 178 + +++++++++++++++++++------------- + 4 files changed, 134 insertions(+), 114 deletions(-) + +commit e3b2e077f549b04779c08a9fedb1f35b9f11075c +Author: Behdad Esfahbod +Date: Wed Mar 7 10:21:24 2012 -0500 + + Typo + + src/hb-ot-shape-normalize.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c346671b6b9b05fa51b95c16212eb29ac69510fa +Author: Behdad Esfahbod +Date: Tue Mar 6 20:47:50 2012 -0500 + + Minor doc fixes + + src/hb-ot-shape-normalize.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 406044986a68676f3050f9350ccc448c615fc685 +Author: Behdad Esfahbod +Date: Tue Mar 6 20:24:31 2012 -0500 + + Add Hebrew diacritics test cases + + From: + https://bugzilla.mozilla.org/show_bug.cgi?id=662055 + + test/shaping/texts/in-tree/shaper-default/MANIFEST | 1 + + .../texts/in-tree/shaper-default/script-hebrew/MANIFEST | 1 + + .../in-tree/shaper-default/script-hebrew/misc/MANIFEST | 1 + + .../shaper-default/script-hebrew/misc/diacritics.txt | 15 + +++++++++++++++ + 4 files changed, 18 insertions(+) + +commit 461b9b6347e4f58589f5be82c40a2df61da2c715 +Author: Behdad Esfahbod +Date: Thu Mar 1 18:11:19 2012 -0800 + + Fix cluster formation in Indic + + Makes number of failures against Uniscribe with hi_IN dictionary from + OO.o to go down from 6334 to 4290. Not bad for a one-line change! + + Mozilla Bug 729626 - ASAN: heap-buffer-overflow HTML + + src/hb-ot-shape-complex-indic-machine.rl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bc71ad4973842f25216b48842a46d6c9cbce6aa3 +Author: Behdad Esfahbod +Date: Thu Mar 1 17:30:29 2012 -0800 + + Fix atomic-int op on Apple + + The OSAtomicAdd32Barrier operator returns the new value, we want the + old value. + + src/hb-blob.cc | 2 +- + src/hb-object-private.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit a1970d9afc15b2c6b7513b923019bb223bd95154 +Author: Behdad Esfahbod +Date: Fri Feb 24 13:51:09 2012 -0500 + + Add support for atomic int and mutex on Apple systems + + So, apparently there's no atomic int 'get' method on Apple. + You have to + add(0) to get. And that's not const-friendly. So switch inert-object + checking to a non-atomic get. This, however, is safe, and a + negligible + performance boost too. + + src/hb-mutex-private.hh | 14 +++++++++----- + src/hb-object-private.hh | 15 ++++++++++----- + 2 files changed, 19 insertions(+), 10 deletions(-) + +commit 8004429102d7d3a8c42e1cbfe231835de4d3d782 +Author: Behdad Esfahbod +Date: Thu Feb 23 18:47:17 2012 -0500 + + Remove unused hb_atomic_int_set() + + Apparently it can't be implemented on OS X. We weren't using + it anyway. + + src/hb-object-private.hh | 4 ---- + 1 file changed, 4 deletions(-) + +commit 45227c10e416894ba7f84fdf72d849cecdb9b898 +Author: Behdad Esfahbod +Date: Thu Feb 23 19:47:43 2012 -0500 + + Add hb-warning.cc. Oops! + + src/hb-warning.cc | 53 + +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 53 insertions(+) + +commit bd7ff1dec5b92ee59fa060e793f88499adcd8c11 +Author: Behdad Esfahbod +Date: Thu Feb 23 15:06:16 2012 -0500 + + Allow disabling multi-threaded support + + By defining HB_NO_MT. + + Also, only warn once per missing MT feature support. + + Mozilla Bug 666661 - gfx/harfbuzz/src/hb-prive.h - compiler warnings + on mac + + src/Makefile.am | 1 + + src/hb-mutex-private.hh | 6 +++--- + src/hb-object-private.hh | 11 +++-------- + 3 files changed, 7 insertions(+), 11 deletions(-) + +commit 634c9e3423a9c23793400d1f56e98070e00b6056 +Author: Behdad Esfahbod +Date: Wed Feb 22 16:43:21 2012 -0500 + + Minor + + src/hb-ot-shape-private.hh | 69 + ++++++++++++++++++++++++++-------------------- + 1 file changed, 39 insertions(+), 30 deletions(-) + +commit 514b6f88668da4eab85103c536dabe24b7bc457b +Author: Behdad Esfahbod +Date: Wed Feb 22 16:34:37 2012 -0500 + + Followup: Reorder Hebrew combining classes for better rendering + + Patch from Jonathan Kew. + + Bug 662055 - advanced Hebrew diacritics are shown correctly only in + particular order. + + src/hb-ot-shape-private.hh | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +commit 6e78607ea71e3e5306f88f227ddba76133d16ed0 +Author: Behdad Esfahbod +Date: Wed Feb 22 16:31:15 2012 -0500 + + Reorder Hebrew combining classes for better rendering + + Patch from Jonathan Kew. + + Bug 662055 - advanced Hebrew diacritics are shown correctly only in + particular order + + src/hb-ot-shape-private.hh | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) + +commit 7a70ca78e06c676befe1ae17199fff1f000f8188 +Author: Behdad Esfahbod +Date: Tue Feb 21 11:31:47 2012 -0500 + + Add test case from https://bugzilla.mozilla.org/show_bug.cgi?id=714067 + + test/shaping/texts/in-tree/shaper-arabic/script-arabic/misc/MANIFEST + | 1 + + .../in-tree/shaper-arabic/script-arabic/misc/ligature-diacritics.txt + | 1 + + 2 files changed, 2 insertions(+) + +commit f51e167436a51b890ffe3f7f7920498fa287acd9 +Author: Behdad Esfahbod +Date: Mon Jan 30 09:48:33 2012 -0500 + + Minor error handling + + util/options.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit bee74efbdebc4e46ce57daa8a88bcf06b13411fe +Author: Behdad Esfahbod +Date: Fri Jan 27 02:14:08 2012 -0500 + + Update git.mk to new upstream + + git.mk | 44 +++++++++++++++++++++++++++++++++----------- + 1 file changed, 33 insertions(+), 11 deletions(-) + +commit 134aa7bc7e3f9b9de76c9de2ed4b7344a7b323f9 +Author: Behdad Esfahbod +Date: Fri Jan 27 02:09:40 2012 -0500 + + Make checks more OS X friendly + + src/check-internal-symbols.sh | 21 +++++++++++++-------- + src/check-libstdc++.sh | 21 +++++++++++++-------- + 2 files changed, 26 insertions(+), 16 deletions(-) + +commit 6152199368399bf98368ea3c794fa760b49756ba +Author: Behdad Esfahbod +Date: Fri Jan 27 01:57:59 2012 -0500 + + Fix check-header-guards on OS X + + src/check-header-guards.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c62e41b6aad1fc56225d0e53d6d4abd0f005fe3b +Author: Behdad Esfahbod +Date: Fri Jan 27 02:20:58 2012 -0500 + + Minor + + configure.ac | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 1a5a91dc0d8bf4b72a2f22dc6300b06ad7000b79 +Author: Behdad Esfahbod +Date: Sun Jan 22 19:57:00 2012 -0500 + + Add a few more tests + + .../in-tree/shaper-indic/indic/script-devanagari/misc/misc.txt | 3 +++ + .../shaper-indic/south-east-asian/script-thai/misc/misc.txt | + 9 +++++++++ + 2 files changed, 12 insertions(+) + +commit 1795f3a222a85cdf80c78a0e9181d23dd1673876 +Author: Behdad Esfahbod +Date: Sun Jan 22 19:29:45 2012 -0500 + + Add a couple Thai test cases from Thep + + test/shaping/texts/in-tree/shaper-indic/south-east-asian/MANIFEST | + 1 + + .../texts/in-tree/shaper-indic/south-east-asian/script-thai/MANIFEST | + 1 + + .../in-tree/shaper-indic/south-east-asian/script-thai/misc/MANIFEST | + 1 + + .../in-tree/shaper-indic/south-east-asian/script-thai/misc/misc.txt | + 2 ++ + 4 files changed, 5 insertions(+) + +commit ec3f506682fc6e2d7d7455e49d6c82ac9dd0c660 +Author: Behdad Esfahbod +Date: Sun Jan 22 19:10:55 2012 -0500 + + Add Devanagari test from Tom Hacohen + + .../texts/in-tree/shaper-indic/indic/script-devanagari/misc/misc.txt + | 1 + + 1 file changed, 1 insertion(+) + +commit 71be4ca3dd5eaaca31957e34fef11f6aeb4aebdf +Author: Behdad Esfahbod +Date: Sun Jan 22 16:26:49 2012 -0500 + + Also ignore "ChangeLog" in manifests + + test/shaping/hb_test_tools.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3c9a39ecd65990f2c7b29bb741c6a538fa425531 +Author: Behdad Esfahbod +Date: Sun Jan 22 16:21:19 2012 -0500 + + Remove newline + + test/shaping/hb_test_tools.py | 2 ++ + 1 file changed, 2 insertions(+) + +commit e4ccbfe276db5ed098ddcf78a7bb8f2da4263128 +Author: Behdad Esfahbod +Date: Sun Jan 22 16:07:32 2012 -0500 + + Allow --color=html in hb-diff + + Not that useful right now as we don't escape < and >. Perhaps + another tool can be added to convert the ANSI output to HTML. + + test/shaping/hb-diff | 2 +- + test/shaping/hb_test_tools.py | 22 +++++++++++++++++----- + 2 files changed, 18 insertions(+), 6 deletions(-) + +commit 71632c96daa4ba15e13f4d9e7f2c121d0162614e +Author: Behdad Esfahbod +Date: Sun Jan 22 15:31:44 2012 -0500 + + Fallback to Latin script if the font has no other usable scripts + + Patch and description from Jonathan Kew: + + It turns out that some legacy Thai fonts provide OpenType substitution + features to implement mark positioning, but (incorrectly) put those + features/lookups under the 'latn' script tag instead of using 'thai' + (or + possibly 'DFLT'). See + https://bugzilla.mozilla.org/show_bug.cgi?id=719366 for an example and + more detailed description. + + Although this is really a font bug, I suggest that we could improve + the + rendering of such fonts by looking for the 'latn' as a fallback if + neither the requested script nor "default" is found in + hb_ot_layout_table_choose_script. Suggested patch against harfbuzz + master is attached. + + This does _not_ affect the other kind of legacy Thai font, where + custom + code to support vendor-specific PUA codepoints would be needed. I'm + not + keen to go down that path; IMO, such fonts should be ruthlessly + stamped + out in favour of standards-based solutions. :) + + JK + + src/hb-ot-layout.cc | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 8f80f93491be73f05eba908591c856339acda51e +Author: Behdad Esfahbod +Date: Sat Jan 21 20:03:25 2012 -0500 + + More shoveling around + + test/shaping/hb-diff-filter-failures | 2 +- + test/shaping/hb-manifest-read | 2 +- + test/shaping/hb_test_tools.py | 27 ++++++++++++++++----------- + 3 files changed, 18 insertions(+), 13 deletions(-) + +commit c78c6e9844a23144ce7fa29afbf57b74587bfcd0 +Author: Behdad Esfahbod +Date: Sat Jan 21 19:55:16 2012 -0500 + + Cleanup + + test/shaping/hb-manifest-read | 2 +- + test/shaping/hb_test_tools.py | 13 ++++++++----- + 2 files changed, 9 insertions(+), 6 deletions(-) + +commit ab94a9c542f7ec9143335b73493ccb75d4586a3a +Author: Behdad Esfahbod +Date: Sat Jan 21 19:43:58 2012 -0500 + + Distribute testing tools + + test/shaping/Makefile.am | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +commit 3e86feb54c94e46b60168fd2a4773183eb1354b4 +Author: Behdad Esfahbod +Date: Sat Jan 21 19:40:30 2012 -0500 + + Speed up colorless diff + + test/shaping/hb_test_tools.py | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 1e58df603457cb4b57da78b5d4a8df66aa7d7be4 +Author: Behdad Esfahbod +Date: Sat Jan 21 19:37:31 2012 -0500 + + Cleanup manifest code + + test/shaping/hb_test_tools.py | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +commit 956d552e108eeb50bb3ad21588830af7a2f3862a +Author: Behdad Esfahbod +Date: Sat Jan 21 19:31:51 2012 -0500 + + Port hb-manifest-update to Python + + test/shaping/hb-manifest-update | 23 +++-------------------- + test/shaping/hb_test_tools.py | 38 + ++++++++++++++++++++++++++++++-------- + 2 files changed, 33 insertions(+), 28 deletions(-) + +commit 3a34e9e351ed0ee3eb27f9c0f154bc227f1226bf +Author: Behdad Esfahbod +Date: Sat Jan 21 19:15:41 2012 -0500 + + Ignore Broken Pipe errors + + test/shaping/hb_test_tools.py | 76 + +++++++++++++++++++++++++++---------------- + 1 file changed, 48 insertions(+), 28 deletions(-) + +commit d5300241680844f5625f32792f7dd7181ed05f9b +Author: Behdad Esfahbod +Date: Sat Jan 21 19:07:22 2012 -0500 + + [util] Make clusters work with char offset instead of UTF-8 offset + + This means the --features indices also refer to char position + instead of byte position now. Same for cluster values reported + by hb-shape. + + Will add an option for byte indices later. + + util/options.cc | 7 +++++-- + util/options.hh | 12 ++++++++++++ + 2 files changed, 17 insertions(+), 2 deletions(-) + +commit 0f68f4a0b5ee78cbdb2a89a9a1a9125afe72ed2f +Author: Behdad Esfahbod +Date: Sat Jan 21 18:59:48 2012 -0500 + + Correctly print out Unicode strings + + util/options.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f22089ac24f43ff048c2a0f1c1f604ae3a96be8b +Author: Behdad Esfahbod +Date: Fri Jan 20 21:21:47 2012 -0500 + + Misc fixes + + test/shaping/hb-diff | 8 ++++---- + test/shaping/hb_test_tools.py | 4 ++-- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit 96968bfae5ce61a0a098bf0e6acd2210a309a499 +Author: Behdad Esfahbod +Date: Fri Jan 20 21:16:34 2012 -0500 + + Port hb-manifest-read to Python + + test/shaping/hb-diff-filter-failures | 2 +- + test/shaping/hb-manifest-read | 37 +++------------------------ + test/shaping/hb_test_tools.py | 49 + ++++++++++++++++++++++++++++++++---- + 3 files changed, 48 insertions(+), 40 deletions(-) + +commit a59ed46fa4f7b76605f8ce6e75783ead406468f5 +Author: Behdad Esfahbod +Date: Fri Jan 20 20:56:32 2012 -0500 + + Add final residues from test-shape-complex + + .../shaping/texts/in-tree/shaper-arabic/script-nko/misc/MANIFEST | 1 + + .../shaping/texts/in-tree/shaper-arabic/script-nko/misc/misc.txt | + 5 +++++ + test/shaping/texts/in-tree/shaper-default/MANIFEST | 1 + + .../texts/in-tree/shaper-default/script-linear-b/MANIFEST | 1 + + .../texts/in-tree/shaper-default/script-linear-b/misc/MANIFEST | 1 + + .../texts/in-tree/shaper-default/script-linear-b/misc/misc.txt | 1 + + test/shaping/texts/in-tree/shaper-indic/MANIFEST | 1 + + .../shaping/texts/in-tree/shaper-indic/south-east-asian/MANIFEST | 1 + + .../in-tree/shaper-indic/south-east-asian/script-khmer/MANIFEST | 1 + + .../shaper-indic/south-east-asian/script-khmer/misc/MANIFEST | 1 + + .../shaper-indic/south-east-asian/script-khmer/misc/misc.txt | + 9 +++++++++ + 11 files changed, 23 insertions(+) + +commit 820e0ed318d9b187a131baa9491d5d390ec33ef4 +Author: Behdad Esfahbod +Date: Fri Jan 20 20:51:52 2012 -0500 + + Add Punjabi tests from test-shape-complex also + + .../texts/in-tree/shaper-indic/indic/script-punjabi/misc/MANIFEST + | 1 + + .../texts/in-tree/shaper-indic/indic/script-punjabi/misc/misc.txt + | 1 + + 2 files changed, 2 insertions(+) + +commit a7d71c105772fb612871b4cae59bdae47bbc8751 +Author: Behdad Esfahbod +Date: Fri Jan 20 20:50:09 2012 -0500 + + Add Tamil test data from Muguntharaj Subramanian + + .../shaper-indic/indic/script-tamil/misc/MANIFEST | 1 + + .../shaper-indic/indic/script-tamil/misc/misc.txt | 43 + ++++++++++++++++++++++ + 2 files changed, 44 insertions(+) + +commit 5992a9941e7f19181df1e34e79e514ccedc3d284 +Author: Behdad Esfahbod +Date: Fri Jan 20 20:48:14 2012 -0500 + + Import test data from late test-shape-complex + + .../in-tree/shaper-arabic/script-arabic/MANIFEST | 1 + + .../shaper-arabic/script-arabic/misc/MANIFEST | 0 + .../in-tree/shaper-arabic/script-mandaic/MANIFEST | 1 + + .../shaper-arabic/script-mandaic/misc/MANIFEST | 0 + .../shaper-arabic/script-mongolian/MANIFEST | 1 + + .../shaper-arabic/script-mongolian/misc/MANIFEST | 0 + .../in-tree/shaper-arabic/script-nko/MANIFEST | 1 + + .../in-tree/shaper-arabic/script-nko/misc/MANIFEST | 0 + .../in-tree/shaper-arabic/script-syriac/MANIFEST | 1 + + .../shaper-arabic/script-syriac/misc/MANIFEST | 0 + .../shaper-indic/indic/script-assamese/MANIFEST | 1 + + .../indic/script-assamese/misc/MANIFEST | 0 + .../shaper-indic/indic/script-bengali/MANIFEST | 1 + + .../indic/script-bengali/misc/MANIFEST | 1 + + .../indic/script-bengali/misc/misc.txt | 48 + ++++++++++++++++++++++ + .../shaper-indic/indic/script-devanagari/MANIFEST | 1 + + .../indic/script-devanagari/misc/MANIFEST | 1 + + .../indic/script-devanagari/misc/misc.txt | 23 +++++++++++ + .../shaper-indic/indic/script-gujarati/MANIFEST | 1 + + .../indic/script-gujarati/misc/MANIFEST | 0 + .../shaper-indic/indic/script-kannada/MANIFEST | 1 + + .../indic/script-kannada/misc/MANIFEST | 1 + + .../indic/script-kannada/misc/misc.txt | 17 ++++++++ + .../shaper-indic/indic/script-malayalam/MANIFEST | 1 + + .../indic/script-malayalam/misc/MANIFEST | 1 + + .../indic/script-malayalam/misc/misc.txt | 22 ++++++++++ + .../shaper-indic/indic/script-oriya/MANIFEST | 1 + + .../shaper-indic/indic/script-oriya/misc/MANIFEST | 1 + + .../shaper-indic/indic/script-oriya/misc/misc.txt | 28 +++++++++++++ + .../shaper-indic/indic/script-punjabi/MANIFEST | 1 + + .../indic/script-punjabi/misc/MANIFEST | 0 + .../shaper-indic/indic/script-sinhala/MANIFEST | 1 + + .../indic/script-sinhala/misc/MANIFEST | 1 + + .../indic/script-sinhala/misc/misc.txt | 6 +++ + .../shaper-indic/indic/script-tamil/MANIFEST | 1 + + .../shaper-indic/indic/script-tamil/misc/MANIFEST | 0 + .../shaper-indic/indic/script-telugu/MANIFEST | 1 + + .../shaper-indic/indic/script-telugu/misc/MANIFEST | 1 + + .../shaper-indic/indic/script-telugu/misc/misc.txt | 11 +++++ + 39 files changed, 178 insertions(+) + +commit 46ac45647760984c6220f04ba4521038e628b169 +Author: Behdad Esfahbod +Date: Fri Jan 20 19:32:17 2012 -0500 + + Fix Unicode encoding issue + + test/shaping/hb_test_tools.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit ad34e39a4a320310b1edd9fc4d7e740373510c69 +Author: Behdad Esfahbod +Date: Fri Jan 20 18:39:27 2012 -0500 + + Make test tools interactive + + By bypassing readlines() buffering. + + test/shaping/hb_test_tools.py | 33 +++++++++++++++++++++++++++------ + 1 file changed, 27 insertions(+), 6 deletions(-) + +commit 91540a7d97051a3d6e97fdcd1e98af23e0780cdd +Author: Behdad Esfahbod +Date: Fri Jan 20 18:27:52 2012 -0500 + + Move most testing logic into hb_test_tools.py + + The actual utils are one-liners now. + + test/shaping/hb-diff | 77 ++------------- + test/shaping/hb-diff-filter-failures | 27 +----- + test/shaping/hb-unicode-decode | 18 +--- + test/shaping/hb-unicode-encode | 21 +--- + test/shaping/hb-unicode-prettyname | 53 +---------- + test/shaping/hb_test_tools.py | 180 + +++++++++++++++++++++++++++++++++++ + 6 files changed, 197 insertions(+), 179 deletions(-) + +commit 66aa080033dcff07b8bb5e7b1f0e3511f067d6c1 +Author: Behdad Esfahbod +Date: Fri Jan 20 17:36:10 2012 -0500 + + Remove test-shape-complex + + New shaping testsuite and framework coming. + + test/api/Makefile.am | 6 - + test/api/test-shape-complex.c | 1237 + ------------------------------------ + test/shaping/hb-unicode-prettyname | 1 + + 3 files changed, 1 insertion(+), 1243 deletions(-) + +commit ed459bfb63c58b59fc0dbe25021c396e8ef8683c +Author: Behdad Esfahbod +Date: Fri Jan 20 17:24:05 2012 -0500 + + Add hb-unicode-encode + + test/shaping/hb-unicode-encode | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +commit d8134bc017ca3383e0978ddee57070eb3aab8964 +Author: Behdad Esfahbod +Date: Fri Jan 20 17:18:59 2012 -0500 + + [hb-shape] Add parantheses around --show-text output + + util/options.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit b12c4d43614199f8910a06507603f6c431d9df67 +Author: Behdad Esfahbod +Date: Fri Jan 20 17:17:44 2012 -0500 + + Add hb-diff-filter-failures + + test/shaping/hb-diff-filter-failures | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) + +commit d4bffbc55bf4c23ab5c7f46af613aeecc79ac515 +Author: Behdad Esfahbod +Date: Fri Jan 20 17:16:35 2012 -0500 + + Move + + test/shaping/texts/MANIFEST | + 4 +--- + test/shaping/texts/in-tree/MANIFEST | + 3 +++ + test/shaping/texts/{ => in-tree}/shaper-arabic/MANIFEST | 0 + test/shaping/texts/{ => in-tree}/shaper-arabic/script-arabic/MANIFEST | 0 + .../shaping/texts/{ => in-tree}/shaper-arabic/script-mandaic/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-arabic/script-mongolian/MANIFEST | 0 + test/shaping/texts/{ => in-tree}/shaper-arabic/script-nko/MANIFEST | 0 + test/shaping/texts/{ => in-tree}/shaper-arabic/script-syriac/MANIFEST | 0 + test/shaping/texts/{ => in-tree}/shaper-default/MANIFEST | 0 + test/shaping/texts/{ => in-tree}/shaper-indic/MANIFEST | 0 + test/shaping/texts/{ => in-tree}/shaper-indic/indic/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-assamese/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-assamese/utrrs/LICENSE | 0 + .../{ => in-tree}/shaper-indic/indic/script-assamese/utrrs/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-assamese/utrrs/README | 0 + .../{ => in-tree}/shaper-indic/indic/script-assamese/utrrs/SOURCES | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../shaper-indic/indic/script-assamese/utrrs/codepoint/MANIFEST | 0 + .../script-assamese/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../script-assamese/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 0 + .../shaper-indic/indic/script-assamese/utrrs/gpos/MANIFEST | 0 + .../indic/script-assamese/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../shaper-indic/indic/script-assamese/utrrs/gsub/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-bengali/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-bengali/utrrs/LICENSE | 0 + .../{ => in-tree}/shaper-indic/indic/script-bengali/utrrs/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-bengali/utrrs/README | 0 + .../{ => in-tree}/shaper-indic/indic/script-bengali/utrrs/SOURCES | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../shaper-indic/indic/script-bengali/utrrs/codepoint/MANIFEST | 0 + .../script-bengali/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../script-bengali/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 0 + .../shaper-indic/indic/script-bengali/utrrs/gpos/MANIFEST | 0 + .../indic/script-bengali/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../shaper-indic/indic/script-bengali/utrrs/gsub/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-devanagari/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-devanagari/utrrs/LICENSE | 0 + .../{ => in-tree}/shaper-indic/indic/script-devanagari/utrrs/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-devanagari/utrrs/README | 0 + .../{ => in-tree}/shaper-indic/indic/script-devanagari/utrrs/SOURCES | 0 + .../codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../codepoint/IndicFontFeatureCodepoint-DevnagariSpecificAddition.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-GenericPunctuation.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../shaper-indic/indic/script-devanagari/utrrs/codepoint/MANIFEST | 0 + .../script-devanagari/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../script-devanagari/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 0 + .../shaper-indic/indic/script-devanagari/utrrs/gpos/MANIFEST | 0 + .../indic/script-devanagari/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../shaper-indic/indic/script-devanagari/utrrs/gsub/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-gujarati/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-gujarati/utrrs/LICENSE | 0 + .../{ => in-tree}/shaper-indic/indic/script-gujarati/utrrs/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-gujarati/utrrs/README | 0 + .../{ => in-tree}/shaper-indic/indic/script-gujarati/utrrs/SOURCES | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../shaper-indic/indic/script-gujarati/utrrs/codepoint/MANIFEST | 0 + .../script-gujarati/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../script-gujarati/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 0 + .../shaper-indic/indic/script-gujarati/utrrs/gpos/MANIFEST | 0 + .../indic/script-gujarati/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../shaper-indic/indic/script-gujarati/utrrs/gsub/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-kannada/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-kannada/utrrs/LICENSE | 0 + .../{ => in-tree}/shaper-indic/indic/script-kannada/utrrs/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-kannada/utrrs/README | 0 + .../{ => in-tree}/shaper-indic/indic/script-kannada/utrrs/SOURCES | 0 + .../codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../shaper-indic/indic/script-kannada/utrrs/codepoint/MANIFEST | 0 + .../script-kannada/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../shaper-indic/indic/script-kannada/utrrs/gpos/MANIFEST | 0 + .../indic/script-kannada/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../shaper-indic/indic/script-kannada/utrrs/gsub/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-malayalam/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-malayalam/utrrs/LICENSE | 0 + .../{ => in-tree}/shaper-indic/indic/script-malayalam/utrrs/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-malayalam/utrrs/README | 0 + .../{ => in-tree}/shaper-indic/indic/script-malayalam/utrrs/SOURCES | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../shaper-indic/indic/script-malayalam/utrrs/codepoint/MANIFEST | 0 + .../indic/script-malayalam/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../shaper-indic/indic/script-malayalam/utrrs/gsub/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-oriya/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-oriya/utrrs/LICENSE | 0 + .../{ => in-tree}/shaper-indic/indic/script-oriya/utrrs/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-oriya/utrrs/README | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-oriya/utrrs/SOURCES | 0 + .../codepoint/IndicFontFeatureCodepoint-AdditionalConsonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../script-oriya/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-OriyaSpecific.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../shaper-indic/indic/script-oriya/utrrs/codepoint/MANIFEST | 0 + .../indic/script-oriya/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../{ => in-tree}/shaper-indic/indic/script-oriya/utrrs/gsub/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-punjabi/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-punjabi/utrrs/LICENSE | 0 + .../{ => in-tree}/shaper-indic/indic/script-punjabi/utrrs/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-punjabi/utrrs/README | 0 + .../{ => in-tree}/shaper-indic/indic/script-punjabi/utrrs/SOURCES | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-GurmukhiSpecific.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../shaper-indic/indic/script-punjabi/utrrs/codepoint/MANIFEST | 0 + .../script-punjabi/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../script-punjabi/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 0 + .../shaper-indic/indic/script-punjabi/utrrs/gpos/MANIFEST | 0 + .../indic/script-punjabi/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../shaper-indic/indic/script-punjabi/utrrs/gsub/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-sinhala/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-sinhala/utrrs/LICENSE | 0 + .../{ => in-tree}/shaper-indic/indic/script-sinhala/utrrs/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-sinhala/utrrs/README | 0 + .../{ => in-tree}/shaper-indic/indic/script-sinhala/utrrs/SOURCES | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Punctuation.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../shaper-indic/indic/script-sinhala/utrrs/codepoint/MANIFEST | 0 + .../indic/script-sinhala/utrrs/gpos/IndicFontFeatureGPOS.txt | 0 + .../shaper-indic/indic/script-sinhala/utrrs/gpos/MANIFEST | 0 + .../indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Conjunct.txt | 0 + .../script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Rakaaraansaya.txt | 0 + .../indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Repaya.txt | 0 + .../script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Special-Cases.txt | 0 + .../utrrs/gsub/IndicFontFeatureGSUB-TouchingLetters.txt | 0 + .../indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB-Yansaya.txt | 0 + .../indic/script-sinhala/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../shaper-indic/indic/script-sinhala/utrrs/gsub/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-tamil/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-tamil/utrrs/LICENSE | 0 + .../{ => in-tree}/shaper-indic/indic/script-tamil/utrrs/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-tamil/utrrs/README | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-tamil/utrrs/SOURCES | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-CurrencySymbols.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../script-tamil/utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Numerics.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Symbols.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-TamilSymbol.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../shaper-indic/indic/script-tamil/utrrs/codepoint/MANIFEST | 0 + .../indic/script-tamil/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../indic/script-tamil/utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 0 + .../{ => in-tree}/shaper-indic/indic/script-tamil/utrrs/gpos/MANIFEST | 0 + .../indic/script-tamil/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../{ => in-tree}/shaper-indic/indic/script-tamil/utrrs/gsub/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-telugu/MANIFEST | 0 + .../{ => in-tree}/shaper-indic/indic/script-telugu/utrrs/LICENSE | 0 + .../{ => in-tree}/shaper-indic/indic/script-telugu/utrrs/MANIFEST | 0 + .../texts/{ => in-tree}/shaper-indic/indic/script-telugu/utrrs/README | 0 + .../{ => in-tree}/shaper-indic/indic/script-telugu/utrrs/SOURCES | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-AdditionalVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Consonants.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-DependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Digits.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-IndependentVowels.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-Reserved.txt | 0 + .../utrrs/codepoint/IndicFontFeatureCodepoint-VariousSigns.txt | 0 + .../shaper-indic/indic/script-telugu/utrrs/codepoint/MANIFEST | 0 + .../indic/script-telugu/utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 0 + .../shaper-indic/indic/script-telugu/utrrs/gpos/MANIFEST | 0 + .../indic/script-telugu/utrrs/gsub/IndicFontFeatureGSUB.txt | 0 + .../shaper-indic/indic/script-telugu/utrrs/gsub/MANIFEST | 0 + 212 files changed, 4 insertions(+), 3 deletions(-) + +commit 45f640c98d752161e51eda63061d70fad9ab9f68 +Author: Behdad Esfahbod +Date: Fri Jan 20 14:24:21 2012 -0500 + + Minor + + test/shaping/hb-diff | 35 ++++++++++++++++++++--------------- + 1 file changed, 20 insertions(+), 15 deletions(-) + +commit 47ca766a9cbdfb304f60e23a4dee0a155075a277 +Author: Behdad Esfahbod +Date: Fri Jan 20 14:21:53 2012 -0500 + + Minor + + test/shaping/hb-unicode-decode | 2 +- + test/shaping/hb-unicode-prettyname | 5 ++--- + 2 files changed, 3 insertions(+), 4 deletions(-) + +commit 8f1db07894674b02c36ca9352e666b4618ee8832 +Author: Behdad Esfahbod +Date: Fri Jan 20 13:57:57 2012 -0500 + + [test/shaping] Add some Indic test data for the new test suite + + Imported from UTRRS. + + test/shaping/texts/shaper-indic/indic/MANIFEST | 2 +- + .../shaper-indic/indic/script-assamese/MANIFEST | 1 + + .../indic/script-assamese/utrrs/LICENSE | 19 + + .../indic/script-assamese/utrrs/MANIFEST | 3 + + .../indic/script-assamese/utrrs/README | 13 + + .../indic/script-assamese/utrrs/SOURCES | 2 + + .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 4 + + .../IndicFontFeatureCodepoint-Consonants.txt | 40 + + .../IndicFontFeatureCodepoint-DependentVowels.txt | 10 + + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 11 + + .../IndicFontFeatureCodepoint-Reserved.txt | 2 + + .../IndicFontFeatureCodepoint-VariousSigns.txt | 6 + + .../indic/script-assamese/utrrs/codepoint/MANIFEST | 7 + + .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 59 + + .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 131 ++ + .../indic/script-assamese/utrrs/gpos/MANIFEST | 2 + + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 139 ++ + .../indic/script-assamese/utrrs/gsub/MANIFEST | 1 + + .../shaper-indic/indic/script-bengali/MANIFEST | 1 + + .../indic/script-bengali/utrrs/LICENSE | 19 + + .../indic/script-bengali/utrrs/MANIFEST | 3 + + .../shaper-indic/indic/script-bengali/utrrs/README | 13 + + .../indic/script-bengali/utrrs/SOURCES | 2 + + .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 1 + + .../IndicFontFeatureCodepoint-Consonants.txt | 36 + + .../IndicFontFeatureCodepoint-DependentVowels.txt | 10 + + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 12 + + .../IndicFontFeatureCodepoint-Reserved.txt | 2 + + .../IndicFontFeatureCodepoint-VariousSigns.txt | 6 + + .../indic/script-bengali/utrrs/codepoint/MANIFEST | 7 + + .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 58 + + .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 119 ++ + .../indic/script-bengali/utrrs/gpos/MANIFEST | 2 + + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 215 +++ + .../indic/script-bengali/utrrs/gsub/MANIFEST | 1 + + .../shaper-indic/indic/script-devanagari/MANIFEST | 1 + + .../indic/script-devanagari/utrrs/LICENSE | 19 + + .../indic/script-devanagari/utrrs/MANIFEST | 3 + + .../indic/script-devanagari/utrrs/README | 13 + + .../indic/script-devanagari/utrrs/SOURCES | 2 + + ...icFontFeatureCodepoint-AdditionalConsonants.txt | 8 + + .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 4 + + .../IndicFontFeatureCodepoint-Consonants.txt | 45 + + .../IndicFontFeatureCodepoint-DependentVowels.txt | 14 + + ...tFeatureCodepoint-DevnagariSpecificAddition.txt | 1 + + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + + ...ndicFontFeatureCodepoint-GenericPunctuation.txt | 2 + + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 16 + + .../IndicFontFeatureCodepoint-VariousSigns.txt | 10 + + .../script-devanagari/utrrs/codepoint/MANIFEST | 9 + + .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 185 +++ + .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 185 +++ + .../indic/script-devanagari/utrrs/gpos/MANIFEST | 2 + + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 1367 + ++++++++++++++++++++ + .../indic/script-devanagari/utrrs/gsub/MANIFEST | 1 + + .../shaper-indic/indic/script-gujarati/MANIFEST | 1 + + .../indic/script-gujarati/utrrs/LICENSE | 19 + + .../indic/script-gujarati/utrrs/MANIFEST | 3 + + .../indic/script-gujarati/utrrs/README | 13 + + .../indic/script-gujarati/utrrs/SOURCES | 2 + + .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 1 + + .../IndicFontFeatureCodepoint-Consonants.txt | 34 + + .../IndicFontFeatureCodepoint-DependentVowels.txt | 12 + + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 13 + + .../IndicFontFeatureCodepoint-Reserved.txt | 2 + + .../IndicFontFeatureCodepoint-VariousSigns.txt | 7 + + .../indic/script-gujarati/utrrs/codepoint/MANIFEST | 7 + + .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 170 +++ + .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 170 +++ + .../indic/script-gujarati/utrrs/gpos/MANIFEST | 2 + + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 1156 + +++++++++++++++++ + .../indic/script-gujarati/utrrs/gsub/MANIFEST | 1 + + .../shaper-indic/indic/script-kannada/MANIFEST | 1 + + .../indic/script-kannada/utrrs/LICENSE | 19 + + .../indic/script-kannada/utrrs/MANIFEST | 3 + + .../shaper-indic/indic/script-kannada/utrrs/README | 13 + + .../indic/script-kannada/utrrs/SOURCES | 2 + + ...icFontFeatureCodepoint-AdditionalConsonants.txt | 1 + + .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 4 + + .../IndicFontFeatureCodepoint-Consonants.txt | 40 + + .../IndicFontFeatureCodepoint-DependentVowels.txt | 13 + + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 14 + + .../IndicFontFeatureCodepoint-Reserved.txt | 2 + + .../IndicFontFeatureCodepoint-VariousSigns.txt | 9 + + .../indic/script-kannada/utrrs/codepoint/MANIFEST | 8 + + .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 188 +++ + .../indic/script-kannada/utrrs/gpos/MANIFEST | 1 + + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 306 +++++ + .../indic/script-kannada/utrrs/gsub/MANIFEST | 1 + + .../shaper-indic/indic/script-malayalam/MANIFEST | 1 + + .../indic/script-malayalam/utrrs/LICENSE | 19 + + .../indic/script-malayalam/utrrs/MANIFEST | 2 + + .../indic/script-malayalam/utrrs/README | 13 + + .../indic/script-malayalam/utrrs/SOURCES | 2 + + .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 2 + + .../IndicFontFeatureCodepoint-Consonants.txt | 36 + + .../IndicFontFeatureCodepoint-DependentVowels.txt | 12 + + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 14 + + .../IndicFontFeatureCodepoint-Reserved.txt | 2 + + .../IndicFontFeatureCodepoint-VariousSigns.txt | 4 + + .../script-malayalam/utrrs/codepoint/MANIFEST | 7 + + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 254 ++++ + .../indic/script-malayalam/utrrs/gsub/MANIFEST | 1 + + .../texts/shaper-indic/indic/script-oriya/MANIFEST | 1 + + .../shaper-indic/indic/script-oriya/utrrs/LICENSE | 19 + + .../shaper-indic/indic/script-oriya/utrrs/MANIFEST | 2 + + .../shaper-indic/indic/script-oriya/utrrs/README | 13 + + .../shaper-indic/indic/script-oriya/utrrs/SOURCES | 2 + + ...icFontFeatureCodepoint-AdditionalConsonants.txt | 3 + + .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 2 + + .../IndicFontFeatureCodepoint-Consonants.txt | 34 + + .../IndicFontFeatureCodepoint-DependentVowels.txt | 12 + + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 12 + + .../IndicFontFeatureCodepoint-OriyaSpecific.txt | 2 + + .../IndicFontFeatureCodepoint-Reserved.txt | 2 + + .../IndicFontFeatureCodepoint-VariousSigns.txt | 8 + + .../indic/script-oriya/utrrs/codepoint/MANIFEST | 9 + + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 170 +++ + .../indic/script-oriya/utrrs/gsub/MANIFEST | 1 + + .../shaper-indic/indic/script-punjabi/MANIFEST | 1 + + .../indic/script-punjabi/utrrs/LICENSE | 19 + + .../indic/script-punjabi/utrrs/MANIFEST | 3 + + .../shaper-indic/indic/script-punjabi/utrrs/README | 13 + + .../indic/script-punjabi/utrrs/SOURCES | 2 + + .../IndicFontFeatureCodepoint-Consonants.txt | 38 + + .../IndicFontFeatureCodepoint-DependentVowels.txt | 9 + + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + + .../IndicFontFeatureCodepoint-GurmukhiSpecific.txt | 6 + + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 10 + + .../IndicFontFeatureCodepoint-Reserved.txt | 2 + + .../IndicFontFeatureCodepoint-VariousSigns.txt | 6 + + .../indic/script-punjabi/utrrs/codepoint/MANIFEST | 7 + + .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 22 + + .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 2 + + .../indic/script-punjabi/utrrs/gpos/MANIFEST | 2 + + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 152 +++ + .../indic/script-punjabi/utrrs/gsub/MANIFEST | 1 + + .../shaper-indic/indic/script-sinhala/MANIFEST | 1 + + .../indic/script-sinhala/utrrs/LICENSE | 19 + + .../indic/script-sinhala/utrrs/MANIFEST | 3 + + .../shaper-indic/indic/script-sinhala/utrrs/README | 13 + + .../indic/script-sinhala/utrrs/SOURCES | 2 + + .../IndicFontFeatureCodepoint-Consonants.txt | 41 + + .../IndicFontFeatureCodepoint-DependentVowels.txt | 17 + + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 18 + + .../IndicFontFeatureCodepoint-Punctuation.txt | 1 + + .../IndicFontFeatureCodepoint-VariousSigns.txt | 3 + + .../indic/script-sinhala/utrrs/codepoint/MANIFEST | 5 + + .../utrrs/gpos/IndicFontFeatureGPOS.txt | 162 +++ + .../indic/script-sinhala/utrrs/gpos/MANIFEST | 1 + + .../utrrs/gsub/IndicFontFeatureGSUB-Conjunct.txt | 1 + + .../gsub/IndicFontFeatureGSUB-Rakaaraansaya.txt | 41 + + .../utrrs/gsub/IndicFontFeatureGSUB-Repaya.txt | 42 + + .../gsub/IndicFontFeatureGSUB-Special-Cases.txt | 2 + + .../gsub/IndicFontFeatureGSUB-TouchingLetters.txt | 1 + + .../utrrs/gsub/IndicFontFeatureGSUB-Yansaya.txt | 41 + + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 1 + + .../indic/script-sinhala/utrrs/gsub/MANIFEST | 7 + + .../texts/shaper-indic/indic/script-tamil/MANIFEST | 1 + + .../shaper-indic/indic/script-tamil/utrrs/LICENSE | 19 + + .../shaper-indic/indic/script-tamil/utrrs/MANIFEST | 3 + + .../shaper-indic/indic/script-tamil/utrrs/README | 13 + + .../shaper-indic/indic/script-tamil/utrrs/SOURCES | 2 + + .../IndicFontFeatureCodepoint-Consonants.txt | 23 + + .../IndicFontFeatureCodepoint-CurrencySymbols.txt | 1 + + .../IndicFontFeatureCodepoint-DependentVowels.txt | 11 + + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 12 + + .../IndicFontFeatureCodepoint-Numerics.txt | 3 + + .../IndicFontFeatureCodepoint-Reserved.txt | 2 + + .../IndicFontFeatureCodepoint-Symbols.txt | 6 + + .../IndicFontFeatureCodepoint-TamilSymbol.txt | 1 + + .../IndicFontFeatureCodepoint-VariousSigns.txt | 4 + + .../indic/script-tamil/utrrs/codepoint/MANIFEST | 10 + + .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 64 + + .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 44 + + .../indic/script-tamil/utrrs/gpos/MANIFEST | 2 + + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 4 + + .../indic/script-tamil/utrrs/gsub/MANIFEST | 1 + + .../shaper-indic/indic/script-telugu/MANIFEST | 1 + + .../shaper-indic/indic/script-telugu/utrrs/LICENSE | 19 + + .../indic/script-telugu/utrrs/MANIFEST | 3 + + .../shaper-indic/indic/script-telugu/utrrs/README | 13 + + .../shaper-indic/indic/script-telugu/utrrs/SOURCES | 2 + + .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 2 + + .../IndicFontFeatureCodepoint-Consonants.txt | 38 + + .../IndicFontFeatureCodepoint-DependentVowels.txt | 13 + + .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + + ...IndicFontFeatureCodepoint-IndependentVowels.txt | 14 + + .../IndicFontFeatureCodepoint-Reserved.txt | 2 + + .../IndicFontFeatureCodepoint-VariousSigns.txt | 6 + + .../indic/script-telugu/utrrs/codepoint/MANIFEST | 7 + + .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 385 ++++++ + .../indic/script-telugu/utrrs/gpos/MANIFEST | 1 + + .../utrrs/gsub/IndicFontFeatureGSUB.txt | 287 ++++ + .../indic/script-telugu/utrrs/gsub/MANIFEST | 1 + + 202 files changed, 7581 insertions(+), 1 deletion(-) + +commit 11267aef364b1cc5683ce65aaf544b7f2a127fb3 +Author: Behdad Esfahbod +Date: Fri Jan 20 13:57:14 2012 -0500 + + Fix + + test/shaping/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4e84ce48d5d41cf1bad2fb8774e5c66745b0e75e +Author: Behdad Esfahbod +Date: Fri Jan 20 13:50:55 2012 -0500 + + Move hb-diff to test/shaping/ + + {util => test/shaping}/hb-diff | 0 + util/Makefile.am | 2 -- + 2 files changed, 2 deletions(-) + +commit f868e1b84d2f73688d4d6558d44610b1ac75ec13 +Author: Behdad Esfahbod +Date: Fri Jan 20 13:50:05 2012 -0500 + + Add hb-unicode-decode + + test/shaping/{hb-read-manifest => hb-manifest-read} | 0 + .../{hb-update-manifests => hb-manifest-update} | 0 + test/shaping/hb-unicode-decode | 19 + +++++++++++++++++++ + 3 files changed, 19 insertions(+) + +commit 9ab23ef4749b51e60464b9ef2a92739cdc2b36ba +Author: Behdad Esfahbod +Date: Fri Jan 20 13:49:56 2012 -0500 + + Minor + + test/shaping/hb-unicode-prettyname | 5 +++++ + 1 file changed, 5 insertions(+) + +commit c8d81db03335192f20f08ab8fabe9869fd7350a2 +Author: Behdad Esfahbod +Date: Fri Jan 20 13:39:27 2012 -0500 + + Recognize more characters + + test/shaping/hb-unicode-prettyname | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 0016d4662d486fa32c2191df801a2792f44b273c +Author: Behdad Esfahbod +Date: Fri Jan 20 13:31:59 2012 -0500 + + [test] Make hb-unicode-prettyname take a --stdin option + + test/shaping/hb-unicode-prettyname | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +commit ad8c6446f2e0d21d065203924467f6a2c418401e +Author: Behdad Esfahbod +Date: Thu Jan 19 20:28:31 2012 -0500 + + [test/shaping] Add hb-unicode-prettyname + + test/shaping/hb-unicode-prettyname | 38 + ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 38 insertions(+) + +commit e900869b0f373d25b72d966338beb6cbc53e6446 +Author: Behdad Esfahbod +Date: Thu Jan 19 20:28:15 2012 -0500 + + [test/shaping] Add hb-read-manifest + + test/shaping/hb-read-manifest | 36 ++++++++++++++++++++++++++++++++++++ + 1 file changed, 36 insertions(+) + +commit a211cd3ffce3aa100e92d837384bbaa9decf6b09 +Author: Behdad Esfahbod +Date: Thu Jan 19 20:27:53 2012 -0500 + + Ignore AUTHORS also + + test/shaping/hb-update-manifests | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c91c4fa47140c0d6191241a832fc534b1c1514ce +Author: Behdad Esfahbod +Date: Thu Jan 19 17:51:57 2012 -0500 + + [hb-shape] Change glyphstring brackets from to [/] + + Sorry for the disruption but I need this to differentiate from the + Unicode string. + + util/options.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 36fe87d1b4bf8317074a597501d1ee52c0bec38d +Author: Behdad Esfahbod +Date: Thu Jan 19 16:55:26 2012 -0500 + + More Indic tests from Pravin + + test/api/test-shape-complex.c | 48 + +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 48 insertions(+) + +commit a33e46cf7d9862856fd7ecb04e047cc58a9785c8 +Author: Behdad Esfahbod +Date: Thu Jan 19 15:43:48 2012 -0500 + + [test/shaping] Add hb-update-manifests + + test/shaping/Makefile.am | 6 ++---- + test/shaping/hb-update-manifests | 22 + ++++++++++++++++++++++ + test/shaping/texts/shaper-indic/indic/MANIFEST | 1 + + 3 files changed, 25 insertions(+), 4 deletions(-) + +commit d4de562adf691425b15e3e9c0eec035feaa60413 +Author: Behdad Esfahbod +Date: Thu Jan 19 15:21:04 2012 -0500 + + Start adding new shaping test suite together + + configure.ac | 1 + + test/Makefile.am | 2 +- + test/shaping/Makefile.am | + 10 ++++++++++ + test/shaping/texts/MANIFEST | 3 +++ + test/shaping/texts/shaper-arabic/MANIFEST | 5 +++++ + test/shaping/texts/shaper-arabic/script-arabic/MANIFEST | 0 + test/shaping/texts/shaper-arabic/script-mandaic/MANIFEST | 0 + test/shaping/texts/shaper-arabic/script-mongolian/MANIFEST | 0 + test/shaping/texts/shaper-arabic/script-nko/MANIFEST | 0 + test/shaping/texts/shaper-arabic/script-syriac/MANIFEST | 0 + test/shaping/texts/shaper-default/MANIFEST | 0 + test/shaping/texts/shaper-indic/MANIFEST | 1 + + test/shaping/texts/shaper-indic/indic/MANIFEST | + 10 ++++++++++ + test/shaping/texts/shaper-indic/indic/script-assamese/MANIFEST | 0 + test/shaping/texts/shaper-indic/indic/script-bengali/MANIFEST | 0 + .../texts/shaper-indic/indic/script-devanagari/MANIFEST | 0 + test/shaping/texts/shaper-indic/indic/script-gujarati/MANIFEST | 0 + test/shaping/texts/shaper-indic/indic/script-kannada/MANIFEST | 0 + .../shaping/texts/shaper-indic/indic/script-malayalam/MANIFEST | 0 + test/shaping/texts/shaper-indic/indic/script-oriya/MANIFEST | 0 + test/shaping/texts/shaper-indic/indic/script-punjabi/MANIFEST | 0 + test/shaping/texts/shaper-indic/indic/script-tamil/MANIFEST | 0 + test/shaping/texts/shaper-indic/indic/script-telugu/MANIFEST | 0 + 23 files changed, 31 insertions(+), 1 deletion(-) + +commit 7a4a848db27d1605195f677c9c8632cde558aa05 +Author: Behdad Esfahbod +Date: Thu Jan 19 15:15:21 2012 -0500 + + Minor + + src/hb-ot-shape-complex-private.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 4d6dafd47f4271549e528d2e8047d50562aef399 +Author: Behdad Esfahbod +Date: Thu Jan 19 14:52:02 2012 -0500 + + Rename test/ to test/api/ + + configure.ac | 1 + + test/Makefile.am | 128 + +---------------------------------- + test/api/Makefile.am | 131 + ++++++++++++++++++++++++++++++++++++ + test/{ => api}/hb-test.h | 0 + test/{ => api}/test-blob.c | 0 + test/{ => api}/test-buffer.c | 0 + test/{ => api}/test-c.c | 0 + test/{ => api}/test-common.c | 0 + test/{ => api}/test-cplusplus.cc | 0 + test/{ => api}/test-font.c | 0 + test/{ => api}/test-object.c | 0 + test/{ => api}/test-ot-tag.c | 0 + test/{ => api}/test-shape-complex.c | 0 + test/{ => api}/test-shape.c | 0 + test/{ => api}/test-unicode.c | 0 + test/{ => api}/test-version.c | 0 + 16 files changed, 133 insertions(+), 127 deletions(-) + +commit 3b5c22c39b87155f315853fb0c40edcf14e99b54 +Author: Behdad Esfahbod +Date: Thu Jan 19 14:28:11 2012 -0500 + + Remove src/test.cc + + Not really useful. + + src/Makefile.am | 6 +-- + src/test.cc | 132 + -------------------------------------------------------- + 2 files changed, 1 insertion(+), 137 deletions(-) + +commit 4983feebbbb25e79201bf34035e4d58e61218758 +Author: Behdad Esfahbod +Date: Thu Jan 19 13:54:52 2012 -0500 + + [hb-diff] Clean up + + util/hb-diff | 41 ++++++++++++++++++++++++++--------------- + 1 file changed, 26 insertions(+), 15 deletions(-) + +commit cdc673d97c5ffedb386865a81f54a5cedcbad27c +Author: Behdad Esfahbod +Date: Thu Jan 19 12:46:18 2012 -0500 + + [hb-shape] Add --show-line-num + + Ok, much more useful as a test suite driver now. + + util/hb-shape.cc | 24 +++++------------------- + util/options.cc | 34 ++++++++++++++++++++++++++++++++++ + util/options.hh | 25 ++++++++++++++++++++----- + 3 files changed, 59 insertions(+), 24 deletions(-) + +commit cc4d9810d6318ca2e4de3b8d62f03b51cc21ee05 +Author: Behdad Esfahbod +Date: Thu Jan 19 12:32:20 2012 -0500 + + [hb-shape] Add --show-text and --show-unicode options + + util/hb-shape.cc | 19 ++++++++++++++++++- + util/options.cc | 26 +++++++++++++++++++++++--- + util/options.hh | 12 +++++++++--- + 3 files changed, 50 insertions(+), 7 deletions(-) + +commit 27c36af411c7c4d75dd25d79fc76dd92c6bb9643 +Author: Behdad Esfahbod +Date: Thu Jan 19 12:30:43 2012 -0500 + + Fix OOB in hb-shape + + util/options.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8d2781d69274672303e30522e222bd01c6b5e781 +Author: Behdad Esfahbod +Date: Thu Jan 19 11:36:39 2012 -0500 + + [test] Add two Indic test cases from Bernard Massot + + test/test-shape-complex.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +commit 8750abaf8410005facbea8c886c592bead7f959b +Author: Behdad Esfahbod +Date: Wed Jan 18 22:47:44 2012 -0500 + + [util] Add --help-features + + Patch from Khaled Hosny. + + util/options.cc | 42 +++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 41 insertions(+), 1 deletion(-) + +commit 889caa52fa1bef61013ec1d127f84d7d5907ef1e +Author: Behdad Esfahbod +Date: Wed Jan 18 22:32:52 2012 -0500 + + [icu] Use U_FAILURE + + src/hb-icu.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 36a4f4a482456ee816dcb59befa0b0538ba487df +Author: Behdad Esfahbod +Date: Wed Jan 18 22:16:49 2012 -0500 + + Replace u_strlen() with u_countChar32() + + The latter is what I meant. + + src/hb-icu.cc | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +commit 055fb24d03ae518fa0aa6c2860a03f3cb6a5ef0d +Author: Behdad Esfahbod +Date: Wed Jan 18 21:58:34 2012 -0500 + + Add test for bug in ICU decompose + + As reported by Kenichi Ishibashi on 2011-10-28. + + test/test-unicode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c521e793bd6c1dafacb94253a45b9c70ab38525e +Author: Behdad Esfahbod +Date: Wed Jan 18 21:51:05 2012 -0500 + + Fix OOB in replace_glyph() + + Patch from Kenichi Ishibashi. + + src/hb-buffer.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 03408ce73d003ed4e58e3f8472f9445e72b86bee +Author: Behdad Esfahbod +Date: Wed Jan 18 21:28:34 2012 -0500 + + Fix more possible buffer overruns + + I have this function, but can't clean up it to my satisfaction. + + src/hb-ot-layout-gsubgpos-private.hh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 7d479900cd11bc88148cd601ee43bc5492ce5843 +Author: Behdad Esfahbod +Date: Wed Jan 18 21:19:32 2012 -0500 + + Refactor the two remaining uses of _hb_ot_layout_skip_mark() + + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 7 +++++-- + 2 files changed, 6 insertions(+), 3 deletions(-) + +commit 506ffeb8e77a668fa305139582d215c32e46bb03 +Author: Behdad Esfahbod +Date: Wed Jan 18 16:07:53 2012 -0500 + + Further mark skippy fixes from Jonathan Kew + + We should be in good shape now. + + src/hb-ot-layout-gsubgpos-private.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit a4a48fe6d4f884a37e720430347d10dbe3562a79 +Author: Behdad Esfahbod +Date: Tue Jan 17 18:08:41 2012 -0500 + + Fix mark skipping regression + + Ouch! + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4ab97311541225906f6b737a2b47de252224cc09 +Author: Behdad Esfahbod +Date: Mon Jan 16 22:05:08 2012 -0500 + + Refactor mark skipping + + src/hb-ot-layout-gpos-table.hh | 95 ++++++++++---------------- + src/hb-ot-layout-gsub-table.hh | 21 +++--- + src/hb-ot-layout-gsubgpos-private.hh | 125 + +++++++++++++++++++++++++++-------- + 3 files changed, 143 insertions(+), 98 deletions(-) + +commit 370f03e9c69d98d735eafb7e72b13b17f42cbaa9 +Author: Behdad Esfahbod +Date: Mon Jan 16 17:03:55 2012 -0500 + + Minor + + src/hb-ot-layout-gsub-table.hh | 5 ++--- + src/hb-ot-layout-gsubgpos-private.hh | 6 ++---- + 2 files changed, 4 insertions(+), 7 deletions(-) + +commit 4d3aeb8cb2bc1ca7cdd03ba28ba8c334f12d4c03 +Author: Behdad Esfahbod +Date: Mon Jan 16 16:43:26 2012 -0500 + + [GSUB/GPOS] Fix mark skip indexing issues + + Mozilla bug 701637 and 714067 combined. + + Patch from Jonathan Kew. + + src/hb-ot-layout-gpos-table.hh | 42 + ++++++++++++++++----------------- + src/hb-ot-layout-gsub-table.hh | 21 +++++++++-------- + src/hb-ot-layout-gsubgpos-private.hh | 45 + ++++++++++++++++++------------------ + 3 files changed, 54 insertions(+), 54 deletions(-) + +commit e8eedf2687f05372bf5476e84139d01ba67c9f73 +Author: Behdad Esfahbod +Date: Mon Jan 16 16:39:40 2012 -0500 + + Avoid enum trailing commas + + Based on patch from Jonathan Kew. + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + src/hb-ot-shape-complex-private.hh | 2 ++ + 2 files changed, 4 insertions(+), 2 deletions(-) + +commit 3d0ddd12801689b4093ffca97da4dd9ca669b64a +Author: Behdad Esfahbod +Date: Sun Jan 15 15:55:52 2012 -0500 + + Require glib >= 2.16 for the gobject option + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 95ab82a992ab916046c2e6205db7cadeec88d206 +Author: Behdad Esfahbod +Date: Sun Jan 15 14:56:56 2012 -0500 + + Disable gtk-doc macro + + We don't have any docs yet. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 299ae0c3a367c84a835eadbd1276ca284d2720c0 +Author: Behdad Esfahbod +Date: Sat Jan 14 21:29:45 2012 -0500 + + [icu] Remove glib-ism + + src/hb-icu.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a097043f9a81e6c20caf69a5dabdf9e00438d79b +Author: Behdad Esfahbod +Date: Sat Jan 14 17:55:51 2012 -0500 + + Allow space in one more place when parsing features + + util/options.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit af92135424b994062648f4fb7e26af0bd970a4b1 +Author: Behdad Esfahbod +Date: Fri Oct 21 09:18:43 2011 -0700 + + Minor + + src/hb-object-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 89d89646e8163b6c0874b9a3c14d4da974ea8219 +Author: Behdad Esfahbod +Date: Mon Oct 17 11:50:54 2011 -0700 + + Fix intrin.h b0rkage with older MSVC + + Reported by Jonathan Kew. + + src/hb-object-private.hh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit af913c5788e600e36d29f44fe4e77db84cf8c442 +Author: Behdad Esfahbod +Date: Mon Oct 17 11:39:28 2011 -0700 + + Fix infinite loop in normalization code with variation selectors + + Reported by Jonathan Kew. + + src/hb-ot-shape-normalize.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit fd528c17b7b5ac912f1ac980e1d9981f561c3b46 +Author: Behdad Esfahbod +Date: Wed Oct 12 15:03:58 2011 -0400 + + [util] Add --list-shapers to hb-view and hb-shape + + util/options.cc | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +commit a17554bfd51dc8a37b1674d1ede63e616618e0a6 +Author: Behdad Esfahbod +Date: Wed Sep 28 16:57:34 2011 -0400 + + Make test-c.c actually use hb + + This will make sure we test that C code can actually link to the + library. + + test/test-c.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 55deff7595ef357d000fef83559c74c9f8acad00 +Author: Behdad Esfahbod +Date: Wed Sep 28 16:20:09 2011 -0400 + + Add comments + + src/hb-ot-shape-normalize.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit a240d5a0a3ccc71902e7a341b6d531995319999d +Author: Behdad Esfahbod +Date: Tue Sep 27 13:50:45 2011 -0400 + + Add TODO item + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 52ebdff49d13f239efc886de935d47be9860f6e5 +Author: Behdad Esfahbod +Date: Tue Sep 27 12:38:16 2011 -0400 + + Fix GSUB lookuptype 1 subtype 1 delta wrapping + + src/hb-ot-layout-gsub-table.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 5857720cd35078d1c3906c8b2db3190b5166b66f +Author: Behdad Esfahbod +Date: Tue Sep 27 12:36:26 2011 -0400 + + [util] s/%d/%u/ when printing glyph ids and clusters + + util/options.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit b95324cdd217f44c40c5fd44898e659500f19511 +Author: Behdad Esfahbod +Date: Wed Sep 21 16:50:39 2011 -0400 + + Minor + + src/hb-blob.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0cd33592ab4bb486ffc438ba0efdac2fa7a1bb7f +Author: Behdad Esfahbod +Date: Wed Sep 21 16:49:33 2011 -0400 + + Fix possible leaks + + src/hb-font.cc | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +commit d3f3690b485e1d240fec4f204aef54e07853a244 +Author: Behdad Esfahbod +Date: Wed Sep 21 16:41:43 2011 -0400 + + hb-shape: In --no-glyph-names, output glyph number directly + + Ie. write "86" instead of "gid86". + + util/options.cc | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +commit 088c1e27c0fc0cdef999cf1f567e4d5eb2cfb2e4 +Author: Behdad Esfahbod +Date: Tue Sep 20 14:43:55 2011 -0400 + + [util] Fix option parsing + + Wow, who knew bool is one byte and I was using it as a 4byte int?! + + C++ auto casts fails you in mysterious ways... + + util/helper-cairo.cc | 2 +- + util/options.cc | 3 ++- + util/options.hh | 14 +++++++------- + 3 files changed, 10 insertions(+), 9 deletions(-) + +commit d606daa4cca323c8977b2e52e6863dc0f1b72fa9 +Author: Behdad Esfahbod +Date: Tue Sep 20 14:34:06 2011 -0400 + + Whitespace + + src/gen-arabic-table.py | 2 +- + src/gen-indic-table.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit e700bce1189465a159a7c3c179f231be224f31cc +Author: Behdad Esfahbod +Date: Tue Sep 20 11:20:53 2011 -0400 + + [util] Add hb-diff + + A diff program written in Python that is more suitable for comparing + hb-shape output from different backends. Main differences with stock + diff: + + 1. It outputs one line's comparison at a time, as opposed to batching + '+' lines and '-' lines. + + 2. It colors the part of the line that changed, taking word boundaries + into consideration. + + You can pipe the colored output to 'less -r'. + + util/Makefile.am | 2 ++ + util/hb-diff | 59 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 61 insertions(+) + +commit 880c1f0e4ede65890592d28dfb38bb06f5b57500 +Author: Behdad Esfahbod +Date: Mon Sep 19 23:10:22 2011 -0400 + + Rewrite ICU detection code with in-house macros + + At least works for cross-compiling now... + + configure.ac | 26 +++++++++++++++----------- + 1 file changed, 15 insertions(+), 11 deletions(-) + +commit f83f0f4836691b04306c2ef80979f2e1d76a2f28 +Author: Behdad Esfahbod +Date: Mon Sep 19 18:51:48 2011 -0400 + + [graphite] Add note about graphite shaker brokenness + + src/hb-graphite2.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 422558142aabb996d8ad1848df7ea4d5a8ade98a +Author: Behdad Esfahbod +Date: Mon Sep 19 17:57:02 2011 -0400 + + [util] Account for line-space in surface size + + util/options.cc | 2 +- + util/options.hh | 1 - + util/view-cairo.cc | 2 +- + 3 files changed, 2 insertions(+), 3 deletions(-) + +commit b5afd8f78e6b372f1bbed469329c1554adb20eea +Author: Behdad Esfahbod +Date: Mon Sep 19 16:56:21 2011 -0400 + + [util] Rename --output to --output_file, and --format to + --output-format + + util/options.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0a965eee880428a43ad7f9d1317c344666247dd7 +Author: Behdad Esfahbod +Date: Mon Sep 19 16:53:47 2011 -0400 + + Minor + + src/hb-ot-shape-complex-indic.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 466393c2f04fb5b3dcb3e81ea9609905fa8c9648 +Author: Behdad Esfahbod +Date: Mon Sep 19 16:50:18 2011 -0400 + + Really fix build this time + + util/hb-view.hh | 1 - + 1 file changed, 1 deletion(-) + +commit fe1605db4f28ed75d5debe0db45a19aa77f0585f +Author: Behdad Esfahbod +Date: Mon Sep 19 16:49:03 2011 -0400 + + Fix dist + + util/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit 8b8b19056decaf09e4e0ccd9412ee1aeb30f4de7 +Author: Behdad Esfahbod +Date: Mon Sep 19 16:41:17 2011 -0400 + + [util] Add hb-shape utility + + Like hb-view, but prints out buffer contents. + + The output format is kinda cryptic. Suggestions welcome. + + configure.ac | 6 - + util/Makefile.am | 44 +++-- + util/{common.cc => hb-shape.cc} | 57 ++++-- + util/hb-view.cc | 44 +---- + util/hb-view.hh | 79 ++++++++ + util/helper-cairo.cc | 375 + +++++++++++++++++++++++++++++++++++ + util/{common.hh => helper-cairo.hh} | 64 ++++-- + util/options.cc | 79 ++++++++ + util/options.hh | 53 ++++- + util/view-cairo.cc | 381 + ++---------------------------------- + util/view-cairo.hh | 8 +- + 11 files changed, 717 insertions(+), 473 deletions(-) + +commit eb2d8be7a8ede0c0f5e346cf06516792f83f36f7 +Author: Behdad Esfahbod +Date: Mon Sep 19 16:15:22 2011 -0400 + + Minor + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit f6496663c2f6849a944e41afcf9511f378477532 +Author: Behdad Esfahbod +Date: Mon Sep 19 15:45:52 2011 -0400 + + [util] If no text is provided, simply call cairo_show_glyphs() + + util/view-cairo.cc | 92 + ++++++++++++++++++++++++++++++------------------------ + 1 file changed, 51 insertions(+), 41 deletions(-) + +commit 5c299343118d1eaff32ffb2a5dac077cfff67dee +Author: Behdad Esfahbod +Date: Mon Sep 19 14:53:26 2011 -0400 + + [uniscribe] Various improvements + + src/hb-uniscribe.cc | 30 +++++++++++++++++++----------- + 1 file changed, 19 insertions(+), 11 deletions(-) + +commit 11e51993ab562d4c7460eb7c43d0e97404e628e7 +Author: Behdad Esfahbod +Date: Mon Sep 19 09:58:55 2011 -0400 + + [util] Move font-size into view-options + + util/options.cc | 2 +- + util/options.hh | 7 +++---- + util/view-cairo.cc | 4 ++-- + 3 files changed, 6 insertions(+), 7 deletions(-) + +commit 0fe296019746689551d224a5f6fb7e0ebe1b91dc +Author: Behdad Esfahbod +Date: Sat Sep 17 09:59:58 2011 -0400 + + Fix Linux build when io.h is available + + Bug 40953 - fail compile git: make[2]: *** [hb_view-options.o] Error 1 + + configure.ac | 2 +- + util/options.cc | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit d2b3ab9ecebbf46cb9dac1f09c17379c50ea4575 +Author: Behdad Esfahbod +Date: Fri Sep 16 16:59:17 2011 -0400 + + Fix "[util] Fix hb-view crash with bogus font." + + util/view-cairo.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit da4a2a1426ee3aa9d9678ec12c9ba4dfcba0bcf8 +Author: Behdad Esfahbod +Date: Fri Sep 16 16:56:34 2011 -0400 + + Cosmetic + + util/view-cairo.cc | 31 +++++++++++++++++++++++-------- + 1 file changed, 23 insertions(+), 8 deletions(-) + +commit 4274ed7ab6fb03fbf8eaaa43ab06647dc0beed79 +Author: Behdad Esfahbod +Date: Fri Sep 16 16:52:26 2011 -0400 + + [util] Fix hb-view crash with bogus font + + util/view-cairo.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 5ddd9cc499f2470eca239ae357a5c8a3626c0809 +Author: Behdad Esfahbod +Date: Fri Sep 16 16:40:44 2011 -0400 + + Minor + + src/hb-private.hh | 2 +- + src/hb-unicode-private.hh | 4 ++-- + src/test.cc | 4 ++-- + util/common.hh | 2 +- + util/options.cc | 8 ++++---- + 5 files changed, 10 insertions(+), 10 deletions(-) + +commit 652d64aa8d32d914bf3ee2f2c451de103fea8fa9 +Author: Behdad Esfahbod +Date: Fri Sep 16 16:34:39 2011 -0400 + + TODO items + + TODO | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 947c9a778c0d4b428b58806f98c34ede59b7439c +Author: Behdad Esfahbod +Date: Fri Sep 16 16:33:18 2011 -0400 + + Minor + + src/hb-ot-shape-normalize.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d5476a30a10da5e54783c8dbf04340225a9a00d7 +Author: Behdad Esfahbod +Date: Fri Sep 16 12:30:50 2011 -0400 + + Minor + + src/hb-object-private.hh | 26 +++++++++++++++----------- + 1 file changed, 15 insertions(+), 11 deletions(-) + +commit 55aeb0490454cc1ba93a42f307ed1230f59dee4b +Author: Behdad Esfahbod +Date: Fri Sep 16 02:08:36 2011 -0400 + + Fix reading text from stdin + + util/options.cc | 76 + +++++++++++++++++++++++++++++++++++------------------- + util/options.hh | 16 +++++++----- + util/view-cairo.cc | 6 +++-- + 3 files changed, 64 insertions(+), 34 deletions(-) + +commit a75c1b125159f6cfb6b652a9ec40803f7c7e3f71 +Author: Behdad Esfahbod +Date: Fri Sep 16 01:16:41 2011 -0400 + + Move code around + + util/options.cc | 27 +++++++++++++++++++++++++-- + util/options.hh | 20 +------------------- + 2 files changed, 26 insertions(+), 21 deletions(-) + +commit 7bf6ecd3bfb1ccf5d9ac6fe274efa74b46885fea +Author: Behdad Esfahbod +Date: Fri Sep 16 01:11:30 2011 -0400 + + Always shape at size=upem + + Fixes bug with uniscribe not handling GIGANTIC sizes. + + util/options.cc | 2 +- + util/view-cairo.cc | 8 ++++---- + util/view-cairo.hh | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +commit 674ee58d9bc9f825d769220d77f58513edae4558 +Author: Behdad Esfahbod +Date: Fri Sep 16 00:54:05 2011 -0400 + + Minor + + util/options.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 4451168e5d1ea26560899e9a9733b3a3f1853050 +Author: Behdad Esfahbod +Date: Fri Sep 16 00:38:19 2011 -0400 + + Fix binary stdin/stdout io in Windows + + Make --font-file accept "-" to mean stdin, and have it work + in Windows too! + + configure.ac | 2 +- + util/common.hh | 5 +++++ + util/options.cc | 64 + +++++++++++++++++++++++++++++++++++++++++++++++---------- + util/options.hh | 10 +++++++-- + 4 files changed, 67 insertions(+), 14 deletions(-) + +commit 639b5957d9c7b6d8bef6784e3467ccc055ddeea4 +Author: Behdad Esfahbod +Date: Thu Sep 15 18:09:49 2011 -0400 + + Minor + + util/options.cc | 5 +++-- + util/options.hh | 4 ++-- + 2 files changed, 5 insertions(+), 4 deletions(-) + +commit f7e2ef74f856ee13d6fd6cf3f1e04bc162203bc2 +Author: Behdad Esfahbod +Date: Thu Sep 15 17:52:00 2011 -0400 + + [hb-view] Make print to stdout work in Windows + + Apparently there's no equivalent to "/dev/stdout", so write using + stdio to be able to output to stdout. + + util/common.hh | 1 + + util/options.hh | 31 ++++++++++++++++----- + util/view-cairo.cc | 79 + ++++++++++++++++++++++++++++++++++++------------------ + 3 files changed, 78 insertions(+), 33 deletions(-) + +commit 36b10f58cc70ce9570d17b30616f9cb27423e03b +Author: Behdad Esfahbod +Date: Thu Sep 15 16:29:51 2011 -0400 + + Minor + + src/hb-ot-shape-normalize.cc | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit c4611cb66f8e3a133ec00e3ace62ef19d9b95b28 +Author: Behdad Esfahbod +Date: Tue Sep 13 13:33:11 2011 -0400 + + Fix test + + src/hb-graphite2.h | 1 + + src/hb-ot-shape.h | 1 + + src/hb-uniscribe.h | 1 + + 3 files changed, 3 insertions(+) + +commit b9b10ad78b1f977494a3a42b58f8040fe16505a3 +Author: Behdad Esfahbod +Date: Tue Sep 13 13:30:39 2011 -0400 + + [util] Refactor hb-view completely + + Now we can use the same code to do other utils... + + configure.ac | 2 + + util/Makefile.am | 2 + + util/common.cc | 7 +- + util/common.hh | 2 +- + util/hb-view.cc | 244 ++++------------------------- + util/options.cc | 321 ++++++++++++++++++++++++++------------ + util/options.hh | 179 +++++++++++++++++++--- + util/view-cairo.cc | 440 + +++++++++++++++++++++++++++++++++++++++++++++++++++++ + util/view-cairo.hh | 63 ++++++++ + 9 files changed, 927 insertions(+), 333 deletions(-) + +commit bc4b07b05ea9e39eb9f966eb2c3e1c737efa77ff +Author: Behdad Esfahbod +Date: Thu Sep 8 17:08:32 2011 -0400 + + More reshuffling + + util/hb-view.cc | 4 ++-- + util/options.cc | 64 + ++++++++++++++++++++++++++++++--------------------------- + util/options.hh | 13 ++++++------ + 3 files changed, 43 insertions(+), 38 deletions(-) + +commit 516857eb51bbb79ff4adf44e3fefbf460f9ee8f8 +Author: Behdad Esfahbod +Date: Thu Sep 8 16:50:24 2011 -0400 + + [util] Simplify more + + util/options.hh | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +commit 4f4b114a5592c2f5d128ee795f159b438ad97829 +Author: Behdad Esfahbod +Date: Thu Sep 8 16:49:02 2011 -0400 + + [util] Move code around + + util/hb-view.cc | 8 +------- + util/options.hh | 14 ++++++++++++++ + 2 files changed, 15 insertions(+), 7 deletions(-) + +commit 46d86a73a103b061144018c3fe947b57548fc58f +Author: Behdad Esfahbod +Date: Thu Sep 8 16:43:15 2011 -0400 + + Minor + + We now support using -1 for NUL-terminated strings. + + util/hb-view.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit 90e312cb85df7a6dc350cb62138ab950790e3d15 +Author: Behdad Esfahbod +Date: Thu Sep 8 16:42:37 2011 -0400 + + [util] Move code around + + util/hb-view.cc | 5 ----- + util/options.hh | 4 ++++ + 2 files changed, 4 insertions(+), 5 deletions(-) + +commit 109cb382898f491eed733dba4ef5ba12de94aaf6 +Author: Behdad Esfahbod +Date: Thu Sep 8 16:00:04 2011 -0400 + + [util] Further refactor option parsing + + util/options.cc | 80 + +++++++++++++++++++++++++++++++++++++++++++++++---------- + util/options.hh | 20 ++++++++++++--- + 2 files changed, 83 insertions(+), 17 deletions(-) + +commit bc187e5ac7433f5561b0e97e8c62172c73883f3f +Author: Behdad Esfahbod +Date: Thu Sep 8 13:35:17 2011 -0400 + + Refine Indic scripts, following Martin Hosken's recommendation + + src/hb-ot-shape-complex-private.hh | 56 + +++++++++++++++++++++++--------------- + 1 file changed, 34 insertions(+), 22 deletions(-) + +commit 738d096a06822e63b3894bd817ecb90e5fb94f73 +Author: Behdad Esfahbod +Date: Fri Sep 2 13:31:19 2011 -0400 + + Pass through unknown ISO 639-3 language tags to OpenType engine + + In hb_ot_tag_from_language(), if first component of an unknown + language is three letters long, use it directly as OpenType language + tag (after case conversion and padding). + + src/hb-ot-tag.cc | 8 ++++++++ + test/test-ot-tag.c | 5 +++++ + 2 files changed, 13 insertions(+) + +commit ea02cbf03c084b3ead6e9e4c9af07b3b47608d5b +Author: Behdad Esfahbod +Date: Fri Sep 2 12:39:20 2011 -0400 + + [graphite] Don't preload glyphs + + Doesn't seem to be slower. + + src/hb-graphite2.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 210a06f3d7bd2df55ebd1743da74f327c5a7a967 +Author: Behdad Esfahbod +Date: Fri Aug 26 13:39:49 2011 +0200 + + Minor + + src/hb-graphite2.h | 12 ++++++------ + src/hb-ot-shape.h | 1 - + src/hb-uniscribe.h | 1 - + 3 files changed, 6 insertions(+), 8 deletions(-) + +commit 4a8d2e379a34b19bccc72bc3e2d9ace3fdd27733 +Author: Behdad Esfahbod +Date: Fri Aug 26 09:40:54 2011 +0200 + + [graphite2] Chop a few more lines + + src/hb-graphite2.cc | 13 ++++--------- + 1 file changed, 4 insertions(+), 9 deletions(-) + +commit 81ec289da799bd2f50da9382507c606d2c779ab9 +Author: Behdad Esfahbod +Date: Fri Aug 26 09:33:06 2011 +0200 + + Minor + + src/hb-graphite2.cc | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +commit 3380de5abbaff535e1cf57ea7e5c2a7c4fdcfe66 +Author: Behdad Esfahbod +Date: Fri Aug 26 09:30:49 2011 +0200 + + [graphite] Use buffer->replace_glyphs() + + src/hb-graphite2.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 9ebe8c0286856d46430ae184ba7303bd34485883 +Author: Behdad Esfahbod +Date: Fri Aug 26 09:29:42 2011 +0200 + + Add buffer->replace_glyphs() + + src/hb-buffer-private.hh | 3 +++ + src/hb-buffer.cc | 26 ++++++++++++++++++++++++++ + 2 files changed, 29 insertions(+) + +commit a5edb1031c204464da4f852ba3d90e8cc20cd20e +Author: Behdad Esfahbod +Date: Fri Aug 26 09:27:13 2011 +0200 + + Minor + + src/hb-graphite2.cc | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 290e3ee51727df75d136ccfff79831b94d1583b6 +Author: Behdad Esfahbod +Date: Fri Aug 26 09:25:04 2011 +0200 + + [graphite] Only pass the first part language tag to graphite + + Still not sure about: + + 1) Case. We pass lowercase for now. Would be nice if graphite was + uppercase 3letter like OpenType, + + 2) Padding. IMO, tag padding is always with spaces, but Martin was + talking about NUL bytes. + + src/hb-graphite2.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 4c9fe88d30036340fe592bcbc375049b84602b8b +Author: Behdad Esfahbod +Date: Fri Aug 26 09:18:53 2011 +0200 + + [API] Make all _from_string() functions take a len parameter + + Can be -1 for NUL-terminated string. This is useful for passing parts + of a larger string to a function without having to copy or modify the + string first. + + Affected functions: + + hb_tag_t hb_tag_from_string() + hb_direction_from_string() + hb_language_from_string() + hb_script_from_string() + + src/hb-common.cc | 29 +++++++++++++------- + src/hb-common.h | 12 +++++--- + src/hb-graphite2.cc | 2 +- + src/hb-icu.cc | 2 +- + src/hb-ot-tag.cc | 8 +++--- + test/test-buffer.c | 4 +-- + test/test-common.c | 79 + +++++++++++++++++++++++++++++++---------------------- + test/test-ot-tag.c | 22 +++++++-------- + util/hb-view.cc | 6 ++-- + util/options.cc | 5 +--- + 10 files changed, 96 insertions(+), 73 deletions(-) + +commit a499bdea5cc5097dec62eeafdef58d08ba534be0 +Author: Behdad Esfahbod +Date: Thu Aug 25 22:46:21 2011 +0200 + + [graphite2] Bail if grface is NULL + + src/hb-graphite2.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 3007ffa9e53e6100a761c2363f50a2b19a0764fc +Author: Behdad Esfahbod +Date: Thu Aug 25 09:08:53 2011 +0200 + + Reorder combining-class to better suit Arabic shadda mark-mark + positioning + + As reported by Khaled on the list: + + "After the introduction of canonical reordering of combining marks + (commit 34c22f8), I'm no longer able to do mark/mark substitution or + positioning for mark sequences that involve shadda as a first mark (or + most interesting sequences at least). + + "After some digging, it turned out that shadda have a ccc=33 + while most + Arabic marks that combine with it have a lower ccc value, which + results + in the shadda being reordered after the other mark which, + unsurprisingly, breaks my contextual substitution and mkmk anchors." + + See: + + http://unicode.org/faq/normalization.html#8 + http://unicode.org/faq/normalization.html#9 + + src/hb-ot-shape-private.hh | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +commit 74ef81a0b0f9adddfb42c3cb87f08f8156054519 +Author: Behdad Esfahbod +Date: Wed Aug 24 19:16:13 2011 +0200 + + Fix make distcheck + + src/Makefile.am | 15 ++++++++------- + src/hb-gobject-enums.cc.tmpl | 2 +- + 2 files changed, 9 insertions(+), 8 deletions(-) + +commit 24bcdbcc0639ca9e9c0fde1a71cbbf1c3d2ef98d +Author: Behdad Esfahbod +Date: Wed Aug 24 19:13:15 2011 +0200 + + Add hb-ot-hmtx-table.hh + + Oops! + + src/hb-ot-hmtx-table.hh | 86 + +++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 86 insertions(+) + +commit a3bd8a0e1862212a2d4141b973039bd000a3054f +Author: Behdad Esfahbod +Date: Wed Aug 24 03:22:49 2011 +0200 + + [graphite] Rewrite properly + + src/hb-graphite2.cc | 633 + ++++++++++++++++++++++------------------------------ + src/hb-uniscribe.cc | 2 + + 2 files changed, 273 insertions(+), 362 deletions(-) + +commit 5072934c35bddc23d6bcb07a41010da51eb1b090 +Author: Behdad Esfahbod +Date: Wed Aug 24 02:24:27 2011 +0200 + + Minor + + src/hb-uniscribe.cc | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 46377396accf6b43792ffba553dcd9847608aa86 +Author: Behdad Esfahbod +Date: Wed Aug 24 02:12:05 2011 +0200 + + [configure] Fix graphite bits + + configure.ac | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 71388b3ee71c7d3b79f842db7588bd683691797c +Author: Behdad Esfahbod +Date: Wed Aug 24 02:09:04 2011 +0200 + + [uniscribe] Minor + + src/hb-uniscribe.cc | 19 +++++++++---------- + 1 file changed, 9 insertions(+), 10 deletions(-) + +commit cd2b901027bd154e31aa509c0cb2d86633e36398 +Author: Behdad Esfahbod +Date: Wed Aug 24 01:47:25 2011 +0200 + + [graphite] Minor + + src/hb-graphite2.cc | 10 ++++------ + src/hb-shape.cc | 1 - + 2 files changed, 4 insertions(+), 7 deletions(-) + +commit 834af3b48a1aca3e53811d1eb4ca09b582b8e598 +Author: Behdad Esfahbod +Date: Wed Aug 24 01:45:47 2011 +0200 + + [graphite] Remove hb_graphite2_feature_check() + + I don't see how this function can be useful. + + src/hb-graphite2.cc | 10 ---------- + src/hb-graphite2.h | 2 -- + 2 files changed, 12 deletions(-) + +commit 1f49cf32c96cb45a4d8ba2c210aeb7a8076b4762 +Author: Behdad Esfahbod +Date: Wed Aug 24 01:29:25 2011 +0200 + + Add graphite2 integration from Martin Hosken + + To be modified, a lot. + + configure.ac | 9 +- + contrib/python/lib/harfbuzz.pyx | 20 +- + contrib/python/runpy | 2 - + contrib/python/scripts/hbtestfont | 4 +- + contrib/python/setup.py | 18 +- + src/Makefile.am | 7 + + src/hb-graphite2.cc | 446 + ++++++++++++++++++++++++++++++++++++++ + src/hb-graphite2.h | 47 ++++ + src/hb-shape.cc | 7 + + 9 files changed, 542 insertions(+), 18 deletions(-) + +commit 0e6d36d8a3f9f533cb6eb04408af62bfd1ad83da +Author: Behdad Esfahbod +Date: Wed Aug 24 01:31:29 2011 +0200 + + Minor + + src/Makefile.am | 2 +- + src/{hb-uniscribe-shape.cc => hb-uniscribe.cc} | 0 + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit efde8113258b117ec0a7fbffe6d681442d045c41 +Author: Behdad Esfahbod +Date: Tue Aug 23 00:04:57 2011 +0200 + + Add a constructor for hb_prealloced_array_t + + Fixes build with MSVC. + + src/hb-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit d75333f166d21e9b9f2341c3bc8a9ef8a886f4b3 +Author: Behdad Esfahbod +Date: Fri Aug 19 19:59:24 2011 +0200 + + Add gobject enum support, but disabled for now + + need to figure out the naming. The generated code doesn't have the + right name. + + configure.ac | 2 + + src/Makefile.am | 13 +++-- + src/hb-gobject-enums.cc.tmpl | 74 + ++++++++++++++++++++++++++++ + src/{hb-gobject.cc => hb-gobject-structs.cc} | 0 + 4 files changed, 86 insertions(+), 3 deletions(-) + +commit 7d235d272f4c9213f54c9c807fb8fba5068c45b0 +Author: Behdad Esfahbod +Date: Wed Aug 17 23:55:29 2011 +0200 + + Flesh out tt funcs a bit + + src/hb-tt-font.cc | 36 +++++++++++++++++++++++++++++++++++- + 1 file changed, 35 insertions(+), 1 deletion(-) + +commit b9415e76d7b41da203b9ae85e38b6dc777481184 +Author: Behdad Esfahbod +Date: Wed Aug 17 19:21:44 2011 +0200 + + [API] Add hb_font_set_funcs_data() + + src/hb-font.cc | 15 +++++++++++++++ + src/hb-font.h | 6 ++++++ + 2 files changed, 21 insertions(+) + +commit e6c09cdf43201ff1b7f38e411ae1f9977e4f9271 +Author: Behdad Esfahbod +Date: Wed Aug 17 19:07:59 2011 +0200 + + Remove the pre_allocate argument from hb_buffer_create() + + For two reasons: + + 1. User can always call hb_buffer_pre_allocate() themselves, and + + 2. Now we do a pre_alloc in add_utfX anyway, so the total number of + reallocs is limited to a small number (~3) anyway. This just + makes the + API cleaner. + + src/hb-buffer.cc | 7 +------ + src/hb-buffer.h | 2 +- + src/test.cc | 2 +- + test/test-buffer.c | 9 ++++----- + test/test-object.c | 4 ++-- + test/test-shape-complex.c | 2 +- + test/test-shape.c | 2 +- + util/hb-view.cc | 2 +- + 8 files changed, 12 insertions(+), 18 deletions(-) + +commit 187bdeaa6c82fcb95fdd546da9c78b843e1dea0e +Author: Behdad Esfahbod +Date: Wed Aug 17 19:03:06 2011 +0200 + + Do (nothing for) hmtx sanitize + + src/hb-ot-hhea-table.hh | 1 - + src/hb-tt-font.cc | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit d6016e49108be183ab2dc9c226447d1db3a09b90 +Author: Behdad Esfahbod +Date: Wed Aug 17 14:47:41 2011 +0200 + + Fix name-table sanitize + + src/hb-ot-name-table.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ae9877dea6a1aed3566d9b87a75ede84259deaca +Author: Behdad Esfahbod +Date: Wed Aug 17 14:43:45 2011 +0200 + + Add hhea-table support + + src/Makefile.am | 1 + + src/hb-open-type-private.hh | 6 ++ + src/hb-ot-head-table.hh | 2 +- + src/hb-ot-hhea-table.hh | 93 ++++++++++++++++++ + src/hb-ot-layout-gdef-table.hh | 2 +- + src/hb-ot-layout-gpos-table.hh | 2 +- + src/hb-ot-layout-gsub-table.hh | 2 +- + src/hb-ot-maxp-table.hh | 2 +- + src/hb-ot-name-table.hh | 3 +- + src/hb-tt-font.cc | 207 + +++++++++++++++++++++++++++++++++++++++++ + 10 files changed, 314 insertions(+), 6 deletions(-) + +commit 7a750ac33ec482e2c4856c19ea607f3563741c24 +Author: Behdad Esfahbod +Date: Wed Aug 17 14:19:59 2011 +0200 + + Rename table files from eg maxp-private.hh to maxp-table.hh + + src/Makefile.am | 12 + ++++++------ + src/hb-font.cc | 2 +- + src/{hb-ot-head-private.hh => hb-ot-head-table.hh} | 6 +++--- + ...-ot-layout-gdef-private.hh => hb-ot-layout-gdef-table.hh} | 6 +++--- + ...-ot-layout-gpos-private.hh => hb-ot-layout-gpos-table.hh} | 6 +++--- + ...-ot-layout-gsub-private.hh => hb-ot-layout-gsub-table.hh} | 6 +++--- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-ot-layout.cc | + 8 ++++---- + src/{hb-ot-maxp-private.hh => hb-ot-maxp-table.hh} | 6 +++--- + src/{hb-ot-name-private.hh => hb-ot-name-table.hh} | 6 +++--- + src/hb-uniscribe-shape.cc | 2 +- + src/main.cc | 2 +- + 12 files changed, 32 insertions(+), 32 deletions(-) + +commit 0b7e4d9f20b3ed947d0c441ca59b43c4097cdb0e +Author: Behdad Esfahbod +Date: Mon Aug 15 20:41:59 2011 +0200 + + [ft] FT_Get_Advance() for advance-width callbacks + + Using graphite2's comparerenderer suggests that this makes hb-ft 15 + times faster. No caching layer needed anymore. + + configure.ac | 2 +- + src/hb-ft.cc | 19 +++++++++++++------ + util/common.hh | 4 +++- + 3 files changed, 17 insertions(+), 8 deletions(-) + +commit 97796453aab56873809a15b5e316cba8acea7449 +Author: Behdad Esfahbod +Date: Mon Aug 15 19:03:43 2011 +0200 + + Fix falloffs of the GOption conversion + + util/options.cc | 8 ++++---- + util/options.hh | 4 ++-- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit 4e9ff1dd6ee3ea63fd91a76a91d9725a10a294a0 +Author: Behdad Esfahbod +Date: Mon Aug 15 16:21:22 2011 +0200 + + Pre-allocate buffers when adding string + + We do a conservative estimate of the number of characters, but still, + this limits the number of buffer reallocs to a small constant. + + src/hb-buffer.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 553bc3de82cfda8d83db26a93205e0d39440cbd1 +Author: Behdad Esfahbod +Date: Mon Aug 15 16:21:06 2011 +0200 + + Minor + + src/hb-ft.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 254142bb67a5c520a304142301479eb5292592d1 +Author: Behdad Esfahbod +Date: Mon Aug 15 16:15:44 2011 +0200 + + [ft] FT_Select_Charmap() when we create face + + src/hb-ft.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit a4cbd03dd17990783d8fd4c6be0c9c0d3d9cae5b +Author: Behdad Esfahbod +Date: Mon Aug 15 09:52:05 2011 +0200 + + Apply 'locl' with 'ccmp' in Arabic shaper + + According to Peter Constable this is indeed what Uniscribe has been + doing for years. + + Mozilla Bug 667166 - wrong shape of letter when it comes at the end of + word in the arabic version of Firefox 5.0 + + src/hb-ot-shape-complex-arabic.cc | 1 + + 1 file changed, 1 insertion(+) + +commit c214cff55ce539d004d069a484dac3988953cb11 +Author: Behdad Esfahbod +Date: Sun Aug 14 15:17:16 2011 +0200 + + Start adding gobject-introspection support + + configure.ac | 13 ++++++++++- + src/Makefile.am | 43 ++++++++++++++++------------------- + src/hb-common.h | 1 + + src/hb-glib.cc | 3 --- + src/hb-gobject.cc | 63 + +++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-gobject.h | 68 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 6 files changed, 163 insertions(+), 28 deletions(-) + +commit 9527fb200ffbbd839334e99b51d9671752d393db +Author: Behdad Esfahbod +Date: Sat Aug 13 19:03:48 2011 +0200 + + Fix missing return + + src/hb-ft.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 77a328769545f6b2970d8491fe77fe98781961cf +Author: Behdad Esfahbod +Date: Sat Aug 13 17:16:45 2011 +0200 + + Minor + + src/hb-common.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3bb300ee78a40f9ded21ab19283863b733aeb677 +Author: Behdad Esfahbod +Date: Thu Aug 11 11:54:31 2011 +0200 + + Refactor hb-view code + + util/Makefile.am | 26 +++- + util/common.cc | 40 ++++++ + util/common.hh | 49 +++++++ + util/hb-view.cc | 387 + ++++--------------------------------------------------- + util/options.cc | 318 +++++++++++++++++++++++++++++++++++++++++++++ + util/options.hh | 86 +++++++++++++ + 6 files changed, 541 insertions(+), 365 deletions(-) + +commit d6660356dd81358033743f72d8a5fbf2fc70eaf7 +Author: Behdad Esfahbod +Date: Wed Aug 10 22:08:36 2011 +0200 + + Add uniscribe font getters + + src/hb-uniscribe-shape.cc | 24 +++++++++++++++++++++--- + src/hb-uniscribe.h | 8 ++++++++ + 2 files changed, 29 insertions(+), 3 deletions(-) + +commit 01ec13a1d9ae380305b593e1c52cebb0e8327cb6 +Author: Behdad Esfahbod +Date: Wed Aug 10 22:00:35 2011 +0200 + + Implement hb_ft_font_get_face + + src/hb-ft.cc | 15 ++++++++++++++- + src/hb-ft.h | 2 ++ + 2 files changed, 16 insertions(+), 1 deletion(-) + +commit 36a4fe037df201f85b7a544eb30d75dc3585a1b6 +Author: Behdad Esfahbod +Date: Wed Aug 10 21:54:22 2011 +0200 + + Fix charset conversion + + util/hb-view.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 25c4830593064f023e296aa795b72ddcaa1c9322 +Author: Behdad Esfahbod +Date: Wed Aug 10 16:28:38 2011 +0200 + + [util] Add hb-shape --shapers + + If the specified shapers fail, hb-shape will fail immediately + + util/hb-view.cc | 57 + +++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 33 insertions(+), 24 deletions(-) + +commit 0501573deda3a8dcdfcea491392f554f21ed0154 +Author: Behdad Esfahbod +Date: Wed Aug 10 16:25:56 2011 +0200 + + Fix const correctness in the API + + src/hb-fallback-shape-private.hh | 2 +- + src/hb-fallback-shape.cc | 2 +- + src/hb-ot-shape.cc | 2 +- + src/hb-ot-shape.h | 2 +- + src/hb-shape.cc | 14 +++++++------- + src/hb-shape.h | 12 ++++++------ + src/hb-uniscribe-shape.cc | 2 +- + src/hb-uniscribe.h | 2 +- + 8 files changed, 19 insertions(+), 19 deletions(-) + +commit a21add6c0da067173d51792d716d6e38379f138f +Author: Behdad Esfahbod +Date: Wed Aug 10 16:07:49 2011 +0200 + + Reformat + + util/hb-view.cc | 49 ++++++++++++++++++------------------------------- + 1 file changed, 18 insertions(+), 31 deletions(-) + +commit 8df90c81187db58eee6b90426cd16c32feef6be3 +Author: Behdad Esfahbod +Date: Wed Aug 10 15:26:41 2011 +0200 + + [util] Port hb-view to GOption + + util/hb-view.cc | 267 + +++++++++++++++++++++++++++++++++----------------------- + 1 file changed, 156 insertions(+), 111 deletions(-) + +commit 511a136f0c092880b19250a5df53bcf9f4b043ca +Author: Behdad Esfahbod +Date: Tue Aug 9 15:03:00 2011 +0200 + + Move hb-view into util/ + + Makefile.am | 3 +-- + configure.ac | 1 + + src/Makefile.am | 13 ------------- + util/Makefile.am | 24 ++++++++++++++++++++++++ + {src => util}/hb-view.cc | 0 + 5 files changed, 26 insertions(+), 15 deletions(-) + +commit d753ac78da5619a0a545cdaf7a8e65787e996570 +Author: Behdad Esfahbod +Date: Tue Aug 9 14:03:12 2011 +0200 + + [uniscribe] Remove zerowidth glyphs from output + + src/hb-uniscribe-shape.cc | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 217cc81cd9c3de30b2ef226983ec43c0f78b5c7d +Author: Behdad Esfahbod +Date: Tue Aug 9 14:00:44 2011 +0200 + + [test/shape-complex] Print cluster and position info in --verbose + + test/test-shape-complex.c | 20 +++++++++++++++++--- + 1 file changed, 17 insertions(+), 3 deletions(-) + +commit 708403e7f3e4a5cf9b0d2bd764fb74b148af7adb +Author: Behdad Esfahbod +Date: Tue Aug 9 13:52:36 2011 +0200 + + Fix warnings with old glib + + test/hb-test.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit ddd247b0c528cdb8bdf5f8063180abe884afa305 +Author: Behdad Esfahbod +Date: Tue Aug 9 11:44:42 2011 +0200 + + Minor + + src/test.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 1b8196c98638ba05ae0ebcb8ba7aa99ed9c08e0a +Author: Behdad Esfahbod +Date: Tue Aug 9 11:37:46 2011 +0200 + + Add fallback shaper + + src/hb-fallback-shape.cc | 23 +++++++++++++++++++++-- + 1 file changed, 21 insertions(+), 2 deletions(-) + +commit 13a601fe99f237b08b7166448e386eaea0b77294 +Author: Behdad Esfahbod +Date: Tue Aug 9 11:36:54 2011 +0200 + + [FT] Don't make font immutable + + src/hb-ft.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit 38b2118724600521c6ad1e49df0667dcdf863634 +Author: Behdad Esfahbod +Date: Tue Aug 9 10:51:24 2011 +0200 + + [API] Add hb_ft_font_set_funcs(), remove hb_ft_get_font_funcs() + + Remove hb_ft_get_font_funcs() as it cannot be used by the user anyway. + + Add hb_ft_font_set_funcs(). Which will make the font internally use + FreeType. That is, no need for the font to have created using the + hb-ft API. Just create using hb_face_create()/hb_font_create() and + then call this on the font (after having set font scale). This + internally creates an FT_Face and attached to the font. + + src/Makefile.am | 4 +-- + src/hb-ft.cc | 76 + +++++++++++++++++++++++++++++++++++++++++++++++++++--- + src/hb-ft.h | 10 ++++--- + src/test.cc | 7 +++++ + test/Makefile.am | 8 ------ + test/test-object.c | 9 ------- + 6 files changed, 89 insertions(+), 25 deletions(-) + +commit 255f176fdcd42ab94f9c3c54e2bffb55d0b1a8f5 +Author: Behdad Esfahbod +Date: Tue Aug 9 08:35:07 2011 +0200 + + Minor + + src/hb-uniscribe-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a9057eb3f38018faa1ece53c4aaeeba798b41fd1 +Author: Behdad Esfahbod +Date: Tue Aug 9 00:47:55 2011 +0200 + + [uniscribe] Unbreak + + src/hb-uniscribe-shape.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c0975e12315b7167b92411584d2f00a751bbc204 +Author: Behdad Esfahbod +Date: Tue Aug 9 00:46:18 2011 +0200 + + Fix build again + + test/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +commit 33ccc77902660ed4b49184e5ec99f4fd0ef63175 +Author: Behdad Esfahbod +Date: Tue Aug 9 00:43:24 2011 +0200 + + [API] Make set_user_data() functions take a replace parameter + + We need this to set data on objects safely without worrying that some + other thread unsets it by setting it at the same time. + + src/hb-blob.cc | 5 +++-- + src/hb-blob.h | 3 ++- + src/hb-buffer.cc | 5 +++-- + src/hb-buffer.h | 3 ++- + src/hb-common.cc | 13 ++++++++----- + src/hb-font.cc | 15 +++++++++------ + src/hb-font.h | 9 ++++++--- + src/hb-object-private.hh | 13 ++++++++----- + src/hb-private.hh | 16 +++++++++++----- + src/hb-shape.cc | 2 +- + src/hb-unicode.cc | 5 +++-- + src/hb-unicode.h | 3 ++- + src/hb-uniscribe-shape.cc | 18 ++++++++++++++---- + test/test-object.c | 33 +++++++++++++++++---------------- + 14 files changed, 89 insertions(+), 54 deletions(-) + +commit 944b2ba1ce076385f985212bbdf2df96a8a995f0 +Author: Behdad Esfahbod +Date: Tue Aug 9 00:23:58 2011 +0200 + + [buffer] Make API take signed int length + + Since we already switched to accepting -1 as 'zero-terminated'. + + src/hb-buffer.cc | 12 ++++++------ + src/hb-buffer.h | 12 ++++++------ + src/hb-ot-layout.cc | 2 -- + src/main.cc | 1 - + 4 files changed, 12 insertions(+), 15 deletions(-) + +commit de1e1cf9bccfd116d495804e230dc2e12b733a2d +Author: Behdad Esfahbod +Date: Tue Aug 9 00:19:38 2011 +0200 + + [FT] Adapt to new face API + + src/hb-ft.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 458c89a85695220d43b69dbae36fc93e3fe78d89 +Author: Behdad Esfahbod +Date: Tue Aug 9 00:19:19 2011 +0200 + + Minor + + test/test-c.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit bf3eef540f81fdeba1c36263d7d5b2ec4c5f07b1 +Author: Behdad Esfahbod +Date: Tue Aug 9 00:13:24 2011 +0200 + + [uniscribe] Cleanup backend + + TODO | 2 + + src/hb-uniscribe-shape.cc | 161 + ++++++++++++++++++++++++++++++++++------------ + 2 files changed, 123 insertions(+), 40 deletions(-) + +commit f1f848e2e46ac54ff08aca7cd83390af31c7c9ef +Author: Behdad Esfahbod +Date: Mon Aug 8 23:41:06 2011 +0200 + + Fix build + + test/Makefile.am | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 3897335c7620c37e9a0224b0c42ade0dfdce4053 +Author: Behdad Esfahbod +Date: Mon Aug 8 23:37:41 2011 +0200 + + [API] Sort out get_blob API + + hb_face_get_blob() renamed to hb_face_reference_blob(), returns a + reference now. + + hb_face_[sg]et_index() added. + + hb_face_set_upem() added. + + src/hb-font-private.hh | 3 +- + src/hb-font.cc | 67 + +++++++++++++++++++++++++++++++++++---------- + src/hb-font.h | 17 ++++++++++-- + src/hb-ft.cc | 3 +- + src/hb-ot-layout-private.hh | 9 ------ + src/hb-ot-layout.cc | 21 -------------- + src/hb-uniscribe-shape.cc | 3 +- + 7 files changed, 72 insertions(+), 51 deletions(-) + +commit e715784be35f0846c0e084b7c53c7556ce933a45 +Author: Behdad Esfahbod +Date: Mon Aug 8 21:42:02 2011 +0200 + + Rename get_table to reference_table in all API + + src/hb-font-private.hh | 6 +++--- + src/hb-font.cc | 20 ++++++++++---------- + src/hb-font.h | 8 ++++---- + src/hb-ft.cc | 4 ++-- + 4 files changed, 19 insertions(+), 19 deletions(-) + +commit 670c873499f7f03fdfc07b8a0567b041628c6ab0 +Author: Behdad Esfahbod +Date: Mon Aug 8 21:36:24 2011 +0200 + + Fix shaper ordering logic + + src/hb-shape.cc | 80 + ++++++++++++++++++++++++--------------------------------- + 1 file changed, 34 insertions(+), 46 deletions(-) + +commit cc797e0d5368b2f5732d77eb3e3882283bd87cf7 +Author: Behdad Esfahbod +Date: Mon Aug 8 03:49:30 2011 +0200 + + Minor + + TODO | 2 -- + src/hb-shape.cc | 2 ++ + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 826e22732dd8697600a1392f48af21b7b3ce6271 +Author: Behdad Esfahbod +Date: Sun Aug 7 03:53:42 2011 -0400 + + [uniscribe] Fix blob lifecycles + + src/hb-uniscribe-shape.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit ff199ba356f0eb5bc6252203eea18a1d1fd28934 +Author: Behdad Esfahbod +Date: Sun Aug 7 03:43:46 2011 -0400 + + Fix shaper_list manipulation, aaaaaaaaaaaaargh + + src/hb-shape.cc | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +commit 206e32934592b915b1f3052aecf014c6ced729e1 +Author: Behdad Esfahbod +Date: Sun Aug 7 01:10:55 2011 -0400 + + [test] test-object is not FreeType-specific, move it to the right + place + + test/Makefile.am | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +commit 577326b86af80cc137eea81f4cc1e30adf9232b1 +Author: Behdad Esfahbod +Date: Sun Aug 7 01:04:40 2011 -0400 + + [uniscribe] Fix cluster calculation + + src/hb-uniscribe-shape.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit f6d83b2dcf120f9d6f0a28c6f5de2da7addf9089 +Author: Behdad Esfahbod +Date: Sun Aug 7 00:59:58 2011 -0400 + + Minor + + src/test.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 2eb474afb4a09f4da8f14b444bd6066769010224 +Author: Behdad Esfahbod +Date: Sun Aug 7 00:59:38 2011 -0400 + + [uniscribe] Fix shaper + + It's kinda working finally! + + src/hb-uniscribe-shape.cc | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit f22e661147691ebc9d531aa28a850988e6503f9b +Author: Behdad Esfahbod +Date: Sun Aug 7 00:59:12 2011 -0400 + + [glib] Protect against invalid characters + + src/hb-glib.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 144cd49a0eb3ccc749325d0ee14b3ebf4367c971 +Author: Behdad Esfahbod +Date: Sun Aug 7 00:51:50 2011 -0400 + + [buffer] Accept -1 for text_length and item_length + + A -1 text_length means: zero-terminated string. + A -1 item_length means: to the end of string. + + src/hb-buffer.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit e9c71fab30fd1d5b163c8a072f9e2d3eb8ba3a92 +Author: Behdad Esfahbod +Date: Sun Aug 7 00:00:27 2011 -0400 + + Fix name-table lookup + + Oops! + + src/hb-ot-name-private.hh | 2 +- + src/hb-uniscribe-shape.cc | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit 3fd2b5bece28c81e3e379352f09eee39d19ac372 +Author: Behdad Esfahbod +Date: Sat Aug 6 22:59:54 2011 -0400 + + [uniscribe] Use font size directly + + src/hb-uniscribe-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 892eb2e462b40451b8f73879eab66310d884386a +Author: Behdad Esfahbod +Date: Sat Aug 6 22:06:52 2011 -0400 + + [uniscribe] Make font selection work + + Not tested yet. + + src/hb-ot-name-private.hh | 37 +++++++++++++++++++++++++++++++++++++ + src/hb-uniscribe-shape.cc | 30 +++++++++++++++++++++++------- + src/test.cc | 1 - + 3 files changed, 60 insertions(+), 8 deletions(-) + +commit b492299eb3c398701557e452f6c2c9bd370fbbf3 +Author: Behdad Esfahbod +Date: Fri Aug 5 20:34:50 2011 -0400 + + Start implementing the 'name' table + + src/Makefile.am | 3 +- + src/hb-ot-name-private.hh | 91 + +++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-uniscribe-shape.cc | 12 ++++--- + 3 files changed, 100 insertions(+), 6 deletions(-) + +commit 4538efacca84329a60ff69851de70027d9b4f567 +Author: Behdad Esfahbod +Date: Fri Aug 5 20:11:06 2011 -0400 + + Skip tests by returning 77 + + automake test runner understands this. + + src/check-internal-symbols.sh | 3 ++- + src/check-libstdc++.sh | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +commit 54eb65538da0a6ab0389d09944c90e12a913157d +Author: Behdad Esfahbod +Date: Fri Aug 5 20:09:25 2011 -0400 + + Fix check on OS X sh + + src/check-header-guards.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9da554504e30a326fc57b28cdb0e57108bfa9555 +Author: Behdad Esfahbod +Date: Fri Aug 5 19:48:49 2011 -0400 + + Add hb_shape_list_shapers() + + src/hb-shape.cc | 22 ++++++++++++++++++---- + src/hb-shape.h | 3 +++ + test/Makefile.am | 2 ++ + test/test-c.c | 8 ++++++++ + test/test-shape.c | 15 +++++++++++++++ + 5 files changed, 46 insertions(+), 4 deletions(-) + +commit d7bf473ef222ab420456ff155ffaa09bacb3a394 +Author: Behdad Esfahbod +Date: Fri Aug 5 18:18:21 2011 -0400 + + Minor + + src/check-header-guards.sh | 1 - + src/hb-open-type-private.hh | 10 +++++----- + 2 files changed, 5 insertions(+), 6 deletions(-) + +commit c62a8f10f3b9a4ac3ac6b686464ac734ebfa2f7f +Author: Behdad Esfahbod +Date: Fri Aug 5 18:02:30 2011 -0400 + + Free all static memory upon exit + + src/hb-common.cc | 8 +++++--- + src/hb-shape.cc | 4 ++-- + 2 files changed, 7 insertions(+), 5 deletions(-) + +commit c4d63ef744f79701458ab7af2055afb87ffe8de3 +Author: Behdad Esfahbod +Date: Fri Aug 5 17:54:25 2011 -0400 + + Fix env parsing code + + Also changed the separator to comma instead of colon. + + src/hb-shape.cc | 34 +++++++++++++++++++++++++--------- + 1 file changed, 25 insertions(+), 9 deletions(-) + +commit 3931837bebd79c5eb1bd5b24ff12e2c8e7d3f24c +Author: Behdad Esfahbod +Date: Fri Aug 5 17:22:19 2011 -0400 + + Change hb_shape() API back to what it was, add hb_shape_full() + + I disliked changing hb_shape() API, and disliked the fact that it was + returning a bool now. So, reverted. Added new API for the extra + functionality. + + src/hb-view.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3ca6c4ecc299295b6682fa2b6b9f83b213223bad +Author: Behdad Esfahbod +Date: Fri Aug 5 17:22:19 2011 -0400 + + Change hb_shape() API back to what it was, add hb_shape_full() + + I disliked changing hb_shape() API, and disliked the fact that it was + returning a bool now. So, reverted. Added new API for the extra + functionality. + + src/hb-shape.cc | 21 +++++++++++++++------ + src/hb-shape.h | 14 ++++++++++---- + src/test.cc | 2 +- + test/test-shape.c | 2 +- + 4 files changed, 27 insertions(+), 12 deletions(-) + +commit 02aeca985b570763342c35e99af90025bfa088d5 +Author: Behdad Esfahbod +Date: Thu Aug 4 22:31:05 2011 -0400 + + [API] Changes to main shape API + + hb_shape() now accepts a shaper_options and a shaper_list argument. + Both can be set to NULL to emulate previous API. And in most + situations + they are expected to be set to NULL. + + hb_shape() also returns a boolean for now. If shaper_list is + NULL, the + return value can be ignored. + + shaper_options is ignored for now, but otherwise it should be a + NULL-terminated list of strings. + + shaper_list is a NULL-terminated list of strings. Currently + recognized + strings are "ot" for native OpenType Layout implementation, + "uniscribe" + for the Uniscribe backend, and "fallback" for the non-complex backend + (that will be implemented shortly). The fallback backend never fails. + + The env var HB_SHAPER_LIST is also parsed and honored. It's a + colon-separated list of shaper names. The fallback shaper is + invoked if + none of the env-listed shapers succeed. + + New API hb_buffer_guess_properties() added. + + TODO | 2 - + configure.ac | 9 +++ + src/Makefile.am | 14 ++-- + src/hb-buffer-private.hh | 1 + + src/hb-buffer.cc | 35 ++++++++++ + src/hb-buffer.h | 3 + + src/hb-fallback-shape-private.hh | 48 ++++++++++++++ + src/hb-fallback-shape.cc | 43 +++++++++++++ + src/hb-ot-shape.cc | 9 ++- + src/hb-ot-shape.h | 5 +- + src/hb-shape.cc | 135 + +++++++++++++++++++++++---------------- + src/hb-shape.h | 13 ++-- + src/hb-uniscribe-shape.cc | 52 ++++++--------- + src/hb-uniscribe.h | 5 +- + src/hb-view.cc | 2 +- + src/test.cc | 3 +- + test/test-shape.c | 2 +- + 17 files changed, 274 insertions(+), 107 deletions(-) + +commit 57692adf1294a6db4627d0de7c671e4aa01d2a8f +Author: Behdad Esfahbod +Date: Thu Aug 4 20:49:16 2011 -0400 + + Make test.cc do something more useful + + Hardcoded to the uniscribe backend for now. Will fix soon. + + src/test.cc | 38 ++++++++++++++++++++++++++++++++++---- + 1 file changed, 34 insertions(+), 4 deletions(-) + +commit c605bbbb6d4b2a98b1f40ca818760088d991f7d1 +Author: Behdad Esfahbod +Date: Thu Aug 4 20:00:53 2011 -0400 + + Remove C++ guards from source files + + Where causing issues for people with MSVC. + + src/check-c-linkage-decls.sh | 3 +-- + src/hb-blob.cc | 2 -- + src/hb-buffer-private.hh | 2 -- + src/hb-buffer.cc | 2 -- + src/hb-common.cc | 2 -- + src/hb-font-private.hh | 2 -- + src/hb-font.cc | 2 -- + src/hb-ft.cc | 2 -- + src/hb-glib.cc | 2 -- + src/hb-icu.cc | 2 -- + src/hb-mutex-private.hh | 2 -- + src/hb-object-private.hh | 4 ---- + src/hb-open-file-private.hh | 2 -- + src/hb-open-type-private.hh | 4 ---- + src/hb-ot-head-private.hh | 2 -- + src/hb-ot-layout-common-private.hh | 4 ---- + src/hb-ot-layout-gdef-private.hh | 2 -- + src/hb-ot-layout-gpos-private.hh | 4 ---- + src/hb-ot-layout-gsub-private.hh | 4 ---- + src/hb-ot-layout-gsubgpos-private.hh | 6 ------ + src/hb-ot-layout-private.hh | 2 -- + src/hb-ot-layout.cc | 2 -- + src/hb-ot-map-private.hh | 2 -- + src/hb-ot-map.cc | 2 -- + src/hb-ot-maxp-private.hh | 2 -- + src/hb-ot-shape-complex-arabic-table.hh | 2 -- + src/hb-ot-shape-complex-arabic.cc | 2 -- + src/hb-ot-shape-complex-indic-table.hh | 2 -- + src/hb-ot-shape-complex-indic.cc | 2 -- + src/hb-ot-shape-complex-misc.cc | 2 -- + src/hb-ot-shape-complex-private.hh | 2 -- + src/hb-ot-shape-normalize.cc | 2 -- + src/hb-ot-shape-private.hh | 2 -- + src/hb-ot-shape.cc | 2 -- + src/hb-ot-tag.cc | 2 -- + src/hb-private.hh | 8 -------- + src/hb-shape.cc | 2 -- + src/hb-unicode-private.hh | 2 -- + src/hb-unicode.cc | 2 -- + src/hb-uniscribe-shape.cc | 2 -- + src/hb-view.cc | 2 -- + src/main.cc | 2 -- + src/test.cc | 2 -- + 43 files changed, 1 insertion(+), 106 deletions(-) + +commit 8336186a52813b53e90b4399dc462d55750e2d37 +Author: Behdad Esfahbod +Date: Thu Aug 4 19:49:05 2011 -0400 + + Zero map objects + + src/hb-ot-map-private.hh | 4 ++++ + 1 file changed, 4 insertions(+) + +commit ecd3b6e4ad253cf9d0dae1ed2da8ba6caed16b85 +Author: Behdad Esfahbod +Date: Thu Aug 4 01:57:40 2011 -0400 + + More build fixes + + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +commit c747f509bcc4e6a34ced04e9e79ed414a44437b1 +Author: Behdad Esfahbod +Date: Thu Aug 4 01:51:30 2011 -0400 + + More out-of-tree build fixes + + src/check-c-linkage-decls.sh | 3 +-- + src/check-header-guards.sh | 8 ++++---- + 2 files changed, 5 insertions(+), 6 deletions(-) + +commit 0530ca9a180edc330ab801c535907cefa4a0c298 +Author: Behdad Esfahbod +Date: Thu Aug 4 01:42:59 2011 -0400 + + Fix out-of-tree build + + test/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ddbf4edc5d09a645351b1bd1722b068aba6a6dec +Author: Behdad Esfahbod +Date: Thu Aug 4 01:38:37 2011 -0400 + + Minor + + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +commit 20dde6101662fd9ebe5f613631ea468f4c0a995f +Author: Behdad Esfahbod +Date: Thu Aug 4 01:07:33 2011 -0400 + + Minor + + src/hb-uniscribe.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 44b4f50d05fd51d8056a78e359fbb00fbcac43a0 +Author: Behdad Esfahbod +Date: Thu Aug 4 00:52:20 2011 -0400 + + Fix typo + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0fbb2dc83132a89201ad8b56c6909610437d2da0 +Author: Behdad Esfahbod +Date: Wed Aug 3 19:55:04 2011 -0400 + + Add draft experimental Uniscribe backend + + Not complete yet, font selection doesn't work. But hey it shapes! + + This is not supposed to be a production backend, more like a testing + backend. + + configure.ac | 9 ++ + src/Makefile.am | 11 ++ + src/hb-private.hh | 4 +- + src/hb-uniscribe-shape.cc | 325 + ++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-uniscribe.h | 46 +++++++ + 5 files changed, 394 insertions(+), 1 deletion(-) + +commit 0d7d4824b2edc7aeeb995077655a9a89b5c360a9 +Author: Behdad Esfahbod +Date: Wed Aug 3 17:39:24 2011 -0400 + + Minor + + configure.ac | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit e62df43649e31b7815c272f01808b3f726c7d07d +Author: Behdad Esfahbod +Date: Wed Aug 3 17:38:54 2011 -0400 + + Add internal hb_buffer_t::get_scratch_buffer() + + src/hb-buffer-private.hh | 2 ++ + src/hb-buffer.cc | 10 ++++++++++ + 2 files changed, 12 insertions(+) + +commit 71e7936fcadfd375a8bdc47987ef8b1b2b542df5 +Author: Behdad Esfahbod +Date: Wed Aug 3 17:38:34 2011 -0400 + + Minor + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit bf8c57ba745c02370c38198adfdcd8075ba38b13 +Author: Behdad Esfahbod +Date: Wed Aug 3 17:38:04 2011 -0400 + + [API] Add hb_face_get_blob() + + Need to think more about it. + + src/hb-font.cc | 10 ++++++++++ + src/hb-font.h | 3 +++ + 2 files changed, 13 insertions(+) + +commit 2118fdb9f584e6735e904638e48bae48314372fa +Author: Behdad Esfahbod +Date: Tue Aug 2 14:06:51 2011 -0400 + + Fix fallback shaping + + Broke it a few commits ago. + + src/hb-ot-shape.cc | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 199abbd0f15bd295c3a56845c71b38dd20af1332 +Author: Behdad Esfahbod +Date: Tue Aug 2 13:59:47 2011 -0400 + + Minor + + test/test-unicode.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 4f052b93c0b17d92b9f0adddf64ef77518bf2ac4 +Author: Behdad Esfahbod +Date: Tue Aug 2 13:44:24 2011 -0400 + + Fix build with glib but not freetype + + test/Makefile.am | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit c21be799daa85d5edb2d831ac985d3e43c8755ec +Author: Behdad Esfahbod +Date: Tue Aug 2 12:05:49 2011 -0400 + + Minor + + test/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit e9c2341b1384c161bbab9871411af0bc9f6c3cf4 +Author: Behdad Esfahbod +Date: Tue Aug 2 11:40:44 2011 -0400 + + Don't use icu-config when cross-compiling + + configure.ac | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) + +commit 390dab49b6cf34f263b67d20a13f0752ada57bcc +Author: Behdad Esfahbod +Date: Tue Aug 2 11:29:55 2011 -0400 + + Unbreak icu-config results a bit + + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +commit b301478a69d961c724a4875b839a81fb458d1153 +Author: Behdad Esfahbod +Date: Tue Aug 2 11:25:13 2011 -0400 + + Bug 39763 - autogen.sh should check pkg-config availability + + (and revert change have_icu change I mistakenly pushed out) + + autogen.sh | 10 ++++++++-- + configure.ac | 1 - + 2 files changed, 8 insertions(+), 3 deletions(-) + +commit f60271c0c2b0101e7b2725f9a9ad950c277a616c +Author: Behdad Esfahbod +Date: Tue Aug 2 09:56:30 2011 -0400 + + Add mingw32 support + + With these changes, on Ubuntu I can do: + + ./configure --host=i586-mingw32msvc && make + + configure.ac | 1 + + src/hb-mutex-private.hh | 4 ++-- + src/hb-open-type-private.hh | 5 +++++ + src/hb-private.hh | 6 +++++- + src/main.cc | 1 + + 5 files changed, 14 insertions(+), 3 deletions(-) + +commit 1264b23e4a4ae1c9831a3009e1c7ab8e65a5b434 +Author: Behdad Esfahbod +Date: Mon Aug 1 16:39:32 2011 -0400 + + Bug 39702 - configure check for ragel + + autogen.sh | 18 +++++++++++++----- + 1 file changed, 13 insertions(+), 5 deletions(-) + +commit f5414cf0a220d6e6f3d4b6e8221cd583b4684187 +Author: Behdad Esfahbod +Date: Mon Aug 1 16:34:16 2011 -0400 + + Use missing script for calling ragel + + src/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit a91c58bf98258a34e5f7c1ad39a38db58fadc4b9 +Author: Behdad Esfahbod +Date: Mon Aug 1 16:30:11 2011 -0400 + + [Indic] Disable CJCT-disabling logic + + Read comment. + + src/hb-ot-shape-complex-indic.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 5e72071062c015237b79fbd0521341a63166a204 +Author: Behdad Esfahbod +Date: Sun Jul 31 17:51:50 2011 -0400 + + [Indic] Stop looking for base upon seeing joiners + + Not sure where this is documented, but I remember this being the + desired + behavior. + + test-shape-complex failures are down from 48 to 46. Meh. + + src/hb-ot-shape-complex-indic.cc | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit 281683995a46ed37aeeb84061249758c59822457 +Author: Behdad Esfahbod +Date: Sun Jul 31 16:00:35 2011 -0400 + + Cosmetic + + src/hb-ot-shape-complex-indic.cc | 23 +++++++++++++++-------- + 1 file changed, 15 insertions(+), 8 deletions(-) + +commit 6b37bc80843e38ca7b62500f95fd70c08af68d62 +Author: Behdad Esfahbod +Date: Sun Jul 31 15:57:00 2011 -0400 + + [Indic] Fix ZWJ/ZWNJ application + + Not quite working just yet. False alarm re 10 failures. It was + crashing. Ouch! Back to 48 failures. + + src/hb-ot-shape-complex-indic.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit e7be05702447ae270d797398132c1930cd3a9b86 +Author: Behdad Esfahbod +Date: Sun Jul 31 15:18:57 2011 -0400 + + [Indic] Add Final Reordering rules into comments + + Not applied yet. + + src/hb-ot-shape-complex-indic.cc | 86 + ++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 83 insertions(+), 3 deletions(-) + +commit cfd4382ec1af91640129551697de36fd42c0849a +Author: Behdad Esfahbod +Date: Sun Jul 31 15:07:11 2011 -0400 + + [Indic] Handle Reph when determining base consonant + + src/hb-ot-shape-complex-indic.cc | 24 +++++++++++++++--------- + 1 file changed, 15 insertions(+), 9 deletions(-) + +commit 97158392a5899ddb739afaac925128f33f699bd7 +Author: Behdad Esfahbod +Date: Sun Jul 31 15:01:28 2011 -0400 + + [Indic] Ra is a consonant too + + src/hb-ot-shape-complex-indic.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 0d8f8a177c4bfd4dc642a353bab8d03674e839ac +Author: Behdad Esfahbod +Date: Sun Jul 31 14:57:59 2011 -0400 + + [Indic] Fix reph inhibition logic + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9da0487cd452d780673e24329ce03e174a4ef83b +Author: Behdad Esfahbod +Date: Sun Jul 31 13:46:44 2011 -0400 + + [Indic] Support ZWJ/ZWNJ + + Brings test-shape-complex failures down from 52 to 10! + + I hereby declare harfbuzz-ng supporting Indic! + + src/hb-ot-shape-complex-indic.cc | 57 + +++++++++++++++++++++++++++++++++------- + 1 file changed, 48 insertions(+), 9 deletions(-) + +commit 9ee27a928a989c71923cef82a9e9828f8e9ca051 +Author: Behdad Esfahbod +Date: Sun Jul 31 11:10:14 2011 -0400 + + [Indic] Suppress reph formation upon joiners + + src/hb-ot-shape-complex-indic.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 8354e004e553856d7d743e0f0b4de4668484026a +Author: Behdad Esfahbod +Date: Sun Jul 31 02:24:51 2011 -0400 + + Un-Ra U+09F1. According to the test suite this is correct. + + But I'm not sure... Down from 54 failures to 52. + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 07cedd81f48907b2e372cd2e963716bbded9ce29 +Author: Behdad Esfahbod +Date: Sat Jul 30 21:16:51 2011 -0400 + + Minor + + test/test-shape-complex.c | 21 +++++++++++---------- + 1 file changed, 11 insertions(+), 10 deletions(-) + +commit ba7e85c104e68b4685c1b3b5c9a260fe0f6879df +Author: Behdad Esfahbod +Date: Sat Jul 30 21:11:53 2011 -0400 + + Cosmetic + + src/hb-ot-shape-complex-indic.cc | 1 + + 1 file changed, 1 insertion(+) + +commit f5bc2725cb892264ba223e0a49f7fd2c622a0730 +Author: Behdad Esfahbod +Date: Sat Jul 30 21:08:10 2011 -0400 + + [Indic] For old-style Indic tables, move Halant around + + In old-style Indic OT standards, the post-base Halants are moved after + their base. Emulate that by moving first post-base Halant to + post-last-consonant. + + Brings test-shape-complex failures down from 88 to 54. Getting there! + + src/hb-ot-map-private.hh | 3 +++ + src/hb-ot-shape-complex-indic.cc | 20 ++++++++++++++++++++ + 2 files changed, 23 insertions(+) + +commit c47a31fb4793b825f4be57e9cb1b10db352b9512 +Author: Behdad Esfahbod +Date: Sat Jul 30 20:57:01 2011 -0400 + + [OT] Save chosen script tag + + src/hb-ot-layout.cc | 20 ++++++++++++++++---- + src/hb-ot-layout.h | 3 ++- + src/hb-ot-map-private.hh | 1 + + src/hb-ot-map.cc | 2 +- + 4 files changed, 20 insertions(+), 6 deletions(-) + +commit 3a9b14dfdfc278b432890e1537672a4ca141a3b0 +Author: Behdad Esfahbod +Date: Sat Jul 30 20:23:55 2011 -0400 + + Minor + + test/test-shape-complex.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 8613193bbf28fe8951c900b68c4418a6fb929626 +Author: Behdad Esfahbod +Date: Sat Jul 30 20:21:40 2011 -0400 + + [test] Fix problem with N'ko test direction + + Old HarfBuzz test suite always shaped as left-to-right and hence + had wrong + 0x14db, direction expected glyphstring for N'ko. Doh! + + Failures down from 92 to 88. + + test/test-shape-complex.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit fd06bf56110e73826b3d5c73ac964e2609450d46 +Author: Behdad Esfahbod +Date: Sat Jul 30 20:14:44 2011 -0400 + + [Indic] Handle initial Ra+Halant in scripts that support Reph + + Brings test-shape-complex failures down from 104 to 92. Way to go! + + src/hb-ot-shape-complex-indic.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit ee58f3bc75d2d071a71b94063bf12205a5871acb +Author: Behdad Esfahbod +Date: Sat Jul 30 19:15:53 2011 -0400 + + Minor + + src/hb-ot-shape-complex-indic.cc | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) + +commit 352372ae5ea0998e40cf9fe43c22b6b610a5764e +Author: Behdad Esfahbod +Date: Sat Jul 30 19:04:02 2011 -0400 + + [Indic] Categorize Ra in scripts that have Reph + + Is the categorization correct? I don't know. + + src/hb-ot-shape-complex-indic.cc | 31 ++++++++++++++++++++++++++++++- + 1 file changed, 30 insertions(+), 1 deletion(-) + +commit 45d6f29f15f1d2323bcaa2498aed23ff0c8a1567 +Author: Behdad Esfahbod +Date: Sat Jul 30 14:44:30 2011 -0400 + + [Indic] Reorder matras + + Number of failing shape-complex tests goes from 125 down to 94. + + Next: Add Ra handling and it's fair to say we kinda support Indic :). + + src/hb-ot-shape-complex-indic.cc | 29 +++++++++++++++++++++++++++-- + src/hb-ot-shape-normalize.cc | 26 ++++++++++---------------- + src/hb-private.hh | 36 + ++++++++++++++++++++++++++++++------ + 3 files changed, 67 insertions(+), 24 deletions(-) + +commit 911bf32acad7f1cd161f666cb659990ade0925ad +Author: Behdad Esfahbod +Date: Sat Jul 30 11:16:00 2011 -0400 + + Bug 39686 - Add '-no-undefined' to libharfbuzz LDFLAGS + + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8f0b64fb6988f9502d2c5e39768a9af133d9a83f +Author: Behdad Esfahbod +Date: Fri Jul 29 17:02:48 2011 -0400 + + Minor + + src/hb-ot-shape-complex-arabic.cc | 6 +++--- + src/hb-private.hh | 8 ++++++-- + 2 files changed, 9 insertions(+), 5 deletions(-) + +commit 743807a3ce1b2229e5307a8aea074a7544623d8d +Author: Behdad Esfahbod +Date: Fri Jul 29 16:37:02 2011 -0400 + + [Indic] Apply Indic features + + Find the base consonant and apply basic Indic features accordingly. + Nothing complete, but does something for now. Specifically: + no Ra handling right now, and no ZWJ/ZWNJ. + + Number of failing shape-complex tests goes from 174 down to 125. + + Next: reorder matras. + + src/hb-ot-shape-complex-indic-machine.rl | 35 ++++-- + src/hb-ot-shape-complex-indic.cc | 209 + ++++++++++++++++++++++++++++--- + 2 files changed, 212 insertions(+), 32 deletions(-) + +commit 1a1b5013159369b343d0c32df02c9c419277aead +Author: Behdad Esfahbod +Date: Fri Jul 29 16:36:46 2011 -0400 + + Minor + + test/test-shape-complex.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit dd5546de15e63c0320b7db2bf42b0f15271f7915 +Author: Behdad Esfahbod +Date: Fri Jul 29 16:27:31 2011 -0400 + + Minor + + test/test-shape-complex.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9f9bcceca6321d5a5812f878de1de39901349a78 +Author: Behdad Esfahbod +Date: Thu Jul 28 17:06:46 2011 -0400 + + Register buffer vars in Indic shaper + + src/hb-ot-shape-complex-indic.cc | 6 ++++++ + src/hb-ot-shape.cc | 2 ++ + 2 files changed, 8 insertions(+) + +commit be09bf6b799cafc2ff54a28915b307ffe99661b6 +Author: Behdad Esfahbod +Date: Thu Jul 28 17:03:43 2011 -0400 + + Oops. This should have gone into the previous commit + + src/hb-ot-layout-gsub-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b65c06025d2b54a44f716e030d4b10072c65bea8 +Author: Behdad Esfahbod +Date: Thu Jul 28 16:48:43 2011 -0400 + + Formalize buffer var allocations + + src/hb-buffer-private.hh | 25 ++++++---------- + src/hb-buffer.cc | 15 +++++----- + src/hb-ot-layout-gpos-private.hh | 14 +++++---- + src/hb-ot-layout-gsub-private.hh | 5 +++- + src/hb-ot-shape-complex-arabic.cc | 6 +++- + src/hb-ot-shape-complex-indic.cc | 4 +-- + src/hb-ot-shape-complex-private.hh | 10 ++++++- + src/hb-ot-shape.cc | 60 + +++++++++++++++++++++++--------------- + src/hb-private.hh | 1 + + 9 files changed, 83 insertions(+), 57 deletions(-) + +commit a9ad3d3460ba863a8d8f3766ccbeab288c3c6822 +Author: Behdad Esfahbod +Date: Thu Jul 28 15:42:18 2011 -0400 + + Move more code around + + Buffer var allocation coming into shape + + src/hb-buffer-private.hh | 1 + + src/hb-buffer.cc | 35 +++++++++++++++++++++++++++++++++++ + src/hb-ot-layout-gpos-private.hh | 7 +++++++ + src/hb-ot-layout-gsub-private.hh | 18 ++++++++++++++++++ + src/hb-ot-layout.cc | 8 +++----- + 5 files changed, 64 insertions(+), 5 deletions(-) + +commit cc06c243d8be3ebb1190281653d2dba504c16c0f +Author: Behdad Esfahbod +Date: Mon Jul 25 20:25:44 2011 -0400 + + Streamline debugging infrastructure even more + + src/hb-blob.cc | 26 ++++----- + src/hb-object-private.hh | 8 +-- + src/hb-open-type-private.hh | 64 ++++++-------------- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-private.hh | 109 + +++++++++++++++++++++++++++++++---- + 5 files changed, 136 insertions(+), 73 deletions(-) + +commit 43ff203d8ea3e1b09e316e3aae1a4e5ec15bfdd2 +Author: Behdad Esfahbod +Date: Mon Jul 25 17:35:24 2011 -0400 + + Use variadic macros for debugging + + Looks *so* much nicer! + + src/hb-blob.cc | 26 ++++++++-------- + src/hb-object-private.hh | 8 ++--- + src/hb-open-type-private.hh | 75 + ++++++++++++++++++++------------------------- + src/hb-private.hh | 7 +++-- + 4 files changed, 56 insertions(+), 60 deletions(-) + +commit decd4e3e16424dc311e9fb5b663170414a11556a +Author: Behdad Esfahbod +Date: Mon Jul 25 16:47:02 2011 -0400 + + Add sugar syntax for debug messages + + Buffer debugging coming soon. + + src/hb-blob.cc | 35 +++++++++++++---------------------- + src/hb-object-private.hh | 9 ++++----- + src/hb-open-type-private.hh | 44 + ++++++++++++++++++++++---------------------- + src/hb-private.hh | 7 +++++-- + 4 files changed, 44 insertions(+), 51 deletions(-) + +commit 3a81b1db89beba91fb91791918b9fdd9f8fc9fa0 +Author: Behdad Esfahbod +Date: Mon Jul 25 16:30:32 2011 -0400 + + Minor, fix leak from my previous refactorings + + src/hb-buffer.cc | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit f4a579bc42fb811ff5c391a0e97b7d8656ef59b1 +Author: Behdad Esfahbod +Date: Mon Jul 25 16:20:16 2011 -0400 + + Add internal API for buffer var allocation + + src/hb-buffer-private.hh | 25 +++++++++++++++++++++++-- + src/hb-buffer.cc | 22 ++++++++++++++++++++++ + 2 files changed, 45 insertions(+), 2 deletions(-) + +commit 651e8dd79ec8eaca5ab75a61e8ce961ff7bd26eb +Author: Behdad Esfahbod +Date: Mon Jul 25 14:54:08 2011 -0400 + + Start cleaning up buffer var allocation + + I've messed up a lot of stuff recently, different parts of the + shaping process are stumbling on eachother's toes because + manually tracking what's in which buffer var is hard. I'm + going to add some internal API to track those such that mistakes + are discovered as soon as they are introduced. + + src/hb-ot-layout-gsubgpos-private.hh | 1 - + src/hb-ot-layout.cc | 1 + + src/hb-ot-shape.cc | 10 ---------- + 3 files changed, 1 insertion(+), 11 deletions(-) + +commit c86f932015bdf5803572b0904d343d3bc033e009 +Author: Behdad Esfahbod +Date: Mon Jul 25 00:44:50 2011 -0400 + + Move code around + + src/hb-ot-shape.cc | 85 + +++++++++++++++++++++++++++--------------------------- + 1 file changed, 42 insertions(+), 43 deletions(-) + +commit 18c42850c9327ab4479ff150660a76d4ff6f3e9c +Author: Behdad Esfahbod +Date: Mon Jul 25 00:36:58 2011 -0400 + + Shrink space used for ligature ids + + This frees 16bits in the glyph_info struct during the ot_layout + process. + We can use the freed space in the shapers now. + + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit d8787493c9aa420544096cef07c29a591a0c1a99 +Author: Behdad Esfahbod +Date: Mon Jul 25 00:36:01 2011 -0400 + + Minor + + src/hb-ot-layout-gsub-private.hh | 6 ------ + src/hb-ot-layout-gsubgpos-private.hh | 7 +++++++ + 2 files changed, 7 insertions(+), 6 deletions(-) + +commit c311d852080b50ffc85e80168de62abb05a6be59 +Author: Behdad Esfahbod +Date: Sat Jul 23 23:43:54 2011 -0400 + + Keep Unicode props updated as we go so we avoid a scan later + + src/hb-ot-shape-normalize.cc | 54 + +++++++++++++++++++++----------------------- + 1 file changed, 26 insertions(+), 28 deletions(-) + +commit 5389ff4dbc46c76c9483e3c95f22524b60e21166 +Author: Behdad Esfahbod +Date: Fri Jul 22 20:22:49 2011 -0400 + + Implement the Unicode Canonical Composition algorithm + + Fallback normalization is complete and working now! + + src/hb-ot-shape-normalize.cc | 49 + +++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 46 insertions(+), 3 deletions(-) + +commit dcdc51cdc0ba9d9fb75f84dd5fa7a49aa0b24ea0 +Author: Behdad Esfahbod +Date: Fri Jul 22 17:14:46 2011 -0400 + + Handle singleton decompositions + + src/hb-ot-shape-normalize.cc | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit 34c22f816808d061a980cffca12de03beb437fa0 +Author: Behdad Esfahbod +Date: Fri Jul 22 17:04:20 2011 -0400 + + Implement Unicode Canonical Reordering Algorithm + + src/hb-ot-shape-normalize.cc | 80 + +++++++++++++++++++++++++++++++++++++------- + src/hb-ot-shape-private.hh | 2 ++ + src/hb-ot-shape.cc | 6 ++-- + 3 files changed, 73 insertions(+), 15 deletions(-) + +commit 4ff0d2d9dfc4f7e4880a4e964ca9872624508ea0 +Author: Behdad Esfahbod +Date: Fri Jul 22 16:15:32 2011 -0400 + + Decomposition works now! + + src/hb-ot-shape-normalize.cc | 109 + +++++++++++++++++++++++++++---------------- + src/hb-ot-shape.cc | 3 +- + 2 files changed, 70 insertions(+), 42 deletions(-) + +commit 468e9cb25c9bc14781b7013e447d763f93bf76a3 +Author: Behdad Esfahbod +Date: Fri Jul 22 11:28:07 2011 -0400 + + Move buffer methods into the object + + src/hb-buffer-private.hh | 110 +++---- + src/hb-buffer.cc | 605 + +++++++++++++++++------------------ + src/hb-ot-layout-gpos-private.hh | 88 ++--- + src/hb-ot-layout-gsub-private.hh | 58 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 50 +-- + src/hb-ot-shape-normalize.cc | 16 +- + src/hb-ot-shape.cc | 14 +- + 7 files changed, 456 insertions(+), 485 deletions(-) + +commit 45412523dc295cb5ee12e096bfacb282cc925843 +Author: Behdad Esfahbod +Date: Fri Jul 22 11:07:05 2011 -0400 + + More normalization kick + + src/hb-ot-shape-normalize.cc | 54 + +++++++++++++++++++++++++++++--------------- + src/hb-ot-shape-private.hh | 8 ++++++- + src/hb-ot-shape.cc | 13 +++-------- + 3 files changed, 46 insertions(+), 29 deletions(-) + +commit 63c0ef4a0763e579c9c80887bbfbd2651de05067 +Author: Behdad Esfahbod +Date: Thu Jul 21 20:58:42 2011 -0400 + + Fix decompose() implementations to work with non-starter + non-composables + + Add tests. + + src/hb-glib.cc | 10 +++++----- + src/hb-icu.cc | 20 +++++++++++++------- + test/test-unicode.c | 11 ++++++++--- + 3 files changed, 26 insertions(+), 15 deletions(-) + +commit 5d90a342e319068716429bf7af76c3896b61a0e5 +Author: Behdad Esfahbod +Date: Thu Jul 21 15:25:01 2011 -0400 + + Document normalization design + + src/hb-ot-shape-normalize.cc | 78 + +++++++++++++++++++++++++++++++++++--------- + src/hb-ot-shape-private.hh | 2 +- + src/hb-ot-shape.cc | 6 ++-- + 3 files changed, 67 insertions(+), 19 deletions(-) + +commit 02cdf743c2ec345a44d4fcf865594b6ac13fccd0 +Author: Behdad Esfahbod +Date: Thu Jul 21 12:23:12 2011 -0400 + + Add prefer_decomposed() complex-shaper callback + + This allows the Indic shaper to request decomposed characters. + This will + handle split matra for free. Other shapers prefer precomposed + characters. + + src/hb-ot-shape-complex-arabic.cc | 6 ++++++ + src/hb-ot-shape-complex-indic.cc | 7 +++++++ + src/hb-ot-shape-complex-misc.cc | 6 ++++++ + src/hb-ot-shape-complex-private.hh | 31 +++++++++++++++++++++++++++++-- + 4 files changed, 48 insertions(+), 2 deletions(-) + +commit d6b9c6d20041b4f4fa11befc179aee757c41904d +Author: Behdad Esfahbod +Date: Thu Jul 21 12:16:45 2011 -0400 + + More kicking + + src/hb-ot-shape-normalize.cc | 17 ++++++++++++++--- + 1 file changed, 14 insertions(+), 3 deletions(-) + +commit 192445aef2e50087049243ce54ce7059ec441ffa +Author: Behdad Esfahbod +Date: Thu Jul 21 12:13:04 2011 -0400 + + Remove intermittent_glyph() + + Lets not worry about performance for now... + + src/hb-ot-shape-normalize.cc | 3 ++- + src/hb-ot-shape-private.hh | 2 -- + 2 files changed, 2 insertions(+), 3 deletions(-) + +commit d63adfc7d09b26764d9166da97372b21257e7611 +Author: Behdad Esfahbod +Date: Thu Jul 21 11:48:57 2011 -0400 + + No need to handle variation-selectors seperately, they are GC=Mn + + src/hb-ot-shape.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit aa7264123a088936f2043b45d4d41ca7413fabe5 +Author: Behdad Esfahbod +Date: Thu Jul 21 11:34:59 2011 -0400 + + Only form clusters if we are reversing + + This produces more accurate cluster mappings. Cluster mappings are + minimal now. Combining marks get their own cluster value most of + the time. + + src/hb-ot-shape.cc | 45 ++++++++++++++++++++++----------------------- + 1 file changed, 22 insertions(+), 23 deletions(-) + +commit 5c6f5982d78e2d7fadc2fbb8b4f3a4be9420c59a +Author: Behdad Esfahbod +Date: Thu Jul 21 11:31:08 2011 -0400 + + Towards normalization + + src/hb-ot-shape-normalize.cc | 33 ++++++++++++++++++++++----------- + src/hb-ot-shape-private.hh | 3 ++- + src/hb-ot-shape.cc | 4 +++- + 3 files changed, 27 insertions(+), 13 deletions(-) + +commit ad903e66b1cc4ec1b8160f93b3ab2b5e636f8d62 +Author: Behdad Esfahbod +Date: Thu Jul 21 10:17:22 2011 -0400 + + s/COMBINING_MARK/SPACING_MARK/ here too. Oops! + + test/test-unicode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cf7f43ec3382cac2af11f5637c840500daabf889 +Author: Behdad Esfahbod +Date: Thu Jul 21 01:12:26 2011 -0400 + + Remove stale comment + + src/hb-ot-shape.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 54d1a0d2b2c4ffe15494967122c6422ecb1fc80b +Author: Behdad Esfahbod +Date: Thu Jul 21 01:11:09 2011 -0400 + + Form clusters before ensuring native direciton + + This is essential as ensure_native_direction uses cluster info that + is set by form_clusters(). + + src/hb-ot-shape.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9111b21ef99d5e53348176f683261b0101eb427f +Author: Behdad Esfahbod +Date: Thu Jul 21 00:58:29 2011 -0400 + + Add _hb_buffer_output_glyph() and _hb_buffer_skip_glyph() + + src/hb-buffer-private.hh | 10 ++++++++++ + src/hb-buffer.cc | 19 ++++++++++++++++--- + src/hb-ot-shape.cc | 2 +- + 3 files changed, 27 insertions(+), 4 deletions(-) + +commit 655586fe5e1fadf2a2ef7826e61ee9a445ffa37a +Author: Behdad Esfahbod +Date: Thu Jul 21 00:51:18 2011 -0400 + + Towards normalization + + src/Makefile.am | 1 + + src/hb-ot-shape-normalize.cc | 71 + ++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-shape-private.hh | 12 ++++++++ + src/hb-ot-shape.cc | 10 ++----- + 4 files changed, 86 insertions(+), 8 deletions(-) + +commit 49741c86334d12fa08a5bfa2110ff3b9adcba1c7 +Author: Behdad Esfahbod +Date: Thu Jul 21 00:35:37 2011 -0400 + + Include variation-selectors in cluster calculation + + src/hb-ot-shape.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit dd89d958c139d85efb776fffaf314eead3952c78 +Author: Behdad Esfahbod +Date: Thu Jul 21 00:28:57 2011 -0400 + + Fix cluster calculation for non-LTR text + + TODO | 6 ------ + src/hb-buffer.cc | 5 +++++ + 2 files changed, 5 insertions(+), 6 deletions(-) + +commit 4a68684654e645882095c1189477146287ce9437 +Author: Behdad Esfahbod +Date: Thu Jul 21 00:14:01 2011 -0400 + + When forming clusters, participate all mark types + + src/hb-ot-shape.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 5157e12a55f943b7fc5be7dce0b2ee1bcacca6ec +Author: Behdad Esfahbod +Date: Thu Jul 21 00:12:33 2011 -0400 + + Rename HB_UNICODE_GENERAL_CATEGORY_COMBINING_MARK to + HB_UNICODE_GENERAL_CATEGORY_SPACING_MARK + + Spacing_Mark is the current Unicode long-name for this property value. + The previous name was wrongly carried from glib. + + src/hb-common.h | 2 +- + src/hb-icu.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 7b08b0a7f2057937dfc3ab2ec191656bf2386463 +Author: Behdad Esfahbod +Date: Wed Jul 20 23:59:07 2011 -0400 + + Minor + + src/hb-ot-shape-complex-arabic.cc | 8 ++++---- + src/hb-private.hh | 19 +++++++++++++++++++ + 2 files changed, 23 insertions(+), 4 deletions(-) + +commit 498e1a9be673bb02c00aac3f12bb4c6993a85910 +Author: Behdad Esfahbod +Date: Wed Jul 20 23:19:49 2011 -0400 + + [icu] Implement compose()/decompose() + + src/hb-icu.cc | 87 + +++++++++++++++++++++++++++++++++++++++++++++++++++-- + test/test-unicode.c | 1 + + 2 files changed, 86 insertions(+), 2 deletions(-) + +commit ffd4a436f7baccb68a0c3602f94ea0246e32844f +Author: Behdad Esfahbod +Date: Wed Jul 20 22:30:29 2011 -0400 + + Add tests for compose()/decompose() + + Adjust glib fallback implementation. + + The tests are not hooked up for ICU yet. + + src/hb-glib.cc | 17 ++++++++++++-- + src/hb-unicode.cc | 2 +- + test/test-unicode.c | 66 + +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 82 insertions(+), 3 deletions(-) + +commit fca0923b04aeff9369849da97d247a647611f346 +Author: Behdad Esfahbod +Date: Wed Jul 20 22:16:13 2011 -0400 + + Minor + + src/hb-icu.cc | 62 + ++++++++++++++++++++++++++++++++++++----------------------- + 1 file changed, 38 insertions(+), 24 deletions(-) + +commit 26b6024962b254b624d4f22088b6c87745074743 +Author: Behdad Esfahbod +Date: Wed Jul 20 21:58:14 2011 -0400 + + [glib] Use g_unicode_script_to/from_iso15924() if available + + src/hb-glib.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 22fdc66712464bdb02e45eed49e4be57e79b442f +Author: Behdad Esfahbod +Date: Wed Jul 20 21:51:37 2011 -0400 + + [glib] Add compose() and decompose() implementations with fallback + + src/hb-glib.cc | 126 + +++++++++++++++++++++++++++++++++++++++++++----------- + src/hb-unicode.cc | 6 ++- + 2 files changed, 106 insertions(+), 26 deletions(-) + +commit a54a5505a35eef5315a8e2e7a79502901e3eff5f +Author: Behdad Esfahbod +Date: Wed Jul 20 16:42:10 2011 -0400 + + Minor + + src/hb-ot-shape-complex-indic.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 23db8d5c92c96a34c716b68e1aa6819c5a20477a +Author: Behdad Esfahbod +Date: Tue Jul 12 12:02:26 2011 -0400 + + [test] Work around glib <= 2.30 API + + test/hb-test.h | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 22989c5ffc8cce1ea05d729cdf33661c35a52334 +Author: Behdad Esfahbod +Date: Tue Jul 12 11:54:58 2011 -0400 + + Distribute hb-ot-shape-complex-indic-machine.rl + + src/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit f6fd3780e12b23ff7ed3743497c8996e71dcb064 +Author: Behdad Esfahbod +Date: Fri Jul 8 00:22:40 2011 -0400 + + Let shapers decide when to apply ccmp and locl + + Instead of always applying those two features before the complex + shaper, + let the complex shaper decide whether they should be applied first. + + Also add stub for Indic's final_reordering(). + + src/hb-ot-shape-complex-arabic.cc | 2 ++ + src/hb-ot-shape-complex-indic.cc | 16 ++++++++++++++++ + src/hb-ot-shape.cc | 7 +------ + 3 files changed, 19 insertions(+), 6 deletions(-) + +commit c4641723fbf6532b2e80a662e15573b31276bc73 +Author: Behdad Esfahbod +Date: Thu Jul 7 23:47:19 2011 -0400 + + [API] Add compose() and decompose() unicode funcs, rename other ones + + Add compose() and decompose() unicode funcs. These implement + pair-wise canonical composition/decomposition. + + The glib/icu implementations are lacking for now. We are adding + API for this to glib, but I cannot find any useful API in ICU. + May end of implementing these in-house. + + Changed all unicode_funcs callback names to remove the "_get" part. + Eg, hb_unicode_get_script_func_t is now hb_unicode_script_func_t, + and hb_unicode_get_script() is hb_unicode_script() now. + + TODO | 4 ++- + src/hb-glib.cc | 6 +++- + src/hb-icu.cc | 6 +++- + src/hb-ot-shape.cc | 6 ++-- + src/hb-shape.cc | 2 +- + src/hb-unicode-private.hh | 8 +++-- + src/hb-unicode.cc | 85 + ++++++++++++++++++++++++++++++++++------------- + src/hb-unicode.h | 70 +++++++++++++++++++++++++++----------- + test/test-unicode.c | 21 +++++++----- + 9 files changed, 146 insertions(+), 62 deletions(-) + +commit d05dded1676924e8894c90f7a7c3527b492bcdff +Author: Behdad Esfahbod +Date: Thu Jul 7 23:42:40 2011 -0400 + + More code generation through preprocessor + + src/hb-ot-shape-complex-private.hh | 46 + ++++++++++++++++++++++++-------------- + 1 file changed, 29 insertions(+), 17 deletions(-) + +commit 891c4755baae6cd59fad59d27fd8933e5f548a74 +Author: Behdad Esfahbod +Date: Thu Jul 7 23:19:27 2011 -0400 + + Humm, undo some shuffling + + In preparation for adding more advanced unicode funcs. + + src/hb-ot-shape.cc | 6 ++--- + src/hb-shape.cc | 2 +- + src/hb-unicode-private.hh | 36 +++++++++++++------------- + src/hb-unicode.cc | 65 + ++++++++++++++++++++++++++++++++++------------- + 4 files changed, 70 insertions(+), 39 deletions(-) + +commit 4b6317c4f426cfaf21e509dbf6ee6d4e0422cdac +Author: Behdad Esfahbod +Date: Thu Jul 7 23:14:42 2011 -0400 + + More code shuffling + + src/hb-font-private.hh | 16 +++--- + src/hb-font.cc | 3 +- + src/hb-unicode-private.hh | 42 +++++++------- + src/hb-unicode.cc | 140 + +++++++++++++++++----------------------------- + 4 files changed, 82 insertions(+), 119 deletions(-) + +commit 3361c9a323575309d9fd55fe076697a3e22073c0 +Author: Behdad Esfahbod +Date: Thu Jul 7 22:35:17 2011 -0400 + + Minor + + src/Makefile.am | 1 + + src/hb-ot-shape-complex-misc.cc | 51 + ++++++++++++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-private.hh | 12 ++++++--- + 3 files changed, 60 insertions(+), 4 deletions(-) + +commit 76f76812ac7cca8ac6935952a2360d5e151480fa +Author: Behdad Esfahbod +Date: Thu Jul 7 22:25:25 2011 -0400 + + Shuffle code around, remove shape_plan from complex shapers + + src/hb-ot-shape-complex-arabic.cc | 36 +++++++++++++------------- + src/hb-ot-shape-complex-indic-machine.rl | 12 ++++----- + src/hb-ot-shape-complex-indic.cc | 25 +++++++++--------- + src/hb-ot-shape-complex-private.hh | 44 + +++++++++++++++++++++----------- + src/hb-ot-shape-private.hh | 13 ++-------- + src/hb-ot-shape.cc | 4 +-- + 6 files changed, 69 insertions(+), 65 deletions(-) + +commit e88bff9b4d77dc86c04832163081effbff752216 +Author: Behdad Esfahbod +Date: Thu Jul 7 22:03:02 2011 -0400 + + Minor, use function typedefs + + src/hb-ot-shape-complex-private.hh | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 359dcaa0d33271025ca42a5f54ecbac7ae3b56d3 +Author: Behdad Esfahbod +Date: Thu Jul 7 21:55:05 2011 -0400 + + Update copyright headers + + src/hb-ot-map-private.hh | 2 +- + src/hb-ot-map.cc | 2 +- + src/hb-ot-shape-complex-private.hh | 2 +- + src/hb-ot-shape.cc | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit d8d0c480c85246a74d47dd5297019c7e39391ab0 +Author: Behdad Esfahbod +Date: Thu Jul 7 21:22:08 2011 -0400 + + Refactor some code common to GSUB and GPOS + + src/hb-ot-map-private.hh | 29 ++++++++++++++++++-------- + src/hb-ot-map.cc | 54 + +++++++++--------------------------------------- + 2 files changed, 30 insertions(+), 53 deletions(-) + +commit b70c96dbe41d6512b80fe3d966a1942e1ef64a4b +Author: Behdad Esfahbod +Date: Thu Jul 7 21:07:41 2011 -0400 + + Enable applying GSUB/GPOS features in multiple segments + + Fixes https://bugzilla.mozilla.org/show_bug.cgi?id=644184 + among others. + + Shapers now can request segmented feature application by calling + add_gsub_pause() or add_gpos_pause(). They can also provide a + callback to be called at the pause. Currently the Arabic shaper + uses pauses to enforce certain feature application. The Indic + shaper can use the same facility to pause and do reordering in the + callback. + + src/hb-ot-map-private.hh | 50 +++++++++++---- + src/hb-ot-map.cc | 132 + +++++++++++++++++++++++++++++++++----- + src/hb-ot-shape-complex-arabic.cc | 24 ++++++- + src/hb-private.hh | 5 ++ + 4 files changed, 181 insertions(+), 30 deletions(-) + +commit f6d7a9bb4c19e605f1f16d9ca40adefba138c37e +Author: Behdad Esfahbod +Date: Thu Jul 7 16:20:35 2011 -0400 + + Shuffle code around + + src/hb-ot-map-private.hh | 68 + ++++++++++++++++++++++++------------------------ + 1 file changed, 34 insertions(+), 34 deletions(-) + +commit fc551edbf236d71a522ae7c2c9461aa71c5f7d66 +Author: Behdad Esfahbod +Date: Thu Jul 7 16:09:38 2011 -0400 + + Add todo + + I'm too lazy to fix the tests now. + + test/test-shape.c | 1 + + 1 file changed, 1 insertion(+) + +commit 2e18c6dbdfbbfdec0490260bb7cb5213551b2188 +Author: Behdad Esfahbod +Date: Wed Jul 6 16:05:45 2011 -0400 + + Fix reverse_range() position loop + + Mozilla Bug 669175 - Slow rendering of text sometimes in this case, + using direction: rtl + + src/hb-buffer.cc | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit fa2befa46f215d8c33a54dfc57889928a628164c +Author: Behdad Esfahbod +Date: Mon Jul 4 17:18:57 2011 -0400 + + Minor + + src/hb-view.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d69d5ceaa0ad30e8d4b9783507c59c6d4221de4f +Author: Behdad Esfahbod +Date: Mon Jul 4 12:56:38 2011 -0400 + + [Indic] Well, at least finding syllables works now :) + + Still not much there. + + src/hb-ot-shape-complex-indic-machine.rl | 4 +++- + src/hb-ot-shape-complex-indic.cc | 9 ++++++++- + 2 files changed, 11 insertions(+), 2 deletions(-) + +commit 253a57fb5ab211f67140e6139d183e49483a9074 +Author: Behdad Esfahbod +Date: Tue Jun 28 17:26:03 2011 -0400 + + [test-shape-complex] Remove the greek tests + + They are outdated with respect to the DejaVu Sans I'm using. + We need to add font version checking to the tests. + + test/test-shape-complex.c | 17 ----------------- + 1 file changed, 17 deletions(-) + +commit afa74bf90405fb121d3132982b87762c1686d80c +Author: Behdad Esfahbod +Date: Tue Jun 28 17:25:17 2011 -0400 + + [test-shape-complex] Print out expected and actual glyphstrings + upon failure + + One has to run the test with --verbose to see that right now. + + test/test-shape-complex.c | 25 ++++++++++++++++++++++--- + 1 file changed, 22 insertions(+), 3 deletions(-) + +commit 42d453b0236f67239342df2003b7abce6e2c51ea +Author: Behdad Esfahbod +Date: Tue Jun 28 16:59:16 2011 -0400 + + [test] Name tests after their input string + + test/Makefile.am | 2 +- + test/test-shape-complex.c | 150 + ++++++++++++++++++++++++++++++---------------- + 2 files changed, 100 insertions(+), 52 deletions(-) + +commit 27413169782fdf79e278dd6552c8e194b3bc4eaa +Author: Behdad Esfahbod +Date: Tue Jun 28 16:21:31 2011 -0400 + + Minor + + Towards a better test runner. + + test/test-shape-complex.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit cc674cbf7fb9972975dc0499974e5e7fb4ae3c81 +Author: Behdad Esfahbod +Date: Tue Jun 28 16:17:16 2011 -0400 + + Minor + + test/test-shape-complex.c | 2 -- + 1 file changed, 2 deletions(-) + +commit 20d8a3982ae320035edd6a04b402cefc9a5e5779 +Author: Behdad Esfahbod +Date: Tue Jun 28 16:16:21 2011 -0400 + + [test] Remove disabled code + + We'd add normalization and decomposition tests later. + + test/test-shape-complex.c | 92 + ----------------------------------------------- + 1 file changed, 92 deletions(-) + +commit 9704f0ca6c2defed52640da77506c80bc67b4f56 +Author: Behdad Esfahbod +Date: Tue Jun 28 16:15:46 2011 -0400 + + [test] Restructure shape test data a bit + + test/test-shape-complex.c | 75 + +++++++++++++++++++++++++++-------------------- + 1 file changed, 43 insertions(+), 32 deletions(-) + +commit 4ec30aec3014be6effc09cbbc88dcd075f3826df +Author: Behdad Esfahbod +Date: Tue Jun 28 14:13:38 2011 -0400 + + [Indic] Optimize Indic table storage + + src/hb-ot-shape-complex-indic.cc | 8 +++++--- + src/hb-private.hh | 1 + + 2 files changed, 6 insertions(+), 3 deletions(-) + +commit c4a59de6d8c1e581b5c155319232be9e805e5cba +Author: Behdad Esfahbod +Date: Tue Jun 28 14:03:29 2011 -0400 + + [Indic] Generate a single data table instead of multiple ones + + src/gen-indic-table.py | 30 +++++++++------- + src/hb-ot-shape-complex-indic-table.hh | 62 + ++++++++++++++++------------------ + 2 files changed, 48 insertions(+), 44 deletions(-) + +commit a346e923a99f920bbebc25b335db51fdfb1429ea +Author: Behdad Esfahbod +Date: Tue Jun 28 12:49:18 2011 -0400 + + [test] Add Indic tests from harfbuzz.old + + Needs fonts to be put in test/fonts. Tests are skipped otherwise. + Run with --verbose for details. Working on improving the test runner + to make it easier to make sense of what's going on. + + test/Makefile.am | 11 +- + test/hb-test.h | 21 + + test/test-shape-complex.c | 1179 + +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 1209 insertions(+), 2 deletions(-) + +commit 8fdba506f0f1c66b50f8f4b114d624cb956d03b7 +Author: Behdad Esfahbod +Date: Fri Jun 24 20:45:55 2011 -0400 + + [Indic] Define indic_position_t + + src/hb-ot-shape-complex-indic.cc | 239 + ++++++++++++++++++++------------------- + 1 file changed, 122 insertions(+), 117 deletions(-) + +commit 65988a145b4a52c37fd53c1473034f9e701f61d9 +Author: Behdad Esfahbod +Date: Fri Jun 24 19:05:52 2011 -0400 + + [Indic] Add a table of consonant positions + + Copied form HarfBuzz.old Indic data. These are below and post + consonants. This is temporary. Read the comment in the patch. + + src/hb-ot-shape-complex-indic.cc | 106 + +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 106 insertions(+) + +commit c7fe56a1d5d3e969b6ec51cd9ecd471706a19568 +Author: Behdad Esfahbod +Date: Fri Jun 24 19:05:34 2011 -0400 + + [Indic] Some of the basic features are global; Mark them so + + src/hb-ot-shape-complex-indic-machine.rl | 1 + + src/hb-ot-shape-complex-indic.cc | 48 + ++++++++++++++++++++++---------- + 2 files changed, 35 insertions(+), 14 deletions(-) + +commit 867361c3ad39629a8d5b7dc48d558a1c19e37d43 +Author: Behdad Esfahbod +Date: Fri Jun 17 18:35:46 2011 -0400 + + [indic] Add syllable recognition state machine + + Using an incredible tool called Ragel. + + src/Makefile.am | 5 ++ + src/hb-ot-shape-complex-indic-machine.rl | 105 + +++++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-indic.cc | 21 +++++-- + 3 files changed, 125 insertions(+), 6 deletions(-) + +commit 422e08dbb8e2c0c5664f1bdc7e159a673cfea8c5 +Author: Behdad Esfahbod +Date: Wed Jun 15 17:22:48 2011 -0400 + + Better categorize Indic character classes + + Matches OT types now. + + src/hb-ot-shape-complex-indic.cc | 51 + +++++++++++++++++++++++++--------------- + 1 file changed, 32 insertions(+), 19 deletions(-) + +commit 31f18abecb149f8888a72510f2660328dd6de16d +Author: Behdad Esfahbod +Date: Wed Jun 15 09:49:58 2011 -0400 + + Minor compiler warning fixes + + src/hb-buffer-private.hh | 8 ++++---- + src/hb-object-private.hh | 4 ++-- + src/hb-open-type-private.hh | 6 +++--- + src/hb-ot-layout-common-private.hh | 8 ++++---- + src/hb-ot-map.cc | 28 +++++++++++++++------------- + src/hb-ot-shape-complex-arabic.cc | 3 +-- + src/hb-view.cc | 11 ++++++----- + test/test-object.c | 22 +++++++++++----------- + test/test-unicode.c | 4 ++-- + 9 files changed, 48 insertions(+), 46 deletions(-) + +commit e3693b72f0651985d4f619cde668611639dca885 +Author: Behdad Esfahbod +Date: Wed Jun 15 09:33:52 2011 -0400 + + Change a couple strstr() to strchr() + + src/hb-ot-tag.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit b9452bfc1696457e156e79037c863903da5454fc +Author: Behdad Esfahbod +Date: Tue Jun 14 14:47:07 2011 -0400 + + Fix compiler warnings with -pedantic + + src/hb-blob.cc | 18 +++++++++--------- + src/hb-glib.cc | 20 ++++++++++---------- + src/hb-icu.cc | 20 ++++++++++---------- + src/hb-object-private.hh | 2 +- + src/hb-open-type-private.hh | 14 +++++++------- + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout.cc | 2 +- + src/hb-ot-map-private.hh | 2 +- + src/hb-ot-shape-complex-indic.cc | 8 ++++---- + src/hb-ot-shape-private.hh | 2 +- + src/hb-ot-shape.cc | 2 +- + 11 files changed, 46 insertions(+), 46 deletions(-) + +commit 970e092dc23cbeb7897d4c7bb58c042209f518fb +Author: Behdad Esfahbod +Date: Tue Jun 14 14:35:44 2011 -0400 + + Remove extra semicolon + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 81426808020e2b88f008480bd63519aa68c579a7 +Author: Behdad Esfahbod +Date: Mon Jun 13 16:02:18 2011 -0400 + + Cosmetic + + src/gen-indic-table.py | 9 +- + src/hb-ot-shape-complex-indic-table.hh | 1038 + ++++++++++++++++---------------- + 2 files changed, 524 insertions(+), 523 deletions(-) + +commit 902ab866f2d2edc3a71c1203065e6ddf49e5b431 +Author: Behdad Esfahbod +Date: Fri Jun 10 23:08:54 2011 -0400 + + GNOME Bug 652227 - Unconditional use of stdint.h + + src/hb-common.h | 33 ++++++++++++++++++++++----------- + 1 file changed, 22 insertions(+), 11 deletions(-) + +commit 20503ccd578c9983162857954e3236413469ed35 +Author: Behdad Esfahbod +Date: Tue Jun 7 17:02:48 2011 -0400 + + More Indic data shuffling + + src/hb-ot-shape-complex-indic.cc | 74 + +++++++++++++++++++++++++++------------- + 1 file changed, 50 insertions(+), 24 deletions(-) + +commit 63b177e45c2405272da3fa6c26fe11ae37950bd0 +Author: Behdad Esfahbod +Date: Tue Jun 7 15:51:40 2011 -0400 + + Minor + + src/hb-ot-shape.cc | 1 + + 1 file changed, 1 insertion(+) + +commit b9ddbd55930228422e82b34a141ad1b6093f5376 +Author: Behdad Esfahbod +Date: Thu Jun 2 17:43:12 2011 -0400 + + [Indic] Start an Indic shaper + + Nothing functional in there yet. + + So far, we're parsing IndicSyllabicCategory.txt and + IndicMatraCategory.txt + fils from Unicode Character Database and store them in an array to + be used + by the shaper. Also hooked up the shaper, but it does not do anything + right now. + + src/Makefile.am | 3 + + src/gen-indic-table.py | 201 ++++++++ + src/hb-ot-shape-complex-arabic.cc | 4 +- + src/hb-ot-shape-complex-indic-table.hh | 834 + +++++++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-indic.cc | 141 ++++++ + src/hb-ot-shape-complex-private.hh | 58 ++- + src/hb-ot-shape-private.hh | 3 +- + 7 files changed, 1237 insertions(+), 7 deletions(-) + +commit 697a65c5f5cda53bc68720886a253a019e8212a8 +Author: Behdad Esfahbod +Date: Wed Jun 1 20:52:00 2011 -0400 + + Minor + + src/gen-arabic-table.py | 21 +++++++++++++-------- + src/hb-ot-shape-complex-arabic-table.hh | 9 ++++----- + 2 files changed, 17 insertions(+), 13 deletions(-) + +commit 9de1481f2bbbf2a174280b849628612f36a2f701 +Author: Behdad Esfahbod +Date: Wed Jun 1 20:45:14 2011 -0400 + + Update to ArabicShaping-6.1.0d2.txt + + src/hb-ot-shape-complex-arabic-table.hh | 307 + ++++++++++++++++++++------------ + 1 file changed, 197 insertions(+), 110 deletions(-) + +commit 9d49433efba2217852f4e44f056465b451961c49 +Author: Behdad Esfahbod +Date: Wed Jun 1 18:10:10 2011 -0400 + + Minor rename + + src/Makefile.am | 2 +- + src/{gen-arabic-joining-table.py => gen-arabic-table.py} | 2 +- + src/hb-ot-shape-complex-arabic-table.hh | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 0eafce56eed4c5166ee5b97b121a452ffd292a7a +Author: Behdad Esfahbod +Date: Wed Jun 1 12:44:30 2011 -0400 + + [TODO] New items + + TODO | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 89a2bc9ba674e7e57fec1fd8ce7648a44f3aab63 +Author: Behdad Esfahbod +Date: Tue May 31 15:18:13 2011 -0400 + + [Vertical] Apply vertical features + + We apply all of vert, vrt2, vkrn, valt, and vpal. + + TODO | 7 ------- + src/hb-ot-shape.cc | 50 + +++++++++++++++++++++++++++++++++++++++++--------- + 2 files changed, 41 insertions(+), 16 deletions(-) + +commit 0c6a9767c812c00f2a6a02d9f43f4694e1f43815 +Author: Behdad Esfahbod +Date: Tue May 31 12:59:17 2011 -0400 + + [hb-view] Add --face-index to choose a face in a TrueType Collection + + src/hb-view.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 4f28fbdd804fabeec57a98fe267d892ab58b3a6d +Author: Behdad Esfahbod +Date: Tue May 31 12:33:11 2011 -0400 + + Fix TTC header handling + + Also change the Version type to avoid similar bugs in the future. + + Reported by Grigori Goronzy. + + src/hb-open-file-private.hh | 6 +++--- + src/hb-open-type-private.hh | 2 +- + src/hb-ot-layout-gdef-private.hh | 6 +++--- + 3 files changed, 7 insertions(+), 7 deletions(-) + +commit 21deab2bdc58d8e9f1a3ba1f9c61c30a79e288a1 +Author: Behdad Esfahbod +Date: Mon May 30 11:08:40 2011 -0400 + + Fixed inifinite loop introduced in 7403e055cd1463f + + k is the index, not j. + + Reported by Tom Hacohen. + + src/hb-ot-layout-gpos-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 51881a61ca96c3328e2d92927a5a61e60997a429 +Author: Behdad Esfahbod +Date: Fri May 27 18:15:56 2011 -0400 + + Shrink code size + + src/hb-ot-map-private.hh | 11 +---------- + src/hb-ot-map.cc | 11 +++++++++++ + 2 files changed, 12 insertions(+), 10 deletions(-) + +commit 90645fb24bcbb78183576d3641a99560d87e49f2 +Author: Behdad Esfahbod +Date: Fri May 27 18:13:31 2011 -0400 + + [OT] Separate map_builder from the actual map + + Respectively, separate planner from the actual plan. + + src/hb-ot-map-private.hh | 121 + ++++++++++++++++++++----------------- + src/hb-ot-map.cc | 33 +++++----- + src/hb-ot-shape-complex-arabic.cc | 6 +- + src/hb-ot-shape-complex-private.hh | 8 +-- + src/hb-ot-shape-private.hh | 22 +++++++ + src/hb-ot-shape.cc | 28 +++++---- + 6 files changed, 127 insertions(+), 91 deletions(-) + +commit 5560a19e2b3901437d8ee2e5905b4ac77073bfbe +Author: Behdad Esfahbod +Date: Fri May 27 17:49:16 2011 -0400 + + Minor + + src/hb-view.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1587c26fe94087040b4a5d682ec196f568e4a1a2 +Author: Behdad Esfahbod +Date: Fri May 27 16:05:01 2011 -0400 + + [TODO] Add item + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 5c9f14932d59e306fbc72f7daecb384a16da73d9 +Author: Behdad Esfahbod +Date: Fri May 27 15:59:33 2011 -0400 + + Minor + + Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit 5bc18195d55570ef01e4b24dd248f222f081b0a2 +Author: Behdad Esfahbod +Date: Fri May 27 15:58:54 2011 -0400 + + Add check-includes.sh + + src/Makefile.am | 7 +++++++ + src/check-c-linkage-decls.sh | 6 +++++- + src/check-header-guards.sh | 8 +++++++- + src/check-includes.sh | 42 + ++++++++++++++++++++++++++++++++++++++++++ + src/check-internal-symbols.sh | 8 ++++---- + src/check-libstdc++.sh | 7 ++++--- + src/hb-ot-shape.h | 1 + + 7 files changed, 70 insertions(+), 9 deletions(-) + +commit 3f12c434e20261f6d5c600e56575b7dfdd5b1470 +Author: Behdad Esfahbod +Date: Fri May 27 04:58:11 2011 -0400 + + [configure] Generate sha256sum and GPG-sign it + + Makefile.am | 29 ++++++++++++++++++++++++++++- + 1 file changed, 28 insertions(+), 1 deletion(-) + +commit 75ba4073ca6f72c135927d9314197a605281b789 +Author: Behdad Esfahbod +Date: Fri May 27 03:58:17 2011 -0400 + + [test] Rename valgrind-log to log-vaglring.txt + + test/Makefile.am | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit e3b0ba8e292e6a90666cfbbab6faf11ae11f9ddb +Author: Behdad Esfahbod +Date: Fri May 27 03:56:37 2011 -0400 + + Minor + + harfbuzz.doap | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 595dc63eee926a0e0fee26f8225b5fbe00610fcb +Author: Behdad Esfahbod +Date: Fri May 27 04:14:12 2011 -0400 + + Bump version to 0.7.0 to open up for development + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f24557604281356131618546332d7ee3a0c8abef +Author: Behdad Esfahbod +Date: Wed May 25 16:08:06 2011 -0400 + + Release 0.6.0. First official tarball release! + + There are no API guarantees just yet, but I *expect* that no + incompatible API changes to happen before 1.0.0. + + Update NEWS. + + NEWS | 262 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 263 insertions(+), 1 deletion(-) + +commit 654f88fbc9bcb54f9bd2d5586236234e03424044 +Author: Behdad Esfahbod +Date: Fri May 27 03:38:46 2011 -0400 + + [test-common] Test hb_direction_to_string() + + Caught by "make check-symbols". + + test/test-common.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 18bced134fc3379c9124ba029e22ff3f6434ca0f +Author: Behdad Esfahbod +Date: Fri May 27 03:38:30 2011 -0400 + + [test] Rename test-symbols to check-symbols + + Shows undocumented symbols. + + test/Makefile.am | 37 +++++++++++++++++++++---------------- + 1 file changed, 21 insertions(+), 16 deletions(-) + +commit 376dafa6ed414e368e9dc1d5a2e0bfc8e55f410d +Author: Behdad Esfahbod +Date: Fri May 27 03:35:58 2011 -0400 + + Hide internal symbols + + src/hb-ot-shape.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0e482ec6ba30b613f2d7ee97c61be458c5aebcd6 +Author: Behdad Esfahbod +Date: Fri May 27 02:46:28 2011 -0400 + + [test/unicode] Fix double-free + + Caught by "make check-valgrind". + + test/Makefile.am | 2 +- + test/test-unicode.c | 2 -- + 2 files changed, 1 insertion(+), 3 deletions(-) + +commit 28b1bac5415774cf892c9cc0afcac1324c2093f5 +Author: Behdad Esfahbod +Date: Fri May 27 02:44:29 2011 -0400 + + [test] Switch to automake-based test-runner + + Adds check-valgrind among other modes. We do not run under gtester by + default anymore. + + Makefile.am | 2 + + test/.valgrind-suppressions | 0 + test/Makefile.am | 48 ++++++++++++++++++++++-- + test/Makefile.decl | 90 + --------------------------------------------- + 4 files changed, 47 insertions(+), 93 deletions(-) + +commit adbc97ddde27cf609d95d3249f3ea8060a6e1d20 +Author: Behdad Esfahbod +Date: Fri May 27 01:33:18 2011 -0400 + + [test] Add test-symbols that checks API symbol text coverage + + We're not at 100% coverage yet, so do not enable the test by default. + + test/Makefile.am | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +commit 9313b9aa66a82fd3fa60d8417c22a5350e5a8791 +Author: Behdad Esfahbod +Date: Fri May 27 01:00:55 2011 -0400 + + [test/version] Test hb-version.h + + test/Makefile.am | 1 + + test/test-version.c | 80 + +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 81 insertions(+) + +commit 329c15714be90d3fc2d9054f80cb14fa325dc959 +Author: Behdad Esfahbod +Date: Wed May 25 16:07:07 2011 -0400 + + Add libtool versioning + + The versioning is automatic. For now, soname-major is 0. With + the 1.0.0 release it will jump to 1 and stay there forever. + + configure.ac | 26 +++++++++++++++++++++----- + src/Makefile.am | 1 + + 2 files changed, 22 insertions(+), 5 deletions(-) + +commit 5b21eff8c4a00962d4315a47a65a143abe323299 +Author: Behdad Esfahbod +Date: Wed May 25 14:49:35 2011 -0400 + + Update README, etc + + COPYING | 1 + + README | 8 +++----- + configure.ac | 2 +- + 3 files changed, 5 insertions(+), 6 deletions(-) + +commit 5bf56ea056b30fba8e07e82ec818c430cab8cafd +Author: Behdad Esfahbod +Date: Wed May 25 14:43:10 2011 -0400 + + [TODO] Add item + + TODO | 2 ++ + test/test-shape.c | 2 ++ + 2 files changed, 4 insertions(+) + +commit 2d8ebcb9d089c2cfbefac71ca6350e2703ab13e3 +Author: Behdad Esfahbod +Date: Wed May 25 11:27:33 2011 -0400 + + [API] One last font-funcs API change + + Now that vertical text works correctly, I'm doing a last round + modification of the font-funcs API to simplify. Expect no more + changes around here. + + src/hb-font.cc | 107 + ++++++++++++++++++------------------------------------ + src/hb-font.h | 50 +++++++++++-------------- + src/hb-ft.cc | 26 ++++++------- + test/test-font.c | 27 +++++++------- + test/test-shape.c | 21 +++++------ + 5 files changed, 91 insertions(+), 140 deletions(-) + +commit d31691296f7d3051fcd345bf1325d17835484b50 +Author: Behdad Esfahbod +Date: Wed May 25 11:01:32 2011 -0400 + + [test] Update to API changes + + test/test-font.c | 72 + ++++++++++++++++++++++--------------------------------- + test/test-shape.c | 35 +++++++++++++-------------- + 2 files changed, 44 insertions(+), 63 deletions(-) + +commit 7403e055cd1463f38215ad9faedd61c3e1b66ac5 +Author: Behdad Esfahbod +Date: Tue May 24 21:04:15 2011 -0400 + + [Vertical] fix vertical gpos + + Wow, it took me a few days to find the right fix! + + We now set the advance for attached marks to zero, but we + do this in the _finish() state of gpos, so it shouldn't + regress with fonts like DejaVuSansMono that explicitly + decrease the mark advance width to set it to zero. + + src/hb-ot-layout-gpos-private.hh | 167 + +++++++++++++++++++++++---------------- + src/hb-ot-shape.cc | 9 ++- + 2 files changed, 103 insertions(+), 73 deletions(-) + +commit ff7cbd0219a7c260612c53b3bed343747d79ec4e +Author: Behdad Esfahbod +Date: Wed May 25 09:56:06 2011 -0400 + + [TODO] Update + + TODO | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +commit 3b0bb855e011099f1a4c77ffc5214c658e280b2d +Author: Behdad Esfahbod +Date: Fri May 20 15:59:59 2011 -0400 + + [Vertical] GPOS x/y advance adjustments only apply in hori/vert + respectively + + src/hb-ot-layout-gpos-private.hh | 31 +++++++++++++++++++++---------- + 1 file changed, 21 insertions(+), 10 deletions(-) + +commit cc2086d67ce559878a5ce2b41d89a37eabac90b8 +Author: Behdad Esfahbod +Date: Thu May 19 19:19:50 2011 -0400 + + [Vertical] Fix GPOS y-advance direction + + src/hb-ot-layout-gpos-private.hh | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 67d51ff96154c8909734046601e439dd8f6a86df +Author: Behdad Esfahbod +Date: Thu May 19 19:08:57 2011 -0400 + + [Vertical] Do fallback origin calculation + + src/hb-font.cc | 32 +++++++++++++++++++++++++++----- + 1 file changed, 27 insertions(+), 5 deletions(-) + +commit 60fbb36096e344e9af79409ce8cfe3f1f7b0d321 +Author: Behdad Esfahbod +Date: Thu May 19 18:46:15 2011 -0400 + + [Vertical] GPOS is always done with horizontal origin + + src/hb-font-private.hh | 4 +- + src/hb-font.cc | 187 + ++++++++++++++++++--------------------- + src/hb-font.h | 53 ++++++----- + src/hb-ft.cc | 47 ++++------ + src/hb-ot-layout-gdef-private.hh | 18 ++-- + src/hb-ot-layout-gpos-private.hh | 23 ++--- + src/hb-ot-layout.h | 2 +- + src/hb-ot-shape.cc | 15 ++++ + 8 files changed, 166 insertions(+), 183 deletions(-) + +commit 8b38faeede41e64eb0f6ac2e12ce51dd7138d50a +Author: Behdad Esfahbod +Date: Thu May 19 13:08:00 2011 -0400 + + More vertical + + Starting to get there, but not without yet another round of changes. + + I think I know wheere to go now. + + src/hb-font.cc | 44 ++++++++++++++++++++++++++++++++------------ + src/hb-font.h | 10 ++++++++++ + src/hb-ft.cc | 14 ++++++++++++-- + src/hb-ot-shape.cc | 4 ++++ + 4 files changed, 58 insertions(+), 14 deletions(-) + +commit e609aeb1e24da6b7c812396cddb93ee3c95ef87a +Author: Behdad Esfahbod +Date: Wed May 18 10:17:02 2011 -0400 + + [hb-view] Add --annotate + + Currently it only marks glyph origins. + + src/hb-view.cc | 20 +++++++++++++++++++- + 1 file changed, 19 insertions(+), 1 deletion(-) + +commit b8d76dd74e50d295918cc015e9d2a55e2bf6a461 +Author: Behdad Esfahbod +Date: Tue May 17 23:31:00 2011 -0400 + + Vertical: Adjust origin in glyph_extents() and glyph_contour_point() + + The base for vertical is almost ready now. + + src/hb-font.cc | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 190981851fe2bb6479b5c72451279f66fe4f6e23 +Author: Behdad Esfahbod +Date: Tue May 17 23:27:22 2011 -0400 + + Cosmetic + + src/hb-font.cc | 114 + ++++++++++++++++++++++++++++----------------------------- + src/hb-ft.cc | 36 +++++++++--------- + 2 files changed, 74 insertions(+), 76 deletions(-) + +commit 2c3f51a11c176aa3fc12a9522325efaef2c79d35 +Author: Behdad Esfahbod +Date: Tue May 17 23:23:27 2011 -0400 + + Minor + + src/hb-font.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7e2c85de305be59e1a6afa7d2061e4b7dd00acf7 +Author: Behdad Esfahbod +Date: Tue May 17 17:55:03 2011 -0400 + + [API] Vertical support, take 2 + + I like this API *much* better. Implementation still incomplete, but + horizontal works. + + src/hb-font-private.hh | 7 +- + src/hb-font.cc | 185 + +++++++++++++++++++++++---------------- + src/hb-font.h | 109 ++++++++++++----------- + src/hb-ft.cc | 66 ++++++++------ + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 2 +- + src/hb-ot-shape.cc | 8 +- + 7 files changed, 218 insertions(+), 161 deletions(-) + +commit 744970af4d884cc87ffa645804578fec8df674a9 +Author: Behdad Esfahbod +Date: Mon May 16 18:15:37 2011 -0400 + + [API] Add support for vertical text + + Design not final yet, and in fact I'm going to change it immediately, + but this is an standalone change for itself. + + src/hb-font-private.hh | 35 ++-- + src/hb-font.cc | 387 + +++++++++++++++++++++++++---------- + src/hb-font.h | 164 +++++++++++---- + src/hb-ft.cc | 227 +++++++++++++------- + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 35 ++-- + src/hb-ot-layout-gsub-private.hh | 1 + + src/hb-ot-layout-gsubgpos-private.hh | 1 + + src/hb-ot-shape.cc | 14 +- + src/hb-ot-tag.cc | 2 +- + test/test-font.c | 61 +++--- + test/test-shape.c | 17 +- + 12 files changed, 650 insertions(+), 296 deletions(-) + +commit 80dce8b7c8202766d52cc7666355446bbf5b0565 +Author: Behdad Esfahbod +Date: Tue May 17 17:08:36 2011 -0400 + + Minor + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 5be7d047f6bf54cc577e311b5426c463d2b9b131 +Author: Behdad Esfahbod +Date: Tue May 17 15:05:34 2011 -0400 + + Check for mmap() + + Apparently there exist systems with mprotect(), but not mmap()? + + configure.ac | 2 +- + test/test-blob.c | 6 ++++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +commit 4053f3f788353448b41e541ee617aafbe1cac366 +Author: Behdad Esfahbod +Date: Mon May 16 16:20:48 2011 -0400 + + Cosmetic + + src/hb-font.h | 8 ++++---- + test/test-shape.c | 6 +++--- + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit 56d12e0356bee5a95b870dfbc2100b8caeb5d593 +Author: Behdad Esfahbod +Date: Mon May 16 16:01:58 2011 -0400 + + Remove unnecessary TODO item + + src/hb-ft.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 1883af3796459cafe2d194064403b6b1152c584d +Author: Behdad Esfahbod +Date: Mon May 16 15:18:16 2011 -0400 + + [hb-view] Start work on vertical support + + src/hb-view.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 9aa6f96af5e5940ba5c9596c6ae377fea23c0ec0 +Author: Behdad Esfahbod +Date: Mon May 16 15:08:31 2011 -0400 + + [hb-view] No need to allocate an extra glyph item at the end + + src/hb-view.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit a0359485c9997e3a211f7c00d40c09074d906c4f +Author: Behdad Esfahbod +Date: Mon May 16 15:07:48 2011 -0400 + + Minor + + test/test-shape.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 92de53ea450eaee077eb1730e6d7a487b20ac721 +Author: Behdad Esfahbod +Date: Mon May 16 12:24:56 2011 -0400 + + [test/buffer] Add more tests for nil buffer + + test/test-buffer.c | 38 ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 38 insertions(+) + +commit 065fb38c9a338ddb095f2ec9e034fcc5a02167bd +Author: Behdad Esfahbod +Date: Fri May 13 23:04:46 2011 -0400 + + [test/ot-tag] More tests + + test/test-ot-tag.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 1a64f6e19a4b483e278c85e4941107be2f71b0a4 +Author: Behdad Esfahbod +Date: Fri May 13 22:55:32 2011 -0400 + + [API] Add HB_LANGUAGE_INVALID + + src/hb-common.cc | 5 +++-- + src/hb-common.h | 2 ++ + src/hb-ot-tag.cc | 2 +- + src/hb-shape.cc | 2 +- + test/test-common.c | 9 ++++++--- + 5 files changed, 13 insertions(+), 7 deletions(-) + +commit 40b5c2e86c633441040196d158e965ad95d6ad37 +Author: Behdad Esfahbod +Date: Fri May 13 22:46:36 2011 -0400 + + [test/test-ot-tag] Test hb-ot-tag.h, fix many bugs + + I'm in awe with how many bugs this test revealed. All fixed. + + src/hb-ot-tag.cc | 153 +++++++++++++++++++++--------------- + test/Makefile.am | 3 + + test/test-ot-tag.c | 227 + +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 320 insertions(+), 63 deletions(-) + +commit 1368018b475c2a6dd5f625af99695ae2fcba1f05 +Author: Behdad Esfahbod +Date: Fri May 13 20:25:38 2011 -0400 + + [TODO] Add items + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 7fc5a30cb4fbe9a4633ab842b0a8cbbcc6f6bd1b +Author: Behdad Esfahbod +Date: Thu May 12 17:48:20 2011 -0400 + + [API] Add hb_face_make/is_immutable() + + src/hb-font-private.hh | 2 ++ + src/hb-font.cc | 18 ++++++++++++++++++ + src/hb-font.h | 6 ++++++ + test/test-font.c | 2 ++ + test/test-object.c | 2 +- + 5 files changed, 29 insertions(+), 1 deletion(-) + +commit 20c8b908ddf50a9814dfdd9fca595f258273cd4f +Author: Behdad Esfahbod +Date: Thu May 12 15:19:33 2011 -0400 + + Finish off previous change + + src/hb-font.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 0fd8c2f1be693616f19f2f1526369874763d6cf6 +Author: Behdad Esfahbod +Date: Thu May 12 15:14:13 2011 -0400 + + [API] Make get_glyph() callback return a boolean + + We need to know whether the glyph exists, so we can fallback to + composing / decomposing. Assuming that glyph==0 means "doesn't exist" + wouldn't work for applications like Pango that want to use different + "doesn't exist" glyph codes for different characters. An explicit + return value fixes that. + + src/hb-font.cc | 15 +++++++++------ + src/hb-font.h | 12 +++++++----- + src/hb-ft.cc | 12 +++++++----- + src/hb-ot-shape.cc | 13 +++++++++---- + test/test-font.c | 5 ++++- + test/test-shape.c | 12 +++++++----- + 6 files changed, 43 insertions(+), 26 deletions(-) + +commit 8e07f93ab4a3ef9adc7942727ef21f2f9a141d10 +Author: Behdad Esfahbod +Date: Thu May 12 14:27:44 2011 -0400 + + [test/shape] Check shape output + + test/test-shape.c | 23 +++++++++++++++++++---- + 1 file changed, 19 insertions(+), 4 deletions(-) + +commit 805af72405a2f653f08de392d7172291ffe8e902 +Author: Behdad Esfahbod +Date: Thu May 12 12:39:40 2011 -0400 + + Rename get_kernings() arguments from first/second_glyph to + left/right_glyph + + Makes it clear that kerning is in visual order. + + src/hb-font.cc | 10 +++++----- + src/hb-font.h | 4 ++-- + src/hb-ft.cc | 6 +++--- + 3 files changed, 10 insertions(+), 10 deletions(-) + +commit 23d2432219a91c6328efa9e041b1ecf137752ac3 +Author: Behdad Esfahbod +Date: Thu May 12 10:53:57 2011 -0400 + + [test] Add test-shape.c. Oops + + test/test-shape.c | 125 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 125 insertions(+) + +commit c098c3acc8c48b4b6883c50c9a87e81dbe98ba24 +Author: Behdad Esfahbod +Date: Thu May 12 10:49:30 2011 -0400 + + [test/blob] Use MAP_ANON instead of MAP_ANONYMOUS + + More portable. + + test/test-blob.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8329eb7c6ca39e162228733a2210e643b1a1019d +Author: Behdad Esfahbod +Date: Thu May 12 01:39:17 2011 -0400 + + [test/shape] Add simplest test for hb_shape() + + test/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit df077fadd7828b609bdfe4dbcad52ef2448525c7 +Author: Behdad Esfahbod +Date: Thu May 12 01:19:39 2011 -0400 + + [object] Make object inert during destruction + + Such that user_data and other finalizers cannot resurrect object + + src/hb-object-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit ee8dd83bb4e0b1c2ca5928391e35e8bd1fca6121 +Author: Behdad Esfahbod +Date: Thu May 12 01:02:03 2011 -0400 + + [TODO] Update + + TODO | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 52df150efeff4cf003cee65f8c91618f1a980bc8 +Author: Behdad Esfahbod +Date: Thu May 12 00:46:57 2011 -0400 + + Fix font subclass chainup + + Test passing now. + + src/hb-font.cc | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +commit f2c1dd4f746c36a44cf33d0257a3cd800107c286 +Author: Behdad Esfahbod +Date: Thu May 12 00:35:12 2011 -0400 + + [test/font] Test font_funcs subclassing + + test/test-font.c | 158 + +++++++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 155 insertions(+), 3 deletions(-) + +commit 14f1e81b77971204e9325e2a8b6f8b690fac20a7 +Author: Behdad Esfahbod +Date: Thu May 12 00:18:28 2011 -0400 + + [test/font] Test empty funcs + + test/test-font.c | 75 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 73 insertions(+), 2 deletions(-) + +commit 2ca0b5ae1e65d3f43df3a4a2144a1451d8b485c4 +Author: Behdad Esfahbod +Date: Wed May 11 23:57:36 2011 -0400 + + [test/font] Test more + + test/test-font.c | 63 + ++++++++++++++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 54 insertions(+), 9 deletions(-) + +commit 7033518f756490e9cf00b96387fee6f2f7fae785 +Author: Behdad Esfahbod +Date: Wed May 11 23:31:15 2011 -0400 + + [API] Pass face to get_table() + + src/hb-font.cc | 4 ++-- + src/hb-font.h | 2 +- + src/hb-ft.cc | 2 +- + test/test-font.c | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +commit b46782780690e26a8221e2d63dd224159aebe413 +Author: Behdad Esfahbod +Date: Wed May 11 23:25:28 2011 -0400 + + [API] Remove const from font user_data + + src/hb-font.cc | 20 ++++++++++---------- + src/hb-font.h | 20 ++++++++++---------- + src/hb-ft.cc | 20 ++++++++++---------- + 3 files changed, 30 insertions(+), 30 deletions(-) + +commit ea93e7b27ca04a1655d62bd1d18a32805994af44 +Author: Behdad Esfahbod +Date: Wed May 11 23:22:55 2011 -0400 + + [test/font] More tests + + test/test-font.c | 36 +++++++++++++++++++++++++++++++++--- + 1 file changed, 33 insertions(+), 3 deletions(-) + +commit cdb153175f8a1521cde112c65b173f548ca6ee5c +Author: Behdad Esfahbod +Date: Wed May 11 23:12:58 2011 -0400 + + [test/font] More tests + + test/test-font.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 44 insertions(+) + +commit 74d9fa3d9ac226ed72702884e721ef94ecc48e22 +Author: Behdad Esfahbod +Date: Wed May 11 23:07:47 2011 -0400 + + [test/font] More get_empty() tests + + test/test-font.c | 5 +++++ + 1 file changed, 5 insertions(+) + +commit db9f4eb4e004fadae9d540522d1d21c3bbe659b0 +Author: Behdad Esfahbod +Date: Wed May 11 23:06:02 2011 -0400 + + [test/font] Test get_face() / get_parent() + + test/test-font.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 606923bb4304d5b9cf164745d657cba58949a80a +Author: Behdad Esfahbod +Date: Wed May 11 23:05:02 2011 -0400 + + [test/font] Add test_font_properties() + + test/test-font.c | 85 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 85 insertions(+) + +commit da603e80386b41b360acb070a862b6ed87da57b8 +Author: Behdad Esfahbod +Date: Wed May 11 22:52:35 2011 -0400 + + [test/font] Start adding tests for hb-font.h + + test/Makefile.am | 1 + + test/test-buffer.c | 2 +- + test/test-font.c | 69 + +++++++++++++++++++++++++++++++++++++++++++++++++++++ + test/test-unicode.c | 1 + + 4 files changed, 72 insertions(+), 1 deletion(-) + +commit 9a14688e40e926b9453fcb75891f27bff1e45c49 +Author: Behdad Esfahbod +Date: Wed May 11 22:49:29 2011 -0400 + + [API] Rename hb_face_create_for_data() to hb_face_create() + + src/hb-font.cc | 4 ++-- + src/hb-font.h | 4 ++-- + src/hb-ft.cc | 2 +- + src/test.cc | 2 +- + test/test-object.c | 4 ++-- + 5 files changed, 8 insertions(+), 8 deletions(-) + +commit 46d6a21cc8613519e6ce27b1925e29285cccb71d +Author: Behdad Esfahbod +Date: Wed May 11 22:33:13 2011 -0400 + + [API] Add hb_ot_layout_substitute_start/finish() + + src/hb-ot-layout.cc | 13 +++++++++++++ + src/hb-ot-layout.h | 8 ++++++++ + 2 files changed, 21 insertions(+) + +commit c84d15f52e1183164502d45b476b54f8fe812e0f +Author: Behdad Esfahbod +Date: Wed May 11 22:23:15 2011 -0400 + + Remove unused hb_set_t + + src/hb-private.hh | 48 ------------------------------------------------ + 1 file changed, 48 deletions(-) + +commit 389a7c9e67549b1a9f7c538965e4647077f8e6ec +Author: Behdad Esfahbod +Date: Wed May 11 22:21:38 2011 -0400 + + Remove hb_static_threadsafe_set_t + + src/hb-common.cc | 5 +++-- + src/hb-mutex-private.hh | 42 ------------------------------------------ + 2 files changed, 3 insertions(+), 44 deletions(-) + +commit e06d4eda7bbdb3a1be1f1ce8d98b059a0730f14d +Author: Behdad Esfahbod +Date: Wed May 11 22:18:31 2011 -0400 + + Use constructor/destructor for hb_ot_shape_plan_t + + src/hb-ot-shape-private.hh | 6 +++++- + src/hb-ot-shape.cc | 4 +--- + 2 files changed, 6 insertions(+), 4 deletions(-) + +commit a5e4e109460ea23fa5e64926a1676c6a02ab6ba2 +Author: Behdad Esfahbod +Date: Wed May 11 22:00:56 2011 -0400 + + Minor + + TODO | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit daa446f184fa27c9764ff7f8a2444d47cf34d986 +Author: Behdad Esfahbod +Date: Wed May 11 21:31:25 2011 -0400 + + Fix compile with no mutex available + + src/hb-mutex-private.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 1e56c476c10577fe319fe553c5ced000bd740940 +Author: Behdad Esfahbod +Date: Wed May 11 21:28:01 2011 -0400 + + Free static mutex'es + + src/hb-mutex-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 831886a9b4073cfe27f7e1db0e957cbd5913fd31 +Author: Behdad Esfahbod +Date: Wed May 11 21:27:52 2011 -0400 + + Streamline mutex stuff + + src/hb-mutex-private.hh | 61 + ++++++++++++++++++++++++++++++------------------- + src/hb-private.hh | 8 +++++++ + 2 files changed, 46 insertions(+), 23 deletions(-) + +commit 438c4eee353ddf0de66171d84c6ef9b21cbdf8f6 +Author: Behdad Esfahbod +Date: Wed May 11 21:14:34 2011 -0400 + + Remove unused hb_mutex_trylock() + + src/hb-mutex-private.hh | 3 --- + 1 file changed, 3 deletions(-) + +commit b8477e1da2785708f3232f8f2577f602a5d320d1 +Author: Behdad Esfahbod +Date: Wed May 11 21:12:44 2011 -0400 + + [test] Add tests for _get_empty() funcs + + test/test-blob.c | 1 + + test/test-buffer.c | 7 +++++++ + test/test-unicode.c | 10 ++++++++++ + 3 files changed, 18 insertions(+) + +commit 3994be3ded40e5a3da0e187ad421b19a78865e02 +Author: Behdad Esfahbod +Date: Wed May 11 21:08:31 2011 -0400 + + [TODO] Update + + TODO | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 80a6833b032bc63b4e8c3da6489d3767af1168f3 +Author: Behdad Esfahbod +Date: Wed May 11 18:14:44 2011 -0400 + + [API] Add hb_*_get_empty() for all objects + + src/hb-buffer.cc | 6 ++++++ + src/hb-buffer.h | 3 +++ + src/hb-font.cc | 18 ++++++++++++++++++ + src/hb-font.h | 9 +++++++++ + src/hb-unicode.cc | 6 ++++++ + src/hb-unicode.h | 3 +++ + test/test-object.c | 36 +++++++++++++++++++++++++++++++++--- + 7 files changed, 78 insertions(+), 3 deletions(-) + +commit d3b30be378c1dec0259a626d9a408bb9ca1b71ac +Author: Behdad Esfahbod +Date: Wed May 11 18:06:12 2011 -0400 + + [API] Add HB_UNTAG() + + Useful in C API only. + + src/hb-common.h | 1 + + 1 file changed, 1 insertion(+) + +commit 3cc6e9dcb42551761c3a1a9d3c25b1f1bcdc2419 +Author: Behdad Esfahbod +Date: Wed May 11 18:02:48 2011 -0400 + + Minor + + src/test.cc | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 4101ca7dbbdf1438fa116fb8cad935501ac7cca8 +Author: Behdad Esfahbod +Date: Wed May 11 14:30:56 2011 -0400 + + Plug more leaks + + All good now. + + src/hb-blob.cc | 2 +- + src/hb-open-type-private.hh | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 6a7ac79e26e85f6781186cf708a12825c0857324 +Author: Behdad Esfahbod +Date: Wed May 11 14:19:18 2011 -0400 + + Plug leaks + + src/hb-ot-map-private.hh | 7 +++++++ + src/hb-ot-shape-private.hh | 2 ++ + src/hb-ot-shape.cc | 2 ++ + src/hb-private.hh | 10 +++++++++- + 4 files changed, 20 insertions(+), 1 deletion(-) + +commit 7aa12ebdff11a4ffbd04bf9b164586eb0c172e37 +Author: Behdad Esfahbod +Date: Wed May 11 11:55:11 2011 -0400 + + [unicode] Simplify method setting + + src/hb-unicode.cc | 6 +----- + test/test-unicode.c | 6 +++++- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit d5bfd0272130a315d3b5e6cdcf9b7e6395879204 +Author: Behdad Esfahbod +Date: Wed May 11 11:48:28 2011 -0400 + + Minor + + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6a4e7e1372ef9fde81b84ecc9c4d1f23d97396c1 +Author: Behdad Esfahbod +Date: Wed May 11 10:31:33 2011 -0400 + + Add maxp table + + Not used for anything right now. Will use to get num_glyphs in + the future. + + src/Makefile.am | 1 + + src/hb-ot-head-private.hh | 1 - + src/hb-ot-layout.cc | 1 + + src/hb-ot-maxp-private.hh | 68 + +++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 70 insertions(+), 1 deletion(-) + +commit e0b0710ae52bcc8c6fbd87dfae83818faa5d5f5f +Author: Behdad Esfahbod +Date: Wed May 11 08:58:21 2011 -0400 + + Minor + + TODO | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit a513dbcf73ab1cc39a7c9653034904d0c6cd9fe9 +Author: Behdad Esfahbod +Date: Wed May 11 00:24:34 2011 -0400 + + [API] Change signature of get_contour_point and get_kerning ffuncs + + get_contour_point now takes glyph id before point_index. + + get_kerning now takes a vector to fill-in. + + src/hb-font.cc | 56 + +++++++++++++++++++++------------------- + src/hb-font.h | 16 +++++++----- + src/hb-ft.cc | 11 +++++--- + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 2 +- + src/hb-ot-shape.cc | 15 ++++++++--- + 6 files changed, 59 insertions(+), 43 deletions(-) + +commit 63d646fb2933c2765ce526d321a498d0f7fae2f5 +Author: Behdad Esfahbod +Date: Wed May 11 00:15:37 2011 -0400 + + [font] Do user-space conversion when chaining up to parent font + + src/hb-font-private.hh | 28 ++++++++++++++++++++++++++++ + src/hb-font.cc | 23 +++++++++++++++++------ + 2 files changed, 45 insertions(+), 6 deletions(-) + +commit b6f902a1a9c8b72b5d6a241a14a7bacfaea3a56a +Author: Behdad Esfahbod +Date: Wed May 11 00:04:15 2011 -0400 + + Minor + + src/hb-font-private.hh | 6 +++--- + src/hb-ot-layout-gdef-private.hh | 6 +++--- + src/hb-ot-layout-gpos-private.hh | 20 ++++++++++---------- + 3 files changed, 16 insertions(+), 16 deletions(-) + +commit abcfe9b59b4475eb02dd679aac4bc59616713b28 +Author: Behdad Esfahbod +Date: Wed May 11 00:02:02 2011 -0400 + + Remove hb_ot_layout_context_t, simplify code + + src/hb-font-private.hh | 12 +++- + src/hb-font.cc | 6 +- + src/hb-ot-layout-common-private.hh | 8 +-- + src/hb-ot-layout-gdef-private.hh | 34 +++++----- + src/hb-ot-layout-gpos-private.hh | 121 + ++++++++++++++++++----------------- + src/hb-ot-layout-gsub-private.hh | 24 +++---- + src/hb-ot-layout-gsubgpos-private.hh | 11 ++-- + src/hb-ot-layout-private.hh | 13 ---- + src/hb-ot-layout.cc | 15 +---- + 9 files changed, 118 insertions(+), 126 deletions(-) + +commit 1ded6d8bbf93b7dabf2b1f620c07bd3236e7a60f +Author: Behdad Esfahbod +Date: Tue May 10 20:49:02 2011 -0400 + + Make default font-funcs chain-up to the parent + + src/hb-font.cc | 44 +++++++++++++++++++++++++++++++++++++++----- + src/hb-font.h | 41 +++++++++++++++++++++-------------------- + 2 files changed, 60 insertions(+), 25 deletions(-) + +commit b9d975b931d6310f25fab5ac280f523cdc27bf94 +Author: Behdad Esfahbod +Date: Tue May 10 20:41:13 2011 -0400 + + [API] Pass down closure user_data to font funcs + + src/hb-font-private.hh | 30 ++++++-- + src/hb-font.cc | 184 + +++++++++++++++++++++++++------------------------ + src/hb-font.h | 42 ++++++----- + src/hb-ft.cc | 103 ++++++++++++++------------- + 4 files changed, 198 insertions(+), 161 deletions(-) + +commit 446df9cdb1fddb51819b731436fca54146d0bb23 +Author: Behdad Esfahbod +Date: Tue May 10 20:14:44 2011 -0400 + + Whitespace + + src/hb-unicode.h | 30 +++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) + +commit 686c2d165dfb284b74b78f6b902d04b585dcaef3 +Author: Behdad Esfahbod +Date: Tue May 10 20:04:26 2011 -0400 + + [API] Remove font_funcs func getter functions + + src/hb-font.cc | 32 -------------------------------- + src/hb-font.h | 18 ------------------ + 2 files changed, 50 deletions(-) + +commit defc45be6d75aba4a67fa7814b91b73bad953fe6 +Author: Behdad Esfahbod +Date: Tue May 10 20:02:49 2011 -0400 + + [API] Add hb_font_create_sub_font() and hb_font_get_parent() + + Not quite useful just yet. + + src/hb-font-private.hh | 1 + + src/hb-font.cc | 41 ++++++++++++++++++++++++++++++++++++++--- + src/hb-font.h | 5 +++++ + src/hb-unicode.h | 2 +- + 4 files changed, 45 insertions(+), 4 deletions(-) + +commit 11bb8fe7b3925bc9b019ad0c0218a231e581f152 +Author: Behdad Esfahbod +Date: Tue May 10 19:57:00 2011 -0400 + + [font] Fix internal sign of x/y_scale + + Should have been done as part of + da975419884a535281745f30f4b32fee0bc8a7a1 + + src/hb-font-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 85e6218e3306165d69ef44277459511d5b54b9ff +Author: Behdad Esfahbod +Date: Tue May 10 19:40:44 2011 -0400 + + [API] Remove broken-by-design hb_font_unset_funcs() + + src/hb-font.cc | 22 ---------------------- + src/hb-font.h | 16 ---------------- + 2 files changed, 38 deletions(-) + +commit 74f1d896f2479500d65649cf3ec86dd201f0663a +Author: Behdad Esfahbod +Date: Tue May 10 19:39:32 2011 -0400 + + Add hb_font_make/is_immutable() + + src/hb-font-private.hh | 2 ++ + src/hb-font.cc | 26 +++++++++++++++++++++++--- + src/hb-font.h | 6 ++++++ + test/test-object.c | 2 +- + 4 files changed, 32 insertions(+), 4 deletions(-) + +commit 8c7a100a4d0f3a257fb7563cb08ed4356c3af669 +Author: Behdad Esfahbod +Date: Tue May 10 19:21:07 2011 -0400 + + Fix build without mutex + + src/hb-mutex-private.hh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 19d3035c40e73923bcad709dc5eefe31cb34d681 +Author: Behdad Esfahbod +Date: Tue May 10 19:18:12 2011 -0400 + + Remove duplicate atomic_int implementation + + src/hb-mutex-private.hh | 17 ----------------- + 1 file changed, 17 deletions(-) + +commit 45bfa99034512e886d75b1d45a5a649647f4711f +Author: Behdad Esfahbod +Date: Tue May 10 19:12:49 2011 -0400 + + Fix set implementation to be truly threadsafe even with destroy() + callbacks + + The test/object test is passing again, instead of deadlocking. + + src/hb-common.cc | 26 +++++------ + src/hb-mutex-private.hh | 47 +++++++------------ + src/hb-object-private.hh | 6 ++- + src/hb-private.hh | 117 + ++++++++++++++++++++++++++++++++++++++--------- + 4 files changed, 128 insertions(+), 68 deletions(-) + +commit 0c2ec1d78bfa0166ffd4afc204c2668d4f456ed9 +Author: Behdad Esfahbod +Date: Tue May 10 19:11:27 2011 -0400 + + [test] Always initialize gthread such that our mutex() stuff is tested + + Now the test/object test deadlocks as expected. Fix coming. + + configure.ac | 1 + + test/Makefile.am | 4 ++-- + test/hb-test.h | 1 + + 3 files changed, 4 insertions(+), 2 deletions(-) + +commit 6a9093cc486c1899197cd7cc9a3eb907c2e756f7 +Author: Behdad Esfahbod +Date: Tue May 10 19:00:07 2011 -0400 + + [test/object] Test user_data with destroy() callback that calls + user_data + + Exposes the non-atomicity of user_data opertaions at this time because + we call finish() while still locked and modifying the object. + In fact, + I'm surprised that it doesn't deadlock. It should. + + test/test-object.c | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +commit abe636b8761e47ea60b193c7e72a044de224d172 +Author: Behdad Esfahbod +Date: Tue May 10 17:55:40 2011 -0400 + + Add DOAP file + + Makefile.am | 6 +++++- + harfbuzz.doap | 24 ++++++++++++++++++++++++ + 2 files changed, 29 insertions(+), 1 deletion(-) + +commit f82c18630471216a04e4e3ad42396da4e6d74cba +Author: Behdad Esfahbod +Date: Tue May 10 17:48:34 2011 -0400 + + [test/blob] Fix bug in test + + test/test-blob.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 785d23acd0ce72d399f9c5021bebc854872648af +Author: Behdad Esfahbod +Date: Tue May 10 17:41:44 2011 -0400 + + [test/blob] Add create_sub_blob() + + test/test-blob.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit 0617b1558234673d3924f37541be01b04d36f05a +Author: Behdad Esfahbod +Date: Tue May 10 17:37:08 2011 -0400 + + [test] Test blob API + + test/Makefile.am | 1 + + test/test-blob.c | 280 + +++++++++++++++++++++++++++++++++++++++++++++++++++++ + test/test-buffer.c | 149 ++++++++++++++-------------- + 3 files changed, 359 insertions(+), 71 deletions(-) + +commit 1c9f8717eb12c37c219333cbb0d123e1d2da4896 +Author: Behdad Esfahbod +Date: Fri May 6 22:28:26 2011 -0400 + + [API] Simplify blob API, remove lock + + TODO | 2 - + src/hb-blob.cc | 206 + ++++++++++++++++++-------------------------- + src/hb-blob.h | 19 ++-- + src/hb-font.cc | 2 - + src/hb-open-type-private.hh | 32 ++++--- + src/hb-ot-layout.cc | 7 +- + test/test-object.c | 2 +- + 7 files changed, 118 insertions(+), 152 deletions(-) + +commit 71cef14ac3de07e4fed0a2903b1f0f639406ec6c +Author: Behdad Esfahbod +Date: Fri May 6 19:30:59 2011 -0400 + + Add -Bsymbolic-functions to linker flags + + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +commit ab428aeab724ca40341318b66640f992cd72d2fc +Author: Behdad Esfahbod +Date: Fri May 6 19:30:46 2011 -0400 + + [TODO] Update + + TODO | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a0f337a1cce1788dbf3147b459e7f615acbfe81b +Author: Behdad Esfahbod +Date: Fri May 6 19:20:52 2011 -0400 + + Remove unused hb_blob_try_writable_inplace() + + src/hb-blob.cc | 20 -------------------- + src/hb-blob.h | 3 --- + 2 files changed, 23 deletions(-) + +commit 08611d5194144bbf5d96a1110aeb812db06e0901 +Author: Behdad Esfahbod +Date: Fri May 6 16:28:10 2011 -0400 + + Add note re deadlocks + + src/hb-common.cc | 1 + + src/hb-mutex-private.hh | 4 ++++ + 2 files changed, 5 insertions(+) + +commit 34fb5521a5fbb6b95ceff4bbac42a62628bc9f31 +Author: Behdad Esfahbod +Date: Fri May 6 00:04:28 2011 -0400 + + [API] Add hb_language_get_default() + + It uses locale information to detect default language. It's used by + hb_shape() whenever language is not set on the buffer. + + Not sure how to properly test it in the test suite. Tested by + observing + that with DejaVu Sans we select the proper local glyph version + for U+431 + under Serbian locale. See http://www.pango.org/ScriptGallery + + src/hb-common.cc | 21 +++++++++++++++++++++ + src/hb-common.h | 3 +++ + src/hb-shape.cc | 2 +- + test/test-common.c | 5 +++++ + 4 files changed, 30 insertions(+), 1 deletion(-) + +commit c78f4485587cc1dee07e772c164a13fde9d2859f +Author: Behdad Esfahbod +Date: Thu May 5 21:31:04 2011 -0400 + + [API] Add version macros and functions + + Step version up to 0.5.0. + + Also, fix to pass "make distcheck" + + configure.ac | 24 ++++++++++++----- + src/Makefile.am | 9 +++++++ + src/check-c-linkage-decls.sh | 2 +- + src/hb-common.cc | 29 +++++++++++++++++++++ + src/hb-version.h.in | 62 + ++++++++++++++++++++++++++++++++++++++++++++ + src/hb.h | 1 + + test/Makefile.am | 2 ++ + 7 files changed, 122 insertions(+), 7 deletions(-) + +commit 9ff819f6571fd0d570f271162d7a30d97ee64148 +Author: Behdad Esfahbod +Date: Thu May 5 19:47:59 2011 -0400 + + Add disable-static libtool flag + + No one who builds harfbuzz static uses the autotools build system + to do it. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7ca7571ef91754274f6c84bbf988962d74a74098 +Author: Behdad Esfahbod +Date: Thu May 5 19:47:12 2011 -0400 + + Remove win32-dll libtool flag + + Since we're not win32-dll clean the way libtool docs define it. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 174e3fe89b72729c9c34c647544a2dc1bf63cd84 +Author: Behdad Esfahbod +Date: Thu May 5 19:37:53 2011 -0400 + + Add AC_CANONICAL_HOST + + configure.ac | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit e6a5b88c01420366a70e0c9ae1775fb3c930cb8b +Author: Behdad Esfahbod +Date: Thu May 5 16:24:42 2011 -0400 + + Fix build with older glib + + configure.ac | 2 +- + test/hb-test.h | 55 + +++++++++++++++++++++++++++++++++---------------------- + 2 files changed, 34 insertions(+), 23 deletions(-) + +commit 3935af1c0d0f53a5fd6054e1ee219f3adda42dca +Author: Behdad Esfahbod +Date: Thu May 5 16:09:45 2011 -0400 + + [buffer] Remove wrong optimization + + While the cluster fields of the glyph string are usually sorted, they + wouldn't be in special cases (for example for non-native direction). + Blindly using bsearch is plain wrong. If we want to reintroduce this + optimization we have to make sure we know the buffer clusters are + monotonic and in which direction. Not sure it's worth it though. + + src/hb-buffer.cc | 16 +++------------- + 1 file changed, 3 insertions(+), 13 deletions(-) + +commit 46df6828513d56cd60467e36cbe45aa06648f488 +Author: Behdad Esfahbod +Date: Thu May 5 15:33:19 2011 -0400 + + Make user_data access threadsafe + + For now, by taking a global user_data mutex. + + src/hb-common.cc | 25 +++++++++++++++++++++++-- + src/hb-object-private.hh | 2 -- + 2 files changed, 23 insertions(+), 4 deletions(-) + +commit 218e67b9eefa26e2e4fe43f99a84d082b185b1b0 +Author: Behdad Esfahbod +Date: Thu May 5 15:28:37 2011 -0400 + + Shrink code + + src/hb-common.cc | 26 ++++++++++++++++++++++++++ + src/hb-object-private.hh | 21 ++++----------------- + 2 files changed, 30 insertions(+), 17 deletions(-) + +commit b8d6183ebc4697a434776cf2aec7857d63a7d881 +Author: Behdad Esfahbod +Date: Thu May 5 15:14:04 2011 -0400 + + Use threadsafe set implementation for hb_language lookups + + Note that the static variable has to be a global static, as gcc + implements local statics differently and that would require linking + to libstdc++, which we don't want. + + src/hb-common.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit d37486d87b65c5abaaa2998fa5c9e48eedde0933 +Author: Behdad Esfahbod +Date: Thu May 5 15:07:54 2011 -0400 + + Add hb_threadsafe_set_t + + src/hb-mutex-private.hh | 54 + +++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-private.hh | 3 +-- + 2 files changed, 55 insertions(+), 2 deletions(-) + +commit b45f32ee4e599c515ce93e44315283d236b073bb +Author: Behdad Esfahbod +Date: Thu May 5 15:00:43 2011 -0400 + + Use hb_array_t for hb_language_t mapping + + src/hb-common.cc | 48 + ++++++++++++++++++++++-------------------------- + src/hb-object-private.hh | 4 ++-- + src/hb-private.hh | 19 +++++++++++++++---- + 3 files changed, 39 insertions(+), 32 deletions(-) + +commit 21d2c92fdf7307c7117f8948021f0dd7d5a5d2a3 +Author: Behdad Esfahbod +Date: Thu May 5 14:47:53 2011 -0400 + + Move code around + + src/hb-object-private.hh | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +commit 448ea9bf63104d39f87fff66219034222fa632b8 +Author: Behdad Esfahbod +Date: Thu May 5 14:39:24 2011 -0400 + + [TODO] Remove done items + + TODO | 9 --------- + 1 file changed, 9 deletions(-) + +commit 265ac614ea6d26041c7d64739098b76a82bbc4f4 +Author: Behdad Esfahbod +Date: Thu May 5 14:38:16 2011 -0400 + + Replace fixed-size lookup_maps array with hb_array_t + + src/hb-ot-map-private.hh | 13 +++++-------- + src/hb-ot-map.cc | 47 + +++++++++++++++++++++++++---------------------- + src/hb-private.hh | 6 ++---- + 3 files changed, 32 insertions(+), 34 deletions(-) + +commit 6843569d2c70c1771ce964e3d1a4cf91e14e7687 +Author: Behdad Esfahbod +Date: Thu May 5 14:12:37 2011 -0400 + + Replace fixed-size feature_maps array with hb_array_t + + src/hb-ot-map-private.hh | 10 +++------- + src/hb-ot-map.cc | 12 ++++++------ + src/hb-ot-shape.cc | 2 +- + src/hb-private.hh | 42 +++++++++++++++++++++++++++++------------- + 4 files changed, 39 insertions(+), 27 deletions(-) + +commit 44b0a4d2fc62689fc56ef57f412b4bb1e439a614 +Author: Behdad Esfahbod +Date: Thu May 5 13:42:19 2011 -0400 + + Replace fixed-size feature_infos array with hb_array_t + + src/hb-ot-map-private.hh | 9 +++++---- + src/hb-ot-map.cc | 9 +++++---- + src/hb-private.hh | 12 ++++++++++++ + 3 files changed, 22 insertions(+), 8 deletions(-) + +commit b214ec3ac0ce6568e9226fd09661d52de11dca96 +Author: Behdad Esfahbod +Date: Thu May 5 13:24:07 2011 -0400 + + Minor + + src/hb-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 811482bd650fb5652a9835471ae8ecf0fb185611 +Author: Behdad Esfahbod +Date: Thu May 5 13:21:04 2011 -0400 + + Replace hb_map_t with hb_set_t which is more intuitive and flexible + + src/hb-object-private.hh | 24 ++++++++++++++---------- + src/hb-private.hh | 44 + +++++++++++++++++--------------------------- + test/test-object.c | 4 ++++ + 3 files changed, 35 insertions(+), 37 deletions(-) + +commit 478a42536ff7ab777a7774fbfdb9c5e51334a14e +Author: Behdad Esfahbod +Date: Thu May 5 12:39:51 2011 -0400 + + Make array/map implementation more generic + + src/hb-object-private.hh | 2 ++ + src/hb-private.hh | 13 +++++++------ + 2 files changed, 9 insertions(+), 6 deletions(-) + +commit b81bd42951e1ce1569b29168015d3c5a2dacf773 +Author: Behdad Esfahbod +Date: Thu May 5 00:21:16 2011 -0400 + + Make hb_mutex_*() macros take a pointer + + More intuitive. + + src/hb-blob.cc | 28 ++++++++++++++-------------- + src/hb-mutex-private.hh | 32 ++++++++++++++++---------------- + 2 files changed, 30 insertions(+), 30 deletions(-) + +commit a4b1900913c91aa9db74c4fdfa7c691a5cdf02a8 +Author: Behdad Esfahbod +Date: Thu May 5 00:17:43 2011 -0400 + + Add hb_static_mutex_t + + src/hb-mutex-private.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 56eb5ad6f94c32189ad219438db9a18683ca6846 +Author: Behdad Esfahbod +Date: Wed May 4 19:27:37 2011 -0400 + + Move code around + + Mutex (and Windows.h by extension) are fairly isolated now. + + src/Makefile.am | 8 ++-- + src/hb-blob-private.hh | 60 --------------------------- + src/hb-blob.cc | 24 ++++++++++- + src/hb-font-private.hh | 3 -- + src/hb-font.cc | 12 +++--- + src/hb-mutex-private.hh | 105 + +++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-object-private.hh | 33 ++------------- + src/hb-unicode.cc | 1 - + 8 files changed, 141 insertions(+), 105 deletions(-) + +commit d292885893395dcb345dce1010e5c8628a715ef4 +Author: Behdad Esfahbod +Date: Tue May 3 01:03:53 2011 -0400 + + [ft] Fix font->face handling + + Don't use _cached() + + src/hb-ft.cc | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 2000179487b49e0d504ec127450dc6fcb5568cec +Author: Behdad Esfahbod +Date: Tue May 3 00:49:06 2011 -0400 + + Move Win32 thread-safety stuff to hb-object-private.h + + The Win32 definitions for LONG, ULONG, etc conflicts with + hb-open-type.h. Avoid that by making sure hb-object-private.h + and hb-open-type.h are not included in the same compilation unit. + + src/hb-common.cc | 54 --------------------------------------- + src/hb-object-private.hh | 66 + ++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-private.hh | 66 + ------------------------------------------------ + 3 files changed, 66 insertions(+), 120 deletions(-) + +commit 266b34418c9bbe23ccaf29cb354b58c465fa3b22 +Author: Behdad Esfahbod +Date: Tue May 3 00:35:53 2011 -0400 + + Refactor to keep hb-object-private.h and hb-open-type.h separate + + Needed to be able to include from hb-object-private.h. + + src/hb-font.cc | 19 ++++---------- + src/hb-ot-layout-private.hh | 60 + +++++++++++++++++++++++++-------------------- + src/hb-ot-layout.cc | 28 ++++++++++++++++++--- + 3 files changed, 63 insertions(+), 44 deletions(-) + +commit d4141a44b97377a65e6d2a3e03b3709307af38c1 +Author: Behdad Esfahbod +Date: Tue May 3 00:19:18 2011 -0400 + + [blob] Implement sub_blob() in terms of create() + + Fixes problem with uninitialized sub_blob->mutex among other things. + + Reported by Bradley Grainger. + + src/hb-blob.cc | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +commit fc52e9e44c2fe84d63f18dc0098720830f0b467d +Author: Behdad Esfahbod +Date: Tue May 3 00:09:16 2011 -0400 + + Implement win32 thread-safety stuff + + Patch from Bradley Grainger. + + src/hb-common.cc | 54 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-private.hh | 30 +++++++++++++++++++++++++----- + 2 files changed, 79 insertions(+), 5 deletions(-) + +commit f55272ecde857c116f97a3195f3abd1df3be4b86 +Author: Behdad Esfahbod +Date: Mon May 2 20:57:28 2011 -0400 + + Add hb_mutex_free() and use it + + Based on patch by Bradley Grainger. + + src/hb-blob.cc | 1 + + src/hb-private.hh | 16 +++++++++------- + 2 files changed, 10 insertions(+), 7 deletions(-) + +commit 8d5186484b28b5f629b523e067d7d5166eec557a +Author: Behdad Esfahbod +Date: Mon May 2 20:52:21 2011 -0400 + + Cosmetic + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 72657e4ce757dcb055a8db7291b68f96f0d34bfb +Author: Behdad Esfahbod +Date: Mon May 2 20:46:32 2011 -0400 + + [API] Make hb_font_create() take a face and reference it + + src/hb-font-private.hh | 2 ++ + src/hb-font.cc | 42 + +++++++++++++++++++++++++--------------- + src/hb-font.h | 26 ++++++++++++++----------- + src/hb-ft.cc | 7 +------ + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 2 +- + src/hb-ot-layout.cc | 10 ++++------ + src/hb-ot-layout.h | 2 -- + src/hb-ot-map-private.hh | 2 +- + src/hb-ot-shape.cc | 23 +++++++++++----------- + src/hb-ot-shape.h | 1 - + src/hb-shape.cc | 18 ++--------------- + src/hb-shape.h | 1 - + src/hb-view.cc | 4 +--- + test/test-object.c | 7 +++++-- + 15 files changed, 70 insertions(+), 79 deletions(-) + +commit cec6611c5ce84d69d910bf7e9ec1fdd594398f9f +Author: Behdad Esfahbod +Date: Mon May 2 20:18:58 2011 -0400 + + Protect NULL in a couple places + + src/hb-font.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 5a5030366e40baa8d96ca67b47a52ad5af143157 +Author: Behdad Esfahbod +Date: Mon May 2 19:54:29 2011 -0400 + + Fix bug in array growth implementation + + With this, test/object is now passing. Yay! + + src/hb-private.hh | 24 +++++++++++------------- + 1 file changed, 11 insertions(+), 13 deletions(-) + +commit 16123e10700436df18d14e37371bb621b31ea5d1 +Author: Behdad Esfahbod +Date: Mon May 2 19:54:17 2011 -0400 + + Fix bug in map implementation + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1cd5969f253528b1fc05a06c7a9f222baa29f68d +Author: Behdad Esfahbod +Date: Mon May 2 19:53:39 2011 -0400 + + [object] Fix bug in get_user_data() implementation + + src/hb-object-private.hh | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit db99589529a22a2113bcef1680ab6d9b934f382e +Author: Behdad Esfahbod +Date: Mon May 2 19:52:47 2011 -0400 + + [test/object] Add test for object lifecycle stuff + + Revealed many bugs in the (untested and known buggy) user_data + support. + + test/Makefile.am | 4 + + test/test-object.c | 316 + +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 320 insertions(+) + +commit f74d6c81f14f117b3cecfb65f0d5df22849c9a07 +Author: Behdad Esfahbod +Date: Mon May 2 19:52:32 2011 -0400 + + Cosmetic + + test/test-unicode.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 4911062d5be0d937ee8f1a70cc93e05d162f45b3 +Author: Behdad Esfahbod +Date: Mon May 2 19:36:39 2011 -0400 + + [API] Rename hb_blob_create_empty() to hb_blob_get_empty() + + src/hb-blob.cc | 2 +- + src/hb-blob.h | 2 +- + src/hb-font.cc | 2 +- + src/hb-open-type-private.hh | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit 1ab1d3e38cdf8e7331efdbc4ef0c02ee9d5c8c04 +Author: Behdad Esfahbod +Date: Mon May 2 19:35:53 2011 -0400 + + [face] Return nil face if blob is inert + + src/hb-font.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit e87867cb88280e3f3a38d829e359cb686168b2cb +Author: Behdad Esfahbod +Date: Mon May 2 19:35:05 2011 -0400 + + [buffer] Fail in _create() if we cannot pre-allocate the requested + size + + src/hb-buffer.cc | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit cd361ec9a1b2bfc271e5490dbfc0a870fd5c439a +Author: Behdad Esfahbod +Date: Mon May 2 16:54:05 2011 -0400 + + Cosmetic + + test/test-unicode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c784c67a28f5b92d396eaa9529d57ef91a5cb9ac +Author: Behdad Esfahbod +Date: Mon May 2 15:59:57 2011 -0400 + + [unicode] Make _get_parent() return _nil object instead of NULL + + src/hb-unicode.cc | 29 ++++++++++++----------------- + test/test-unicode.c | 2 +- + 2 files changed, 13 insertions(+), 18 deletions(-) + +commit 07e22779abd089d5921bf2d19d4a3bf1bd0173c6 +Author: Behdad Esfahbod +Date: Mon May 2 14:58:04 2011 -0400 + + [test/unicode] Add script roundtrip tests for glib and ICU + + test/test-unicode.c | 70 + ++++++++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 64 insertions(+), 6 deletions(-) + +commit 7cda65935c73c277550f6ac12f6730e96d4852a7 +Author: Behdad Esfahbod +Date: Mon May 2 14:33:53 2011 -0400 + + [test/unicode] Better test chainup + + test/test-unicode.c | 54 + ++++++++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 49 insertions(+), 5 deletions(-) + +commit 250c59225ead28449deb11522dee3819480a19b4 +Author: Behdad Esfahbod +Date: Mon May 2 14:21:30 2011 -0400 + + [test/unicode] Port the _custom test to test all property setters + + test/test-unicode.c | 186 + +++++++++++++++++++++++++++++----------------------- + 1 file changed, 104 insertions(+), 82 deletions(-) + +commit e74b5b339ab0af53d893ec84a0955d5aa508fed3 +Author: Behdad Esfahbod +Date: Mon May 2 14:03:55 2011 -0400 + + [test/unicode] Test Unicode 5.2+ but don't fail + + test/test-unicode.c | 21 +++++++++++++++++++-- + 1 file changed, 19 insertions(+), 2 deletions(-) + +commit c763aa42b46eaee95359806cab56fa632ff3ad58 +Author: Behdad Esfahbod +Date: Mon May 2 13:52:17 2011 -0400 + + [test/buffer] Clean up testing + + Getting the hang of how to cleanly use gtest. + + test/test-buffer.c | 154 + +++++++++++++++++++++++++++++------------------------ + 1 file changed, 85 insertions(+), 69 deletions(-) + +commit 819e9d9e5310e67e8dcce9fa885f8a086a9b9ee8 +Author: Behdad Esfahbod +Date: Mon May 2 12:38:54 2011 -0400 + + Minor + + test/test-unicode.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 03034acb8a9fdd33135bc3775a1f932da9ebdd42 +Author: Behdad Esfahbod +Date: Mon May 2 12:37:45 2011 -0400 + + [icu] Make sure we return script UNKNOWN instead of INVALID + + src/hb-icu.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit d02985ec5a24c659a0a133cc6bc103f1d76bcb29 +Author: Behdad Esfahbod +Date: Mon May 2 12:35:14 2011 -0400 + + ISO 15924 fixes + + Update to http://unicode.org/iso15924 + + Fixes some of the test failures in test-unicode with ICU. Still + one more to fix before the test passes. + + src/hb-common.cc | 10 ++++++++-- + src/hb-common.h | 5 +++-- + src/hb-ot-tag.cc | 2 -- + 3 files changed, 11 insertions(+), 6 deletions(-) + +commit e8e29c725a72c2e991cd1c4422a020457e1684e9 +Author: Behdad Esfahbod +Date: Mon May 2 12:06:18 2011 -0400 + + [test/unicode] Add log messages + + Use with --verbose to see what's failing + + test/test-unicode.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 208c2c31501f6eb2b81b6bf80fcf39f4646eb38b +Author: Behdad Esfahbod +Date: Sun May 1 20:04:01 2011 -0400 + + Minor + + test/test-unicode.c | 478 + ++++++++++++++++++++++++++-------------------------- + 1 file changed, 243 insertions(+), 235 deletions(-) + +commit 60833efaf1310c3f18e150b61daaeb0074ae3d91 +Author: Behdad Esfahbod +Date: Fri Apr 29 16:49:57 2011 -0400 + + [test/unicode] Add testing of all unicode properties + + ICU fails for now. + + test/hb-test.h | 4 +- + test/test-unicode.c | 432 + +++++++++++++++++++++++++++++++++++++++++++++++++--- + 2 files changed, 416 insertions(+), 20 deletions(-) + +commit da96ee072fa3544c3d36cf0b82ada11806789d70 +Author: Behdad Esfahbod +Date: Fri Apr 29 12:17:09 2011 -0400 + + [test/unicode] Test is/make_immutable() + + test/test-unicode.c | 46 ++++++++++++++++++++++++++++++---------------- + 1 file changed, 30 insertions(+), 16 deletions(-) + +commit 6af9cff5e17e82100b435c8d21aed0765296d58d +Author: Behdad Esfahbod +Date: Fri Apr 29 12:00:38 2011 -0400 + + [test/unicode] Use text fixture instead of static variables + + src/hb-unicode-private.hh | 2 +- + src/hb-unicode.h | 2 +- + test/test-buffer.c | 2 +- + test/test-c.c | 1 + + test/test-common.c | 3 +- + test/test-cplusplus.cc | 1 + + test/test-unicode.c | 112 + +++++++++++++++++++++++++++------------------- + 7 files changed, 74 insertions(+), 49 deletions(-) + +commit 13db3d40bfc09c68f9761a71435b1840b9d34099 +Author: Behdad Esfahbod +Date: Thu Apr 28 19:44:45 2011 -0400 + + [test/buffer] Add UTF-16 tests + + test/test-buffer.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 46 insertions(+), 2 deletions(-) + +commit 243673d601588a6f704ceafbff5dd5cdf66c47b7 +Author: Behdad Esfahbod +Date: Thu Apr 28 19:37:51 2011 -0400 + + [test/buffer] Add more extensive UTF-8 test data from glib + + src/hb-buffer.cc | 2 +- + test/test-buffer.c | 317 + ++++++++++++++++++++++++++++++++++++++++++++++++++--- + 2 files changed, 303 insertions(+), 16 deletions(-) + +commit dfec67f958482e5c3bb01e06b08694cd4ded6f66 +Author: Behdad Esfahbod +Date: Thu Apr 28 18:34:42 2011 -0400 + + [test/buffer] Add initial utf-8 tests + + test/hb-test.h | 25 ++++++++++++++++++++++++- + test/test-buffer.c | 46 +++++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 69 insertions(+), 2 deletions(-) + +commit aafe395ab550d3ba2fabc69155662e87d45e74a8 +Author: Behdad Esfahbod +Date: Thu Apr 28 17:10:44 2011 -0400 + + Add test suite infrastructure + + Wraps around glib for convenience and ease of use. + + test/Makefile.am | 1 + + test/hb-test.h | 132 + ++++++++++++++++++++++++++++++++++++++++++++++++---- + test/test-buffer.c | 29 ++++++------ + test/test-common.c | 14 +++--- + test/test-unicode.c | 32 ++++++------- + 5 files changed, 160 insertions(+), 48 deletions(-) + +commit c7ffe2ad5f6e97e26d14e2cc0d4098af8f5f36d0 +Author: Behdad Esfahbod +Date: Thu Apr 28 16:03:29 2011 -0400 + + [API Remove hb_font_funcs_copy() + + Will be adding font_funcs subclassing instead. + + src/hb-font.cc | 13 ------------- + src/hb-font.h | 3 --- + 2 files changed, 16 deletions(-) + +commit 30f34d08d445722320db711c3ddf41e66225752c +Author: Behdad Esfahbod +Date: Thu Apr 28 16:02:40 2011 -0400 + + [TODO] Remove finished items + + TODO | 2 -- + src/hb-font.h | 10 ---------- + 2 files changed, 12 deletions(-) + +commit 080a0eb7d82d7195be72c16ece6e0a3ffed636b6 +Author: Behdad Esfahbod +Date: Thu Apr 28 16:01:01 2011 -0400 + + Add _hb_unsigned_int_mul_overflows + + src/hb-buffer.cc | 7 ++----- + src/hb-open-type-private.hh | 2 +- + src/hb-ot-layout-gsub-private.hh | 2 +- + src/hb-private.hh | 9 ++++++++- + 4 files changed, 12 insertions(+), 8 deletions(-) + +commit 1d39d6e42b3d7628512d675a84a831a0f58624eb +Author: Behdad Esfahbod +Date: Thu Apr 28 15:54:16 2011 -0400 + + Desable possibly lethal test on 64-bit machines + + test/test-buffer.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 3264042873fd639f3ef8ff0acfad777a0a9f3355 +Author: Behdad Esfahbod +Date: Thu Apr 28 14:24:16 2011 -0400 + + [test/buffer] Test pre_allocate() and allocation_successful() + + src/hb-buffer.cc | 3 ++- + test/test-buffer.c | 26 +++++++++++++++++++++++++- + 2 files changed, 27 insertions(+), 2 deletions(-) + +commit 123aa04f7b3241d6e43de2d472c4a1cbdb250ac7 +Author: Behdad Esfahbod +Date: Thu Apr 28 12:58:28 2011 -0400 + + Fix possible but improbable overflow in hb_array_t + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e0db4b868f9fdd8e680890f87dd4e13a1c27b7a1 +Author: Behdad Esfahbod +Date: Thu Apr 28 12:56:49 2011 -0400 + + [buffer] More error handling + + Should be all set now. + + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 60 + +++++++++++++++++++++++++++++++++--------------- + 2 files changed, 43 insertions(+), 19 deletions(-) + +commit 15c57e04bf05026ef424f8ae912d2f379301bf93 +Author: Behdad Esfahbod +Date: Thu Apr 28 12:28:54 2011 -0400 + + [test/buffer] Add test pre_alloc(); hangs in the buffer code right now + + Because the following loop overflows: + + while (size > new_allocated) + new_allocated += (new_allocated >> 1) + 32; + + test/test-buffer.c | 33 ++++++++++++++++++++++++++------- + 1 file changed, 26 insertions(+), 7 deletions(-) + +commit 1e5527e2d60ed3b4a5adf62b258415ec3aef41fb +Author: Behdad Esfahbod +Date: Thu Apr 28 12:15:24 2011 -0400 + + [test/buffer] Test reset(), set_length(), and set/get_unicode_data() + + test/test-buffer.c | 66 + ++++++++++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 59 insertions(+), 7 deletions(-) + +commit db126b5448ec802285cf2b6f0e7da412d02dfb28 +Author: Behdad Esfahbod +Date: Thu Apr 28 11:56:29 2011 -0400 + + [test/buffer] Test reverse() and reverse_clusters() + + test/test-buffer.c | 61 + ++++++++++++++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 57 insertions(+), 4 deletions(-) + +commit 5fa849b77d49da2212825ebb1bea9145713b8449 +Author: Behdad Esfahbod +Date: Wed Apr 27 21:46:01 2011 -0400 + + [API] Add _set/get_user_data() for all objects + + src/hb-blob.cc | 17 +++++++++++++++++ + src/hb-blob.h | 12 ++++++++++++ + src/hb-buffer.cc | 16 ++++++++++++++++ + src/hb-buffer.h | 10 ++++++++++ + src/hb-font.cc | 51 + +++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-font.h | 36 ++++++++++++++++++++++++++++++++++++ + src/hb-unicode.cc | 17 +++++++++++++++++ + src/hb-unicode.h | 12 ++++++++++++ + 8 files changed, 171 insertions(+) + +commit 852e08ec8fbfbce1d50e571d0bb0b52ef4d4cc58 +Author: Behdad Esfahbod +Date: Wed Apr 27 21:45:51 2011 -0400 + + Move code around + + src/hb-object-private.hh | 153 + ++++++++++------------------------------------- + src/hb-private.hh | 136 +++++++++++++++++++++++++++++++++++++---- + 2 files changed, 157 insertions(+), 132 deletions(-) + +commit 29c67d3f70b081766a6c01353980f457f38aeb12 +Author: Behdad Esfahbod +Date: Wed Apr 27 21:22:32 2011 -0400 + + Add initial implementation of user_data to objects + + src/hb-common.h | 11 ++- + src/hb-object-private.hh | 186 + ++++++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 193 insertions(+), 4 deletions(-) + +commit 47e71d9661946a4ffb96026bf1d697d788414ab5 +Author: Behdad Esfahbod +Date: Wed Apr 27 16:38:03 2011 -0400 + + [object] Remove unnecessary use of macros + + TODO | 2 -- + src/hb-blob.cc | 18 +++++++++--------- + src/hb-buffer.cc | 6 +++--- + src/hb-font.cc | 30 +++++++++++++++--------------- + src/hb-object-private.hh | 9 --------- + src/hb-unicode.cc | 8 ++++---- + 6 files changed, 31 insertions(+), 42 deletions(-) + +commit 8be1420f8fd0e5c53282245d6830efbee5c7409d +Author: Behdad Esfahbod +Date: Wed Apr 27 16:14:04 2011 -0400 + + [blob] Use HB_FUNC instead of __FUNCTION__ + + src/hb-blob.cc | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +commit ae008b90cfc2028e878100f78b21d70f923a6044 +Author: Behdad Esfahbod +Date: Wed Apr 27 16:12:12 2011 -0400 + + [object] Add tracing support back in + + src/hb-object-private.hh | 38 ++++++++++++++++++++++++++------------ + 1 file changed, 26 insertions(+), 12 deletions(-) + +commit 5b7f38979fa90117861fe327477de1707f117a8c +Author: Behdad Esfahbod +Date: Wed Apr 27 15:10:12 2011 -0400 + + GNOME Bug 612402 - (hb-arm) HarfBuzz compilation fix for arm + + With gcc on arm, request 8-bit structure alignment. + + configure.ac | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit 39a840ae65327b173e6eb1bb291e235a8305d7a1 +Author: Behdad Esfahbod +Date: Wed Apr 27 14:48:19 2011 -0400 + + [API] Add hb_direction_from/to_string() + + And hb-view --direction argument. + + TODO | 1 - + src/hb-common.cc | 36 ++++++++++++++++++++++++++++++++++++ + src/hb-common.h | 6 ++++++ + src/hb-view.cc | 13 ++++++++++--- + test/test-common.c | 21 ++++++++++++++++++++- + 5 files changed, 72 insertions(+), 5 deletions(-) + +commit f1425a549fef360c3750532de23604cd318999d8 +Author: Behdad Esfahbod +Date: Wed Apr 27 12:15:06 2011 -0400 + + Rename hb-view.c and test.c to .cc files + + src/Makefile.am | 4 ++-- + src/{hb-view.c => hb-view.cc} | 2 +- + src/{test.c => test.cc} | 5 ++++- + 3 files changed, 7 insertions(+), 4 deletions(-) + +commit eb5796f58897ecfb9d76fd99915bf1a30669a0fa +Author: Behdad Esfahbod +Date: Wed Apr 27 12:14:53 2011 -0400 + + [TODO] Add hb-view items + + TODO | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 65e0063eae2f3adb25315b8bd7b0e7757aa960f3 +Author: Behdad Esfahbod +Date: Wed Apr 27 09:33:58 2011 -0400 + + Make buffer size growth start from 32 instead of 8 + + src/hb-buffer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d4bee9f813bb299b1c4aab7c33d588be2a7d354b +Author: Behdad Esfahbod +Date: Wed Apr 27 09:24:37 2011 -0400 + + [API] Add hb_unicode_funcs_get_default() + + src/hb-buffer.cc | 4 ++-- + src/hb-glib.cc | 5 +++-- + src/hb-icu.cc | 5 +++-- + src/hb-unicode-private.hh | 11 +++++++++++ + src/hb-unicode.cc | 7 +++++++ + src/hb-unicode.h | 8 ++++++++ + src/hb-view.c | 13 ++++++------- + test/test-unicode.c | 11 ++++++++++- + 8 files changed, 50 insertions(+), 14 deletions(-) + +commit 153142dac8dd9abaf164bb88af07c600c17fc3a1 +Author: Behdad Esfahbod +Date: Wed Apr 27 01:49:03 2011 -0400 + + Replace simple macros with inline functions for better type safety + + Now that we use C++ for all source code, lets benefit from it! + + The hb_be_int16/32_get/put/eq() macros grow code size if replaced with + inline functions, so leave them as is. + + src/hb-open-type-private.hh | 4 ++-- + src/hb-private.hh | 30 +++++++++++++++++++++--------- + 2 files changed, 23 insertions(+), 11 deletions(-) + +commit 40a9b8154f929947f4693bf90c64301afa407c3f +Author: Behdad Esfahbod +Date: Wed Apr 27 01:48:56 2011 -0400 + + Add TODO item + + src/hb-object-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit ebdc83467c31574daa118fc18cd2ef2dc819b503 +Author: Behdad Esfahbod +Date: Wed Apr 27 01:41:24 2011 -0400 + + Don't return in void function + + Would have been nice if gcc had warned... + + src/hb-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ec6f9c2fd03a49d1e91cbaefa5bdbbfb35dff92e +Author: Behdad Esfahbod +Date: Thu Apr 21 18:35:58 2011 -0400 + + Further simplify object handling + + src/hb-object-private.hh | 53 + ++++++++++++++++++++++++------------------------ + 1 file changed, 27 insertions(+), 26 deletions(-) + +commit fca368c4682624346a0aaee690e1ad6ed4c0b337 +Author: Behdad Esfahbod +Date: Thu Apr 21 18:24:02 2011 -0400 + + Add hb_object_header_t which is the common part of all objects + + Makes way for adding arbitrary user_data support. + + src/hb-blob-private.hh | 3 +- + src/hb-blob.cc | 2 +- + src/hb-buffer-private.hh | 9 +++-- + src/hb-buffer.cc | 2 +- + src/hb-font-private.hh | 7 ++-- + src/hb-font.cc | 7 ++-- + src/hb-ft.cc | 3 +- + src/hb-glib.cc | 3 +- + src/hb-icu.cc | 3 +- + src/hb-object-private.hh | 95 + ++++++++++++++++++++++++++--------------------- + src/hb-private.hh | 5 +-- + src/hb-unicode-private.hh | 6 ++- + src/hb-unicode.cc | 3 +- + 13 files changed, 82 insertions(+), 66 deletions(-) + +commit a9f24c802956d57180d71b83e96a0fb81197df4a +Author: Behdad Esfahbod +Date: Thu Apr 21 17:18:22 2011 -0400 + + Move hb_reference_count_t to hb-private.h + + src/hb-object-private.hh | 17 ----------------- + src/hb-private.hh | 20 ++++++++++++++++++++ + 2 files changed, 20 insertions(+), 17 deletions(-) + +commit 2409d5f8d7dd8b535ce5ea29e933f7db27d33793 +Author: Behdad Esfahbod +Date: Thu Apr 21 17:14:28 2011 -0400 + + Update Copyright headers + + COPYING | 15 ++++++++------- + src/hb-blob-private.hh | 2 +- + src/hb-blob.cc | 2 +- + src/hb-blob.h | 2 +- + src/hb-buffer-private.hh | 4 ++-- + src/hb-buffer.cc | 6 +++--- + src/hb-buffer.h | 6 +++--- + src/hb-common.cc | 4 +++- + src/hb-common.h | 4 +++- + src/hb-font-private.hh | 4 +++- + src/hb-font.cc | 2 +- + src/hb-font.h | 2 +- + src/hb-ft.cc | 4 ++-- + src/hb-ft.h | 2 +- + src/hb-glib.cc | 4 +++- + src/hb-glib.h | 4 +++- + src/hb-icu.cc | 6 ++++-- + src/hb-icu.h | 4 +++- + src/hb-object-private.hh | 6 ++++-- + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 2 +- + src/hb-ot-head-private.hh | 2 +- + src/hb-ot-layout-common-private.hh | 4 ++-- + src/hb-ot-layout-gdef-private.hh | 4 ++-- + src/hb-ot-layout-gpos-private.hh | 4 ++-- + src/hb-ot-layout-gsub-private.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + src/hb-ot-layout-private.hh | 2 +- + src/hb-ot-layout.cc | 6 +++--- + src/hb-ot-layout.h | 2 +- + src/hb-ot-map-private.hh | 4 ++-- + src/hb-ot-map.cc | 4 ++-- + src/hb-ot-shape-complex-arabic-table.hh | 2 +- + src/hb-ot-shape-complex-arabic.cc | 2 +- + src/hb-ot-shape-complex-private.hh | 2 +- + src/hb-ot-shape-private.hh | 2 +- + src/hb-ot-shape.cc | 4 ++-- + src/hb-ot-shape.h | 2 +- + src/hb-ot-tag.cc | 4 +++- + src/hb-ot-tag.h | 2 +- + src/hb-ot.h | 2 +- + src/hb-private.hh | 4 +++- + src/hb-shape.cc | 2 +- + src/hb-shape.h | 2 +- + src/hb-unicode-private.hh | 4 ++-- + src/hb-unicode.cc | 4 ++-- + src/hb-unicode.h | 4 +++- + src/hb-view.c | 4 ++-- + src/hb.h | 2 +- + src/main.cc | 2 +- + src/test.c | 2 +- + test/hb-test.h | 17 ++++++++++++++++- + test/test-buffer.c | 2 +- + test/test-c.c | 2 +- + test/test-common.c | 2 +- + test/test-cplusplus.cc | 2 +- + test/test-unicode.c | 2 +- + 57 files changed, 122 insertions(+), 84 deletions(-) + +commit 08da7a3841ca7dfcb627314cae1c3a668b9c7236 +Author: Behdad Esfahbod +Date: Thu Apr 21 16:59:10 2011 -0400 + + [hb-view] Accept numbers in feature tag name + + Reported by Adam Twardoch. + + src/hb-view.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 24229eb13268a422efffbcb28a094b726824c7f0 +Author: Behdad Esfahbod +Date: Thu Apr 21 16:55:17 2011 -0400 + + Remove obsolete comment + + Talking to Ryan Lortie, he thinks my comment doesn't make sense. + + So I'm making the getter const. Note that g_atomic_int_get() + casts that away itself, so we don't need to worry about that + (which kinda makes me uncomfortable actually). + + src/hb-object-private.hh | 16 ++-------------- + 1 file changed, 2 insertions(+), 14 deletions(-) + +commit dcb7026f33cbcdf60e9b7fcdd44c64cc08702c74 +Author: Behdad Esfahbod +Date: Thu Apr 21 16:34:22 2011 -0400 + + Add ASSERT_STATIC_EXPR macro + + Unused right now. + + src/hb-private.hh | 2 ++ + 1 file changed, 2 insertions(+) + +commit 3e8bdbf9414291da5cf61213d5f4275c1ae23ae5 +Author: Behdad Esfahbod +Date: Thu Apr 21 16:16:21 2011 -0400 + + Cleanup hb_refrence_count_t + + src/hb-object-private.hh | 23 ++++++++++++++++++----- + src/hb-private.hh | 6 +++--- + 2 files changed, 21 insertions(+), 8 deletions(-) + +commit 783a7d69696bf0b1502ec9c1495e482e491c78e0 +Author: Behdad Esfahbod +Date: Thu Apr 21 16:03:59 2011 -0400 + + [TODO] Remove finished items + + TODO | 6 +----- + src/hb-ft.cc | 1 - + 2 files changed, 1 insertion(+), 6 deletions(-) + +commit da975419884a535281745f30f4b32fee0bc8a7a1 +Author: Behdad Esfahbod +Date: Thu Apr 21 15:08:01 2011 -0400 + + [API] Allow negative font x_scale/y_scale + + I was reconsidering whether y should grow down, since all three/four + times I've used this API I was tricked and got that wrong in my use. + So I was very inclined to make y grow down instead of up. However, + considering that the font space has y up and it would be very + confusing + for callbacks to work against that, I decided that what I really want + is for the user to be able to set y_scale to a negative number + to imply + that user-space y grows down. + + Changing x_scale/y_scale from unsigned int to int allows that, + and I've + made pango to use that instead of negating glyph y_offset later. + hb-ft + however still has y group up. I *guess* that's how FreeType works? + I'm not sure, FreeType docs don't make this clear... + + I'm happy with the resolution :-). + + src/hb-font.cc | 8 ++++---- + src/hb-font.h | 8 ++++---- + src/hb-ot-layout-common-private.hh | 6 +----- + src/hb-ot-layout-private.hh | 2 +- + 4 files changed, 10 insertions(+), 14 deletions(-) + +commit 4d559cddbb3b3a5c12c5167eba69598618a9f283 +Author: Behdad Esfahbod +Date: Thu Apr 21 14:58:23 2011 -0400 + + [icu] Remove big script switch(), rely on reverse-lookup + + src/hb-icu.cc | 137 + ++++------------------------------------------------------ + 1 file changed, 9 insertions(+), 128 deletions(-) + +commit d18431b4cd8c1b14523733cd60a62b862f5b471f +Author: Behdad Esfahbod +Date: Wed Apr 20 18:59:10 2011 -0400 + + Move hb_reference_count_t from macros to inline methods + + src/hb-object-private.hh | 25 +++++++++++-------------- + 1 file changed, 11 insertions(+), 14 deletions(-) + +commit c57d454accff66e5f2c58006e8fb40bc020b6182 +Author: Behdad Esfahbod +Date: Wed Apr 20 18:50:27 2011 -0400 + + Rename all private sources and headers to C++ files + + So we can liberally use the simple features of C++ that parts of the + codebase is already using. + + src/Makefile.am | 17 + +++++++++-------- + src/{hb-blob-private.h => hb-blob-private.hh} | 8 ++++---- + src/hb-blob.cc | 4 ++-- + src/hb-buffer-private.hh | 2 +- + src/{hb-common.c => hb-common.cc} | 8 ++++---- + src/{hb-font-private.h => hb-font-private.hh} | 8 ++++---- + src/hb-font.cc | 6 +++--- + src/{hb-ft.c => hb-ft.cc} | 4 ++-- + src/hb-glib.cc | 2 +- + src/hb-icu.cc | 2 +- + src/{hb-object-private.h => hb-object-private.hh} | 10 ++++------ + src/hb-open-type-private.hh | 2 +- + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-private.hh | 4 ++-- + ...abic-table.h => hb-ot-shape-complex-arabic-table.hh} | 8 ++++---- + src/hb-ot-shape-complex-arabic.cc | 2 +- + src/hb-ot-shape-complex-private.hh | 2 +- + src/hb-ot-shape-private.hh | 2 +- + src/{hb-ot-tag.c => hb-ot-tag.cc} | 8 ++++---- + src/{hb-private.h => hb-private.hh} | 8 ++++---- + src/hb-shape.cc | 2 +- + src/hb-unicode-private.hh | 2 +- + src/hb-unicode.cc | 2 +- + src/hb-view.c | 6 ++++++ + 24 files changed, 63 insertions(+), 58 deletions(-) + +commit f19f4f9b0965ad7473a0f3a1ffcdbf16930e35d4 +Author: Behdad Esfahbod +Date: Wed Apr 20 18:25:56 2011 -0400 + + Rename hb-blob.c to hb-blob.cc in preparation of more changes + + src/Makefile.am | 2 +- + src/{hb-blob.c => hb-blob.cc} | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 04744e73bad22d679986173b5f0d84dbbf49dd57 +Author: Behdad Esfahbod +Date: Wed Apr 20 17:24:03 2011 -0400 + + [TODO] Remove done items + + TODO | 6 ------ + 1 file changed, 6 deletions(-) + +commit 9417c1c0d2b005eadf0c087ca695121a6200d0f7 +Author: Behdad Esfahbod +Date: Wed Apr 20 17:21:23 2011 -0400 + + [API] Make hb_face_reference_table() return empty blob instead of NULL + + The idea here is that: + + - Like pretty much all other API in harfbuzz, user does not have to + check for NULL. + + - In any caller code, the case of missing table should be handled + exactly the same way that a too-short table is handled. Turning + a non-existent talbe into a table of size 0 makes the user code + safer. + + src/hb-font.cc | 2 ++ + src/hb-open-type-private.hh | 3 --- + 2 files changed, 2 insertions(+), 3 deletions(-) + +commit c035812feb0d385a9e8c334631738e4915912c71 +Author: Behdad Esfahbod +Date: Wed Apr 20 17:03:00 2011 -0400 + + [API] Rename hb_face_get_table() to hb_face_reference_table() + + That correctly reflects the reference ownership transfer happening. + + src/hb-font.cc | 4 ++-- + src/hb-font.h | 7 ++----- + src/hb-ot-layout.cc | 6 +++--- + src/hb-shape.cc | 2 +- + 4 files changed, 8 insertions(+), 11 deletions(-) + +commit 2d7b61a4b0ed212ca414b3281c2eae3e3db19c13 +Author: Behdad Esfahbod +Date: Wed Apr 20 16:40:56 2011 -0400 + + [TODO] Remove done items + + TODO | 10 ++-------- + src/hb-ft.h | 2 +- + 2 files changed, 3 insertions(+), 9 deletions(-) + +commit af02933739e03a156b9f7761fd7a63e2a02d0df1 +Author: Behdad Esfahbod +Date: Wed Apr 20 15:49:31 2011 -0400 + + [API] Remove hb_*_get_reference_count() + + This was a bizzare piece of API that I inherited from cairo. It has + been wrong adding them to cairo in the first place. Remove them + before + someone uses them! + + src/hb-blob.c | 6 ------ + src/hb-blob.h | 3 --- + src/hb-buffer.cc | 6 ------ + src/hb-buffer.h | 3 --- + src/hb-font.cc | 18 ------------------ + src/hb-font.h | 9 --------- + src/hb-object-private.h | 7 ------- + src/hb-unicode.cc | 6 ------ + src/hb-unicode.h | 3 --- + test/test-unicode.c | 24 ------------------------ + 10 files changed, 85 deletions(-) + +commit 440a76b630a36a7336c93e8b05d988c6407b085e +Author: Behdad Esfahbod +Date: Wed Apr 20 14:20:00 2011 -0400 + + [OT] Fix script to ot-script-tag conversion + + src/hb-ot-tag.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a3036a3e97b14c8eb1df208aed944207f9b6cc0b +Author: Behdad Esfahbod +Date: Wed Apr 20 14:13:23 2011 -0400 + + Minor + + src/hb-view.c | 1 - + 1 file changed, 1 deletion(-) + +commit fb6291d9c9224bedf207bf0077ad9f0a2690f867 +Author: Behdad Esfahbod +Date: Wed Apr 20 03:15:31 2011 -0400 + + [test] Add test for headers included from C and C++ + + test/Makefile.am | 17 +++++++++++++++++ + test/test-c.c | 49 + +++++++++++++++++++++++++++++++++++++++++++++++++ + test/test-cplusplus.cc | 29 +++++++++++++++++++++++++++++ + 3 files changed, 95 insertions(+) + +commit 107a50581ccab7df7c390d5b927fdab1bbe8e713 +Author: Behdad Esfahbod +Date: Wed Apr 20 03:04:56 2011 -0400 + + [test] Add todo items + + test/test-unicode.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit 5668189c12c264e8d2caf0d12dac918363ef6f80 +Author: Behdad Esfahbod +Date: Wed Apr 20 03:03:32 2011 -0400 + + [API] font: move user_data before destroy() + + This is the common convention for language binding tools. + + src/hb-font-private.h | 4 ++-- + src/hb-font.cc | 30 +++++++++++++++--------------- + src/hb-font.h | 12 ++++++------ + src/hb-ft.c | 8 ++++---- + 4 files changed, 27 insertions(+), 27 deletions(-) + +commit e5847f75fb7bd25c5db6061d8e20d61fa469f9fe +Author: Behdad Esfahbod +Date: Wed Apr 20 02:59:28 2011 -0400 + + [API] blob: move user_data before destroy() + + This is the common convention for language binding tools. + + src/hb-blob-private.h | 2 +- + src/hb-blob.c | 16 ++++++++-------- + src/hb-blob.h | 4 ++-- + 3 files changed, 11 insertions(+), 11 deletions(-) + +commit 1fd73b594d611624ccb73f614c61298debf48994 +Author: Behdad Esfahbod +Date: Wed Apr 20 02:56:39 2011 -0400 + + [test] Rename test-types to test-common + + test/Makefile.am | 2 +- + test/{test-types.c => test-common.c} | 0 + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit f144a8ea840c6452c1fece2fd988b42a8ea7c5a6 +Author: Behdad Esfahbod +Date: Wed Apr 20 02:54:42 2011 -0400 + + [icu] Add two-way script conversion functions + + Also optimizes the common-direction script lookup. + + src/hb-common.c | 5 +- + src/hb-icu.cc | 205 + +++++++++++++++++++++++++++++------------------------- + src/hb-icu.h | 9 +++ + test/test-types.c | 2 +- + 4 files changed, 124 insertions(+), 97 deletions(-) + +commit 0809aadd4bbd5d0f256407def7cc10b79772a824 +Author: Behdad Esfahbod +Date: Wed Apr 20 02:44:29 2011 -0400 + + [glib] Add two-way script conversion functions + + Also optimizes the common-direction script lookup to be an array + lookup. + + src/hb-glib.cc | 270 + ++++++++++++++++++++++++++++++--------------------------- + src/hb-glib.h | 8 ++ + 2 files changed, 148 insertions(+), 130 deletions(-) + +commit 5c8c1b680c4fa23c8574b9aebd21113e276f57a3 +Author: Behdad Esfahbod +Date: Wed Apr 20 02:29:22 2011 -0400 + + Remove verbose comments + + src/hb-glib.cc | 194 ++++++++++++++++++++--------------------- + src/hb-icu.cc | 266 + ++++++++++++++++++++++++++++----------------------------- + 2 files changed, 230 insertions(+), 230 deletions(-) + +commit fb194b8794898f51eb596fa4092c26606889d376 +Author: Behdad Esfahbod +Date: Wed Apr 20 02:00:47 2011 -0400 + + unicode: Cleanup implementation + + src/Makefile.am | 8 +- + src/hb-buffer-private.hh | 2 +- + src/{hb-glib.c => hb-glib.cc} | 65 +++---- + src/{hb-icu.c => hb-icu.cc} | 30 +-- + src/hb-ot-shape.cc | 14 +- + src/hb-shape.cc | 4 +- + ...{hb-unicode-private.h => hb-unicode-private.hh} | 65 ++++--- + src/{hb-unicode.c => hb-unicode.cc} | 213 + +++++++++------------ + src/hb-unicode.h | 57 +++--- + test/test-unicode.c | 23 ++- + 10 files changed, 237 insertions(+), 244 deletions(-) + +commit ecfb773829a5d98a4f5456a992f3e5ecd6731435 +Author: Behdad Esfahbod +Date: Wed Apr 20 01:34:51 2011 -0400 + + Cosmetic + + src/hb-unicode.h | 22 +++++++++------------- + 1 file changed, 9 insertions(+), 13 deletions(-) + +commit 2fd0c577e322ccbf762927bc4600b3ea31db4c80 +Author: Ryan Lortie +Date: Wed Apr 20 00:19:20 2011 -0400 + + [API] unicode: rework virtual functions for subclassing + + Unicode data providers can now be subclassed, including support for + chain-up. The interface should now be nicely bindable, as well. + + Also fix glib unicode funcs that where broken after hb_script_t + changes. Nicely caught by the test-unicode.c added in this commit. + + src/hb-glib.c | 186 ++++++++++++++++++++++++++++++++++++-- + src/hb-icu.c | 45 +++++++-- + src/hb-ot-shape.cc | 9 +- + src/hb-shape.cc | 2 +- + src/hb-unicode-private.h | 17 ++++ + src/hb-unicode.c | 231 + +++++++++++++++++++++++++---------------------- + src/hb-unicode.h | 68 +++++++------- + test/Makefile.am | 1 + + test/test-unicode.c | 215 + +++++++++++++++++++++++++++++++++++++++++++ + 9 files changed, 610 insertions(+), 164 deletions(-) + +commit f85faee9b3cb841ea977403945e2c877ab32b97a +Author: Behdad Esfahbod +Date: Tue Apr 19 00:38:01 2011 -0400 + + [API] Rename hb_buffer_add_glyph() to hb_buffer_add() + + src/hb-buffer.cc | 10 +++++----- + src/hb-buffer.h | 8 ++++---- + test/test-buffer.c | 2 +- + 3 files changed, 10 insertions(+), 10 deletions(-) + +commit aab0de50e23727b69fa8c3d4e05c50c114c62835 +Author: Behdad Esfahbod +Date: Tue Apr 19 00:32:19 2011 -0400 + + [API] Add hb_buffer_allocation_successful() + + Returns the error status of the buffer. + + src/hb-buffer.cc | 6 ++++++ + src/hb-buffer.h | 6 ++++++ + test/test-buffer.c | 2 +- + 3 files changed, 13 insertions(+), 1 deletion(-) + +commit 02a534b23f2d1e7475109563b9f61221ed020e8b +Author: Ryan Lortie +Date: Fri Apr 15 18:34:45 2011 -0400 + + [API] Rename hb_buffer_ensure() to hb_buffer_pre_allocate() + + The new name is self-documenting. + + src/hb-buffer.cc | 4 ++-- + src/hb-buffer.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 70566befc59cfa8b9c43ac682749c40ea783b1dd +Author: Ryan Lortie +Date: Fri Apr 15 18:32:36 2011 -0400 + + [API} hb_buffer_get_glyph_{infos,positions}: Add length out parameter + + Return the length, whenever we return an array. Makes it easier + on the + language bindings. + + src/hb-buffer.cc | 12 ++++++++++-- + src/hb-buffer.h | 6 ++++-- + src/hb-ot-layout-gpos-private.hh | 4 ++-- + src/hb-view.c | 4 ++-- + test/test-buffer.c | 7 ++----- + 5 files changed, 20 insertions(+), 13 deletions(-) + +commit 62879eebd9965179af8602ba29ac0a64a739b757 +Author: Behdad Esfahbod +Date: Mon Apr 18 23:40:21 2011 -0400 + + [API] Use ISO 15924 tags for hb_script_t + + This simplifies the code, reduces static data, and makes the design + more extensible to future additions of new scripts. + + src/hb-common.c | 411 + ++++--------------------------------- + src/hb-common.h | 199 +++++++++--------- + src/hb-ot-map.cc | 4 +- + src/hb-ot-shape-complex-private.hh | 3 +- + src/hb-ot-tag.c | 228 +++++++++----------- + src/hb-ot-tag.h | 6 +- + src/hb-shape.cc | 4 +- + test/test-types.c | 2 +- + 8 files changed, 252 insertions(+), 605 deletions(-) + +commit c0af193c8e25c4f11d23b8893e9ce1c2d2615bb2 +Author: Behdad Esfahbod +Date: Fri Apr 15 19:26:24 2011 -0400 + + Change buffer default properties to invalid + + This includes HB_DIRECTION_INVALID and HB_SCRIPT_INVALID. + + The INVALID will cause a "guess whatever from the text" in hb_shape(). + While it's not ideal, it works better than the previous defaults at + least (HB_DIRECTION_LTR and HB_SCRIPT_COMMON). + + src/hb-buffer-private.hh | 9 +++------ + src/hb-buffer.cc | 24 ++++++++++++++++-------- + src/hb-view.c | 6 ++---- + test/test-buffer.c | 4 ++-- + 4 files changed, 23 insertions(+), 20 deletions(-) + +commit 00bec2c969555e76c3f84650a1d3c45308e585ad +Author: Behdad Esfahbod +Date: Fri Apr 15 19:16:54 2011 -0400 + + Move enum types to hb-common.h + + src/hb-common.c | 406 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-common.h | 170 +++++++++++++++++++++++ + src/hb-unicode.c | 406 + ------------------------------------------------------- + src/hb-unicode.h | 166 ----------------------- + 4 files changed, 576 insertions(+), 572 deletions(-) + +commit 5dd4609f4da5674966a0169d9fa533ac5bc9f464 +Author: Behdad Esfahbod +Date: Fri Apr 15 19:16:34 2011 -0400 + + [TODO] Add new item + + TODO | 1 + + 1 file changed, 1 insertion(+) + +commit b54cd07b2623b68171e00179a9dc3ecbea7aa6a1 +Author: Behdad Esfahbod +Date: Fri Apr 15 19:12:01 2011 -0400 + + Mark internal buffer variables private + + src/hb-buffer.h | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 0e8d35c0932ddc20ebf430f2fd82c087da698954 +Author: Behdad Esfahbod +Date: Fri Apr 15 19:07:10 2011 -0400 + + Add hb_script_from_string() + + src/hb-unicode.c | 6 ++++++ + src/hb-unicode.h | 4 ++++ + src/hb-view.c | 2 +- + 3 files changed, 11 insertions(+), 1 deletion(-) + +commit 8f0d7e0c3fd4b05c43ac449be4f374dc2dc56127 +Author: Behdad Esfahbod +Date: Fri Apr 15 18:59:56 2011 -0400 + + Remove hb_buffer_clear_positions(), add hb_ot_layout_position_start() + + src/hb-buffer-private.hh | 6 +++++- + src/hb-buffer.cc | 24 ++++++++++++------------ + src/hb-buffer.h | 5 +---- + src/hb-ot-layout.cc | 6 ++++++ + src/hb-ot-layout.h | 4 ++++ + src/hb-ot-shape.cc | 2 +- + 6 files changed, 29 insertions(+), 18 deletions(-) + +commit 2fc56edff6d64f190271454ccb1b5fd347d4f172 +Author: Behdad Esfahbod +Date: Fri Apr 15 18:35:08 2011 -0400 + + [API] Remove hb_buffer_clear() + + One should use hb_buffer_reset() really. + + src/hb-buffer.cc | 16 +++++----------- + src/hb-buffer.h | 4 ---- + test/test-buffer.c | 4 ---- + 3 files changed, 5 insertions(+), 19 deletions(-) + +commit 7f5bdc80541cdc90aa1acafba5e9e0bd2df53ff4 +Author: Behdad Esfahbod +Date: Fri Apr 15 18:34:55 2011 -0400 + + [TODO] Remove done items + + TODO | 4 ---- + 1 file changed, 4 deletions(-) + +commit 5814dfa3f5aa41bc3df06b78980d57d7bea0ba58 +Author: Behdad Esfahbod +Date: Fri Apr 15 14:41:04 2011 -0400 + + Cosmetic + + src/hb-ot-shape.cc | 14 +++++++------- + src/hb-ot-shape.h | 4 ++-- + src/hb-shape.cc | 20 ++++++++++---------- + src/hb-shape.h | 10 +++++----- + 4 files changed, 24 insertions(+), 24 deletions(-) + +commit cfbfeb88a6ec059ea97a6624e63cfacc642b685a +Author: Behdad Esfahbod +Date: Fri Apr 15 12:40:40 2011 -0400 + + [TODO] Remove done items + + TODO | 4 ---- + 1 file changed, 4 deletions(-) + +commit 3cbdf70e0a92f1c24e16c0d4dcfbec4ac59a77a3 +Author: Behdad Esfahbod +Date: Fri Apr 15 12:32:06 2011 -0400 + + Make hb_language_t typesafe + + src/hb-common.c | 18 +++++++++++------- + src/hb-common.h | 2 +- + 2 files changed, 12 insertions(+), 8 deletions(-) + +commit 2f2f448af35c232d18888c0e57cb21c9796ba7a8 +Author: Behdad Esfahbod +Date: Fri Apr 15 11:45:14 2011 -0400 + + [test] Add more TODO items + + test/test-buffer.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit c910bec863215f918c659f58debbc7fe5264d7b6 +Author: Behdad Esfahbod +Date: Wed Apr 13 15:49:06 2011 -0400 + + Add hb_buffer_reset() and hb_buffer_set_length() + + src/hb-buffer.cc | 31 +++++++++++++++++++++++++++++++ + src/hb-buffer.h | 15 ++++++++++++++- + 2 files changed, 45 insertions(+), 1 deletion(-) + +commit 69ea23cb5d47dd1cfd3129f68375021ef79bf63b +Author: Behdad Esfahbod +Date: Wed Apr 13 15:02:40 2011 -0400 + + Minor + + src/hb-buffer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7dea908cd582c8c25555015940065c69c1e7e65b +Author: Behdad Esfahbod +Date: Wed Apr 13 01:35:58 2011 -0400 + + [test] Add todo items + + test/test-buffer.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 07cbaac07d7f43437b171e9275430b5fb3097716 +Author: Behdad Esfahbod +Date: Wed Apr 13 01:11:19 2011 -0400 + + [TODO] Add item re script iso15924 functions + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit d0f53fdbead15d9003b521b8ed47d02fd29a4c64 +Author: Behdad Esfahbod +Date: Wed Apr 13 01:09:09 2011 -0400 + + [test] Test hb-buffer.h + + test/Makefile.am | 8 ++- + test/test-buffer.c | 195 + +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 202 insertions(+), 1 deletion(-) + +commit 72d89404c2837d578f5305456c817130b6a15c73 +Author: Behdad Esfahbod +Date: Wed Apr 13 01:07:42 2011 -0400 + + [TODO] Add item re hb_buffer_reset() + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 5015c12dfb4de8525325178ae6def9e80fd83669 +Author: Behdad Esfahbod +Date: Wed Apr 13 01:06:02 2011 -0400 + + [TODO] Add item re hb_buffer_resize() + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 9329ec92078d0e2d7bb04f683e0c6a582aab92f7 +Author: Behdad Esfahbod +Date: Wed Apr 13 00:06:23 2011 -0400 + + [TODO] Add API item + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 4744379efc6063d94e15ff99381a7ab8b88ee567 +Author: Behdad Esfahbod +Date: Mon Apr 11 19:47:33 2011 -0400 + + Minor + + test/test-types.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9385caa8a693df0f06a511a71de9aa407637097c +Author: Behdad Esfahbod +Date: Mon Apr 11 19:43:51 2011 -0400 + + [test] Actually hook up hb_script_t tests + + I really shall find a way to automate the test enumeration. Otherwise + it's too easy to add a test and wrongly hook it up. Did it twice + today. + + test/test-types.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8e4bb3cacc269ed32187aaaeaa166c64f41a0418 +Author: Behdad Esfahbod +Date: Mon Apr 11 17:55:58 2011 -0400 + + Fold hb-language.[ch] into hb-common.[ch] + + src/Makefile.am | 2 - + src/hb-buffer.h | 1 - + src/hb-common.c | 92 ++++++++++++++++++++++++++++++++++++++++- + src/hb-common.h | 42 +++++++++++++------ + src/hb-language.c | 120 + ------------------------------------------------------ + src/hb-language.h | 46 --------------------- + src/hb-ot-tag.h | 1 - + src/hb.h | 1 - + 8 files changed, 120 insertions(+), 185 deletions(-) + +commit 09125576ca745b3393f3dc49071df891400bbdc9 +Author: Behdad Esfahbod +Date: Mon Apr 11 17:49:33 2011 -0400 + + [test] Test hb_language_t + + test/test-types.c | 26 +++++++++++++++++++++++++- + 1 file changed, 25 insertions(+), 1 deletion(-) + +commit 316b7a1afb84a5dfeaed886a585669b4d549c9b7 +Author: Behdad Esfahbod +Date: Mon Apr 11 17:49:10 2011 -0400 + + Make hb_language_from_string("") return NULL language + + src/hb-language.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit db60c96f20426111ffa71e9802ef6e248f8b28d0 +Author: Behdad Esfahbod +Date: Mon Apr 11 16:17:02 2011 -0400 + + [teset] Test hb_script_t + + test/hb-test.h | 8 ++++++++ + test/test-types.c | 35 ++++++++++++++++++++++++++++++++++- + 2 files changed, 42 insertions(+), 1 deletion(-) + +commit 99b74760a4cddc798ab44b5ca897486bbb9c76d6 +Author: Behdad Esfahbod +Date: Mon Apr 11 15:47:40 2011 -0400 + + Rename hb_category_t to hb_unicode_general_category_t + + src/hb-glib.c | 2 +- + src/hb-icu.c | 64 + ++++++++++++++++++------------------- + src/hb-ot-shape-complex-arabic.cc | 8 ++--- + src/hb-ot-shape-private.hh | 2 +- + src/hb-ot-shape.cc | 2 +- + src/hb-unicode.c | 4 +-- + src/hb-unicode.h | 66 + +++++++++++++++++++-------------------- + 7 files changed, 74 insertions(+), 74 deletions(-) + +commit 4188096a7722f09ffa9319986c0286071da10a27 +Author: Behdad Esfahbod +Date: Mon Apr 11 14:58:28 2011 -0400 + + Make HB_TAG_CHAR4 private + + It's just sugar. + + src/hb-common.h | 5 +---- + src/hb-private.h | 7 ++++++- + test/test-types.c | 2 -- + 3 files changed, 7 insertions(+), 7 deletions(-) + +commit 7ff7401c9237cda661869c1cb196d685706ac4e9 +Author: Behdad Esfahbod +Date: Mon Apr 11 13:27:30 2011 -0400 + + Make hb_tag_from_string(NULL) return HB_TAG_NONE + + src/hb-common.c | 3 +++ + test/test-types.c | 3 +++ + 2 files changed, 6 insertions(+) + +commit 02f6e62d6cabc7808c188daef26a1fe7ac626b1f +Author: Behdad Esfahbod +Date: Mon Apr 11 13:27:21 2011 -0400 + + Build fix + + test/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit db5227c40e5c35fe2ffb750f32b639cb44424a1d +Author: Behdad Esfahbod +Date: Mon Apr 11 13:16:08 2011 -0400 + + Move macros around + + src/hb-ot-tag.c | 6 ++---- + src/hb-private.h | 7 +++++++ + 2 files changed, 9 insertions(+), 4 deletions(-) + +commit 07233581c9d953708d3c020907c42b8b89472b89 +Author: Behdad Esfahbod +Date: Mon Apr 11 13:12:37 2011 -0400 + + Rename HB_TAG_STR() to HB_TAG_CHAR4() + + The problem with HB_TAG_STR() was that it expected a string of size 4 + exactly, and unlike hb_tag_from_string() it doesn't pad the tag with + space characters. So, the new name is more appropriate. + + src/hb-common.c | 2 +- + src/hb-common.h | 8 ++++---- + src/hb-ot-tag.c | 2 +- + test/test-types.c | 2 +- + 4 files changed, 7 insertions(+), 7 deletions(-) + +commit 9faa980067f802f712c2adf8263152ed40c98088 +Author: Behdad Esfahbod +Date: Mon Apr 11 12:46:49 2011 -0400 + + Add an in-tree test suite + + Uses the glib testing framework. Wrote unit tests for hb-common.h + types. + + Makefile.am | 2 +- + test/Makefile.am | 18 +++++++++ + test/Makefile.decl | 90 ++++++++++++++++++++++++++++++++++++++++++++ + test/hb-test.h | 67 +++++++++++++++++++++++++++++++++ + test/test-types.c | 108 + +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 284 insertions(+), 1 deletion(-) + +commit d77b76200efbaa0611691920f9f2018b1e8be340 +Author: Behdad Esfahbod +Date: Mon Apr 11 12:29:52 2011 -0400 + + Add few more paratheses to the HB_TAG macro + + Never hurts. + + src/hb-common.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b13640de6992de9ee9d07e3581c33b8181b70ff9 +Author: Behdad Esfahbod +Date: Mon Apr 11 12:29:31 2011 -0400 + + A few more ASSERTs + + src/hb-private.h | 3 +++ + 1 file changed, 3 insertions(+) + +commit ae9eeaff9300f3bb7bed588c5478e8e5461b3df0 +Author: Behdad Esfahbod +Date: Mon Apr 11 11:49:08 2011 -0400 + + Remove warning message from public header file + + Since we now assert thos in hb-private.h, the int types cannot + be wrong. + (Except for when someone else includes hb-common.h in a very broken + configuration, but that's not our problem!) + + Plus, we don't use inline in the public headers, so remove that too. + + src/hb-common.h | 7 ------- + src/hb-private.h | 4 ++++ + 2 files changed, 4 insertions(+), 7 deletions(-) + +commit 6fd5364bdc3a2b459175377e9e16c86cff054232 +Author: Behdad Esfahbod +Date: Mon Apr 11 11:47:14 2011 -0400 + + Assert int types + + src/hb-private.h | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit bbdeff59646e5502b9fc53ab1761b3f014ee276c +Author: Behdad Esfahbod +Date: Thu Apr 7 16:05:07 2011 -0400 + + Add test directory + + configure.ac | 1 + + test/Makefile.am | 0 + 2 files changed, 1 insertion(+) + +commit 4accc92afc702177ea53280d977cec839af3c12c +Author: Behdad Esfahbod +Date: Thu Apr 7 15:53:26 2011 -0400 + + Update TODO items + + TODO | 31 ++++++++++++++++++++----------- + 1 file changed, 20 insertions(+), 11 deletions(-) + +commit a71b9c8579d73aea4549f12524bbc2e89f43b5c5 +Author: Behdad Esfahbod +Date: Wed Apr 6 14:04:56 2011 -0400 + + Disable 'cswh' by default except for Arabic shaper + + That better matches OpenType spec. Note that we enable it for all + Arabic-shaper scripts. Ie. we enable it by default for Syriac too, + but the SyriacOT spec does not require it. I think this is a more + useful compromise than special-casing for Arabic script alone. + + src/hb-ot-shape-complex-arabic.cc | 3 +++ + src/hb-ot-shape.cc | 1 - + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit cab6f65bba560ac1651d9152f1ecf12eb88eca74 +Author: Behdad Esfahbod +Date: Mon Apr 4 15:36:51 2011 -0400 + + [hb-view] setlocale (LC_ALL, "") + + For now we don't use anything from the locale, but we should default + to using $LANG, etc, if --language is not specified. Right? + + src/hb-view.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit fb9ca1bfabde7da0c274e7a1bd12bffaf7949c18 +Author: Behdad Esfahbod +Date: Mon Apr 4 14:50:09 2011 -0400 + + [hb-view] Rewrite --features parsing, with range support + + The --features parsing handles errors now. More importantly, it + allos limiting individual features to specific byte ranges. The + format is Python-esque. Here is how it all works: + + Syntax: Value: Start: End: + + Setting value: + "kern" 1 0 ∞ # Turn feature on + "+kern" 1 0 ∞ # Turn feature off + "-kern" 0 0 ∞ # Turn feature off + "kern=0" 0 0 ∞ # Turn feature off + "kern=1" 1 0 ∞ # Turn feature on + "kern=2" 2 0 ∞ # Choose 2nd alternate + + Setting index: + "kern[]" 1 0 ∞ # Turn feature on + "kern[:]" 1 0 ∞ # Turn feature on + "kern[5:]" 1 5 ∞ # Turn feature on, partial + "kern[:5]" 1 0 5 # Turn feature on, partial + "kern[3:5]" 1 3 5 # Turn feature on, range + "kern[3]" 1 3 3+1 # Turn feature on, single char + + Mixing it all: + + "kern[3:5]=0" 1 3 5 # Turn feature off for range + + src/hb-view.c | 169 + +++++++++++++++++++++++++++++++++++++++++++++------------- + 1 file changed, 132 insertions(+), 37 deletions(-) + +commit ccc6745afaa68ce7497a6cd02ce85986d3c863d0 +Author: Behdad Esfahbod +Date: Mon Apr 4 14:49:50 2011 -0400 + + [hb-view] Use cached hb-ft face creation + + Avoids recreating the face the second time we call draw(). + + src/hb-view.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1b4a2cc095d165dc573e0235f00fbbf2a5d3c2c5 +Author: Behdad Esfahbod +Date: Mon Apr 4 14:45:28 2011 -0400 + + [hb-view] Add --debug + + Frees all allocated memory before exiting. Useful for valgrind run. + + src/hb-view.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit b2da26d1e32a012f7feaad7c7cced61e4fb269f1 +Author: Behdad Esfahbod +Date: Fri Apr 1 15:48:43 2011 -0400 + + [hb-view] Support --features + + Accepts values like: + + --features="-mkmk,aalt=2,calt=1,+cswh" + + A minus sign means "=0", a plus sign means "=1". Default is "=1". + A minus sign overrides an explicit value. + + src/hb-view.c | 70 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 68 insertions(+), 2 deletions(-) + +commit f48ff19b629070d13cee3c0eeeb06c98992f93c6 +Author: Behdad Esfahbod +Date: Fri Apr 1 14:19:10 2011 -0400 + + Sort options for clarity + + src/hb-view.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 5d91c3d547f78163b36aa7436d4388a836cca94a +Author: Behdad Esfahbod +Date: Wed Mar 16 17:36:32 2011 -0300 + + Add script to/from ISO 15924 tag support + + Also adds --script support to hb-view. + + If a script tag is not known to us, we pass the ISO 15924 tag around. + Right now, the OT layer ignores that, but we can fix it to blindly + convert that to an OT script tag. + + src/hb-ot-tag.c | 4 + + src/hb-unicode.c | 273 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-unicode.h | 8 +- + src/hb-view.c | 10 +- + 4 files changed, 293 insertions(+), 2 deletions(-) + +commit 3286fc0e9adc3f2874c9409e7fdb09e4d2b7dda1 +Author: Behdad Esfahbod +Date: Wed Mar 16 14:53:32 2011 -0300 + + Let hb_shape() guess script and direction... + + - Rename HB_SCRIPT_INVALID_CODE to HB_SCRIPT_INVALID + + - Add HB_DIRECTION_INVALID + + - Make hb_script_get_horizontal_direction() public + + - Make hb_shape() guess script from buffer text (first non-common + non-inherit script) if buffer script is set to HB_SCRIPT_INVALID + (this + is NOT the default.) + + - Make hb_shape() guess direction from buffer script if buffer + direction + is set to HB_DIRECTION_INVALID (this is NOT the default.) + + - Make hb-view.c set INVALID script and direction on the buffer. + + The above changes are meant to make hb-view fairly useful for + uni-script + uni-direction text. The guessing behavior however is NOT the + default of + hb_shape() and must be asked for explicitly. This is intended, + because + the guess is not a suitable substitute to full-fledged bidi and script + segmentation. It's just a testing tool. + + src/hb-common.h | 3 ++- + src/hb-icu.c | 2 +- + src/hb-ot-shape.cc | 3 ++- + src/hb-shape.cc | 52 + ++++++++++++++++++++++++++++++++++++++++++------ + src/hb-unicode-private.h | 4 ---- + src/hb-unicode.c | 2 +- + src/hb-unicode.h | 8 +++++++- + src/hb-view.c | 4 ++-- + 8 files changed, 61 insertions(+), 17 deletions(-) + +commit b7b29684df67af7280b74ca4cf18f02ad6521bdc +Author: Behdad Esfahbod +Date: Wed Mar 2 01:01:03 2011 -0500 + + [hb-view] Handle write_to_png errors + + src/hb-view.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit c2cb98c8185c5560cfd04de7ee7c64c9496b986c +Author: Behdad Esfahbod +Date: Tue Mar 1 23:18:09 2011 -0500 + + [hb-view] Link with -lm + + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b5dd44e24669cd35affcd92788d39ff56cac94db +Author: Behdad Esfahbod +Date: Mon Feb 28 10:13:52 2011 -0800 + + Fix possible overflow + + src/hb-buffer.cc | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +commit a4b781e93a0bee0549611e129b3564d9804d9090 +Author: Behdad Esfahbod +Date: Wed Feb 23 12:47:56 2011 -0500 + + Default background color shall either be white or transparent + + Definitely not black! + + src/hb-view.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5353bf439c150492708ef9337078cfd73b83627b +Author: Behdad Esfahbod +Date: Tue Feb 22 18:06:19 2011 -0500 + + Add initial hb-view tool + + Currently doesn't handle script or direction. + + configure.ac | 18 +++ + src/Makefile.am | 14 +++ + src/hb-view.c | 342 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 374 insertions(+) + +commit 82438c6ad5f60b6afc75c48cef72e18bef532468 +Author: Bradley Grainger +Date: Tue Feb 15 18:37:29 2011 -0500 + + Fix #pragma message for MSVC. + + __LOC__ was renamed to _HB__LOC__ in cd7555 but the corresponding + change wasn't made in hb-private.h. + + src/hb-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ba9ab8d6d9c863662c4b44ace4a4d89e29e592f2 +Author: Behdad Esfahbod +Date: Mon Jan 10 07:45:41 2011 -0500 + + Fix language extension matching + + src/hb-ot-tag.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a07874300a669ec0ea09a67df2a3ee8b0612d6b9 +Author: Behdad Esfahbod +Date: Mon Jan 10 02:27:49 2011 -0500 + + Don't use the m4/ dir + + We just require people to have libtool, pkg-config, etc installed + when running autogen.sh + + Makefile.am | 2 -- + configure.ac | 1 - + 2 files changed, 3 deletions(-) + +commit 7bbe14bed8a886ea5b293c927c4bf937cbfc6f51 +Author: Behdad Esfahbod +Date: Sun Jan 9 22:29:14 2011 -0500 + + Fix 'make distcheck' + + src/Makefile.am | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 2abe1264a580858bf7803af1701117a462375fb4 +Author: Javier Jardón +Date: Sun Jan 9 22:18:53 2011 -0500 + + Bug 31174 - Update autotools configuration + + Makefile.am | 2 + + autogen.sh | 188 + ++++------------------------------------------------------- + configure.ac | 22 +++++-- + 3 files changed, 29 insertions(+), 183 deletions(-) + +commit cc1a8a938b4c13e76b58825a9e1951c4134e634a +Author: Behdad Esfahbod +Date: Thu Jan 6 14:58:52 2011 -0500 + + Fix ChanContext backtrack matching with GPOS + + Reported on mailing list by Keith Stribley and Khaled Hosny. + + src/hb-buffer-private.hh | 5 +++-- + src/hb-buffer.cc | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 6 +++--- + 3 files changed, 7 insertions(+), 6 deletions(-) + +commit 1c3183027fe823cd673866ba29d169b69f8efba1 +Author: Behdad Esfahbod +Date: Thu Jan 6 14:44:14 2011 -0500 + + Remove unused realloc + + We always allocate and grow str and pos together. + + src/hb-buffer.cc | 6 ------ + 1 file changed, 6 deletions(-) + +commit 76691f0240d6de230e9b42280b54e91639464635 +Author: Behdad Esfahbod +Date: Thu Jan 6 14:16:59 2011 -0500 + + Fix ICU detection + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 756f794a1fce701092345a3f9afae039583fb55b +Author: Behdad Esfahbod +Date: Sun Dec 26 20:52:40 2010 -0500 + + Remove Graphite backend + + It was unmaintained and the code has to be replaced to use the new + grphite-ng code base. + + configure.ac | 6 -- + src/Makefile.am | 14 --- + src/hb-graphite.cc | 310 + ----------------------------------------------------- + src/hb-graphite.h | 47 -------- + 4 files changed, 377 deletions(-) + +commit f3d9d9879364609502d9d3a3a9f4647adb167d78 +Author: Behdad Esfahbod +Date: Wed Dec 22 01:39:29 2010 -0500 + + Docs + + src/hb-unicode.h | 60 + ++++++++++++++++++++++++++++---------------------------- + 1 file changed, 30 insertions(+), 30 deletions(-) + +commit d86a5b3c5752abcc791724035ba4115958e6b5e2 +Author: Behdad Esfahbod +Date: Tue Dec 21 18:36:25 2010 -0500 + + Bug 32274 - classic mongolian shaper + + Add support for classic Mongolian script to the Arabic shaper. + + Still work to be done around U+180E MONGOLIAN VOWEL SEPARATOR as it + should not be included in the final glyph stream the same way that + ZWNJ, etc should not appear in the final glyph stream. + + But the joining part should be done. + + There remains the question of how should the U+18A9 MONGOLIAN + LETTER ALI + GALI DAGALGA be handled as it has General Category NSM but a letter + nonetheless. For now, our generic logic makes this a joining + T instead + of joining D as other Mongolian letters are. + + src/hb-ot-shape-complex-arabic.cc | 8 ++++++++ + src/hb-ot-shape-complex-private.hh | 1 + + 2 files changed, 9 insertions(+) + +commit b0e7378fa9a4fc6fc74d9b3c27d927602eaacc5b +Author: Behdad Esfahbod +Date: Tue Dec 21 14:19:32 2010 -0500 + + Reroute Mandaic shaping through the Arabic shaper + + We added Mandaic joining data to the Arabic shaper a while ago, but + were not actually using the Arabic shaper for Mandaic. Fixed. + + src/hb-ot-shape-complex-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 88e7f37488e4e8590619d815b975232a0c9d2ea0 +Author: Behdad Esfahbod +Date: Tue Dec 21 14:18:24 2010 -0500 + + Annotate the Arabic joining table with block information + + src/gen-arabic-joining-table.py | 93 + +++++++++++++++++++++------------- + src/hb-ot-shape-complex-arabic-table.h | 24 +++++++-- + 2 files changed, 80 insertions(+), 37 deletions(-) + +commit 1482a39e56cd4151874e5c073540274349240a87 +Author: Behdad Esfahbod +Date: Fri Dec 17 20:15:05 2010 -0500 + + Rename remaining metrics uses to extents + + src/hb-font.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 22c537657cee1f47a4056a21e2cddfcbe6ab1c01 +Author: Behdad Esfahbod +Date: Tue Dec 14 23:51:29 2010 -0500 + + Rename TableDirectory to TableRecord as per OpenType 1.6 + + src/hb-open-file-private.hh | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 33e8b86197239e667a887709104357bdc6566b7c +Author: Behdad Esfahbod +Date: Mon Dec 13 15:54:56 2010 -0500 + + Update 'head' table to OpenType 1.6 + + src/hb-ot-head-private.hh | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit b7683335146bfe3a74d9419db92cd7a8019a9c10 +Author: Behdad Esfahbod +Date: Mon Dec 13 14:22:35 2010 -0500 + + Disallow ligature substitutions replacing one glyph + + src/hb-ot-layout-gsub-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7eb875118dc31e9fb0e23c45985396a8bfe977e3 +Author: Behdad Esfahbod +Date: Mon Dec 13 14:13:35 2010 -0500 + + Mozilla Bug 618592 - freeze on typekit + + Fix apply_lookup() for zero-input broken fonts. + + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit bbbbe80ec9bc45c5b685bc09c8f993e98496555c +Author: Behdad Esfahbod +Date: Tue Dec 7 16:22:02 2010 -0500 + + Rename original_direction to target_direction + + src/hb-ot-shape-private.hh | 2 +- + src/hb-ot-shape.cc | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit ee8aaf976a6eb42be49b63b4c51c7a0a338e0298 +Author: Behdad Esfahbod +Date: Tue Dec 7 16:20:42 2010 -0500 + + Fix arabic shaping of LTR text + + We should ensure-direction before doing any complex work. The only + exception is mirroring that needs to see the original / final + direction, + not the native. Handle that. + + src/hb-ot-shape.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit d1f1707adc03317760b0f75e04d0f3dd425e547f +Author: Behdad Esfahbod +Date: Tue Nov 30 00:57:15 2010 -0500 + + Bug 31965 - some GNU/Linux distributions lack icu.pc but have + icu-config + + Patch from suzuki toshiya. + + configure.ac | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit 3c48982be6b2286088541ee55cac78b0f2b6e771 +Author: Behdad Esfahbod +Date: Sun Nov 28 19:39:47 2010 -0500 + + Adjust pyx files to reflect change from int to hb_var_int_t + + Patch from Thomas Hunger. + + contrib/python/lib/harfbuzz.pyx | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 4f9e4a40bc248aeb1364ed6f4aa7f392aa364497 +Author: Behdad Esfahbod +Date: Mon Nov 22 11:30:32 2010 -0500 + + Fix failing checks + + src/hb-ot-shape-complex-arabic-table.h | 37 + ++++++++++++++++++++++++++++++++++ + 1 file changed, 37 insertions(+) + +commit 9da26d6669e7f3b91ba37e71f6f8a6e2ea806688 +Author: Behdad Esfahbod +Date: Mon Nov 22 11:03:18 2010 -0500 + + Remove email address from Copyright headers + + COPYING | 2 +- + src/hb-ft.c | 2 +- + src/hb-icu.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit a45f00019242734fca742adeb2ed507305baeda6 +Author: Behdad Esfahbod +Date: Thu Nov 18 13:58:32 2010 -0500 + + Clarify copyright notice + + COPYING | 12 ++++++++++++ + README | 4 ++-- + src/hb-graphite.cc | 4 ++-- + src/hb-object-private.h | 2 +- + 4 files changed, 17 insertions(+), 5 deletions(-) + +commit 0884a8d9cd576f116400b3f7c8815e747c315d5e +Author: Behdad Esfahbod +Date: Wed Nov 17 16:58:21 2010 -0500 + + Move generated table to its own file + + src/Makefile.am | 1 + + src/hb-ot-shape-complex-arabic-table.h | 619 + ++++++++++++++++++++++++++++++++ + src/hb-ot-shape-complex-arabic.cc | 621 + +-------------------------------- + 3 files changed, 621 insertions(+), 620 deletions(-) + +commit 14d784116b08685425e4ddcb1c1f813dbe2b2986 +Author: Behdad Esfahbod +Date: Wed Nov 17 16:52:58 2010 -0500 + + Update Arabic joining table to include Mandaic + + Mandaic was added to Unicode 6.0, but the joining data was not + updated. + Draft ArabicShaping.txt from 6.1 includes the joining data for + Mandaic. + Use that. + + src/gen-arabic-joining-table.py | 45 ++++++++++---- + src/hb-ot-shape-complex-arabic.cc | 123 + ++++++++++++++++++++++++++++++++------ + 2 files changed, 137 insertions(+), 31 deletions(-) + +commit 43bf2f7f1ec427c431e2ee2fd1a9345e7d5c9718 +Author: Behdad Esfahbod +Date: Wed Nov 17 14:49:40 2010 -0500 + + Add OpenType script tags for Unicode 5.2 and Unicode 6.0 scripts + + Based on tags proposed by Microsoft for inclusion in OpenType. + + src/hb-ot-tag.c | 34 +++++++++++++++++----------------- + 1 file changed, 17 insertions(+), 17 deletions(-) + +commit afab01cf7caca79cf6dfabe6827d1703be1a74f7 +Author: Behdad Esfahbod +Date: Wed Nov 17 14:35:34 2010 -0500 + + Add Unicode 6.0 scripts + + src/hb-icu.c | 6 ++++++ + src/hb-ot-tag.c | 7 ++++++- + src/hb-unicode.c | 7 ++++++- + src/hb-unicode.h | 7 ++++++- + 4 files changed, 24 insertions(+), 3 deletions(-) + +commit f234b68d18d956f7e4eb4bf58d6dc408d9e5146e +Author: Behdad Esfahbod +Date: Wed Nov 17 14:25:44 2010 -0500 + + Change HB_SCRIPT_MEITEI_MAYEK to HB_SCRIPT_MEETEI_MAYEK + + The new name matches the Unicode name. Reported by Jonathan Kew. + + src/hb-icu.c | 2 +- + src/hb-ot-tag.c | 2 +- + src/hb-unicode.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 3ca9a6d1cffe950b325e1d522b20d4a645ae448e +Author: Behdad Esfahbod +Date: Wed Nov 17 13:08:47 2010 -0500 + + Add TODO item + + TODO | 3 +++ + 1 file changed, 3 insertions(+) + +commit 300cb41417d40473268e3b4089bed24e9e77a753 +Author: Behdad Esfahbod +Date: Wed Nov 17 12:57:23 2010 -0500 + + Add XXX marks + + src/hb-ot-layout-gsubgpos-private.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit ea00aee9f94ae8c6cf03d620254817d5e1f51d64 +Author: Behdad Esfahbod +Date: Fri Nov 5 10:51:37 2010 -0400 + + Add TODO item + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 3a852ae7fe6edfaadd75625d27515a3689503395 +Author: Behdad Esfahbod +Date: Wed Nov 3 16:37:24 2010 -0400 + + Save general category and combining class in the buffer for reuse + + src/hb-ot-layout-private.hh | 3 ++- + src/hb-ot-shape-complex-arabic.cc | 16 ++++++++++------ + src/hb-ot-shape-private.hh | 6 ++++++ + src/hb-ot-shape.cc | 26 +++++++++++++++++++++----- + 4 files changed, 39 insertions(+), 12 deletions(-) + +commit a5ab682b9ba8224fc132624f93e6fef9973a68ca +Author: Behdad Esfahbod +Date: Wed Nov 3 15:50:36 2010 -0400 + + More "unreached code" warning fixes + + Ugly :(. + + src/hb-blob.c | 48 ++++++++++++++++++++++++------------------------ + 1 file changed, 24 insertions(+), 24 deletions(-) + +commit 4e22c7e94102c9f00c32b8cb6aaa832f83909149 +Author: Behdad Esfahbod +Date: Wed Nov 3 15:47:12 2010 -0400 + + Add comment + + src/hb-ot-layout-common-private.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit 0342034d1cb577d34b42f7204da7fb930c12a464 +Author: Behdad Esfahbod +Date: Wed Nov 3 15:40:07 2010 -0400 + + Pedantic + + src/hb-ot-layout-gpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4a2d844c2f12dc1b858ab4ddd737ded7c0852221 +Author: Behdad Esfahbod +Date: Wed Nov 3 15:28:56 2010 -0400 + + Minor code shuffling + + src/hb-ot-layout-private.hh | 21 +++------------- + src/hb-ot-layout.cc | 61 + +++++++++++++++++++++++++++++++++------------ + 2 files changed, 48 insertions(+), 34 deletions(-) + +commit 11e3ec444a85fc72541823c2e98cc92c4ceb19af +Author: Behdad Esfahbod +Date: Wed Nov 3 15:11:04 2010 -0400 + + Fix a few more "unreachable code" warnings + + src/hb-blob.c | 2 +- + src/hb-object-private.h | 12 +++--- + src/hb-open-type-private.hh | 84 + +++++++++++++++++------------------- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-private.h | 3 +- + 5 files changed, 49 insertions(+), 54 deletions(-) + +commit 2304856340782c72cb30873f7907191dc359e921 +Author: Behdad Esfahbod +Date: Wed Nov 3 12:46:58 2010 -0400 + + Remove another couple lines of dead code + + src/hb-ot-layout-gsubgpos-private.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit b8783c85ac5dd9ea8f5a66eacb92dfcfbf649a6d +Author: Behdad Esfahbod +Date: Wed Nov 3 11:50:21 2010 -0400 + + Fix unreachable-code warning + + src/hb-ot-layout-gpos-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit c2709119c8c610a0d4d71884a7d4fdba7cb65b72 +Author: Behdad Esfahbod +Date: Wed Oct 27 23:18:51 2010 -0400 + + Move things around some more + + src/hb-ot-layout-gpos-private.hh | 8 ++++---- + src/hb-ot-layout-gsub-private.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 9 +++++++-- + src/hb-ot-layout-private.hh | 7 +++---- + src/hb-ot-layout.cc | 6 +++--- + 5 files changed, 19 insertions(+), 15 deletions(-) + +commit 194d4566ec054db03fa31d369a9f1c6cf4941e74 +Author: Behdad Esfahbod +Date: Wed Oct 27 23:09:10 2010 -0400 + + Move buffer var allocation local + + src/hb-ot-layout-gpos-private.hh | 19 ++++++++++++++----- + src/hb-ot-layout-private.hh | 2 -- + 2 files changed, 14 insertions(+), 7 deletions(-) + +commit 1e7c1fcbc33599faefc32d4a28e5d8506d2c56fa +Author: Behdad Esfahbod +Date: Wed Oct 27 22:48:31 2010 -0400 + + Move code around + + src/hb-ot-layout-gpos-private.hh | 59 + ++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-layout.cc | 59 + ++-------------------------------------- + src/hb-ot-layout.h | 4 +-- + src/hb-ot-shape.cc | 2 +- + 4 files changed, 63 insertions(+), 61 deletions(-) + +commit bf94b3ad22b2fe4730d4e64d673c63154fc5b5fe +Author: Behdad Esfahbod +Date: Wed Oct 27 22:37:59 2010 -0400 + + Move some more code around + + src/hb-ot-layout-gdef-private.hh | 21 +++++++++++++++ + src/hb-ot-layout-private.hh | 27 ++++++++++++++++--- + src/hb-ot-layout.cc | 56 + ++++++---------------------------------- + 3 files changed, 52 insertions(+), 52 deletions(-) + +commit 6334658fe79d6acfb46a2a147721b78f92510ebb +Author: Behdad Esfahbod +Date: Wed Oct 27 22:11:32 2010 -0400 + + Simplify mark skipping logic + + src/hb-ot-layout.cc | 17 +++-------------- + 1 file changed, 3 insertions(+), 14 deletions(-) + +commit 8c69e65abed961002d90024c92e18538c6516262 +Author: Behdad Esfahbod +Date: Wed Oct 27 22:07:49 2010 -0400 + + Rename lookup_flags to lookup_props since it's more than just flags + + src/hb-ot-layout-common-private.hh | 6 +++++- + src/hb-ot-layout-gpos-private.hh | 14 +++++++------- + src/hb-ot-layout-gsub-private.hh | 8 ++++---- + src/hb-ot-layout-gsubgpos-private.hh | 10 +++++----- + src/hb-ot-layout-private.hh | 4 ++-- + src/hb-ot-layout.cc | 36 + ++++++++++++++++++------------------ + src/main.cc | 4 ++-- + 7 files changed, 43 insertions(+), 39 deletions(-) + +commit 98370e89d1bff248737b482d129c2a4deb8bfd95 +Author: Behdad Esfahbod +Date: Wed Oct 27 17:39:01 2010 -0400 + + WIP removing external synthesized GDEF support and implementing + it internally + + TODO | 2 - + src/hb-buffer-private.hh | 4 - + src/hb-buffer.cc | 3 - + src/hb-ot-layout-common-private.hh | 8 +- + src/hb-ot-layout-gdef-private.hh | 6 +- + src/hb-ot-layout-gpos-private.hh | 4 +- + src/hb-ot-layout-gsub-private.hh | 66 ++++++----------- + src/hb-ot-layout-gsubgpos-private.hh | 29 +++++++- + src/hb-ot-layout-private.hh | 29 +++----- + src/hb-ot-layout.cc | 138 + +++++------------------------------ + src/hb-ot-layout.h | 26 ------- + src/hb-ot-shape.cc | 10 +++ + 12 files changed, 98 insertions(+), 227 deletions(-) + +commit 870e2d6eac01d004c72a925ea93e6823251d5fa2 +Author: Behdad Esfahbod +Date: Wed Oct 27 17:37:20 2010 -0400 + + Remove unused function + + src/hb-buffer-private.hh | 10 ---------- + src/hb-buffer.cc | 27 --------------------------- + 2 files changed, 37 deletions(-) + +commit 1115890b90709fa5329a55d22f543020f3df9f6f +Author: Behdad Esfahbod +Date: Wed Oct 27 17:07:04 2010 -0400 + + More cleanup + + src/hb-buffer-private.hh | 5 +---- + src/hb-ot-layout-private.hh | 6 ++++++ + 2 files changed, 7 insertions(+), 4 deletions(-) + +commit dbf56b1d94910f04823e53e39ace1e5145bddc04 +Author: Behdad Esfahbod +Date: Wed Oct 27 17:06:12 2010 -0400 + + More lig-id cleanup + + src/hb-buffer-private.hh | 4 ++-- + src/hb-buffer.cc | 2 +- + src/hb-ot-layout-gsub-private.hh | 8 +++++++- + 3 files changed, 10 insertions(+), 4 deletions(-) + +commit f6a23a0b9171958f76c1d0473b09fc08d2b3a0d0 +Author: Behdad Esfahbod +Date: Wed Oct 27 17:01:03 2010 -0400 + + More removal of lig-id code from buffer + + src/hb-buffer.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit dd2ffd282c059194fd87fb1664e2e0cdb56a87a0 +Author: Behdad Esfahbod +Date: Wed Oct 27 16:57:01 2010 -0400 + + Minor renaming + + src/hb-buffer-private.hh | 41 + ++++++++++++++++++++-------------------- + src/hb-buffer.cc | 20 ++++++++++---------- + src/hb-ot-layout-gsub-private.hh | 8 ++++---- + src/hb-ot-shape.cc | 6 +++--- + 4 files changed, 37 insertions(+), 38 deletions(-) + +commit fe263272a2b26204bc39829a94d90ab537517f3f +Author: Behdad Esfahbod +Date: Wed Oct 27 16:51:02 2010 -0400 + + Move setting lig_id/component out of buffer and to the gsub code + + src/hb-buffer-private.hh | 30 +++++++---------------- + src/hb-buffer.cc | 52 + +++++++--------------------------------- + src/hb-ot-layout-gsub-private.hh | 27 ++++++++++++--------- + 3 files changed, 34 insertions(+), 75 deletions(-) + +commit 2e2b2480c01c788ea702d78ca830c2bb659654a8 +Author: Behdad Esfahbod +Date: Wed Oct 27 16:25:28 2010 -0400 + + Always allocate new ligature id + + No practical point in reusing ligature ids. + + src/hb-ot-layout-gsub-private.hh | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit bf07d5a29c61baf6fd683289c7764f487ad7e413 +Author: Behdad Esfahbod +Date: Wed Oct 27 16:19:13 2010 -0400 + + Set component=0 for ligature glyph + + src/hb-ot-layout-gsub-private.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 37ab877149582c7ce7416425bb402340e3f948a2 +Author: Behdad Esfahbod +Date: Wed Oct 27 15:38:06 2010 -0400 + + Remove comment + + src/hb-buffer.cc | 20 -------------------- + 1 file changed, 20 deletions(-) + +commit 88474c6fdaf35c56368694a5b164f4988a004d49 +Author: Behdad Esfahbod +Date: Wed Oct 27 14:42:15 2010 -0400 + + Get rid of the OpenType-specific internal buffer representation + + Add variant integers to buffer item types. More cleanup coming. + + TODO | 2 -- + src/hb-buffer-private.hh | 35 ++++++---------------- + src/hb-buffer.cc | 62 + +++++++++++++++++++-------------------- + src/hb-buffer.h | 2 +- + src/hb-ot-layout-gpos-private.hh | 24 +++++++-------- + src/hb-ot-layout-gsub-private.hh | 2 +- + src/hb-ot-layout-private.hh | 4 +-- + src/hb-ot-layout.cc | 39 ++++++++++++------------ + src/hb-ot-shape-complex-arabic.cc | 8 ++--- + 9 files changed, 79 insertions(+), 99 deletions(-) + +commit 6cb8c3493019e1497921666fc268cb81943f9f1f +Author: Behdad Esfahbod +Date: Wed Oct 27 14:27:03 2010 -0400 + + Add hb_var_int_t + + src/hb-buffer.h | 6 +++--- + src/hb-common.h | 10 ++++++++++ + 2 files changed, 13 insertions(+), 3 deletions(-) + +commit f22802431a983bd4bc60a7653b1103973c3475cb +Author: Behdad Esfahbod +Date: Tue Nov 2 19:12:37 2010 -0400 + + Remove trailing comma + + src/hb-ot-shape-complex-arabic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 13528d0c78cadb1f67267c9a692558caef9fdaa6 +Author: Behdad Esfahbod +Date: Wed Oct 27 14:09:27 2010 -0400 + + Supposedly implement vertical support in GPOS + + Not tested at all. + + src/hb-ot-layout-gpos-private.hh | 27 ++++++++++++++++++++------- + src/hb-ot-layout.cc | 39 + ++++++++++++++++++++++++--------------- + 2 files changed, 44 insertions(+), 22 deletions(-) + +commit 9624de5b496846cd89ee4f7b07d38029aca70ce1 +Author: Behdad Esfahbod +Date: Wed Oct 27 13:44:59 2010 -0400 + + Clarify cursive_chain (and change its sign) + + src/hb-ot-layout-gpos-private.hh | 4 ++-- + src/hb-ot-layout.cc | 13 +++++++------ + 2 files changed, 9 insertions(+), 8 deletions(-) + +commit d6c9eadb88240c40b3cb9a33f067e575cbc2f729 +Author: Behdad Esfahbod +Date: Wed Oct 27 12:34:50 2010 -0400 + + Remove more pointless LONGTERMTODO items + + src/hb-ot-layout-common-private.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit e204674fe340a57c48a9fe7e1ed02a9a08f4aca4 +Author: Behdad Esfahbod +Date: Wed Oct 27 12:32:02 2010 -0400 + + Rename hb_ot_layout_get_lig_carets() to + hb_ot_layout_get_ligature_carets() + + src/hb-ot-layout.cc | 14 +++++++------- + src/hb-ot-layout.h | 14 +++++++------- + 2 files changed, 14 insertions(+), 14 deletions(-) + +commit 3357d145f81cb7b746c910018fe3a0dfab00972c +Author: Behdad Esfahbod +Date: Wed Oct 27 12:30:46 2010 -0400 + + Implement vertical support in get_lig_carets() + + src/hb-ot-layout-gdef-private.hh | 34 ++++++++++++++++++---------------- + src/hb-ot-layout.cc | 3 ++- + src/hb-ot-layout.h | 1 + + 3 files changed, 21 insertions(+), 17 deletions(-) + +commit 8eeed7eddc789151cbffe62ed6bfd77612266bf1 +Author: Behdad Esfahbod +Date: Wed Oct 27 12:07:49 2010 -0400 + + Remove LONGTERMTODO item that I'll never fix + + src/hb-ot-layout-gsubgpos-private.hh | 6 ------ + 1 file changed, 6 deletions(-) + +commit 184a5279c64f37bc2ceefbe2191bb64ca87f88d8 +Author: Behdad Esfahbod +Date: Wed Oct 27 12:00:49 2010 -0400 + + Remove unused macro + + src/hb-ot-layout-gpos-private.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit af5d02a269d55331300df1e382241893928d64e0 +Author: Behdad Esfahbod +Date: Wed Oct 27 11:54:26 2010 -0400 + + Rewrite Cursive joining to act more like other pair lookups + + Look forward for next character instead of joining to the last + character. + + src/hb-ot-layout-gpos-private.hh | 71 + ++++++++++++++++++---------------------- + src/hb-ot-layout-private.hh | 10 ------ + 2 files changed, 31 insertions(+), 50 deletions(-) + +commit ea22c749c7371cf66ca44f0bfe7030aef1926edd +Author: Behdad Esfahbod +Date: Wed Oct 27 11:09:48 2010 -0400 + + Fix Cursive positioning + + Test case: "مرا" rendered using IranNastaliq. + + src/hb-ot-layout-gpos-private.hh | 124 + +-------------------------------------- + 1 file changed, 3 insertions(+), 121 deletions(-) + +commit aefdb64689aab19df76590a36c4a04052a8bffdb +Author: Behdad Esfahbod +Date: Wed Oct 27 10:40:39 2010 -0400 + + Fix segfault with Arabic combining marks + + src/hb-ot-shape-complex-arabic.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 12b2d09a87adc1e1aac089cd2e09a68fb7129829 +Author: Behdad Esfahbod +Date: Wed Oct 27 01:28:28 2010 -0400 + + Remove obsolete TODO item + + We don't cache any metrics internally, so the correct way to add more + glyph metrics items is to add new callbacks for them. We already have + separeate callbacks for advance vs extents. + + TODO | 2 -- + 1 file changed, 2 deletions(-) + +commit 248e3c2ba47889c247959e44166644872aed59ba +Author: Behdad Esfahbod +Date: Wed Oct 27 01:23:14 2010 -0400 + + Oops, remove extra mask setting that broke complex shaping + + src/hb-ot-shape.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit 502f4cba3e0bcd625d31f8fd295b8b18e2d02a5a +Author: Behdad Esfahbod +Date: Wed Oct 27 01:13:56 2010 -0400 + + Divide get_metrics into get_advance and get_extents + + Graphite module not updated. + Bump version to 0.3. + + configure.ac | 2 +- + src/hb-font-private.h | 3 +- + src/hb-font.cc | 96 + +++++++++++++++++++++++++++++++++++---------------- + src/hb-font.h | 61 ++++++++++++++++++++------------ + src/hb-ft.c | 72 +++++++++++++++++++++++--------------- + src/hb-ot-shape.cc | 7 ++-- + 6 files changed, 154 insertions(+), 87 deletions(-) + +commit ec6c0e54d322d58cbc835feb58dcec7ede6ab744 +Author: Behdad Esfahbod +Date: Tue Oct 26 11:28:14 2010 -0400 + + Fix blob leak + + src/hb-font.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bd7378b2ef9793de4e7f57b920f29f48ac9d0c25 +Author: Behdad Esfahbod +Date: Wed Oct 13 18:33:16 2010 -0400 + + Massage mask setting a bit more + + Still finding the exact correct way the masks should be set. + + src/hb-buffer-private.hh | 19 ++++++++++++++++--- + src/hb-buffer.cc | 9 +++++++++ + src/hb-ot-shape.cc | 6 ++++-- + 3 files changed, 29 insertions(+), 5 deletions(-) + +commit 961f9baa7bc3556f1e4e7135859cebe1351f73a4 +Author: Behdad Esfahbod +Date: Wed Oct 13 17:17:00 2010 -0400 + + Oops, actually set global mask + + src/hb-buffer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 39dede9ffffe732f78cbd092ccb3b48d77ddd66d +Author: Behdad Esfahbod +Date: Wed Oct 13 15:54:06 2010 -0400 + + Make sure boolean features always use value=1 + + Previously boolean features turned on the entire feature mask. + This is + wrong if feature is Alternate and user has provided values bigger + than one. + Though, I don't think other engines support such corner cases. + + src/hb-ot-map-private.hh | 10 ++++++++-- + src/hb-ot-map.cc | 3 ++- + src/hb-ot-shape-complex-arabic.cc | 2 +- + src/hb-ot-shape.cc | 2 +- + 4 files changed, 12 insertions(+), 5 deletions(-) + +commit 3506b2e78db27e7835bd2c09c053a9807c9cac40 +Author: Behdad Esfahbod +Date: Wed Oct 13 15:38:52 2010 -0400 + + Return early if mask is 0 + + src/hb-buffer.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 5c1c8c9c50ddbe66ea595afb245a208b7775b27c +Author: Behdad Esfahbod +Date: Wed Oct 13 15:36:38 2010 -0400 + + Make sure feature values don't leak out of their mask + + src/hb-buffer.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 852912fc2db06b6183a2dc87c45ec1b563063572 +Author: Behdad Esfahbod +Date: Wed Oct 13 15:34:50 2010 -0400 + + Fix applying default-value for features + + Previously if a default global feature was overrided by a non-global + user feature, we were not setting any default mask for the feature, + essentially disabling the feature by default. Fix that. + + TODO | 2 -- + src/hb-ot-map-private.hh | 10 ++++++---- + src/hb-ot-map.cc | 13 +++++++------ + 3 files changed, 13 insertions(+), 12 deletions(-) + +commit 2989be4919242670c94825bded96db20a7b2035b +Author: Behdad Esfahbod +Date: Wed Oct 13 15:18:29 2010 -0400 + + Set user masks after complex masks + + src/hb-ot-shape.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a7820b7b15a809b4a1a4077147ceed7bea528483 +Author: Behdad Esfahbod +Date: Wed Oct 13 14:20:48 2010 -0400 + + Add TODO item + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 04a3023a66203d94b77f2d7a8d6bcdedf067e155 +Author: Behdad Esfahbod +Date: Wed Oct 13 10:57:27 2010 -0400 + + Cleanup TODO + + Looks like a roadmap now. + + TODO | 72 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++------------- + 1 file changed, 59 insertions(+), 13 deletions(-) + +commit 3111b8a0d5b38da57c0f6285aec2b92eb690188f +Author: Behdad Esfahbod +Date: Wed Oct 13 10:41:53 2010 -0400 + + Fix stupid bug, oops + + src/hb-font.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3703f88b74707113e782eb6ca9a77603561760d0 +Author: Behdad Esfahbod +Date: Tue Oct 12 18:34:20 2010 -0400 + + Step the version up to 0.2 now that Arabic shaper is in + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 758f68b860b44b5a04eb3dde5cb40b1b04cf634a +Author: Behdad Esfahbod +Date: Tue Oct 12 17:37:44 2010 -0400 + + Fix Arabic shaper + + It's tested now. It works! + + src/hb-ot-shape-complex-arabic.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 13403bc67a01e0d4908fb964093fd02ddd11c580 +Author: Behdad Esfahbod +Date: Tue Oct 12 17:23:54 2010 -0400 + + Hookup Arabic shaper! + + Not tested yet. + + src/hb-ot-shape-complex-arabic.cc | 6 +++--- + src/hb-ot-shape-complex-private.hh | 37 + ++++++++++++++++++++++--------------- + src/hb-ot-shape-private.hh | 14 +++++++++++++- + src/hb-ot-shape.cc | 3 ++- + 4 files changed, 40 insertions(+), 20 deletions(-) + +commit 57ac0ecb7843533b2e6e6d6c8a12b2a44437cc1c +Author: Behdad Esfahbod +Date: Tue Oct 12 17:07:02 2010 -0400 + + Merge clearing masks and setting global masks + + src/hb-buffer-private.hh | 11 ++++++----- + src/hb-buffer.cc | 5 +++-- + src/hb-ot-map.cc | 2 +- + src/hb-ot-shape.cc | 7 ++----- + 4 files changed, 12 insertions(+), 13 deletions(-) + +commit fc96596b7c1c4e62491e951a3c256fb00dcde550 +Author: Behdad Esfahbod +Date: Tue Oct 12 17:00:25 2010 -0400 + + Form clusters before setting masks + + src/hb-ot-shape.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 1e80782244cdb1dedae9d1e61079d0508e57ca72 +Author: Behdad Esfahbod +Date: Tue Oct 12 17:00:07 2010 -0400 + + Clear masks before setting them up, not after! + + src/hb-ot-shape.cc | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit fd3d32d31cb6d74a9994b6850d539fd0b707d941 +Author: Behdad Esfahbod +Date: Tue Oct 12 16:57:47 2010 -0400 + + Add hb_ot_shape_execute() + + Not public yet. + + src/hb-ot-shape-private.hh | 5 ++--- + src/hb-ot-shape.cc | 19 ++++++++++++++----- + 2 files changed, 16 insertions(+), 8 deletions(-) + +commit 49baa1f69efb0e3c62e45bd59dd88459a84bf390 +Author: Behdad Esfahbod +Date: Tue Oct 12 16:50:36 2010 -0400 + + Add hb_ot_complex_shaper_t stuff and start hooking Arabic shaper up + + src/Makefile.am | 3 +- + src/hb-ot-map-private.hh | 2 +- + src/hb-ot-map.cc | 2 +- + ...ape-arabic.cc => hb-ot-shape-complex-arabic.cc} | 9 +++ + src/hb-ot-shape-complex-private.hh | 88 + ++++++++++++++++++++++ + src/hb-ot-shape-private.hh | 12 +-- + src/hb-ot-shape.cc | 8 +- + 7 files changed, 107 insertions(+), 17 deletions(-) + +commit 605ed468f380f86d642031f6451447d270cb6de1 +Author: Behdad Esfahbod +Date: Tue Oct 12 16:19:29 2010 -0400 + + Add hb_ot_shape_plan_t + + This is the object that a separate plan/execute shaping API will + use in + between the two stages. + + src/hb-ot-shape-private.hh | 12 ++++++++++-- + src/hb-ot-shape.cc | 38 ++++++++++++++++++-------------------- + 2 files changed, 28 insertions(+), 22 deletions(-) + +commit 895fb5d364e7ae5d9d2e34b9f68b8651804369ef +Author: Behdad Esfahbod +Date: Tue Oct 12 16:00:21 2010 -0400 + + Refactor, in a different direction + + src/hb-ot-map-private.hh | 15 ++++++++------- + src/hb-ot-map.cc | 23 ++++++++++++----------- + src/hb-ot-shape-private.hh | 13 +------------ + src/hb-ot-shape.cc | 33 +++++++++++++++++---------------- + 4 files changed, 38 insertions(+), 46 deletions(-) + +commit d2ba016ca1ba7489537768b619980d5159b5870c +Author: Behdad Esfahbod +Date: Tue Oct 12 15:35:45 2010 -0400 + + More refactoring + + src/hb-ot-map-private.hh | 32 +++++--------------------------- + src/hb-ot-map.cc | 32 +++++++++++++++++++++++++++++--- + src/hb-ot-shape-private.hh | 16 ++++++++++++++-- + src/hb-ot-shape.cc | 43 + ++++++++++++++++++++++++++++--------------- + src/hb-ot-shape.h | 10 +++++----- + 5 files changed, 81 insertions(+), 52 deletions(-) + +commit 66e487dfbfdccd0c4be8cd11661d412ca27c3425 +Author: Behdad Esfahbod +Date: Tue Oct 12 13:51:19 2010 -0400 + + Update Arabic shaping table to Unicode 6.0.0. + + src/hb-ot-shape-arabic.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit f4792d99eee0e8cd72b7cb01c96a09f16e2a72ce +Author: Behdad Esfahbod +Date: Tue Oct 12 12:32:18 2010 -0400 + + Fix infinite loop! + + Untested code is indeed buggy code. + + Mozilla bug #603352. + + src/hb-ot-tag.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit 993d1e786a32612b796dae8309ce402a4121bec7 +Author: Behdad Esfahbod +Date: Tue Oct 12 11:17:30 2010 -0400 + + Fix missing negation in unreachable code! + + Mozilla bug #603346 + + src/hb-open-type-private.hh | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 52601275d5e4000dada4f925fb78723eeeee7bd4 +Author: Behdad Esfahbod +Date: Fri Oct 8 20:38:46 2010 -0400 + + More separation + + src/hb-ot-shape.cc | 14 +++++--------- + 1 file changed, 5 insertions(+), 9 deletions(-) + +commit 6b7e6758626268ba1c7c266128e618ec73ae2c0f +Author: Behdad Esfahbod +Date: Fri Oct 8 20:30:04 2010 -0400 + + Minor + + src/hb-ot-shape.cc | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +commit aa9c450bb2d7c3c9e36ea32e3558250391a0582d +Author: Behdad Esfahbod +Date: Fri Oct 8 20:27:38 2010 -0400 + + Enable 'rtlm' mirroring + + src/hb-ot-map-private.hh | 9 +++++---- + src/hb-ot-shape.cc | 30 +++++++++++++++--------------- + 2 files changed, 20 insertions(+), 19 deletions(-) + +commit 36925f695d349a53d52ecc3a58f18240a6977463 +Author: Behdad Esfahbod +Date: Fri Oct 8 20:20:32 2010 -0400 + + Rename hb_mask_allocator_t to hb_ot_map_t + + hb_ot_plan_t may be a better name, donno. + + src/hb-ot-map-private.hh | 4 ++-- + src/hb-ot-map.cc | 2 +- + src/hb-ot-shape-private.hh | 4 ++-- + src/hb-ot-shape.cc | 49 + +++++++++++++++++++++------------------------- + 4 files changed, 27 insertions(+), 32 deletions(-) + +commit f5dd3be46b5c77a2c5b97b82a0b67ac9e851b898 +Author: Behdad Esfahbod +Date: Fri Oct 8 20:16:23 2010 -0400 + + Improve checks + + src/check-c-linkage-decls.sh | 2 +- + src/check-header-guards.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 5a2b0b3878cd9c62121bb4fd6344e102a9ee1825 +Author: Behdad Esfahbod +Date: Fri Oct 8 20:14:57 2010 -0400 + + Add hb-ot-map.cc + + src/Makefile.am | 1 + + src/hb-ot-map-private.hh | 129 +----------------------------------- + src/hb-ot-map.cc | 165 + +++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 168 insertions(+), 127 deletions(-) + +commit ecc4550ed7bc900a61081edfbcd0ad09cbf29b36 +Author: Behdad Esfahbod +Date: Fri Oct 8 20:05:29 2010 -0400 + + Fix feature overriding + + src/hb-ot-map-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8f08c3275040870a645ef034a38d30c05c619f21 +Author: Behdad Esfahbod +Date: Fri Oct 8 19:43:48 2010 -0400 + + Minor cleanup + + src/hb-open-type-private.hh | 8 ++---- + src/hb-ot-map-private.hh | 61 + +++++++++++++-------------------------------- + src/hb-ot-tag.c | 11 ++++---- + src/hb-private.h | 4 +++ + 4 files changed, 28 insertions(+), 56 deletions(-) + +commit a806762a314e83154793d96ee665e6668d6b56de +Author: Behdad Esfahbod +Date: Fri Oct 8 19:18:40 2010 -0400 + + Add hb-ot-shape-private.hh + + src/Makefile.am | 1 + + src/hb-ot-shape-arabic.cc | 2 +- + src/hb-ot-shape-private.hh | 60 + ++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 62 insertions(+), 1 deletion(-) + +commit 4924affe0f0adf75f2a0e2137a71206b0576d63f +Author: Behdad Esfahbod +Date: Fri Oct 8 19:18:16 2010 -0400 + + Add hb-ot-map-private.hh + + src/Makefile.am | 1 + + src/hb-ot-map-private.hh | 307 + +++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-shape.cc | 274 ++---------------------------------------- + 3 files changed, 315 insertions(+), 267 deletions(-) + +commit a7c5046d6b676a32298b97403a49235f7f255161 +Author: Behdad Esfahbod +Date: Fri Oct 8 18:47:47 2010 -0400 + + Add private hb_segment_properties_t + + src/hb-buffer-private.hh | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit b897c607d91d569f4eaa681d1f5b3d9f3d2bb093 +Author: Behdad Esfahbod +Date: Fri Oct 8 18:41:57 2010 -0400 + + Flip the OT bit-allocation vs gsub/gpos inside-out + + We now build our entire attack plan before jumping in. + + src/hb-ot-shape.cc | 333 + ++++++++++++++++++++++++++++------------------------- + 1 file changed, 176 insertions(+), 157 deletions(-) + +commit e89b7d2a61b7f58e6c7cec00d5ce2246dee1e8a1 +Author: Behdad Esfahbod +Date: Fri Oct 8 12:29:59 2010 -0400 + + Logically separate feature collection + + src/hb-ot-shape.cc | 29 ++++++++++++++++++----------- + 1 file changed, 18 insertions(+), 11 deletions(-) + +commit 5b88908f12ad1d828dd6075fb8fc0036c2d6af3a +Author: Behdad Esfahbod +Date: Fri Oct 8 12:23:01 2010 -0400 + + Minor + + src/hb-ot-shape.cc | 18 ++++++------------ + 1 file changed, 6 insertions(+), 12 deletions(-) + +commit 5360ce0c5c33f921b3f9ad3f42529a19df5ad0fe +Author: Behdad Esfahbod +Date: Thu Oct 7 21:21:11 2010 -0400 + + Move some more code around + + src/hb-ot-shape.cc | 27 +++++++++++++-------------- + 1 file changed, 13 insertions(+), 14 deletions(-) + +commit d9c726078828d50db62e05407a3f38f2e7607533 +Author: Behdad Esfahbod +Date: Thu Oct 7 21:19:54 2010 -0400 + + Minor + + src/hb-ot-shape.cc | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit efe0d682e860ffd23a1d17c68c8273f17d51c1c9 +Author: Behdad Esfahbod +Date: Thu Oct 7 21:12:46 2010 -0400 + + Simplify compiling lookups + + src/hb-ot-shape.cc | 66 + ++++++++++++++++++++++-------------------------------- + 1 file changed, 27 insertions(+), 39 deletions(-) + +commit 476c94218b4f5b8e119e82b0e10b641e0c10bf56 +Author: Behdad Esfahbod +Date: Thu Oct 7 17:47:33 2010 -0400 + + Rename + + src/hb-ot-shape.cc | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +commit 34db6f031d7ac009f554386ef990bad44886b9ee +Author: Behdad Esfahbod +Date: Thu Oct 7 01:21:19 2010 -0400 + + Add XXX note + + src/hb-buffer.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 98aa3f65446496dc250d9b01d98cacfdf1157e06 +Author: Behdad Esfahbod +Date: Wed Oct 6 00:23:36 2010 -0400 + + Call hb_ot_shape_setup_lookups_complex() + + src/hb-ot-shape.cc | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit f1d07885dc358e79c237e824c94b3320c0a9c17d +Author: Behdad Esfahbod +Date: Wed Oct 6 00:21:37 2010 -0400 + + Rename setup_lookups() + + src/hb-ot-shape.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit affc5abac7bdae51df85856a5478d34d96fda4fe +Author: Behdad Esfahbod +Date: Wed Oct 6 00:18:16 2010 -0400 + + Move table_tag to hb_ot_shape_context_t + + src/hb-ot-shape.cc | 31 +++++++++++++++++-------------- + 1 file changed, 17 insertions(+), 14 deletions(-) + +commit 967240dd8b96802345ef273e75427066e91ea8fb +Author: Behdad Esfahbod +Date: Tue Oct 5 23:00:05 2010 -0400 + + Add internal hb_ot_shape_context_t + + src/hb-ot-shape-arabic.cc | 26 ++--- + src/hb-ot-shape.cc | 237 + +++++++++++++++++++--------------------------- + 2 files changed, 108 insertions(+), 155 deletions(-) + +commit 3eb936f1539475098f39be78654b9c39b86f0799 +Author: Behdad Esfahbod +Date: Tue Oct 5 18:36:58 2010 -0400 + + Add Arabic/Syriac/N'ko shaping logic + + Not hooked up just yet. + + src/Makefile.am | 9 + + src/gen-arabic-joining-table.py | 39 +++ + src/hb-ot-shape-arabic.cc | 716 + ++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 764 insertions(+) + +commit 0109816b50064a314389333ff64aaf22cb4b1e56 +Author: Behdad Esfahbod +Date: Tue Oct 5 18:36:45 2010 -0400 + + Update build system + + autogen.sh | 3 --- + configure.ac | 1 + + 2 files changed, 1 insertion(+), 3 deletions(-) + +commit e81d7afe6e0e9dd26025f3243a11cf0b408a8046 +Author: Behdad Esfahbod +Date: Mon Oct 4 18:18:48 2010 -0400 + + Add hb_face_get_upem() + + src/hb-font.cc | 6 ++++++ + src/hb-font.h | 3 +++ + 2 files changed, 9 insertions(+) + +commit d47f79db92fa45d51cd5f7845db8a206f5ec122b +Author: Behdad Esfahbod +Date: Mon Oct 4 18:13:30 2010 -0400 + + Add TODO item + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit bd361945a89ea31e6c4525aa030e18744ea81fb3 +Author: Behdad Esfahbod +Date: Mon Oct 4 17:22:57 2010 -0400 + + Add API comments + + src/hb-font.h | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +commit 645f6f265b5f6fb85b3c0f59ea874d58c86e3917 +Author: Behdad Esfahbod +Date: Mon Oct 4 17:01:01 2010 -0400 + + Add is_mutable() functions + + Correspond to the make_mutable() ones. + + src/hb-font.cc | 6 ++++++ + src/hb-font.h | 2 ++ + src/hb-unicode.c | 6 ++++++ + src/hb-unicode.h | 2 ++ + 4 files changed, 16 insertions(+) + +commit 19c0eab8cf96d00e168c4b11ec435019c1ed44f7 +Author: Behdad Esfahbod +Date: Mon Oct 4 16:45:21 2010 -0400 + + Add getters for all setter APIs + + One in particular is not a straight getter: hb_font_unset_funcs() is + special because of the specific needs of the lifecycle management of + the user_data object. + + src/hb-font.cc | 64 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-font.h | 40 +++++++++++++++++++++++++++++++++++ + src/hb-unicode.c | 32 ++++++++++++++++++++++++++++ + src/hb-unicode.h | 31 ++++++++++++++++++++++++++- + 4 files changed, 166 insertions(+), 1 deletion(-) + +commit f0feb084b0fd1510474b25404d1dcc5686ee0538 +Author: Behdad Esfahbod +Date: Sun Oct 3 19:09:39 2010 -0400 + + Minor + + src/hb-ot-layout-private.hh | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit ac0c1663fa6e93a5a94c88fc7497bc11ca17f0a1 +Author: Behdad Esfahbod +Date: Fri Oct 1 19:09:23 2010 -0400 + + Avoid div-by-zero, validate upem + + src/hb-ot-head-private.hh | 7 +++++++ + src/hb-ot-layout-private.hh | 6 +++--- + 2 files changed, 10 insertions(+), 3 deletions(-) + +commit 7f97d2cd904ea999c099c73c52187c5d65aeec67 +Author: Behdad Esfahbod +Date: Fri Oct 1 18:58:50 2010 -0400 + + Pedantic + + src/hb-open-type-private.hh | 12 ++++++------ + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gdef-private.hh | 10 +++++----- + src/hb-ot-layout-gpos-private.hh | 6 +++--- + 4 files changed, 15 insertions(+), 15 deletions(-) + +commit 2841436926d6a406bd1f4a35c66a0e3c2fdbeca7 +Author: Behdad Esfahbod +Date: Wed Sep 29 12:20:36 2010 -0400 + + Don't zero glyph advances in MarkToBase and similar lookups + + See email thread "Should MarkToBase attachment zero the mark advance?" + started by Jonathan Kew on 23 August 2010 for details. + + src/hb-ot-layout-gpos-private.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit 36b3862009c00ad922d68810173a69ac59723365 +Author: Behdad Esfahbod +Date: Wed Sep 29 12:10:24 2010 -0400 + + One fewer cmp() implementation... + + src/hb-ot-layout-common-private.hh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 4e573715ae5f5ed486ad66382bb44c47a86591ff +Author: Behdad Esfahbod +Date: Tue Sep 28 16:23:58 2010 -0400 + + Improve cmp function parameter namings and casts + + No semantic change. + + src/hb-open-type-private.hh | 6 +++--- + src/hb-ot-layout-common-private.hh | 6 +++--- + src/hb-ot-shape.cc | 8 ++++---- + 3 files changed, 10 insertions(+), 10 deletions(-) + +commit dca8aff24652c83c53efbb9d06e5e1c7ef1c2fa5 +Author: Behdad Esfahbod +Date: Tue Sep 28 16:25:23 2010 -0400 + + Add comment re DejaVu Sans Mono having 'dflt' script + + src/hb-ot-layout.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 9dc45401c07cb40114067cafbe286c63a9598f3b +Author: Behdad Esfahbod +Date: Tue Sep 28 16:23:28 2010 -0400 + + Fix stupid bug in bsearch cmp function! + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6fca4c18c42bdcbc67ee8855499c51c7d6311eb2 +Author: Behdad Esfahbod +Date: Thu Sep 23 10:28:51 2010 -0400 + + Add TODO iteam + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit f2a30bd605a57b99fce4b78e288c2ca62f7191ad +Author: Behdad Esfahbod +Date: Thu Sep 23 10:27:08 2010 -0400 + + Remove unimplemented method hb_font_get_funcs() + + Got to add a suitable replacement. + + src/hb-font.h | 3 --- + 1 file changed, 3 deletions(-) + +commit 7b9a38a112aa2421d97187a9b30619360edeabbe +Author: Behdad Esfahbod +Date: Wed Sep 22 17:42:59 2010 -0400 + + Add test.c using public API + + src/Makefile.am | 6 +++- + src/test.c | 94 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 99 insertions(+), 1 deletion(-) + +commit 9ea7368fce3fa373d8d2925961ad211f5cf6ce70 +Author: Behdad Esfahbod +Date: Wed Sep 22 17:38:44 2010 -0400 + + Fix hb_ot_layout leak + + src/hb-ot-layout.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 8e577acae2e605547b6a1b9b3a941cb9e3c56a4c +Author: Behdad Esfahbod +Date: Wed Sep 22 17:37:02 2010 -0400 + + Fix blob refcounting with insane SFNT table directories + + src/hb-font.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 75371bea4fbf50b8604d2698b4935c011648a6b6 +Author: Behdad Esfahbod +Date: Wed Sep 22 17:12:10 2010 -0400 + + Add TODO item + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 5bd1e95236320aed60fb29ca1e93b9595d4aeeec +Author: Behdad Esfahbod +Date: Wed Sep 22 16:46:18 2010 -0400 + + Speedup Device table delta computation for common cases + + src/hb-ot-layout-common-private.hh | 25 +++++++++++++++++++++---- + 1 file changed, 21 insertions(+), 4 deletions(-) + +commit ed4acbde9c5e3323cc95037b500d1bf2878ed3ee +Author: Behdad Esfahbod +Date: Mon Aug 16 14:36:27 2010 -0400 + + Fix NULL dereference + + Reported by Jonathan Kew. Face table handling needs to be redone + anyway, but fix this for now. + + src/hb-ot-layout.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 258305c2a5dd47bd2d83f12eaf9caa5b19ae5efb +Author: Behdad Esfahbod +Date: Fri Aug 13 14:10:02 2010 -0400 + + [GPOS] Fix div-by-zero + + Patch by Jonathan Kew. Mozilla bug #465728. + + src/hb-ot-layout-gpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2422c4b96d32037a5cdaef4c427ed1d25db5f647 +Author: Behdad Esfahbod +Date: Fri Aug 13 14:00:34 2010 -0400 + + Add TODO + + src/hb-ot-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 27f0b092a13344e8791c496c77a3c1e5de4f887c +Author: Behdad Esfahbod +Date: Fri Jul 23 17:35:54 2010 -0400 + + Logically separate feature allocation from application + + src/hb-ot-shape.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 6cf63132dc771e1bcd5627720daf4bd2ea0800a5 +Author: Behdad Esfahbod +Date: Fri Jul 23 17:32:26 2010 -0400 + + Minor + + src/hb-ot-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4e4ef24e46f273ad2bdda2f718223e05b37dd50f +Author: Behdad Esfahbod +Date: Fri Jul 23 17:22:11 2010 -0400 + + Towards separating bit allocation from shaping + + src/hb-buffer-private.hh | 9 ++++++--- + src/hb-buffer.cc | 12 ++++++------ + src/hb-ot-layout-gpos-private.hh | 2 +- + src/hb-ot-layout.cc | 2 +- + src/hb-ot-shape.cc | 41 + ++++++++++++++++------------------------ + 5 files changed, 30 insertions(+), 36 deletions(-) + +commit da6cff3864d2ef4a061a29e5918359bafcd51f4c +Author: Behdad Esfahbod +Date: Fri Jul 23 15:40:58 2010 -0400 + + Add TODO items + + TODO | 3 +++ + 1 file changed, 3 insertions(+) + +commit acdba3f90b232fc12fcb200dca2584481b339118 +Author: Behdad Esfahbod +Date: Fri Jul 23 15:11:18 2010 -0400 + + Prefer C linkage + + src/Makefile.am | 1 + + src/check-c-linkage-decls.sh | 18 ++++++++++++++++++ + src/hb-blob-private.h | 2 ++ + src/hb-blob.c | 18 ++++++++++++------ + src/hb-blob.h | 2 ++ + src/hb-buffer-private.hh | 1 + + src/hb-buffer.cc | 7 ++++++- + src/hb-buffer.h | 1 + + src/hb-common.c | 6 ++++++ + src/hb-common.h | 21 +++++++++++++-------- + src/hb-font-private.h | 1 + + src/hb-font.cc | 4 ++++ + src/hb-font.h | 1 + + src/hb-ft.c | 10 ++++++++-- + src/hb-ft.h | 2 ++ + src/hb-glib.c | 6 ++++++ + src/hb-glib.h | 2 ++ + src/hb-graphite.cc | 6 ++++++ + src/hb-graphite.h | 3 ++- + src/hb-icu.c | 6 ++++++ + src/hb-icu.h | 2 ++ + src/hb-language.c | 5 +++++ + src/hb-language.h | 2 ++ + src/hb-object-private.h | 2 ++ + src/hb-open-file-private.hh | 4 ++++ + src/hb-open-type-private.hh | 5 +++++ + src/hb-ot-head-private.hh | 5 +++++ + src/hb-ot-layout-common-private.hh | 6 ++++++ + src/hb-ot-layout-gdef-private.hh | 4 ++++ + src/hb-ot-layout-gpos-private.hh | 6 ++++++ + src/hb-ot-layout-gsub-private.hh | 7 ++++++- + src/hb-ot-layout-gsubgpos-private.hh | 13 +++++++++++++ + src/hb-ot-layout-private.hh | 3 ++- + src/hb-ot-layout.cc | 5 +++++ + src/hb-ot-layout.h | 1 + + src/hb-ot-shape.cc | 6 ++++++ + src/hb-ot-shape.h | 2 ++ + src/hb-ot-tag.c | 5 +++++ + src/hb-ot-tag.h | 2 ++ + src/hb-ot.h | 3 +++ + src/hb-private.h | 5 +++++ + src/hb-shape.cc | 5 +++++ + src/hb-shape.h | 1 + + src/hb-unicode-private.h | 1 + + src/hb-unicode.c | 6 ++++++ + src/hb-unicode.h | 1 + + src/hb.h | 3 +++ + src/main.cc | 6 ++++++ + 48 files changed, 214 insertions(+), 20 deletions(-) + +commit cc6d52279d10a2edcf0d86c3a18a79ff4f6d3858 +Author: Behdad Esfahbod +Date: Fri Jul 23 15:00:13 2010 -0400 + + De-C++ where possible + + Helps with avoiding many "extern C" declarations in source files. + + src/Makefile.am | 4 ++-- + src/check-header-guards.sh | 2 +- + src/{hb-font-private.hh => hb-font-private.h} | 6 +++--- + src/hb-font.cc | 2 +- + src/{hb-ft.cc => hb-ft.c} | 2 +- + src/hb-graphite.cc | 2 +- + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-private.hh | 2 +- + 8 files changed, 11 insertions(+), 11 deletions(-) + +commit 0dd200d28f51bf4062d8a377432c8977c80cb210 +Author: Behdad Esfahbod +Date: Fri Jul 23 14:56:29 2010 -0400 + + Header dep cleanup + + src/hb-font-private.hh | 2 -- + src/hb-ot-layout-private.hh | 1 + + 2 files changed, 1 insertion(+), 2 deletions(-) + +commit fb0d25246267851a1fc200ead28c56359a40047e +Author: Behdad Esfahbod +Date: Fri Jul 23 14:54:22 2010 -0400 + + dos2unix + + src/hb-ot-head-private.hh | 256 + +++++++++++++++++++++++----------------------- + 1 file changed, 128 insertions(+), 128 deletions(-) + +commit 81408cd51ce575891e79e6483be187130f864c28 +Author: Behdad Esfahbod +Date: Fri Jul 23 14:46:57 2010 -0400 + + Don't use "operator =" + + Some compilers don't like operator = defined on members of union + members + either. Reported by Ginn Chen for Sun Studio compilers. + + src/hb-open-type-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 39fe34d4c356516f0a92f42b13a168572829d24e +Author: Behdad Esfahbod +Date: Thu Jul 22 18:12:38 2010 -0400 + + Add TODO option + + TODO | 2 ++ + 1 file changed, 2 insertions(+) + +commit 243a96f41482edb83e4798358064bd3329dd278c +Author: Behdad Esfahbod +Date: Wed Jul 21 17:21:12 2010 -0400 + + Add arm build fix to TODO + + TODO | 1 + + 1 file changed, 1 insertion(+) + +commit c407f05f99f9225916d3d0ae06eac8fbc8b55b97 +Author: Behdad Esfahbod +Date: Wed Jul 21 17:20:44 2010 -0400 + + Remove fixed TODO item + + TODO | 1 - + 1 file changed, 1 deletion(-) + +commit 4f801bd6586defdbf70162e0c7f8968d2b476df2 +Author: Behdad Esfahbod +Date: Wed Jul 21 16:37:01 2010 -0400 + + Mozilla bug 580233 - check for zero-length record in hb sanitizer. + + Patch / report by Jonathan Kew. + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 17e9ff938b638fd1cb80c990ba13bd47562116b8 +Author: Behdad Esfahbod +Date: Thu Jul 15 11:21:34 2010 -0700 + + Fix 64bit issues with debug prints + + src/hb-blob.c | 10 +++++----- + src/hb-open-type-private.hh | 5 +++-- + 2 files changed, 8 insertions(+), 7 deletions(-) + +commit fd56ae49637b978ea3b36fab5b48f1a3cc99e90e +Author: Behdad Esfahbod +Date: Thu Jul 8 00:53:40 2010 -0400 + + Don't bother sorting, it's a safe font error if the array is not + sorted + + src/hb-open-type-private.hh | 29 ----------------------------- + src/hb-ot-layout-common-private.hh | 7 ------- + 2 files changed, 36 deletions(-) + +commit cc8a4abea68f2dba26feb5785f9e518e6853c744 +Author: Behdad Esfahbod +Date: Thu Jul 8 00:40:04 2010 -0400 + + Use bsearch where applicable + + src/hb-open-type-private.hh | 49 +++++++++++++ + src/hb-ot-layout-common-private.hh | 145 + +++++++++++++------------------------ + 2 files changed, 100 insertions(+), 94 deletions(-) + +commit 2f418f5709b2b8b3ef2f6056b9d8c13b66f0b74a +Author: Behdad Esfahbod +Date: Wed Jul 7 22:07:40 2010 -0400 + + Remove useless TODO + + src/hb-open-file-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit da8edbb62204dc39f93d500ef85929e234e0bd19 +Author: Behdad Esfahbod +Date: Wed Jun 9 07:15:39 2010 -0400 + + Fix header + + src/hb-buffer-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit d05d13df02fbe76814694fe49cc01bbb41c3d0e7 +Author: Behdad Esfahbod +Date: Wed Jun 9 07:15:03 2010 -0400 + + Add a test for header preprocessor guards + + src/Makefile.am | 4 +++- + src/check-header-guards.sh | 20 ++++++++++++++++++++ + src/check-libstdc++.sh | 1 - + 3 files changed, 23 insertions(+), 2 deletions(-) + +commit 0f0cd9d361f1bb614aa3fd4616160d027062370e +Author: Behdad Esfahbod +Date: Wed Jun 9 06:32:56 2010 -0400 + + Fix header tags + + src/hb-font-private.hh | 6 +++--- + src/hb-object-private.h | 6 +++--- + src/hb-open-type-private.hh | 4 ++-- + src/hb-ot-layout-private.hh | 6 +++--- + src/hb-ot-shape.h | 2 +- + 5 files changed, 12 insertions(+), 12 deletions(-) + +commit f2a1b411b1d48c3dfac0df8e78c848d9aa3bb047 +Author: Behdad Esfahbod +Date: Thu Jun 3 11:37:51 2010 -0400 + + Followup fix for variation-selectors + + Patch from Jonathan Kew + + src/hb-ot-shape.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit a224b4d502d026fa642ee4098bf7bc0b4ba7ce27 +Author: Behdad Esfahbod +Date: Wed Jun 2 22:24:54 2010 -0400 + + Fix skipping variation-selectors + + src/hb-ot-shape.cc | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit 81a77b115db401f69e869690f24b9047370bdfde +Author: Behdad Esfahbod +Date: Tue Jun 1 23:03:54 2010 -0400 + + Make feature sorting stable + + src/hb-ot-shape.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit fdc322a82047c4bda9fa3dab4338a0eac1c1bde7 +Author: Behdad Esfahbod +Date: Fri May 28 20:55:52 2010 -0400 + + Minor + + src/hb-ot-shape.cc | 38 +++++++++++++++++++++----------------- + 1 file changed, 21 insertions(+), 17 deletions(-) + +commit f062ec6bb24b1c21d37b12adc7e944a5fe53526a +Author: Behdad Esfahbod +Date: Fri May 28 20:54:43 2010 -0400 + + Further simplify mask allocator + + src/hb-ot-shape.cc | 23 +++++++---------------- + 1 file changed, 7 insertions(+), 16 deletions(-) + +commit 8af45fda475d075c5a285002463a00a0423d3926 +Author: Behdad Esfahbod +Date: Fri May 28 20:41:20 2010 -0400 + + Fix global feature handling + + src/hb-ot-shape.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit e04685ee7be01695ec437fab50f919f1b7423c57 +Author: Behdad Esfahbod +Date: Fri May 28 20:37:06 2010 -0400 + + Simplify mask allocation + + src/hb-ot-shape.cc | 48 ++++++++++++++++++++---------------------------- + 1 file changed, 20 insertions(+), 28 deletions(-) + +commit 0e235d0fc9bdeeaffa7215c21abc5d40767a10c7 +Author: Behdad Esfahbod +Date: Fri May 28 20:21:47 2010 -0400 + + Towards a mask allocator + + src/hb-ot-shape.cc | 291 + ++++++++++++++++++++++++++++++++++------------------- + 1 file changed, 186 insertions(+), 105 deletions(-) + +commit 81c5e8724b740c6e42ed3a45e0574c7c5f3ad8e6 +Author: Behdad Esfahbod +Date: Fri May 28 18:31:16 2010 -0400 + + Allow disabling default features + + Patch from Jonathan Kew + + src/hb-buffer-private.hh | 18 +++-- + src/hb-buffer.cc | 15 ++-- + src/hb-ot-shape.cc | 196 + ++++++++++++++++++++++++++++++++--------------- + 3 files changed, 153 insertions(+), 76 deletions(-) + +commit 2163afbf35044f59dbf449254e65b8c9feb6cdeb +Author: Behdad Esfahbod +Date: Thu May 27 14:04:15 2010 -0400 + + Add note about UTF-8 decoder + + src/hb-buffer.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 226faa58f4e23eb655bebb0eff7206a3024c8d55 +Author: Behdad Esfahbod +Date: Thu May 27 11:42:34 2010 -0400 + + Fix loop + + src/hb-ot-tag.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 56bef5680cc76a67d16ca14ac69f0dda1a691968 +Author: Martin Hosken +Date: Thu May 27 10:09:04 2010 +0100 + + Fixes to Python and Graphite from Martin + + contrib/python/README | 10 ++++ + contrib/python/lib/fontconfig.pyx | 47 +++++++++++++++++ + contrib/python/lib/harfbuzz.pyx | 104 + ++------------------------------------ + contrib/python/scripts/hbtestfont | 103 + +++++++++++++++++++++++++++++++++---- + contrib/python/setup.py | 3 +- + src/hb-graphite.cc | 8 +-- + 6 files changed, 159 insertions(+), 116 deletions(-) + +commit b485da0b719cb03cc33da57802c5151301664c2f +Author: Behdad Esfahbod +Date: Thu May 27 11:39:19 2010 -0400 + + Disable Graphite as it crashes all over the place... + + src/hb-shape.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 93ac709b1f6b015371c29bf244a9ece62baedff0 +Author: Behdad Esfahbod +Date: Wed May 26 16:22:00 2010 -0400 + + Cypriot is RTL + + src/hb-unicode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 15c7379c16dbb9ee8ed1c0333ca7492532ce8423 +Author: Behdad Esfahbod +Date: Wed May 26 10:48:10 2010 -0400 + + Revert "Merge remote branch 'martin/master'" + + This reverts commit 80af2812fb3b231ddcb4608ec13c6038a681c818, + reversing + changes made to c442672ec2fb83ed41f3994b3aa4f92a097664ab. + + contrib/python/README | 10 ---- + contrib/python/lib/fontconfig.pyx | 47 ----------------- + contrib/python/lib/harfbuzz.pyx | 104 + ++++++++++++++++++++++++++++++++++++-- + contrib/python/scripts/hbtestfont | 98 + ++++------------------------------- + contrib/python/setup.py | 3 +- + src/Makefile.am | 2 +- + src/hb-graphite.cc | 8 +-- + src/hb-ot-shape.cc | 2 +- + src/hb-ot-tag.c | 1 - + src/hb-ot.h | 2 +- + src/hb-shape.cc | 2 +- + 11 files changed, 119 insertions(+), 160 deletions(-) + +commit 80af2812fb3b231ddcb4608ec13c6038a681c818 +Merge: c442672e 3109a86a +Author: Behdad Esfahbod +Date: Mon May 24 18:14:24 2010 +0100 + + Merge remote branch 'martin/master' + +commit c442672ec2fb83ed41f3994b3aa4f92a097664ab +Author: Behdad Esfahbod +Date: Mon May 24 18:02:32 2010 +0100 + + Fix struct initializers + + src/hb-ft.cc | 12 ++++++------ + src/hb-glib.c | 14 +++++++------- + src/hb-icu.c | 14 +++++++------- + 3 files changed, 20 insertions(+), 20 deletions(-) + +commit f5ac9de259773a5f86809892e58166a485d70a3d +Author: Behdad Esfahbod +Date: Mon May 24 18:01:09 2010 +0100 + + Minor + + src/hb-object-private.h | 24 +++++++++++++----------- + 1 file changed, 13 insertions(+), 11 deletions(-) + +commit f97bf4f81257c97a46dff51be31b2ec214d6c270 +Author: Behdad Esfahbod +Date: Mon May 24 17:50:19 2010 +0100 + + Make sure we initialize all callbacks upon creation + + Also fixes issue with unicode callbacks never being set really. + + src/hb-font.cc | 18 +++++++----------- + src/hb-unicode.c | 9 ++------- + 2 files changed, 9 insertions(+), 18 deletions(-) + +commit bf36a1074ab23abeab0a7a6c47db26770dc1ab0a +Author: Behdad Esfahbod +Date: Mon May 24 17:46:21 2010 +0100 + + Move all callback functions in a vtable structs + + src/hb-font-private.hh | 10 ++++++---- + src/hb-font.cc | 28 +++++++++++++++------------- + src/hb-ot-shape.cc | 4 ++-- + src/hb-unicode-private.h | 12 +++++++----- + src/hb-unicode.c | 32 +++++++++++++++++--------------- + 5 files changed, 47 insertions(+), 39 deletions(-) + +commit 3109a86add936ae4cc77541fc026c4fe2db4e328 +Author: Martin Hosken +Date: Mon May 24 13:25:37 2010 +0100 + + hb-graphite now no longer has -ve advances within clusters. Fix + infinite loop in tag_to_script(). python fixed to use tag_to_script + and allow hbtestfont to be passed font files, where fontconfig knows + about them. + + contrib/python/lib/harfbuzz.pyx | 4 ++-- + contrib/python/scripts/hbtestfont | 6 +++++- + src/hb-graphite.cc | 4 ++-- + src/hb-ot-tag.c | 1 + + 4 files changed, 10 insertions(+), 5 deletions(-) + +commit e5bed0a37fe1b0576d08435179e455cb28eadcdb +Author: Martin Hosken +Date: Sat May 22 20:19:00 2010 +0100 + + Tidy up hbtestfont and add README + + contrib/python/README | 10 +++ + contrib/python/scripts/hbtestfont | 134 + +++++++++++++++++++------------------- + 2 files changed, 77 insertions(+), 67 deletions(-) + +commit 70ae332fe66510500d303b6fcc79537833b42f05 +Author: Martin Hosken +Date: Sat May 22 19:58:00 2010 +0100 + + Add fontconfig to hbtestfont + + contrib/python/lib/fontconfig.pyx | 47 ++++++++++++++++++++++++++++ + contrib/python/scripts/hbtestfont | 64 + ++++++++++++++++++++++++--------------- + contrib/python/setup.py | 3 +- + 3 files changed, 88 insertions(+), 26 deletions(-) + +commit 72631c9d06b131d82080f212908e7d0b0266b841 +Merge: 1432ab15 1094a294 +Author: Martin Hosken +Date: Sat May 22 09:38:02 2010 +0100 + + Merge branch 'master' of git://git.freedesktop.org/~behdad/harfbuzz-ng + +commit 1432ab15c163eb0b5be3de66a4cb3df15ad73500 +Author: Martin Hosken +Date: Sat May 22 00:56:40 2010 +0100 + + Add graphical output to hbtestfont + + contrib/python/lib/harfbuzz.pyx | 100 + +------------------------------------- + contrib/python/scripts/hbtestfont | 62 ++++++++++++++++++++++- + src/Makefile.am | 2 +- + src/hb-ot-shape.cc | 2 +- + src/hb-ot.h | 2 +- + src/hb-shape.cc | 2 +- + 6 files changed, 67 insertions(+), 103 deletions(-) + +commit bbc7a99d01298f9be1ebaaceacbc9bc961e247e5 +Author: Behdad Esfahbod +Date: Fri May 21 18:24:34 2010 +0100 + + Move mirroring around a bit + + src/hb-ot-shape.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit bd0987386b3a4dddf208ccf1a70ebfff6242ba73 +Author: Behdad Esfahbod +Date: Fri May 21 18:06:35 2010 +0100 + + Add a few more standard features + + src/hb-ot-shape.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 75f3469ca6d626b08eb411984a2ba7fd48ca5b5f +Author: Behdad Esfahbod +Date: Fri May 21 17:59:04 2010 +0100 + + Add note + + src/hb-ot-shape.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 1094a294f6a44c47fc75867983f2b135a6442bab +Author: Behdad Esfahbod +Date: Fri May 21 17:58:20 2010 +0100 + + Add rtlm + + src/hb-ot-shape.cc | 26 +++++++++++++++++++++----- + 1 file changed, 21 insertions(+), 5 deletions(-) + +commit 074ea787493a37ae8f68d17be7820f13fff57520 +Author: Behdad Esfahbod +Date: Fri May 21 17:53:10 2010 +0100 + + Add ltra, ltrm, and rtla features + + src/hb-ot-shape.cc | 60 + +++++++++++++++++++++++++++++++++++++++++++----------- + 1 file changed, 48 insertions(+), 12 deletions(-) + +commit 1ce7b87c4d8d1ab3ec1d5198351d71b7199f7c64 +Author: Behdad Esfahbod +Date: Fri May 21 17:31:45 2010 +0100 + + Cleanup bitmask allocation + + src/hb-buffer-private.hh | 16 +++++++++++++ + src/hb-buffer.cc | 36 +++++++++++++++++++++++++++++ + src/hb-ot-shape.cc | 60 + +++++++++++++++++++++--------------------------- + 3 files changed, 78 insertions(+), 34 deletions(-) + +commit dd22a8f7bfd424a69286e90f79d2a23af6e89ec1 +Author: Behdad Esfahbod +Date: Fri May 21 16:43:17 2010 +0100 + + Add note + + src/hb-ot-layout-gsub-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit cbd1d6a63a5d696b7d6a5aba9ee7305ea228416a +Author: Martin Hosken +Date: Fri May 21 15:16:43 2010 +0100 + + Rename Grxxx to HbGrxxx + + src/hb-graphite.cc | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +commit 0375bdd2027767ee7bebef1ed289b33dc64f430e +Author: Martin Hosken +Date: Fri May 21 15:01:37 2010 +0100 + + Rename classes from Grxxx to HbGrxxx + + src/hb-graphite.cc | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +commit a5a72e004bb7123445c2c3a94352d358fc80d904 +Author: Behdad Esfahbod +Date: Fri May 21 15:12:52 2010 +0100 + + Add hb-ot-shape.h, oops. + + src/hb-ot-shape.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 44 insertions(+) + +commit aa62a402a72bdecad2a955dbfaf6e24cd2c00e55 +Author: Behdad Esfahbod +Date: Fri May 21 14:42:11 2010 +0100 + + Fix Makefile to install hb-ot-shape.h + + src/Makefile.am | 2 +- + src/hb-ot.h | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 9722b8f005a10fd16e841df4da3ccd80be66e296 +Author: Behdad Esfahbod +Date: Fri May 21 14:37:47 2010 +0100 + + Simple renames + + src/hb-ot-shape.cc | 36 ++++++++++++++++++------------------ + 1 file changed, 18 insertions(+), 18 deletions(-) + +commit 02f28550d785671cf92fd4239c5f913f7e71585f +Author: Behdad Esfahbod +Date: Fri May 21 14:37:28 2010 +0100 + + Graphite also forces us to link to libstdc++ currently + + src/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +commit ca663bb23c16f6a1f04efa6e10dad0e3e7c260a3 +Author: Behdad Esfahbod +Date: Fri May 21 14:34:23 2010 +0100 + + Move main shaper code into hb_ot_shape() + + src/hb-ot-shape-private.hh | 53 ----------- + src/hb-ot-shape.cc | 225 + ++++++++++++++++++++++++++++++++++++++++++--- + src/hb-shape.cc | 209 + +---------------------------------------- + 3 files changed, 214 insertions(+), 273 deletions(-) + +commit 7acd232d36c2b2ed03823e6aa6bb2b814bf673b3 +Author: Behdad Esfahbod +Date: Fri May 21 14:20:48 2010 +0100 + + Fix test failing + + src/hb-graphite.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dd47924d88d86b83e7f3ab040de6e7136ac0ca09 +Author: Behdad Esfahbod +Date: Fri May 21 14:18:08 2010 +0100 + + Fix warnings + + src/hb-graphite.cc | 14 +++++--------- + 1 file changed, 5 insertions(+), 9 deletions(-) + +commit 305ba8671553cd955c20a54db622666c0bb02532 +Author: Behdad Esfahbod +Date: Fri May 21 14:02:20 2010 +0100 + + Import Graphite shaping backend by Martin Hosken + + configure.ac | 6 ++ + src/Makefile.am | 11 ++ + src/hb-graphite.cc | 308 + +++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-graphite.h | 46 ++++++++ + src/hb-shape.cc | 15 +++ + 5 files changed, 386 insertions(+) + +commit 3ba6818ba9be950e46902f0239f2451ec0e65d44 +Author: Behdad Esfahbod +Date: Fri May 21 13:51:29 2010 +0100 + + Update the Python module + + contrib/python/lib/harfbuzz.pyx | 40 + +++++++++++++++++++++------------------- + 1 file changed, 21 insertions(+), 19 deletions(-) + +commit 83f34677bcbc6bb194940407b0fcb23575650e3d +Author: Behdad Esfahbod +Date: Fri May 21 13:43:49 2010 +0100 + + Add hb_tag_from_string() + + src/Makefile.am | 1 + + src/hb-common.c | 41 +++++++++++++++++++++++++++++++++++++++++ + src/hb-common.h | 3 +++ + 3 files changed, 45 insertions(+) + +commit 4a9a5c0b06e8aa5d15327242609a7c766d3e0e94 +Author: Behdad Esfahbod +Date: Fri May 21 13:33:46 2010 +0100 + + Don't allocate bits for features not available + + src/hb-ot-shape.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit e53d77142ac4ecbe38ab3235491fa93cb7ff16ab +Author: Behdad Esfahbod +Date: Fri May 21 13:32:38 2010 +0100 + + Speed up feature mask setting + + Patch from Jonathan Kew. + + src/hb-ot-shape.cc | 31 +++++++++++++++++++++++++------ + 1 file changed, 25 insertions(+), 6 deletions(-) + +commit 4fa67f34ecc65056ce60a572213fbdae66e0423b +Author: Behdad Esfahbod +Date: Fri May 21 13:29:12 2010 +0100 + + Add Unicode 5.2 scripts + + src/hb-icu.c | 29 ++++++++++++++++++++++++++++- + src/hb-ot-tag.c | 21 +++++++++++++++++++-- + src/hb-unicode.c | 19 ++++++++++++++++++- + src/hb-unicode.h | 19 ++++++++++++++++++- + 4 files changed, 83 insertions(+), 5 deletions(-) + +commit ee1b322100a6bd575b999904592abbd9fed5587f +Author: Behdad Esfahbod +Date: Fri May 21 12:55:57 2010 +0100 + + Fix feature mask setting + + src/hb-ot-shape.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit b490fa343322f1b5abaf880abc073287c1f34132 +Author: Behdad Esfahbod +Date: Fri May 21 11:15:07 2010 +0100 + + Add hb_ot_tag_to_script() + + src/hb-ot-tag.c | 14 ++++++++++++++ + src/hb-ot-tag.h | 3 +++ + 2 files changed, 17 insertions(+) + +commit 50355309047765558ef8f5d60aefed42a7f954cc +Author: Behdad Esfahbod +Date: Fri May 21 10:33:23 2010 +0100 + + Add Python wrapper from Martin Hosken + + contrib/python/lib/harfbuzz.pyx | 306 + ++++++++++++++++++++++++++++++++++++++ + contrib/python/runpy | 2 + + contrib/python/scripts/hbtestfont | 35 +++++ + contrib/python/setup.py | 24 +++ + 4 files changed, 367 insertions(+) + +commit 280af1bddb958ff97cf7ce12fe7ec2b6352e61d0 +Author: Behdad Esfahbod +Date: Thu May 20 18:33:35 2010 +0100 + + Let hb_face_get_table() return NULL if table not found + + src/hb-font.cc | 2 +- + src/hb-font.h | 1 + + src/hb-open-type-private.hh | 3 +++ + 3 files changed, 5 insertions(+), 1 deletion(-) + +commit 1cdbfd944eecb58587461f57f037e47a44f39990 +Author: Behdad Esfahbod +Date: Thu May 20 17:47:28 2010 +0100 + + Fix alternate, again + + src/hb-ot-layout-gsub-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit fdca3d51603bd6bef6a4b0ee4a560f7dcd2f1d37 +Author: Behdad Esfahbod +Date: Thu May 20 17:46:20 2010 +0100 + + Fix alternate off-by-one + + src/hb-ot-layout-gsub-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b634beb39e0a4fef7167a8af646f6b2d8cafe69b +Author: Behdad Esfahbod +Date: Thu May 20 17:44:52 2010 +0100 + + Fix delta scale, again... + + src/hb-ot-layout-common-private.hh | 8 ++++++++ + src/hb-ot-layout-gdef-private.hh | 3 +-- + src/hb-ot-layout-gpos-private.hh | 12 ++++++------ + src/hb-ot-layout-private.hh | 2 +- + 4 files changed, 16 insertions(+), 9 deletions(-) + +commit 40335d4533ac2b08121c9dc6003f3ebc5b44a67b +Author: Behdad Esfahbod +Date: Thu May 20 17:35:14 2010 +0100 + + Remove unused operator + + src/hb-ot-layout-common-private.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit f7acd8df5146155b51d6f50aeb04f54f3030c1c3 +Author: Behdad Esfahbod +Date: Thu May 20 17:26:35 2010 +0100 + + Do alternate glyph selection! + + Kinda hand-wavy right now. Not tested. + + src/hb-ot-layout-gpos-private.hh | 12 +++++++----- + src/hb-ot-layout-gsub-private.hh | 20 +++++++++----------- + src/hb-ot-layout-gsubgpos-private.hh | 1 + + src/hb-private.h | 19 ++++++++++++++++++- + 4 files changed, 35 insertions(+), 17 deletions(-) + +commit 750a2294553d252e28875b605fe61fd9d6696e0f +Author: Behdad Esfahbod +Date: Thu May 20 16:23:27 2010 +0100 + + get_table() is allowed to return NULL. Use that to simplify code + + src/hb-font.cc | 2 +- + src/hb-ft.cc | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 99d9ef785f108df76f80a307eaa2784685ea86ba +Author: Behdad Esfahbod +Date: Thu May 20 15:47:49 2010 +0100 + + Write hb_face_create_for_data() in terms of + hb_face_create_for_tables() + + Fixes lack of head_table initialization in create_for_tables() also. + + src/hb-font.cc | 35 ++++++++++++----------------------- + 1 file changed, 12 insertions(+), 23 deletions(-) + +commit 6774463883978b00b4d8c719ed75edfc4537c77f +Author: Behdad Esfahbod +Date: Thu May 20 15:40:12 2010 +0100 + + Apply user features to ranges! + + src/hb-ot-shape.cc | 23 ++++++++++++++++++++++- + 1 file changed, 22 insertions(+), 1 deletion(-) + +commit 9b6023338530a2dbb8214eb4391ef3e8372f3892 +Author: Behdad Esfahbod +Date: Thu May 20 15:31:12 2010 +0100 + + Add _hb_bit_storage() + + src/hb-private.h | 35 ++++++++++++++++++++++------------- + 1 file changed, 22 insertions(+), 13 deletions(-) + +commit 6b1b957f6d2955cbe4fa97e2659e033b3eaaf4d2 +Author: Behdad Esfahbod +Date: Thu May 20 15:14:44 2010 +0100 + + Add lookup_map + + src/hb-ot-shape.cc | 48 +++++++++++++++++++++++++++++++++--------------- + 1 file changed, 33 insertions(+), 15 deletions(-) + +commit 60010a0c4d8efae5c61a0c9cf10cfe2c1860f41e +Author: Behdad Esfahbod +Date: Thu May 20 14:05:02 2010 +0100 + + Update always-apply mask from 0xFFFF to 1 + + We plan to use the first bit to be always on. + + src/hb-ot-shape.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 009aad567863c05ee2ec4a3ee76fe0ee79c767bb +Author: Behdad Esfahbod +Date: Thu May 20 14:00:57 2010 +0100 + + Invert the mask logic + + Before, the mask in the buffer was inverted. That is, a 0 bit meant + feature should be applied and 1 meant not applied, whereas in the + lookups, the logic was positive. + + Now both are in sync. When calling hb_buffer_add_glyph() manually, + the mask should be 1 instead of 0. + + src/hb-buffer.cc | 2 +- + src/hb-ot-layout-gpos-private.hh | 2 +- + src/hb-ot-layout-gsub-private.hh | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit 7f411dbfd9f8d5360c948531ff9f6c3998d1d897 +Author: Behdad Esfahbod +Date: Thu May 20 13:40:18 2010 +0100 + + Apply user features + + No ranges yet + + src/hb-ot-shape.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 0db299ccad346d9ea5573ea8408b78d9997bd379 +Author: Behdad Esfahbod +Date: Thu May 20 13:30:09 2010 +0100 + + Change hb_feature_t to keep tag/int instead of string + + src/hb-shape.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0a4399ca228d244e646abdb3487da0f13b228889 +Author: Behdad Esfahbod +Date: Wed May 19 15:45:06 2010 -0400 + + Fix scale issues + + hb_font_set_scale() now sets the value to be used to represent a unit + pixel. For example, if rendering a 10px font with a 26.6 + representation, + you would set scale to (10 << 6). For 10px in 16.16 you would set + it to + (10 << 16). This space should be the same space that the + get_glyph_metrics + and get_kerning callbacks work in. + + src/hb-common.h | 1 - + src/hb-font-private.hh | 8 +++----- + src/hb-font.cc | 12 ++++++------ + src/hb-font.h | 12 +++--------- + src/hb-ft.cc | 4 ++-- + src/hb-ot-layout-gdef-private.hh | 6 +++--- + src/hb-ot-layout-gpos-private.hh | 37 + +++++++++++++++++-------------------- + src/hb-ot-layout-gsub-private.hh | 2 +- + src/hb-ot-layout-private.hh | 20 +++++++++++--------- + src/hb-ot-layout.cc | 31 +++++++++++++++---------------- + src/hb-private.h | 4 ---- + 11 files changed, 61 insertions(+), 76 deletions(-) + +commit cf5585cfa6cac6fdf627a99941299e76af5ae0f7 +Author: Behdad Esfahbod +Date: Wed May 19 12:03:35 2010 -0400 + + Add 'head' table + + src/Makefile.am | 1 + + src/hb-font-private.hh | 5 ++ + src/hb-font.cc | 9 ++++ + src/hb-open-type-private.hh | 2 +- + src/hb-ot-head-private.hh | 128 + ++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 144 insertions(+), 1 deletion(-) + +commit e29caf3f943b2b6f4997f469f7274252c82f465e +Author: Behdad Esfahbod +Date: Wed May 19 11:47:17 2010 -0400 + + Add LONGDATETIME + + src/hb-open-type-private.hh | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +commit f415755fdf011d3fa3b9aad04c38f2255dd7acf8 +Author: Behdad Esfahbod +Date: Mon May 17 15:14:14 2010 -0400 + + Minor + + src/hb-ot-layout.cc | 52 + +++++++++++++++++++++++++++------------------------- + 1 file changed, 27 insertions(+), 25 deletions(-) + +commit 73af7756dc6d3961f176854246e5722baff101fb +Author: Behdad Esfahbod +Date: Fri May 14 23:38:08 2010 -0400 + + Indent + + src/hb-ot-layout-gsub-private.hh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 3567b87cce541dfb0af7caf024ec67c9d3c09214 +Author: Behdad Esfahbod +Date: Fri May 14 23:28:44 2010 -0400 + + Add an inline version of hb_buffer_ensure() + + src/hb-buffer.cc | 117 + ++++++++++++++++++++++++++++++------------------------- + 1 file changed, 63 insertions(+), 54 deletions(-) + +commit a6a79df5fe2ed2cd307e7a991346faee164e70d9 +Author: Behdad Esfahbod +Date: Fri May 14 23:20:16 2010 -0400 + + Handle malloc failture in the buffer + + src/hb-buffer-private.hh | 5 ++-- + src/hb-buffer.cc | 71 + +++++++++++++++++++++++++++++------------------- + src/hb-buffer.h | 2 +- + 3 files changed, 47 insertions(+), 31 deletions(-) + +commit ca54a12658510f9aa0b2db82f20a8fac230d6bb6 +Author: Behdad Esfahbod +Date: Fri May 14 22:25:42 2010 -0400 + + Minor + + src/hb-shape.cc | 60 + +++++++++++++++++++++++++-------------------------------- + 1 file changed, 26 insertions(+), 34 deletions(-) + +commit 910a33fe8457a8e13f7eb77fc92fa59c31f5e8fd +Author: Behdad Esfahbod +Date: Fri May 14 22:13:38 2010 -0400 + + Update buffer docs + + src/hb-buffer-private.hh | 13 +++++++------ + src/hb-buffer.cc | 16 ++++++++-------- + 2 files changed, 15 insertions(+), 14 deletions(-) + +commit 36b73c80df91e96492357c6da945e081e9046a93 +Author: Behdad Esfahbod +Date: Fri May 14 22:10:39 2010 -0400 + + Shortening buffer accessors: rename buffer->in_pos to buffer->i + + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 52 ++++++++++---------- + src/hb-ot-layout-gpos-private.hh | 94 + ++++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.hh | 48 +++++++++--------- + src/hb-ot-layout-gsubgpos-private.hh | 46 +++++++++--------- + src/hb-shape.cc | 40 +++++++-------- + 6 files changed, 141 insertions(+), 141 deletions(-) + +commit 29427c5c51ac70aca53ed523fa5ddb3de4355fb0 +Author: Behdad Esfahbod +Date: Fri May 14 22:08:22 2010 -0400 + + Shortening buffer accessors: rename buffer->out_length to + buffer->out_len + + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 52 + ++++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 6 ++--- + 4 files changed, 31 insertions(+), 31 deletions(-) + +commit 6960350be97f24e97140391025b56369c393a3df +Author: Behdad Esfahbod +Date: Fri May 14 22:07:46 2010 -0400 + + Shortening buffer accessors: rename buffer->in_length to buffer->len + + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 26 +++++++++++++------------- + src/hb-ot-layout-gpos-private.hh | 8 ++++---- + src/hb-ot-layout-gsub-private.hh | 8 ++++---- + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- + src/hb-shape.cc | 12 ++++++------ + 6 files changed, 32 insertions(+), 32 deletions(-) + +commit 1b621823f3e31b48c80cc8b0691dfa873ba086cd +Author: Behdad Esfahbod +Date: Fri May 14 22:05:53 2010 -0400 + + Shortening buffer accessors: rename buffer->positions to buffer->pos + + src/hb-buffer-private.hh | 4 ++-- + src/hb-buffer.cc | 32 ++++++++++++++++---------------- + src/hb-ot-layout-gpos-private.hh | 26 +++++++++++++------------- + src/hb-shape.cc | 10 +++++----- + 4 files changed, 36 insertions(+), 36 deletions(-) + +commit 9d5e26df0877aa5b187764ba09bd7bf221e92968 +Author: Behdad Esfahbod +Date: Fri May 14 22:03:11 2010 -0400 + + Shortening buffer accessors: rename buffer->out_string to + buffer->out_info + + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 56 + ++++++++++++++++++------------------ + src/hb-ot-layout-gsubgpos-private.hh | 4 +-- + 3 files changed, 31 insertions(+), 31 deletions(-) + +commit 7e7007a1c9bf2c07a8369752126ece8fa6164248 +Author: Behdad Esfahbod +Date: Fri May 14 22:02:37 2010 -0400 + + Shortening buffer accessors: rename buffer->in_string to buffer->info + + src/hb-buffer-private.hh | 2 +- + src/hb-buffer.cc | 82 + ++++++++++++++++++------------------ + src/hb-ot-layout-gpos-private.hh | 58 ++++++++++++------------- + src/hb-ot-layout-gsub-private.hh | 30 ++++++------- + src/hb-ot-layout-gsubgpos-private.hh | 26 ++++++------ + src/hb-shape.cc | 18 ++++---- + 6 files changed, 108 insertions(+), 108 deletions(-) + +commit 8e6b6bb2932946ebc7b01c3abf575b654c741e20 +Author: Behdad Esfahbod +Date: Fri May 14 21:58:22 2010 -0400 + + Merge buffer->out_pos and buffer->out_length + + src/hb-buffer-private.hh | 1 - + src/hb-buffer.cc | 48 + +++++++++++++++--------------------- + src/hb-ot-layout-gsub-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 6 ++--- + 4 files changed, 24 insertions(+), 33 deletions(-) + +commit 22f668eb9ad5f62d9fcd2e0c826ea78977687e5c +Author: Behdad Esfahbod +Date: Fri May 14 21:41:04 2010 -0400 + + Remove the unused BUFFER macro + + src/hb-buffer-private.hh | 6 ------ + src/hb-ot-layout-gpos-private.hh | 6 ------ + src/hb-ot-layout-gsub-private.hh | 6 ------ + src/hb-ot-layout-gsubgpos-private.hh | 5 ----- + 4 files changed, 23 deletions(-) + +commit 7e53ebe478597778c25c197ff9f0cb379f1d0043 +Author: Behdad Esfahbod +Date: Fri May 14 21:38:13 2010 -0400 + + Remove the IN_CURGLYPH() macro + + src/hb-buffer-private.hh | 3 --- + src/hb-ot-layout-gpos-private.hh | 24 ++++++++++++------------ + src/hb-ot-layout-gsub-private.hh | 16 ++++++++-------- + src/hb-ot-layout-gsubgpos-private.hh | 16 ++++++++-------- + src/hb-shape.cc | 14 +++++++------- + 5 files changed, 35 insertions(+), 38 deletions(-) + +commit d784da1923ff2ca093f8b0210449731d376b7513 +Author: Behdad Esfahbod +Date: Fri May 14 21:37:18 2010 -0400 + + Remove the IN_CURINFO() macro + + src/hb-buffer-private.hh | 1 - + src/hb-ot-layout-gpos-private.hh | 2 +- + src/hb-ot-layout-gsub-private.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 4 files changed, 4 insertions(+), 5 deletions(-) + +commit 281f59b4fb16f7c73767eb042a91f70f4c109b3a +Author: Behdad Esfahbod +Date: Fri May 14 21:34:22 2010 -0400 + + Remove IN_INFO() and IN_NEXTGLYPH() macros + + src/hb-buffer-private.hh | 2 -- + src/hb-ot-layout-gpos-private.hh | 10 +++++----- + src/hb-ot-layout-gsub-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + src/hb-shape.cc | 4 ++-- + 5 files changed, 10 insertions(+), 12 deletions(-) + +commit 6e489cdf7623ac627d06d59a80ecea03ca97dc1b +Author: Behdad Esfahbod +Date: Fri May 14 21:07:35 2010 -0400 + + Remove the IN_GLYPH() macro + + src/hb-buffer-private.hh | 1 - + src/hb-ot-layout-gpos-private.hh | 12 ++++++------ + src/hb-ot-layout-gsub-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + src/hb-shape.cc | 2 +- + 5 files changed, 10 insertions(+), 11 deletions(-) + +commit 01feb74c78a3a302fa3472a0be7b2a1d52fd1ba3 +Author: Behdad Esfahbod +Date: Fri May 14 21:00:08 2010 -0400 + + Remove the IN_CLUSTER() macro + + src/hb-buffer-private.hh | 1 - + src/hb-shape.cc | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +commit d63a1e089acad9ab9f80addd936d36b6d38fb46a +Author: Behdad Esfahbod +Date: Fri May 14 20:30:07 2010 -0400 + + Remove the IN_MASK() macro + + src/hb-buffer-private.hh | 1 - + src/hb-ot-layout-gpos-private.hh | 2 +- + src/hb-ot-layout-gsub-private.hh | 4 ++-- + 3 files changed, 3 insertions(+), 4 deletions(-) + +commit 89e2834dabd2d17f2823c51fe3a7fcadeaba7a59 +Author: Behdad Esfahbod +Date: Fri May 14 20:25:55 2010 -0400 + + Remove the IN_LIGID() macro + + src/hb-buffer-private.hh | 1 - + src/hb-ot-layout-gpos-private.hh | 4 ++-- + src/hb-ot-layout-gsub-private.hh | 2 +- + 3 files changed, 3 insertions(+), 4 deletions(-) + +commit 4a871041f4718834afa312ed17cdd157603468b7 +Author: Behdad Esfahbod +Date: Fri May 14 20:25:04 2010 -0400 + + Remove IN_COMPONENT() macro + + src/hb-buffer-private.hh | 1 - + src/hb-ot-layout-gpos-private.hh | 8 ++++---- + src/hb-ot-layout-gsub-private.hh | 2 +- + 3 files changed, 5 insertions(+), 6 deletions(-) + +commit 27da6dd89a359f7ef340c646c4cb79373782261d +Author: Behdad Esfahbod +Date: Fri May 14 20:17:50 2010 -0400 + + Remove OUT_GLYPH() and OUT_INFO() macros + + src/hb-buffer-private.hh | 2 -- + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + 2 files changed, 2 insertions(+), 4 deletions(-) + +commit cc6ae7ff91eeb93bef153f331ed02b500062f90e +Author: Behdad Esfahbod +Date: Fri May 14 20:09:48 2010 -0400 + + Fix lookahead matching. Oops! + + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3109375b849f340b4807724218010c53dea58082 +Author: Behdad Esfahbod +Date: Fri May 14 19:55:27 2010 -0400 + + Remove POSITION() and CURPOSITION() macros + + src/hb-buffer-private.hh | 2 -- + src/hb-ot-layout-gpos-private.hh | 54 + ++++++++++++++++++++-------------------- + src/hb-shape.cc | 10 ++++---- + 3 files changed, 32 insertions(+), 34 deletions(-) + +commit d7cfb3b2d1dd2e9fdae2b3e540bbe313660895e8 +Author: Behdad Esfahbod +Date: Thu May 13 14:18:49 2010 -0400 + + s/\/c/g + + src/hb-open-file-private.hh | 28 +-- + src/hb-open-type-private.hh | 100 ++++---- + src/hb-ot-layout-common-private.hh | 84 +++---- + src/hb-ot-layout-gdef-private.hh | 98 ++++---- + src/hb-ot-layout-gpos-private.hh | 460 + +++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.hh | 306 +++++++++++------------ + src/hb-ot-layout-gsubgpos-private.hh | 258 ++++++++++---------- + src/hb-ot-layout.cc | 24 +- + 8 files changed, 679 insertions(+), 679 deletions(-) + +commit f679635893eebc13402c5ee51a6f106eed0c76be +Author: Behdad Esfahbod +Date: Thu May 13 13:34:17 2010 -0400 + + Don't use variable-length-arrays + + src/hb-open-type-private.hh | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit 72071a8afaba2952fe42be093024ae9dbd37f233 +Author: Behdad Esfahbod +Date: Thu May 13 13:22:24 2010 -0400 + + Add a few more buffer convenience methods + + src/hb-buffer-private.hh | 12 ++++++++++++ + src/hb-ot-layout-gsub-private.hh | 20 ++++++++++---------- + 2 files changed, 22 insertions(+), 10 deletions(-) + +commit 11a81612e51c598e857507c268312206423cbfca +Author: Behdad Esfahbod +Date: Thu May 13 00:01:40 2010 -0400 + + Minor + + src/hb-unicode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3f93518a634cb1852bf050877db23b9b9203ad03 +Author: Behdad Esfahbod +Date: Wed May 12 23:48:40 2010 -0400 + + Improve check for internal symbols + + src/check-internal-symbols.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 357d0f29c431b842179ee4b56c21bcc402178ce7 +Author: Behdad Esfahbod +Date: Wed May 12 23:46:16 2010 -0400 + + Make HB_PRIVATE more useful + + So we can apply it to class methods also. Not sure if that works! + + src/hb-blob-private.h | 2 +- + src/hb-font-private.hh | 4 ++-- + src/hb-private.h | 2 +- + src/hb-unicode-private.h | 3 +-- + 4 files changed, 5 insertions(+), 6 deletions(-) + +commit 1d5e78013696b10751d8a35027619e81978e1312 +Author: Behdad Esfahbod +Date: Wed May 12 23:43:00 2010 -0400 + + Add a few other buffer methods + + src/hb-buffer-private.hh | 11 +++++++---- + src/hb-buffer.cc | 7 ------- + src/hb-ot-layout-gsub-private.hh | 10 +++++----- + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + 4 files changed, 14 insertions(+), 18 deletions(-) + +commit d0316a81f59a4e814b0af78797d915d7ce04d119 +Author: Behdad Esfahbod +Date: Wed May 12 23:34:52 2010 -0400 + + Add buffer->swap() + + src/hb-buffer-private.hh | 68 + ++++++++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.hh | 2 +- + 2 files changed, 38 insertions(+), 32 deletions(-) + +commit 3b649a38b5772dd7aba7f07ff7698a7f427f421f +Author: Behdad Esfahbod +Date: Wed May 12 23:28:38 2010 -0400 + + Add check for internal symbols + + src/Makefile.am | 3 ++- + src/check-internal-symbols.sh | 28 ++++++++++++++++++++++++++++ + 2 files changed, 30 insertions(+), 1 deletion(-) + +commit eee8598d75d3af692d9ececf7e8ac458e892ba9e +Author: Behdad Esfahbod +Date: Wed May 12 23:22:55 2010 -0400 + + Hide internal symbols + + src/hb-ot-layout-private.hh | 4 ++-- + src/hb-private.h | 8 ++++---- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit 8951fc2c82f2db4865da6d9e303fce419b6363bb +Author: Behdad Esfahbod +Date: Wed May 12 23:13:39 2010 -0400 + + Add buffer->allocate_lig_id() + + src/hb-buffer-private.hh | 5 ++--- + src/hb-buffer.cc | 6 ------ + src/hb-ot-layout-gsub-private.hh | 4 ++-- + 3 files changed, 4 insertions(+), 11 deletions(-) + +commit 1ce4dc95dbb28842085342aea4f9d12cbe9671a9 +Author: Behdad Esfahbod +Date: Wed May 12 18:29:25 2010 -0400 + + Use bit tricks for HB_DIRECTION_IS_* + + We already depend on the exact values of the direction enum + in HB_DIRECTION_REVERSE(), so we may as well use that. + + src/hb-common.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 22da7fd94d6318c52df69d70470a85464ffc533d +Author: Behdad Esfahbod +Date: Wed May 12 18:23:21 2010 -0400 + + Rename a few files to be C++ sources + + In anticipation for buffer revamp coming. + + src/Makefile.am | 16 + ++++++++-------- + src/{hb-buffer-private.h => hb-buffer-private.hh} | 2 +- + src/{hb-buffer.c => hb-buffer.cc} | 14 + +++++++------- + src/hb-common.h | 1 + + src/{hb-font-private.h => hb-font-private.hh} | 2 +- + src/hb-font.cc | 4 ++-- + src/{hb-ft.c => hb-ft.cc} | 8 ++++---- + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/{hb-ot-layout-private.h => hb-ot-layout-private.hh} | 2 +- + src/hb-ot-layout.cc | 2 +- + src/{hb-ot-shape-private.h => hb-ot-shape-private.hh} | 0 + src/{hb-ot-shape.c => hb-ot-shape.cc} | 4 ++-- + src/{hb-shape.c => hb-shape.cc} | 6 +++--- + 15 files changed, 34 insertions(+), 33 deletions(-) + +commit c3df649f258b334e93c7626a43cd8ebfbd5a610e +Author: Behdad Esfahbod +Date: Tue May 11 13:54:12 2010 -0400 + + Fix comment + + src/hb-buffer-private.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 281f08954a1d96d7807153c25073b8eb7630703b +Author: Behdad Esfahbod +Date: Tue May 11 11:37:58 2010 -0400 + + Remove obsolete friend + + src/hb-ot-layout-gpos-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 70c9bfd5646a4a55a7f43c0cf0b5ac5993615d5b +Author: Behdad Esfahbod +Date: Tue May 11 00:23:50 2010 -0400 + + Simplify PairSet + + src/hb-ot-layout-gpos-private.hh | 101 + +++++++++++++++++++++------------------ + 1 file changed, 54 insertions(+), 47 deletions(-) + +commit 97e7f8f305c47caf2968a9da3b8407825547286d +Author: Behdad Esfahbod +Date: Tue May 11 00:11:36 2010 -0400 + + Add CONST_FUNC annotation + + src/hb-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 494d28ad988e505c1c45cc35a7ec6b880cfec5fc +Author: Behdad Esfahbod +Date: Mon May 10 23:50:07 2010 -0400 + + Simplify likely() implementation + + Shrinks .text by 1%! + + src/hb-private.h | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +commit 75651b20871047d3ec17f4221794b8ef5d60e14b +Author: Behdad Esfahbod +Date: Mon May 10 23:44:51 2010 -0400 + + Fix warnings + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4c20d8c057738b66150a88472714690e137884f8 +Author: Behdad Esfahbod +Date: Mon May 10 23:27:54 2010 -0400 + + Sprinkle a few strategic likely()'s + + Shrinks the code size by some 2% even. + + src/hb-open-file-private.hh | 4 ++-- + src/hb-open-type-private.hh | 20 ++++++++++---------- + 2 files changed, 12 insertions(+), 12 deletions(-) + +commit 69cb28bc13d236a01acf40da62e345c7e83ccba7 +Author: Behdad Esfahbod +Date: Mon May 10 23:13:08 2010 -0400 + + Remove a few likely()'s + + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 24552ecf92982fe561dc47d5102fcf1a7b337c70 +Author: Behdad Esfahbod +Date: Mon May 10 23:08:41 2010 -0400 + + Remove excess sub_format sanitize + + src/hb-ot-layout-gpos-private.hh | 1 - + src/hb-ot-layout-gsub-private.hh | 1 - + 2 files changed, 2 deletions(-) + +commit f7adc5e9be352ac31ad3ab847abb6fceb239aa12 +Author: Behdad Esfahbod +Date: Mon May 10 22:41:50 2010 -0400 + + Shrink NullPool now that we have accurate size tracking + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3d44fb6f15177dc6518166e435597936b044acc1 +Author: Behdad Esfahbod +Date: Mon May 10 22:22:54 2010 -0400 + + Fix warning + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b5db4f1e4eefa266a71a28b5496f47ff9d1a81e8 +Author: Behdad Esfahbod +Date: Mon May 10 22:22:22 2010 -0400 + + Clean up NO_INDEX + + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 10 ++++++---- + src/hb-ot-layout-common-private.hh | 17 ++++------------- + src/hb-ot-layout.cc | 8 ++++---- + src/main.cc | 2 +- + 5 files changed, 16 insertions(+), 23 deletions(-) + +commit fe9bc070e1d545b0df2ea548eebf5a1fc4c92ddc +Author: Behdad Esfahbod +Date: Mon May 10 21:39:24 2010 -0400 + + Fix awful confusion between lookup format and subtable format + + As reported by John Daggett. + + src/hb-ot-layout-gpos-private.hh | 14 +++++++------- + src/hb-ot-layout-gsub-private.hh | 14 +++++++------- + 2 files changed, 14 insertions(+), 14 deletions(-) + +commit 458ecbb60bb7e8e32aca62a562586d921d5396aa +Author: Behdad Esfahbod +Date: Mon May 10 21:11:35 2010 -0400 + + Fix tracing order + + src/hb-open-type-private.hh | 14 +++++--------- + src/hb-ot-layout-gsubgpos-private.hh | 3 +-- + 2 files changed, 6 insertions(+), 11 deletions(-) + +commit 48146e5612f6d272d6962f6829c6d64a31edef89 +Author: Behdad Esfahbod +Date: Mon May 10 20:07:56 2010 -0400 + + Don't fail sanitize on NULL data + + src/hb-open-type-private.hh | 5 +++++ + 1 file changed, 5 insertions(+) + +commit d2c2ca8faf62fc380d4717d286556139a62d2356 +Author: Behdad Esfahbod +Date: Mon May 10 19:58:25 2010 -0400 + + Fix comment + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b435ab7e29c388e3b100f729957319931625a3a8 +Author: Behdad Esfahbod +Date: Mon May 10 19:51:57 2010 -0400 + + Fix accessing tables from NULL pointer + + src/hb-font.cc | 2 +- + src/hb-open-type-private.hh | 5 +++++ + src/hb-ot-layout.cc | 6 +++--- + 3 files changed, 9 insertions(+), 4 deletions(-) + +commit dacebcadae36b35531d635d81df2afb937677b7a +Author: Behdad Esfahbod +Date: Mon May 10 19:45:41 2010 -0400 + + Simplify unions + + src/hb-open-file-private.hh | 24 +++---- + src/hb-ot-layout-common-private.hh | 24 +++---- + src/hb-ot-layout-gdef-private.hh | 24 +++---- + src/hb-ot-layout-gpos-private.hh | 120 + +++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.hh | 88 ++++++++++++------------- + src/hb-ot-layout-gsubgpos-private.hh | 44 ++++++------- + 6 files changed, 163 insertions(+), 161 deletions(-) + +commit fd671e02433bcbc1fd07901fa2d6065020f41ba8 +Author: Behdad Esfahbod +Date: Mon May 10 19:02:32 2010 -0400 + + Remove unused macro + + src/hb-open-type-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 0eb9fc6e37935707dba2bf4b3705de2161a08cb7 +Author: Behdad Esfahbod +Date: Mon May 10 19:01:17 2010 -0400 + + Change DEFINE_SIZE_VAR to DEFINE_SIZE_ARRAY + + src/hb-open-file-private.hh | 4 ++-- + src/hb-open-type-private.hh | 10 +++++----- + src/hb-ot-layout-common-private.hh | 27 +++++++++++++++------------ + src/hb-ot-layout-gdef-private.hh | 10 +++++----- + src/hb-ot-layout-gpos-private.hh | 25 ++++++++++++------------- + src/hb-ot-layout-gsub-private.hh | 14 +++++++------- + src/hb-ot-layout-gsubgpos-private.hh | 16 ++++++++-------- + 7 files changed, 54 insertions(+), 52 deletions(-) + +commit 596e471aa5053d955fb5d5b5923088c8814469b1 +Author: Behdad Esfahbod +Date: Mon May 10 18:47:48 2010 -0400 + + Cleanup DEFINE_SIZE_VAR2 + + src/hb-open-type-private.hh | 18 +++++++++++------- + src/hb-ot-layout-common-private.hh | 6 +++--- + src/hb-ot-layout-gdef-private.hh | 4 ++-- + src/hb-ot-layout-gpos-private.hh | 4 ++-- + src/hb-ot-layout-gsub-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + 6 files changed, 21 insertions(+), 17 deletions(-) + +commit 33afa4e2dc352f08cc094703e3f01d3ecd83b354 +Author: Behdad Esfahbod +Date: Mon May 10 18:35:02 2010 -0400 + + Minor + + src/hb-open-type-private.hh | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit b961518b9611471ff7060e97686e5625974847eb +Author: Behdad Esfahbod +Date: Mon May 10 18:20:54 2010 -0400 + + Simplify array access + + src/hb-open-type-private.hh | 29 ++++++++++------------------- + src/hb-ot-layout-common-private.hh | 8 ++++---- + src/hb-ot-layout-gsub-private.hh | 6 +++--- + src/hb-ot-layout-gsubgpos-private.hh | 16 ++++++++-------- + 4 files changed, 25 insertions(+), 34 deletions(-) + +commit 54842374c2b291ef208c51ae1d853ec0403ccf84 +Author: Behdad Esfahbod +Date: Mon May 10 18:13:32 2010 -0400 + + Fix check_struct to check min_size instead of sizeof + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ed07422c33bbb52ff4d79e65986171e3f07697d8 +Author: Behdad Esfahbod +Date: Mon May 10 18:08:46 2010 -0400 + + Further cleanup of sizeof + + src/hb-open-type-private.hh | 7 +++++-- + src/hb-ot-layout-common-private.hh | 4 ++++ + src/hb-ot-layout-gdef-private.hh | 4 ++++ + src/hb-ot-layout-gpos-private.hh | 10 +++++++--- + src/hb-ot-layout-gsub-private.hh | 4 +++- + src/hb-ot-layout-gsubgpos-private.hh | 2 ++ + 6 files changed, 25 insertions(+), 6 deletions(-) + +commit a82ef7a893b773a17f7548375de9f588dfc83aba +Author: Behdad Esfahbod +Date: Mon May 10 17:55:03 2010 -0400 + + Remove CastP completely + + src/hb-open-type-private.hh | 39 +++++++++++++++++---------------------- + 1 file changed, 17 insertions(+), 22 deletions(-) + +commit 40cbefe858192531ed64dd51d402f7ca7b8153a3 +Author: Behdad Esfahbod +Date: Mon May 10 17:47:22 2010 -0400 + + Remove unnecessary casts + + src/hb-open-type-private.hh | 12 ++++++------ + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 34 + +++++++++++++++++----------------- + src/hb-ot-layout-gsub-private.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 34 + +++++++++++++++++----------------- + 5 files changed, 43 insertions(+), 43 deletions(-) + +commit 09766b1ec5ec55a61edbcd7a89ed3613cc92d4cb +Author: Behdad Esfahbod +Date: Mon May 10 17:36:03 2010 -0400 + + Make StructAtOffset take a pointer + + Is safer. + + src/hb-open-type-private.hh | 26 +++++++++++++------------- + src/hb-ot-layout-gpos-private.hh | 6 +++--- + src/hb-ot-layout-gsub-private.hh | 4 ++-- + 3 files changed, 18 insertions(+), 18 deletions(-) + +commit bea34c7cbb583cf7660776e95cab3171590b8427 +Author: Behdad Esfahbod +Date: Mon May 10 17:28:16 2010 -0400 + + Further cleanup of DEFINE_SIZE + + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 10 +++++----- + src/hb-ot-layout-common-private.hh | 16 ++++++++-------- + src/hb-ot-layout-gdef-private.hh | 8 ++++---- + src/hb-ot-layout-gpos-private.hh | 16 +++++----------- + src/hb-ot-layout-gsub-private.hh | 14 +++++++------- + src/hb-ot-layout-gsubgpos-private.hh | 14 +++++++------- + 7 files changed, 37 insertions(+), 43 deletions(-) + +commit 0abcc3b48cfd51a22695c9e988938b2f45cb19d8 +Author: Behdad Esfahbod +Date: Mon May 10 17:04:20 2010 -0400 + + Cleanup + + src/hb-open-type-private.hh | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +commit b3651231bf80bb7009214547a75ed90e21815c68 +Author: Behdad Esfahbod +Date: Mon May 10 16:57:29 2010 -0400 + + Remove ASSERT_SIZE in favor of the safer DEFINE_SIZE_STATIC + + src/hb-open-file-private.hh | 3 ++- + src/hb-open-type-private.hh | 20 +++++++++++++--- + src/hb-ot-layout-common-private.hh | 24 ++++++++++++-------- + src/hb-ot-layout-gdef-private.hh | 22 +++++++++++------- + src/hb-ot-layout-gpos-private.hh | 44 + ++++++++++++++++++++---------------- + src/hb-ot-layout-gsub-private.hh | 32 ++++++++++++++++---------- + src/hb-ot-layout-gsubgpos-private.hh | 27 ++++++++++++++-------- + src/hb-private.h | 2 -- + 8 files changed, 109 insertions(+), 65 deletions(-) + +commit 569da92bc6956f42d9b2d65c784e184fb6380efe +Author: Behdad Esfahbod +Date: Mon May 10 16:38:32 2010 -0400 + + Cleanup ASSERT_SIZE_VAR + + src/hb-open-file-private.hh | 9 ++++++--- + src/hb-open-type-private.hh | 6 ++++-- + src/hb-ot-layout-common-private.hh | 22 ++++++++++++---------- + src/hb-ot-layout-gdef-private.hh | 3 ++- + src/hb-ot-layout-gpos-private.hh | 30 +++++++++++++++++++----------- + src/hb-ot-layout-gsubgpos-private.hh | 10 ++++++---- + src/hb-private.h | 8 -------- + 7 files changed, 49 insertions(+), 39 deletions(-) + +commit 99bf03459ff2f00cf3fb7fa3c8b8336ec9fcca56 +Author: Behdad Esfahbod +Date: Thu May 6 19:37:32 2010 -0400 + + Whitespace + + src/hb-ot-layout-gpos-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 65f46b00333e20ab8a52a4b350747507541ec1db +Author: Behdad Esfahbod +Date: Thu May 6 19:35:19 2010 -0400 + + Simplify DEFINE_NULL_DATA + + Using ::min_size. + + src/hb-open-type-private.hh | 6 +++--- + src/hb-ot-layout-common-private.hh | 9 +++++---- + 2 files changed, 8 insertions(+), 7 deletions(-) + +commit e45d3f86f9a5f3d29ca35a282de7f98e702878f9 +Author: Behdad Esfahbod +Date: Thu May 6 19:33:31 2010 -0400 + + Start cleaning up get_size() + + So we know when the size is static and when dynamic. + + src/hb-open-file-private.hh | 7 +++--- + src/hb-open-type-private.hh | 42 + +++++++++++++++++++++++++----------- + src/hb-ot-layout-common-private.hh | 14 ++++++------ + src/hb-ot-layout-gpos-private.hh | 17 ++++++--------- + src/hb-ot-layout-gsubgpos-private.hh | 19 ++++++++-------- + 5 files changed, 55 insertions(+), 44 deletions(-) + +commit b157617644d1e38f680163889d1dc2e2f64d9ba3 +Author: Behdad Esfahbod +Date: Thu May 6 14:48:27 2010 -0400 + + Remove the last of SANITIZE macros: SANITIZE_SELF + + src/hb-open-file-private.hh | 4 ++-- + src/hb-open-type-private.hh | 21 ++++++++++++--------- + src/hb-ot-layout-common-private.hh | 16 ++++++++-------- + src/hb-ot-layout-gdef-private.hh | 6 +++--- + src/hb-ot-layout-gpos-private.hh | 26 +++++++++++++------------- + src/hb-ot-layout-gsubgpos-private.hh | 6 +++--- + 6 files changed, 41 insertions(+), 38 deletions(-) + +commit 4f252fedc7136c66a9d7fbcb2978581986da6227 +Author: Behdad Esfahbod +Date: Thu May 6 13:30:23 2010 -0400 + + Remove SANITIZE macro + + src/hb-open-file-private.hh | 4 ++-- + src/hb-open-type-private.hh | 6 ++---- + src/hb-ot-layout-common-private.hh | 18 +++++++++--------- + src/hb-ot-layout-gdef-private.hh | 6 +++--- + src/hb-ot-layout-gpos-private.hh | 18 +++++++++--------- + src/hb-ot-layout-gsub-private.hh | 26 +++++++++++++------------- + src/hb-ot-layout-gsubgpos-private.hh | 22 +++++++++++----------- + 7 files changed, 49 insertions(+), 51 deletions(-) + +commit c2ddfd2d268385257c77c09a9abeacf4230d5377 +Author: Behdad Esfahbod +Date: Thu May 6 13:06:15 2010 -0400 + + Cleanup Value casts + + src/hb-ot-layout-gpos-private.hh | 34 +++++++++++++++++++++------------- + 1 file changed, 21 insertions(+), 13 deletions(-) + +commit 41a93d2c1ff175ef06328a99983577459c2d34b0 +Author: Behdad Esfahbod +Date: Thu May 6 12:55:14 2010 -0400 + + Remove SANITIZE_WITH_BASE + + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 2 - + src/hb-ot-layout-common-private.hh | 6 +-- + src/hb-ot-layout-gdef-private.hh | 24 +++++----- + src/hb-ot-layout-gpos-private.hh | 90 + ++++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.hh | 31 ++++++------- + src/hb-ot-layout-gsubgpos-private.hh | 44 +++++++++--------- + 7 files changed, 98 insertions(+), 101 deletions(-) + +commit f5fab0c71837371cce32dc3e9edca1ccb8d44e29 +Author: Behdad Esfahbod +Date: Thu May 6 10:26:52 2010 -0400 + + Remove SANITIZE_MEM + + src/hb-open-type-private.hh | 4 +--- + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 6 +++--- + 4 files changed, 6 insertions(+), 8 deletions(-) + +commit 4ad2cc5dec6b0639da2b1846282bdd99d06d5ff1 +Author: Behdad Esfahbod +Date: Thu May 6 09:24:24 2010 -0400 + + Rename check to check_range + + src/hb-open-type-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 1cd1e117d060d38e314618b627d7663cb01ed584 +Author: Behdad Esfahbod +Date: Wed May 5 20:15:14 2010 -0400 + + Remove SANITIZE_ARRAY + + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 16 +++++++--------- + src/hb-ot-layout-gpos-private.hh | 8 ++++---- + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + 4 files changed, 14 insertions(+), 16 deletions(-) + +commit 583d7f9586ce69754f1354aa3895e6d732a0c2ce +Author: Behdad Esfahbod +Date: Wed May 5 01:49:22 2010 -0400 + + Cosmetic + + src/hb-open-file-private.hh | 3 ++- + src/hb-open-type-private.hh | 6 ++++-- + src/hb-ot-layout-common-private.hh | 15 ++++++++++----- + src/hb-ot-layout-gpos-private.hh | 5 ++--- + src/hb-ot-layout-gsub-private.hh | 3 ++- + src/hb-ot-layout-gsubgpos-private.hh | 9 +++++---- + 6 files changed, 25 insertions(+), 16 deletions(-) + +commit 705e215268aa95c2bc6af8af9b48b72b690ec1f7 +Author: Behdad Esfahbod +Date: Wed May 5 01:40:25 2010 -0400 + + Minor + + src/hb-open-type-private.hh | 4 ++-- + src/hb-ot-layout-gpos-private.hh | 2 +- + src/hb-ot-layout-gsub-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +commit b18eafd0f62f854d15276c78f99843aecd47acad +Author: Behdad Esfahbod +Date: Wed May 5 01:39:26 2010 -0400 + + Minor + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4169710911450e0f9bc045fe279bfc8ba9e8457c +Author: Behdad Esfahbod +Date: Wed May 5 01:37:58 2010 -0400 + + Simplify chaining + + src/hb-ot-layout-gsubgpos-private.hh | 61 + +++++++++++++++--------------------- + 1 file changed, 25 insertions(+), 36 deletions(-) + +commit 1911b9d21b2b7b6b8219ce6c888540e3a60aa9c3 +Author: Behdad Esfahbod +Date: Wed May 5 01:32:04 2010 -0400 + + Remove APPLY_ARG_DEF and APPLY_ARG + + src/hb-ot-layout-gpos-private.hh | 92 + ++++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.hh | 88 + +++++++++++++++++----------------- + src/hb-ot-layout-gsubgpos-private.hh | 89 + ++++++++++++++++------------------ + 3 files changed, 132 insertions(+), 137 deletions(-) + +commit 6c42cddfe53a1c664081862bb9a3e1c38d05a823 +Author: Behdad Esfahbod +Date: Wed May 5 01:30:48 2010 -0400 + + Port apply to use hb_trace_t + + src/hb-ot-layout-gpos-private.hh | 9 ++++----- + src/hb-ot-layout-gsub-private.hh | 11 +++++------ + src/hb-ot-layout-gsubgpos-private.hh | 13 +++++-------- + 3 files changed, 14 insertions(+), 19 deletions(-) + +commit 969c9705ae0c64577c3f69f5300fec975f952e1f +Author: Behdad Esfahbod +Date: Wed May 5 01:23:44 2010 -0400 + + Move context_length into apply_context + + src/hb-ot-layout-gpos-private.hh | 9 ++--- + src/hb-ot-layout-gsub-private.hh | 9 ++--- + src/hb-ot-layout-gsubgpos-private.hh | 70 + ++++++++++++++++++++---------------- + 3 files changed, 50 insertions(+), 38 deletions(-) + +commit 94a23aaeca39c662614037ef887412249bdc8d49 +Author: Behdad Esfahbod +Date: Wed May 5 01:13:09 2010 -0400 + + Move buffer into apply_context + + src/hb-buffer-private.h | 30 +++++++++-------- + src/hb-ot-layout-gpos-private.hh | 64 + ++++++++++++++++++++---------------- + src/hb-ot-layout-gsub-private.hh | 45 ++++++++++++++----------- + src/hb-ot-layout-gsubgpos-private.hh | 49 ++++++++++++++------------- + 4 files changed, 106 insertions(+), 82 deletions(-) + +commit 63493f956dca519df49da0a6badc3cb0a1b92779 +Author: Behdad Esfahbod +Date: Wed May 5 01:01:05 2010 -0400 + + Move layout_context into apply_context + + src/hb-ot-layout-gpos-private.hh | 105 + ++++++++++++++++++----------------- + src/hb-ot-layout-gsub-private.hh | 47 ++++++++-------- + src/hb-ot-layout-gsubgpos-private.hh | 11 ++-- + 3 files changed, 82 insertions(+), 81 deletions(-) + +commit fff9aa263d1daf7c5117cf383fafa5043d5eb5af +Author: Behdad Esfahbod +Date: Wed May 5 00:32:21 2010 -0400 + + Minor + + src/hb-ot-layout-gsubgpos-private.hh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 27e302dc8e794ff6bf878bc76e17d336d510849e +Author: Behdad Esfahbod +Date: Wed May 5 00:26:16 2010 -0400 + + I keep changing my mind about this + + src/hb-open-type-private.hh | 30 ++++++++++-------------------- + 1 file changed, 10 insertions(+), 20 deletions(-) + +commit 39840474afd2cda9ff576c08aff9c87095496c27 +Author: Behdad Esfahbod +Date: Wed May 5 00:23:19 2010 -0400 + + Remove SANITIZE_ARG_DEF and SANITIZE_ARG + + src/hb-open-file-private.hh | 16 ++--- + src/hb-open-type-private.hh | 59 +++++++-------- + src/hb-ot-layout-common-private.hh | 42 +++++------ + src/hb-ot-layout-gdef-private.hh | 28 ++++---- + src/hb-ot-layout-gpos-private.hh | 136 + +++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.hh | 72 +++++++++---------- + src/hb-ot-layout-gsubgpos-private.hh | 46 ++++++------ + 7 files changed, 197 insertions(+), 202 deletions(-) + +commit b261e2ad5c5a065599ce1dbc4ba437caa2cee1e9 +Author: Behdad Esfahbod +Date: Wed May 5 00:20:16 2010 -0400 + + Remove trace from sanitize_shallow() + + src/hb-open-type-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit dfc8cbe85479dde1ffdc6b2e73f4907331d77a19 +Author: Behdad Esfahbod +Date: Wed May 5 00:19:46 2010 -0400 + + Add hb_trace_t + + src/hb-open-type-private.hh | 33 +++++++++++++++++++-------------- + 1 file changed, 19 insertions(+), 14 deletions(-) + +commit 20e3dd5d292b65f70d2eae63b8d8713a1c889d47 +Author: Behdad Esfahbod +Date: Tue May 4 23:21:57 2010 -0400 + + Make sanitize_depth variable automatic and not passed through + function args + + src/hb-open-type-private.hh | 72 + +++++++++++++++++++++++++++------------------ + 1 file changed, 43 insertions(+), 29 deletions(-) + +commit 4a446ac35136eff23d55f47bdd7b40095ad707ab +Author: Behdad Esfahbod +Date: Tue May 4 22:46:21 2010 -0400 + + Use function template for pass-thru argument + + src/hb-open-type-private.hh | 26 ++++++-------------------- + src/hb-ot-layout-gpos-private.hh | 6 +++--- + 2 files changed, 9 insertions(+), 23 deletions(-) + +commit 98daaf183d6dbf2b68959da608cd9876ba55d7aa +Author: Behdad Esfahbod +Date: Tue May 4 22:42:49 2010 -0400 + + Make _hb_sanitize_*() methods of the context object + + src/hb-open-type-private.hh | 190 + +++++++++++++++++++++++--------------------- + 1 file changed, 98 insertions(+), 92 deletions(-) + +commit bb029af943faa9905e652d58856998687e60c31d +Author: Behdad Esfahbod +Date: Tue May 4 15:28:52 2010 -0400 + + Remove SANITIZE_THIS + + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 3 +- + src/hb-ot-layout-common-private.hh | 4 +-- + src/hb-ot-layout-gdef-private.hh | 25 ++++++++-------- + src/hb-ot-layout-gpos-private.hh | 55 + ++++++++++++++++++++---------------- + src/hb-ot-layout-gsub-private.hh | 29 ++++++++++--------- + src/hb-ot-layout-gsubgpos-private.hh | 42 +++++++++++++-------------- + 7 files changed, 85 insertions(+), 75 deletions(-) + +commit 2226fc93d1427b8830bfb892fe1b25b488ea36dc +Author: Behdad Esfahbod +Date: Tue May 4 15:12:17 2010 -0400 + + Rename SANITIZE_BASE to SANITIZE_WITH_BASE + + src/hb-open-type-private.hh | 11 +++++++---- + src/hb-ot-layout-common-private.hh | 3 ++- + src/hb-ot-layout-gpos-private.hh | 15 ++++++++------- + 3 files changed, 17 insertions(+), 12 deletions(-) + +commit 89da1346ec3a8dec8a368df46d61ca75356e22fa +Author: Behdad Esfahbod +Date: Tue May 4 15:01:45 2010 -0400 + + Remove SANITIZE_OBJ + + src/hb-open-type-private.hh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 4d4cce96266b777a01cec03e8766dc8c0b159351 +Author: Behdad Esfahbod +Date: Tue May 4 14:57:55 2010 -0400 + + Remove SANITIZE_THIS2 + + src/hb-open-type-private.hh | 2 -- + src/hb-ot-layout-common-private.hh | 3 ++- + src/hb-ot-layout-gdef-private.hh | 10 ++++++---- + src/hb-ot-layout-gpos-private.hh | 9 ++++++--- + src/hb-ot-layout-gsub-private.hh | 11 +++++++---- + src/hb-ot-layout-gsubgpos-private.hh | 14 +++++++++----- + 6 files changed, 30 insertions(+), 19 deletions(-) + +commit 26bfcb64e473c40e439d6efbe974781dada28eca +Author: Behdad Esfahbod +Date: Tue May 4 14:49:45 2010 -0400 + + Cosmetic + + src/hb-ot-layout-gdef-private.hh | 5 ++--- + src/hb-ot-layout-gsubgpos-private.hh | 7 +++---- + 2 files changed, 5 insertions(+), 7 deletions(-) + +commit be74284673a1944e0f1884e861c3fe8f9855172c +Author: Behdad Esfahbod +Date: Tue May 4 14:47:05 2010 -0400 + + Remove SANITIZE_THIS3 + + src/hb-open-type-private.hh | 1 - + src/hb-ot-layout-gpos-private.hh | 21 +++++++++++++++------ + src/hb-ot-layout-gsubgpos-private.hh | 8 ++++++-- + 3 files changed, 21 insertions(+), 9 deletions(-) + +commit fbab9f9bd8ba59e7e5811f33c1dda198f95cf05a +Author: Behdad Esfahbod +Date: Tue May 4 14:42:10 2010 -0400 + + Remove SANITIZE_BASE2 + + src/hb-open-type-private.hh | 1 - + src/hb-ot-layout-gpos-private.hh | 3 ++- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 73c7dbf7f5433c0cdd467ef32402f52867e9798e +Author: Behdad Esfahbod +Date: Tue May 4 14:40:55 2010 -0400 + + Remove SANITIZE2 + + src/hb-open-type-private.hh | 1 - + src/hb-ot-layout-gsub-private.hh | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +commit c9f14687a30866181feb57ee2736a147ec9f25a1 +Author: Behdad Esfahbod +Date: Tue May 4 14:38:08 2010 -0400 + + Remove the NEUTER macro, move code to a method + + src/hb-open-type-private.hh | 21 +++++++++++++-------- + 1 file changed, 13 insertions(+), 8 deletions(-) + +commit 30fa2821c277df99a14089749313dfe2b541e2d0 +Author: Behdad Esfahbod +Date: Tue May 4 14:28:18 2010 -0400 + + Make internal method private + + src/hb-open-type-private.hh | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit ce5694c79671bf75990923c1da17bb611e4e7d15 +Author: Behdad Esfahbod +Date: Tue May 4 14:10:18 2010 -0400 + + [main] Recognize Apple SFNTs + + src/hb-open-file-private.hh | 4 ++-- + src/main.cc | 6 ++++++ + 2 files changed, 8 insertions(+), 2 deletions(-) + +commit 710500a93ecc2a0c595045602aa367073485ff91 +Author: Behdad Esfahbod +Date: Mon May 3 23:11:16 2010 -0400 + + Comment new SFNT tags + + src/hb-open-file-private.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 64d3fc8d0dada673245cc8c0b1c12cd849b30997 +Author: Behdad Esfahbod +Date: Mon May 3 22:51:19 2010 -0400 + + Cosmetic: Rename HB_LIKELY/HB_UNLIKELY to likely/unlikely + + src/hb-buffer.c | 14 ++++---- + src/hb-font.cc | 6 ++-- + src/hb-ft.c | 14 ++++---- + src/hb-language.c | 2 +- + src/hb-object-private.h | 10 +++--- + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 38 ++++++++++----------- + src/hb-ot-layout-common-private.hh | 16 ++++----- + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 64 + ++++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.hh | 52 ++++++++++++++--------------- + src/hb-ot-layout-gsubgpos-private.hh | 40 +++++++++++----------- + src/hb-ot-layout.cc | 12 +++---- + src/hb-ot-tag.c | 2 +- + src/hb-private.h | 8 ++--- + src/hb-shape.c | 10 +++--- + src/hb-unicode.c | 2 +- + 17 files changed, 147 insertions(+), 147 deletions(-) + +commit fa3b3d58443a7c22eca3f86243993ba2d4bd9f4a +Author: Behdad Esfahbod +Date: Mon May 3 22:47:22 2010 -0400 + + Mark a couple functions as inline + + src/hb-open-type-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 6b84198f9d471defb6f55d44d4f5423df70b2a10 +Merge: 631d10b7 eaf29edb +Author: Behdad Esfahbod +Date: Mon May 3 22:46:52 2010 -0400 + + Merge remote branch 'jrmuizel/master' + +commit eaf29edb8fa49390e5f48b78105dfd173aff445b +Author: Jeff Muizelaar +Date: Mon May 3 22:27:56 2010 -0400 + + HB_UNUSED is unneeded on static inline functions + + src/hb-object-private.h | 2 +- + src/hb-open-type-private.hh | 6 +++--- + src/hb-private.h | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +commit 4ce578ed369f1526c91deedcf9e72537b3e4328f +Author: Jeff Muizelaar +Date: Mon May 3 15:03:53 2010 -0400 + + Include the tags from the Apple specification for TrueType fonts + + src/hb-open-file-private.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 631d10b728d9e1a02c7dddf505d4fae5e244c6e8 +Author: Behdad Esfahbod +Date: Sun May 2 21:14:21 2010 -0400 + + Remove unused method + + src/hb-open-file-private.hh | 5 ----- + 1 file changed, 5 deletions(-) + +commit f0abcd69408a3af65207cdf8847575ade4579bd4 +Author: Behdad Esfahbod +Date: Sun May 2 18:14:25 2010 -0400 + + Whitespace + + src/hb-open-type-private.hh | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit a8d960bd26883ee937b04ca2a3c16a3644870356 +Author: Behdad Esfahbod +Date: Thu Apr 29 14:31:56 2010 -0400 + + [GPOS] Speedup apply_value() + + src/hb-ot-layout-gpos-private.hh | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 2cd1ea4411d0808559a942ff3fa4e637f9c9a9c8 +Author: Behdad Esfahbod +Date: Thu Apr 29 14:15:32 2010 -0400 + + [ft] Disallow getting the entire font data with tag=0 + + src/hb-ft.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit 33d13fdda99acaeffa9600737e8870278d053ebe +Author: Behdad Esfahbod +Date: Thu Apr 29 13:56:44 2010 -0400 + + Rename HB_GNUC_UNUSED -> HB_UNUSED + + src/hb-buffer.c | 6 ++--- + src/hb-font.cc | 44 + ++++++++++++++++++------------------ + src/hb-ft.c | 16 ++++++------- + src/hb-object-private.h | 2 +- + src/hb-open-type-private.hh | 18 +++++++-------- + src/hb-ot-layout-gdef-private.hh | 4 ++-- + src/hb-ot-layout-gpos-private.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 6 ++--- + src/hb-ot-layout.cc | 4 ++-- + src/hb-ot-shape.c | 2 +- + src/hb-private.h | 16 ++++++------- + src/hb-shape.c | 32 +++++++++++++------------- + src/hb-unicode.c | 8 +++---- + 13 files changed, 81 insertions(+), 81 deletions(-) + +commit 7d3a126334f8e6f6441561c1bb592bd3fa7a2c5c +Author: Behdad Esfahbod +Date: Thu Apr 29 13:54:01 2010 -0400 + + Define HB_FUNC for portability to non-gcc + + src/hb-open-type-private.hh | 12 ++++++------ + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-private.h | 9 +++++++++ + 3 files changed, 16 insertions(+), 7 deletions(-) + +commit fa030175ca998b00cc42cbced6e98de323ec01ec +Author: Behdad Esfahbod +Date: Thu Apr 29 13:48:26 2010 -0400 + + [sanitize] Make debug code always available to the compiler + + Such that we don't break debug build all the time. + + src/hb-open-type-private.hh | 71 + ++++++++++++++++++++------------------------- + 1 file changed, 31 insertions(+), 40 deletions(-) + +commit fde6f5bd682f5ad0cc5e2ec69fc831b0192bf90b +Author: Behdad Esfahbod +Date: Thu Apr 29 04:41:41 2010 -0400 + + Convert to uppercase in hb_ot_tag_from_language() + + src/hb-ot-tag.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 6f729b45b04243c42ad7201b67cda9d5e5c363f1 +Author: Behdad Esfahbod +Date: Thu Apr 29 03:59:06 2010 -0400 + + More contour point use + + src/hb-font.cc | 1 + + src/hb-ot-layout-gdef-private.hh | 8 +++++--- + src/hb-ot-layout-gpos-private.hh | 13 +++++++++---- + 3 files changed, 15 insertions(+), 7 deletions(-) + +commit 3840b6b50503ba2c9a99f774284e0077baffa8a0 +Author: Behdad Esfahbod +Date: Thu Apr 29 03:48:27 2010 -0400 + + [gdef] Fix delta scale + + src/hb-ot-layout-gdef-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4ac6cc284b2c1eb670c2a3659ec385ed729acac4 +Author: Behdad Esfahbod +Date: Thu Apr 29 03:48:11 2010 -0400 + + [gdef] Fix rounding + + src/hb-ot-layout-gdef-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit b52fbb1bab608bda76efb936f08344afaec600a1 +Author: Behdad Esfahbod +Date: Thu Apr 29 03:47:00 2010 -0400 + + [gdef] Implement getting contour point + + src/hb-ot-layout-gdef-private.hh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 4c5fbae011a33b9efef5aedd61c357fc0ded1113 +Author: Behdad Esfahbod +Date: Thu Apr 29 03:39:39 2010 -0400 + + Make sure mirroring is done in original direction + + Reported by Jonathan Kew. + + src/hb-shape.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit ce23c9234b87513d6460fb89bad178fb8537e161 +Author: Behdad Esfahbod +Date: Thu Apr 29 03:31:03 2010 -0400 + + Use BCP47 private-use tags for OpenType tag language string mapping + + src/hb-ot-tag.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit eaf1d9a46c4a320f3b0026c0a610f95a620d566f +Author: Behdad Esfahbod +Date: Thu Apr 29 03:11:32 2010 -0400 + + Minor + + src/hb-ot-tag.c | 1 + + 1 file changed, 1 insertion(+) + +commit 3a4784fe88a0f14147ccdd3633952c9c0f3ae8f3 +Author: Behdad Esfahbod +Date: Thu Apr 29 02:58:38 2010 -0400 + + Fix bug in hb_language_from_string() + + Reported by Jonathan Kew. + + src/hb-language.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit 602e4f8d5512cdf48c696ad64ad62ff97f6dbdcc +Author: Behdad Esfahbod +Date: Thu Apr 29 02:28:54 2010 -0400 + + Use const_cast + + src/hb-open-type-private.hh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit abff3580a5b229641086e0da097efee11d22ff81 +Author: Behdad Esfahbod +Date: Thu Apr 29 02:27:20 2010 -0400 + + Add const + + src/hb-object-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6617eada95928457a25e29f793f1a93c6b3edaec +Author: Behdad Esfahbod +Date: Thu Apr 29 02:25:30 2010 -0400 + + Rename apply_context -> context + + src/hb-ot-layout-gpos-private.hh | 22 +++++++++++----------- + src/hb-ot-layout-gsub-private.hh | 26 +++++++++++++------------- + src/hb-ot-layout-gsubgpos-private.hh | 12 ++++++------ + 3 files changed, 30 insertions(+), 30 deletions(-) + +commit b4c7fab762935b9c182b3e2ac3415f29fc6a5558 +Author: Behdad Esfahbod +Date: Thu Apr 29 02:24:25 2010 -0400 + + Rename + + src/hb-ot-layout-gpos-private.hh | 98 + ++++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.hh | 46 ++++++++--------- + src/hb-ot-layout-gsubgpos-private.hh | 12 ++--- + 3 files changed, 78 insertions(+), 78 deletions(-) + +commit 1376fb7bf9ef07970f0ba13dc64d6a8ab8252762 +Author: Behdad Esfahbod +Date: Thu Apr 29 02:19:21 2010 -0400 + + [apply] Use a context object to reduce number of parameters passed + around + + src/hb-open-type-private.hh | 5 ++--- + src/hb-ot-layout-gpos-private.hh | 26 ++++++++++++++----------- + src/hb-ot-layout-gsub-private.hh | 37 + +++++++++++++++++++----------------- + src/hb-ot-layout-gsubgpos-private.hh | 29 +++++++++++++++------------- + 4 files changed, 53 insertions(+), 44 deletions(-) + +commit 173fde7087c0db3e99409f1119530477c14072f5 +Author: Behdad Esfahbod +Date: Thu Apr 29 01:47:30 2010 -0400 + + Further simplify tracing + + src/hb-open-type-private.hh | 31 +++++++++++++++---------------- + src/hb-ot-layout-gpos-private.hh | 9 +++++---- + src/hb-ot-layout-gsub-private.hh | 11 ++++++----- + src/hb-ot-layout-gsubgpos-private.hh | 8 -------- + 4 files changed, 26 insertions(+), 33 deletions(-) + +commit bc200457430c083914a64bf4b056153506749610 +Author: Behdad Esfahbod +Date: Thu Apr 29 01:40:26 2010 -0400 + + Simplify trace code + + src/hb-open-type-private.hh | 41 +++++++++--------------------- + src/hb-ot-layout-gsubgpos-private.hh | 25 +++++-------------- + src/hb-private.h | 48 + +++++++++++++++++++++++++----------- + 3 files changed, 51 insertions(+), 63 deletions(-) + +commit 807c5b03a2251a3c29a520852639421783101b55 +Author: Behdad Esfahbod +Date: Wed Apr 28 20:25:22 2010 -0400 + + [sanitize] Make debug code always available to the compiler + + Such that we don't break debug build all the time. + + src/hb-open-type-private.hh | 31 ++++++++++++++++++++----------- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 2 files changed, 21 insertions(+), 12 deletions(-) + +commit 74e313c016704e1d9157c2763691c4151f049dfc +Author: Behdad Esfahbod +Date: Wed Apr 28 15:15:09 2010 -0400 + + [gsubgpos] Make debug code always available to the compiler + + Such that we don't break debug build all the time. + + src/hb-ot-layout-gsubgpos-private.hh | 52 + ++++++++++++++++++------------------ + 1 file changed, 26 insertions(+), 26 deletions(-) + +commit 41011a6ed7c4891b20c0eddbb6d4ad9c820cfddb +Author: Behdad Esfahbod +Date: Wed Apr 28 13:33:09 2010 -0400 + + Fix compiler warning about value unused + + src/hb-object-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 863df68e894b7644dcd12da88aa22f73edf829dc +Author: Behdad Esfahbod +Date: Wed Apr 28 13:29:55 2010 -0400 + + [object] Make debug code always available to the compiler + + Such that we don't break debug build all the time. + + src/hb-object-private.h | 42 +++++++++++++++++++++++++++--------------- + 1 file changed, 27 insertions(+), 15 deletions(-) + +commit 1d52151a19ed8ec776276aac5cc6ce3769e0d947 +Author: Behdad Esfahbod +Date: Wed Apr 28 13:18:41 2010 -0400 + + Minor + + src/hb-private.h | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 444fffb1ab378cb3022e2a8e9f90d20a00c82f6a +Author: Behdad Esfahbod +Date: Wed Apr 28 13:16:38 2010 -0400 + + [blob] Make debug code always available to the compiler + + Such that we don't break debug build all the time. + + src/hb-blob.c | 78 + ++++++++++++++++++++++++----------------------------------- + 1 file changed, 32 insertions(+), 46 deletions(-) + +commit ba51b25c7ba568aeced17f016eceba987569c5d9 +Author: Behdad Esfahbod +Date: Wed Apr 28 13:10:36 2010 -0400 + + Fix build. Ouch! + + src/hb-object-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a92f0fda7fee9d60b399b8865541bf73e6e30141 +Author: Behdad Esfahbod +Date: Wed Apr 28 13:09:40 2010 -0400 + + Fix debug build + + src/hb-open-type-private.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit c165f25410f817d248ad5d07e1827d33efd1b0a0 +Author: Behdad Esfahbod +Date: Tue Apr 27 23:28:10 2010 -0400 + + [object] Actually handle malloc() failure + + Caught by John Daggett. + + src/hb-object-private.h | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit caff7db93d205e32a535d49e51a3cad70f91dfdd +Author: Behdad Esfahbod +Date: Mon Apr 26 10:07:35 2010 -0400 + + Fix Device::get_size() calculation + + src/hb-ot-layout-common-private.hh | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 66d6eb30eb0b8d61e00f86ea0c7829abaddb52fa +Author: Behdad Esfahbod +Date: Sun Apr 25 23:01:45 2010 -0400 + + Rename Var to Obj + + src/hb-open-type-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 690b9194619589c32ffc0c092e45262ae7776e79 +Author: Behdad Esfahbod +Date: Sun Apr 25 22:51:05 2010 -0400 + + Remove use of flexible arrays + + Also remove wrong ASSERT_SIZE that would trigger only when not using + flexible arrays (which was the case on win32, but not with gcc). + + configure.ac | 2 -- + src/hb-open-file-private.hh | 1 - + src/hb-private.h | 4 ---- + 3 files changed, 7 deletions(-) + +commit 1cebfbb0636b13dc5dc6a4b8b7acbb7da28129d2 +Author: Behdad Esfahbod +Date: Fri Apr 23 20:49:18 2010 -0400 + + Cleanup hb_face_create_for_data() + + src/Makefile.am | 1 + + src/hb-blob-private.h | 57 +++++++++++++++++++++++++++++++ + src/hb-blob.c | 20 ++--------- + src/hb-font-private.h | 3 -- + src/hb-font.cc | 92 + +++++++++++++++++++++++++++++++++++---------------- + 5 files changed, 123 insertions(+), 50 deletions(-) + +commit d6b3c83a90f60bedb4049750ffb351161710980d +Author: Behdad Esfahbod +Date: Fri Apr 23 19:59:53 2010 -0400 + + Allow get_table() to return NULL + + src/hb-font.cc | 6 +++++- + src/hb-ft.c | 2 +- + 2 files changed, 6 insertions(+), 2 deletions(-) + +commit ad3653751b1e4a03f7058200cb83f64db46722d5 +Author: Behdad Esfahbod +Date: Fri Apr 23 19:43:40 2010 -0400 + + Typo + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 990443e5f282ad61de00dcf1ebff9cf1d5bc2d70 +Author: Behdad Esfahbod +Date: Fri Apr 23 17:53:32 2010 -0400 + + Remove lock_instance() + + src/hb-font.cc | 2 +- + src/hb-open-type-private.hh | 4 ---- + src/hb-ot-layout.cc | 6 +++--- + 3 files changed, 4 insertions(+), 8 deletions(-) + +commit 187454c595559ce48d072fee6bccb51f3de283d4 +Author: Behdad Esfahbod +Date: Fri Apr 23 16:35:01 2010 -0400 + + Add different casts from pointer and ref to avoid bugs + + src/hb-open-type-private.hh | 22 +++++++++++++++------- + src/hb-ot-layout-gpos-private.hh | 8 ++++---- + src/hb-ot-layout-gsub-private.hh | 12 ++++++------ + src/main.cc | 6 +++--- + 4 files changed, 28 insertions(+), 20 deletions(-) + +commit efb324a46ff64adb4ec8612b4089e8daff1e6d8e +Author: Behdad Esfahbod +Date: Fri Apr 23 16:22:54 2010 -0400 + + Remove GET_FOR_DATA macros + + The major-version check is now handled by sanitize. If major + doesn't match, we reject and fall back to the Null object. + + src/hb-open-file-private.hh | 4 ---- + src/hb-open-type-private.hh | 23 ++--------------------- + src/hb-ot-layout-gdef-private.hh | 2 -- + src/hb-ot-layout-gpos-private.hh | 3 --- + src/hb-ot-layout-gsub-private.hh | 3 --- + src/hb-ot-layout-gsubgpos-private.hh | 2 -- + src/main.cc | 6 +++--- + 7 files changed, 5 insertions(+), 38 deletions(-) + +commit f1aaa2a43654c28405ffd393de2cb127437c99a5 +Author: Behdad Esfahbod +Date: Fri Apr 23 15:19:50 2010 -0400 + + Add TODO + + src/hb-ft.c | 2 -- + src/hb-ft.h | 1 + + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 2 ++ + src/hb-ot-layout-common-private.hh | 12 ++++++------ + 5 files changed, 10 insertions(+), 9 deletions(-) + +commit 33d4d4325e15e332105ea8f361bab79ee542f0f8 +Author: Behdad Esfahbod +Date: Fri Apr 23 14:56:55 2010 -0400 + + Zero glyph metrics before calling user callback + + src/hb-font.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 4206e9511a222c0c50cc9b4fe72ec421983bba2c +Author: Behdad Esfahbod +Date: Fri Apr 23 14:44:55 2010 -0400 + + More warning fixes + + src/hb-ot-layout.cc | 4 ++-- + src/hb-ot-shape.c | 9 ++++----- + src/hb-shape.c | 32 ++++++++++++++++---------------- + 3 files changed, 22 insertions(+), 23 deletions(-) + +commit ef66ebeabc6c234004bd9e9bb67eb5c9711f4a1e +Author: Behdad Esfahbod +Date: Fri Apr 23 14:40:36 2010 -0400 + + Remove unused parameter + + src/hb-open-file-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 1d720192b193f48b44be0385eda3c2c5d5cd28ad +Author: Behdad Esfahbod +Date: Fri Apr 23 14:39:10 2010 -0400 + + Fix compile warnings (HB_GNUC_UNUSED) + + src/hb-buffer.c | 6 +++--- + src/hb-font.cc | 31 ++++++++++++++++++++++--------- + src/hb-ft.c | 29 +++++++++++++++++++++-------- + src/hb-open-type-private.hh | 2 +- + src/hb-unicode.c | 8 ++++---- + 5 files changed, 51 insertions(+), 25 deletions(-) + +commit 8dfdca599c0a3ba5255131002910bca3b381acac +Author: Behdad Esfahbod +Date: Fri Apr 23 14:07:34 2010 -0400 + + No need to keep blob in sanitize context + + src/hb-open-type-private.hh | 13 +++++-------- + 1 file changed, 5 insertions(+), 8 deletions(-) + +commit 254933c397f1ce9796f59689a25f9fc2e58df4ea +Author: Behdad Esfahbod +Date: Fri Apr 23 13:57:10 2010 -0400 + + When sanitizing, delay making writable + + Before, as soon as we needed to make an edit, we tried to make + the blob + writable inplace. That grows code unnecessarily though. We can + simply + fail, make writable, then start again. That's indeed what the + fallback + was doing anyway. + + src/hb-open-type-private.hh | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +commit 71e735e915c85536ee4d3035576f7426e8cd19dd +Author: Behdad Esfahbod +Date: Fri Apr 23 13:48:06 2010 -0400 + + [blob] Fallback to copying if mprotect() fails + + src/hb-blob.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 1aa4666b914da7747fc58a8f6f2d913c94e3b8da +Author: Behdad Esfahbod +Date: Fri Apr 23 13:32:03 2010 -0400 + + Cleanup OpenTypeFontFile + + src/hb-open-file-private.hh | 44 + ++++++++++++++++++++++++++------------------ + src/main.cc | 2 +- + 2 files changed, 27 insertions(+), 19 deletions(-) + +commit ae4190cafe927649f8ff8be6a0082478d1298fda +Author: Behdad Esfahbod +Date: Fri Apr 23 12:33:02 2010 -0400 + + Properly define separate structs for TTCHeader and TTCHeaderVersion1 + + src/hb-open-file-private.hh | 71 + +++++++++++++++++++++++++++++++++++---------- + 1 file changed, 55 insertions(+), 16 deletions(-) + +commit a065f471b3bc23d33ef75217308efeaed4ffd033 +Author: Behdad Esfahbod +Date: Thu Apr 22 20:15:11 2010 -0400 + + Cleanup Extension lookups + + Two things: + + 1. Allow nested Extension lookups. The offset is always positive, so + it can't loop circularly. + + 2. Move the check for all Extension subtables having the same lookup + type to the correct place. Before it wasn't really working. + + src/hb-ot-layout-gpos-private.hh | 29 +------------------- + src/hb-ot-layout-gsub-private.hh | 57 + ++++++++++++++++++++++------------------ + 2 files changed, 33 insertions(+), 53 deletions(-) + +commit a0bb49c5830f8a7f25d573ec57b79df2620ddba7 +Author: Behdad Esfahbod +Date: Thu Apr 22 18:47:03 2010 -0400 + + Add comment re bsearch effect on sanitize + + src/hb-open-file-private.hh | 2 +- + src/hb-ot-layout-common-private.hh | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit d632ec4000b3079150e6424e88a3ab7509f7445c +Author: Behdad Esfahbod +Date: Thu Apr 22 18:33:12 2010 -0400 + + Cosmetic + + src/hb-open-type-private.hh | 6 +++--- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit a3263aa773ad7a914496792466c69047048b093c +Author: Behdad Esfahbod +Date: Thu Apr 22 18:29:09 2010 -0400 + + Convert the last set of cast macros to templates + + src/hb-open-file-private.hh | 4 +-- + src/hb-open-type-private.hh | 53 + +++++++++++++++++++++++------------- + src/hb-ot-layout-gpos-private.hh | 16 +++++------ + src/hb-ot-layout-gsub-private.hh | 14 +++++----- + src/hb-ot-layout-gsubgpos-private.hh | 12 ++++---- + 5 files changed, 57 insertions(+), 42 deletions(-) + +commit c38188a1912f72d9ef90ae1bcbdbba7ecce63371 +Author: Behdad Esfahbod +Date: Thu Apr 22 16:52:09 2010 -0400 + + Remove unused macro + + src/hb-open-type-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 3b2c2df41b90f2a1d9e33b3dc15a92cff58a689a +Author: Behdad Esfahbod +Date: Thu Apr 22 16:51:42 2010 -0400 + + Cleanup Extension sanitize() + + src/hb-ot-layout-common-private.hh | 20 +++----------------- + src/hb-ot-layout-gpos-private.hh | 20 +++++++++++++------- + src/hb-ot-layout-gsub-private.hh | 20 +++++++++++++------- + src/hb-ot-layout-gsubgpos-private.hh | 13 ++++--------- + 4 files changed, 33 insertions(+), 40 deletions(-) + +commit 1856184b93760a1a54fb1a3c54281bb252df7ce6 +Author: Behdad Esfahbod +Date: Thu Apr 22 14:15:11 2010 -0400 + + Fail sanitize on major version mismatch + + We handle major-version differences via get_for_data(), so sanitize + should never see a major version mismatch. + + src/hb-open-file-private.hh | 4 ++-- + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit df3f505dcfeefc8cd395900b116767d22549f756 +Author: Behdad Esfahbod +Date: Thu Apr 22 14:11:33 2010 -0400 + + More sanitize cleanup + + src/hb-open-file-private.hh | 24 ++---------------------- + src/main.cc | 4 ++-- + 2 files changed, 4 insertions(+), 24 deletions(-) + +commit 278a91f0cd802ac817c2603429bae1fa4a350ea0 +Author: Behdad Esfahbod +Date: Thu Apr 22 13:59:39 2010 -0400 + + Minor cleanup of sanitize + + Done with an audit of all sanitize() + + src/hb-ot-layout-gpos-private.hh | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 9ac7dc73bc24b6dafb94df5de9cbf8fa0c82d5bc +Author: Behdad Esfahbod +Date: Thu Apr 22 13:50:22 2010 -0400 + + Check for (impossible) overflow + + src/hb-ot-layout-gpos-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 9fc8684fd85ef6ec82b3b54323761bbdd4c3d891 +Author: Behdad Esfahbod +Date: Thu Apr 22 13:37:58 2010 -0400 + + Cleanup ContextFormat3 sanitize + + src/hb-ot-layout-gsubgpos-private.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit e77302c61f1f1620d1f438a997575fa6ee5c172e +Author: Behdad Esfahbod +Date: Thu Apr 22 13:34:00 2010 -0400 + + Add comment + + src/hb-ot-layout-common-private.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 7c469c3ca4ed4e45c50eff70df59b1a4780bae5b +Author: Behdad Esfahbod +Date: Thu Apr 22 13:26:21 2010 -0400 + + Minor + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dc228048a813e43356373505168d3822deea5d72 +Author: Behdad Esfahbod +Date: Thu Apr 22 13:22:41 2010 -0400 + + Remove integrity check in Tag sanitize + + Serves no useful purpose. + + src/hb-open-type-private.hh | 9 --------- + src/hb-ot-layout-common-private.hh | 2 +- + 2 files changed, 1 insertion(+), 10 deletions(-) + +commit 8015a8c762dc7be36998d529b7a3af59e3d14d87 +Author: Behdad Esfahbod +Date: Thu Apr 22 11:06:30 2010 -0400 + + Don't sanitize raw table data + + That part is performed by individual table sanitize. + + src/hb-open-file-private.hh | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +commit c293581e962b7982622e7d607fa3909b40da718e +Author: Behdad Esfahbod +Date: Thu Apr 22 11:15:46 2010 -0400 + + Add coment + + src/hb-open-type-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 1faa76c6e848c6b0e360d9ddcf567533b87f8f31 +Author: Behdad Esfahbod +Date: Thu Apr 22 10:54:26 2010 -0400 + + Remove unnecessary casts + + src/hb-open-type-private.hh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 079dc40112d3908ff7b7028ea3019bfe82bf606d +Author: Behdad Esfahbod +Date: Thu Apr 22 10:47:12 2010 -0400 + + Avoid overflow in TableDirectory sanitize + + src/hb-open-file-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fb5904ec935d925a423401bc975ffaa22022ce1b +Author: Behdad Esfahbod +Date: Thu Apr 22 10:43:30 2010 -0400 + + Make casts more explicit + + src/hb-ot-layout-gpos-private.hh | 4 ++-- + src/hb-ot-layout-gsub-private.hh | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 565c80bd2960366ace2d10dd71beaaf2a80213c8 +Author: Behdad Esfahbod +Date: Thu Apr 22 10:26:35 2010 -0400 + + Make sure semicolon is expected after DEFINE_NULL_DATA() + + src/hb-open-type-private.hh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit bb1e16335e537231246f44740f73cc23c0707364 +Author: Behdad Esfahbod +Date: Thu Apr 22 01:01:35 2010 -0400 + + Improve Subst/Pos SubTable access and sanitize + + src/hb-ot-layout-gpos-private.hh | 4 ++-- + src/hb-ot-layout-gsub-private.hh | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 81f2af40f9afd5bb9695018e6baddcd4aa3361c1 +Author: Behdad Esfahbod +Date: Thu Apr 22 00:58:49 2010 -0400 + + Simplify Extension offset now that our int types have no alignment + + src/hb-ot-layout-gsubgpos-private.hh | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +commit 19828ad42d8117563412aae3c70887aa117805a9 +Author: Behdad Esfahbod +Date: Thu Apr 22 00:49:16 2010 -0400 + + Sanitize shallow in Lookup since the generic SubLookup has no methods + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e5546a4352c54311ac4a9ef138b187378155ebe1 +Author: Behdad Esfahbod +Date: Thu Apr 22 00:45:42 2010 -0400 + + Watch for overflow in Array sanitize + + src/hb-open-type-private.hh | 21 +++++++++++++++------ + src/hb-ot-layout-common-private.hh | 2 +- + 2 files changed, 16 insertions(+), 7 deletions(-) + +commit 4f5f1c34dda1e0629bfa6d7b0ffa2e1ce003b7c7 +Author: Behdad Esfahbod +Date: Thu Apr 22 00:27:39 2010 -0400 + + Rename const_sub_array to sub_array since all consts are implicit now + + src/hb-open-type-private.hh | 2 +- + src/hb-ot-layout-common-private.hh | 4 ++-- + src/hb-ot-layout-gdef-private.hh | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +commit 0795b784dd1009976c185482a376df250167e73b +Author: Behdad Esfahbod +Date: Thu Apr 22 00:23:14 2010 -0400 + + Cosmetic + + src/hb-ot-layout-common-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 2d98d3bbaa0ddadcb08b5a8f437b18c211c50768 +Author: Behdad Esfahbod +Date: Thu Apr 22 00:19:30 2010 -0400 + + Simplify Lookup sanitize + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c755cb3e3ac55156d0d2ec05adea7a650b97cc41 +Author: Behdad Esfahbod +Date: Thu Apr 22 00:11:43 2010 -0400 + + Change header comment + + README | 2 +- + src/hb-blob.c | 2 +- + src/hb-blob.h | 2 +- + src/hb-buffer-private.h | 2 +- + src/hb-buffer.c | 2 +- + src/hb-buffer.h | 2 +- + src/hb-common.h | 2 +- + src/hb-font-private.h | 2 +- + src/hb-font.cc | 2 +- + src/hb-font.h | 2 +- + src/hb-ft.c | 2 +- + src/hb-ft.h | 2 +- + src/hb-glib.c | 2 +- + src/hb-glib.h | 2 +- + src/hb-icu.c | 2 +- + src/hb-icu.h | 2 +- + src/hb-language.c | 2 +- + src/hb-language.h | 2 +- + src/hb-object-private.h | 2 +- + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 2 +- + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 2 +- + src/hb-ot-layout-gsub-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + src/hb-ot-layout-private.h | 2 +- + src/hb-ot-layout.cc | 2 +- + src/hb-ot-layout.h | 2 +- + src/hb-ot-shape-private.h | 2 +- + src/hb-ot-shape.c | 2 +- + src/hb-ot-tag.c | 2 +- + src/hb-ot-tag.h | 2 +- + src/hb-ot.h | 2 +- + src/hb-private.h | 2 +- + src/hb-shape.c | 2 +- + src/hb-shape.h | 2 +- + src/hb-unicode-private.h | 2 +- + src/hb-unicode.c | 2 +- + src/hb-unicode.h | 2 +- + src/hb.h | 2 +- + src/main.cc | 2 +- + 42 files changed, 42 insertions(+), 42 deletions(-) + +commit 243d20e011e251462a07947275e0e98cc19c7e9b +Author: Behdad Esfahbod +Date: Wed Apr 21 23:57:01 2010 -0400 + + More cast simplification + + src/hb-open-type-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 0dfcc13a4668cdd2c2ebdd5f4a7540a51222cf2f +Author: Behdad Esfahbod +Date: Wed Apr 21 23:41:26 2010 -0400 + + Rename ConstCharP to CharP (overloaded now) + + src/hb-open-file-private.hh | 10 +++++----- + src/hb-open-type-private.hh | 24 ++++++++++++------------ + src/hb-ot-layout-gpos-private.hh | 12 ++++++------ + src/hb-ot-layout-gsub-private.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 14 +++++++------- + 5 files changed, 32 insertions(+), 32 deletions(-) + +commit 62c0fd75737a69721dbf29e773405a4c529f8b6d +Author: Behdad Esfahbod +Date: Wed Apr 21 23:30:48 2010 -0400 + + Cleanup de-const-casting during sanitize + + src/hb-open-file-private.hh | 2 +- + src/hb-open-type-private.hh | 29 ++++++++++++++--------------- + src/hb-ot-layout-common-private.hh | 4 ++-- + src/hb-ot-layout-gpos-private.hh | 12 ++++++------ + 4 files changed, 23 insertions(+), 24 deletions(-) + +commit dd155870567cfb9647b2e71593ace8b2705d7cff +Author: Behdad Esfahbod +Date: Wed Apr 21 23:13:33 2010 -0400 + + Add more comments + + src/hb-open-type-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit c85c3620675f38ffdca59134aeec2641485f40ca +Author: Behdad Esfahbod +Date: Wed Apr 21 23:12:54 2010 -0400 + + Add comment + + src/hb-open-type-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 2467c669c2aee4de2a6621a9d06cba0262376d41 +Author: Behdad Esfahbod +Date: Wed Apr 21 23:11:45 2010 -0400 + + Add comment + + src/hb-open-type-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit 29c3f5e1b6212c775a7b911becd44ba093b7b0eb +Author: Behdad Esfahbod +Date: Wed Apr 21 23:01:00 2010 -0400 + + Improve comment + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 01c01618e98283611628cd54d5ba4bf122f24cd9 +Author: Behdad Esfahbod +Date: Wed Apr 21 22:49:56 2010 -0400 + + Further simplify IntType struct defs + + src/hb-open-type-private.hh | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) + +commit 2cb08458f674301cde9d962c13911035a251f7c5 +Author: Behdad Esfahbod +Date: Wed Apr 21 22:37:31 2010 -0400 + + Rename const_array() to array() (overloaded) + + src/hb-open-type-private.hh | 12 ++++++------ + src/hb-ot-layout-common-private.hh | 4 ++-- + src/hb-ot-layout-gsub-private.hh | 6 +++--- + src/hb-ot-layout-gsubgpos-private.hh | 16 ++++++++-------- + 4 files changed, 19 insertions(+), 19 deletions(-) + +commit 2e2f43edf2f49f4047e28b1ce2ea95938536de9c +Author: Behdad Esfahbod +Date: Wed Apr 21 22:30:36 2010 -0400 + + Remove ArrayAfter, use StructAfter in place + + src/hb-open-type-private.hh | 21 ++++++--------------- + 1 file changed, 6 insertions(+), 15 deletions(-) + +commit e961c86c579fd98ee604342a9c70c4e7f8d4f220 +Author: Behdad Esfahbod +Date: Wed Apr 21 15:56:11 2010 -0400 + + Convert NEXT() and ARRAY_AFTER() macros to templates + + src/hb-open-type-private.hh | 40 + ++++++++++++++++++++++++++---------- + src/hb-ot-layout-common-private.hh | 4 ++-- + src/hb-ot-layout-gsub-private.hh | 8 ++++---- + src/hb-ot-layout-gsubgpos-private.hh | 24 +++++++++++----------- + 4 files changed, 47 insertions(+), 29 deletions(-) + +commit 198facdc55756cb48cdfb8ba7fa50916fac54ec3 +Author: Behdad Esfahbod +Date: Wed Apr 21 13:35:36 2010 -0400 + + Use templates for const char * casts + + src/hb-open-file-private.hh | 12 ++++----- + src/hb-open-type-private.hh | 48 + ++++++++++++++++++------------------ + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 32 ++++++++++++------------ + src/hb-ot-layout-gsub-private.hh | 4 +-- + src/hb-ot-layout-gsubgpos-private.hh | 14 +++++------ + 6 files changed, 56 insertions(+), 56 deletions(-) + +commit 1922ffe7013c46014803a9f18c42e193a25b1968 +Author: Behdad Esfahbod +Date: Wed Apr 21 04:19:51 2010 -0400 + + Const correctness + + src/hb-ot-layout-gsub-private.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 30 +++++++++++++++--------------- + 2 files changed, 17 insertions(+), 17 deletions(-) + +commit e032ed9f75d4a0f365649a25706871bbb5ae6651 +Author: Behdad Esfahbod +Date: Wed Apr 21 03:11:46 2010 -0400 + + Use templates for defining int typess + + src/hb-open-type-private.hh | 66 + ++++++++++++++++++++++++++++++--------------- + src/hb-private.h | 10 ++----- + 2 files changed, 46 insertions(+), 30 deletions(-) + +commit 2c9fd2adce5a6a9dcd62c874bd64613ea68d8d9b +Author: Behdad Esfahbod +Date: Wed Apr 21 02:15:39 2010 -0400 + + Remove unused macro + + src/hb-open-type-private.hh | 15 --------------- + 1 file changed, 15 deletions(-) + +commit 7a52f281178867379adb6e6c6fb0022102f75d17 +Author: Behdad Esfahbod +Date: Wed Apr 21 02:14:44 2010 -0400 + + Rename macros + + src/hb-open-type-private.hh | 6 +++--- + src/hb-private.h | 30 +++++++++++++++--------------- + 2 files changed, 18 insertions(+), 18 deletions(-) + +commit ffff7dc44cb2a35a60f92831165e9d3c3a61ce19 +Author: Behdad Esfahbod +Date: Wed Apr 21 02:13:55 2010 -0400 + + Minor + + src/hb-private.h | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit f60f2166c48d07f556ff83f04e95181946eb03df +Author: Behdad Esfahbod +Date: Wed Apr 21 02:12:45 2010 -0400 + + Move macros around + + src/hb-private.h | 122 + ++++++++++++++++++++++++++++--------------------------- + 1 file changed, 62 insertions(+), 60 deletions(-) + +commit 649a4344ca363da3d44cdd908350449ec40ed0f9 +Author: Behdad Esfahbod +Date: Wed Apr 21 02:11:59 2010 -0400 + + Remove unused macros + + src/hb-private.h | 7 ------- + 1 file changed, 7 deletions(-) + +commit eba8b4f644701cc6b78b0fcb4e932dce15561598 +Author: Behdad Esfahbod +Date: Mon Mar 29 00:04:12 2010 -0400 + + GNOME Bug 613015 - [HB] Does not sanitize Device tables referenced + from ValueRecords + + src/hb-ot-layout-gpos-private.hh | 47 + ++++++++++++++++++++++++++++++---------- + 1 file changed, 36 insertions(+), 11 deletions(-) + +commit 673a4efcbc72a62105a24d9b0b54047417160f7d +Author: Behdad Esfahbod +Date: Wed Apr 21 02:02:57 2010 -0400 + + WIP + + src/hb-ot-layout-gpos-private.hh | 102 + +++++++++++++++++++++++++++++++-------- + 1 file changed, 81 insertions(+), 21 deletions(-) + +commit 40d73bc68dd828cf68f90fde0f9499a6ce9fbb19 +Author: Behdad Esfahbod +Date: Wed Apr 21 00:49:40 2010 -0400 + + Improve comments + + src/hb-open-type-private.hh | 22 ++++++++++++++-------- + 1 file changed, 14 insertions(+), 8 deletions(-) + +commit 394bad41a76f90e441e327cef76efb99997e9ae0 +Author: Behdad Esfahbod +Date: Wed Apr 21 00:40:50 2010 -0400 + + Remove stale TODO item + + src/hb-open-type-private.hh | 1 - + 1 file changed, 1 deletion(-) + +commit 9d3677899f90abdc7fb3e3d854db654a8707a84b +Author: Behdad Esfahbod +Date: Wed Apr 21 00:32:47 2010 -0400 + + Use a function template instead of struct template for Null + + src/hb-open-type-private.hh | 24 ++++++++++-------------- + 1 file changed, 10 insertions(+), 14 deletions(-) + +commit ffd321afd91429c5de7ab03d71ef1030044f53cb +Author: Behdad Esfahbod +Date: Wed Apr 21 00:14:12 2010 -0400 + + Simplify Tag struct + + src/hb-open-file-private.hh | 3 ++- + src/hb-open-type-private.hh | 6 +----- + src/hb-ot-layout-common-private.hh | 3 ++- + 3 files changed, 5 insertions(+), 7 deletions(-) + +commit 00e23fcc6fd0eee5c582251bf3de6a2703fbbd3e +Author: Behdad Esfahbod +Date: Tue Apr 20 23:50:45 2010 -0400 + + Cosmetic + + src/hb-open-type-private.hh | 8 ++++---- + src/hb-ot-layout-common-private.hh | 6 +++--- + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit a87072db5d41e25b2e31191545298bca4838c65c +Author: Behdad Esfahbod +Date: Tue Apr 20 15:52:47 2010 -0400 + + Fix Class operator return type + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f9b37727985191c9b4aedb0e9835736027e59260 +Author: Behdad Esfahbod +Date: Tue Apr 20 15:51:53 2010 -0400 + + Add couple consts to operators + + src/hb-open-type-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 53d237ec6352d7c6fab3b2805b48154a25506beb +Author: Behdad Esfahbod +Date: Tue Apr 20 15:25:27 2010 -0400 + + Remove ASSERT_SIZE_DATA + + src/hb-open-type-private.hh | 4 ---- + src/hb-ot-layout-common-private.hh | 9 ++++++--- + 2 files changed, 6 insertions(+), 7 deletions(-) + +commit 06558d2a745b8f3af11a8d6dce956ae52187a7e5 +Author: Behdad Esfahbod +Date: Mon Apr 19 02:34:10 2010 -0400 + + Round instead of trunc + + src/hb-ot-layout-gpos-private.hh | 20 ++++++++++---------- + src/hb-private.h | 2 +- + 2 files changed, 11 insertions(+), 11 deletions(-) + +commit 0e206de98621ed8a55824b42e9e6bf320f4c6cc8 +Author: Behdad Esfahbod +Date: Mon Apr 19 02:29:04 2010 -0400 + + Fix warnings + + src/hb-open-type-private.hh | 2 +- + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 4 ++-- + src/hb-ot-layout-gsubgpos-private.hh | 6 +++--- + 4 files changed, 7 insertions(+), 7 deletions(-) + +commit d5943407a4251cb947fbfc130c0facb2f6216bd6 +Author: Behdad Esfahbod +Date: Mon Apr 19 02:27:56 2010 -0400 + + Fix debug build + + src/hb-open-type-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 12b27ed91de0192deee4e9feffcaf4aca4c78113 +Author: Behdad Esfahbod +Date: Sat Mar 27 17:00:19 2010 -0400 + + Fix leak when duplicating blob + + src/hb-blob.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 4b8487d83e0c10076a6c573cb3487790ce366607 +Author: Behdad Esfahbod +Date: Tue Mar 16 03:46:17 2010 -0400 + + Fix the mystery bug! + + A couple bugs joined forces to exhibit the mystery behavior of + crashes / infinite loops on OS X / wrong kerning / invalid memory + access. Pooh! + + The bugs were involved: + + - Wrong pointer math with ValueRecord in PairPosFormat1 + + - Fallout from avoiding flex arrays, code not correctly updated + to remove sizeof() usage. + + We strictly never use sizeof() directly now. And the PairPos code + is cleaned up. Should fix them all. Bugs are: + + Bug 605655 - Pango 1.26.2 introduces kerning bug + Bug 611229 - Pango reads from uninitialized memory + Bug 593240 - (pangoosx) Crash / infinite loop with Mac OS X + + We were also doing wrong math converting Device adjustments to + hb_position_t. Fallout from FreeType days. Should shift 16, not + 6. Fixed that too. + + There's still another bug: we don't sanitize Device records + referenced from value records. Fixing that also. + + src/hb-open-file-private.hh | 4 +++- + src/hb-open-type-private.hh | 11 ++++++----- + src/hb-ot-layout-common-private.hh | 10 ++++++++-- + src/hb-ot-layout-gpos-private.hh | 37 + ++++++++++++++++++++---------------- + src/hb-ot-layout-gsubgpos-private.hh | 15 ++++++++------- + 5 files changed, 46 insertions(+), 31 deletions(-) + +commit 9b39755d104603d1163738f77637cc1923d4055b +Author: Behdad Esfahbod +Date: Thu Apr 15 14:00:25 2010 -0400 + + Typo + + src/hb-open-type-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f85ec1c7da36d2c2c9b1c94a988563697dcc79c9 +Author: Behdad Esfahbod +Date: Wed Mar 10 04:14:40 2010 -0500 + + Cosmetic + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e48ed72230a83499dabbd02af2ac63340220a353 +Author: Behdad Esfahbod +Date: Mon Mar 1 22:33:45 2010 -0500 + + [ft] Check stream->read instead of stream->base + + The former is more robust. See discussion on freetype-devel. + + src/hb-ft.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 917c227500305aee543981ad24a39f868c5ca0b7 +Author: Behdad Esfahbod +Date: Tue Feb 23 16:47:51 2010 -0500 + + Make blob unlocking 64bit-safe + + GNOME Bug 604128 - Applications crash when displaying Hebrew + characters + + src/hb-blob.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit ecd2e996d2137fef30011a41dd57ea45f9a796de +Author: Behdad Esfahbod +Date: Tue Feb 23 02:42:00 2010 -0500 + + Improve the alignment for NullPool + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bc7830e4259755ce7549025c6f5bf750e78c2ff1 +Author: Behdad Esfahbod +Date: Wed Feb 17 15:14:57 2010 -0500 + + Use __attribute__((unused)) only with gcc 4 and later + + See discussion at: + https://bugzilla.gnome.org/show_bug.cgi?id=610183 + + src/hb-private.h | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 555d11273ee4c30e84eda3a78ffadb3ee7da65d0 +Author: Behdad Esfahbod +Date: Tue Jan 26 12:58:59 2010 -0500 + + [GDEF] Fix bug in building synthetic GDEF + + src/hb-ot-layout.cc | 5 +++-- + src/hb-ot-layout.h | 1 - + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 70834d89c30a56fcd78825fbc28fc9c6bec31124 +Author: Behdad Esfahbod +Date: Tue Jan 26 12:17:37 2010 -0500 + + [TODO] Add kern/GPOS interaction + + TODO | 3 +++ + 1 file changed, 3 insertions(+) + +commit cd11a98fa1426e9dbc4b61e702913b23a4794ae2 +Author: Behdad Esfahbod +Date: Sun Dec 20 23:05:02 2009 +0100 + + Fix compile with older FreeType + + configure.ac | 7 +++++++ + src/hb-ft.c | 2 ++ + 2 files changed, 9 insertions(+) + +commit 7f7448a354c43650348b4e91b4e40ecf18718d66 +Author: Behdad Esfahbod +Date: Sun Dec 20 21:42:14 2009 +0100 + + Indent + + src/hb-ot-layout-gpos-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e70f45eb522bcb41388cc218b79bbd6aaecf8050 +Author: Behdad Esfahbod +Date: Sun Dec 20 21:26:24 2009 +0100 + + Revert "Fallback to 'kern' if no GPOS applied" + + This reverts commit d740c8f78bcbe80a8bcd8a9468830a406da37cc0. + + The change is wrong. If there is a GPOS table, we should not use + 'kern'. + + src/hb-ot-shape.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d740c8f78bcbe80a8bcd8a9468830a406da37cc0 +Author: Behdad Esfahbod +Date: Sun Dec 20 21:23:56 2009 +0100 + + Fallback to 'kern' if no GPOS applied + + src/hb-ot-shape.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 2f78c17197892b2bdc2f64caeb1c1c806ef44545 +Author: Behdad Esfahbod +Date: Sun Dec 20 21:03:11 2009 +0100 + + Remove glibism! + + src/hb-ot-shape-private.h | 4 ++-- + src/hb-ot-shape.c | 4 ++-- + src/hb-shape.c | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +commit 907e67da13b5ed719362702138703fe2f90e790d +Author: Behdad Esfahbod +Date: Sun Dec 20 20:59:51 2009 +0100 + + Oops, add file. + + src/hb-ot-shape-private.h | 53 + +++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 53 insertions(+) + +commit 2014b8d110231b13e524008282ece7451f1ae9e7 +Author: Behdad Esfahbod +Date: Sun Dec 20 20:58:26 2009 +0100 + + Hook OpenType shaping up + + Default features only for now. + + src/Makefile.am | 2 + + src/hb-ot-layout.cc | 28 +++++++++ + src/hb-ot-layout.h | 7 +++ + src/hb-ot-shape.c | 165 + ++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-shape.c | 8 +-- + 5 files changed, 206 insertions(+), 4 deletions(-) + +commit 196610ba4c7071c2b802d0fc921a63cbc0753114 +Author: Behdad Esfahbod +Date: Sun Dec 20 19:01:14 2009 +0100 + + Pass features down + + src/hb-shape.c | 49 +++++++++++++++++++++++++++++++++---------------- + 1 file changed, 33 insertions(+), 16 deletions(-) + +commit 51f141a7f38a73f671b23f58cadf97a72c43b625 +Author: Behdad Esfahbod +Date: Sun Dec 20 18:22:28 2009 +0100 + + Avoid overflow + + src/hb-shape.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit 26d7a75752631b2596a5bcb7e645b34cc3d139ab +Author: Behdad Esfahbod +Date: Sun Dec 20 17:58:25 2009 +0100 + + Refactor hb_shape a bit + + src/hb-shape.c | 87 + +++++++++++++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 74 insertions(+), 13 deletions(-) + +commit 001fc2d2aa22f14302739fe4ca45f7535855e0fb +Author: Behdad Esfahbod +Date: Sun Dec 20 17:24:05 2009 +0100 + + Add TrueType kern support + + src/hb-shape.c | 74 + +++++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 48 insertions(+), 26 deletions(-) + +commit 2c1b85cf66e5ecb7521b6018b76f0e161fb68967 +Author: Behdad Esfahbod +Date: Sun Dec 20 16:29:17 2009 +0100 + + Direct unicode->get_mirroring directly + + src/hb-shape.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 6a2ef5aa5459def232708af30ef8a484906b868b +Author: Behdad Esfahbod +Date: Sun Dec 20 16:28:01 2009 +0100 + + Do mirroring + + src/hb-shape.c | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +commit 0465e69832393cc1ed36508ec5d597fbab64877a +Author: Behdad Esfahbod +Date: Sun Dec 20 16:25:18 2009 +0100 + + Protect against NULL funcs + + src/hb-buffer.c | 3 +++ + src/hb-font.cc | 3 +++ + 2 files changed, 6 insertions(+) + +commit 5ceefa1d8dbd310570ea8d1c47107fe8d3dc96d9 +Author: Behdad Esfahbod +Date: Sun Dec 20 15:29:16 2009 +0100 + + Add hb_unicode_get_*() functions + + src/hb-unicode.c | 37 +++++++++++++++++++++++++++++++++++++ + src/hb-unicode.h | 21 +++++++++++++++++++++ + 2 files changed, 58 insertions(+) + +commit b8a53e44ce05911ce98b7cff34dee165e19d87ba +Author: Behdad Esfahbod +Date: Sun Dec 20 14:56:25 2009 +0100 + + We'll have to link to libstdc++ if linking to ICU, so disable test + for now + + We have to get rid of the ICU in main lib. Still thinking about + best way + to do it. + + src/Makefile.am | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 314905d7548d5be58354546d660754b807b6efb2 +Author: Behdad Esfahbod +Date: Sun Dec 20 14:50:42 2009 +0100 + + Explicitly track whether the buffer has positions + + src/hb-buffer-private.h | 3 ++- + src/hb-buffer.c | 27 ++++++++++++++------------- + 2 files changed, 16 insertions(+), 14 deletions(-) + +commit 314b460d8a02ed4b2789ff527cf6c9bc19769114 +Author: Behdad Esfahbod +Date: Sun Dec 20 13:58:50 2009 +0100 + + Add HB_DIRECTION_IS_FORWARD/BACKWARD + + src/hb-common.h | 2 ++ + src/hb-shape.c | 3 +-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit bdd0ff5290bae4db65c3fdf95c5728031f13ca84 +Author: Behdad Esfahbod +Date: Tue Dec 15 04:07:40 2009 -0500 + + Make main.cc compile without glib + + src/main.cc | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +commit 8a7d16808200f4fa02d6d12a8b8492bdedeb2c24 +Author: Behdad Esfahbod +Date: Tue Dec 15 03:53:45 2009 -0500 + + Distribute autogen.sh + + Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +commit 807b8aa486753474e05e09f4fcca8ac94021b97c +Author: Behdad Esfahbod +Date: Thu Nov 19 20:28:03 2009 -0500 + + Another C++ strictness fix + + Pango Bug 602408 - Invalid C++ code breaks compile with Sun C++ + Compiler + (Error: A union member cannot have a user-defined assignment operator) + + According to the bug: + + C++ Programming Language by Bjarne Stroustrup: Chapter 10.4.12 forbids + explicitly using of union members with constructors, destructors + or assignment + operations. + + So we use a set() method instead of the assignment operator. Ugly, + but hey, + that's life. + + src/hb-open-type-private.hh | 8 ++++---- + src/hb-ot-layout-common-private.hh | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 8b9b866d3e495c186f0530fcf4e00ffcdc170d3f +Author: Behdad Esfahbod +Date: Thu Nov 19 20:27:57 2009 -0500 + + Fix warning + + src/hb-ot-layout-gdef-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c65b26acf28bd1a5b346fd8f6f28bec1f7d17a2a +Author: Behdad Esfahbod +Date: Wed Nov 18 11:27:33 2009 -0500 + + Use autoconf FLEXIBLE_ARRAY_MEMBER when available + + configure.ac | 2 ++ + src/hb-ot-layout-gpos-private.hh | 4 ++-- + src/hb-private.h | 13 ++++++++++--- + 3 files changed, 14 insertions(+), 5 deletions(-) + +commit d33f674cb793af40f1612df3660b138383f2de95 +Author: Behdad Esfahbod +Date: Wed Nov 18 09:47:44 2009 -0500 + + Add Mongolian variation selectors + + src/hb-shape.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit d6387757de2c27867d6f57c4ee7c4ef436b3a74f +Author: Behdad Esfahbod +Date: Wed Nov 11 17:15:03 2009 -0500 + + Fix sanitize + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 636f017e387d46d4083c9f9ee57647a94dc5dc6d +Author: Behdad Esfahbod +Date: Tue Nov 10 12:56:35 2009 -0500 + + Remove obsolete TODO item + + src/hb-open-file-private.hh | 2 -- + 1 file changed, 2 deletions(-) + +commit bf2b25dd8591e92f3944c763641b613a70c379a7 +Author: Behdad Esfahbod +Date: Fri Nov 6 19:52:47 2009 -0500 + + Remove done item + + src/hb-shape.c | 1 - + 1 file changed, 1 deletion(-) + +commit 4a8605315901e0ff1e6e09437a92dd5ac39164cc +Author: Behdad Esfahbod +Date: Fri Nov 6 19:52:01 2009 -0500 + + Reverse buffer at the end if RTL + + src/hb-shape.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit ff44f88df2c46920f3ec2384ef321a4c7bb0f6ef +Author: Behdad Esfahbod +Date: Fri Nov 6 19:48:16 2009 -0500 + + Handle shaping in non-native direction + + src/hb-buffer-private.h | 1 + + src/hb-buffer.c | 42 +++++++++++++++++-- + src/hb-buffer.h | 10 ++--- + src/hb-common.h | 11 +++++ + src/hb-shape.c | 38 +++++++++++++++-- + src/hb-unicode-private.h | 5 +++ + src/hb-unicode.c | 103 + +++++++++++++++++++++++++++++++++++++++++++++++ + 7 files changed, 196 insertions(+), 14 deletions(-) + +commit b4b4272c8d19ba3e0cb8f12b3b7d1590349e3d14 +Author: Behdad Esfahbod +Date: Fri Nov 6 17:46:33 2009 -0500 + + Oops, wrong change + + src/hb-ot-layout.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 52ea47767c7c35650ebddfba6ddc8203a3e33d3a +Author: Behdad Esfahbod +Date: Fri Nov 6 17:45:38 2009 -0500 + + Change order of font and face for API consistency + + src/hb-ot-layout.cc | 14 +++++++------- + src/hb-ot-layout.h | 14 +++++++------- + 2 files changed, 14 insertions(+), 14 deletions(-) + +commit f4f1fc970b3e37d9903cbf5e05bbd38be4df3047 +Author: Behdad Esfahbod +Date: Fri Nov 6 17:42:38 2009 -0500 + + Remove debug info that crept in + + src/hb-ot-layout.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit aa196d6026b496ec70be3d3588cc8cd2b8ccdb36 +Author: Behdad Esfahbod +Date: Fri Nov 6 17:23:31 2009 -0500 + + [GSUB] More ligature/component fixing + + We can only reuse the ligid if it belongs to a previous ligature, + not a + component! + + src/hb-ot-layout-gsub-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 25e7ef704633447f109b148620336c42d6fb310e +Author: Behdad Esfahbod +Date: Fri Nov 6 17:21:01 2009 -0500 + + Add _hb_buffer_add_output_glyphs() that takes codepoint_t* + + src/hb-buffer-private.h | 10 ++++++++- + src/hb-buffer.c | 45 + ++++++++++++++++++++++++++++++++++++++-- + src/hb-ot-layout-gsub-private.hh | 16 +++++++------- + 3 files changed, 60 insertions(+), 11 deletions(-) + +commit 9db8ad75317d589807e7725455f49cafece58d5d +Author: Behdad Esfahbod +Date: Fri Nov 6 16:47:31 2009 -0500 + + Add hb_ot_layout_position_finish() + + We expect buffer to be setup with default positions before GPOS. + + src/hb-buffer-private.h | 6 +---- + src/hb-buffer.h | 11 +-------- + src/hb-ot-layout-gpos-private.hh | 8 +++---- + src/hb-ot-layout.cc | 52 + ++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-layout.h | 16 +++++++++---- + 5 files changed, 69 insertions(+), 24 deletions(-) + +commit edb54e9aeca25f4120a69ed3d5562cbb68fdb348 +Author: Behdad Esfahbod +Date: Fri Nov 6 15:19:22 2009 -0500 + + Fix FT_Face finalizer call + + src/hb-ft.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3d14528b8b2e7da425a9df7057fc9fb326d8298c +Author: Behdad Esfahbod +Date: Fri Nov 6 15:13:17 2009 -0500 + + Rename hb_buffer_get_len() to hb_buffer_get_length() + + src/hb-buffer.c | 2 +- + src/hb-buffer.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 1ff7775051559a8ca442be3938450c7ed3817806 +Author: Behdad Esfahbod +Date: Fri Nov 6 13:52:57 2009 -0500 + + Minor. + + src/hb-shape.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 3648bdf5b221adfe01ad99714de420b49964921e +Author: Behdad Esfahbod +Date: Thu Nov 5 20:17:53 2009 -0500 + + Fix FT_Face generic finalizer + + src/hb-ft.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit 5a11c875d8c95d480e6f32b57e969ee34ca1940d +Author: Behdad Esfahbod +Date: Thu Nov 5 20:08:17 2009 -0500 + + Cosmetic + + src/hb-blob.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 44533e773f75b9a1171d884fcbe91a2f3879e2d8 +Author: Behdad Esfahbod +Date: Thu Nov 5 19:58:02 2009 -0500 + + Fix warning + + src/hb-object-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bcc0406a525ca3fe597aec5f2a97e5c50965d49c +Author: Behdad Esfahbod +Date: Thu Nov 5 19:54:23 2009 -0500 + + include errno.h + + src/hb-blob.c | 1 + + 1 file changed, 1 insertion(+) + +commit 799b3c375ad0e1293fd37a0e3a0d422a3166dcd8 +Author: Behdad Esfahbod +Date: Thu Nov 5 19:37:58 2009 -0500 + + Add debugging to object lifecycle + + src/hb-object-private.h | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +commit 25edb940ab050545f47a06648e73c192fa213548 +Author: Behdad Esfahbod +Date: Thu Nov 5 19:20:06 2009 -0500 + + Cosmetic + + src/hb-ft.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 850dc5bb551409bb9bf6113ec2199bb3fb905e43 +Author: Behdad Esfahbod +Date: Thu Nov 5 18:26:52 2009 -0500 + + Return 0 from get_glyph_nil + + src/hb-font.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 85555a953376ee68a8fcc64485e74d44a353577b +Author: Behdad Esfahbod +Date: Thu Nov 5 18:25:56 2009 -0500 + + Initialize font->klass + + src/hb-font.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit bcd26bd7b1c96057bf154d7d50a61018d40f0d29 +Author: Behdad Esfahbod +Date: Thu Nov 5 18:03:26 2009 -0500 + + Add TODO item + + src/hb-ft.c | 1 + + 1 file changed, 1 insertion(+) + +commit f4281e0a92a40746fa630fb15b877adaf3ff15b1 +Author: Behdad Esfahbod +Date: Thu Nov 5 17:58:41 2009 -0500 + + Fix ref counting + + src/hb-ft.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 6358ff45ae8cfc0b58b4976619319e3dde43add2 +Author: Behdad Esfahbod +Date: Thu Nov 5 17:39:16 2009 -0500 + + Add hb_ft_face_create_cached + + src/hb-ft.c | 16 ++++++++++++++++ + src/hb-ft.h | 3 +++ + 2 files changed, 19 insertions(+) + +commit 2027f74b286cabe3c60c275170c4f4b437a30f55 +Author: Behdad Esfahbod +Date: Thu Nov 5 16:34:47 2009 -0500 + + Add default positioning to hb-shape + + src/hb-shape.c | 28 ++++++++++++++++++++++++---- + 1 file changed, 24 insertions(+), 4 deletions(-) + +commit c3f9f7e59d865f8664862b7ca99d9a3a9221e456 +Author: Behdad Esfahbod +Date: Thu Nov 5 16:16:14 2009 -0500 + + Fix MarkMark issue with ligid and components + + src/hb-ot-layout-gpos-private.hh | 11 ++++++----- + src/hb-ot-layout-gsub-private.hh | 6 +----- + 2 files changed, 7 insertions(+), 10 deletions(-) + +commit d0351314cd29fbdf0efb5c7f89a569648f7a7fc7 +Author: Behdad Esfahbod +Date: Thu Nov 5 16:16:06 2009 -0500 + + Include stdio.h if debugging + + src/hb-blob.c | 4 ++++ + src/hb-open-type-private.hh | 1 + + src/hb-ot-layout-gsubgpos-private.hh | 1 + + 3 files changed, 6 insertions(+) + +commit 2e336692913405976392bf505028481a5caa53b4 +Author: Behdad Esfahbod +Date: Thu Nov 5 13:55:41 2009 -0500 + + Add hb_font_get_* + + src/hb-font.cc | 35 +++++++++++++++++++++++++++++++++++ + src/hb-font.h | 18 ++++++++++++++++++ + src/hb-shape.c | 2 +- + 3 files changed, 54 insertions(+), 1 deletion(-) + +commit 9bef3611f07b45ba8199a4a339c72f49d266216a +Author: Behdad Esfahbod +Date: Thu Nov 5 12:20:11 2009 -0500 + + Rename [xy]_pos to [xy]_offset since we don't accumulate positions + + src/hb-buffer-private.h | 4 ++-- + src/hb-buffer.h | 4 ++-- + src/hb-font.h | 4 ++-- + src/hb-ft.c | 10 +++++----- + src/hb-ot-layout-gpos-private.hh | 40 + ++++++++++++---------------------------- + src/hb-shape.c | 14 +++++++------- + src/hb-shape.h | 4 ++-- + 7 files changed, 32 insertions(+), 48 deletions(-) + +commit 2daa47e9cdbfb027f76765301b3a78950e92eb09 +Author: Behdad Esfahbod +Date: Thu Nov 5 12:08:34 2009 -0500 + + Cosmetic + + src/hb-shape.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2f50d873680ce0a43b6ec79df1ac946b91f31e63 +Author: Behdad Esfahbod +Date: Wed Nov 4 21:07:03 2009 -0500 + + Start filling hb_shape() in + + src/hb-buffer-private.h | 1 + + src/hb-shape.c | 40 +++++++++++++++++++++++++++++++++++++++- + 2 files changed, 40 insertions(+), 1 deletion(-) + +commit ae070b7d39d03bd8bc1244f687b24db505f4af3f +Author: Behdad Esfahbod +Date: Wed Nov 4 20:29:54 2009 -0500 + + Add script and language to buffer + + TODO | 1 - + src/hb-buffer-private.h | 6 +++--- + src/hb-buffer.c | 26 ++++++++++++++++++++++++++ + src/hb-buffer.h | 15 ++++++++++++++- + 4 files changed, 43 insertions(+), 5 deletions(-) + +commit 8a3511ac6c795226699c2b36e03401ecdf88f5f8 +Author: Behdad Esfahbod +Date: Wed Nov 4 19:45:39 2009 -0500 + + Add hb_language_t as well as language/script conversion to OT tags + + src/Makefile.am | 4 + + src/hb-language.c | 113 +++++++++ + src/hb-language.h | 44 ++++ + src/hb-ot-layout.cc | 6 +- + src/hb-ot-layout.h | 4 +- + src/hb-ot-tag.c | 662 + ++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-tag.h | 49 ++++ + src/hb-ot.h | 1 + + src/hb-private.h | 3 + + src/hb.h | 1 + + 10 files changed, 882 insertions(+), 5 deletions(-) + +commit 4591753ad4b5ec0224e3f1befdfe4fc5f6075562 +Author: Behdad Esfahbod +Date: Wed Nov 4 18:15:59 2009 -0500 + + Define ARRAY_LENGTH + + src/hb-private.h | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +commit 214ac7c1ff51b397d227832526f882e824cb9ea3 +Author: Behdad Esfahbod +Date: Wed Nov 4 18:12:32 2009 -0500 + + Another one + + src/hb-unicode.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1e91434569a9e9535ef021ca52b60b2e2af75d19 +Author: Behdad Esfahbod +Date: Wed Nov 4 18:12:09 2009 -0500 + + Minor + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 48de3730cdf91b9f6473509e22260a902ccec992 +Author: Behdad Esfahbod +Date: Wed Nov 4 16:59:50 2009 -0500 + + Fix previous commit, ouch! + + src/hb-open-type-private.hh | 12 ++++++++++++ + src/hb-ot-layout-common-private.hh | 12 ++++-------- + src/hb-ot-layout-gdef-private.hh | 12 ++++-------- + 3 files changed, 20 insertions(+), 16 deletions(-) + +commit e21899bc3593aa0d3adf64cee21c5de2ea219783 +Author: Behdad Esfahbod +Date: Wed Nov 4 16:36:14 2009 -0500 + + Fix array query API + + The array query APIs now all do: + + - Return the total number of items + - Take a start_offset, such that individual items can be fetched + - The _count IN/OUT variable always has number of items written + into the array upon return of the function + + TODO | 1 - + src/hb-ot-layout-common-private.hh | 59 ++++++++++++++----------- + src/hb-ot-layout-gdef-private.hh | 84 + +++++++++++++++++++++--------------- + src/hb-ot-layout-gsubgpos-private.hh | 14 +++--- + src/hb-ot-layout.cc | 40 ++++++++++------- + src/hb-ot-layout.h | 24 +++++++---- + 6 files changed, 131 insertions(+), 91 deletions(-) + +commit 3b59306b858d31d97be0ea8c64461de1d0d03572 +Author: Behdad Esfahbod +Date: Wed Nov 4 15:48:32 2009 -0500 + + Finish FT glue. Rough and untested + + src/hb-font.cc | 2 +- + src/hb-font.h | 2 +- + src/hb-ft.c | 114 + ++++++++++++++++++++++++++++++--------------------------- + 3 files changed, 63 insertions(+), 55 deletions(-) + +commit f8be443aecd54b479470e6559b1dfbc8f33c5f55 +Author: Behdad Esfahbod +Date: Tue Nov 3 20:28:27 2009 -0500 + + Add TODO item + + TODO | 1 + + 1 file changed, 1 insertion(+) + +commit 7951279b4a52b48f13631e7838dbc180c7249ea4 +Author: Behdad Esfahbod +Date: Tue Nov 3 20:27:05 2009 -0500 + + Implement nil font functions + + TODO | 1 + + src/hb-font-private.h | 8 ++--- + src/hb-font.cc | 72 + +++++++++++++++++++++++++++++++++++++--- + src/hb-font.h | 9 +++-- + src/hb-ot-layout-gpos-private.hh | 7 ++-- + src/hb-ot-layout-gsub-private.hh | 2 +- + src/hb-private.h | 18 +++++----- + 7 files changed, 91 insertions(+), 26 deletions(-) + +commit 8fb3d1aa4e613cdf965a83bd650c668884c58ad8 +Author: Behdad Esfahbod +Date: Tue Nov 3 18:34:20 2009 -0500 + + Start ft glue + + TODO | 3 - + src/Makefile.am | 16 ++++- + src/hb-font-private.h | 4 +- + src/hb-font.cc | 17 ++++- + src/hb-font.h | 6 +- + src/hb-ft.c | 192 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-ft.h | 52 ++++++++++++++ + src/hb-glib.h | 2 - + src/hb-icu.h | 2 - + src/hb.h | 4 +- + 10 files changed, 281 insertions(+), 17 deletions(-) + +commit d94647e2cd187bf4a4c8fb1c0c15c3d23c1293ac +Author: Behdad Esfahbod +Date: Tue Nov 3 16:35:10 2009 -0500 + + Add ICU glue + + configure.ac | 8 +- + src/Makefile.am | 23 +++++- + src/hb-icu.c | 221 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-icu.h | 41 +++++++++++ + 4 files changed, 288 insertions(+), 5 deletions(-) + +commit b7dd4b945b4ec384526439b365a25739bf9cd2df +Author: Behdad Esfahbod +Date: Tue Nov 3 15:21:15 2009 -0500 + + Fix hb_be_uint16() + + src/hb-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cd7555eef27cb18857c0c06d2afdaf3a354a3c15 +Author: Behdad Esfahbod +Date: Tue Nov 3 15:16:10 2009 -0500 + + Namespace MSVC defines in public header + + src/hb-common.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 5ebabecef382c3e8b0a2a5657b2c01f7ff37d796 +Author: Behdad Esfahbod +Date: Tue Nov 3 15:15:07 2009 -0500 + + Move unicode_funcs to buffer + + TODO | 1 - + src/hb-buffer-private.h | 12 +++++++++++- + src/hb-buffer.c | 47 + ++++++++++++++++++++++++++++++++++++++--------- + src/hb-buffer.h | 10 ++++++++++ + src/hb-font-private.h | 3 --- + src/hb-font.cc | 17 ----------------- + src/hb-font.h | 9 ++++----- + 7 files changed, 63 insertions(+), 36 deletions(-) + +commit d5a8e46099e363d928b54de104126b1b34ba401c +Author: Behdad Esfahbod +Date: Tue Nov 3 15:14:40 2009 -0500 + + [Makefile] Install hb-unicode.h + + Separate OT headers also. + + src/Makefile.am | 27 ++++++++++++++++----------- + 1 file changed, 16 insertions(+), 11 deletions(-) + +commit 63d7a41dd0704a7e89bd2872ad096f470f51866a +Author: Behdad Esfahbod +Date: Tue Nov 3 15:14:08 2009 -0500 + + [TODO] Add item for fixing buffer error handling + + TODO | 1 + + 1 file changed, 1 insertion(+) + +commit 21d0fce3d5364c91e5582bd530210f03e054d1a4 +Author: Behdad Esfahbod +Date: Tue Nov 3 14:28:32 2009 -0500 + + Add check for not linking to libstdc++ + + TODO | 3 +-- + src/Makefile.am | 4 ++++ + src/check-libstdc++.sh | 28 ++++++++++++++++++++++++++++ + 3 files changed, 33 insertions(+), 2 deletions(-) + +commit ca95ce460adf2ca6901595d4a6107fd000d90151 +Author: Behdad Esfahbod +Date: Tue Nov 3 14:18:33 2009 -0500 + + Use the C linker, not C++ linker + + Such that we don't link to libstdc++. + + src/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit eb4ebda2d10637b966f42a4ed5cfaec46082a050 +Author: Behdad Esfahbod +Date: Tue Nov 3 14:09:32 2009 -0500 + + [configure] Fix check for FreeType + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cb0e99a5a76136c128faba1c27d7e7eac2f219ee +Author: Behdad Esfahbod +Date: Tue Nov 3 14:09:10 2009 -0500 + + [TODO] Remove obsolete item + + TODO | 2 -- + 1 file changed, 2 deletions(-) + +commit 3a59ec37c5576b711c7c36dcfa2a63f6c00a3f5c +Author: Behdad Esfahbod +Date: Tue Nov 3 11:36:06 2009 -0500 + + Add bunch of TODO items + + TODO | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +commit ffbe0a853d5e7defa85d0eef53814c22d1ecb412 +Author: Behdad Esfahbod +Date: Tue Nov 3 10:52:45 2009 -0500 + + More MSVC fixes from Jonathan Kew + + src/hb-common.h | 7 ++++++- + src/hb-private.h | 5 +++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit d3480ba37fbb5d4be75b094060f5b2f1ce98fb53 +Author: Behdad Esfahbod +Date: Tue Nov 3 10:47:29 2009 -0500 + + Don't use zero-sized arrays + + It's not part of the standard and MSVC doesn't like it. It makes + the code + a lot less elegant than it used to be, but I think it should work now. + + src/hb-open-file-private.hh | 4 +- + src/hb-open-type-private.hh | 36 +++++++++++------ + src/hb-ot-layout-common-private.hh | 33 ++++++++-------- + src/hb-ot-layout-gdef-private.hh | 14 +++---- + src/hb-ot-layout-gpos-private.hh | 76 + ++++++++++++++---------------------- + src/hb-ot-layout-gsub-private.hh | 44 ++++++++------------- + src/hb-ot-layout-gsubgpos-private.hh | 47 +++++++++++----------- + src/hb-private.h | 5 +++ + 8 files changed, 122 insertions(+), 137 deletions(-) + +commit 6bec81aa3a58b8be255568b2ea63b7854e1b0ea7 +Author: Behdad Esfahbod +Date: Mon Nov 2 19:17:36 2009 -0500 + + Cosmetic + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f94cf6b969281cf8a7f701ff26ea4f134ff9746e +Author: Behdad Esfahbod +Date: Mon Nov 2 18:55:19 2009 -0500 + + Another try at build without glib + + configure.ac | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 2f3e69f3cb7e571cc62b0840d0b3f2072b29345a +Author: Behdad Esfahbod +Date: Mon Nov 2 18:53:15 2009 -0500 + + Fix build without glib, again + + src/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d03f81865914b40e941bf680557c0d8f98e30ad5 +Author: Behdad Esfahbod +Date: Mon Nov 2 18:52:21 2009 -0500 + + Disable configure cache + + autogen.sh | 1 - + 1 file changed, 1 deletion(-) + +commit a6451aa626fa5850d7c3b716bd52126995154e27 +Author: Behdad Esfahbod +Date: Mon Nov 2 18:35:12 2009 -0500 + + We don't really use gthread directly + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 63a792a811e0ad69d05e8805d4f347bd533db4c3 +Author: Behdad Esfahbod +Date: Mon Nov 2 18:33:52 2009 -0500 + + Update Makefile to build without glib + + src/Makefile.am | 12 +++++++++--- + src/hb-glib.c | 2 ++ + 2 files changed, 11 insertions(+), 3 deletions(-) + +commit 68a2c771e2b923461a552bf3673e9e8245e1bfea +Author: Behdad Esfahbod +Date: Mon Nov 2 18:31:53 2009 -0500 + + Build without glib + + Thready-safety disabled in that case, until we add support for + pthread, etc. + Fun... + + src/hb-private.h | 19 +++++++++++++++++-- + 1 file changed, 17 insertions(+), 2 deletions(-) + +commit cc4c096a7e08ae96b3030fe27f871ce5b797f370 +Author: Behdad Esfahbod +Date: Mon Nov 2 18:13:17 2009 -0500 + + MSVC has no stdint.h + + src/hb-common.h | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit 9a204c7ab57ca0a866c72e1431c54a8883b15605 +Author: Behdad Esfahbod +Date: Mon Nov 2 18:11:55 2009 -0500 + + Remove use of GINT16_FROM_BE + + src/hb-private.h | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +commit 1f0ceeb8cf2fad0a0dfd338ce1472470a81789d4 +Author: Behdad Esfahbod +Date: Mon Nov 2 16:28:39 2009 -0500 + + Install library + + autogen.sh | 2 +- + src/Makefile.am | 5 ++--- + 2 files changed, 3 insertions(+), 4 deletions(-) + +commit 5932f8f7c3b73ade3752020351fa8b6a9a3bf500 +Author: Behdad Esfahbod +Date: Mon Nov 2 16:38:41 2009 -0500 + + Generate ChangeLog + + Makefile.am | 39 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 39 insertions(+) + +commit 29aa40018301a4f138cd5e73463079c7704bf3ac +Author: Behdad Esfahbod +Date: Mon Nov 2 16:28:39 2009 -0500 + + Add build system + + AUTHORS | 0 + src/COPYING => COPYING | 0 + Makefile.am | 3 + + NEWS | 0 + src/README => README | 0 + src/TODO => TODO | 0 + autogen.sh | 189 + +++++++++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 40 +++++++++++ + git.mk | 184 + +++++++++++++++++++++++++++++++++++++++++++++++ + harfbuzz.pc.in | 11 +++ + src/.gitignore | 1 - + src/Makefile.ng | 11 --- + 12 files changed, 427 insertions(+), 12 deletions(-) + +commit c09ed9801ead002d6f8e507ce664b83707b202e9 +Author: Behdad Esfahbod +Date: Thu Oct 29 03:08:42 2009 -0400 + + [HB] Add glyph_metrics typedef + + src/hb-font.h | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 91b1e03e0312be2a7a165308239b40449e3ab360 +Author: Behdad Esfahbod +Date: Thu Oct 29 03:05:18 2009 -0400 + + [HB] Add point_index to get_contour_point() + + Pointed out by Keith Stribley on HarfBuzz list. + + src/hb-font.h | 1 + + 1 file changed, 1 insertion(+) + +commit aa87d951739f6beacb66daa235cd033fdcfcadd7 +Author: Behdad Esfahbod +Date: Thu Oct 29 03:00:44 2009 -0400 + + [HB] Fix lookup_flag ignoring + + Reported by Keith Stribley on HarfBuzz list. + + src/hb-ot-layout-common-private.hh | 1 + + src/hb-ot-layout.cc | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 52e9a71d578c5171bbb0f4bfc1b70841c3270328 +Author: Behdad Esfahbod +Date: Mon Sep 21 13:58:56 2009 -0400 + + [HB] Add comment + + src/hb-ot-layout-gsubgpos-private.hh | 5 +++++ + 1 file changed, 5 insertions(+) + +commit f9c0a2dad09cd168fb28cdee09b4303f307ea56d +Author: Behdad Esfahbod +Date: Mon Sep 21 13:43:54 2009 -0400 + + [HB] Fix apply_lookup() loop + + Part of Bug 595539 - Regressions in rendering certain Thai sequences + with + OpenType font + + src/hb-ot-layout-gsubgpos-private.hh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit c0ab43c05833e8fc06d770a89370bec58a627e74 +Author: Behdad Esfahbod +Date: Mon Sep 21 13:40:38 2009 -0400 + + [HB] Fix bug in chain_context_lookup() invocations + + Part of Bug 595539 - Regressions in rendering certain Thai sequences + with + OpenType font + + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e6bd4e93bd5722249ab977dfa98bdc8eb765318c +Author: Behdad Esfahbod +Date: Sun Aug 30 21:02:28 2009 -0400 + + [HB] Add TODO item + + src/TODO | 1 + + 1 file changed, 1 insertion(+) + +commit 3e2401f6c53d2b047954d75c37aef5e5e7cdc51a +Author: Behdad Esfahbod +Date: Fri Aug 28 17:17:11 2009 -0400 + + [HB] Rename DEBUG to TRACE where appropriate + + src/hb-open-file-private.hh | 8 ++-- + src/hb-open-type-private.hh | 50 ++++++++++---------- + src/hb-ot-layout-common-private.hh | 32 ++++++------- + src/hb-ot-layout-gdef-private.hh | 20 ++++---- + src/hb-ot-layout-gpos-private.hh | 92 + ++++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.hh | 72 ++++++++++++++-------------- + src/hb-ot-layout-gsubgpos-private.hh | 78 +++++++++++++++--------------- + 7 files changed, 176 insertions(+), 176 deletions(-) + +commit 0535b50f436f3dac85e6df1761957f86c2bd7213 +Author: Behdad Esfahbod +Date: Fri Aug 28 17:14:33 2009 -0400 + + [HB] Add GSUB/GPOS tracing + + src/hb-ot-layout-gpos-private.hh | 29 ++++++++++++++++++--- + src/hb-ot-layout-gsub-private.hh | 28 ++++++++++++++++++--- + src/hb-ot-layout-gsubgpos-private.hh | 49 + ++++++++++++++++++++++++++++++++++-- + 3 files changed, 98 insertions(+), 8 deletions(-) + +commit 95e202403ffa543c817f45cca21fbc116eb8e807 +Author: Behdad Esfahbod +Date: Fri Aug 28 16:31:20 2009 -0400 + + [HB] Allow enabling different debug facilities individually + + src/hb-blob.c | 28 ++++++++++++++++------------ + src/hb-open-type-private.hh | 32 ++++++++++++++++++-------------- + 2 files changed, 34 insertions(+), 26 deletions(-) + +commit 37006bd1bd107ac1a1c1b131579e9c494ba3a20f +Author: Behdad Esfahbod +Date: Fri Aug 28 09:46:14 2009 -0400 + + Fix stupid array growing bug + + src/hb-ot-layout.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 9897749113f76dc26a83bfae8de62e55d384fcad +Author: Behdad Esfahbod +Date: Thu Aug 27 01:32:17 2009 -0400 + + [HB] Simplify counting + + src/hb-ot-layout.cc | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 81a5c4df94e7c6066314d5fe75bbaf24483bc022 +Author: Behdad Esfahbod +Date: Thu Aug 27 00:21:04 2009 -0400 + + [HB] Indent + + src/hb-blob.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c91facd83b5dc3b9aed75617c7c35585ff18889f +Author: Behdad Esfahbod +Date: Wed Aug 26 18:53:43 2009 -0400 + + [HB] Bug 593231 - < c99 compiler dislikes ValueRecord + + src/hb-ot-layout-gpos-private.hh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit f0c7540c4e217a7354072365a7301453d1e25b80 +Author: Behdad Esfahbod +Date: Thu Aug 20 14:01:37 2009 -0400 + + Bug 592484 - invalid write in HB + + Fix off-by-one. + + src/hb-ot-layout.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit b614b004723ead60849dd37e7ba2faee67cebd93 +Author: Behdad Esfahbod +Date: Thu Aug 20 13:07:50 2009 -0400 + + [HB][glib] Make glib unicode funcs static + + src/hb-glib.c | 36 +++++++++++++++++------------------- + 1 file changed, 17 insertions(+), 19 deletions(-) + +commit 8b5346130425c7c101f6ff2432874ba2fd372edc +Author: Behdad Esfahbod +Date: Wed Aug 19 18:16:50 2009 -0400 + + [HB] Fix more casts + + src/hb-open-type-private.hh | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 9d2e02db74deb3b3b92beab96f112cc387c8bd88 +Author: Behdad Esfahbod +Date: Wed Aug 19 18:07:36 2009 -0400 + + [HB] Rename CAIRO_ in macro prefix to HB_ + + Hiss! + + src/hb-private.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 388ad037ff399c23c5e24bbcede27e0e35bed07e +Author: Behdad Esfahbod +Date: Wed Aug 19 16:45:41 2009 -0400 + + [HB] Remove HB_MEMORY_MODE_READONLY_NEVER_DUPLICATE + + Unlike the rest of the memory-mode enum, this one didn't only + describe the access mode of the input memory region. Remove it. + + If someone wants to inhibit duplicating, they can lock the blob + and throw away the key. + + Based on mailing list discussion with Carl Worth. + + src/hb-blob.c | 51 +++++++++++++++++++++++++-------------------------- + src/hb-blob.h | 1 - + 2 files changed, 25 insertions(+), 27 deletions(-) + +commit 977eeb714454630bd045bb11f58ff6397f10b143 +Author: Behdad Esfahbod +Date: Wed Aug 19 16:17:24 2009 -0400 + + [HB] s/writeable/writable/g + + src/hb-blob.c | 38 +++++++++++++++++++------------------- + src/hb-blob.h | 10 +++++----- + src/hb-open-type-private.hh | 6 +++--- + 3 files changed, 27 insertions(+), 27 deletions(-) + +commit 2f5931e404cb56e31d24b2eb7ff0a849fb077b55 +Author: Behdad Esfahbod +Date: Wed Aug 19 16:07:40 2009 -0400 + + [HB] Hide lig_id and component members of hb_glyph_info_t + + src/hb-buffer.h | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 6b600dd6199104cff01b3fa43d2abb52ae4319ea +Author: Behdad Esfahbod +Date: Wed Aug 19 14:45:24 2009 -0400 + + [HB] Fix typo + + src/hb-font.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 32c65a5ca3bde673bf2aa8fca911dd32914d3122 +Author: Behdad Esfahbod +Date: Tue Aug 18 18:37:36 2009 -0400 + + [HB] Add font funcs prototypes + + src/hb-font-private.h | 2 -- + src/hb-font.cc | 14 ++++++-------- + src/hb-font.h | 23 ++++++++++++++++------- + 3 files changed, 22 insertions(+), 17 deletions(-) + +commit 8f034d5849627ee95a5889fa34c9ba294fff13ca +Author: Behdad Esfahbod +Date: Tue Aug 18 16:41:59 2009 -0400 + + Fix a few other pedantic warnings + + src/hb-ot-layout-common-private.hh | 2 +- + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 4 ++-- + src/hb-ot-layout-gsub-private.hh | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +commit 864e2560b627f1e73be3b0635e02f00844cb67c3 +Author: Behdad Esfahbod +Date: Tue Aug 18 16:38:48 2009 -0400 + + [HB] Fix pedantic warnings + + src/hb-blob.h | 2 +- + src/hb-buffer-private.h | 18 +++++++++--------- + src/hb-buffer.h | 6 +++--- + 3 files changed, 13 insertions(+), 13 deletions(-) + +commit 3e09722214d9bbcc9014409342072c79d0c4447f +Author: Behdad Esfahbod +Date: Tue Aug 18 16:32:31 2009 -0400 + + [HB] Fix more wrong method signatures + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 822e99fe9ae920df41a0bd3f1125495c2ea96b45 +Author: Behdad Esfahbod +Date: Tue Aug 18 16:27:48 2009 -0400 + + [HB] Fix wrong method signature + + src/hb-ot-layout-common-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4ff2a58952f010c6252f06e5f404d6840d257250 +Author: Behdad Esfahbod +Date: Tue Aug 18 15:49:23 2009 -0400 + + Bug 592194 - Fix missing _SC_PAGE_SIZE macro + + Autoconfiscate a simple call to mprotect() even more. + + src/hb-blob.c | 94 + ++++++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 60 insertions(+), 34 deletions(-) + +commit 3c69bd46e27069fac0bfdefdecf5492c17eb01df +Author: Behdad Esfahbod +Date: Mon Aug 17 16:48:13 2009 -0400 + + [HB] Avoid int overflow in GPOS + + Bug 592036 - integer overflow bug causes misrendering of Nepali + characters + + src/hb-ot-layout-gpos-private.hh | 20 ++++++++++---------- + src/hb-private.h | 3 +++ + 2 files changed, 13 insertions(+), 10 deletions(-) + +commit b2b18ef43c5bac6a5bb8412da7c9a37f815d4deb +Author: Behdad Esfahbod +Date: Fri Aug 14 19:37:18 2009 -0400 + + [HB] Simplify loop + + src/hb-ot-layout-gpos-private.hh | 31 ++++++++++++++----------------- + 1 file changed, 14 insertions(+), 17 deletions(-) + +commit b41f210d12d8df48e645823463343f7e14b0ddd0 +Author: Behdad Esfahbod +Date: Fri Aug 14 19:33:24 2009 -0400 + + [HB] Merge mark positionin code between three types of lookups + + src/hb-ot-layout-gpos-private.hh | 95 + ++++++++++++---------------------------- + 1 file changed, 29 insertions(+), 66 deletions(-) + +commit cd33cb9ed84308da72bd7c64b9355dc2410c63ec +Author: Behdad Esfahbod +Date: Fri Aug 14 18:42:42 2009 -0400 + + [HB] More minor shuffling + + src/hb-open-type-private.hh | 3 --- + src/hb-ot-layout-common-private.hh | 5 +++++ + 2 files changed, 5 insertions(+), 3 deletions(-) + +commit 80e2aa2e1bfa2c8ecedcfa4cce8cadeb15792ac3 +Author: Behdad Esfahbod +Date: Fri Aug 14 18:40:56 2009 -0400 + + [HB] Move code around + + src/hb-open-type-private.hh | 21 +++++++++++++++++++++ + src/hb-ot-layout-common-private.hh | 19 ------------------- + 2 files changed, 21 insertions(+), 19 deletions(-) + +commit 3564ee5216004d45d30b0ded61184cf8dde5dd89 +Author: Behdad Esfahbod +Date: Fri Aug 14 18:32:56 2009 -0400 + + [HB] Correctly sanitize LigatureAttach + + src/hb-open-type-private.hh | 14 ++++++++++---- + src/hb-ot-layout-common-private.hh | 4 ++++ + src/hb-ot-layout-gdef-private.hh | 4 ++-- + src/hb-ot-layout-gpos-private.hh | 6 +++--- + 4 files changed, 19 insertions(+), 9 deletions(-) + +commit cb71a2fb76c6ddee050f775eb299ee44230c3ac9 +Author: Behdad Esfahbod +Date: Fri Aug 14 18:14:03 2009 -0400 + + [HB] Simplify MarkBase and MarkLig too + + src/hb-ot-layout-gpos-private.hh | 127 + +++++++++++++++------------------------ + 1 file changed, 48 insertions(+), 79 deletions(-) + +commit dfa54f4440960c39d37ef02fff4c0d9eb315d4b4 +Author: Behdad Esfahbod +Date: Fri Aug 14 17:53:31 2009 -0400 + + [HB] Simplify MarkMark + + src/hb-ot-layout-gpos-private.hh | 29 ++++++++++++++++------------- + 1 file changed, 16 insertions(+), 13 deletions(-) + +commit 815a73e4202ca17677f12e862b70ca8724cf2f57 +Author: Behdad Esfahbod +Date: Fri Aug 14 17:31:16 2009 -0400 + + [HB] Fix possible int overflows during sanitize + + src/TODO | 1 - + src/hb-open-type-private.hh | 22 ++++++++++++++++++++++ + src/hb-ot-layout-gpos-private.hh | 15 ++++++++------- + 3 files changed, 30 insertions(+), 8 deletions(-) + +commit ae728e51e94d18d731b7c8dc524da1a4f427d63b +Author: Behdad Esfahbod +Date: Fri Aug 14 16:41:00 2009 -0400 + + [HB] Debug output for SANITIZE_MEM() + + src/hb-open-type-private.hh | 34 +++++++++++++++++++++++----------- + 1 file changed, 23 insertions(+), 11 deletions(-) + +commit 41895506cb6a41b1a833866f8822261ea449ea0b +Author: Behdad Esfahbod +Date: Fri Aug 14 16:25:33 2009 -0400 + + [HB] Use inline function for SANITIZE_MEM() + + src/hb-open-type-private.hh | 33 ++++++++++++++++++++------------- + 1 file changed, 20 insertions(+), 13 deletions(-) + +commit 95528131b5ab9fc9e265ace715832135ebd457a4 +Author: Behdad Esfahbod +Date: Fri Aug 14 16:17:32 2009 -0400 + + [HB] Use SANITIZE_THIS() when applicable + + src/hb-open-type-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 5769538abfe153c503da4801649493e57a9854c2 +Author: Behdad Esfahbod +Date: Fri Aug 14 16:12:22 2009 -0400 + + [HB] Add note about auditing sanitize code for overflows + + src/TODO | 1 + + src/hb-ot-layout-gpos-private.hh | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 15232e26f4a89dab1b6de35ad9d3d16e75bf93d0 +Author: Behdad Esfahbod +Date: Thu Aug 13 17:13:25 2009 -0400 + + [HB] Add empty hb_shape() API + + src/Makefile.am | 2 ++ + src/hb-shape.c | 40 ++++++++++++++++++++++++++++++++++++++++ + src/hb-shape.h | 53 + +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 95 insertions(+) + +commit 2866d2974b6768e93cc7d473d14c5a8abae5f7fd +Author: Behdad Esfahbod +Date: Thu Aug 13 11:47:08 2009 -0400 + + [HB] Bitfield packing *is* very delicate + + Fix the second instance. + + src/hb-buffer.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ec90ee23b29aab187c3fa209970aa97434c84b1b +Author: Behdad Esfahbod +Date: Thu Aug 13 05:25:23 2009 -0400 + + Bug 591511 – hh-blob.c does not compile using mingw on windows + + Check for sys/mman.h, not mprotect(). + + src/hb-blob.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 12eae6d55d468ff2fbe2bc12bec188d313c671f9 +Author: Behdad Esfahbod +Date: Thu Aug 13 05:20:46 2009 -0400 + + [HB] Fix buffer sizing issue with mingw gcc + + Bit field packing is a delicate field. Issue reported in comment + 3 here: + http://bugzilla.gnome.org/show_bug.cgi?id=591511 + + src/hb-buffer-private.h | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 6936706cd77f96961a1239d0c9dc8ede64d7f06d +Author: Behdad Esfahbod +Date: Wed Aug 12 19:45:50 2009 -0400 + + Bug 591413 – needs to link with libstdc++ + + Enforce -fno-exceptions better. + + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c486ea9c3582710474c1085c21c1dc5e2700adc3 +Author: Behdad Esfahbod +Date: Wed Aug 12 19:36:29 2009 -0400 + + Bug 591511 – hb-blob.c does not compile using mingw on windows + + Only call mprotect() when available. For optimal performance, a win32 + way to make memory writeable needs to be added. + + src/hb-blob.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit a579584594f1ca4781f1c5b92ad78513c0b37480 +Author: Behdad Esfahbod +Date: Wed Aug 12 19:23:16 2009 -0400 + + [HB] Add comment + + src/hb-buffer-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b6e66ee102eb5b64d945e5a73ab63fe8cac5edcb +Author: Behdad Esfahbod +Date: Wed Aug 12 16:50:28 2009 -0400 + + [HB] Always clear positions if dirty, before returning to user + + src/hb-buffer.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e4679d9fae43f3219c476c5b9e411d1f5d0d5bae +Author: Behdad Esfahbod +Date: Wed Aug 12 16:47:27 2009 -0400 + + [HB] Fix _hb_buffer_next() when positioning + + We were copying glyphs to output. This should not happen when in + GPOS. Back then it was fine, then some optimizations broke then + assumption. + + src/hb-buffer-private.h | 1 + + src/hb-buffer.c | 12 ++++++++++++ + 2 files changed, 13 insertions(+) + +commit 5ccf1ba339d6ffb4469f1c4f20d8d8d00012c857 +Author: Behdad Esfahbod +Date: Wed Aug 12 15:55:23 2009 -0400 + + [HB] Fixed signedness warnings + + src/hb-open-type-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f71329147bd3087588cfeafd6feff45f29d1ca7a +Author: Behdad Esfahbod +Date: Wed Aug 12 15:48:44 2009 -0400 + + [HB] Ouch. Fix compilation. + + src/hb-ot-layout-gpos-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0532ed160c678b5404b20594fd2ca9a640bf6a0a +Author: Behdad Esfahbod +Date: Wed Aug 12 15:40:04 2009 -0400 + + [HB] Fix invalid access / overflow on x86-64 + + Bug 591557 – [HB] crash scrolling the evolution message list + Bug 591576 – crashed with SIGSEGV at pango + + src/hb-ot-layout-gpos-private.hh | 21 ++++++++++++--------- + src/hb-ot-layout-gsub-private.hh | 2 -- + 2 files changed, 12 insertions(+), 11 deletions(-) + +commit 8d70312c7b899131c3aafa7a43527ef3ced33bfe +Author: Behdad Esfahbod +Date: Mon Aug 10 23:50:51 2009 -0400 + + [HB] Add hb_font_funcs_make_immutable() + + src/hb-font-private.h | 4 ++++ + src/hb-font.cc | 17 +++++++++++++++-- + src/hb-font.h | 3 +++ + 3 files changed, 22 insertions(+), 2 deletions(-) + +commit 3284d05da27c338d94f0da99df66d924cd9d6717 +Author: Behdad Esfahbod +Date: Mon Aug 10 23:45:57 2009 -0400 + + [HB] Add missing initializer + + src/hb-font.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 081819ea8b98c0a4b4dffe8d4aca3512f9798719 +Author: Behdad Esfahbod +Date: Mon Aug 10 23:40:28 2009 -0400 + + [OT] Hookup glib unicode funcs + + src/hb-buffer.c | 14 +++++++------- + src/hb-glib.c | 4 +++- + src/hb-glib.h | 4 ++-- + src/hb-ot-layout.cc | 10 +++++----- + src/hb-private.h | 2 +- + 5 files changed, 18 insertions(+), 16 deletions(-) + +commit 49f261df2aa753e8b09e97f7835e6a827f92970a +Author: Behdad Esfahbod +Date: Mon Aug 10 23:35:05 2009 -0400 + + [HB] Add hb-glib + + src/Makefile.am | 4 +++- + src/hb-glib.c | 56 + ++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-glib.h | 41 +++++++++++++++++++++++++++++++++++ + src/hb-unicode-private.h | 2 +- + src/hb-unicode.c | 10 ++++----- + src/hb-unicode.h | 6 +++--- + 6 files changed, 109 insertions(+), 10 deletions(-) + +commit eb27ec0cef0d92740875ab5035b53acc639e5fae +Author: Behdad Esfahbod +Date: Mon Aug 10 23:25:28 2009 -0400 + + [HB] Add hb_unicode_funcs_make_immutable() + + src/hb-unicode-private.h | 2 ++ + src/hb-unicode.c | 22 +++++++++++++++++----- + src/hb-unicode.h | 2 ++ + 3 files changed, 21 insertions(+), 5 deletions(-) + +commit af9e104028b7cdc1fbba0eb1d86cfa4d5258657f +Author: Behdad Esfahbod +Date: Mon Aug 10 23:21:33 2009 -0400 + + [HB] Use nil unicode funcs in nil face + + src/hb-font.cc | 7 ++++--- + src/hb-unicode-private.h | 3 +++ + src/hb-unicode.c | 2 +- + 3 files changed, 8 insertions(+), 4 deletions(-) + +commit 48910f8f0034c54b4e11cef3d08aa40e52c06b28 +Author: Behdad Esfahbod +Date: Mon Aug 10 23:05:05 2009 -0400 + + [HB] Initialize unicode funcs to nil getters + + src/hb-unicode.c | 29 +++++++++++++++++++---------- + 1 file changed, 19 insertions(+), 10 deletions(-) + +commit 04cc0a29ee1472c318c36efcd19b9c1a6657d9ea +Author: Behdad Esfahbod +Date: Mon Aug 10 22:58:56 2009 -0400 + + [HB] Flesh out Unicode funcs + + src/hb-object-private.h | 2 +- + src/hb-unicode-private.h | 12 ++++----- + src/hb-unicode.c | 67 + ++++++++++++++++++++++++++++++++++++++++++------ + src/hb-unicode.h | 3 --- + 4 files changed, 65 insertions(+), 19 deletions(-) + +commit 299f08961ffcea27e8def4f0743d0c86ef8dadf1 +Author: Behdad Esfahbod +Date: Mon Aug 10 22:47:57 2009 -0400 + + [HB] Implement buffer UTF-X input + + src/hb-buffer.c | 110 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-buffer.h | 12 +++---- + 2 files changed, 116 insertions(+), 6 deletions(-) + +commit 1b7b97f28ac192006ca5b6d1cc9fbc80fa2bdb55 +Author: Behdad Esfahbod +Date: Mon Aug 10 21:10:37 2009 -0400 + + [HB] Add buffer UTF-X API + + src/hb-buffer.h | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +commit fbaf8ffa098bd2b6fb4f4bc2d04b360a319c4af5 +Author: Behdad Esfahbod +Date: Mon Aug 10 20:59:25 2009 -0400 + + [HB] Add hb_buffer_reverse() + + src/hb-buffer.c | 32 +++++++++++++++++++++++++++++--- + src/hb-buffer.h | 7 +++++++ + 2 files changed, 36 insertions(+), 3 deletions(-) + +commit cbe5a4e08e6c2ccfdf98e630d48ec9da69374516 +Author: Behdad Esfahbod +Date: Mon Aug 10 20:24:49 2009 -0400 + + [HB] Reuse the positions array as alt string array + + src/hb-buffer-private.h | 1 - + src/hb-buffer.c | 28 +++++++++------------------- + 2 files changed, 9 insertions(+), 20 deletions(-) + +commit 5c44188455ca1b696aa24b20c3a83877dfae2fb2 +Author: Behdad Esfahbod +Date: Mon Aug 10 20:05:16 2009 -0400 + + [HB] Start adding Unicode funcs + + src/Makefile.am | 3 + + src/hb-font-private.h | 29 ++----- + src/hb-font.cc | 163 ++++++++++------------------------- + src/hb-font.h | 140 ++++++++++-------------------- + src/hb-unicode-private.h | 54 ++++++++++++ + src/hb-unicode.c | 89 +++++++++++++++++++ + src/hb-unicode.h | 220 + +++++++++++++++++++++++++++++++++++++++++++++++ + 7 files changed, 463 insertions(+), 235 deletions(-) + +commit 20b035dad41247076815a2bbb0346d63058b322f +Author: Behdad Esfahbod +Date: Mon Aug 10 19:00:36 2009 -0400 + + [HB] Put C++ inline's back + + Apparetly in C++, inline means a totally different thing. + + src/hb-open-file-private.hh | 14 +++++++------- + src/hb-open-type-private.hh | 16 ++++++++-------- + src/hb-ot-layout-common-private.hh | 12 ++++++------ + src/hb-ot-layout-gdef-private.hh | 4 ++-- + src/hb-ot-layout-gpos-private.hh | 12 ++++++------ + src/hb-ot-layout-gsub-private.hh | 12 ++++++------ + src/hb-ot-layout-gsubgpos-private.hh | 12 ++++++------ + 7 files changed, 41 insertions(+), 41 deletions(-) + +commit a62f776d8e7e3e57d28ee71b34abab0a5b8471eb +Author: Behdad Esfahbod +Date: Mon Aug 10 13:57:02 2009 -0400 + + [HB] Don't override CXX compiler + + Just add couple of options to it (still assuming gcc) + + src/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 6bdab706ecb41c1305e85d041a586e86c54d0ab7 +Author: Behdad Esfahbod +Date: Mon Aug 10 09:35:11 2009 -0400 + + [HB] Indent + + src/hb-ot-layout.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 797724904a3ab294f8390d4ff80c299d8213a5c6 +Author: Behdad Esfahbod +Date: Sun Aug 9 22:25:17 2009 -0400 + + [HB] Remove unused code + + src/hb-ot-layout-gdef-private.hh | 10 ---------- + 1 file changed, 10 deletions(-) + +commit 284899ccbe79fda7405ab09d3092fc25fd89e810 +Author: Behdad Esfahbod +Date: Sun Aug 9 22:10:39 2009 -0400 + + [HB] Add a NEXT() macro + + src/hb-open-type-private.hh | 2 ++ + src/hb-ot-layout-common-private.hh | 4 ++-- + src/hb-ot-layout-gsub-private.hh | 8 ++++---- + src/hb-ot-layout-gsubgpos-private.hh | 24 ++++++++++++------------ + 4 files changed, 20 insertions(+), 18 deletions(-) + +commit 918572fc870dfd7596155ce700247a5bb024fb1a +Author: Behdad Esfahbod +Date: Sun Aug 9 18:31:47 2009 -0400 + + [HB] Remove done TODO item + + src/TODO | 1 - + 1 file changed, 1 deletion(-) + +commit 67cb8111f209de26b3afa46e9fb7e4d01c9ecad4 +Author: Behdad Esfahbod +Date: Sun Aug 9 13:05:08 2009 -0400 + + [HB] Print mark sets in main.cc + + src/main.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 17878255fa88e76cd503461fc1ade2ed365cebd2 +Author: Behdad Esfahbod +Date: Sat Aug 8 16:57:27 2009 -0400 + + [HB] Remove hb_ot_layout_table_find_feature() + + That function doesn't make much sense as multiple features in the + table may + have the same tag. + + src/hb-ot-layout.cc | 16 ---------------- + src/hb-ot-layout.h | 6 ------ + 2 files changed, 22 deletions(-) + +commit 468769b8f5332940278244e744ec2bd5a5dc5ee9 +Author: Behdad Esfahbod +Date: Sat Aug 8 16:53:23 2009 -0400 + + [HB] Rename hb_ot_layout_feature_mask_t to hb_mask_t + + src/TODO | 1 - + src/hb-buffer-private.h | 4 ++-- + src/hb-buffer.c | 12 ++++++------ + src/hb-buffer.h | 4 ++-- + src/hb-common.h | 1 + + src/hb-ot-layout-gpos-private.hh | 12 ++++++------ + src/hb-ot-layout-gsub-private.hh | 14 +++++++------- + src/hb-ot-layout.cc | 18 +++++++++--------- + src/hb-ot-layout.h | 34 +++++++++------------------------- + 9 files changed, 42 insertions(+), 58 deletions(-) + +commit 7f96b39a9d5a81ba77e0c3dea8fe2cdb9957c4c7 +Author: Behdad Esfahbod +Date: Sat Aug 8 16:37:22 2009 -0400 + + [HB] Fix bug introduced recently + + src/hb-open-type-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit bff3c0fde5da04a70d1f7aeeb9fa2a75fe5c07f6 +Author: Behdad Esfahbod +Date: Fri Aug 7 19:46:30 2009 -0400 + + [HB] Remove clumsy macros and improve API + + src/TODO | 2 - + src/hb-open-file-private.hh | 41 ++++++++-- + src/hb-open-type-private.hh | 104 +------------------------ + src/hb-ot-layout-common-private.hh | 103 ++++++++++++++++++------ + src/hb-ot-layout-gsubgpos-private.hh | 35 +++++++-- + src/hb-ot-layout.cc | 146 + ++++++++++++----------------------- + src/hb-ot-layout.h | 101 ++++++++++-------------- + 7 files changed, 240 insertions(+), 292 deletions(-) + +commit d0b657379bbe63602953412d6bc944b2a0f430eb +Author: Behdad Esfahbod +Date: Thu Aug 6 18:34:47 2009 -0400 + + [HB] Fix various XXX issues + + src/hb-open-type-private.hh | 13 ++++++++++--- + src/hb-ot-layout-gdef-private.hh | 5 ++--- + 2 files changed, 12 insertions(+), 6 deletions(-) + +commit 82199868fb036b63799af761762225d45d36f575 +Author: Behdad Esfahbod +Date: Thu Aug 6 18:28:45 2009 -0400 + + [HB] Remove unused var + + src/hb-ot-layout-private.h | 2 -- + 1 file changed, 2 deletions(-) + +commit 07e69226cbd4167741fd868a3125487bbabb99dc +Author: Behdad Esfahbod +Date: Thu Aug 6 18:28:00 2009 -0400 + + [HB] Remove another stale XXX + + src/hb-ot-layout.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit e605c367c5627e7ab05af9cb59247a89290e598a +Author: Behdad Esfahbod +Date: Thu Aug 6 18:27:28 2009 -0400 + + [HB] Rebrand XXX as TODO + + src/hb-open-file-private.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c5a13048e21fcfcfd3b74f800e8d521e6245b451 +Author: Behdad Esfahbod +Date: Thu Aug 6 18:26:38 2009 -0400 + + [HB] Remove stale XXX + + src/hb-blob.c | 2 -- + 1 file changed, 2 deletions(-) + +commit 9e826ea2832f0444bcef9075b445d481a58a09c2 +Author: Behdad Esfahbod +Date: Thu Aug 6 18:24:55 2009 -0400 + + [HB] Fix unaligned access + + src/hb-open-type-private.hh | 20 +++++++++++++++++--- + src/hb-private.h | 22 ++++++++++++++++++++++ + 2 files changed, 39 insertions(+), 3 deletions(-) + +commit 71a8344a5eeaa34e31d53138cf3bbe30b819f83c +Author: Behdad Esfahbod +Date: Thu Aug 6 14:28:18 2009 -0400 + + [HB] Remove a few 'inline's, though the compiler mostly ignores them + + src/hb-open-file-private.hh | 1 - + src/hb-open-type-private.hh | 16 ++++++++-------- + src/hb-ot-layout-gsubgpos-private.hh | 6 +++--- + 3 files changed, 11 insertions(+), 12 deletions(-) + +commit 7f3d5c8166e5205e9d9bf8b4b2f31d44387a8006 +Author: Behdad Esfahbod +Date: Thu Aug 6 13:33:51 2009 -0400 + + [HB] Fix blob to use a actual mutex + + src/hb-blob.c | 125 + +++++++++++++++++++++++++++++++++++------------- + src/hb-object-private.h | 4 +- + src/hb-private.h | 20 +++++--- + 3 files changed, 106 insertions(+), 43 deletions(-) + +commit a794ebf4be9896393f4badf02905a4007981a588 +Author: Behdad Esfahbod +Date: Thu Aug 6 12:32:35 2009 -0400 + + [HB] Use glib again + + src/Makefile.am | 5 +++-- + src/hb-blob.c | 4 ++-- + src/hb-object-private.h | 19 ++++++------------- + src/hb-private.h | 45 + ++++++++++++++++++++++++++------------------- + 4 files changed, 37 insertions(+), 36 deletions(-) + +commit 9b76a290a94f2603f3cb9498ae976125347cf54b +Author: Behdad Esfahbod +Date: Thu Aug 6 10:27:38 2009 -0400 + + [HB] Improve debug output + + src/hb-open-type-private.hh | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 9faee63034d3965735bd6362c0beeca1613bd771 +Author: Behdad Esfahbod +Date: Thu Aug 6 10:24:49 2009 -0400 + + [HB] Minor + + src/hb-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f72059ee6946d9b4812b794f662ee83c7e25fe53 +Author: Behdad Esfahbod +Date: Wed Aug 5 15:35:02 2009 -0400 + + [HB] Add a few TODO items + + src/TODO | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 0d77ab8a73f57c9fca4c6f9301dae394d79526e3 +Author: Behdad Esfahbod +Date: Wed Aug 5 15:27:42 2009 -0400 + + [HB] Improve debug output + + src/hb-open-type-private.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 268cac4c9ef8cb592cfb8507273332165b8d3ad3 +Author: Behdad Esfahbod +Date: Wed Aug 5 15:21:48 2009 -0400 + + [HB] Fix blob unlock + + src/hb-blob.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7acb389569cf99c6bae9db31a8ed7c7007fbb566 +Author: Behdad Esfahbod +Date: Wed Aug 5 15:20:34 2009 -0400 + + [HB] Improve debug output and fix mprotect bug + + src/hb-blob.c | 57 + ++++++++++++++++++++++++++++++++++++++------- + src/hb-open-type-private.hh | 30 +++++++++++------------- + src/hb-private.h | 3 ++- + 3 files changed, 65 insertions(+), 25 deletions(-) + +commit ec9f8db0d3cad146801b7dc5c59e517de3b6fa34 +Author: Behdad Esfahbod +Date: Wed Aug 5 14:52:03 2009 -0400 + + [HB] Minor + + src/hb-private.h | 3 +++ + 1 file changed, 3 insertions(+) + +commit d341881d9a0f835f691b121480046081ad162918 +Author: Behdad Esfahbod +Date: Wed Aug 5 14:49:25 2009 -0400 + + [HB] Fix build of main.cc + + src/Makefile.am | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 8f3be25e7ec88ea451ee8097bf32e5f729f4fef9 +Author: Behdad Esfahbod +Date: Tue Aug 4 23:43:40 2009 -0400 + + [HB] turn debugging off + + src/hb-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 62ed5850d9e0e0d0231889470d58e815420c21e5 +Author: Behdad Esfahbod +Date: Tue Aug 4 23:30:32 2009 -0400 + + [HB] Fix another sanitize() bug; hopefully it's the last one + + src/hb-ot-layout-common-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 90482b68178b687c0f0a3f82cd6a36b2c0bb9384 +Author: Behdad Esfahbod +Date: Tue Aug 4 23:24:35 2009 -0400 + + [HB] Fix a couple other sanitize() bugs + + src/hb-ot-layout-gpos-private.hh | 4 ++-- + src/hb-ot-layout-gsub-private.hh | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 4f3ad9115a4161fc23fa559c26082440196217ec +Author: Behdad Esfahbod +Date: Tue Aug 4 23:01:23 2009 -0400 + + [HB] More debugging output + + src/hb-open-type-private.hh | 45 + ++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 40 insertions(+), 5 deletions(-) + +commit 8cd6fa28d1b77100491519b8dedb2e113508bf59 +Author: Behdad Esfahbod +Date: Tue Aug 4 22:55:44 2009 -0400 + + [HB] Fix fatal Sanitizer bug + + src/hb-open-type-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2870ac5e5d5d87646a4b273a9805fb3fcf280f97 +Author: Behdad Esfahbod +Date: Tue Aug 4 22:43:47 2009 -0400 + + [HB] Add missing sanitize + + src/hb-open-file-private.hh | 1 + + 1 file changed, 1 insertion(+) + +commit b28815c1f6e46d38471cacbc31248ca6fda8c4d1 +Author: Behdad Esfahbod +Date: Tue Aug 4 22:35:36 2009 -0400 + + [HB] Add sanitize debugging facilities + + src/hb-open-file-private.hh | 4 ++++ + src/hb-open-type-private.hh | 43 + +++++++++++++++++++++++++++++++----- + src/hb-ot-layout-common-private.hh | 17 ++++++++++++++ + src/hb-ot-layout-gdef-private.hh | 10 +++++++++ + src/hb-ot-layout-gpos-private.hh | 28 +++++++++++++++++++++++ + src/hb-ot-layout-gsub-private.hh | 18 +++++++++++++++ + src/hb-ot-layout-gsubgpos-private.hh | 16 ++++++++++++++ + src/hb-private.h | 6 ++++- + 8 files changed, 136 insertions(+), 6 deletions(-) + +commit 7edb430f9182723b7b720708c56088cec1200a70 +Author: Behdad Esfahbod +Date: Tue Aug 4 22:06:57 2009 -0400 + + [HB] Rename open-types to open-type; beauty + + src/Makefile.am | 2 +- + src/hb-open-file-private.hh | 2 +- + src/{hb-open-types-private.hh => hb-open-type-private.hh} | 0 + src/hb-ot-layout-common-private.hh | 2 +- + 4 files changed, 3 insertions(+), 3 deletions(-) + +commit f4b58d3fc2956a9d1b6178588d809c781f7a5c0c +Author: Behdad Esfahbod +Date: Tue Aug 4 21:47:29 2009 -0400 + + [HB] Save edit even if not writeable + + src/hb-open-types-private.hh | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit 9bd629ccd064e739789e504c41ad875eed93abba +Author: Behdad Esfahbod +Date: Tue Aug 4 21:42:23 2009 -0400 + + [HB] Fix warnings + + src/hb-open-file-private.hh | 1 + + src/hb-open-types-private.hh | 5 +++++ + src/hb-ot-layout-gsub-private.hh | 3 +-- + 3 files changed, 7 insertions(+), 2 deletions(-) + +commit 5ff4e13143c227fa57854c987b5a98e610f89361 +Author: Behdad Esfahbod +Date: Tue Aug 4 21:35:32 2009 -0400 + + [HB] Avoid infinite recusion in Extension sanitize() + + src/hb-ot-layout-gpos-private.hh | 1 + + src/hb-ot-layout-gsub-private.hh | 1 + + 2 files changed, 2 insertions(+) + +commit d60bb8ca2ae6edf29b2227b56c57f0d16879370b +Author: Behdad Esfahbod +Date: Tue Aug 4 21:32:57 2009 -0400 + + [HB] Hook Sanitizer up. Hell's breaking loose right now + + src/hb-font.cc | 7 ++----- + src/hb-open-types-private.hh | 2 +- + src/hb-ot-layout.cc | 12 ++++++------ + 3 files changed, 9 insertions(+), 12 deletions(-) + +commit 679f41fe61242aa8d7f45b64bdb66395aa530fe2 +Author: Behdad Esfahbod +Date: Tue Aug 4 21:32:06 2009 -0400 + + [HB] Fix leak + + src/hb-ot-layout.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 4e8a0602bb0b3cbf7f26cc38790e37cdec7b0b37 +Author: Behdad Esfahbod +Date: Tue Aug 4 20:52:47 2009 -0400 + + [HB] Add Sanitizer + + src/hb-open-types-private.hh | 58 + ++++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 53 insertions(+), 5 deletions(-) + +commit 2765d333e523a13dbd932fa33f3b39a5cf83f0f7 +Author: Behdad Esfahbod +Date: Tue Aug 4 20:50:18 2009 -0400 + + [HB] Add XXX + + src/hb-open-file-private.hh | 3 +++ + 1 file changed, 3 insertions(+) + +commit a328d66e6a8122f7d4d71941449d4d0136203e08 +Author: Behdad Esfahbod +Date: Tue Aug 4 20:27:05 2009 -0400 + + [HB] Minor cleanup + + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 2 +- + src/hb-ot-layout-gsub-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- + 4 files changed, 5 insertions(+), 5 deletions(-) + +commit 577c1116493d785d3455626612f97dabb383abf0 +Author: Behdad Esfahbod +Date: Tue Aug 4 19:31:02 2009 -0400 + + [HB] Shuffle code around + + src/hb-open-types-private.hh | 127 + ++++++++++++++++++++++--------------------- + 1 file changed, 65 insertions(+), 62 deletions(-) + +commit b1e187fc6365f5355c652a61494a5e9f6acf51b4 +Author: Behdad Esfahbod +Date: Tue Aug 4 15:28:49 2009 -0400 + + [HB] More sanitize infrastructure + + src/hb-open-types-private.hh | 29 ++++++++++++++++++++++++++++- + 1 file changed, 28 insertions(+), 1 deletion(-) + +commit b508e5ccd528f3f0f49f545bd5f30a525d5abd5a +Author: Behdad Esfahbod +Date: Tue Aug 4 15:07:24 2009 -0400 + + [HB] open-file sanitize() + + src/hb-open-file-private.hh | 46 + ++++++++++++++++++++++++++++++++++++++++---- + src/hb-open-types-private.hh | 13 +++++++++++++ + 2 files changed, 55 insertions(+), 4 deletions(-) + +commit 738c54d9caa3affc4b434e56bfb810ff6dc9b0b3 +Author: Behdad Esfahbod +Date: Tue Aug 4 14:42:46 2009 -0400 + + [HB] Tag sanitize() + + src/hb-open-types-private.hh | 8 ++++++++ + src/hb-ot-layout-common-private.hh | 6 +----- + 2 files changed, 9 insertions(+), 5 deletions(-) + +commit e49a84c9e37c08808880e74e94c8160731ababa1 +Author: Behdad Esfahbod +Date: Tue Aug 4 14:33:23 2009 -0400 + + [HB] GDEF sanitize() + + src/hb-ot-layout-gdef-private.hh | 54 + ++++++++++++++++++++++++++++++++++++ + src/hb-ot-layout-gpos-private.hh | 2 +- + src/hb-ot-layout-gsub-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 4 files changed, 57 insertions(+), 3 deletions(-) + +commit 18939487d04dba86880b0af8e89cf2cc44a431f5 +Author: Behdad Esfahbod +Date: Tue Aug 4 14:27:56 2009 -0400 + + [HB] Fix Extension sanitize() + + src/hb-ot-layout-gpos-private.hh | 3 ++- + src/hb-ot-layout-gsub-private.hh | 3 ++- + src/hb-ot-layout-gsubgpos-private.hh | 2 +- + 3 files changed, 5 insertions(+), 3 deletions(-) + +commit f2be750981be58a723831e69b1670275851d4be9 +Author: Behdad Esfahbod +Date: Tue Aug 4 14:12:46 2009 -0400 + + [HB] Remove stale TODO + + src/hb-ot-layout.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit ac26e2a838d1266bb5f39c43245eb2a52c5e072d +Author: Behdad Esfahbod +Date: Tue Aug 4 14:10:39 2009 -0400 + + [HB] Hookup NEUTER() + + src/hb-open-types-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 15164d9258a74122a4db748d35532bd72c47cec2 +Author: Behdad Esfahbod +Date: Tue Aug 4 13:57:41 2009 -0400 + + [HB] Fix mix warnings + + src/Makefile.am | 2 +- + src/hb-font.cc | 15 +++------------ + src/hb-open-types-private.hh | 2 +- + src/hb-ot-layout-common-private.hh | 6 +++--- + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-gpos-private.hh | 9 ++++----- + src/hb-ot-layout.cc | 2 +- + src/main.cc | 4 +--- + 8 files changed, 15 insertions(+), 27 deletions(-) + +commit 42b778f89e0818fe06910ce04e2203485823da09 +Author: Behdad Esfahbod +Date: Tue Aug 4 13:30:49 2009 -0400 + + [HB] GPOS sanitize() + + src/hb-open-types-private.hh | 22 ++++- + src/hb-ot-layout-gpos-private.hh | 195 + ++++++++++++++++++++++++++++++++++++++- + src/hb-ot-layout-gsub-private.hh | 2 - + 3 files changed, 213 insertions(+), 6 deletions(-) + +commit dc9c4d93cd0f3ac991f32df08c1c17fc389054c0 +Author: Behdad Esfahbod +Date: Tue Aug 4 12:26:26 2009 -0400 + + [HB] Sanitize DeviceTable + + src/hb-open-types-private.hh | 8 ++++---- + src/hb-ot-layout-common-private.hh | 17 ++++++++++++++--- + src/hb-ot-layout-gsub-private.hh | 2 +- + 3 files changed, 19 insertions(+), 8 deletions(-) + +commit ad3a3cd4955661c591b20af1f2c493432f0bebf0 +Author: Behdad Esfahbod +Date: Tue Aug 4 12:13:52 2009 -0400 + + [HB] More casts + + src/hb-ot-layout-gsub-private.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 95639fccc1ef18eadeb737e8b611d1d1f1315fc2 +Author: Behdad Esfahbod +Date: Tue Aug 4 12:05:24 2009 -0400 + + [HB] Fix couple of bugs + + src/hb-open-types-private.hh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 2b5a59c277f4c5bf7aac9a9005054763e322e02d +Author: Behdad Esfahbod +Date: Tue Aug 4 11:38:50 2009 -0400 + + [HB] More cast cleanup + + src/hb-open-types-private.hh | 23 ++++++++----- + src/hb-ot-layout-common-private.hh | 7 ++-- + src/hb-ot-layout-gsub-private.hh | 27 ++++++--------- + src/hb-ot-layout-gsubgpos-private.hh | 64 + +++++++++++++----------------------- + 4 files changed, 50 insertions(+), 71 deletions(-) + +commit 196598bbccff08415ff5192314cba044df258cad +Author: Behdad Esfahbod +Date: Tue Aug 4 11:04:32 2009 -0400 + + [Hb] Use reinterpret casts instead of direct casts to char * + + src/hb-open-file-private.hh | 4 ++-- + src/hb-open-types-private.hh | 19 +++++++++++----- + src/hb-ot-layout-common-private.hh | 8 +++---- + src/hb-ot-layout-gpos-private.hh | 12 +++++----- + src/hb-ot-layout-gsub-private.hh | 20 ++++++++-------- + src/hb-ot-layout-gsubgpos-private.hh | 44 + ++++++++++++++++++------------------ + 6 files changed, 57 insertions(+), 50 deletions(-) + +commit 92b5dd8e71e1bdeaa6e86a53f167683a3f5f4289 +Author: Behdad Esfahbod +Date: Tue Aug 4 10:41:32 2009 -0400 + + [HB] Merge more templates + + src/hb-open-types-private.hh | 167 + ++++++++++++++----------------------------- + 1 file changed, 55 insertions(+), 112 deletions(-) + +commit e6ab2c59ba2d37942ac5fcbfe61d38b7e359ac8c +Author: Behdad Esfahbod +Date: Tue Aug 4 10:23:01 2009 -0400 + + [HB] Simplify indirect sanitize() + + src/hb-open-types-private.hh | 52 + ++++++++++++++++++-------------------- + src/hb-ot-layout-common-private.hh | 11 +------- + 2 files changed, 26 insertions(+), 37 deletions(-) + +commit 29d8644a315ebe6976f15db2fe96069376d9b8cd +Author: Behdad Esfahbod +Date: Tue Aug 4 02:27:37 2009 -0400 + + [HB] Finish GSUB sanitize() + + src/hb-ot-layout-gsub-private.hh | 21 ++++++++++++++++++++- + 1 file changed, 20 insertions(+), 1 deletion(-) + +commit cf086adca1b7b5a361a248808f9a847e513d3630 +Author: Behdad Esfahbod +Date: Tue Aug 4 02:14:24 2009 -0400 + + [HB] Add comment + + src/hb-ot-layout-common-private.hh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit a97ce570ab693190350886e4e80942851c4d5727 +Author: Behdad Esfahbod +Date: Tue Aug 4 02:10:48 2009 -0400 + + [HB] Optimize sanitize() + + src/hb-open-types-private.hh | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit cd3827ee567612c5500206b62840702fc956e0f5 +Author: Behdad Esfahbod +Date: Tue Aug 4 02:09:34 2009 -0400 + + [HB] More sanitize() + + src/hb-open-file-private.hh | 2 +- + src/hb-open-types-private.hh | 12 ++++--- + src/hb-ot-layout-common-private.hh | 64 + +++++++++++++++++++++++++++++++----- + src/hb-ot-layout-gdef-private.hh | 2 +- + src/hb-ot-layout-gsubgpos-private.hh | 15 +++++++-- + 5 files changed, 79 insertions(+), 16 deletions(-) + +commit 70de50c11ed7037b20eb6814ff60f6e32a9944e4 +Author: Behdad Esfahbod +Date: Tue Aug 4 00:58:28 2009 -0400 + + [HB] Start sanitize() + + src/hb-open-types-private.hh | 105 ++++++++++++++++++++++++++++- + src/hb-ot-layout-common-private.hh | 48 +++++++++++++- + src/hb-ot-layout-gsub-private.hh | 125 + ++++++++++++++++++++++++++++++++++- + src/hb-ot-layout-gsubgpos-private.hh | 104 +++++++++++++++++++++++++++++ + 4 files changed, 376 insertions(+), 6 deletions(-) + +commit 5fc22e647c8a2bf6d3cb59185e351ac625e7e322 +Author: Behdad Esfahbod +Date: Mon Aug 3 22:43:02 2009 -0400 + + [HB] Remove use of typeof() + + src/hb-blob.c | 4 ++-- + src/hb-buffer.c | 2 +- + src/hb-font.cc | 14 +++++++------- + src/hb-object-private.h | 4 ++-- + 4 files changed, 12 insertions(+), 12 deletions(-) + +commit 70e0f2a75ec1559f2f70ada837ce4bc4baca49e3 +Author: Behdad Esfahbod +Date: Mon Aug 3 22:01:47 2009 -0400 + + [HB] Make it all work again + + src/hb-font.cc | 23 ++++++++++++--------- + src/hb-ot-layout-private.h | 9 +++++--- + src/hb-ot-layout.cc | 51 + +++++++++++++++++++++++----------------------- + 3 files changed, 44 insertions(+), 39 deletions(-) + +commit 23c86aa0009324433e78fcd0c47f2c0ff14b1949 +Author: Behdad Esfahbod +Date: Mon Aug 3 21:40:20 2009 -0400 + + [HB] Use face_t directly instead of ot_layout_t + + src/TODO | 1 + + src/hb-font-private.h | 4 + + src/hb-font.cc | 74 +++++++++--- + src/hb-font.h | 3 + + src/hb-object-private.h | 36 +++--- + src/hb-ot-layout-gdef-private.hh | 2 + + src/hb-ot-layout-gpos-private.hh | 14 +-- + src/hb-ot-layout-gsub-private.hh | 32 ++--- + src/hb-ot-layout-gsubgpos-private.hh | 8 +- + src/hb-ot-layout-private.h | 40 ++++--- + src/hb-ot-layout.cc | 220 + +++++++++++++++-------------------- + 11 files changed, 237 insertions(+), 197 deletions(-) + +commit fc6c94002dd5478cf9fbdaff12d8374a786c85e1 +Author: Behdad Esfahbod +Date: Mon Aug 3 21:27:08 2009 -0400 + + [HB] Simplify sub-blob support + + src/hb-blob.c | 172 + ++++++++++++++++++++++------------------------------------ + src/hb-blob.h | 14 +++-- + 2 files changed, 74 insertions(+), 112 deletions(-) + +commit a26442437ae9f11674e0d68cd5cbf395ade7695d +Author: Behdad Esfahbod +Date: Mon Aug 3 17:53:29 2009 -0400 + + [HB] Add sub-blobs + + src/hb-blob.c | 162 + +++++++++++++++++++++++++++++++++++++++++++++++++--------- + src/hb-blob.h | 12 ++++- + 2 files changed, 147 insertions(+), 27 deletions(-) + +commit b28e21b90c4105a0c2e17009b748777294614664 +Author: Behdad Esfahbod +Date: Sun Aug 2 20:06:48 2009 -0400 + + [HB] Rename hb-font.c to hb-font.cc + + src/Makefile.am | 2 +- + src/{hb-font.c => hb-font.cc} | 0 + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit 5f5b24f99f52bbc922e238b65c06061ba07c8548 +Author: Behdad Esfahbod +Date: Sun Aug 2 20:03:12 2009 -0400 + + [OT] Rename C++ header files from *.h to *.hh + + src/Makefile.am | 14 + +++++++------- + src/{hb-open-file-private.h => hb-open-file-private.hh} | 8 ++++---- + src/{hb-open-types-private.h => hb-open-types-private.hh} | 6 +++--- + ...out-common-private.h => hb-ot-layout-common-private.hh} | 8 ++++---- + ...-layout-gdef-private.h => hb-ot-layout-gdef-private.hh} | 8 ++++---- + ...-layout-gpos-private.h => hb-ot-layout-gpos-private.hh} | 8 ++++---- + ...-layout-gsub-private.h => hb-ot-layout-gsub-private.hh} | 8 ++++---- + ...gsubgpos-private.h => hb-ot-layout-gsubgpos-private.hh} | 8 ++++---- + src/hb-ot-layout.cc | 8 ++++---- + src/main.cc | 6 +++--- + 10 files changed, 41 insertions(+), 41 deletions(-) + +commit 2098a021a826e76ee27d5db74e32738d7d1c3d30 +Author: Behdad Esfahbod +Date: Sun Aug 2 19:57:00 2009 -0400 + + [HB] Move OT file handling out of ot-layout + + src/Makefile.am | 3 +- + src/hb-open-file-private.h | 145 + +++++++++++++++++++++ + ...yout-open-private.h => hb-open-types-private.h} | 117 + +---------------- + src/hb-ot-layout-common-private.h | 4 +- + src/hb-ot-layout.cc | 2 +- + src/main.cc | 4 +- + 6 files changed, 157 insertions(+), 118 deletions(-) + +commit 0ead481a5a8623103565fd7d924666e7342278dd +Author: Behdad Esfahbod +Date: Sun Aug 2 17:41:36 2009 -0400 + + [HB] Port ot-layout to new public API + + src/TODO | 1 + + src/hb-common.h | 1 + + src/hb-font.c | 9 + + src/hb-font.h | 3 + + src/hb-ot-layout-gdef-private.h | 32 ++-- + src/hb-ot-layout-gpos-private.h | 106 ++++++------ + src/hb-ot-layout-gsub-private.h | 50 +++--- + src/hb-ot-layout-gsubgpos-private.h | 12 +- + src/hb-ot-layout-private.h | 36 +++- + src/hb-ot-layout.cc | 334 + ++++++++++++++++++++---------------- + src/hb-ot-layout.h | 207 ++++++++++------------ + 11 files changed, 415 insertions(+), 376 deletions(-) + +commit 678bed433371d90536976a2d57195c1e1867f766 +Author: Behdad Esfahbod +Date: Sun Aug 2 15:35:31 2009 -0400 + + [HB] Add top-level header files + + src/Makefile.am | 2 ++ + src/hb-ot.h | 34 ++++++++++++++++++++++++++++++++++ + src/hb.h | 35 +++++++++++++++++++++++++++++++++++ + 3 files changed, 71 insertions(+) + +commit 2c80296aa5991ad67483889147f5c84fefe54af2 +Author: Behdad Esfahbod +Date: Sun Aug 2 15:20:22 2009 -0400 + + [HB] Add XXX marks + + src/hb-ot-layout-private.h | 2 ++ + src/hb-ot-layout.cc | 7 ++----- + 2 files changed, 4 insertions(+), 5 deletions(-) + +commit c46f8efd6ddd981b5724b2600ac98a80193385be +Author: Behdad Esfahbod +Date: Sat Aug 1 23:06:27 2009 -0400 + + [HB] Rename _duplicate to _copy + + To be in line with cairo + + src/hb-font.c | 4 ++-- + src/hb-font.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit f1ebe44985e2192844cf1747a4e36ed81e715ce6 +Author: Behdad Esfahbod +Date: Sat Aug 1 22:55:11 2009 -0400 + + [HB] Cleanup TODO + + src/TODO | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +commit f1322e52d557726baa010be8d35a594748e8fa1a +Author: Behdad Esfahbod +Date: Sat Aug 1 22:53:04 2009 -0400 + + [HB] Cleanup public buffer structs + + src/hb-buffer-private.h | 46 + +++++++++++++++++++++++++++++++------- + src/hb-buffer.c | 49 + +++++++++++++++++++++-------------------- + src/hb-buffer.h | 35 ++++++++++++++--------------- + src/hb-ot-layout-gpos-private.h | 8 +++---- + src/hb-ot-layout-private.h | 5 +++-- + src/hb-ot-layout.cc | 20 ++++++++--------- + 6 files changed, 97 insertions(+), 66 deletions(-) + +commit 6d5bb18e93d2a53350b342869a3ec8f25f0396c2 +Author: Behdad Esfahbod +Date: Sat Aug 1 22:25:04 2009 -0400 + + [OT] Match struct with HB's + + src/hb-buffer.c | 6 +++--- + src/hb-buffer.h | 2 +- + src/hb-ot-layout.cc | 12 ++++++------ + 3 files changed, 10 insertions(+), 10 deletions(-) + +commit 11fbb5487d9900a019440ef8235f35c9f525decb +Author: Behdad Esfahbod +Date: Sat Aug 1 22:19:06 2009 -0400 + + [HB] Port buffert to new object API + + src/hb-buffer-private.h | 24 +++++++++++++++--- + src/hb-buffer.c | 65 + +++++++++++++++++++++++++++++++++++++------------ + src/hb-buffer.h | 53 +++++++++++++++++++++++++--------------- + 3 files changed, 104 insertions(+), 38 deletions(-) + +commit 0cc7bc59ea6e8f38bf1e196c558cca9862ac3302 +Author: Behdad Esfahbod +Date: Sat Aug 1 21:38:39 2009 -0400 + + [HB] Move typedef's around + + src/hb-blob.h | 2 ++ + src/hb-common.h | 9 --------- + src/hb-font.h | 10 ++++++++++ + 3 files changed, 12 insertions(+), 9 deletions(-) + +commit a12dd324a3859496a95602d426aee34ce6c5c8a6 +Author: Behdad Esfahbod +Date: Sat Aug 1 21:36:15 2009 -0400 + + [HB] Add get_reference_count() + + src/hb-blob.c | 6 ++++++ + src/hb-blob.h | 3 +++ + src/hb-font.c | 24 ++++++++++++++++++++++++ + src/hb-font.h | 12 ++++++++++++ + src/hb-object-private.h | 7 +++++++ + 5 files changed, 52 insertions(+) + +commit baec684fde2303edb16341bfcf1022cd72acf129 +Author: Behdad Esfahbod +Date: Sat Aug 1 21:06:11 2009 -0400 + + [HB] Remove glib dependency + + src/Makefile.am | 7 ++----- + src/hb-buffer.c | 2 +- + src/hb-private.h | 30 ++++++++++++++++++------------ + src/main.cc | 1 + + 4 files changed, 22 insertions(+), 18 deletions(-) + +commit df66028781a7609a515980e64396e6f1044d764a +Author: Behdad Esfahbod +Date: Sat Aug 1 20:46:02 2009 -0400 + + [HB] Assorted compiler macros + + src/hb-ot-layout-open-private.h | 4 +- + src/hb-private.h | 88 + +++++++++++++++++++++++++++++++---------- + 2 files changed, 70 insertions(+), 22 deletions(-) + +commit ba8d94ce3360bfaf2c530d01f2af69237018a531 +Author: Behdad Esfahbod +Date: Sat Aug 1 20:29:22 2009 -0400 + + [HB] Simplify object creation + + src/Makefile.am | 2 +- + src/hb-blob.c | 6 +--- + src/hb-font-private.h | 1 - + src/hb-font.c | 37 + +++++++--------------- + src/{hb-refcount-private.h => hb-object-private.h} | 14 ++++++-- + src/hb-private.h | 2 ++ + 6 files changed, 27 insertions(+), 35 deletions(-) + +commit c62b503770325819f249885dfc9d4683a69c9efd +Author: Behdad Esfahbod +Date: Sat Aug 1 19:54:49 2009 -0400 + + [HB] Add abstract font and face API + + Not used yet. + + src/Makefile.am | 3 + + src/hb-blob.c | 6 +- + src/hb-font-private.h | 108 +++++++++++++++ + src/hb-font.c | 331 + ++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-font.h | 182 +++++++++++++++++++++++++ + src/hb-refcount-private.h | 14 +- + 6 files changed, 636 insertions(+), 8 deletions(-) + +commit 35a7383c6138fd705560f0d4bb30659cbd1ab64c +Author: Behdad Esfahbod +Date: Sat Aug 1 19:30:31 2009 -0400 + + [HB] Simplify refcounting functions + + src/hb-blob.c | 32 ++++++++++---------------------- + src/hb-common.h | 2 ++ + src/hb-private.h | 2 ++ + src/hb-refcount-private.h | 31 ++++++++++++++++++++++++++++++- + 4 files changed, 44 insertions(+), 23 deletions(-) + +commit 23af767a4475fecc1fe9fe9108f12c05c89bc8c9 +Author: Behdad Esfahbod +Date: Sat Aug 1 19:10:41 2009 -0400 + + [HB] Fix for dfont's with multiple faces + + src/hb-ot-layout-open-private.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit e97a95f2ea2770689bbf076d3c3ac404f273271e +Author: Behdad Esfahbod +Date: Sat Aug 1 19:05:44 2009 -0400 + + [HB] Use calloc instead of malloc where feasible + + src/hb-blob.c | 8 +++++--- + src/hb-buffer.c | 4 ++-- + 2 files changed, 7 insertions(+), 5 deletions(-) + +commit 0090dc0f67b553d2f6eaaedc289c0956ade09ef6 +Author: Behdad Esfahbod +Date: Thu Jul 30 16:28:45 2009 -0400 + + [HB] Remove hinting setting and use ppem==0 to mean "no hinting" + + src/hb-blob.h | 3 --- + src/hb-common.h | 9 +++++++++ + src/hb-ot-layout-gpos-private.h | 36 ++++++++++++++++++++++++------------ + src/hb-ot-layout-private.h | 2 -- + src/hb-ot-layout.cc | 7 ------- + src/hb-ot-layout.h | 4 ---- + 6 files changed, 33 insertions(+), 28 deletions(-) + +commit f0954d1e08ae288eda9904e17108fc73f48c0b98 +Author: Behdad Esfahbod +Date: Thu Jul 30 15:33:57 2009 -0400 + + [HB] Add a "blob" manager + + src/Makefile.am | 5 +- + src/hb-blob.c | 181 + ++++++++++++++++++++++++++++++++++++++++++++++ + src/hb-blob.h | 74 +++++++++++++++++++ + src/hb-private.h | 2 + + src/hb-refcount-private.h | 54 ++++++++++++++ + 5 files changed, 315 insertions(+), 1 deletion(-) + +commit 02a370697d25b986dbf1d5c38f46a89a4833b495 +Author: Behdad Esfahbod +Date: Wed Jul 29 18:41:25 2009 -0400 + + [HB] Move direction to buffer + + src/hb-buffer.c | 9 +++++++++ + src/hb-buffer.h | 14 ++++++++++++++ + src/hb-ot-layout-gpos-private.h | 2 +- + src/hb-ot-layout-private.h | 1 - + src/hb-ot-layout.cc | 7 ------- + src/hb-ot-layout.h | 5 ----- + 6 files changed, 24 insertions(+), 14 deletions(-) + +commit 7cda6fa24c26887c5543d0657b07aad466452cb3 +Author: Behdad Esfahbod +Date: Wed Jul 29 18:37:57 2009 -0400 + + [HB] Rename internal vars + + src/hb-ot-layout-gsubgpos-private.h | 56 + ++++++++++++++++++------------------- + 1 file changed, 28 insertions(+), 28 deletions(-) + +commit b196e6f2743d631ef181f1116370be3055063d36 +Author: Behdad Esfahbod +Date: Tue Jul 28 15:50:42 2009 -0400 + + [HB] Fix buffer enlargement. Ouch + + src/hb-buffer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f9cd1014f8f4d0394b5e0e9eefc1e2af13c59cab +Author: Behdad Esfahbod +Date: Tue Jul 28 15:43:34 2009 -0400 + + Apply patch from Jonathan Kew + + src/hb-buffer.c | 75 + ++++++++++++++++++++++++++++------------------------- + src/hb-buffer.h | 6 ++++- + src/hb-ot-layout.cc | 31 ++++++++++++++++++++++ + src/hb-ot-layout.h | 15 +++++++++++ + src/hb-private.h | 2 +- + 5 files changed, 91 insertions(+), 38 deletions(-) + +commit 2ebb89d63dd27e800f2b6cbf624924601105f48a +Author: Behdad Esfahbod +Date: Sat Jul 25 19:09:01 2009 -0400 + + Revert "XX" + + This reverts commit c939f6aff405ca7b10b1f1538f46148bff719fcb. + + src/Makefile.am | 2 - + src/hb-buffer.c | 9 --- + src/hb-buffer.h | 14 ----- + src/hb-common.h | 3 - + src/hb-ot-layout-gdef-private.h | 32 +++++------ + src/hb-ot-layout-gpos-private.h | 108 + ++++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.h | 46 +++++++-------- + src/hb-ot-layout-gsubgpos-private.h | 68 +++++++++++------------ + src/hb-ot-layout-private.h | 28 ++++------ + src/hb-ot-layout.cc | 30 ++++++++++ + src/hb-ot-layout.h | 5 ++ + src/hb-private.h | 16 ------ + 12 files changed, 174 insertions(+), 187 deletions(-) + +commit 55520d2af172f5f6617b909e80cbd7d898f2bc15 +Author: Behdad Esfahbod +Date: Wed Jun 10 23:26:51 2009 -0400 + + XX + + src/Makefile.am | 2 + + src/hb-buffer.c | 9 +++ + src/hb-buffer.h | 14 +++++ + src/hb-common.h | 3 + + src/hb-ot-layout-gdef-private.h | 32 +++++------ + src/hb-ot-layout-gpos-private.h | 108 + ++++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.h | 46 +++++++-------- + src/hb-ot-layout-gsubgpos-private.h | 68 +++++++++++------------ + src/hb-ot-layout-private.h | 28 ++++++---- + src/hb-ot-layout.cc | 30 ---------- + src/hb-ot-layout.h | 5 -- + src/hb-private.h | 16 ++++++ + 12 files changed, 187 insertions(+), 174 deletions(-) + +commit f53d434b9151c4ec43c148734b49bb165e522cc9 +Author: Behdad Esfahbod +Date: Sat May 30 22:17:32 2009 -0400 + + [GPOS] Advance buffer cursor in SinglePos lookups. Ouch! + + src/hb-ot-layout-gpos-private.h | 4 ++++ + 1 file changed, 4 insertions(+) + +commit e35bbd570a5d914f86f1ea83941ee4328f268059 +Author: Behdad Esfahbod +Date: Sat May 30 12:02:46 2009 -0400 + + [HB] Improve buffer. Don't dup out buffer unless out is longer + than in + + That is, we work in-place even for ligatures now. + + src/hb-buffer.c | 156 + ++++++++++++++++++++++++-------------------------------- + src/hb-buffer.h | 7 ++- + 2 files changed, 71 insertions(+), 92 deletions(-) + +commit 6734ed4b6b2ce382917bf644aaf1acfa993f00ad +Author: Behdad Esfahbod +Date: Wed May 27 18:16:55 2009 -0400 + + [GPOS] Fix property checking + + src/hb-ot-layout-gpos-private.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit cc83ae12484108586fba6586bd9008971338b322 +Author: Behdad Esfahbod +Date: Wed May 27 00:17:37 2009 -0400 + + [GPOS] Add vertical TODO + + src/hb-ot-layout-gpos-private.h | 2 ++ + 1 file changed, 2 insertions(+) + +commit b69d38e7eaea544ba6c1876cdc6ddac61a698dd3 +Author: Behdad Esfahbod +Date: Tue May 26 22:29:02 2009 -0400 + + [HB] Remove useless include + + src/hb-ot-layout-private.h | 3 --- + 1 file changed, 3 deletions(-) + +commit 6c8108cb583292a679b05844ab613b7f4587adc6 +Author: Behdad Esfahbod +Date: Tue May 26 22:26:08 2009 -0400 + + [GPOS] Remove unused variables + + src/hb-ot-layout-gpos-private.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 09c292e3b688a67fbae67b645d1e6ffcf8d8eb6e +Author: Behdad Esfahbod +Date: Tue May 26 19:48:16 2009 -0400 + + [HB] Fix glyph properties + + src/hb-ot-layout-common-private.h | 6 +++--- + src/hb-ot-layout-open-private.h | 2 +- + src/hb-ot-layout.cc | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +commit 64e33f008ff9cc807fdfdc4553ad3fe01bb0615f +Author: Behdad Esfahbod +Date: Tue May 26 18:57:56 2009 -0400 + + [GPOS] Fix PairPos signedness + + src/hb-ot-layout-gpos-private.h | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +commit 80ea5bd10e72561a7627a5196621a6d7eccd91b7 +Author: Behdad Esfahbod +Date: Tue May 26 17:58:37 2009 -0400 + + [GPOS] Fix mark matching + + src/hb-ot-layout-gpos-private.h | 44 + +++++++++++++++++++---------------------- + 1 file changed, 20 insertions(+), 24 deletions(-) + +commit 4189b92aaa41e4a1756c561cc6e08b0ed024afda +Author: Behdad Esfahbod +Date: Tue May 26 17:31:56 2009 -0400 + + [HB] When looking back/forward, skip marks only + + src/TODO | 1 - + src/hb-ot-layout-gpos-private.h | 13 ++----- + src/hb-ot-layout-gsub-private.h | 38 +++++++++----------- + src/hb-ot-layout-gsubgpos-private.h | 14 ++++---- + src/hb-ot-layout-private.h | 6 ++++ + src/hb-ot-layout.cc | 69 + ++++++++++++++++++++++++------------- + 6 files changed, 76 insertions(+), 65 deletions(-) + +commit 1246e41021ab1d782b4c97e5d81c4917a57e3ed4 +Author: Behdad Esfahbod +Date: Tue May 26 15:58:34 2009 -0400 + + [GDEF] Support MarkFilteringSets + + src/hb-ot-layout.cc | 59 + +++++++++++++++++++---------------------------------- + 1 file changed, 21 insertions(+), 38 deletions(-) + +commit 5130c35e93528bcf3095fee5baf3847589167a58 +Author: Behdad Esfahbod +Date: Tue May 26 15:45:41 2009 -0400 + + [HB] Simplify MarkAttachmentType handling + + src/hb-ot-layout-gpos-private.h | 6 +++--- + src/hb-ot-layout-gsub-private.h | 6 ++---- + src/hb-ot-layout.cc | 18 ++++++++---------- + 3 files changed, 13 insertions(+), 17 deletions(-) + +commit e4b92b85a7750bd4271ad607b3c41f0184e89feb +Author: Behdad Esfahbod +Date: Tue May 26 15:38:53 2009 -0400 + + [HB] Support parsing MarkFilteringSets introduced in OpenType 1.6 + + src/hb-ot-layout-gdef-private.h | 55 + +++++++++++++++++++++++++++++++++++------ + src/hb-ot-layout-gpos-private.h | 1 + + src/hb-ot-layout.cc | 6 ++--- + 3 files changed, 51 insertions(+), 11 deletions(-) + +commit 515ce4ceb2ab0151d8dfc03ff0bfc7d110dd93b5 +Author: Behdad Esfahbod +Date: Tue May 26 13:08:00 2009 -0400 + + [HB] More de-C++'ization + + src/hb-ot-layout-gsubgpos-private.h | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +commit d7df42d7ee586219475878d160f85ae5a188bd59 +Author: Behdad Esfahbod +Date: Tue May 26 13:04:59 2009 -0400 + + [HB] Start MarkFilteringSet support + + src/hb-ot-layout-common-private.h | 24 +++++++++++++++++++----- + 1 file changed, 19 insertions(+), 5 deletions(-) + +commit 62964afcecd96038cfaa8bc2bc931f43ee83be7e +Author: Behdad Esfahbod +Date: Tue May 26 12:40:10 2009 -0400 + + [HB] Implement get_lig_carets() + + src/hb-ot-layout-gdef-private.h | 57 + ++++++++++++++++++++++++++++++++--------- + src/hb-ot-layout.cc | 17 +++++++++--- + src/hb-ot-layout.h | 8 +++++- + src/main.cc | 9 +------ + 4 files changed, 66 insertions(+), 25 deletions(-) + +commit 79420ad9caf2d5fc94c3693e8292edfa27060b2d +Author: Behdad Esfahbod +Date: Tue May 26 12:24:16 2009 -0400 + + [HB] Add get_attach_points() + + src/Makefile.am | 2 +- + src/hb-ot-layout-gdef-private.h | 35 +++++++++++++++++++++++++---------- + src/hb-ot-layout-gpos-private.h | 28 +++++++--------------------- + src/hb-ot-layout-gsub-private.h | 28 +++++++--------------------- + src/hb-ot-layout-open-private.h | 12 +++--------- + src/hb-ot-layout.cc | 9 +++++++++ + src/hb-ot-layout.h | 6 ++++++ + src/main.cc | 8 ++++---- + 8 files changed, 62 insertions(+), 66 deletions(-) + +commit 855720ca47bf5a7a44eb5b84dce9f7da6e7156bd +Author: Behdad Esfahbod +Date: Tue May 26 12:00:28 2009 -0400 + + [HB] Remove more macros + + src/hb-ot-layout-gdef-private.h | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit c968fc2dc87cf85b53f60a40db59d5ee7b992edf +Author: Behdad Esfahbod +Date: Mon May 25 04:04:24 2009 -0400 + + [HB] More buffer cleanup + + src/hb-buffer-private.h | 39 +++-------- + src/hb-buffer.c | 136 + ++++++++++++++++++------------------ + src/hb-buffer.h | 22 +++--- + src/hb-ot-layout-gpos-private.h | 29 ++++---- + src/hb-ot-layout-gsub-private.h | 10 +-- + src/hb-ot-layout-gsubgpos-private.h | 8 +-- + src/hb-ot-layout-private.h | 13 ++-- + src/hb-ot-layout.cc | 16 ++--- + src/hb-private.h | 29 -------- + 9 files changed, 125 insertions(+), 177 deletions(-) + +commit 88a5f5a49b6809d88560791f9cf6b8f78f22a4ad +Author: Behdad Esfahbod +Date: Mon May 25 03:39:11 2009 -0400 + + [HB] Cleanup buffer + + src/hb-buffer-private.h | 2 +- + src/hb-buffer.c | 26 ++++++++------ + src/hb-ot-layout-gsub-private.h | 26 +++++--------- + src/hb-ot-layout-gsubgpos-private.h | 2 +- + src/hb-ot-layout.cc | 71 + ------------------------------------- + 5 files changed, 25 insertions(+), 102 deletions(-) + +commit 347f0b8621d3adfec157e5634ff3defc818ea37f +Author: Behdad Esfahbod +Date: Mon May 25 03:30:31 2009 -0400 + + [HB] Clean more + + src/hb-ot-layout-private.h | 10 ++++------ + src/hb-ot-layout.cc | 8 ++++---- + 2 files changed, 8 insertions(+), 10 deletions(-) + +commit d9d2a07f4a8696666a12f5a206aa9cfb56dc2b35 +Author: Behdad Esfahbod +Date: Mon May 25 03:24:19 2009 -0400 + + [HB] Remove one XXX, add another + + src/hb-buffer.h | 2 ++ + src/hb-ot-layout-private.h | 3 +-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit 6c78683c042250a7b5a6fc6ebae4717b03fadf9e +Author: Behdad Esfahbod +Date: Mon May 25 03:22:19 2009 -0400 + + [HB] Update copyright years + + src/hb-buffer-private.h | 2 +- + src/hb-buffer.h | 2 +- + src/hb-common.h | 2 +- + src/hb-ot-layout-private.h | 2 +- + src/hb-ot-layout.h | 2 +- + src/hb-private.h | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +commit 4497af0069a94c69fc1518b1db2c1282721b732a +Author: Behdad Esfahbod +Date: Mon May 25 03:20:18 2009 -0400 + + [HB] Would have helped if I actually knew C++ before using it... + + src/hb-ot-layout-gsubgpos-private.h | 4 ++-- + src/hb-ot-layout-open-private.h | 24 ++++++++++++------------ + 2 files changed, 14 insertions(+), 14 deletions(-) + +commit cc6c644ff2af5f6669b6ec100ff13e904872b21c +Author: Behdad Esfahbod +Date: Mon May 25 03:10:06 2009 -0400 + + [HB] More cleanup + + src/hb-ot-layout-common-private.h | 4 ++-- + src/hb-ot-layout-open-private.h | 9 +++++---- + 2 files changed, 7 insertions(+), 6 deletions(-) + +commit 20cc86b3592db33731de671f008d7d222776be49 +Author: Behdad Esfahbod +Date: Mon May 25 02:41:49 2009 -0400 + + [HB] Simplify Tag + + src/hb-ot-layout-open-private.h | 46 + ++++++++++++++++------------------------- + 1 file changed, 18 insertions(+), 28 deletions(-) + +commit 3ec0092c5e2d48e8c4fc1618d3bee427adddb1e7 +Author: Behdad Esfahbod +Date: Mon May 25 02:34:25 2009 -0400 + + [HB] Simplify more + + src/hb-ot-layout-open-private.h | 31 ++++++++++--------------------- + 1 file changed, 10 insertions(+), 21 deletions(-) + +commit 6ad8d5f3c7028147b371137ae4bca6aae66b3489 +Author: Behdad Esfahbod +Date: Mon May 25 02:27:29 2009 -0400 + + [HB] Simplify some basic things + + src/hb-ot-layout-open-private.h | 90 + +++++++++++++++++++++++++++-------------- + src/main.cc | 8 ++-- + 2 files changed, 64 insertions(+), 34 deletions(-) + +commit f96ffd43bce0ac6d9c897933c9be0e51d543e570 +Author: Behdad Esfahbod +Date: Sun May 24 15:01:16 2009 -0400 + + [HB] simplify macros + + src/hb-buffer-private.h | 4 ++-- + src/hb-buffer.h | 4 ++-- + src/hb-common.h | 8 ++++---- + src/hb-ot-layout-private.h | 4 ++-- + src/hb-ot-layout.h | 4 ++-- + 5 files changed, 12 insertions(+), 12 deletions(-) + +commit 8e7b30782a12f3997b9a5a18e6b9d01f6bff8b46 +Author: Behdad Esfahbod +Date: Sun May 24 14:27:24 2009 -0400 + + [HB] Update text files + + src/COPYING | 7 ------- + src/README | 13 ++----------- + 2 files changed, 2 insertions(+), 18 deletions(-) + +commit fa7d47249496fe00ea1ab6943b385c8dd80e5ce6 +Author: Behdad Esfahbod +Date: Sun May 24 14:24:35 2009 -0400 + + [HB] Remove stale makefile.msc too + + src/makefile.msc | 19 ------------------- + 1 file changed, 19 deletions(-) + +commit da2c52abcd75d46929b34cad55c4fb2c8892bc08 +Author: Behdad Esfahbod +Date: Sun May 24 14:22:22 2009 -0400 + + [HB] Remove old code! + + Goodbye 16 thousand lines of ten-year old code! + + src/harfbuzz-dump-main.c | 97 - + src/harfbuzz-dump.c | 768 ------ + src/harfbuzz-dump.h | 41 - + src/harfbuzz-gdef-private.h | 124 - + src/harfbuzz-gdef.c | 1160 -------- + src/harfbuzz-gdef.h | 135 - + src/harfbuzz-global.h | 84 - + src/harfbuzz-gpos-private.h | 712 ----- + src/harfbuzz-gpos.c | 6071 + ----------------------------------------- + src/harfbuzz-gpos.h | 174 -- + src/harfbuzz-gsub-private.h | 476 ---- + src/harfbuzz-gsub.c | 4304 ----------------------------- + src/harfbuzz-gsub.h | 140 - + src/harfbuzz-impl.c | 84 - + src/harfbuzz-impl.h | 126 - + src/harfbuzz-open-private.h | 102 - + src/harfbuzz-open.c | 1405 ---------- + src/harfbuzz-open.h | 282 -- + src/harfbuzz-stream-private.h | 83 - + src/harfbuzz-stream.c | 257 -- + src/harfbuzz.c | 31 - + src/harfbuzz.h | 35 - + 22 files changed, 16691 deletions(-) + +commit e5372f1621602dcee4e14a4b22dc182c21502a50 +Author: Behdad Esfahbod +Date: Sun May 24 14:21:27 2009 -0400 + + [HB] Remove stale TODO mark + + src/hb-ot-layout-open-private.h | 1 - + 1 file changed, 1 deletion(-) + +commit 96908b898476ca5d7da5f386b15be76f9e83d76e +Author: Behdad Esfahbod +Date: Sun May 24 12:30:40 2009 -0400 + + [HB] Add FixedVersion cast to int + + src/hb-ot-layout-open-private.h | 2 ++ + 1 file changed, 2 insertions(+) + +commit 957740dd253475020a94a62ec5dfcd03e3358176 +Author: Behdad Esfahbod +Date: Sun May 24 12:29:55 2009 -0400 + + [HB] Simplify tag + + src/hb-ot-layout-open-private.h | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 87fcdcbe3644da10154688765db2d62eb9ac079a +Author: Behdad Esfahbod +Date: Sun May 24 01:03:24 2009 -0400 + + [HB] Remove unused data types + + src/hb-ot-layout-gdef-private.h | 2 +- + src/hb-ot-layout-gsubgpos-private.h | 2 +- + src/hb-ot-layout-open-private.h | 54 + ++++--------------------------------- + 3 files changed, 7 insertions(+), 51 deletions(-) + +commit 5876bf1b73fcb56cc41b4d348248a4817f9688cb +Author: Behdad Esfahbod +Date: Sun May 24 00:53:28 2009 -0400 + + [HB] Simplify version check in GSUB/GPOS + + src/hb-ot-layout-gpos-private.h | 5 ++++- + src/hb-ot-layout-gsub-private.h | 5 ++++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +commit 212aba6189d7aaac0bab169b77ae6bdab16800a5 +Author: Behdad Esfahbod +Date: Sun May 24 00:50:27 2009 -0400 + + [HB] Check for GDEF/GSUB/GPOS versions + + src/hb-ot-layout-gdef-private.h | 3 +-- + src/hb-ot-layout-gpos-private.h | 3 +-- + src/hb-ot-layout-gsub-private.h | 3 +-- + src/hb-ot-layout-gsubgpos-private.h | 5 ++--- + src/hb-ot-layout-open-private.h | 11 ++++++++++- + 5 files changed, 15 insertions(+), 10 deletions(-) + +commit a21b5062cc32c04eeee3c4b20d26c7e2b34133e9 +Author: Behdad Esfahbod +Date: Sat May 23 22:39:42 2009 -0400 + + [HB] Minor + + src/hb-ot-layout-gdef-private.h | 6 +++--- + src/hb-ot-layout-open-private.h | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit a080b1cc2f66d6e109d431a1e09519d7cf53bb9a +Author: Behdad Esfahbod +Date: Sat May 23 18:50:44 2009 -0400 + + [HB] Add TODO items + + src/TODO | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit e4efdd80a8fa4edbcdec9cd84f35f5f4521943c2 +Author: Behdad Esfahbod +Date: Fri May 22 18:54:24 2009 -0400 + + [GDEF] Add some get_carret_value() code + + src/hb-ot-layout-gdef-private.h | 36 ++++++++++++++++++------------------ + 1 file changed, 18 insertions(+), 18 deletions(-) + +commit 9b006bc0322723d065271e4b0ea4f137f81101e1 +Author: Behdad Esfahbod +Date: Fri May 22 18:29:45 2009 -0400 + + [GPOS] MarkLigPosFormat1 + + GPOS is complete now! Yay! + + src/hb-ot-layout-gpos-private.h | 128 + +++++++++++++++++++++++++++++----------- + 1 file changed, 92 insertions(+), 36 deletions(-) + +commit 923923feb248250626c637c11a886804011197b0 +Author: Behdad Esfahbod +Date: Fri May 22 17:58:09 2009 -0400 + + [HB] Remove apply_subtables() again + + src/hb-ot-layout-gpos-private.h | 31 +++++++++++-------------------- + src/hb-ot-layout-gsub-private.h | 33 ++++++++++++--------------------- + 2 files changed, 23 insertions(+), 41 deletions(-) + +commit d468f9af5b9fdc2713b0b86f28129e4190ee5053 +Author: Behdad Esfahbod +Date: Thu May 21 22:31:33 2009 -0400 + + [HB] Share Extension lookup code between GSUB and GPOS + + src/hb-ot-layout-gpos-private.h | 64 +++++----------------------- + src/hb-ot-layout-gsub-private.h | 83 + +++++++------------------------------ + src/hb-ot-layout-gsubgpos-private.h | 52 +++++++++++++++++++++++ + 3 files changed, 77 insertions(+), 122 deletions(-) + +commit 498f1909e0f7a32484b2058622c4a018cbfc1334 +Author: Behdad Esfahbod +Date: Thu May 21 15:51:04 2009 -0400 + + [GPOS] Remove printf. MarkMarkPos1 is working + + The "bug" was in the font. + + src/hb-ot-layout-gpos-private.h | 1 - + 1 file changed, 1 deletion(-) + +commit c7d457aa3ae7138630f52ca7263f663a3ea284c0 +Author: Behdad Esfahbod +Date: Thu May 21 12:46:29 2009 -0400 + + [HB] Ouch. Add files. + + src/hb-common.h | 13 +++++----- + src/hb-private.h | 74 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- + 2 files changed, 78 insertions(+), 9 deletions(-) + +commit fe550f4dd815285e9de8c3cbff810b0a1c7b377f +Author: Behdad Esfahbod +Date: Thu May 21 08:27:07 2009 -0400 + + [GPOS] MarkMarkPosFormat1 + + Still not quite working. + + src/TODO | 4 +- + src/hb-ot-layout-gpos-private.h | 105 + +++++++++++++++++++++++++++++----------- + 2 files changed, 79 insertions(+), 30 deletions(-) + +commit 357ccde36bba01a405d59b7da061fc5048cdc7b4 +Author: Behdad Esfahbod +Date: Thu May 21 06:32:01 2009 -0400 + + [GPOS] MarkBasePosFormat1 + + src/TODO | 1 + + src/hb-ot-layout-gpos-private.h | 62 + +++++++++++++++++++++++++++++++++++++---- + 2 files changed, 58 insertions(+), 5 deletions(-) + +commit 377bfc5860ae018f54e4a2dd737b4b000383ab54 +Author: Behdad Esfahbod +Date: Thu May 21 04:58:24 2009 -0400 + + [GPOS] Implement MarkArray interface + + src/hb-ot-layout-gpos-private.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit c18ec2b1d7b8c7abe6ebf4b53c9ec75d5c9bb255 +Author: Behdad Esfahbod +Date: Thu May 21 04:54:01 2009 -0400 + + [GPOS] Implement Device support in AnchorFormat3 + + src/hb-ot-layout-gpos-private.h | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +commit fca6a0d158b847181dcf67a13f34499177df899b +Author: Behdad Esfahbod +Date: Thu May 21 04:49:04 2009 -0400 + + [GPOS] Remove apply_value() return value + + src/hb-ot-layout-gpos-private.h | 75 + +++++++++++++++++++---------------------- + 1 file changed, 34 insertions(+), 41 deletions(-) + +commit fb3b5ccfefc4c38c9184d432703e81f73e1f5bc7 +Author: Behdad Esfahbod +Date: Thu May 21 04:47:05 2009 -0400 + + [GPOS] Start MarkBasePosFormat1 + + src/TODO | 1 + + src/hb-ot-layout-gpos-private.h | 38 + +++++++++++++++++--------------------- + 2 files changed, 18 insertions(+), 21 deletions(-) + +commit ee8776d9e009a7fb8e1f3c1f9cf3ad42d9746a16 +Author: Behdad Esfahbod +Date: Wed May 20 15:46:12 2009 -0400 + + [HB] Add TODO item + + src/hb-ot-layout-gpos-private.h | 1 + + src/hb-ot-layout-gsub-private.h | 1 + + 2 files changed, 2 insertions(+) + +commit c6456ca5cfc35095378dcf29f8edc33ece9c3ea1 +Author: Behdad Esfahbod +Date: Wed May 20 06:15:23 2009 -0400 + + [HB] Add TODO item + + src/TODO | 1 + + 1 file changed, 1 insertion(+) + +commit 3015c4175179a1816aad2a4950da9a3b8baf2578 +Author: Behdad Esfahbod +Date: Wed May 20 06:01:16 2009 -0400 + + [HB] Remove last dependence on the old code base! + + src/hb-buffer-private.h | 88 + ++++++++++++++++++++--------------------- + src/hb-buffer.c | 47 +++++++++++----------- + src/hb-ot-layout-gpos-private.h | 11 ++---- + src/hb-ot-layout-gsub-private.h | 12 +++--- + src/hb-ot-layout.cc | 16 ++++---- + 5 files changed, 85 insertions(+), 89 deletions(-) + +commit 5c0adce1ccc739415c4b26ff13ffd2d77ea4bc6c +Author: Behdad Esfahbod +Date: Wed May 20 05:42:12 2009 -0400 + + [HB] Rename harfbuzz-buffer to hb-buffer + + src/Makefile.am | 5 +++-- + src/{harfbuzz-buffer-private.h => hb-buffer-private.h} | 8 ++++---- + src/{harfbuzz-buffer.c => hb-buffer.c} | 6 ++---- + src/{harfbuzz-buffer.h => hb-buffer.h} | 8 ++++---- + src/hb-ot-layout-gsubgpos-private.h | 2 +- + src/hb-ot-layout-private.h | 2 +- + src/hb-ot-layout.cc | 5 +++-- + src/hb-ot-layout.h | 2 +- + 8 files changed, 19 insertions(+), 19 deletions(-) + +commit b857b49c82782d29d6d189f1a9f4a84d39cd84ea +Author: Behdad Esfahbod +Date: Wed May 20 05:35:14 2009 -0400 + + [HB] Remove all references to the old code! + + src/Makefile.am | 76 +++++++--------------- + src/harfbuzz-buffer.c | 154 + +++++++++++++++++++-------------------------- + src/harfbuzz-buffer.h | 80 +++++++++++------------ + src/hb-ot-layout-private.h | 6 +- + src/hb-ot-layout.cc | 17 ++--- + src/hb-ot-layout.h | 1 + + 6 files changed, 137 insertions(+), 197 deletions(-) + +commit e1593a6e620ee6a8184487185d1c95e0d1820ba5 +Author: Behdad Esfahbod +Date: Wed May 20 04:51:30 2009 -0400 + + [GPOS] Finally it's working, up to Cursive + + Wow, IranNastaliq renders perfectly again! + + src/hb-ot-layout.cc | 24 ++++++++++++++++++++++++ + src/hb-ot-layout.h | 12 ++++++++++++ + 2 files changed, 36 insertions(+) + +commit 0f7e6b2cead0c7d527ef68ededb27e0afd71d819 +Author: Behdad Esfahbod +Date: Wed May 20 04:16:35 2009 -0400 + + [GPOS] Fix more brokenness + + src/Makefile.am | 2 +- + src/hb-ot-layout-gpos-private.h | 37 + ++++++++++++++++++++----------------- + src/hb-ot-layout.cc | 7 +++++++ + src/hb-ot-layout.h | 5 +++++ + 4 files changed, 33 insertions(+), 18 deletions(-) + +commit ff05d257dd43221b7c8ebead188e78495daa8eda +Author: Behdad Esfahbod +Date: Wed May 20 03:53:00 2009 -0400 + + [HB] Move lookup types enum into subtable class + + src/hb-ot-layout-gpos-private.h | 66 + ++++++++++++++++++++--------------------- + src/hb-ot-layout-gsub-private.h | 44 +++++++++++++-------------- + 2 files changed, 55 insertions(+), 55 deletions(-) + +commit 263bbef7670b59aa88ef9ba910579dfa51226524 +Author: Behdad Esfahbod +Date: Wed May 20 00:00:09 2009 -0400 + + [GDEF] Simplify Device access + + src/hb-ot-layout-gdef-private.h | 12 +++--------- + 1 file changed, 3 insertions(+), 9 deletions(-) + +commit 60d77cf05fddc5304b4b1fc19cdedba15cbee1e9 +Author: Behdad Esfahbod +Date: Tue May 19 23:58:54 2009 -0400 + + [HB] Indentation + + src/hb-ot-layout-common-private.h | 170 + +++++++++++++++++------------------- + src/hb-ot-layout-gdef-private.h | 65 +++++++------- + src/hb-ot-layout-gsubgpos-private.h | 150 +++++++++++++++++-------------- + src/hb-ot-layout-open-private.h | 159 + ++++++++++++++++----------------- + src/hb-ot-layout-private.h | 9 +- + 5 files changed, 288 insertions(+), 265 deletions(-) + +commit 90de3dfff9e82dae20b7517642511aebaf736b74 +Author: Behdad Esfahbod +Date: Tue May 19 23:43:04 2009 -0400 + + [HB] Remove unused methods + + src/hb-ot-layout-common-private.h | 6 ------ + 1 file changed, 6 deletions(-) + +commit 4c44d830d79431fcb143df2b5a29cdc8e8fccef3 +Author: Behdad Esfahbod +Date: Tue May 19 23:42:30 2009 -0400 + + [HB] Indentation + + src/hb-ot-layout-gpos-private.h | 253 + +++++++++++++++++++++----------------- + src/hb-ot-layout-gsub-private.h | 262 + ++++++++++++++++++++++------------------ + 2 files changed, 284 insertions(+), 231 deletions(-) + +commit d18fd8e3f7185f531fa4c4988d3f5d5c5282b8eb +Author: Behdad Esfahbod +Date: Tue May 19 23:25:41 2009 -0400 + + [GPOS] CursivePosFormat1 + + src/hb-ot-layout-gpos-private.h | 174 + ++++++++++++++++++++++++++++++++++++++-- + src/hb-ot-layout-private.h | 2 +- + 2 files changed, 169 insertions(+), 7 deletions(-) + +commit 70632add333e4ab38f8f485bb87b25116128cf92 +Author: Behdad Esfahbod +Date: Tue May 19 22:30:09 2009 -0400 + + [GSUB] PairPosFormat2 + + src/hb-ot-layout-gpos-private.h | 43 + ++++++++++++++++++++++++++++++++++++----- + 1 file changed, 38 insertions(+), 5 deletions(-) + +commit b24ecbadf44d56fd3286d1d3ff6928151ccec9bd +Author: Behdad Esfahbod +Date: Tue May 19 22:16:04 2009 -0400 + + [GPOS] PairPosFormat1 + + src/hb-ot-layout-gpos-private.h | 91 + +++++++++++++++++++++++++++++++++-------- + 1 file changed, 73 insertions(+), 18 deletions(-) + +commit 056c7ec1aea1eca60a3b20b583b8a8072be9d758 +Author: Behdad Esfahbod +Date: Mon May 18 19:47:52 2009 -0400 + + [GPOS] Start filling apply() functions in + + src/harfbuzz-buffer-private.h | 1 + + src/harfbuzz-buffer.c | 3 - + src/hb-ot-layout-common-private.h | 35 ++++++----- + src/hb-ot-layout-gpos-private.h | 127 + ++++++++++++++++++++++++++++---------- + 4 files changed, 116 insertions(+), 50 deletions(-) + +commit 4fa77d3c4305a76b956de8c1a9b83a961d035a80 +Author: Behdad Esfahbod +Date: Mon May 18 18:44:54 2009 -0400 + + [HB] Use enums + + src/hb-ot-layout-common-private.h | 14 ++++++++------ + src/hb-ot-layout-gdef-private.h | 22 +++++++++++++--------- + 2 files changed, 21 insertions(+), 15 deletions(-) + +commit 6b54c5d0446b514fbb6521e7e9e614d153435f0e +Author: Behdad Esfahbod +Date: Mon May 18 18:30:25 2009 -0400 + + [HB] More reference cast simplification + + src/hb-ot-layout-gsub-private.h | 8 ++++---- + src/hb-ot-layout-gsubgpos-private.h | 28 ++++++++++++++-------------- + src/hb-ot-layout-open-private.h | 2 +- + 3 files changed, 19 insertions(+), 19 deletions(-) + +commit eb0dfc830e09405492f494c85380e133ac5d0ea3 +Author: Behdad Esfahbod +Date: Mon May 18 18:22:44 2009 -0400 + + [HB] Rename LOOKUP_ARGS to APPLY_ARGS + + src/hb-ot-layout-gpos-private.h | 88 + ++++++++++++++++++------------------ + src/hb-ot-layout-gsub-private.h | 84 + +++++++++++++++++----------------- + src/hb-ot-layout-gsubgpos-private.h | 90 + ++++++++++++++++++------------------- + 3 files changed, 131 insertions(+), 131 deletions(-) + +commit 2a8e6accdf798a78ff180dcb593140592d62b872 +Author: Behdad Esfahbod +Date: Mon May 18 18:21:44 2009 -0400 + + [HB] Internally rename position() and substitute() to apply() + + src/hb-ot-layout-gpos-private.h | 110 + ++++++++++++++++++++-------------------- + src/hb-ot-layout-gsub-private.h | 104 + ++++++++++++++++++------------------- + 2 files changed, 107 insertions(+), 107 deletions(-) + +commit f6c8a6eacf27fd1c509d07c85985f0367c5e475f +Author: Behdad Esfahbod +Date: Mon May 18 18:01:19 2009 -0400 + + [HB] Simplify casts + + src/hb-ot-layout-gdef-private.h | 2 +- + src/hb-ot-layout-gpos-private.h | 6 +++--- + src/hb-ot-layout-gsub-private.h | 6 +++--- + src/hb-ot-layout-open-private.h | 10 +++++----- + 4 files changed, 12 insertions(+), 12 deletions(-) + +commit 9c42f05a5ccbb48a9367b80ecdf3679e88088fcf +Author: Behdad Esfahbod +Date: Mon May 18 17:43:49 2009 -0400 + + Switch Pango to new, defunt, GPOS + + src/hb-ot-layout-gpos-private.h | 22 +++++++++++++++------- + src/hb-ot-layout.cc | 13 +++++++++++++ + src/hb-ot-layout.h | 5 +++++ + 3 files changed, 33 insertions(+), 7 deletions(-) + +commit 5e5eb0573f7ea2ce2cf037fef0df70a4351e82c0 +Author: Behdad Esfahbod +Date: Mon May 18 17:09:33 2009 -0400 + + [HB] Start GPOS! + + src/hb-ot-layout-gpos-private.h | 915 + ++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-layout-gsub-private.h | 2 - + src/hb-ot-layout-private.h | 15 +- + src/hb-ot-layout.cc | 5 +- + src/hb-ot-layout.h | 8 +- + 5 files changed, 936 insertions(+), 9 deletions(-) + +commit 64e67f7599deeec98b104f8b70d0d321cf96799d +Author: Behdad Esfahbod +Date: Mon May 18 15:32:40 2009 -0400 + + [GSUB] Minor + + src/hb-ot-layout-gsub-private.h | 16 ++++++---------- + 1 file changed, 6 insertions(+), 10 deletions(-) + +commit d79cae0b4eef8c2694ada791bb8e427c1202875e +Author: Behdad Esfahbod +Date: Mon May 18 13:50:15 2009 -0400 + + [HB] Minor + + src/hb-ot-layout-gsub-private.h | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +commit 8533bb985e6af2b656d7c45620d8f11f36330b85 +Author: Behdad Esfahbod +Date: Mon May 18 06:00:12 2009 -0400 + + [GSUB] Protect against mismatching Extension subtable types + + src/hb-ot-layout-gsub-private.h | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 969afd706e9b52adc79f6210c0088b2c6bbae9bc +Author: Behdad Esfahbod +Date: Mon May 18 05:47:47 2009 -0400 + + [GSUB] Implement ReverseChainSingleSubst + + GSUB is done! + + src/hb-ot-layout-gsub-private.h | 55 + +++++++++++++++++++++++++++---------- + src/hb-ot-layout-gsubgpos-private.h | 43 +++++++++-------------------- + 2 files changed, 54 insertions(+), 44 deletions(-) + +commit 4acaffd786a11b5bd7d41b39fc65625fd8cd5077 +Author: Behdad Esfahbod +Date: Mon May 18 05:29:29 2009 -0400 + + [HB] Don't use G_LIKELY! + + src/hb-ot-layout-gsub-private.h | 12 ++++++------ + src/hb-ot-layout-gsubgpos-private.h | 12 ++++++------ + src/hb-ot-layout-open-private.h | 4 ++-- + src/hb-ot-layout.cc | 6 +++--- + 4 files changed, 17 insertions(+), 17 deletions(-) + +commit 3dcb12f171ebbf44461e6ce6439d286c9520dd88 +Author: Behdad Esfahbod +Date: Mon May 18 05:22:32 2009 -0400 + + [GSUB] Oops, fix Extension check + + src/hb-ot-layout-gsub-private.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 2e8fb6c38dbc01cb77b384c0ae0212514dfbb588 +Author: Behdad Esfahbod +Date: Mon May 18 04:37:37 2009 -0400 + + [HB] Tweak some constants and fix Coverage + + src/hb-ot-layout-common-private.h | 11 ++++++----- + src/hb-ot-layout-gsubgpos-private.h | 2 ++ + src/hb-ot-layout-open-private.h | 6 +++--- + 3 files changed, 11 insertions(+), 8 deletions(-) + +commit d6aae5f5cad54fc5dac8b0ff10a3921ebda533d4 +Author: Behdad Esfahbod +Date: Mon May 18 04:25:22 2009 -0400 + + [HB] Cleanup TODOs + + src/hb-ot-layout-gsub-private.h | 12 ++++++------ + src/hb-ot-layout-open-private.h | 2 +- + src/hb-ot-layout.cc | 4 ++-- + 3 files changed, 9 insertions(+), 9 deletions(-) + +commit 122f21fb9a3a0b914575929a3be11884f1ae00c0 +Author: Behdad Esfahbod +Date: Mon May 18 04:21:53 2009 -0400 + + [GSUB] Fix context_length handling in Ligature too + + src/hb-ot-layout-gsub-private.h | 9 ++++----- + src/hb-ot-layout-gsubgpos-private.h | 5 +++-- + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit 47958dea214fd55725bf04aa13d233870255fb03 +Author: Behdad Esfahbod +Date: Mon May 18 04:17:47 2009 -0400 + + [HB] Minor cleanup + + src/hb-ot-layout-gsubgpos-private.h | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +commit e73a0c2a903112ce9a35b95e14e10ab8ea2dc337 +Author: Behdad Esfahbod +Date: Mon May 18 04:15:25 2009 -0400 + + [HB] Correctly skip glyphs when applying (Chain)Context lookups + + src/hb-ot-layout-gsubgpos-private.h | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +commit 7cff75babd64cd49dd2b3faaa15193d12c098f42 +Author: Behdad Esfahbod +Date: Mon May 18 04:09:05 2009 -0400 + + [HB] Fix context_length checking + + src/hb-ot-layout-gsubgpos-private.h | 23 +++++++++++++---------- + src/hb-ot-layout-open-private.h | 2 +- + 2 files changed, 14 insertions(+), 11 deletions(-) + +commit d0ba0557007798db2c60ddd0b7a5a0624cd1698d +Author: Behdad Esfahbod +Date: Mon May 18 03:56:39 2009 -0400 + + [HB] ChainContext complete + + IranNastaliq renders perfectly again! + + src/hb-ot-layout-gsubgpos-private.h | 63 + +++++++++++++++++++++++++++---------- + 1 file changed, 46 insertions(+), 17 deletions(-) + +commit e072c24e79f0e7c1e078a87c782ab5dd8f21dcda +Author: Behdad Esfahbod +Date: Mon May 18 03:47:31 2009 -0400 + + [HB] Implement backtrack matching + + src/hb-ot-layout-gsubgpos-private.h | 61 + +++++++++++++++++++++++++++---------- + 1 file changed, 45 insertions(+), 16 deletions(-) + +commit 02e1e5c63fa4f896053fa3c21e495239e1e9caa2 +Author: Behdad Esfahbod +Date: Mon May 18 02:47:57 2009 -0400 + + [HB] One more step to go, for fully working GSUB and ChainContext + + src/hb-ot-layout-gsubgpos-private.h | 107 + ++++++++++++++++++++---------------- + 1 file changed, 61 insertions(+), 46 deletions(-) + +commit f14c2b7acfba75b8a6880f41ceec758f9a56abce +Author: Behdad Esfahbod +Date: Mon May 18 02:36:18 2009 -0400 + + [HB] Further modularize Context matching + + src/hb-ot-layout-gsubgpos-private.h | 92 + +++++++++++++++++++++++++------------ + 1 file changed, 63 insertions(+), 29 deletions(-) + +commit 13ed4405c558e445b052360f1ed8ee27ecf48e6e +Author: Behdad Esfahbod +Date: Mon May 18 02:14:37 2009 -0400 + + [HB] A step closer to working ChainContext + + src/hb-ot-layout-gsubgpos-private.h | 36 + ++++++++++++++++++++++++++---------- + 1 file changed, 26 insertions(+), 10 deletions(-) + +commit e8cbaaf6d538036ff9b880b018db402e0895ed01 +Author: Behdad Esfahbod +Date: Mon May 18 02:03:58 2009 -0400 + + [HB] Add HeadlessArrayTo<> + + src/hb-ot-layout-gsub-private.h | 10 ++++------ + src/hb-ot-layout-gsubgpos-private.h | 5 ++--- + src/hb-ot-layout-open-private.h | 19 +++++++++++++++++++ + 3 files changed, 25 insertions(+), 9 deletions(-) + +commit dcb6b60254951a2831c03f3196962d229f7e556c +Author: Behdad Esfahbod +Date: Mon May 18 01:49:57 2009 -0400 + + [HB] More template goodness + + src/hb-ot-layout-gsubgpos-private.h | 37 + +++++++++++++++---------------------- + 1 file changed, 15 insertions(+), 22 deletions(-) + +commit aa3d7adca5c821c91a2a1b5380fd6b3d19656ab1 +Author: Behdad Esfahbod +Date: Sun May 17 23:17:56 2009 -0400 + + [HB] More churning towards ChainContext lookups + + src/hb-ot-layout-common-private.h | 6 +- + src/hb-ot-layout-gsub-private.h | 15 +++- + src/hb-ot-layout-gsubgpos-private.h | 174 + ++++++++++++++++++++++-------------- + 3 files changed, 125 insertions(+), 70 deletions(-) + +commit 48f16ed96ac7041b511d9e0864623d2aa09c6da3 +Author: Behdad Esfahbod +Date: Sun May 17 22:11:30 2009 -0400 + + [HB] Towards sharing Context and ChainContext code + + src/hb-ot-layout-gsubgpos-private.h | 220 + ++++++++++++++++-------------------- + 1 file changed, 99 insertions(+), 121 deletions(-) + +commit 6cf2a52593cb4b23e3efe5e16228e3172bdcdd05 +Author: Behdad Esfahbod +Date: Sun May 17 21:11:49 2009 -0400 + + [HB] Add check to avoid infinite recursion + + src/hb-ot-layout-gsub-private.h | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 887c4b44165eeb8ac7fb09bc4474d11720b94a9e +Author: Behdad Esfahbod +Date: Sun May 17 21:06:08 2009 -0400 + + [HB] Cosmetic + + src/hb-ot-layout-gsub-private.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ca5290f4994e1b2db4dac03f7a22b7071441ba06 +Author: Behdad Esfahbod +Date: Sun May 17 20:48:27 2009 -0400 + + [HB] Start ChainContext and ReverseChainSingleSubst lookups + + src/hb-ot-layout-gsub-private.h | 269 + ++++++++---------------------------- + src/hb-ot-layout-gsubgpos-private.h | 214 +++++++++++++++++++++++++++- + 2 files changed, 268 insertions(+), 215 deletions(-) + +commit 433f4aea741e39df079126769441b79ab64fd236 +Author: Behdad Esfahbod +Date: Sun May 17 20:30:05 2009 -0400 + + [HB] Remove stale TODO + + src/hb-ot-layout-private.h | 2 -- + 1 file changed, 2 deletions(-) + +commit 6f20f72e9c58ba23db2e31afa5d331acfea3d77e +Author: Behdad Esfahbod +Date: Sun May 17 20:28:01 2009 -0400 + + [HB] Split Layout-common tables into new files + + src/hb-ot-layout-common-private.h | 429 + ++++++++++++++++++++++++++++++++++++ + src/hb-ot-layout-gdef-private.h | 3 +- + src/hb-ot-layout-gsub-private.h | 1 + + src/hb-ot-layout-gsubgpos-private.h | 2 + + src/hb-ot-layout-open-private.h | 408 + ---------------------------------- + 5 files changed, 434 insertions(+), 409 deletions(-) + +commit f45107fe0904414f1266648a6c42849c494fe611 +Author: Behdad Esfahbod +Date: Sun May 17 20:13:02 2009 -0400 + + [HB] More shuffling + + src/hb-ot-layout-gsub-private.h | 71 + +++++++++++++++++++++---------------- + src/hb-ot-layout-gsubgpos-private.h | 30 ++++++++++++++++ + src/hb-ot-layout-open-private.h | 41 --------------------- + 3 files changed, 71 insertions(+), 71 deletions(-) + +commit f8dc67b3c24dfc805da756a73cb217b36e16b4b8 +Author: Behdad Esfahbod +Date: Sun May 17 19:47:54 2009 -0400 + + [HB] Cleanup format unions + + src/hb-ot-layout-gdef-private.h | 18 ++++---- + src/hb-ot-layout-gsub-private.h | 87 + +++++++++++++++++++------------------ + src/hb-ot-layout-gsubgpos-private.h | 16 +++---- + src/hb-ot-layout-open-private.h | 41 +++++++---------- + 4 files changed, 77 insertions(+), 85 deletions(-) + +commit da1097bc3b1995776c205707fd2b17603b804646 +Author: Behdad Esfahbod +Date: Sun May 17 19:31:18 2009 -0400 + + [HB] Use four bytes for Null Tag, not 5 + + src/hb-ot-layout-open-private.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 19fc24f268b985d30971307ac2055622d11cb21f +Author: Behdad Esfahbod +Date: Sun May 17 09:45:32 2009 -0400 + + [HB] Couple size checks + + src/hb-ot-layout-gsub-private.h | 7 +++++-- + src/hb-ot-layout-gsubgpos-private.h | 4 ++-- + src/hb-ot-layout-open-private.h | 4 ++-- + 3 files changed, 9 insertions(+), 6 deletions(-) + +commit ecf17e849db19599bbb816d0018380ebf979576b +Author: Behdad Esfahbod +Date: Sun May 17 09:34:41 2009 -0400 + + [HB] Propagate property of first glyph + + This slightly grows code size. + + src/hb-ot-layout-gsub-private.h | 100 + +++++++++++++++++++----------------- + src/hb-ot-layout-gsubgpos-private.h | 7 +-- + 2 files changed, 56 insertions(+), 51 deletions(-) + +commit eca8e33710cfce51454e64d974ff0c28b0eefa14 +Author: Behdad Esfahbod +Date: Sun May 17 09:07:27 2009 -0400 + + [GSUB] Further optimize the main switch + + src/hb-ot-layout-gsub-private.h | 31 +++++++++++++++++-------------- + 1 file changed, 17 insertions(+), 14 deletions(-) + +commit 13068232e7054748ae5ba0d961ee5a95b959e92e +Author: Behdad Esfahbod +Date: Sun May 17 08:59:01 2009 -0400 + + [HB] Unify first glyph property checking + + src/hb-ot-layout-gsub-private.h | 81 + ++++++++++++++++--------------------- + src/hb-ot-layout-gsubgpos-private.h | 12 ------ + 2 files changed, 35 insertions(+), 58 deletions(-) + +commit 66bf7ce4e3135535c110a917178b84c4a2b1d11f +Author: Behdad Esfahbod +Date: Sun May 17 08:28:42 2009 -0400 + + [HB] Move Context matching logic out of GSUB + + src/hb-ot-layout-gdef-private.h | 2 - + src/hb-ot-layout-gsub-private.h | 331 + +--------------------------------- + src/hb-ot-layout-gsubgpos-private.h | 347 + ++++++++++++++++++++++++++++++++++++ + 3 files changed, 352 insertions(+), 328 deletions(-) + +commit a1625528cd5ed94bc8f18903da3300e823ee5b54 +Author: Behdad Esfahbod +Date: Sun May 17 07:52:11 2009 -0400 + + [GSUB] Unify ContextSubst matching + + src/hb-ot-layout-gsub-private.h | 378 + ++++++++++++++++------------------------ + 1 file changed, 154 insertions(+), 224 deletions(-) + +commit c36238bea40e9e2b589028eb6de0710455b31585 +Author: Behdad Esfahbod +Date: Sun May 17 07:39:34 2009 -0400 + + [HB] Renames + + src/hb-ot-layout-gsub-private.h | 122 + ++++++++++++++++++++-------------------- + 1 file changed, 61 insertions(+), 61 deletions(-) + +commit 15c3e75b39797a153b6bc0598f87b27c4a487228 +Author: Behdad Esfahbod +Date: Sun May 17 06:03:42 2009 -0400 + + [HB] Simplify buffer + + src/harfbuzz-buffer-private.h | 14 ++++++-------- + src/harfbuzz-buffer.c | 35 ++++++++++++++++------------------- + src/harfbuzz-gsub.c | 6 +++--- + src/hb-ot-layout-gsub-private.h | 12 ++++++------ + 4 files changed, 31 insertions(+), 36 deletions(-) + +commit 36f78446cef8a7cbae000d5e742c9d13e1cc7f83 +Author: Behdad Esfahbod +Date: Sun May 17 05:52:32 2009 -0400 + + [HB] Add TODO item + + src/TODO | 1 + + src/harfbuzz-buffer.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit ee58aaebd296ea8237516754fd4e825d524b11b7 +Author: Behdad Esfahbod +Date: Sun May 17 05:14:33 2009 -0400 + + [HB] Update copyright years + + src/hb-ot-layout-gdef-private.h | 2 +- + src/hb-ot-layout-open-private.h | 2 +- + src/hb-ot-layout.cc | 2 +- + src/main.cc | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit f4c9514935cf97a58dcb3b1962ac3f3b5ba61264 +Author: Behdad Esfahbod +Date: Sun May 17 04:59:56 2009 -0400 + + [HB] Simplify more arrays + + src/hb-ot-layout-open-private.h | 241 + ++++++++++++++++------------------------ + src/hb-ot-layout.cc | 8 +- + 2 files changed, 100 insertions(+), 149 deletions(-) + +commit c9a7cbe9cb52264af9954e5ce9ac7a45d7e310cd +Author: Behdad Esfahbod +Date: Sun May 17 01:22:51 2009 -0400 + + [HB] Use ArrayOf<> in GSUB + + src/hb-ot-layout-gdef-private.h | 3 +- + src/hb-ot-layout-gsub-private.h | 157 + +++++++++++++--------------------------- + src/hb-ot-layout-open-private.h | 5 -- + 3 files changed, 53 insertions(+), 112 deletions(-) + +commit 5f810363acc3ad3cba631a68620e3d37e54c95c4 +Author: Behdad Esfahbod +Date: Sun May 17 00:54:25 2009 -0400 + + [HB] Add ArrayOf<> + + src/hb-ot-layout-gdef-private.h | 62 ++++++++------------------------- + src/hb-ot-layout-open-private.h | 77 + ++++++++++++++++++++++++++++++----------- + 2 files changed, 71 insertions(+), 68 deletions(-) + +commit 238c855fcd4f0ef97a94a8662d2a2f2bb5c21ecb +Author: Behdad Esfahbod +Date: Sun May 17 00:22:37 2009 -0400 + + [HB] Use OffsetTo<> for Coverage + + src/hb-ot-layout-gdef-private.h | 1 + + src/hb-ot-layout-gsub-private.h | 55 + ++++++++++++++++------------------------- + src/hb-ot-layout-open-private.h | 10 +------- + 3 files changed, 23 insertions(+), 43 deletions(-) + +commit 3d54bd1293069fc3d3bdeeea8ad45036f3ee65f3 +Author: Behdad Esfahbod +Date: Sun May 17 00:15:51 2009 -0400 + + [HB] Use OffsetTo<> in more places + + src/hb-ot-layout-gdef-private.h | 12 +++++------- + src/hb-ot-layout-open-private.h | 4 ++++ + 2 files changed, 9 insertions(+), 7 deletions(-) + +commit 9e4d9d7b2721859172bc9c59c1aea27b01eb9c07 +Author: Behdad Esfahbod +Date: Sun May 17 00:09:20 2009 -0400 + + [HB] Add OffsetTo template. + + src/hb-ot-layout-gdef-private.h | 26 ++++++++++++++------------ + src/hb-ot-layout-gsub-private.h | 6 +++--- + src/hb-ot-layout-open-private.h | 27 ++++++++++++++++++--------- + 3 files changed, 35 insertions(+), 24 deletions(-) + +commit e07f89295b9b38d233dfd4acec1f6b4a3416f267 +Author: Behdad Esfahbod +Date: Sat May 16 23:20:48 2009 -0400 + + [HB] Automate int-type size assertion + + src/hb-ot-layout-open-private.h | 13 +++---------- + 1 file changed, 3 insertions(+), 10 deletions(-) + +commit 8b8358033184198ff638ee1379093717596e162d +Author: Behdad Esfahbod +Date: Sat May 16 22:48:14 2009 -0400 + + [HB] Use templates for Null objects + + Also use a common pool for all nul-content ones. + + src/hb-ot-layout-gdef-private.h | 12 ++-- + src/hb-ot-layout-gsub-private.h | 28 ++++---- + src/hb-ot-layout-open-private.h | 142 + +++++++++++++++++++++++----------------- + src/hb-ot-layout.cc | 8 +-- + 4 files changed, 105 insertions(+), 85 deletions(-) + +commit 6e13d4140158aff736647fc53d8c0ae3a02c2afc +Author: Behdad Esfahbod +Date: Sat May 16 20:15:16 2009 -0400 + + [HB] Remove obsolete comment + + src/hb-ot-layout-gdef-private.h | 1 - + 1 file changed, 1 deletion(-) + +commit 9f721cf380954d67415dbfd0404a983cdd75b7df +Author: Behdad Esfahbod +Date: Sat May 16 19:59:15 2009 -0400 + + [GSUB] Start ChainContextSubst + + src/hb-ot-layout-gsub-private.h | 50 + ++++++++++++++++++++++++++++++++--------- + 1 file changed, 39 insertions(+), 11 deletions(-) + +commit 7fca9e5245d2d283e8b5354eb1ddf553a7ffc033 +Author: Behdad Esfahbod +Date: Sat May 16 19:44:24 2009 -0400 + + [GSUB] Implement ContextSubstFormat3 + + src/hb-ot-layout-gsub-private.h | 62 + ++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 61 insertions(+), 1 deletion(-) + +commit 1ff926a5681b5d4bfce65351062cda9dc1ffeba2 +Author: Behdad Esfahbod +Date: Fri May 15 20:25:37 2009 -0400 + + [GSUB] Implement ContextSubstFormat2 + + src/hb-ot-layout-gsub-private.h | 105 + +++++++++++++++++++++++++++++++++++++--- + 1 file changed, 97 insertions(+), 8 deletions(-) + +commit fc36d9453ed7edb0a570abc44d7caa87aafb0fcf +Author: Behdad Esfahbod +Date: Fri May 15 20:11:10 2009 -0400 + + [GSUB] Add GSUB::substitute_lookup() + + src/hb-ot-layout-gsub-private.h | 7 +++++++ + src/hb-ot-layout.cc | 5 +---- + 2 files changed, 8 insertions(+), 4 deletions(-) + +commit c43562b2a7587fa3f9ef4c1c4338e4eda77368b5 +Author: Behdad Esfahbod +Date: Fri May 15 18:54:53 2009 -0400 + + [GSUB] Finish ContextSubstFormat1 + + src/hb-ot-layout-gsub-private.h | 77 + ++++++++++++++++++++++++++++++++--------- + src/hb-ot-layout-private.h | 14 ++++++++ + src/hb-ot-layout.cc | 13 ------- + 3 files changed, 74 insertions(+), 30 deletions(-) + +commit 5ee21896224e3a9835a9695037a94ccf1c35a217 +Author: Behdad Esfahbod +Date: Fri May 15 13:28:56 2009 -0400 + + [HB] Fix typo + + src/hb-ot-layout-open-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6b59c9b445b6d2454008c83a2c7d6a995ea5995e +Author: Behdad Esfahbod +Date: Fri May 15 01:00:36 2009 -0400 + + [HB] Add TODO item + + src/TODO | 1 + + 1 file changed, 1 insertion(+) + +commit c5419b6cf28822e07f1ef9b0394825e9cb01a445 +Author: Behdad Esfahbod +Date: Fri May 8 21:17:56 2009 -0400 + + [HB] Remove DEFINE_NON_INSTANTIABLE + + src/hb-ot-layout-gdef-private.h | 2 -- + src/hb-ot-layout-gsub-private.h | 3 --- + src/hb-ot-layout-open-private.h | 18 +----------------- + 3 files changed, 1 insertion(+), 22 deletions(-) + +commit 0dff25f0368c5f14ebb0a4af35f3bb6658740d57 +Author: Behdad Esfahbod +Date: Fri May 8 21:12:18 2009 -0400 + + [HB] Remove get_size() + + src/hb-ot-layout-gdef-private.h | 9 ------ + src/hb-ot-layout-gsub-private.h | 63 + ----------------------------------------- + src/hb-ot-layout-open-private.h | 42 ++------------------------- + 3 files changed, 3 insertions(+), 111 deletions(-) + +commit 25c6c9a3f6c062ec639d9202a8b9844be64d6fc0 +Author: Behdad Esfahbod +Date: Fri May 8 19:09:17 2009 -0400 + + [GSUB] ContextSubst format 1 + + src/hb-ot-layout-gsub-private.h | 52 + +++++++++++++++++++++++++++++++++++------ + 1 file changed, 45 insertions(+), 7 deletions(-) + +commit f70229510303109bd0f71423cdf13aa200066d17 +Author: Behdad Esfahbod +Date: Fri May 8 18:45:53 2009 -0400 + + [GSUB] Shuffle + + src/hb-ot-layout-gsub-private.h | 170 + ++++++++++++++++++++-------------------- + 1 file changed, 86 insertions(+), 84 deletions(-) + +commit a83e08f8728439ef75e3dfab2191ac913d8f907b +Author: Behdad Esfahbod +Date: Thu May 7 12:53:02 2009 -0400 + + [HarfBuzz] Start a TODO file + + src/TODO | 1 + + 1 file changed, 1 insertion(+) + +commit eed05b04ebc2cbb3fa699c99200db12a0081cefb +Author: Behdad Esfahbod +Date: Wed May 6 00:25:59 2009 -0400 + + [GSUB] minor + + src/hb-ot-layout-open-private.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit cdb317bc4e188421cad997b448abb19223d39e96 +Author: Behdad Esfahbod +Date: Wed May 6 00:12:29 2009 -0400 + + [GSUB] Towards Context subtitutes + + src/hb-ot-layout-gsub-private.h | 137 + +++++++++++++++++++++++++++++++--------- + 1 file changed, 108 insertions(+), 29 deletions(-) + +commit c9c6a78aec2b16ac06dfca8cbfaf28a77a10bae2 +Author: Behdad Esfahbod +Date: Tue May 5 16:22:02 2009 -0400 + + [GSUB] Minor refactoring + + src/hb-ot-layout-gsub-private.h | 42 + ++++++++++++++++++++++------------------- + 1 file changed, 23 insertions(+), 19 deletions(-) + +commit bb3899a579b00134b24df8891b69bf1621a8190f +Author: Behdad Esfahbod +Date: Tue May 5 13:25:13 2009 -0400 + + [GSUB] Implement ligature substitutions + + src/Makefile.am | 2 + + src/hb-ot-layout-gsub-private.h | 113 + ++++++++++++++++++++++++++++++++-------- + 2 files changed, 93 insertions(+), 22 deletions(-) + +commit 38b011a293181856463dd08d43e2106e5bf1d56e +Author: Behdad Esfahbod +Date: Mon May 4 20:21:57 2009 -0400 + + [GSUB] Hook new GSUB up in Pango + + src/hb-ot-layout-gsub-private.h | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +commit a84e71ad11a72feff47ead16772a8c4bcf4f69d5 +Author: Behdad Esfahbod +Date: Thu Apr 16 16:53:40 2009 -0400 + + [GSUB] Start Ligature subtable support + + src/hb-ot-layout-gsub-private.h | 132 + +++++++++++++++++++++++++++++----------- + src/hb-ot-layout.h | 2 +- + 2 files changed, 96 insertions(+), 38 deletions(-) + +commit 52886ca56b24a8335614b1df16a33dd4e2d7ae56 +Author: Behdad Esfahbod +Date: Thu Apr 16 14:19:42 2009 -0400 + + [GSUB] Implement Alternate subtables + + src/hb-ot-layout-gsub-private.h | 104 + ++++++++++++++++++++++++++++++++++++---- + src/hb-ot-layout-open-private.h | 2 +- + 2 files changed, 97 insertions(+), 9 deletions(-) + +commit 4f27ce7e0213ac5ba356f0fd2ec0a175ffd002e6 +Author: Behdad Esfahbod +Date: Thu Apr 16 13:40:13 2009 -0400 + + [GSUB] Implement Extension subtables + + src/hb-ot-layout-gsub-private.h | 169 + +++++++++++++++++++++++++--------------- + 1 file changed, 108 insertions(+), 61 deletions(-) + +commit 83e61ff4702121d3418fe82a8fe7ef6bb63bb5d2 +Author: Behdad Esfahbod +Date: Thu Apr 16 12:30:51 2009 -0400 + + [GSUB] Fix reverse lookup loop like we did in the old code before + + src/hb-ot-layout-gsub-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5a0b791184cf6ef39eae0570e14aca21abc32845 +Author: Behdad Esfahbod +Date: Thu Apr 16 04:45:30 2009 -0400 + + [harfbuzz/GSUB] towards a partially working GSUB + + src/harfbuzz-buffer.c | 2 +- + src/harfbuzz-impl.h | 2 +- + src/harfbuzz.c | 1 - + src/hb-ot-layout-gdef-private.h | 4 +- + src/hb-ot-layout-gsub-private.h | 383 + +++++++++++++++++++++++++++++----------- + src/hb-ot-layout-open-private.h | 31 +++- + src/hb-ot-layout-private.h | 6 +- + src/hb-ot-layout.cc | 94 +++++++--- + src/hb-ot-layout.h | 2 - + 9 files changed, 381 insertions(+), 144 deletions(-) + +commit 30bd763fa2fa4aceee51433ec9fc8dc28480b5d7 +Author: Behdad Esfahbod +Date: Wed Apr 15 22:56:15 2009 -0400 + + Implement the first substitute() + + src/harfbuzz-buffer-private.h | 8 ++-- + src/harfbuzz-buffer.c | 4 +- + src/harfbuzz-buffer.h | 2 +- + src/harfbuzz-gdef-private.h | 4 +- + src/harfbuzz-gdef.c | 6 +-- + src/harfbuzz-gdef.h | 2 +- + src/harfbuzz-gpos.c | 8 ++-- + src/harfbuzz-gpos.h | 2 +- + src/harfbuzz-gsub.h | 2 +- + src/hb-ot-layout-gsub-private.h | 88 + +++++++++++++++++++++++++++++++++++++---- + src/hb-ot-layout-open-private.h | 2 +- + src/hb-ot-layout-private.h | 23 ++++++----- + src/hb-ot-layout.cc | 54 +++++++++++++++++-------- + src/hb-ot-layout.h | 2 +- + 14 files changed, 151 insertions(+), 56 deletions(-) + +commit ce48f03946bef895912019046bdbe62bb1301d0b +Merge: 0e13beeb 2d15e72c +Author: Behdad Esfahbod +Date: Mon Nov 2 14:35:51 2009 -0500 + + Merge harfbuzz-ng + +commit 0e13beeb93077750183a8242780158b88df81e26 +Author: Behdad Esfahbod +Date: Fri Apr 17 17:03:39 2009 -0400 + + Use git.mk + + src/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit 2d15e72c75931398db5e027e660f1320bb979117 +Author: Behdad Esfahbod +Date: Wed Apr 15 19:50:16 2009 -0400 + + Give it a start at GSUB + + src/hb-common.h | 5 +- + src/hb-ot-layout-gdef-private.h | 24 ++++---- + src/hb-ot-layout-gsub-private.h | 120 + +++++++++++++++++++++++++++++++++++++++- + src/hb-ot-layout-open-private.h | 51 ++++++++++------- + src/hb-ot-layout-private.h | 2 +- + src/hb-ot-layout.cc | 63 +++++++++++++++++++-- + src/hb-ot-layout.h | 29 +++++++++- + src/main.cc | 4 +- + 8 files changed, 253 insertions(+), 45 deletions(-) + +commit 9d870f2a558f4e463e3ff953312202a8d144158b +Author: Behdad Esfahbod +Date: Thu Apr 9 13:30:26 2009 -0400 + + Bug 577952 – Error loading {GDEF,GSUB,GPOS} table 0x6EAD + + Detect TrueType Collections by checking the font data header instead + of checking for "face->num_faces >1". + + src/harfbuzz-stream.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit d49caf1f77743550d83fc7feced1293ba34a4e99 +Author: Behdad Esfahbod +Date: Mon Mar 2 15:16:11 2009 +0330 + + [opentype] Protect against illegal access for arrays of length zero + + src/harfbuzz-gpos.c | 22 ++++++++++++++++++---- + src/harfbuzz-gsub.c | 6 ++++++ + 2 files changed, 24 insertions(+), 4 deletions(-) + +commit 66871797af194f9d2161faf8bfbc9684f09e207e +Author: Behdad Esfahbod +Date: Mon Mar 2 14:20:20 2009 +0330 + + [opentype] Use size_t instead of uint for malloc wrappers + + src/harfbuzz-impl.c | 4 ++-- + src/harfbuzz-impl.h | 6 ++++-- + 2 files changed, 6 insertions(+), 4 deletions(-) + +commit 3664e59c52ed56486a3e38126c0c3abb78f42233 +Author: Behdad Esfahbod +Date: Mon Mar 2 11:09:29 2009 +0330 + + Fix Bug 572529 – Poor -I ordering can break build + + src/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit aca4d11388eedd532a73bd34747abb65c0ea9291 +Author: Behdad Esfahbod +Date: Mon Feb 2 00:13:07 2009 +0000 + + Allocate all array rows in a single ALLOC call. Saves over 100 + alloc calls + + 2009-01-31 Behdad Esfahbod + + * pango/opentype/harfbuzz-gpos.c (Load_Mark2Array), + (Free_Mark2Array): + Allocate all array rows in a single ALLOC call. Saves over + 100 + alloc calls when loading DejaVu Sans, + + src/harfbuzz-gpos.c | 59 + +++++++++++++++-------------------------------------- + 1 file changed, 17 insertions(+), 42 deletions(-) + +commit c561d69c721105b78bb06d1e3c5f21ca314d924a +Author: Behdad Esfahbod +Date: Thu Jan 29 09:20:08 2009 +0000 + + Remove ClassDef->Defined field. This is the comment accompanying it: + + 2009-01-29 Behdad Esfahbod + + * pango/opentype/harfbuzz-open.h: + * pango/opentype/harfbuzz-gdef.c (Make_ClassRange), + (HB_GDEF_Build_ClassDefinition): + * pango/opentype/harfbuzz-gpos.c (Load_PosClassRule), + (Load_ChainPosClassRule): + * pango/opentype/harfbuzz-gsub.c (Load_SubClassRule), + (Load_ChainSubClassRule): + * pango/opentype/harfbuzz-open.c (Load_ClassDef1), + (Load_ClassDef2), (_HB_OPEN_Load_ClassDefinition), + (_HB_OPEN_Load_EmptyClassDefinition), + (_HB_OPEN_Free_ClassDefinition): + Remove ClassDef->Defined field. This is the comment + accompanying it: + + The `Defined' field is not defined in the OpenType + specification + but apparently needed for processing fonts like trado.ttf: + This + font refers to a class which contains not a single element. + We + map such classes to class 0. + + The comment is correct that trado.ttf (MS Traditional + Arabic) uses + such classes. However, in my testing I couldn't identify any + problems with the font if the special handling is removed. + I also + processed as many fonts as I could get my hand on and + trado.ttf was + the only not-totally-broken font hitting the special-case + code. + DejaVu fonts hit it too, but I'm sure they do not require the + special-handling code. Most probably, that code introduces + bugs + in them. + + The special-casing was consuming lots of memory. + EIGHT MEGABYTES + for loading DejaVu Sans! While this could be complete + fixed, I + decided to remove the special-handling code altogether. + I don't + think it will make any real difference, and if it does, + we'll fix + fonts. Such hacks will not be in harfbuzz-ng anyway. + + Bug originally reported by nsf. + + src/harfbuzz-gdef.c | 8 -------- + src/harfbuzz-gpos.c | 32 -------------------------------- + src/harfbuzz-gsub.c | 31 ------------------------------- + src/harfbuzz-open.c | 30 +++--------------------------- + src/harfbuzz-open.h | 8 -------- + 5 files changed, 3 insertions(+), 106 deletions(-) + +commit 9372edd6f020c92609853609dcb504c72551c9c3 +Author: Behdad Esfahbod +Date: Thu Jan 29 09:19:56 2009 +0000 + + Use calloc(), instead of malloc()ing and memset()ing. + + 2009-01-29 Behdad Esfahbod + + * pango/opentype/harfbuzz-impl.c (_hb_alloc): Use calloc(), + instead of malloc()ing and memset()ing. + + src/harfbuzz-impl.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 94c21d26ba878b3168a21f2e76f02bc52e8fe6fd +Author: Behdad Esfahbod +Date: Thu Jan 29 09:19:43 2009 +0000 + + Remove old cruft. + + 2009-01-29 Behdad Esfahbod + + * pango/opentype/harfbuzz-dump-main.c (main): Remove old + cruft. + + src/harfbuzz-dump-main.c | 144 + +---------------------------------------------- + 1 file changed, 1 insertion(+), 143 deletions(-) + +commit 0a47c4f78e8a9e81cd305f24ec92ea61ead7dd8d +Author: Behdad Esfahbod +Date: Thu Jan 29 09:19:20 2009 +0000 + + Allocate all array rows in a single ALLOC call. Saves over 2000 alloc + + 2009-01-29 Behdad Esfahbod + + * pango/opentype/harfbuzz-gpos.c (Load_BaseArray), + (Free_BaseArray): + Allocate all array rows in a single ALLOC call. Saves over + 2000 + alloc calls when loading DejaVu Sans! + + src/harfbuzz-gpos.c | 57 + ++++++++++++++++------------------------------------- + 1 file changed, 17 insertions(+), 40 deletions(-) + +commit 549be924bccd187f53791dfa27647981ac909545 +Author: Behdad Esfahbod +Date: Fri Dec 26 02:31:47 2008 +0000 + + Bug 469049 – Fix all compiler warnings + + 2008-12-25 Behdad Esfahbod + + Bug 469049 – Fix all compiler warnings + + * pango-view/viewer-pangocairo.c (render_callback): + * pango/fonts.c (append_field), + (pango_font_description_to_string): + * pango/opentype/harfbuzz-dump.c: + * pango/pango-bidi-type.c + (pango_log2vis_get_embedding_levels): + * pango/pango-coverage.c (pango_coverage_set): + * pango/pango-markup.c (span_parse_func): + * pango/pango-renderer.c + (pango_renderer_default_draw_error_underline): + * pango/pango-utils.c (pango_scan_string): + * pango/pangocairo-render.c + (pango_cairo_renderer_draw_trapezoid), + (draw_error_underline), (pango_cairo_renderer_class_init): + Fix all the remaining warnings. + + src/harfbuzz-dump.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit 719f9eaa755396ff377da10c5eeced01d3456b1b +Author: Behdad Esfahbod +Date: Fri Dec 26 02:31:35 2008 +0000 + + Fix more warnings. + + 2008-12-25 Behdad Esfahbod + + * pango/modules.c (pango_module_load), (script_info_free): + * pango/opentype/harfbuzz-gpos.c (HB_Load_GPOS_Table): + * pango/pango-bidi-type.c: + * pango/pango-coverage.c (pango_coverage_ref), + (pango_coverage_unref): + * pango/pango-engine.c (pango_engine_shape_real_covers), + (fallback_engine_shape), (fallback_engine_covers): + * pango/pango-fontmap.c (pango_font_map_init): + * pango/pango-ot-ruleset.c (pango_ot_ruleset_finalize), + (pango_ot_ruleset_new): + * pango/pangofc-decoder.c (pango_fc_decoder_init), + (pango_fc_decoder_class_init): + * pango/pangofc-font.c (pango_fc_font_find_shaper), + (pango_fc_font_get_coverage): + * pango/pangofc-fontmap.c (pango_fc_font_map_list_families), + (pango_fc_make_pattern), (pango_fc_font_map_get_patterns), + (get_first_font), (_pango_fc_font_map_get_coverage), + (cleanup_font), (pango_fc_font_description_from_pattern), + (pango_fc_face_list_sizes), (pango_fc_family_list_faces): + * pango/pangoft2-fontmap.c + (pango_ft2_font_map_get_resolution): + * pango/pangoft2-render.c (pango_ft2_renderer_init), + (pango_ft2_renderer_draw_trapezoid): + * pango/pangoft2.c (pango_ft2_font_get_face), + (pango_ft2_font_real_unlock_face), + (pango_ft2_free_glyph_info_callback): + Fix more warnings. + + src/harfbuzz-gpos.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 21f7d507f4b50e2743ab47954270f4c72d5a722a +Author: Behdad Esfahbod +Date: Wed Oct 15 03:45:29 2008 +0000 + + Bug 528272 – "Error loading GPOS table 5503" when using katakana + + 2008-10-14 Behdad Esfahbod + + Bug 528272 – "Error loading GPOS table 5503" when using + katakana + characters + + * pango/opentype/harfbuzz-gpos.c (Load_Mark2Array): Skip + parsing + null anchor tables. + + src/harfbuzz-gpos.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit a26c6ae70502b4d60c52a0648662b1619c688b9a +Author: Behdad Esfahbod +Date: Mon Sep 29 22:28:47 2008 +0000 + + Fix left-to-right positioning. Reported by Peter Hunter. + + 2008-09-29 Behdad Esfahbod + + * pango/opentype/harfbuzz-gpos.c (Position_CursiveChain): + Fix left-to-right positioning. Reported by Peter Hunter. + + src/harfbuzz-gpos.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b6c06c56a33f1e1ec15e3b525ecafe8fadc679db +Author: Behdad Esfahbod +Date: Sun Jun 29 18:30:14 2008 +0000 + + Bug 540592 – Crash in HB_GSUB_Apply_String with Linux-Libertine font + + 2008-06-29 Behdad Esfahbod + + Bug 540592 – Crash in HB_GSUB_Apply_String with + Linux-Libertine font + + * pango/opentype/harfbuzz-gsub.c (GSUB_Do_String_Lookup): + Fix reverse + loops for type 8 lookups. + + src/harfbuzz-gsub.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c44733596c6648e209c12349e18e35424edf3d59 +Author: Behdad Esfahbod +Date: Mon Feb 18 21:14:23 2008 -0500 + + [hb-ot-layout] Add proper namespace to accessors + + src/hb-ot-layout.cc | 165 + ++++++++++++++++++++++++++++++++++++++-------------- + src/hb-ot-layout.h | 115 +++++++++++++++++++++++------------- + 2 files changed, 198 insertions(+), 82 deletions(-) + +commit 57225672098ebdafb0c06ae091a1b55635daca29 +Author: Behdad Esfahbod +Date: Mon Feb 18 20:58:39 2008 -0500 + + Fix typo, add TODOs + + src/hb-ot-layout-open-private.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 4a26ea408c87f0bb59deca9ff44008d138471aa3 +Author: Behdad Esfahbod +Date: Mon Jan 28 07:40:10 2008 -0500 + + Finish script, language, and feature public API + + src/hb-ot-layout-open-private.h | 22 ++++++--- + src/hb-ot-layout.cc | 107 + +++++++++++++++++++++++++++++++--------- + src/hb-ot-layout.h | 34 ++++++++++++- + 3 files changed, 132 insertions(+), 31 deletions(-) + +commit 706ab25a4cb043d46e6088aa0a7184ee200276c9 +Author: Behdad Esfahbod +Date: Mon Jan 28 05:58:50 2008 -0500 + + Add script and language public getter API + + src/hb-ot-layout-open-private.h | 40 ++++++++----- + src/hb-ot-layout.cc | 127 + +++++++++++++++++++++++++++++++++++++++- + src/hb-ot-layout.h | 56 ++++++++++++++++++ + src/main.cc | 2 +- + 4 files changed, 207 insertions(+), 18 deletions(-) + +commit 40a81314fa3eb7c701aea47b43f81bfad985f717 +Author: Behdad Esfahbod +Date: Mon Jan 28 02:30:48 2008 -0500 + + Make main.cc compile again, which means finished getter API + + src/hb-ot-layout-open-private.h | 117 + +++++++++++++++++++++++++++++----------- + src/main.cc | 99 +++++++++++++++++++++++----------- + 2 files changed, 155 insertions(+), 61 deletions(-) + +commit e50c3978d37b2c0d6ddd4ced6a6196f6857cd596 +Author: Behdad Esfahbod +Date: Mon Jan 28 00:16:49 2008 -0500 + + Rename HB_OT_Layout to hb_ot_layout_t + + src/hb-ot-layout-private.h | 8 ++++---- + src/hb-ot-layout.cc | 34 +++++++++++++++++----------------- + src/hb-ot-layout.h | 33 +++++++++++++++------------------ + 3 files changed, 36 insertions(+), 39 deletions(-) + +commit dfa811965133bc4d1696fa5a0166e17ed4142c98 +Author: Behdad Esfahbod +Date: Mon Jan 28 00:12:21 2008 -0500 + + Rename hb_ot_layout_create() to hb_ot_layout_create_for_data() + + src/hb-ot-layout.cc | 4 ++-- + src/hb-ot-layout.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 54e5aac5e2947d4e2864c6f2987e4d275da73100 +Author: Behdad Esfahbod +Date: Sun Jan 27 21:19:51 2008 -0500 + + GDEF completely working now + + src/hb-ot-layout-open-private.h | 11 ++++++++--- + src/hb-ot-layout-private.h | 16 +++++++++------- + src/hb-ot-layout.cc | 19 +++++++++---------- + src/hb-private.h | 7 +++++++ + src/main.cc | 12 ++++++------ + 5 files changed, 39 insertions(+), 26 deletions(-) + +commit 6f425b11799aa20dab553085f05744191b7318e2 +Author: Behdad Esfahbod +Date: Thu Jan 24 19:38:56 2008 -0500 + + [GDEF] Finish internal API + + src/hb-ot-layout-private.h | 15 +++++++- + src/hb-ot-layout.cc | 95 + ++++++++++++++++++++++------------------------ + src/hb-ot-layout.h | 16 ++++---- + 3 files changed, 66 insertions(+), 60 deletions(-) + +commit 590d55cbb9e21ef74dfd88eee51fd0a763958cd2 +Author: Behdad Esfahbod +Date: Thu Jan 24 19:13:50 2008 -0500 + + [GDEF] Finish public API + + src/hb-common.h | 11 ++++ + src/hb-ot-layout-gdef-private.h | 28 +++++---- + src/hb-ot-layout-open-private.h | 25 ++++---- + src/hb-ot-layout-private.h | 23 ++------ + src/hb-ot-layout.cc | 123 + +++++++++++++++++++++++++++++++++++++--- + src/hb-ot-layout.h | 29 ++++++---- + 6 files changed, 176 insertions(+), 63 deletions(-) + +commit aff831ed6787abe8e24a977e34d97ff2e0b7dc21 +Author: Behdad Esfahbod +Date: Thu Jan 24 06:03:45 2008 -0500 + + Implement glyph properties + + src/hb-ot-layout-gdef-private.h | 10 ++++- + src/hb-ot-layout-private.h | 16 +++++++- + src/hb-ot-layout.cc | 84 + +++++++++++++++++++++++++++++++++++++---- + src/hb-ot-layout.h | 25 ++++++++---- + 4 files changed, 117 insertions(+), 18 deletions(-) + +commit ead428d7a0bf4dc84340a99f3959e5cc58123e99 +Author: Behdad Esfahbod +Date: Thu Jan 24 03:54:09 2008 -0500 + + More public api + + src/hb-ot-layout-open-private.h | 32 +++++++++++++++++++------------- + src/hb-ot-layout-private.h | 9 ++++++--- + src/hb-ot-layout.cc | 21 ++++++++++++++------- + src/hb-ot-layout.h | 2 -- + 4 files changed, 39 insertions(+), 25 deletions(-) + +commit fd92a3dde32fd10df30c9eeb97641bc3c15b1e9b +Author: Behdad Esfahbod +Date: Thu Jan 24 03:11:09 2008 -0500 + + Starting public interface + + src/{Makefile => Makefile.ng} | 0 + src/hb-ot-layout-gdef-private.h | 17 ++++---- + src/hb-ot-layout-gsub-private.h | 3 +- + src/hb-ot-layout-open-private.h | 92 + +++++++++++++++++++++++++++++------------ + src/hb-ot-layout-private.h | 51 +++++++++++++++++++++++ + src/hb-ot-layout.cc | 67 ++++++++++++++++++++++++++++++ + src/hb-ot-layout.h | 35 ++++++++++++++-- + src/main.cc | 1 + + 8 files changed, 225 insertions(+), 41 deletions(-) + +commit 7d6b95b000ec6cd8ca93113b2d81a049ad2f9bbe +Author: Behdad Esfahbod +Date: Thu Jan 24 04:42:24 2008 +0000 + + Remove unused macro + + src/harfbuzz-impl.h | 2 -- + 1 file changed, 2 deletions(-) + +commit 7586089c6fa8185cad8387869d3703c637e5cbb1 +Author: Behdad Esfahbod +Date: Wed Jan 23 18:02:28 2008 -0500 + + Minor + + src/hb-ot-layout-gdef-private.h | 37 +++++++++++++++++++++++++------ + src/hb-ot-layout-gsub-private.h | 13 +++++++++++ + src/hb-ot-layout-open-private.h | 49 + ++++++++++++++++++++++++++++++++++------- + src/hb-private.h | 2 ++ + 4 files changed, 86 insertions(+), 15 deletions(-) + +commit aefaafe5bc4fc6d37a412c135b1079c287be7045 +Author: Behdad Esfahbod +Date: Wed Jan 23 17:25:29 2008 -0500 + + Minor renaming + + src/hb-ot-layout-gdef-private.h | 10 +++++----- + src/hb-ot-layout-open-private.h | 16 +++++++--------- + src/main.cc | 4 ++-- + 3 files changed, 14 insertions(+), 16 deletions(-) + +commit a16ecbf0564a6e2576da22c12827f3c0719da549 +Author: Behdad Esfahbod +Date: Wed Jan 23 17:01:55 2008 -0500 + + Initial gsub stub + + src/hb-ot-layout-gdef-private.h | 4 + + src/hb-ot-layout-gsub-private.h | 453 + ++++++++++++++++++++++++++++++++++++++++ + src/hb-ot-layout-open-private.h | 3 + + src/main.cc | 1 + + 4 files changed, 461 insertions(+) + +commit 64aef3a54999496fd1de4f5aa5b019e4c03b3836 +Author: Behdad Esfahbod +Date: Wed Jan 23 16:14:38 2008 -0500 + + Add copyright notices. + + src/hb-common.h | 26 ++++++++++++++++++++++++++ + src/hb-ot-layout-gdef-private.h | 26 ++++++++++++++++++++++++++ + src/hb-ot-layout-open-private.h | 26 ++++++++++++++++++++++++++ + src/hb-ot-layout.h | 26 ++++++++++++++++++++++++++ + src/hb-private.h | 26 ++++++++++++++++++++++++++ + src/main.cc | 26 ++++++++++++++++++++++++++ + 6 files changed, 156 insertions(+) + +commit 12360f7c159826ae72271b34486dee59d96aa8ca +Author: Behdad Esfahbod +Date: Wed Jan 23 15:50:38 2008 -0500 + + Minor cleanup, add LIKELY and UNLIKELY annotations + + src/hb-ot-layout-gdef-private.h | 63 + +++++++++++++++++++++++------------------ + src/hb-ot-layout-open-private.h | 36 ++++++++--------------- + src/hb-private.h | 15 ++++++++++ + 3 files changed, 63 insertions(+), 51 deletions(-) + +commit 8dd1c8b8d6797d899d0f5b0a8015886bf6520ca2 +Author: Behdad Esfahbod +Date: Wed Jan 23 05:00:30 2008 -0500 + + Clean up file names, add namespace + + src/harfbuzz-common.h | 14 + -------------- + src/harfbuzz-gdef.h | 11 + ----------- + src/hb-common.h | 14 + ++++++++++++++ + ...harfbuzz-gdef-private.h => hb-ot-layout-gdef-private.h} | 8 ++++---- + ...harfbuzz-open-private.h => hb-ot-layout-open-private.h} | 10 + +++++----- + src/{harfbuzz-open.h => hb-ot-layout.h} | 12 + ++++++------ + src/{harfbuzz-private.h => hb-private.h} | 6 +++--- + src/main.cc | 4 ++-- + 8 files changed, 34 insertions(+), 45 deletions(-) + +commit 1f437e6f47fb6c15761021bd2078f31778f2179c +Author: Behdad Esfahbod +Date: Wed Jan 23 04:36:40 2008 -0500 + + Make all code NULL-free and assert-free + + src/harfbuzz-gdef-private.h | 125 ++++++++++--------- + src/harfbuzz-open-private.h | 285 + +++++++++++++++++++++++--------------------- + src/main.cc | 8 +- + 3 files changed, 214 insertions(+), 204 deletions(-) + +commit 600e5eb80f553ea8eb862e6784133574c74ca513 +Author: Behdad Esfahbod +Date: Wed Jan 23 02:01:37 2008 -0500 + + Define get_for_data() factories + + src/harfbuzz-gdef-private.h | 3 +++ + src/harfbuzz-open-private.h | 42 + +++++++++++++++++++++++++++++------------- + src/main.cc | 10 ++++------ + 3 files changed, 36 insertions(+), 19 deletions(-) + +commit b9d7688fb3d45894901484b74095c4f11cab6196 +Author: Behdad Esfahbod +Date: Wed Jan 23 01:38:10 2008 -0500 + + Finish and test GDEF + + src/harfbuzz-gdef-private.h | 72 + ++++++++++++++++++++++++++++++++------------- + src/harfbuzz-open-private.h | 23 ++++++++------- + src/harfbuzz-open.h | 4 +++ + src/main.cc | 10 +++++++ + 4 files changed, 77 insertions(+), 32 deletions(-) + +commit 303fe62824d4e99df554b6bfaacba05d068522fb +Author: Behdad Esfahbod +Date: Wed Jan 23 00:20:48 2008 -0500 + + Misc cleanup + + src/Makefile | 10 ++++- + src/harfbuzz-gdef-private.h | 65 +++++++++++++++++++++------- + src/harfbuzz-open-private.h | 102 + ++++++++++++++++++++++++++++++++++++++++---- + src/harfbuzz-private.h | 6 +++ + src/main.cc | 12 +++--- + 5 files changed, 163 insertions(+), 32 deletions(-) + +commit 17843245fde4cc8cddc7da8ef30357d3d8778187 +Author: Behdad Esfahbod +Date: Wed Jan 16 20:39:29 2008 +0000 + + Remove COPYING.GPL and COPYING.FTL that are no longer there. + + 2008-01-16 Behdad Esfahbod + + * pango/opentype/Makefile.am: Remove COPYING.GPL and + COPYING.FTL that + are no longer there. + + src/Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +commit a2a9a023f6472ba262f89e5327318996b8258d25 +Author: Behdad Esfahbod +Date: Tue Jan 15 22:46:32 2008 +0000 + + HarfBuzz was relicensed to a more generous and simpler + license. Adapt. See + + 2008-01-15 Behdad Esfahbod + + * pango/opentype/*: + HarfBuzz was relicensed to a more generous and simpler + license. + Adapt. See pango/opentype/COPYING for the new license + which is + LGPL-compatible. + + src/COPYING | 39 +++-- + src/COPYING.FTL | 174 --------------------- + src/COPYING.GPL | 340 + ------------------------------------------ + src/harfbuzz-buffer-private.h | 32 ++-- + src/harfbuzz-buffer.c | 27 +++- + src/harfbuzz-buffer.h | 32 ++-- + src/harfbuzz-dump-main.c | 34 +++-- + src/harfbuzz-dump.c | 34 +++-- + src/harfbuzz-dump.h | 35 +++-- + src/harfbuzz-gdef-private.h | 29 +++- + src/harfbuzz-gdef.c | 29 +++- + src/harfbuzz-gdef.h | 29 +++- + src/harfbuzz-global.h | 29 +++- + src/harfbuzz-gpos-private.h | 29 +++- + src/harfbuzz-gpos.c | 31 +++- + src/harfbuzz-gpos.h | 29 +++- + src/harfbuzz-gsub-private.h | 29 +++- + src/harfbuzz-gsub.c | 31 +++- + src/harfbuzz-gsub.h | 29 +++- + src/harfbuzz-impl.c | 31 +++- + src/harfbuzz-impl.h | 29 +++- + src/harfbuzz-open-private.h | 29 +++- + src/harfbuzz-open.c | 29 +++- + src/harfbuzz-open.h | 29 +++- + src/harfbuzz-stream-private.h | 29 +++- + src/harfbuzz-stream.c | 31 +++- + src/harfbuzz.c | 28 +++- + src/harfbuzz.h | 29 +++- + 28 files changed, 564 insertions(+), 741 deletions(-) + +commit 4ccedd22eaa6e47bd8bbf255627a8b55fbb44736 +Author: Behdad Esfahbod +Date: Wed Dec 5 03:41:29 2007 +0000 + + Bug 501575 – Compile errors Patch from Jens Granseuer + + 2007-12-04 Behdad Esfahbod + + Bug 501575 – Compile errors + Patch from Jens Granseuer + + * pango/opentype/harfbuzz-stream.c (_hb_font_goto_table): + * pango/pango-utils.c (handle_alias_line): + Fix C99ism. + + src/harfbuzz-stream.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit cd55cfa2b0a1fe35d5a4ad1c8feaa399d7fb7ab3 +Author: Behdad Esfahbod +Date: Fri Nov 30 04:31:29 2007 +0000 + + Undo accidental change. + + src/harfbuzz-impl.c | 2 -- + 1 file changed, 2 deletions(-) + +commit 3f05da638c8d7b13e7f860aeda1a6321e5ebd92e +Author: Behdad Esfahbod +Date: Fri Nov 30 04:29:58 2007 +0000 + + Bug 485536 – underline_position can be zero + + 2007-11-29 Behdad Esfahbod + + Bug 485536 – underline_position can be zero + + * pango/pango-utils.c (pango_cairo_quantize_line_geometry): + Document that returned position may be zero. + + * pango/pangocairo-win32font.c + (pango_cairo_win32_font_create_metrics_for_context): + * pango/pangofc-font.c (get_face_metrics): + Handle case of underline_position==0 after rounding. + + src/harfbuzz-impl.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit e58278fedb67cbaac4bf4d6dfc33209cb22eec08 +Author: Behdad Esfahbod +Date: Sat Nov 24 01:40:13 2007 +0000 + + Remove unused macro. + + 2007-11-23 Behdad Esfahbod + + * pango/opentype/harfbuzz-impl.c: Remove unused macro. + + src/harfbuzz-impl.c | 18 ------------------ + 1 file changed, 18 deletions(-) + +commit 3b047380aec4ccc707c4579327d54172c19820fd +Author: Behdad Esfahbod +Date: Sun Nov 18 22:34:08 2007 +0000 + + Minor + + src/harfbuzz-dump-main.c | 4 +-- + src/harfbuzz-stream.c | 89 + ++++++++++++++++++++++++------------------------ + 2 files changed, 46 insertions(+), 47 deletions(-) + +commit 10d6a25a26bdbab4ece4edf0e34ffd3d22410ebe +Author: Behdad Esfahbod +Date: Wed Nov 7 10:04:11 2007 +0000 + + Remove dead code. + + src/harfbuzz-gdef.c | 88 + ----------------------------------------------------- + src/harfbuzz-gpos.h | 4 +-- + 2 files changed, 1 insertion(+), 91 deletions(-) + +commit 47d2c33e3d099fae79e199367de5011bc5c12273 +Author: Behdad Esfahbod +Date: Wed Nov 7 09:59:18 2007 +0000 + + And some more. + + 2007-11-07 Behdad Esfahbod + + * pango/opentype/*: And some more. + + src/harfbuzz-buffer.h | 8 ++--- + src/harfbuzz-dump-main.c | 22 ++++++------ + src/harfbuzz-gdef.c | 14 ++++---- + src/harfbuzz-gdef.h | 4 +-- + src/harfbuzz-global.h | 21 +++++------ + src/harfbuzz-gpos.c | 82 + +++++++++++++++++++++---------------------- + src/harfbuzz-gpos.h | 12 +++---- + src/harfbuzz-gsub.c | 4 +-- + src/harfbuzz-gsub.h | 4 +-- + src/harfbuzz-stream-private.h | 4 +-- + src/harfbuzz-stream.c | 16 ++++----- + 11 files changed, 95 insertions(+), 96 deletions(-) + +commit 78ef65ba08967fe1b5f97bcb27074bd635f4b898 +Author: Behdad Esfahbod +Date: Wed Nov 7 08:06:01 2007 +0000 + + Some more cleanup and merging. + + 2007-11-07 Behdad Esfahbod + + * pango/opentype/*: Some more cleanup and merging. + + src/Makefile.am | 6 +- + src/harfbuzz-buffer-private.h | 33 ++++++ + src/harfbuzz-buffer.c | 4 +- + src/harfbuzz-dump-main.c | 3 +- + src/harfbuzz-gdef-private.h | 9 +- + src/harfbuzz-gdef.c | 39 +++++++ + src/harfbuzz-global.h | 2 + + src/harfbuzz-gpos-private.h | 1 + + src/harfbuzz-gpos.c | 32 +----- + src/harfbuzz-gsub-private.h | 1 + + src/harfbuzz-gsub.c | 33 +----- + src/harfbuzz-impl.c | 216 + ++------------------------------------ + src/harfbuzz-impl.h | 100 +----------------- + src/harfbuzz-open-private.h | 4 +- + src/harfbuzz-stream-private.h | 70 +++++++++++++ + src/harfbuzz-stream.c | 234 + ++++++++++++++++++++++++++++++++++++++++++ + src/harfbuzz.c | 1 + + src/harfbuzz.h | 3 +- + 18 files changed, 419 insertions(+), 372 deletions(-) + +commit 5c9bd379950d914982bdb91d0f82b8036908db37 +Author: Behdad Esfahbod +Date: Mon Oct 29 23:51:48 2007 +0000 + + Fix typo. + + src/Makefile.am | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit ef1f481752fa6e478f649e826c96927c98f21981 +Author: Behdad Esfahbod +Date: Thu Oct 25 23:37:11 2007 +0000 + + Even more cleanup and more type renames. + + 2007-10-25 Behdad Esfahbod + + * pango/opentype/*: Even more cleanup and more type renames. + + src/harfbuzz-buffer.h | 3 +-- + src/harfbuzz-global.h | 6 ++++++ + src/harfbuzz-impl.c | 16 ++++++++-------- + src/harfbuzz-impl.h | 22 +++++++++++----------- + src/harfbuzz-open.h | 3 --- + 5 files changed, 26 insertions(+), 24 deletions(-) + +commit 282c60a0eea0db784b0a094958bec35b5f3dc399 +Author: Behdad Esfahbod +Date: Thu Oct 25 23:22:17 2007 +0000 + + More cleanup, remove redundant error types. + + 2007-10-25 Behdad Esfahbod + + * pango/opentype/*: More cleanup, remove redundant error + types. + + src/harfbuzz-dump-main.c | 4 +- + src/harfbuzz-dump.c | 14 +++--- + src/harfbuzz-gdef.c | 25 +++++----- + src/harfbuzz-gdef.h | 3 -- + src/harfbuzz-global.h | 31 ++++++------ + src/harfbuzz-gpos.c | 124 + +++++++++++++++++++++++------------------------ + src/harfbuzz-gpos.h | 3 -- + src/harfbuzz-gsub.c | 86 ++++++++++++++++---------------- + src/harfbuzz-gsub.h | 3 -- + src/harfbuzz-impl.c | 18 +++---- + src/harfbuzz-impl.h | 2 + + src/harfbuzz-open.c | 24 ++++----- + src/harfbuzz-open.h | 6 +-- + 13 files changed, 170 insertions(+), 173 deletions(-) + +commit 4280ec4df45ae86c10c3cd24ddb9c05e47223d39 +Author: Behdad Esfahbod +Date: Thu Oct 25 00:23:46 2007 +0000 + + Rename ftglue.c to harfbuzz-impl.c and more type renames and + moving code + + 2007-10-24 Behdad Esfahbod + + * pango/opentype/*: Rename ftglue.c to harfbuzz-impl.c + and more + type renames and moving code around. + + src/Makefile.am | 3 +- + src/ftglue.h | 151 + -------------------------------------- + src/harfbuzz-dump-main.c | 48 ++---------- + src/harfbuzz-dump.c | 30 ++++---- + src/harfbuzz-gdef.c | 18 ++--- + src/harfbuzz-global.h | 18 +++++ + src/harfbuzz-gpos-private.h | 2 +- + src/harfbuzz-gpos.c | 90 +++++++++++------------ + src/harfbuzz-gsub-private.h | 2 +- + src/harfbuzz-gsub.c | 64 ++++++++-------- + src/{ftglue.c => harfbuzz-impl.c} | 64 ++++++++-------- + src/harfbuzz-impl.h | 114 ++++++++++++++++++++++++++-- + src/harfbuzz-open-private.h | 14 ++-- + src/harfbuzz-open.c | 32 ++++---- + src/harfbuzz-open.h | 16 ---- + src/harfbuzz.c | 4 +- + 16 files changed, 289 insertions(+), 381 deletions(-) + +commit 5716ae278a82d318ddbfeba01d0785d4efbe1454 +Author: Behdad Esfahbod +Date: Wed Oct 24 22:44:47 2007 +0000 + + New header file harfbuzz-global.h. Rename FT_* int types to HB_* + types. + + 2007-10-24 Behdad Esfahbod + + * pango/opentype/*: New header file harfbuzz-global.h. Rename + FT_* int types to HB_* types. + + src/Makefile.am | 1 + + src/ftglue.c | 30 +-- + src/ftglue.h | 26 +- + src/harfbuzz-buffer-private.h | 26 +- + src/harfbuzz-buffer.c | 40 ++-- + src/harfbuzz-buffer.h | 42 ++-- + src/harfbuzz-dump-main.c | 24 +- + src/harfbuzz-dump.c | 14 +- + src/harfbuzz-dump.h | 4 +- + src/harfbuzz-gdef-private.h | 30 +-- + src/harfbuzz-gdef.c | 104 ++++---- + src/harfbuzz-gdef.h | 32 +-- + src/harfbuzz-global.h | 34 +++ + src/harfbuzz-gpos-private.h | 182 +++++++------- + src/harfbuzz-gpos.c | 540 + +++++++++++++++++++++--------------------- + src/harfbuzz-gpos.h | 52 ++-- + src/harfbuzz-gsub-private.h | 142 +++++------ + src/harfbuzz-gsub.c | 432 ++++++++++++++++----------------- + src/harfbuzz-gsub.h | 50 ++-- + src/harfbuzz-impl.h | 6 +- + src/harfbuzz-open-private.h | 26 +- + src/harfbuzz-open.c | 146 ++++++------ + src/harfbuzz-open.h | 88 +++---- + src/harfbuzz.h | 1 + + 24 files changed, 1056 insertions(+), 1016 deletions(-) + +commit 2130d852c76cccb94350a4aea222359640ffa8a4 +Author: Behdad Esfahbod +Date: Wed Oct 24 21:35:03 2007 +0000 + + Add commented-out dummy struct for Extension lookups. + + 2007-10-24 Behdad Esfahbod + + * pango/opentype/harfbuzz-gpos-private.h: + * pango/opentype/harfbuzz-gsub-private.h: + Add commented-out dummy struct for Extension lookups. + + src/harfbuzz-gpos-private.h | 13 +++++++++++++ + src/harfbuzz-gsub-private.h | 13 +++++++++++++ + 2 files changed, 26 insertions(+) + +commit 13b2b963848ada169c2fe3d3669fbc1c337f7fe7 +Author: Behdad Esfahbod +Date: Sun Oct 21 18:17:02 2007 +0000 + + Bug 488840 – harfbuzz: protect against ligid overflow + + 2007-10-21 Behdad Esfahbod + + Bug 488840 – harfbuzz: protect against ligid overflow + + * pango/opentype/harfbuzz-buffer.c + (_hb_buffer_allocate_ligid): + Never return zero, even in case of overflow. + + * pango/opentype/harfbuzz-impl.h: Define dummy HB_LIKELY() and + HB_UNLIKELY(), to be filled later. + + src/harfbuzz-buffer.c | 6 +++++- + src/harfbuzz-impl.h | 3 +++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +commit 6b347138b597c41af24453f630336ba2fc033dc5 +Author: Behdad Esfahbod +Date: Thu Oct 11 08:30:50 2007 +0000 + + Mark internal symbols as HB_INTERNAL and define that to static in + + 2007-10-11 Behdad Esfahbod + + * pango/opentype/*: Mark internal symbols as HB_INTERNAL and + define that to static in harfbuzz.c. + + * pango/opentype/harfbuzz-buffer-internal.h: New file. + + src/Makefile.am | 1 + + src/ftglue.c | 18 +++---- + src/ftglue.h | 20 ++++---- + src/harfbuzz-buffer-private.h | 60 +++++++++++++++++++++++ + src/harfbuzz-buffer.c | 108 + +++++++++++++++++++++------------------- + src/harfbuzz-buffer.h | 38 +-------------- + src/harfbuzz-gdef-private.h | 17 ++++--- + src/harfbuzz-gdef.c | 20 ++++---- + src/harfbuzz-gpos-private.h | 13 +++-- + src/harfbuzz-gpos.c | 16 +++--- + src/harfbuzz-gsub-private.h | 14 +++--- + src/harfbuzz-gsub.c | 20 ++++---- + src/harfbuzz-impl.h | 12 +++-- + src/harfbuzz-open-private.h | 81 +++++++++++++++++------------- + src/harfbuzz-open.c | 111 + ++++++++++++++++++++++++------------------ + src/harfbuzz.c | 1 + + 16 files changed, 315 insertions(+), 235 deletions(-) + +commit 7cdfb61deefd8f43edb5eb79d45d38dbbbef9051 +Author: Behdad Esfahbod +Date: Thu Oct 11 07:46:33 2007 +0000 + + Remove FTGLUE_API/APIDEF cruft. + + 2007-10-11 Behdad Esfahbod + + * pango/opentype/ftglue.[ch]: Remove FTGLUE_API/APIDEF cruft. + + src/ftglue.c | 16 ++++++++-------- + src/ftglue.h | 24 ++++++++---------------- + 2 files changed, 16 insertions(+), 24 deletions(-) + +commit 61ddbafaaad31ccacde54cad7e60a84abffc0a9f +Author: Behdad Esfahbod +Date: Thu Oct 11 07:45:26 2007 +0000 + + Build harfbuzz.c instead of individual source files, to let + compiler go + + 2007-10-11 Behdad Esfahbod + + * pango/opentype/Makefile.am: Build harfbuzz.c instead + of individual + source files, to let compiler go wild with optimizations! + + src/Makefile.am | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit a219b3d003d6727c79dc51282d21e9ac48c44458 +Author: Behdad Esfahbod +Date: Thu Oct 11 07:34:08 2007 +0000 + + Same here. + + 2007-10-11 Behdad Esfahbod + + * pango/opentype/harfbuzz.c: Same here. + + src/harfbuzz.c | 1 - + 1 file changed, 1 deletion(-) + +commit 6567e16e3b14c08659342bbcc9f2735e71f9114e +Author: Behdad Esfahbod +Date: Thu Oct 11 07:33:19 2007 +0000 + + Don't include harfbuzz-dump.[ch] in libharfbuzz.a. Those are just + used by + + 2007-10-11 Behdad Esfahbod + + * pango/opentype/Makefile.am: Don't include harfbuzz-dump.[ch] + in + libharfbuzz.a. Those are just used by the harfbuzz-dump tool. + + src/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0b032549ba7581c879a0fc4e794b0e9a4723ae85 +Author: Behdad Esfahbod +Date: Thu Oct 11 07:24:47 2007 +0000 + + Some more cleanup. + + 2007-10-11 Behdad Esfahbod + + * pango/opentype/harfbuzz-buffer.c: Some more cleanup. + + src/harfbuzz-buffer.c | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +commit 7a26864308bd1ca8d5f47d798411cac7239b7d38 +Author: Behdad Esfahbod +Date: Thu Oct 11 07:21:31 2007 +0000 + + Move some code around. + + 2007-10-11 Behdad Esfahbod + + * pango/opentype/harfbuzz-buffer.c: Move some code around. + + src/harfbuzz-buffer.c | 91 + +++++++++++++++++++++++++++------------------------ + 1 file changed, 48 insertions(+), 43 deletions(-) + +commit 7a5405c8261573a0f29d28fb533e800d698f6129 +Author: Behdad Esfahbod +Date: Thu Oct 11 07:15:16 2007 +0000 + + Minor. + + src/harfbuzz-buffer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 986f4fd96892ebda550793941bb1daed862c4a34 +Author: Behdad Esfahbod +Date: Thu Oct 11 07:12:49 2007 +0000 + + Rename buffer->inplace to buffer->separate_out with the inverted + meaning, + + 2007-10-11 Behdad Esfahbod + + * pango/opentype/harfbuzz-buffer.[ch]: Rename buffer->inplace + to + buffer->separate_out with the inverted meaning, such that + buffer + is initialization is memset(0). + + src/harfbuzz-buffer.c | 34 +++++++++++++++++----------------- + src/harfbuzz-buffer.h | 2 +- + 2 files changed, 18 insertions(+), 18 deletions(-) + +commit 06003908ccf2473366816935dd1b144cde587be9 +Author: Behdad Esfahbod +Date: Thu Oct 11 07:05:09 2007 +0000 + + Allocate buffer->positions lazily. + + 2007-10-11 Behdad Esfahbod + + * pango/opentype/*: Allocate buffer->positions lazily. + + src/harfbuzz-buffer.c | 25 +++++++++++++++++++++++-- + src/harfbuzz-buffer.h | 3 +++ + src/harfbuzz-gpos.c | 13 ++++++++----- + src/harfbuzz-gsub.c | 5 +++-- + 4 files changed, 37 insertions(+), 9 deletions(-) + +commit fc3d6f575826704a0ae9ee9018323f6a3c422f4b +Author: Behdad Esfahbod +Date: Thu Oct 11 06:52:07 2007 +0000 + + Bug 485621 – Get rid of freetype memory allocator in harfbuzz + + 2007-10-11 Behdad Esfahbod + + Bug 485621 – Get rid of freetype memory allocator in + harfbuzz + + * pango/opentype/*: Remove all occurences of FT_Memory. Use + malloc/realloc/free directly. + + * pango/pango-ot*: Update to above. + + src/ftglue.c | 52 ++--- + src/ftglue.h | 28 ++- + src/harfbuzz-buffer.c | 16 +- + src/harfbuzz-buffer.h | 4 +- + src/harfbuzz-gdef.c | 106 ++++------ + src/harfbuzz-gdef.h | 6 +- + src/harfbuzz-gpos-private.h | 1 - + src/harfbuzz-gpos.c | 462 + ++++++++++++++++++-------------------------- + src/harfbuzz-gpos.h | 2 - + src/harfbuzz-gsub-private.h | 1 - + src/harfbuzz-gsub.c | 312 +++++++++++------------------- + src/harfbuzz-gsub.h | 2 - + src/harfbuzz-open-private.h | 25 ++- + src/harfbuzz-open.c | 127 ++++++------ + 14 files changed, 441 insertions(+), 703 deletions(-) + +commit a8abb8b994c3cd89808e8f7128a0c04b23eb3ede +Author: Behdad Esfahbod +Date: Thu Oct 11 00:07:58 2007 +0000 + + Bug 485559 – Boston Summit HarfBuzz optimizations + + 2007-10-10 Behdad Esfahbod + + Bug 485559 – Boston Summit HarfBuzz optimizations + + * pango/opentype/*: HarfBuzz hacking to: + + - Rename last remaining FT_Err stuff to HB_Err. + + - Fix a couple invalid table paths to be permissive so + fonts work better. Particularly GDEF table for Nafees + Nastaliq is loaded and works great now. + + - Optimize harfbuzz buffer to not copy/swap for simple + one-to-one and "copy" GSUB operations. + + * pango/pango-ot*: Update to FT_Err to HB_Err renaming. + + src/ftglue.c | 51 ++- + src/ftglue.h | 21 +- + src/harfbuzz-buffer.c | 190 +++++++-- + src/harfbuzz-buffer.h | 26 +- + src/harfbuzz-dump-main.c | 14 +- + src/harfbuzz-dump.c | 15 +- + src/harfbuzz-gdef-private.h | 4 +- + src/harfbuzz-gdef.c | 149 +++---- + src/harfbuzz-gdef.h | 10 +- + src/harfbuzz-gpos-private.h | 2 +- + src/harfbuzz-gpos.c | 810 ++++++++++++++++++-------------------- + src/harfbuzz-gpos.h | 30 +- + src/harfbuzz-gsub-private.h | 2 +- + src/harfbuzz-gsub.c | 919 + +++++++++++++++++++------------------------- + src/harfbuzz-gsub.h | 24 +- + src/harfbuzz-impl.h | 22 +- + src/harfbuzz-open-private.h | 20 +- + src/harfbuzz-open.c | 238 ++++++------ + src/harfbuzz-open.h | 13 +- + 19 files changed, 1253 insertions(+), 1307 deletions(-) + +commit dd810b76bc554278d3a226cf89901d16992cf56d +Author: Behdad Esfahbod +Date: Wed Aug 29 08:46:50 2007 +0000 + + Bug 302952 – The placement of a diacritic marks for an arabic + ligature + + 2007-08-29 Behdad Esfahbod + + Bug 302952 – The placement of a diacritic marks for an + arabic ligature + is not correct + + * pango/opentype/harfbuzz-buffer.c (hb_buffer_allocate_ligid): + Don't + use zero as allocated ligature id. Zero means no ligature id. + + src/harfbuzz-buffer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e90d19919434b90d79e67aaf199bddd991f8e5d8 +Author: Behdad Esfahbod +Date: Tue Aug 21 08:03:26 2007 +0000 + + Bug 463430 – Gets stuck while "formatting message" + + 2007-08-21 Behdad Esfahbod + + Bug 463430 – Gets stuck while "formatting message" + + * pango/opentype/harfbuzz-gpos.c (Lookup_PairPos1), + (Lookup_PairPos2), (Lookup_PairPos), (Do_ContextPos): + * pango/opentype/harfbuzz-gsub.c (Do_ContextSubst): + Change type of intermediate index variable from FT_UShort to + FT_ULong as it was overlowing with more than 65536 glyphs. + + src/harfbuzz-gpos.c | 15 ++++++++++----- + src/harfbuzz-gsub.c | 2 +- + 2 files changed, 11 insertions(+), 6 deletions(-) + +commit 13b86ee398905f96f57df001309312f6dfdfea9a +Author: Behdad Esfahbod +Date: Tue Aug 21 01:38:07 2007 +0000 + + Don't ignore error return value of + hb_buffer_copy_output_glyph(). Patch + + 2007-08-20 Behdad Esfahbod + + * pango/opentype/harfbuzz-gsub.c (GSUB_Do_String_Lookup): + Don't + ignore error return value of hb_buffer_copy_output_glyph(). + Patch + sent to harfbuzz-list. + + src/harfbuzz-gsub.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4c2556cb4c38a56c3a5087deb54aa6262ab3aff9 +Author: Behdad Esfahbod +Date: Fri Jul 6 11:29:21 2007 -0400 + + [gdef] Initial implementation + + src/harfbuzz-gdef-private.h | 144 + +++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 142 insertions(+), 2 deletions(-) + +commit 5b2e947fd2b7c5ea49b2bef1e0190d99a525058c +Author: Behdad Esfahbod +Date: Fri Jul 6 02:03:26 2007 -0400 + + [open] small fixes, including not using unions for main structs + + src/harfbuzz-open-private.h | 54 + ++++++++++++++++++++++++--------------------- + 1 file changed, 29 insertions(+), 25 deletions(-) + +commit 151df44346990728b5dd249db5740a9543ae33b9 +Author: Behdad Esfahbod +Date: Thu Jul 5 17:22:07 2007 -0400 + + Improve stupid Makefile + + src/Makefile | 2 ++ + 1 file changed, 2 insertions(+) + +commit 6c49bebc70a0118a803a5bc979f4436a82b48240 +Author: Behdad Esfahbod +Date: Tue May 1 02:32:12 2007 +0000 + + Link freetype to harfbuzz-dump, for those systems that don't track + + 2007-04-30 Behdad Esfahbod + + * pango/opentype/Makefile.am: Link freetype to harfbuzz-dump, + for + those systems that don't track dependencies automatically. + + src/Makefile.am | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 7341a116916c8470f1211f0cb3c65b189b42ec9e +Author: Behdad Esfahbod +Date: Tue Apr 3 22:45:29 2007 +0000 + + Copy fixes from harfbuzz stable branch. Includes a leak fix, a kerning + + 2007-04-03 Behdad Esfahbod + + * pango/opentype/harfbuzz-gdef.c (_HB_GDEF_Check_Property): + * pango/opentype/harfbuzz-gpos.c (HB_Done_GPOS_Table), + (Lookup_PairPos): + * pango/opentype/harfbuzz-open.c (Get_Class1): + Copy fixes from harfbuzz stable branch. Includes a leak fix, + a kerning fix, and an array out-of-bound access fix. + + src/harfbuzz-gdef.c | 2 ++ + src/harfbuzz-gpos.c | 8 ++++++++ + src/harfbuzz-open.c | 2 +- + 3 files changed, 11 insertions(+), 1 deletion(-) + +commit 999a6f05758c10a902354457ecbf6c943bfed514 +Author: Hans Breuer +Date: Sat Jan 13 21:31:41 2007 +0000 + + updated + + 2007-01-13 Hans Breuer + + * pango/makefile.msc pango/opentype/makefile.msc : updated + + src/makefile.msc | 16 ++++++---------- + 1 file changed, 6 insertions(+), 10 deletions(-) + +commit 3c038d40da4bfe5037cc4e9de22bad08fa408465 +Author: Behdad Esfahbod +Date: Tue Jan 9 03:32:12 2007 +0000 + + Remove .cvsignore files (moved to svn:ignore prop) + + src/.cvsignore | 7 ------- + 1 file changed, 7 deletions(-) + +commit 5b3f7702a64fe0513d08a67bdb72704e46fd7cd4 +Author: Behdad Esfahbod +Date: Thu Dec 28 06:42:37 2006 -0500 + + Add stub GDEF files + + src/harfbuzz-gdef-private.h | 8 ++++++++ + src/harfbuzz-gdef.h | 11 +++++++++++ + src/harfbuzz-open-private.h | 3 +-- + src/harfbuzz-private.h | 6 ++++++ + src/main.cc | 1 + + 5 files changed, 27 insertions(+), 2 deletions(-) + +commit b3395a7aa36ff1ba5a17f494fbf359ec317a7e69 +Author: Behdad Esfahbod +Date: Thu Dec 28 06:31:18 2006 -0500 + + Don't shift down the mark attachment type + + src/harfbuzz-open-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 193b66d52ae2cb5ced7969e15b7f56dc1978ca8a +Author: Behdad Esfahbod +Date: Thu Dec 28 06:12:18 2006 -0500 + + Remove stale comment + + src/harfbuzz-open-private.h | 10 ---------- + 1 file changed, 10 deletions(-) + +commit 12c4568c680ea2b9b98a16a8b7402ca185c90ef6 +Author: Behdad Esfahbod +Date: Thu Dec 28 06:10:59 2006 -0500 + + Break and rename, in the layout of old HarfBuzz codebase + + src/.gitignore | 1 + + src/Makefile | 2 +- + src/harfbuzz-common.h | 14 +++ + src/{harfbuzz-ng.cc => harfbuzz-open-private.h} | 117 + ++---------------------- + src/harfbuzz-open.h | 13 +++ + src/main.cc | 98 + ++++++++++++++++++++ + 6 files changed, 133 insertions(+), 112 deletions(-) + +commit 3158d84b0dfe5032e7c56c03f2da97b8ab549d94 +Author: Behdad Esfahbod +Date: Wed Dec 27 20:08:07 2006 -0500 + + Oops. s/OpenTypeFontFaceFile/OpenTypeFontFile/g + + src/harfbuzz-ng.cc | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +commit bf0f9dd61375c5afce8e6b1664d0df5f6c8b2494 +Author: Behdad Esfahbod +Date: Wed Dec 27 20:06:42 2006 -0500 + + Use union for ClassDef + + src/harfbuzz-ng.cc | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit c46196d09c4ea879bf45182e8a0d649d4c750c39 +Author: Behdad Esfahbod +Date: Wed Dec 27 20:05:16 2006 -0500 + + Use union for Coverage + + src/harfbuzz-ng.cc | 21 +++++++++++---------- + 1 file changed, 11 insertions(+), 10 deletions(-) + +commit 86f450243dbaa82f187cf2d36364e9a59c0e64c7 +Author: Behdad Esfahbod +Date: Wed Dec 27 19:59:07 2006 -0500 + + Add GPOS stub + + src/harfbuzz-ng.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 133466177e104ddcd2501a88735670540252167c +Author: Behdad Esfahbod +Date: Wed Dec 27 19:58:32 2006 -0500 + + s/OpenTypeFont/OpenTypeFontFace/g + + src/harfbuzz-ng.cc | 44 +++++++++++++++++++++++--------------------- + 1 file changed, 23 insertions(+), 21 deletions(-) + +commit 71d62baab0429cdf56ba4019fd2a205f08188503 +Author: Behdad Esfahbod +Date: Wed Dec 27 01:29:24 2006 -0500 + + GSUBGPOSHeader + + src/harfbuzz-ng.cc | 103 + ++++++++++++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 98 insertions(+), 5 deletions(-) + +commit eebabd8b2ec5296deba6b09d7755933da0a7d9dc +Author: Behdad Esfahbod +Date: Wed Dec 27 00:21:31 2006 -0500 + + Finished OpenType Common Table Formats + + src/harfbuzz-ng.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2b7374519766825971f9f4ff5b1cb49b74cfcaf8 +Author: Behdad Esfahbod +Date: Tue Dec 26 20:55:37 2006 -0500 + + Device tables. + + src/harfbuzz-ng.cc | 49 +++++++++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 45 insertions(+), 4 deletions(-) + +commit eb32e374f4d6de8d428d36144f6eef93514820d2 +Author: Behdad Esfahbod +Date: Tue Dec 26 20:00:33 2006 -0500 + + ClassDef + + src/harfbuzz-ng.cc | 121 + ++++++++++++++++++++++++++++++++++++++++++----------- + 1 file changed, 97 insertions(+), 24 deletions(-) + +commit 53502c6723dbf9cd3b6ba91b733678b3c7871715 +Author: Behdad Esfahbod +Date: Tue Dec 26 19:29:08 2006 -0500 + + Rename CoverageFormat to Coverage + + src/harfbuzz-ng.cc | 18 +++++++++++++----- + 1 file changed, 13 insertions(+), 5 deletions(-) + +commit 0d6db2abcbe98456569ccf7934ba0a8b37c7f6f3 +Author: Behdad Esfahbod +Date: Tue Dec 26 18:53:55 2006 -0500 + + Define more structs using DEFINE_INT_TYPE. + + src/harfbuzz-ng.cc | 39 +++++++++++++++++++-------------------- + 1 file changed, 19 insertions(+), 20 deletions(-) + +commit 915931b74a30e8652fac5fec153d499485513f63 +Author: Behdad Esfahbod +Date: Tue Dec 26 15:30:14 2006 -0500 + + s/DEFINE_NOT_INSTANTIABLE/DEFINE_NON_INSTANTIABLE/ + + src/harfbuzz-ng.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 0c0d55330ef4090f3e4864538e83a4344caaf3ba +Author: Behdad Esfahbod +Date: Tue Dec 26 15:29:38 2006 -0500 + + Coverage. + + src/harfbuzz-ng.cc | 91 + +++++++++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 79 insertions(+), 12 deletions(-) + +commit 882e52f59196535495af8ca8069df32308ad52cf +Author: Behdad Esfahbod +Date: Mon Dec 25 10:28:31 2006 -0500 + + Rename to harfbuzz-ng.cc + + src/Makefile | 2 +- + src/{hb-types-private.cc => harfbuzz-ng.cc} | 0 + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit f8ba99f6f322800a915428ffc3b5eaf1be2e6c21 +Author: Behdad Esfahbod +Date: Mon Dec 25 09:58:02 2006 -0500 + + LookupFlags + + src/hb-types-private.cc | 52 + ++++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 47 insertions(+), 5 deletions(-) + +commit 25ad92c8a68bf72464601a644ed57b9213126a78 +Author: Behdad Esfahbod +Date: Mon Dec 25 09:35:06 2006 -0500 + + Implement Feature + + src/hb-types-private.cc | 46 + ++++++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 42 insertions(+), 4 deletions(-) + +commit befc022affd2386b3f46cd7d11e4262f6c8bce9f +Author: Behdad Esfahbod +Date: Mon Dec 25 09:14:52 2006 -0500 + + LangSys + + src/hb-types-private.cc | 51 + ++++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 44 insertions(+), 7 deletions(-) + +commit c81efca149b08832d5d96a944fb5f303f3d0ca42 +Author: Behdad Esfahbod +Date: Mon Dec 25 06:22:08 2006 -0500 + + Use CamelCaseTags. + + src/hb-types-private.cc | 29 ++++++++++++++--------------- + 1 file changed, 14 insertions(+), 15 deletions(-) + +commit 808dbe283c1ad66091f2cb67380888b7cf265c01 +Author: Behdad Esfahbod +Date: Mon Dec 25 06:18:52 2006 -0500 + + Make types not instantiable + + src/hb-types-private.cc | 104 + ++++++++++++++++++++++++++---------------------- + 1 file changed, 57 insertions(+), 47 deletions(-) + +commit b739c05ca4b7acfa45bd4b0812ecbb3747f726f0 +Author: Behdad Esfahbod +Date: Mon Dec 25 05:39:20 2006 -0500 + + Add OpenTypeFontFile. + + src/Makefile | 2 +- + src/hb-types-private.cc | 113 + +++++++++++++++++++++++++++++++++++++++++++++--- + 2 files changed, 107 insertions(+), 8 deletions(-) + +commit 8596944b7421f982960e825019fc0263442520cb +Author: Behdad Esfahbod +Date: Sat Dec 23 17:49:25 2006 -0500 + + Add Makefile + + src/Makefile | 3 +++ + 1 file changed, 3 insertions(+) + +commit b6e62bc5db76ae342177b2b646c37f45eccad975 +Author: Behdad Esfahbod +Date: Fri Dec 22 02:21:55 2006 -0500 + + After DEFINE_SCRIPT_ARRAY + + src/hb-types-private.cc | 215 + +++++++++++++++++++++++++++++++----------------- + 1 file changed, 140 insertions(+), 75 deletions(-) + +commit 01e4fcb032be601f272e62228881e2aabfb9d925 +Author: Behdad Esfahbod +Date: Thu Dec 21 22:31:31 2006 -0500 + + Remove the annoying HB_ prefix. + + src/hb-types-private.cc | 107 + +++++++++++++++++++++++------------------------- + 1 file changed, 52 insertions(+), 55 deletions(-) + +commit 6b4ce01da121e12e1c78ad7eaedf469f35f3568d +Author: Behdad Esfahbod +Date: Thu Dec 21 22:31:10 2006 -0500 + + Second version. Complete redesign, based on C++ classes to ensure + endian + correctness. + + src/hb-types-private.cc | 300 + +++++++++++++++++++++++++++++++++--------------- + 1 file changed, 205 insertions(+), 95 deletions(-) + +commit f78e70c301311ffcfb007c7fc4125d71cbcff1e2 +Author: Behdad Esfahbod +Date: Thu Dec 21 22:30:38 2006 -0500 + + First version. + + src/hb-types-private.cc | 116 + ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 116 insertions(+) + +commit f726b20e56e8b1106dfde0bf8d575c73e83957c4 +Author: Behdad Esfahbod +Date: Tue Jul 25 01:02:27 2006 +0000 + + Bug 347073 – Allow empty GPOS table + + 2006-07-24 Behdad Esfahbod + + Bug 347073 – Allow empty GPOS table + + * pango/opentype/harfbuzz-open.c (_HB_OPEN_Load_ScriptList): + Don't + err on empty GPOS/GSUB tables. + + src/harfbuzz-open.c | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 52481a5c55d466f41654dcdc67245d0ca8cefbcf +Author: Behdad Esfahbod +Date: Thu Jun 22 18:09:04 2006 +0000 + + Bug 345600 – cvs build error in pango/opentype/Makefile + + 2006-06-22 Behdad Esfahbod + + Bug 345600 – cvs build error in pango/opentype/Makefile + + * pango/opentype/Makefile.am: Rename variable SOURCES to + MAINSOURCES. + Some automake versions seem to use it or something. + + src/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ffb2d5c1e7af33644d0a4058befa4b8358c9a7bf +Author: Behdad Esfahbod +Date: Wed May 31 07:42:55 2006 +0000 + + Bug 341138 – Using TTC font, Gtk2 programs begin to eating big + memory + + 2006-05-31 Behdad Esfahbod + + Bug 341138 – Using TTC font, Gtk2 programs begin to eating + big memory + and have many cpu usage. + Patch from Yong Li. + + * pango/opentype/ftglue.c (_hb_ftglue_face_goto_table): + TrueType table + offsets are absolute, not relative. + + src/ftglue.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f8f7bd2451eeafb57f5c80c7b4e88a1e50b97c4f +Author: Behdad Esfahbod +Date: Wed May 31 07:23:02 2006 +0000 + + Bug 336153 – Mark to mark positioning (Lookup Type 6) isn't + correct when + + 2006-05-31 Behdad Esfahbod + + Bug 336153 – Mark to mark positioning (Lookup Type 6) + isn't correct + when using MarkAttchmentType + Patch from Tin Myo Htet. + + * pango/opentype/harfbuzz-gpos.c (Lookup_MarkMarkPos): + Ignore marks + of non-matchin attachment type. + + src/harfbuzz-gpos.c | 37 ++++++++++++++++++++++--------------- + 1 file changed, 22 insertions(+), 15 deletions(-) + +commit d2a613187c1257371d62153b55c89336965e0754 +Author: Behdad Esfahbod +Date: Wed Apr 12 18:47:50 2006 +0000 + + Fix loop variables. (coverity found bug.) + + 2006-04-12 Behdad Esfahbod + + * pango/opentype/harfbuzz-gpos.c: Fix loop + variables. (coverity + found bug.) + + src/harfbuzz-gpos.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 14022e826f63c48b689f9037645c9a3a3302d9b6 +Author: Behdad Esfahbod +Date: Tue Apr 11 08:31:44 2006 +0000 + + Bug 337924 – cleanups for issues reported by various compilers Patch + + 2006-04-11 Behdad Esfahbod + + Bug 337924 – cleanups for issues reported by various + compilers + Patch from Kjartan Maraas. + + * examples/viewer-x.c (update): + * modules/arabic/arabic-fc.c (fallback_shape), + (arabic_engine_shape): + * modules/basic/basic-fc.c (fallback_shape), + (basic_engine_shape): + * modules/basic/basic-x.c: + * modules/hangul/hangul-fc.c: + * modules/hebrew/hebrew-fc.c (hebrew_engine_shape): + * modules/indic/indic-fc.c: + * modules/khmer/khmer-fc.c: + * modules/syriac/syriac-fc.c: + * modules/thai/thai-fc.c: + * modules/tibetan/tibetan-fc.c: + * pango/break.c: + * pango/modules.c: + * pango/opentype/ftglue.c (_hb_ftglue_face_goto_table): + * pango/pango-attributes.c (pango_attr_list_filter): + * pango/pango-engine.c: + * pango/pango-fontset.c: + * pango/pango-layout.c (pango_layout_set_text), + (pango_layout_xy_to_index), (pango_layout_get_cursor_pos): + * pango/pango-markup.c (text_handler): + * pango/pango-utils.c (read_alias_file): + * pango/pangocairo-fcfont.c (G_DEFINE_TYPE_WITH_CODE): + * pango/pangocairo-fcfontmap.c (G_DEFINE_TYPE_WITH_CODE): + * pango/pangocairo-font.c + (_pango_cairo_font_get_hex_box_info): + * pango/pangox-fontmap.c (pango_x_make_matching_xlfd): + * tests/dump-boundaries.c (fail): + Remove unused variables. Remove excess semicolon after + DEFINE_TYPE + macros. + + src/ftglue.c | 2 -- + 1 file changed, 2 deletions(-) + +commit 59aafd07806a2f0d4f399eff13aec74557f60522 +Author: Behdad Esfahbod +Date: Mon Apr 10 10:33:17 2006 +0000 + + Fix minor bugs reported by the Coverity scan report. + + 2006-04-10 Behdad Esfahbod + + Fix minor bugs reported by the Coverity scan report. + + * pango/opentype/harfbuzz-gdef.c + (HB_GDEF_Build_ClassDefinition): + * pango/opentype/harfbuzz-gpos.c (HB_GPOS_Query_Scripts), + (HB_GPOS_Query_Languages), (HB_GPOS_Query_Features): Do + not access + structs before we check them for nullity. + + * pango/pango-layout.c (pango_layout_index_to_line), + (pango_layout_index_to_line_and_extents), + (pango_layout_index_to_pos): Check for invalid iterators + outside the + loop, so we don't crash. + + * pango/pango-layout.c (pango_layout_line_x_to_index): Set + char_trailing instead of trailing in one of too many paths. + Should + have been a typo. + + * pango/pangox.c (get_font_metrics_from_subfonts): Check + for nullity + somewhere. + + src/harfbuzz-gdef.c | 3 ++- + src/harfbuzz-gpos.c | 9 ++++++--- + 2 files changed, 8 insertions(+), 4 deletions(-) + +commit b31d6def96ff99e89ba42e09661992498bda460d +Author: Behdad Esfahbod +Date: Thu Apr 6 18:23:49 2006 +0000 + + Update from HarfBuzz. Lars Knoll fixed all the warnings. + + 2006-04-06 Behdad Esfahbod + + * pango/opentype: Update from HarfBuzz. Lars Knoll fixed + all the + warnings. + + src/harfbuzz-dump.c | 94 ++++++++++++++++++++++++++++--------------- + src/harfbuzz-gpos.c | 80 ++++++++++++++++++++++-------------- + src/harfbuzz-gsub.c | 114 + +++++++++++++++++++++++++++++----------------------- + src/harfbuzz-impl.h | 4 ++ + 4 files changed, 179 insertions(+), 113 deletions(-) + +commit ca57250bc9d9f92c88a2ea516e251b9cbfdebda0 +Author: Behdad Esfahbod +Date: Mon Apr 3 20:13:17 2006 +0000 + + Make sure TTAG_GDEF and frineds are defined, needed for FreeType + <= 2.1.7 + + 2006-04-03 Behdad Esfahbod + + * pango/opentype/harfbuzz-impl.h: Make sure TTAG_GDEF and + frineds are + defined, needed for FreeType <= 2.1.7 (pointed by Tim Janik). + + src/harfbuzz-gdef.c | 3 --- + src/harfbuzz-gpos.c | 3 --- + src/harfbuzz-gsub.c | 3 --- + src/harfbuzz-impl.h | 11 +++++++++++ + 4 files changed, 11 insertions(+), 9 deletions(-) + +commit f618288e00914b6606ec977d506c18e4abdd3ce4 +Author: Behdad Esfahbod +Date: Fri Mar 31 13:19:29 2006 +0000 + + . + + src/.cvsignore | 2 -- + 1 file changed, 2 deletions(-) + +commit 5f1f943b9e6d753722ceadba7eb7ce1f14526ea5 +Author: Behdad Esfahbod +Date: Fri Mar 31 13:18:23 2006 +0000 + + . + + src/.cvsignore | 1 + + 1 file changed, 1 insertion(+) + +commit bce3e0b0d4ee521767d80c5c21704337bf5ac716 +Author: Behdad Esfahbod +Date: Fri Mar 31 12:45:40 2006 +0000 + + Define NULL. + + src/harfbuzz-impl.h | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 9f8da38cd108590514b71756b752d98952a9221f +Author: Behdad Esfahbod +Date: Fri Mar 31 12:28:09 2006 +0000 + + Convert pango/opentype to the new project called HarfBuzz. + + 2006-03-31 Behdad Esfahbod + + Convert pango/opentype to the new project called HarfBuzz. + + * pango/opentype/*: Restructured. + + * pango/pango-ot-*: Updated to use HarfBuzz symbol names. + + src/COPYING | 15 + + src/{FTL.TXT => COPYING.FTL} | 0 + src/COPYING.GPL | 340 ++ + src/FT-license.txt | 28 - + src/Makefile.am | 89 +- + src/README | 44 +- + src/ftglue.c | 88 +- + src/ftglue.h | 68 +- + src/ftxgdef.c | 1225 ------- + src/ftxgdef.h | 224 -- + src/ftxgpos.c | 6199 + ------------------------------- + src/ftxgpos.h | 838 ----- + src/ftxgsub.c | 4533 ----------------------- + src/ftxgsub.h | 594 --- + src/ftxopen.c | 1552 -------- + src/ftxopen.h | 317 -- + src/ftxopenf.h | 166 - + src/harfbuzz-buffer.c | 227 ++ + src/harfbuzz-buffer.h | 106 + + src/{ottest.c => harfbuzz-dump-main.c} | 84 +- + src/{disasm.c => harfbuzz-dump.c} | 186 +- + src/{disasm.h => harfbuzz-dump.h} | 18 +- + src/harfbuzz-gdef-private.h | 101 + + src/harfbuzz-gdef.c | 1228 +++++++ + src/harfbuzz-gdef.h | 127 + + src/harfbuzz-gpos-private.h | 683 ++++ + src/harfbuzz-gpos.c | 6269 + ++++++++++++++++++++++++++++++++ + src/harfbuzz-gpos.h | 168 + + src/harfbuzz-gsub-private.h | 448 +++ + src/harfbuzz-gsub.c | 4581 +++++++++++++++++++++++ + src/harfbuzz-gsub.h | 132 + + src/harfbuzz-impl.h | 64 + + src/harfbuzz-open-private.h | 81 + + src/harfbuzz-open.c | 1426 ++++++++ + src/harfbuzz-open.h | 285 ++ + src/harfbuzz.c | 19 + + src/harfbuzz.h | 23 + + src/otlbuffer.c | 238 -- + src/otlbuffer.h | 103 - + 39 files changed, 16582 insertions(+), 16335 deletions(-) + +commit dd2a8d4d490df1d310e7553ba6c7c8de661f28a1 +Author: Behdad Esfahbod +Date: Sat Mar 25 23:52:30 2006 +0000 + + Don't err on Table_Missing. + + 2006-03-25 Behdad Esfahbod + + * pango/opentype/ottest.c: Don't err on Table_Missing. + + src/ottest.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 434833b1b7b01d85a143f9ad4b04e7044dd72567 +Author: Behdad Esfahbod +Date: Mon Mar 13 05:06:05 2006 +0000 + + === Released 1.12.0 === + + 2006-03-13 Behdad Esfahbod + + * === Released 1.12.0 === + + * configure.in: Version 1.12.0 + + * NEWS, README: Updated. + + src/README | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8228828e1e4c8dd6f9435fb718ad4394bba95655 +Author: Behdad Esfahbod +Date: Mon Jan 30 22:37:48 2006 +0000 + + Handle GSUB Lookup type 8, and ReverseChainContextualSubst table. (bug + + 2006-01-30 Behdad Esfahbod + + * pango/opentype/ftxgsub.c: Handle GSUB Lookup type 8, + and ReverseChainContextualSubst table. (bug #149696, + patch from Aamir Wali) + + src/ftxgsub.c | 545 + ++++++++++++++++++++++++++++++++++++++++++++++----------- + src/ftxgsub.h | 47 +++-- + src/ftxopen.c | 7 + + src/ftxopenf.h | 5 +- + 4 files changed, 487 insertions(+), 117 deletions(-) + +commit e040f681963d51eaadcd53a456100fde1a7addb6 +Author: Behdad Esfahbod +Date: Sat Jan 28 20:29:18 2006 +0000 + + Removed. + + 2006-01-28 Behdad Esfahbod + + * pango/opentype/pango-ot-*: Removed. + + * pango/pango-ot-*: Added. + + * pango/Makefile.am, pango/opentype/Makefile.am: Adjusted. + + src/Makefile.am | 30 +-- + src/pango-ot-buffer.c | 339 ------------------------ + src/pango-ot-info.c | 681 + ------------------------------------------------- + src/pango-ot-private.h | 105 -------- + src/pango-ot-ruleset.c | 225 ---------------- + 5 files changed, 13 insertions(+), 1367 deletions(-) + +commit f45689bc655eb723f11a2eb65a41303221b80397 +Author: Behdad Esfahbod +Date: Wed Jan 25 19:33:58 2006 +0000 + + If major.minor of required and available glib versions are the + same, add + + 2006-01-25 Behdad Esfahbod + + * configure.in: If major.minor of required and available + glib versions + are the same, add -DG_DISABLE_DEPRECATED to GLIB_CFLAGS. (bug + #328617) + + * */Makefile.am: Remove hardcoded -DG_DISABLE_DEPRECATED. + + src/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +commit 6cc6c9a57c674787f278ea5b60705384fd72b4ad +Author: Behdad Esfahbod +Date: Sat Jan 14 07:00:13 2006 +0000 + + Make sure #include is the first include in the file. (bug + + 2006-01-14 Behdad Esfahbod + + * */*.c, */*/*.c: Make sure #include is the + first include + in the file. (bug #158870, based on patch by Luis Menina) + + src/disasm.c | 2 ++ + src/ftglue.c | 1 + + src/ftxgdef.c | 1 + + src/ftxgpos.c | 2 ++ + src/ftxgsub.c | 2 ++ + src/ftxopen.c | 2 ++ + src/otlbuffer.c | 3 +++ + src/ottest.c | 1 + + src/pango-ot-buffer.c | 2 ++ + src/pango-ot-info.c | 2 ++ + src/pango-ot-ruleset.c | 2 ++ + 11 files changed, 20 insertions(+) + +commit ca07fcf6ef61c09825e67ca7e2574a90e4f5a9a0 +Author: Behdad Esfahbod +Date: Thu Jan 5 16:14:49 2006 +0000 + + pango/Makefile.am, pango/fonts.c, pango/glyphstring.c, + + 2006-01-05 Behdad Esfahbod + + * pango/Makefile.am, + * pango/fonts.c, + * pango/glyphstring.c, + * pango/pango-attributes.c, + * pango/pango-color.c, + * pango/pango-impl-utils.h, + * pango/pango-item.c, + * pango/pango-layout.c, + * pango/pango-tabs.c, + * pango/pango-utils.c, + * pango/pango-utils.h, + * pango/pangoatsui-fontmap.c, + * pango/pangocairo-font.c, + * pango/pangocairo-fontmap.c, + * pango/pangofc-fontmap.c, + * pango/pangowin32-fontmap.c, + * pango/pangox-fontmap.c, + * pango/pangox.c, + * pango/opentype/pango-ot-info.c, + * pango/opentype/pango-ot-ruleset.c: Intern strings to avoid + unnecessary strdups in the type system. (bug #325832, + Matthias Clasen) + + src/pango-ot-info.c | 3 ++- + src/pango-ot-ruleset.c | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +commit 71524f1bc891bb4450507f769e5cc8f6f6cffa0c +Author: Behdad Esfahbod +Date: Tue Dec 27 09:55:48 2005 +0000 + + Use g_slice for PangoOTBuffer allocation. (bug #325026, Matthias + Clasen) + + 2005-12-27 Behdad Esfahbod + + * pango/opentype/pango-ot-buffer.c: Use g_slice for + PangoOTBuffer + allocation. (bug #325026, Matthias Clasen) + + src/pango-ot-buffer.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit b5baa43d3a972ebd3ef82ede14b54c185b723a71 +Author: Behdad Esfahbod +Date: Fri Nov 25 09:22:02 2005 +0000 + + Tiny doc improvement. + + src/pango-ot-info.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6f64314f7a031a5a5d6b7663c08b70c452961c89 +Author: Behdad Esfahbod +Date: Wed Nov 23 19:48:10 2005 +0000 + + Fix typo in docs. + + 2005-11-23 Behdad Esfahbod + + * pango/opentyp/pango-ot-buffer.c: Fix typo in docs. + + src/pango-ot-buffer.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit f2bcf72296b57c8cd7d5a08228c3aef6c8f97d2d +Author: Behdad Esfahbod +Date: Wed Nov 23 17:54:55 2005 +0000 + + Added "Since:" tags to all interfaces added after Pango 1.0. (#319116, + + 2005-11-23 Behdad Esfahbod + + * pango/fonts.c pango/pango-attributes.c pango/pango-context.c + pango/pango-glyph-item.c pango/pango-layout.c + pango/pango-script.c pango/pango-utils.c pango/pangofc-font.c + pango/pangoft2-fontmap.c pango/opentype/pango-ot-buffer.c + pango/opentype/pango-ot-ruleset.c: Added "Since:" tags to all + interfaces added after Pango 1.0. (#319116, Brian Cameron) + + src/pango-ot-buffer.c | 49 + +++++++++++++++++++++++++++++++++++++++++++++++++ + src/pango-ot-ruleset.c | 14 ++++++++++++++ + 2 files changed, 63 insertions(+) + +commit 682db81c23d2116072d8550657c914afb7c26d2b +Author: Behdad Esfahbod +Date: Wed Nov 23 15:19:48 2005 +0000 + + Protect against possible division by zeros (#316468, Steve Grubb) + + 2005-11-23 Behdad Esfahbod + + Protect against possible division by zeros (#316468, + Steve Grubb) + + * pango/pango-context.c (update_metrics_from_items), + pango/pango-fontset.c (pango_fontset_real_get_metrics): + If count is + zero, do not alter approximate_{char,digit}_width. + + * pango/opentype/disasm.c: Err on invalid DeltaFormat. + + src/disasm.c | 28 ++++++++++++++++++---------- + 1 file changed, 18 insertions(+), 10 deletions(-) + +commit e6e15352d154e1350340f8045759e5f7b0d86dc7 +Author: Behdad Esfahbod +Date: Wed Nov 23 11:53:03 2005 +0000 + + Reworked basic shaper with OpenType support. (#101079, based on + patch from + + 2005-11-23 Behdad Esfahbod + + * modules/basic/basic-fc.c: Reworked basic shaper with + OpenType + support. (#101079, based on patch from Denis Jacquerye and + Noah Levitt) + + * modules/basic/basic-fc.c (basic_scripts): Added Unicode + 4.1 addition + script PANGO_SCRIPT_GLAGOLITIC that is a "simple" script. + + * modules/arabic/arabic-fc.c, modules/syriac/syriac-fc.c: + Replace + g_utf8_to_ucs4_fast() with g_utf8_strlen()! + + * pango/opentype/pango-ot-ruleset.c + (pango_ot_ruleset_add_feature): + Remove reference in docs to pango_ot_ruleset_shape() that was + removed long ago. + + src/pango-ot-ruleset.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 612b6cf60928b356f4bbb59bc9d64886574322c3 +Author: Behdad Esfahbod +Date: Thu Nov 17 06:28:11 2005 +0000 + + Part of #101079: + + 2005-11-17 Behdad Esfahbod + + Part of #101079: + + * pango/opentype/ftxopen.c (Load_Lookup): In extension + subtables, + offset is relative to the extension subtable, not the original + table. (Greg Aumann) + + * pango/opentype/ftxgpos.c (Load_BaseArray): When reading + BaseAnchor, + skip offsets that are zero. Works around bug in Doulos + SIL Regular. + + src/ftxgpos.c | 6 ++++++ + src/ftxopen.c | 6 ++++-- + 2 files changed, 10 insertions(+), 2 deletions(-) + +commit 1b2c314b804da97b1d5e7adab64bdd4177702579 +Author: Behdad Esfahbod +Date: Wed Nov 9 23:30:00 2005 +0000 + + Remove debug line that got in accidentally. + + 2005-11-09 Behdad Esfahbod + + * pango/opentype/ftxgpos.c, pango/opentype/ftxopen.c: + Remove debug + line that got in accidentally. + + src/ftxgpos.c | 1 - + src/ftxopen.c | 1 - + 2 files changed, 2 deletions(-) + +commit 9717127a5be037e26afe52332a8b07f13474557a +Author: Behdad Esfahbod +Date: Fri Nov 4 23:55:38 2005 +0000 + + Turn various gcc warnings off. Adding const, adding static, fully + + 2005-11-04 Behdad Esfahbod + + * configure.in, examples/argcontext.c examples/cairoview.c, + examples/renderdemo.c, examples/renderdemo.h + examples/xftview.c, + modules/basic/basic-x.c, modules/hangul/hangul-fc.c, + modules/hebrew/hebrew-shaper.c, + modules/hebrew/hebrew-shaper.h, + modules/indic/indic-fc.c, modules/indic/mprefixups.c, + modules/syriac/syriac-fc.c, pango/break.c pango/fonts.c, + pango/modules.c, pango/pango-coverage.c pango/pango-engine.c, + pango/pango-engine.h, pango/pango-fontmap.c, + pango/pango-fontset.c, pango/pango-impl-utils.h, + pango/pango-layout.c, pango/pango-layout.h, + pango/pango-renderer.c, pango/pango-script.c, + pango/pango-utils.c, pango/pangocairo-fc.h, + pango/pangocairo-font.c, pango/pangocairo-fontmap.c, + pango/pangocairo-private.h, pango/pangofc-decoder.c, + pango/pangofc-font.c, pango/pangofc-fontmap.c + pango/pangoft2.c, + pango/pangox-fontcache.c, pango/pangox-fontmap.c + pango/pangox.c, + pango/pangoxft-font.c, pango/querymodules.c, + pango/opentype/ftglue.c, pango/opentype/ftxgpos.c, + pango/opentype/ftxopen.c, pango/opentype/pango-ot-buffer.c, + pango/opentype/pango-ot-info.c, + pango/opentype/pango-ot-ruleset.c, tests/dump-boundaries.c, + tests/testboundaries.c, tests/testcolor.c tests/testiter.c, + tests/testscript.c: Turn various gcc warnings off. Adding + const, + adding static, fully initializing structs, match signedness in + comparisons. (#317804) + + * tests/testscript.c, tools/gen-script-for-lang.c: + (scripts_for_file): Pass error->message instead of error + to fail(), + which was wrong. + (compare_lang): Fix typo comparing a and a instead of a and b. + + src/ftglue.c | 2 +- + src/ftxgpos.c | 4 ++++ + src/ftxopen.c | 1 + + src/pango-ot-buffer.c | 4 ++-- + src/pango-ot-info.c | 5 +++-- + src/pango-ot-ruleset.c | 5 +++-- + 6 files changed, 14 insertions(+), 7 deletions(-) + +commit c0505f3bb28feeba95b201e6464fb2fdac90194a +Author: Behdad Esfahbod +Date: Thu Nov 3 20:13:40 2005 +0000 + + Patches from #170414. Reviewed by Matthias Clasen. + + 2005-11-03 Behdad Esfahbod + + Patches from #170414. Reviewed by Matthias Clasen. + + * pango/opentype/ftxgpos.c, pango/opentype/ftxgsub.c: Use + call table + to dispatch different lookup types. + + * pango/opentype/pango-ot-buffer.c, + pango/opentype/pango-ot-ruleset.c: + Small cleanup. + + src/ftxgpos.c | 143 + ++++++++++++++++++++++++------------------------- + src/ftxgsub.c | 115 +++++++++++++++++++++------------------ + src/pango-ot-buffer.c | 3 +- + src/pango-ot-ruleset.c | 75 +++++++++----------------- + 4 files changed, 159 insertions(+), 177 deletions(-) + +commit c6b22b9119ef54ea8d0d2f08b74fdeb024289d73 +Author: Behdad Esfahbod +Date: Mon Aug 29 10:06:40 2005 +0000 + + Generate valid XML output. Dump LookupFlag too. + + 2005-08-29 Behdad Esfahbod + + * pango/opentype/ottest.c, pango/opentype/disasm.c: + Generate valid + XML output. Dump LookupFlag too. + + src/disasm.c | 58 + ++++++++++++++++++++++++++++++---------------------------- + src/ottest.c | 23 ++++++++++++++--------- + 2 files changed, 44 insertions(+), 37 deletions(-) + +commit 1e3747ca5d1a6f607f8e56fb94e3daaf6ad623cb +Author: Behdad Esfahbod +Date: Mon Aug 15 04:16:04 2005 +0000 + + Replace perror with perror_. Remove FT_BEGIN_STMNT and FT_END_STMNT. + + 2005-08-15 Behdad Esfahbod + + * pango/opentype/ftglue.h: Replace perror with perror_. + Remove FT_BEGIN_STMNT and FT_END_STMNT. (#313477) + + src/ftglue.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 3c60250875fa9d04ca96dea35eba23fc70690ff5 +Author: Owen Taylor +Date: Tue Jul 26 18:33:27 2005 +0000 + + Skip lookups with lookup index out of range. (Patch from Behdad + Esfahbod, + + 2005-07-26 Owen Taylor + + * pango/opentype/ftxgsub.c, pango/opentype/ftxgpos.c: + Skip lookups + with lookup index out of range. (Patch from Behdad Esfahbod, + #171170) + + src/ftxgpos.c | 30 ++++++++++++++++++++++++------ + src/ftxgsub.c | 30 ++++++++++++++++++++++++------ + 2 files changed, 48 insertions(+), 12 deletions(-) + +commit 91a3fa2e4bcdde8ae022d1264c783f133cd7e00d +Author: Owen Taylor +Date: Fri Jul 22 18:03:58 2005 +0000 + + Remove an unecessary set of block2. + + 2005-07-22 Owen Taylor + + * pango/opentype/ftglue.c (ftglue_realloc): Remove + an unecessary set of block2. + + src/ftglue.c | 1 - + 1 file changed, 1 deletion(-) + +commit ff7034787d79dcd1bec58a4e02602039313da00e +Author: Owen Taylor +Date: Fri Jul 22 17:56:37 2005 +0000 + + Patch from David Turner. Review and testing by Behdad Esfahbod + + 2005-07-22 Owen Taylor + + Patch from David Turner. Review and testing by Behdad Esfahbod + + * pango/opentype/ftglue.[ch] Makefile.am: Glue layer that + provides + implementation of the internal functions that the opentype + code + expects in terms of publically exported FreeType API. + + * pango/opentype/ftxgdef.c pango/opentype/ftxgpos.c + pango/opentype/ftxgsub.c pango/opentype/ftxopen.c + pango/opentype/otlbuffer.c pango/opentype/pango-ot-info.c + pango/opentype/pango-ot-ruleset.c: Remove includes of + internal headers. Small changes to work with ftglue.[ch] + + * pango/opentype/fterrcompat.h: Remove: no longer needed. + + * pango/opentype/ftxgpos.c: Use FT_IS_SFNT(face) rather + than poking at FT_MODULE_CLASS (face->driver)->module_name. + + * pango/opentype/ftxopen.c (Free_FeatureList): Free + fl->ApplyOrder. (Found by Behdad) + + src/Makefile.am | 3 +- + src/fterrcompat.h | 95 -------------- + src/ftglue.c | 350 + +++++++++++++++++++++++++++++++++++++++++++++++++ + src/ftglue.h | 156 ++++++++++++++++++++++ + src/ftxgdef.c | 9 +- + src/ftxgpos.c | 9 +- + src/ftxgsub.c | 10 +- + src/ftxopen.c | 8 +- + src/otlbuffer.c | 4 +- + src/pango-ot-info.c | 6 +- + src/pango-ot-ruleset.c | 2 - + 11 files changed, 520 insertions(+), 132 deletions(-) + +commit 43dbec6f3a345ba0e4a43766610ed59622bbe4a0 +Author: Owen Taylor +Date: Thu Jul 21 18:15:45 2005 +0000 + + Fix up places where there is missing or incomplete Copyright and + License + + 2005-07-21 Owen Taylor + + Fix up places where there is missing or incomplete + Copyright and License information (Reported by William N. Ray) + + * pango/opentype/fterrcompat.h: Mark as FreeType/GPL licensed. + + * pango/opentype/FT-license.txt: Make this the dual-licensing + description that covers the FreeType code (FreeType's + LICENSE.TXT) rather than the FTL. + + * pango/opentype/FTL.TXT: Move the FTL (referenced from + FT-license.txt) to here. + + * modules/basic/basic-common.h modules/hebrew/hebrew-shaper.h + modules/thai/thai-charprop.c modules/thai/thai-shaper.h + tools/gen-script-for-lang.c tests/testcolor.c: + Add LGPL header and copyright information. + + * modules/indic/indic-ot.[ch] + modules/indic/indic-ot-class-tables.c + modules/thai/thai-ot.[ch]: Add LGPL header. + + * modules/thai/thai-shaper.c modules/thai/thai-charprop.h: + Minor fixes to copyright information. + + * modules/arabic/arabic-ot.c: Add Freetype license + boilerplate. + + src/FT-license.txt | 179 + +++++++---------------------------------------------- + src/FTL.TXT | 174 + +++++++++++++++++++++++++++++++++++++++++++++++++++ + src/fterrcompat.h | 10 ++- + 3 files changed, 204 insertions(+), 159 deletions(-) + +commit c55850d36d208c7aae8f6ed5c9e1e7927b988d6c +Author: Owen Taylor +Date: Tue Jun 14 19:54:19 2005 +0000 + + Chain up from finalize. (#307547, Paolo Borelli) + + 2005-06-14 Owen Taylor + + * pango/opentype/pango-ot-info.c (pango_ot_info_finalize) + pango/opentype/pango-ot-ruleset.c (pango_ot_ruleset_finalize): + Chain up from finalize. (#307547, Paolo Borelli) + + * pango/opentype/pango-ot-info.c (pango_ot_info_finalizer): + make accidentally public function static. + + src/pango-ot-info.c | 4 +++- + src/pango-ot-ruleset.c | 2 ++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit 44ff46a364fb7981804eb45329c4999b415711f9 +Author: Tor Lillqvist +Date: Tue Apr 12 01:27:21 2005 +0000 + + Rename LDADDS to libpango_ot_la_LIBADD to actually make libpango-ot.la + + 2005-04-12 Tor Lillqvist + + * pango/opentype/Makefile.am: Rename LDADDS to + libpango_ot_la_LIBADD to actually make libpango-ot.la + link with + it. + + * pango/pangowin32.def: Rename get_scale_factor to + get_metrics_factor here, too. (#300222, Ivan Wong) + + src/Makefile.am | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 0c349a032e5a52a9d0dcc8204f761b7cb28bfa6b +Author: Owen Taylor +Date: Thu Mar 3 19:38:02 2005 +0000 + + For all binary searches, handle the case where the number of items + is 0. + + 2005-03-03 Owen Taylor + + * pango/opentype/ftxopen.c (Coverage_Index1, Coverage_Index2, + Get_Class2): For all binary searches, handle the case where + the number of items is 0. (#162977, Nick Lamb) + + * pango/opentype/ftxgdef.c (TT_GDEF_Build_ClassDefinition): + Handle the case where glyph_count == 0 properly. Fix a problem + with cleanups on memory allocation failure. + (Get_New_Count, Add_Glyph_Property): Avoid reading off the + end of the ClassRangeRecord array. + + src/ftxgdef.c | 60 + +++++++++++++++++++++++++++++++++++------------------------ + src/ftxopen.c | 15 +++++++++++++++ + 2 files changed, 51 insertions(+), 24 deletions(-) + +commit 03838daaa9d485bffcb7bc46453a9a4c32a1f32f +Author: Owen Taylor +Date: Mon Nov 22 23:37:19 2004 +0000 + + Set G_LOG_DOMAIN. + + Mon Nov 22 18:30:14 2004 Owen Taylor + + * pango/opentype/Makefile.am pango/Makefile.am + modules/*/Makefile.am: Set G_LOG_DOMAIN. + + src/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 346d3b3cac253d2db41205151c185bf2fd9dda16 +Author: Owen Taylor +Date: Wed Sep 22 18:14:55 2004 +0000 + + Cleanups from 'sparse', #149922, Kjartan Maraas + + Wed Sep 22 14:07:47 2004 Owen Taylor + + Cleanups from 'sparse', #149922, Kjartan Maraas + + * pango/pango-utils.c (read_config): () => (void) in + definition. + + * pango/pangofc-fontmap.c (pango_fc_font_map_list_families): + Initialize *n_families, not n_families. + + * pango/pangofc-fontmap.c pango/pangoft2.c opentype/ftxgdef.c + opentype/ftxgpos.c opentype/ftxgsub.c: : Fix various 0/NULL + confusion. + + src/ftxgdef.c | 2 +- + src/ftxgpos.c | 6 +++--- + src/ftxgsub.c | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +commit 8b654dfb5ad6137ee9c5a48f5abe04bf7d28d8cd +Author: Owen Taylor +Date: Tue Sep 14 13:45:41 2004 +0000 + + === Released 1.6.0 === + + Mon Sep 13 17:38:58 2004 Owen Taylor + + * === Released 1.6.0 === + + * configure.in: Update versions for 1.6.0 + + * NEWS: Update. + + * README: Minor tweak. + + * pango/fonts.c pango/pango-context.c pango/pango-types.h + pango/pango-utils.c pango/pangoft2.c pango/pango-layout.c + pango/opentype/pango-ot-buffer.c: Add a bunch of missing + Since: 1.6. + + src/pango-ot-buffer.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit d41089a5b691967fdd622f47c8397a80af104396 +Author: Owen Taylor +Date: Fri Jul 30 21:23:04 2004 +0000 + + Finish extending properties flags from FT_UShort => + FT_UInt. (OTLBuffer + + Fri Jul 30 17:17:05 2004 Owen Taylor + + * pango/opentype/ftxgpos.[ch] pango/opentype/ftxgsub.[ch] + pango/opentype/ftxopen.[ch]: Finish extending properties + flags from FT_UShort => FT_UInt. (OTLBuffer was already + using an FT_UInt) + + src/ftxgpos.c | 8 ++++---- + src/ftxgpos.h | 2 +- + src/ftxgsub.c | 8 ++++---- + src/ftxgsub.h | 2 +- + src/ftxopen.c | 2 +- + src/ftxopen.h | 2 +- + 6 files changed, 12 insertions(+), 12 deletions(-) + +commit f42d5eca291dcdfb27d7fbf88391d6d381b8e9c4 +Author: Owen Taylor +Date: Tue Jul 27 17:20:01 2004 +0000 + + Save the order in which features were added and use that when applying + + Tue Jul 27 12:38:05 2004 Owen Taylor + + * pango/opentype/ftxopen.[ch] pango/opentype/ftxgsub.c + pango/opentype/ftxpos.c: Save the order in which + features were added and use that when applying features. + (Patch from Soheil Hassas Yeganeh, #122330) + + src/ftxgpos.c | 41 ++++++++++++++++++++++++----------------- + src/ftxgsub.c | 34 +++++++++++++++++++++------------- + src/ftxopen.c | 14 +++++++++++--- + src/ftxopen.h | 2 ++ + 4 files changed, 58 insertions(+), 33 deletions(-) + +commit ae2daa972d74c5ecfe1d2f0057ce12682ad30b00 +Author: Behdad Esfahbod +Date: Tue Jul 27 13:12:19 2004 +0000 + + Remove the unused parameter from the IN_CURITEM() and IN_CURGLYPH + macros. + + + * pango/opentype/ftxgpos.c: Remove the unused parameter + from the IN_CURITEM() and IN_CURGLYPH macros. + + src/ftxgpos.c | 68 + +++++++++++++++++++++++++++++------------------------------ + src/ftxgsub.c | 2 +- + 2 files changed, 35 insertions(+), 35 deletions(-) + +commit 7d5435ea8cb345c79029b8a12d1bddbed28b1997 +Author: Behdad Esfahbod +Date: Tue Jul 27 10:43:58 2004 +0000 + + Fix bug to copy glyph from in_string, not out_string. + + + * pango/opentype/otlbuffer.c (otl_buffer_copy_output_glyph): + Fix bug to copy glyph from in_string, not out_string. + + src/otlbuffer.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 2ea2a55bdf7ef1caebcd0c5922b0f542ed8bb5bf +Author: Owen Taylor +Date: Mon Jul 26 23:14:53 2004 +0000 + + Fix allocation and indexing in NewGlyphClasses array. (#130661, + Masatake + + Mon Jul 26 19:11:46 2004 Owen Taylor + + * pango/opentype/ftxgdef.c: Fix allocation and indexing + in NewGlyphClasses array. (#130661, Masatake YAMATO) + + src/ftxgdef.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 5d42695e5ed89f73fbc665792ebec82c29ae04ae +Author: Owen Taylor +Date: Mon Jul 26 19:25:45 2004 +0000 + + Remove the unused parameter from the IN_CURITEM() and IN_CURGLYPH + macros. + + Mon Jul 26 15:24:11 2004 Owen Taylor + + * pango/opentype/ftxgsub.c (ADD_Glyph): Remove the + unused parameter from the IN_CURITEM() and IN_CURGLYPH + macros. + + src/ftxgsub.c | 56 + ++++++++++++++++++++++++++++---------------------------- + 1 file changed, 28 insertions(+), 28 deletions(-) + +commit a00c4ea5626526980139b122977e367b8434d24a +Author: Owen Taylor +Date: Mon Jul 26 19:23:06 2004 +0000 + + Add missing macro to make the last change actually compile. + + Mon Jul 26 15:21:23 2004 Owen Taylor + + * pango/opentype/ftxgsub.c: Add missing macro to make the + last change actually compile. + + src/ftxgsub.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit ed3e1f278d3ebfd224f0b57388502d4bb9fb1441 +Author: Owen Taylor +Date: Mon Jul 26 19:20:27 2004 +0000 + + Match backtrack context against the output glyphs not the input glyphs + + Mon Jul 26 15:16:07 2004 Owen Taylor + + * pango/opentype/ftxgsub.c (Lookup_ChainContextSubst[123]): + Match backtrack context against the output glyphs not + the input glyphs (#145174, Aamir Wali) + + src/ftxgsub.c | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +commit 78282cda004a88b2aadb2786dd3897884e22ed0b +Author: Owen Taylor +Date: Mon Jul 26 18:59:02 2004 +0000 + + Make Check_Property() take a OTL_GlyphItem, add a gproperties field to + + Mon Jul 26 14:49:22 2004 Owen Taylor + + * ftxgdef.[ch] otlbuffer.[ch]: Make Check_Property() take a + OTL_GlyphItem, add a gproperties field to OTLGlyphItem, + and use that to cache the properties for a glyph. + + * ftxgsub.c ftxgdef.c: Adapt to Check_Property() changes. + + * otlbuffer.[ch] ftxgsub.c: Add otl_buffer_copy_output_glyph() + to use when we are copying an unmodified glyph from input + to output that preserves the cached properties. + + src/ftxgdef.c | 16 ++++++++++------ + src/ftxgpos.c | 52 +++++++++++++++++++++++++++------------------------- + src/ftxgsub.c | 54 + ++++++++++++++++++++++++++++-------------------------- + src/ftxopenf.h | 2 +- + src/otlbuffer.c | 21 +++++++++++++++++++-- + src/otlbuffer.h | 6 ++++++ + 6 files changed, 91 insertions(+), 60 deletions(-) + +commit 81b62af42313fb60db523374cd8c6901829f5c4e +Author: Owen Taylor +Date: Mon Jul 19 21:13:23 2004 +0000 + + Add support for ChainContextSubstFormat3. + + Mon Jul 19 17:09:11 2004 Owen Taylor + + * pango/opentype/disasm.c: Add support for + ChainContextSubstFormat3. + + src/disasm.c | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +commit d4f773ef92fdbaa7e61e6577db5e9b2846a100a4 +Author: Owen Taylor +Date: Mon Jul 19 20:37:22 2004 +0000 + + Fix pervasive buffer overruns when skipping glyphs when matching + contexts. + + Mon Jul 19 16:29:45 2004 Owen Taylor + + * pango/opentype/ftxgsub.c pango/opentype/ftxgpos.c: + Fix pervasive buffer overruns when skipping glyphs + when matching contexts. (#118592, Kailash C. Chowksey) + + src/ftxgpos.c | 259 ++++++++++++++++++---------------------- + src/ftxgsub.c | 376 + ++++++++++++++++++++++++++-------------------------------- + 2 files changed, 284 insertions(+), 351 deletions(-) + +commit 99848cfafee8e598ef533f254cdb99fbae4c9364 +Author: Owen Taylor +Date: Wed Jun 23 20:33:35 2004 +0000 + + #143693, Sayamindu Dasgupta + + Wed Jun 23 16:13:53 2004 Owen Taylor + + #143693, Sayamindu Dasgupta + + * pango/opentype/pango-ot-buffer.c + (pango_ot_buffer_set_zero_width_marks) + pango/opentype/pango-ot-private.h: + Allow setting for whether marks should be given zero width, + defaulting to FALSE. + + * modules/arabic/arabic-fc.c (arabic_engine_shape): Turn + on zero-width-marks setting. + + src/pango-ot-buffer.c | 22 +++++++++++++++++++++- + src/pango-ot-private.h | 5 +++-- + 2 files changed, 24 insertions(+), 3 deletions(-) + +commit 68d4cedb8726fa239f56d62060d8fee7e09cb8be +Author: Owen Taylor +Date: Mon Jun 21 18:04:02 2004 +0000 + + Use the gcc-3.3 strict-aliasing compatible macros from fterrcompat.h + + Mon Jun 21 13:55:17 2004 Owen Taylor + + * pango/opentype/otlbuffer.c: Use the gcc-3.3 + strict-aliasing compatible macros from fterrcompat.h + (#140495, reported by Stanislav Brabec) + + src/otlbuffer.c | 22 ++++++++++++++-------- + 1 file changed, 14 insertions(+), 8 deletions(-) + +commit b327765176dff81047f942ac56a1d206344e6039 +Author: Theppitak Karoonboonyanan +Date: Fri May 28 16:41:36 2004 +0000 + + Negate y offset according to different conventions between + + * pango/opentype/pango-ot-buffer.c (apply_gpos_ltr): Negate + y offset + according to different conventions between PangoGlyphString + and OTL + (#142544) + + src/pango-ot-buffer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 068763b547d791e28b892bcaee810f3d60a83018 +Author: Owen Taylor +Date: Thu May 27 21:55:50 2004 +0000 + + Revert error return changes from last commit. + + Thu May 27 17:54:24 2004 Owen Taylor + + * pango/opentype/otlbuffer.c: Revert error return changes + from last commit. + + src/otlbuffer.c | 16 ++++++---------- + 1 file changed, 6 insertions(+), 10 deletions(-) + +commit ef07481025c5bbb9769b9f908d9dc78f44161bbb +Author: Owen Taylor +Date: Thu May 27 21:03:42 2004 +0000 + + Free buffer->positions, clean up error returns that were returning + + Thu May 27 16:57:30 2004 Owen Taylor + + * pango/opentype/otlbuffer.c: Free buffer->positions, + clean up error returns that were returning uninitialized + values. (#139239, Behdad Esfahbod) + + src/otlbuffer.c | 21 +++++++++++++-------- + 1 file changed, 13 insertions(+), 8 deletions(-) + +commit de568e7e6200c7a49bae1f78ac63858b8df01173 +Author: Owen Taylor +Date: Tue Mar 16 19:23:43 2004 +0000 + + === Released 1.4.0 === + + Tue Mar 16 11:24:46 2004 Owen Taylor + + * === Released 1.4.0 === + + * configure.in: Version 1.4.0, interface ago 0. Require + glib-2.4.0. + + * NEWS: Updates. + + * README: Some updates; include details about the FreeType + license of the OpenType code. + + src/FT-license.txt | 77 + +++++++++++++++++++++++++++++------------------------- + 1 file changed, 42 insertions(+), 35 deletions(-) + +commit 8b3554b3afe7c125b1a53171b01ac87de9c486fe +Author: Hans Breuer +Date: Wed Mar 3 22:35:19 2004 +0000 + + if PANGO_MODULE_PREFIX is defined include the basic backend shaper + (should + + 2004-03-03 Hans Breuer + + * pango/module-defs-win32.c.win32 : if PANGO_MODULE_PREFIX is + defined include the basic backend shaper (should have been + commited at 2003-12-12, too) + + * pango/makefile.msc : generate correct type for PangoFontMask + (bug #135892, John Ehresman) + * pango/opentype/makefile.msc : updated + + * pango/pango.def pango/pangoft2.def : more updatd externals + + src/makefile.msc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit a7e096c5de3ec5319bf9333c9ace0732d97c52c3 +Author: Owen Taylor +Date: Sun Feb 29 15:44:50 2004 +0000 + + Rework opentype interfaces and other changes to make GPOS work + for Arabic. + + Sun Feb 29 09:25:13 2004 Owen Taylor + + Rework opentype interfaces and other changes to make GPOS + work for Arabic. (Most of #117282, #121060) + + * pango/opentype/otlbuffer.[ch]: OTL_Buffer that + acts as a replacement for the separate GSUB and + GPOS string structures and hides many of the internal + details. + + * pango/opentype/ftxgsub.[ch] pango/opentype/ftxgpos.[ch]: + Adapt to OTL_Buffer. + + * pango/opentype/ftxgpos.c: Redo handling of cursive + chains so that it actually works. + + * pango/pango-ot.h pango/opentype/pango-ot-buffer.c: + Pango wrapper around OTL_Buffer. + + * pango/pango-ot.h pango/pango-ot-ruleset.c + pango/pango-ot-buffer.c: + Split pango_ot_ruleset_shape() into + pango_ot_ruleset_substitute(), + pango_ot_ruleset_position(), make them act on + PangoOTBuffer, add a separate pango_ot_buffer_output() + which does the default positioning and writes to a + PangoGlyphString. + + * modules/arabic/arabic-fc.c modules/indic/indic-fc.c + modules/indic/mprefixups.[ch]: Adapt to new OpenType + interfaces; add GPOS features for Arabic. + + * pango/opentype/pango-ot-info.c: Don't derive class + information + from Unicode properties for Arabic presentation forms, + let the shaping process derive the properties. + + src/Makefile.am | 3 + + src/ftxgdef.c | 4 +- + src/ftxgpos.c | 573 ++++++++++++++++----------------------- + src/ftxgpos.h | 23 +- + src/ftxgsub.c | 719 + +++++++++++-------------------------------------- + src/ftxgsub.h | 40 +-- + src/ftxopen.h | 1 + + src/otlbuffer.c | 213 +++++++++++++++ + src/otlbuffer.h | 97 +++++++ + src/ottest.c | 2 + + src/pango-ot-buffer.c | 265 ++++++++++++++++++ + src/pango-ot-info.c | 27 +- + src/pango-ot-private.h | 8 + + src/pango-ot-ruleset.c | 148 +++------- + 14 files changed, 1039 insertions(+), 1084 deletions(-) + +commit d670ddf99192dd4999775a9215a818ae63fa3416 +Author: Owen Taylor +Date: Sat Feb 21 14:53:12 2004 +0000 + + Sign convention for y offsets is opposite between PangoGlyphString + and FT + + Sat Feb 21 09:49:23 2004 Owen Taylor + + * pango/opentype/pango-ot-ruleset.c (pango_ot_ruleset_shape): + Sign convention for y offsets is opposite between + PangoGlyphString and FT code. (#132591) + + src/pango-ot-ruleset.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b9b3c131c2b57c12a77124a52512fb19a1255f8e +Author: Owen Taylor +Date: Fri Feb 13 16:11:40 2004 +0000 + + Memory leak fixes from Masatake YAMATO, #130652 + + Fri Feb 13 10:54:18 2004 Owen Taylor + + Memory leak fixes from Masatake YAMATO, #130652 + + * pango/opentype/ftxgdef.c (TT_Done_GDEF_Table): + Free the gdef table as well as the contained data. + + * pango/opentype/ftxgdef.c (TT_GDEF_Build_ClassDefinition): + Set gcd->loaded, so that the contents get freed later. + + src/ftxgdef.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 926b8f322989298e43c8bac85f23e3525470a669 +Author: Owen Taylor +Date: Mon Jan 26 19:23:35 2004 +0000 + + Suport CFF fonts as well. (#131202, Manjunath Sripadarao) + + Mon Jan 26 14:20:34 2004 Owen Taylor + + * pango/opentype/pango-ot-info.c (is_truetype): Suport + CFF fonts as well. (#131202, Manjunath Sripadarao) + + src/pango-ot-info.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 945e479a3a35769e5e7c792fdcf306892523a5f9 +Author: Hans Breuer +Date: Sat Dec 13 14:31:50 2003 +0000 + + moved pango_fc_* to the latter where they live on *nix too. + + 2003-12-13 Hans Breuer + + * pango/pango.def pangoft2.def : moved pango_fc_* + to the latter where they live on *nix too. + + * pango/makefile.msc : make it build again (including + the Ft2 backend) + + * pango/module-defs-fc.c.win32 : if PANGO_MODULE_PREFIX + is defined + include the basic backend shaper + + * pango/pangowin32.c (pango_win32_render_layout) : + initialize iter before first usage to avoid immediate crashing + + * pango/opentype/makefile.msc + pango/modules/makefile.msc : finally build with mscv, too. + [completely untested cause I'm not able to type, write or read + any of these languages] + + * modules/modules.def : follow module function + renaming/changes + + * modules/basic/basic-win32.c : register the right engine, + i.e. + make it compile + + src/makefile.msc | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +commit ba0ccd5cfcb514cdc45373158343138b7b190f9d +Author: Owen Taylor +Date: Sat Nov 1 15:02:17 2003 +0000 + + Switch over to recommended Freetype system of include ft2build.h then + + Sat Nov 1 09:32:15 2003 Owen Taylor + + * pango/pango-ot.h pango/pangofc-font.h + modules/indic/indic-ot.h + pango/pangoft2.c pango/opentype/pango-ot-info.c + pango/opentype/pango-ot-ruleset.c pango/opentype/ottest.c + pango/opentype/ftxopen.[ch] pango/opentype/ftxgdef.c + pango/opentype/ftxgsub.c pango/opentype/ftxgpos.c: + Switch over to recommended Freetype system of + include ft2build.h then #include FT_FREETYPE_H. + Fixes ftmodule.h problem with current Freetype CVS. + (#125548) + + src/ftxgdef.c | 14 +++++++------- + src/ftxgpos.c | 17 ++++++++--------- + src/ftxgsub.c | 13 ++++++------- + src/ftxopen.c | 10 +++++----- + src/ftxopen.h | 3 ++- + src/ottest.c | 1 - + src/pango-ot-info.c | 4 ++-- + src/pango-ot-private.h | 2 -- + src/pango-ot-ruleset.c | 4 ++-- + 9 files changed, 32 insertions(+), 36 deletions(-) + +commit 558171a7a3666999c679719ad0bfbdf7c6a52289 +Author: Owen Taylor +Date: Mon Sep 15 22:04:55 2003 +0000 + + Fix gcc-3.3 versions of macros to have the right return value. + + Mon Sep 15 17:16:59 2003 Owen Taylor + + * pango/opentype/fterrcompat.h: Fix gcc-3.3 versions of + macros to have the right return value. + + src/fterrcompat.h | 44 ++++++++++++++++++++++++++------------------ + 1 file changed, 26 insertions(+), 18 deletions(-) + +commit c99259bf7e08ccdc4130d4983e8d186021ea8e1a +Author: Owen Taylor +Date: Mon Aug 25 14:30:12 2003 +0000 + + pango/opentype/ftxgsub.c (Lookup_ChainContextSubst3) Fix problems + where + + Mon Aug 25 10:17:21 2003 Owen Taylor + + * pango/opentype/ftxgsub.c (Lookup_ChainContextSubst3) + * pango/opentype/ftxgpos.c (Lookup_ChainContextPos3): + Fix problems where the coverage wasn't being checked + for the first input glyph. (#118639, Kailash C. Chowksey) + + src/ftxgpos.c | 7 +++---- + src/ftxgsub.c | 7 +++---- + 2 files changed, 6 insertions(+), 8 deletions(-) + +commit bcf81bcc80c6235dfbc7eeaa34ed21ea329c7a3d +Author: Owen Taylor +Date: Fri Aug 22 22:52:08 2003 +0000 + + Add some macro definitions for gcc-3.3 that suppress the bogus + + Fri Aug 22 18:09:52 2003 Owen Taylor + + * pango/opentype/fterrcompat.h: Add some macro definitions + for gcc-3.3 that suppress the bogus strict-aliasing + warnings. + + * pango/pango-utils.c (read_config_file): Use + g_hash_table_new_full() to simplify code and fix + gcc-3.3 warnings. + + * pango/pangox-fontmap.c (pango_x_real_get_coverage_win) + * pango/querymodules.c (query_module): Suppress gcc-3.3 + warnings. + + * pango/modules.c (pango_find_map): Fix warning from + missing declaration of pango_module_get_type(). + + * pango/pango-context.c/pango-engine.c: Fix name confusion + for pango_get_fallback_shaper(). + + src/fterrcompat.h | 36 ++++++++++++++++++++++++++++++++++-- + 1 file changed, 34 insertions(+), 2 deletions(-) + +commit 46d379596d7292a3b2e51f35fc8044b366d413a3 +Author: Owen Taylor +Date: Tue Jul 29 14:21:54 2003 +0000 + + Rewrite handling of IGNORE_SPECIAL_MARKS to be properly "ignore + marks of + + Tue Jul 29 09:58:13 2003 Owen Taylor + + * pango/opentype/ftxgdef.c (Check_Property): Rewrite + handling of IGNORE_SPECIAL_MARKS to be properly + "ignore marks of attachment type different than + specified. (#118456, Kailash C. Chowksey) + + src/ftxgdef.c | 37 ++++++++++++++++++++++++++++--------- + 1 file changed, 28 insertions(+), 9 deletions(-) + +commit 8247acad79c1a4154e9337aed453eb3e4d23063d +Author: Owen Taylor +Date: Mon Jul 28 22:28:37 2003 +0000 + + Revert back out the FreeType patch preventing ligatures of + not-originally + + Sat Jul 26 09:41:22 2003 Owen Taylor + + * pango/opentype/ftxgsub.c (Lookup_LigatureSubst): + Revert back out the FreeType patch preventing + ligatures of not-originally adjacent glyphs; + it doesn't work for all scripts. (#118472, + Kailash C. Chowksey) + + src/ftxgsub.c | 31 +++---------------------------- + 1 file changed, 3 insertions(+), 28 deletions(-) + +commit 825e6d7e86cac310161648601b09291fa05d5ba5 +Author: Owen Taylor +Date: Sun Jul 27 02:40:31 2003 +0000 + + Check for lookahead glyphs in the right place. (Patch from #116860) + + Sat Jul 26 22:30:59 2003 Owen Taylor + + * pango/opentype/ftxgsub.c (Lookup_ChainContextSubst{1,2,3}): + Check for lookahead glyphs in the right place. (Patch + from #116860) + + * pango/opentype/ftxgpos.c (Lookup_ChainContextPos{1,2,3}): + Same fix here. + + src/ftxgpos.c | 6 +++--- + src/ftxgsub.c | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit 03a0fe09c711b81c7eb4065fd4700b8cfd2c977a +Author: Owen Taylor +Date: Sun Jul 27 02:19:52 2003 +0000 + + Fix return value to only contain TTO_Err_Not_Covered if *no* lookups + + Sat Jul 26 22:12:46 2003 Owen Taylor + + * pango/opentype/ftxgsub.c (Do_String_Lookup, + TT_GSUB_Apply_String): Fix return value to only + contain TTO_Err_Not_Covered if *no* lookups + matched. Fix memory leaks on error in Apply_String(). + + src/ftxgsub.c | 120 + ++++++++++++++++++++++++++++++++++++---------------------- + 1 file changed, 75 insertions(+), 45 deletions(-) + +commit e10ea2afd9a5868d4ec1ff3a2b99bcd64ce45816 +Author: Owen Taylor +Date: Sun Jul 27 01:10:15 2003 +0000 + + Fix confusion between boolean and FT_Error return. (GSUB equivalent + of fix + + Sat Jul 26 21:06:26 2003 Owen Taylor + + * pango/opentype/ftxgsub.c (Load_EmptyOrClassDefinition): + Fix confusion between boolean and FT_Error return. + (GSUB equivalent of fix for #108358) + + src/ftxgsub.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit a7305ab2624cbc08160dc11587ba3dc4e17781c2 +Author: Owen Taylor +Date: Sat Jul 26 15:02:13 2003 +0000 + + Move allocation afer initial checks, fixing memory leak. + + Sat Jul 26 10:52:20 2003 Owen Taylor + + * pango/opentype/ftxgpos.c (Lookup_ContextPos2): + * pango/opentype/ftxgsub.c (Lookup_ContextSubst2): Move + allocation afer initial checks, fixing memory leak. + + * pango/opentype/ftxgsub.c (Lookup_ChainContextSubst2): + Fix some more error return memory leaks that weren't + fixed in the Qt changes. + + src/ftxgpos.c | 8 ++++---- + src/ftxgsub.c | 12 ++++++------ + 2 files changed, 10 insertions(+), 10 deletions(-) + +commit f40b7c15e0bc4b71e706602c4e062f72d8f0fcdd +Author: Owen Taylor +Date: Sat Jul 26 14:50:23 2003 +0000 + + Fix various memory leaks from error returns that should have been + jumps to + + Sat Jul 26 10:43:20 2003 Owen Taylor + + * pango/opentype/ftxgsub.c pango/opentype/ftxgpos.c: + Fix various memory leaks from error returns that should + have been jumps to cleanup blocks. (From Qt, Lars Knoll) + + src/ftxgpos.c | 8 ++++---- + src/ftxgsub.c | 4 ++-- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit 256d21970733483833b9cf31d5e0fa7ae853e944 +Author: Owen Taylor +Date: Sat Jul 26 14:35:29 2003 +0000 + + Fix additional places where TTO_Err_Not_Covered wasn't considered a + + Sat Jul 26 10:30:24 2003 Owen Taylor + + * pango/opentype/ftxgpos.c: Fix additional places where + TTO_Err_Not_Covered wasn't considered a successful return + from Get_Class. (From Qt, Lars Knoll) + + src/ftxgpos.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 374960681e2e36d0e4032623d8cb92a7910baf71 +Author: Owen Taylor +Date: Sat Jul 26 13:50:23 2003 +0000 + + If applying a ligature lookup makes adjacent two glyphs that were not + + Sat Jul 26 09:41:22 2003 Owen Taylor + + * pango/opentype/ftxgsub.c (Lookup_LigatureSubst): + If applying a ligature lookup makes adjacent two glyphs + that were not originally adjacent, avoid making + subsequent ligatures between those glyphs. + (From FreeType, Werner Lemberg, 2001-08-22, 2001-08-23) + + src/ftxgsub.c | 31 ++++++++++++++++++++++++++++--- + 1 file changed, 28 insertions(+), 3 deletions(-) + +commit b682482df77608d67eca8a050db5b36f44953c13 +Author: Owen Taylor +Date: Sat Jul 26 13:20:52 2003 +0000 + + Fix some FreeType1 variable declarations that snuck in from the last + + Sat Jul 26 09:16:57 2003 Owen Taylor + + * pango/opentype/ftxgpos.c pango/opentype/ftxopen.c: + Fix some FreeType1 variable declarations that snuck + in from the last commits (Christophe Fergeau, + 118363) + + src/ftxgpos.c | 6 +++--- + src/ftxopen.c | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 06c12109de061c357f46dcec82c4bee7160afede +Author: Owen Taylor +Date: Sat Jul 26 03:45:44 2003 +0000 + + OpenType-1.4 update: backtrack information is stored with the + item closest + + Fri Jul 25 23:38:07 2003 Owen Taylor + + * pango/opentype/ftxgpos.c pango/opentype/ftxgsub.c: + OpenType-1.4 update: backtrack information is stored with the + item closest to the input first (From FreeType, + Werner Lemberg, 2002-09-26) + + src/ftxgpos.c | 26 ++++++++++++++++++-------- + src/ftxgsub.c | 24 +++++++++++++++++------- + 2 files changed, 35 insertions(+), 15 deletions(-) + +commit 15a69e4a12739e7392f2a38d6f7bfdd96c0dc3ba +Author: Owen Taylor +Date: Sat Jul 26 03:14:23 2003 +0000 + + Update of GPOS and GSUB support to OpenType 1.3 (From FreeType, Werner + + Fri Jul 25 23:07:06 2003 Owen Taylor + + Update of GPOS and GSUB support to OpenType 1.3 + (From FreeType, Werner Lemberg, 2001-08-08) + + * pango/opentype/ftxopen.h: Add RIGHT_TO_LEFT LookupFlag + + * pango/opentype/ftxgpos.c (GPOS_Instance): Add 'first' + member to mark the beginning of a chain of cursive + connections. + + * pango/opentype/ftxgpos.c (Do_String_Lookup): If the + RIGHT_TO_FLAG flag is set, shift cursive chain up so + last glyph is on the baseline. + + src/ftxgpos.c | 25 ++++++++++++++++++++++++- + src/ftxopen.h | 8 ++++++-- + 2 files changed, 30 insertions(+), 3 deletions(-) + +commit 6f74f18b77402f3adf5bfbae26e8f44de6543b4e +Author: Owen Taylor +Date: Sat Jul 26 03:03:40 2003 +0000 + + Add GPOS_LOOKUP_EXTENSION, GSUB_LOOKUP_EXTENSION, which allow lookup + + Fri Jul 25 22:59:13 2003 Owen Taylor + + * pango/opentype/ftx{gpos,gsub}.h pango/opentype/ftxgdef.c: + Add GPOS_LOOKUP_EXTENSION, GSUB_LOOKUP_EXTENSION, which + allow lookup information to be stored at 32-bit offets + via a double indirection. (From FreeType, Werner Lemberg, + 2001-08-08) + + src/ftxgpos.h | 17 +++++++++-------- + src/ftxgsub.h | 1 + + src/ftxopen.c | 19 +++++++++++++++++++ + 3 files changed, 29 insertions(+), 8 deletions(-) + +commit 375781c4546b5cfc453b99551ddf715bb162ffb9 +Author: Owen Taylor +Date: Sat Jul 26 02:44:19 2003 +0000 + + Fix a couple of places where TTO_Err_Not_Covered wasn't considered a + + Fri Jul 25 22:25:48 2003 Owen Taylor + + * pango/opentype/ftxgsub.c (Lookup_ContextSubst2, + Lookup_ChainContextSubst2): Fix a couple of + places where TTO_Err_Not_Covered wasn't considered + a successful return from Get_Class -- it means + use class index 0. (From FreeType, Werner Lemberg, + 2001-08-06) + + src/ftxgsub.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 378e1889cd294cb77313ba7fdab3e52959bf2c40 +Author: Owen Taylor +Date: Sat Jul 26 02:10:42 2003 +0000 + + Improvements to OpenType-dumping code, based on changes in Qt by Lars + + Fri Jul 25 20:12:00 2003 Owen Taylor + + Improvements to OpenType-dumping code, based on + changes in Qt by Lars Knoll. + + * pango/opentype/ottest.c: Tweak the debugging output, + suppress some warnings. + + * pango/opentype/disasm.c: Add support for + GSUB Context/Chain GPOS MarkBase lookups, improve + output in various ways. + + src/disasm.c | 242 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- + src/ottest.c | 12 +-- + 2 files changed, 241 insertions(+), 13 deletions(-) + +commit 07bad0e77c42b5f2535e3b018bf9074d2f4ecc7c +Author: Owen Taylor +Date: Thu Jul 24 21:05:29 2003 +0000 + + Fix uses of g_assert() around statements with side effects. (#115498, + + Thu Jul 24 17:04:21 2003 Owen Taylor + + * pango/opentype/pango-ot-ruleset.c (pango_ot_ruleset_shape): + Fix uses of g_assert() around statements with side effects. + (#115498, patch from David Cuthbert) + + src/pango-ot-ruleset.c | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +commit f91deef2c9473da5c3cb5e120f2d4fbf0d638166 +Author: Owen Taylor +Date: Wed Apr 16 21:48:29 2003 +0000 + + More careful handling of face->charmap; if is NULL, try to set + a unicode + + Wed Apr 16 03:46:42 2003 Owen Taylor + + * pango/opentype/pango-ot-info.c (synthesize_class_def): + More careful handling of face->charmap; if is NULL, + try to set a unicode charmap, if that doesn't succeed, + return. (Hopefully fixes #106550) + + src/pango-ot-info.c | 26 ++++++++++++++++++++++++-- + 1 file changed, 24 insertions(+), 2 deletions(-) + +commit 587b3940f3ce71e8e1c9950086923d4eb78d62db +Author: Owen Taylor +Date: Wed Apr 16 03:58:17 2003 +0000 + + When loading in Load_Chain{Sub,Pos}ClassRule, the limit we have only + + Tue Apr 15 11:49:39 2003 Owen Taylor + + * pango/opentype/ftxg{sub/pos}.c: When loading + in Load_Chain{Sub,Pos}ClassRule, the limit we + have only applies to the input ClassDef table. + Fixes problem with Arial Unicode. Much help from + Noah Levitt in tracing this down. + + src/ftxgpos.c | 7 ++++--- + src/ftxgsub.c | 7 ++++--- + 2 files changed, 8 insertions(+), 6 deletions(-) + +commit 0d7567f8eaa1f8d0ec9cb89218ce3a1475d258ac +Author: Owen Taylor +Date: Tue Apr 15 23:01:19 2003 +0000 + + Fix mispelled constant from last commit. + + Tue Apr 15 06:57:02 2003 Owen Taylor + + * pango/opentype/ftxgpos.c: Fix mispelled constant + from last commit. + + src/ftxgpos.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 73cd600798a9a7225b2ac8241ea371d48cf7baf3 +Author: Owen Taylor +Date: Tue Apr 15 22:15:41 2003 +0000 + + Fix confusion between boolean and FT_Error return. (#108358, + Noah Levitt) + + Tue Apr 15 06:03:39 2003 Owen Taylor + + * pango/opentype/ftxgpos.c: Fix confusion between + boolean and FT_Error return. (#108358, Noah Levitt) + + * pango/opentype/ftxopen.c (Get_Class1): index is + allowed to be NULL. (#108358, Noah Levitt) + + src/ftxgpos.c | 5 +++-- + src/ftxopen.c | 3 ++- + 2 files changed, 5 insertions(+), 3 deletions(-) + +commit 462bd0be608c3d14e5b4c01099b02b3948a52369 +Author: Owen Taylor +Date: Tue Apr 15 21:05:53 2003 +0000 + + Fix infinite loop in the case where the charmap contains a character > + + Tue Apr 15 05:00:39 2003 Owen Taylor + + * pango/opentype/pango-ot-info.c (synthesize_class_def): + Fix infinite loop in the case where the charmap contains + a character > 65535. (#106550, Morten Welinder.) + + src/pango-ot-info.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 312e1c1cf9f2c1e2137b9aaa5181a541447923cb +Author: James Henstridge +Date: Tue Mar 11 12:31:16 2003 +0000 + + make similar changes to the ones on glib head (call gtk-docize, etc). + + 2003-03-11 James Henstridge + + * autogen.sh: make similar changes to the ones on glib head (call + gtk-docize, etc). + + * configure.in: move some calculations into M4 macros, rather than + calculating them when configure runs. + Use AC_HELP_STRING where appropriate. + Replace gtk-doc checks with a call to GTK_DOC_CHECK. + Replace AC_OUTPUT_COMMANDS() call with a number of calls to + AC_CONFIG_COMMANDS (once per created file). + Get rid of the "chmod +x pango-config" bit, because there is no + pango-config anymore. + + * Makefile.am: get rid of custom distcheck rule, and set + DISTCHECK_CONFIGURE_FLAGS, which is equivalent. + Use += to select which .pc files to install. + + * pango/Makefile.am: Add rules to rebuild module-defs* files, and + remove them on clean. + Reorder so that rules related to each individual library are next + to each other. + Use BUILT_SOURCES for built sources. + + * pango/opentype/Makefile.am: don't use STRIP_BEGIN/STRIP_END. + + * modules/*/Makefile.am: simplify module makefiles through use of + +=, and regularise them a bit (fixed a few bugs in the process). + + * docs/Makefile.am: remove common rules, and instead include + gtk-doc.make. + + * examples/Makefile.am: add pango.modules to CLEANFILES. + + * tests/Makefile.am: remove temporary files on clean. + + src/Makefile.am | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +commit 1aad15fd0c007c9075f2f7f4c4cacf576d726eea +Author: Owen Taylor +Date: Mon Feb 17 22:04:29 2003 +0000 + + Add an --enable-debug configure argument defaulting to 'yes' + for unstable + + Mon Feb 17 13:06:39 2003 Owen Taylor + + * configure.in **/Makefile.am: Add an --enable-debug + configure argument defaulting to 'yes' for unstable + releases and 'minimum' for stable releases. + For minimum, -DG_DISABLE_CAST_CHECKS. + + * pango/pangofc-fontmap.cI pango/pangoft2-fontmap.c + pango/pangoxft-fontmap.c: Add caching of fontsets + (#104495, initial patch and review by Soeren Sandmann) + + * pango/pangofc-fontmap.cI pango/pangoft2-fontmap.c + pango/pangoxft-fontmap.c pango/pangoft2-private.h + pango/pangoxft-private.h: Remove cache of recently freed + fonts; not necessary now that we cache fontsets. + + * pango/pangofc-fontmap.cI (pango_fc_pattern_set_free): + Rename from pango_fc_font_set_free to reflect + what it actually does. + + * pango/pangofc-fontmap.cI pango/pangoft-fontmap.c + pango/pangoxft-fontmap.c: Combine clear-the-cache + functions; we didn't need separate clear-the-font-cache + and clear-the-pattern-cache functions. + + src/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 5febce1ffc956ea44526d50be7cf14c69c66cb34 +Author: Owen Taylor +Date: Wed Feb 12 22:12:55 2003 +0000 + + Up the FreeType version requirement to 2.0.9. (2.2.1 had a compilation + + Wed Feb 12 16:59:23 2003 Owen Taylor + + * configure.in pango/opentype/fterrcompat.h README: + Up the FreeType version requirement to 2.0.9. + (2.2.1 had a compilation failure with older versions, + this catches it more cleanly, and removes some unneeded + checks. #105302, problem reported by Will Partain.) + + src/fterrcompat.h | 4 ---- + 1 file changed, 4 deletions(-) + +commit 54e85cc0cf3700d2c4af5396d79bd0e40df8f0da +Author: Owen Taylor +Date: Sat Jan 11 00:16:26 2003 +0000 + + Export TT_New_GDEF_Table to create an empty GDEF table. + + Fri Jan 10 18:56:36 2003 Owen Taylor + + * pango/opentype/ftxgdef.c: Export TT_New_GDEF_Table + to create an empty GDEF table. + + * pango/opentype/pango-ot-info.c: If the font doesn't + have a class definition table, synthesize one using + the charmap and the unicode properties of characters + in the charmap. (Needed to make things work with various + old Arabic fonts, such as the KACST fonts) + + src/ftxgdef.c | 46 +++++++++++++++------- + src/ftxgdef.h | 4 ++ + src/pango-ot-info.c | 108 + ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 144 insertions(+), 14 deletions(-) + +commit db6bb4b034d4d8d546fc9bdc4ad28b16bb7f1bb7 +Author: Matthias Clasen +Date: Thu Nov 28 23:53:18 2002 +0000 + + Add docs. + + * docs/tmpl/xft-fonts.sgml: + * docs/tmpl/freetype-fonts.sgml: Add docs. + + * pango/pangoxft-fontmap.c (pango_xft_substitute_changed): + * pango/pangoft2-fontmap.c + (pango_ft2_font_map_set_default_substitute): + Fix doc typos. + + src/pango-ot-info.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 226d9b67db852eb29ad37ec8121b79f3ea6f0b73 +Author: Sebastian Wilhelmi +Date: Tue Nov 26 13:37:10 2002 +0000 + + Do not add GLIB_CFLAGS to CFLAGS. + + + 2002-11-26 Sebastian Wilhelmi + + * configure.in: Do not add GLIB_CFLAGS to CFLAGS. + + * docs/Makefile.am, examples/Makefile.am, + modules/arabic/Makefile.am, modules/basic/Makefile.am, + modules/hangul/Makefile.am, modules/hebrew/Makefile.am, + modules/indic/Makefile.am, modules/tamil/Makefile.am, + modules/thai/Makefile.am, pango/Makefile.am, + pango/mini-fribidi/Makefile.am, pango/opentype/Makefile.am: + Instead add $(GLIB_CFLAGS) directly to INCLUDES (GTKDOC_CFLAGS + for + docs/Makefile.am). Also some cosmetic line wrapping and + reindentation. + + src/Makefile.am | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 80634a30b9abdf575320bc6fdacdba4e1ea3903d +Author: Manish Singh +Date: Mon Oct 14 22:50:48 2002 +0000 + + Get rid of unnecessary casts for g_object_{ref,unref} + + Mon Oct 14 15:39:41 2002 Manish Singh + + * pango/pango-context.c pango/pango-layout.c pango/pangoft2.c + pango/pangowin32-fontmap.c pango/pangowin32.c + pango/pangox-fontmap.c + pango/pangox.c pango/pangoxft-font.c pango/pangoxft-fontmap.c + pango/testfonts.c pango/opentype/pango-ot-ruleset.c: + Get rid of unnecessary casts for g_object_{ref,unref} + + src/pango-ot-ruleset.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 741993e0b15b4df86d76fa8df5055bd764c42c71 +Author: Owen Taylor +Date: Sun Sep 29 19:06:58 2002 +0000 + + ligatures can be also used in MarkBasePos lookups. (2001-03-17 Werner + + Sun Sep 29 14:55:36 2002 Owen Taylor + + * pango/opentype/ftxgpos.c: ligatures can be also used in + MarkBasePos lookups. (2001-03-17 Werner Lemberg) + + src/ftxgpos.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +commit a35dc445e86ab433fe9f3937c95f2c1f18f58110 +Author: Owen Taylor +Date: Sun Sep 29 19:05:01 2002 +0000 + + Start of merges from freetype1 of OpenType fixes. + + Sun Sep 29 14:51:25 2002 Owen Taylor + + Start of merges from freetype1 of OpenType fixes. + + (2001-03-17 Werner Lemberg) + + * pango/opentype/ftxgdef.c pango/opentype/ftxgpos.c + pango/opentype/ftxg\sub.c: + More fixes for special marks. + + src/ftxgdef.c | 13 ++++++++----- + src/ftxgpos.c | 6 +++--- + src/ftxgsub.c | 4 ++-- + 3 files changed, 13 insertions(+), 10 deletions(-) + +commit 5c53f14f371b349da65dfa3a848b17ab89ce3ba8 +Author: Tor Lillqvist +Date: Mon Sep 23 21:45:31 2002 +0000 + + Remove. Not used. (A static library is built here. Exported entries + are in + + 2002-09-24 Tor Lillqvist + + * pango/opentype/pango-ot.def: Remove. Not used. (A static + library + is built here. Exported entries are in ../pangoft2.def.) + + * pango/opentype/Makefile.am (EXTRA_DIST): Remove from + here, too. + + src/Makefile.am | 3 +-- + src/pango-ot.def | 50 -------------------------------------------------- + 2 files changed, 1 insertion(+), 52 deletions(-) + +commit 35e4593ccd9ea5ed78f1e6f32f04b3a13cee0145 +Author: Tor Lillqvist +Date: Mon Sep 23 21:19:30 2002 +0000 + + pango/makefile.mingw.in pango/mini-fribidi/makefile.mingw Remove. Not + + 2002-09-23 Tor Lillqvist + + * pango/makefile.mingw.in + * pango/mini-fribidi/makefile.mingw + * pango/opentype/makefile.mingw.in: Remove. Not maintained. + + * pango/Makefile.am (EXTRA_DIST) + * pango/mini-fribidi/Makefile.am (EXTRA_DIST) + * pango/opentype/Makefile.am (EXTRA_DIST): Remove + makefile.mingw(.in) from here, too. + + * configure.in (AC_OUTPUT): Don't try to output above removed + files. + + src/Makefile.am | 3 +-- + src/makefile.mingw.in | 43 ------------------------------------------- + 2 files changed, 1 insertion(+), 45 deletions(-) + +commit fb279cb0bf676bb1d225e6a296282523d839074d +Author: Eric Mader +Date: Mon Sep 9 18:11:55 2002 +0000 + + Correctly handle back, new_advance. + + src/pango-ot-ruleset.c | 25 ++++++++++++++++--------- + 1 file changed, 16 insertions(+), 9 deletions(-) + +commit c880e814a50100577811a8a51bc06b4275c55a7e +Author: Eric Mader +Date: Fri Sep 6 22:45:23 2002 +0000 + + Don't fail when reading an empty script. + + src/ftxopen.c | 36 +++++++++++++++++++++++++----------- + src/ftxopen.h | 1 + + 2 files changed, 26 insertions(+), 11 deletions(-) + +commit 441e7d0292bf1a06396daac80fcbad23976a824d +Author: Owen Taylor +Date: Wed Aug 7 17:01:52 2002 +0000 + + Offset to MarkAttachClassDef is offset to table, not offset to + offset to + + Wed Aug 7 12:32:39 2002 Owen Taylor + + * pango/opentype/ftxgsub.c (TT_Load_GSUB_Table): + Offset to MarkAttachClassDef is offset to table, + not offset to offset to table. + + * pango/opentype/ftxopen.c (Get_Device): Handle + NULL device tables which we represent with + d->DeltaValue == NULL. + + src/ftxgsub.c | 13 ------------- + src/ftxopen.c | 2 +- + 2 files changed, 1 insertion(+), 14 deletions(-) + +commit 48a16fa8090b67b046b2bb686ff4f6f038a2b8e8 +Author: Owen Taylor +Date: Tue Jun 4 00:20:51 2002 +0000 + + on Jun 3 18:56:09 2002 Owen Taylor + + Xft2 and fontconfig conversion, based largely on a patch + from Keith Packard. + + * configure.in acconfig.h: Add checks for fontconfig, switch + Xft checks to switch for Xft2 using pkg-config. + + * pangoxft.pc.in pangoxft.pc.in + modules/{arabic,basic,hebrew,indic,tamil}/Makefile.am + pango/Makefile.am: Reflect new Xft/fontconfig dependencies. + + * pango/pangoxft-private.h pango/pangoxft-fontmap.c + modules/arabic/arabic-xft.c modules/indic/indic-xft.c: + Switch over to using Xft2 and fontconfig. + + * pango/pangoft2.c pango/pangoft2-fontmap.c + pango/pangoft2-private.h + pango/pango/Makefile.am: Remove usage of mini-xft in + favor of fontconfig. + + * pango/pango-ot.h pango/opentype/pango-ot-info.c + pango/pangoxft.h + modules/arabic/arabic-{xft,ft2}.c modules/indic/indic-xft.c: + Attach OpenType information directly to the FT_Face + structure using FT_Generic. + + * modules/tamil/Makefile.am modules/tamil/tamil-xft.c + configure.in: Remove this module, no longer needed. + + * pango/pangoxft-font.c (pango_xft_real_render): Coalesce + calls to Xft rendering functions. + + src/pango-ot-info.c | 29 +++++++++++++++++++++++------ + 1 file changed, 23 insertions(+), 6 deletions(-) + +commit 9df9af0b3615dc6a52d784233a3410a9080d9369 +Author: Owen Taylor +Date: Fri May 10 18:44:47 2002 +0000 + + Fix acess outside of a loaded frame and some memory leaks on failure. + + Fri May 10 14:41:27 2002 Owen Taylor + + * pango/opentype/ftxgdef.c (TT_Load_GDEF_Table): Fix acess + outside of a loaded frame and some memory leaks + on failure. + + src/ftxgdef.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +commit a63dbbbeeb91ebf4ded2fc788f5810a3bd1e14fe +Author: Eric Mader +Date: Tue May 7 20:39:14 2002 +0000 + + Add modules modules/indic/indic-xft.c, indic-ot.c, indic-ot.h, + + Mon May 06 15:07:39 2002 Eric Mader + * Add modules modules/indic/indic-xft.c, indic-ot.c, + indic-ot.h, indic-ot-class-tables.c + + * pango/opentype/ftxgdef.c: Compute full offset for mark + attachment class table + + * pango/opentype/ftxgpos.c: Only return TTO_Err_Not_Covered + if nothing matches + + * pango/opentype/pango-ot-ruleset.c: enable GPOS processing + + src/ftxgdef.c | 10 ++++++++-- + src/ftxgpos.c | 33 ++++++++++++++------------------- + src/pango-ot-ruleset.c | 35 ++++++++++++++++++++++++++++++++++- + 3 files changed, 56 insertions(+), 22 deletions(-) + +commit cf00f8217c9dfcf50febbb06fad245d489a0abe6 +Author: Owen Taylor +Date: Tue Apr 23 20:20:29 2002 +0000 + + Add compatibility defines for changes in FreeType 2.1.0. + + Tue Apr 23 16:15:07 2002 Owen Taylor + + * pango/opentype/fterrcompat.h: Add compatibility + defines for changes in FreeType 2.1.0. + + src/fterrcompat.h | 39 +++++++++++++++++++++++++++++++++++++-- + 1 file changed, 37 insertions(+), 2 deletions(-) + +commit 6b1b04e3736fdca774052ac3cfbe9f027548c29d +Author: Owen Taylor +Date: Fri Mar 15 06:46:05 2002 +0000 + + In Load_ChainContextSubst2, handle the case where an empty class + + Fri Mar 15 01:35:56 2002 Owen Taylor + + * pango/opentype/ftxgsub.c pango/opentype/ftxopen.c + pango/opentype/ftxopenf.h: In Load_ChainContextSubst2, + handle the case where an empty class definition + is represented by an offset of 0. + + * pango/opentype/ftxgpos.c: Same for Load_ChainContextPos2. + + * pango/opentype/{ftxopen.c,ftxgpos.c,ftxgsub.c,ftgdef.c}: + Fix pervasive bug where on cleanups on failure of loading + an array element, all array elements were freed, not + just the ones that had been succesfully loaded. + + src/ftxgdef.c | 24 +++--- + src/ftxgpos.c | 259 + ++++++++++++++++++++++++++++++++++++--------------------- + src/ftxgsub.c | 159 ++++++++++++++++++++--------------- + src/ftxopen.c | 53 ++++++++---- + src/ftxopenf.h | 2 + + 5 files changed, 306 insertions(+), 191 deletions(-) + +commit 6050933f336f43453e35246525cfec362bd23acb +Author: Owen Taylor +Date: Fri Mar 15 04:22:14 2002 +0000 + + Uncomment GPOS parts. + + Thu Mar 14 23:05:18 2002 Owen Taylor + + * pango/opentype/ftxopen.c: Uncomment GPOS parts. + + * pango/opentype/disasm.c: Start adding some GPOS + dumping. + + src/disasm.c | 146 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/ftxopen.c | 20 ++++---- + 2 files changed, 154 insertions(+), 12 deletions(-) + +commit 973bd60a2526666f68138255b8536d1eaee3c2c2 +Author: Sebastian Wilhelmi +Date: Thu Dec 13 17:44:46 2001 +0000 + + Resuming aborted commit + + + Resuming aborted commit + + src/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 6926ca94255e5d52d99d0d64d126165fc725432d +Author: Matthias Clasen +Date: Tue Oct 30 22:09:20 2001 +0000 + + Remove declarations of unimplemented functions + + * docs/pango-sections.txt, pango/pango-ot.h: Remove + declarations + of unimplemented functions pango_ot_ruleset_set_glyph_loader + and + pango_ot_ruleset_set_alternate_func and the related typedefs + PangoOTGlyphLoader and PangoOTAlternateFunc. + + * pango/opentype/pango-ot-info.c, + pango/opentype/pango-ot-ruleset.c: Documentation updates. + + src/pango-ot-info.c | 76 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + src/pango-ot-ruleset.c | 27 ++++++++++++++++++ + 2 files changed, 103 insertions(+) + +commit 87a475c09f6b9b391bca37de47a303a62a397b83 +Author: Havoc Pennington +Date: Wed Sep 19 21:20:36 2001 +0000 + + header to abstract the difference between FreeType 2.0.3 and 2.0.4 + error + + 2001-09-19 Havoc Pennington + + * pango/opentype/fterrcompat.h: header to abstract the + difference + between FreeType 2.0.3 and 2.0.4 error codes, based on the + configure check. + + * configure.in: check for the tterrors.h header in FreeType + 2.0.3, + and define HAVE_FREETYPE_2_0_3 if we have it + + src/Makefile.am | 1 + + src/fterrcompat.h | 16 ++++++++++++++++ + src/ftxgdef.c | 3 ++- + src/ftxgpos.c | 3 ++- + src/ftxgsub.c | 3 ++- + src/ftxopen.c | 3 ++- + src/pango-ot-info.c | 2 +- + 7 files changed, 26 insertions(+), 5 deletions(-) + +commit 9c37226efe2489b4cf9618ec98f581c998aaf9e4 +Author: Owen Taylor +Date: Tue Sep 18 20:05:20 2001 +0000 + + Up to 0.19. + + Tue Sep 18 15:47:08 2001 Owen Taylor + + * configure.in (PANGO_MINOR_VERSION): Up to 0.19. + + * pango/pango-font.h pango/pango-fontmap.[ch] pango/fonts.c + pango/pangoxft-fontmap.c pango/pangoft-fontmap.c + pango/pango-context.[ch] + pango/pangox-fontmap.c: Add new PangoFontFace and + PangoFontFamily + object types, and change the font listing API to list + faces and + families, instead of face names and font descriptions. + + * pango/pango-font.h pango/fonts.c: Make PangoFontDescription + an opaque heap-allocated structure, add accessors and + convenience functions. + + * pango/pango-font.h pango/pango-private.h: Make + PangoFontMetrics + heap allocated, protect the structure definition with + #ifdef PANGO_ENABLE_BACKEND, and add getters for the fields. + + * pango/pango-attributes.[ch] ( pango_attr_iterator_get_font): + instead of providing a base font description and one to fill + in, provide a single font description to modify based on + the attributes. + + * pango/pango-attributes.[ch]: Fix PangoAttrFontDesc to have + a PangoFontDescription by reference, not by value. + + * pango/pango-utils.[ch]: make pango_parse_style() and friends + take pointers to individual enumerations instead of to a + PangoFontDescription structure. + + * pango/*.c: Fix for the PangoFontDescription and + PangoFontMetrics + changes. + + * pango/pango-{break,engine,indic,ot,xft}.h pango/Makefile.am + pango/opentype/Makefile.am: Protect portions with + PANGO_ENABLE_ENGINE to shrink the public API. + + * modules/*/Makefile.am: -DPANGO_ENABLE_ENGINE. + + * pango/{pangox.h,pangox-private.h} modules/basic/basic-x.c: + Move + pango_x_font_get_unknown_glyph() into public header since + it is + used from modules. + + * pango/pango-{context,font,fontmap,modules.utils}.h + pango/Makefile.am: + Protect portions with PANGO_ENABLE_BACKEND to shrink the + public API. + + * pango/*.h: Use G_BEGIN/END_DECLS + + * examples/viewer-qt.[cc,h]: Fix for changes to font + listing API, + PangoFontDescription. + + * pango/pango-indic.h modules/indic/*: Since we install this + header fix it up to Pango conventions, namespece + ZERO_WIDTH_JOINER, ZERO_WIDTH_NON_JOINER. + + * docs/pango-sections.txt: Updated. + + src/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 7dd0838863f65a8ff2e27d12679c9a289a76aec1 +Author: Darin Adler +Date: Thu Jul 12 16:34:40 2001 +0000 + + Remove stray semicolon. + + * modules/arabic/arabic-x.c: (arabic_engine_shape): Remove + stray + semicolon. + + * modules/arabic/arconv.h: + * modules/arabic/arconv.c: (shape), (doublelig), + (arabic_reshape): + Use long* instead of int* for parameter to match what's + passed in. + + * modules/indic/bengali-x.c: Add missing include. + (pango_indic_make_ligs): Use local variable that was added + but not + ever used. + (pango_indic_engine_shape): Remove unused locals. + + * modules/indic/devanagari-x.c: Add missing + include. + (pango_indic_engine_shape): Remove unused local. + + * modules/indic/gujarati-x.c: Add missing include. + (pango_indic_engine_shape): Remove unused local + + * modules/tamil/tamil-x.c: (tamil_engine_shape): Initialize a + variable to quiet the compiler's unused warning. + + * pango/.cvsignore: Ignore more generated files. + + * pango/opentype/ftxgpos.c: (Get_Anchor): Add code to set + up the + ap variable. The old code would just use the uninitialized + value. + + * pango/opentype/ftxopen.c: (Load_Coverage): Remove unused + local. + + * pango/opentype/pango-ot-ruleset.c: (pango_ot_ruleset_shape): + Remove unused local. + + * pango/pango-attributes.c: (pango_attr_list_get_type), + (pango_color_get_type): Add needed function type casts (just + warnings under gcc, but could be errors in other compilers). + + * pango/pangoxft-font.c: (pango_xft_font_get_metrics), + (pango_xft_font_get_coverage), (pango_xft_get_shaper_map), + (pango_xft_font_find_shaper): Switch from lang char* to + PangoLanguage*. The code was still compiling, but would + not have + worked. + + src/ftxgpos.c | 2 ++ + src/ftxopen.c | 1 - + src/pango-ot-ruleset.c | 1 - + 3 files changed, 2 insertions(+), 2 deletions(-) + +commit 68f8a64307441bd3b3d45971ac4dc93f63dedfe8 +Author: Owen Taylor +Date: Fri May 18 16:04:40 2001 +0000 + + Use ISO C99 varargs when available. + + Fri May 18 11:30:57 2001 Owen Taylor + + * pango/opentype/disasm.c: Use ISO C99 varargs when + available. + + Thu May 17 11:16:23 2001 Owen Taylor + + * pango/mapping.c: Fixup docs, remove some FIXMEs that are + no longer applicable. + + * pango/pango-layout.c: Move by graphemes, not characters. + + * pango/pango-layout.c (pango_layout_line_x_to_index): + Position at the closest grapheme boundary, not at character + boundaries. + + * pango/pango-layout.c (pango_layout_line_index_to_x): + Return positions of grapheme boundaries, not character + boundaries. + + src/Makefile.am | 2 ++ + src/disasm.c | 5 +++++ + 2 files changed, 7 insertions(+) + +commit 89eb36ebc6591025c063cb98f0e1b3badde73e9e +Author: Owen Taylor +Date: Tue Apr 24 15:47:22 2001 +0000 + + Remove excess call to DONE_Stream left over from conversion from FT1. + + Tue Apr 24 11:45:55 2001 Owen Taylor + + * pango/opentype/ftxgdef.c (TT_Load_GDEF_Table): Remove + excess call to DONE_Stream left over from conversion + from FT1. (reported by Michael Jansson) + + src/ftxgdef.c | 1 - + 1 file changed, 1 deletion(-) + +commit c61a730aaebec751831f8423894de5f4b539d0ec +Author: Owen Taylor +Date: Tue Apr 3 19:07:36 2001 +0000 + + Release 0.14 + + Tue Apr 3 15:05:19 2001 Owen Taylor + + * Release 0.14 + + * NEWS: updated. + + * pango/pango/opentype/Makefile.am: make dist fixes. + + * configure.in (PANGO_MINOR_VERSION): Up to 0.14 + + src/Makefile.am | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit 405b878923ed219617c6f643a9aec06175223d16 +Author: Tor Lillqvist +Date: Thu Dec 21 19:55:23 2000 +0000 + + Only a script engine here. + + 2000-12-21 Tor Lillqvist + + * modules/basic/basic-win32.c (script_engine_load): Only + a script + engine here. + + * pango/makefile.mingw.in: Add the built + pango-enum-types.[ch]. + + * pango/pango.def + * pango/pangoft2.def: Update. + + * pango/opentype/pango-ot.def + * pango/opentype/makefile.mingw.in: New files. + + * pango/opentype/Makefile.am (EXTRA_DIST): Add them. + + * configure.in (included_modules): Generate + pango/opentype/makefile.mingw. + + src/Makefile.am | 4 +++- + src/makefile.mingw.in | 43 +++++++++++++++++++++++++++++++++++++++++++ + src/pango-ot.def | 50 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 96 insertions(+), 1 deletion(-) + +commit 80a15829135065e16ce5b129c715d10d14b829ba +Author: Owen Taylor +Date: Wed Dec 20 04:41:36 2000 +0000 + + Since Xft may only be available statically without shlib deps, + check for + + Tue Dec 19 22:47:16 2000 Owen Taylor + + * configure.in pango-config.in pangoxft.pc.in + modules/basic/Makefile.am: Since Xft may only be available + statically without shlib deps, check for FreeType libs + explicitly + and include them when linking, otherwise things won't + work. Also, + define FREETYPE_CFLAGS from freetype-config --cflags. + + * modules/basic/basic-xft.c pango/pangoxft-font{,map}.c: Fool + Xft into not converting glyph indices by loading the + face unencoded then calling FT_Set_Charmap ourselves. + + * pango/Makefile.am pango/pango-ot.h pango/opentype/* + :Add start + of opentype handling - most of the actually meat of the + code here + is the OpenType layout code from FreeType 1 ported to + freetype2 + and adapted slighlty for our purposes. Also, includes a + incomplete OpenType-table-dumping code useful for figuring + out what is going on. + + * pango/pangoxft.h pango/pangoxft-font.h: Add calls for + getting FT_Face and PangoOTInfo from PangoXftFont. + + * modules/arabic/{Makefile.am,arabic-ot.[ch],arabic-xft.c}: + Initial support for rendering Arabic with OpenType fonts. + + src/.cvsignore | 8 + + src/FT-license.txt | 158 ++ + src/Makefile.am | 39 + + src/README | 36 + + src/disasm.c | 317 +++ + src/disasm.h | 26 + + src/ftxgdef.c | 1155 +++++++++ + src/ftxgdef.h | 220 ++ + src/ftxgpos.c | 6222 + ++++++++++++++++++++++++++++++++++++++++++++++++ + src/ftxgpos.h | 858 +++++++ + src/ftxgsub.c | 4531 +++++++++++++++++++++++++++++++++++ + src/ftxgsub.h | 612 +++++ + src/ftxopen.c | 1467 ++++++++++++ + src/ftxopen.h | 308 +++ + src/ftxopenf.h | 161 ++ + src/ottest.c | 265 +++ + src/pango-ot-info.c | 438 ++++ + src/pango-ot-private.h | 98 + + src/pango-ot-ruleset.c | 232 ++ + 19 files changed, 17151 insertions(+) diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..2099840 --- /dev/null +++ b/INSTALL @@ -0,0 +1,370 @@ +Installation Instructions +************************* + +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, +Inc. + + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. + +Basic Installation +================== + + Briefly, the shell command `./configure && make && make install' +should configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + + The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package, generally using the just-built uninstalled binaries. + + 4. Type `make install' to install the programs and any data files and + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. + + 6. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS + KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: + + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..8dc8a4b --- /dev/null +++ b/Makefile.am @@ -0,0 +1,82 @@ +# Process this file with automake to produce Makefile.in + +NULL = + +ACLOCAL_AMFLAGS = -I m4 + +SUBDIRS = src util test docs win32 + +EXTRA_DIST = \ + autogen.sh \ + harfbuzz.doap \ + README.python \ + BUILD.md \ + $(NULL) + +MAINTAINERCLEANFILES = \ + $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \ + $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \ + $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \ + $(srcdir)/INSTALL \ + $(srcdir)/ChangeLog \ + $(srcdir)/gtk-doc.make \ + $(srcdir)/m4/gtk-doc.m4 \ + $(NULL) + + +# +# ChangeLog generation +# +CHANGELOG_RANGE = +ChangeLog: $(srcdir)/ChangeLog +$(srcdir)/ChangeLog: + $(AM_V_GEN) if test -d "$(top_srcdir)/.git"; then \ + (GIT_DIR=$(top_srcdir)/.git \ + $(GIT) log $(CHANGELOG_RANGE) --stat) | fmt --split-only > $@.tmp \ + && mv -f $@.tmp "$(srcdir)/ChangeLog" \ + || ($(RM) $@.tmp; \ + echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \ + (test -f $@ || echo git-log is required to generate this file >> "$(srcdir)/$@")); \ + else \ + test -f $@ || \ + (echo A git checkout and git-log is required to generate ChangeLog >&2 && \ + echo A git checkout and git-log is required to generate this file >> "$(srcdir)/$@"); \ + fi +.PHONY: ChangeLog $(srcdir)/ChangeLog + + +# +# Release engineering +# + +DISTCHECK_CONFIGURE_FLAGS = \ + --enable-gtk-doc \ + --disable-doc-cross-references \ + --with-gobject \ + --enable-introspection \ + $(NULL) + +# TODO: Copy infrastructure from cairo + +# TAR_OPTIONS is not set as env var for 'make dist'. How to fix that? +TAR_OPTIONS = --owner=0 --group=0 + +dist-hook: dist-clear-sticky-bits +# Clean up any sticky bits we may inherit from parent dir +dist-clear-sticky-bits: + chmod -R a-s $(distdir) + + +tar_file = $(PACKAGE_TARNAME)-$(VERSION).tar.bz2 +sha256_file = $(tar_file).sha256 +gpg_file = $(sha256_file).asc +$(sha256_file): $(tar_file) + sha256sum $^ > $@ +$(gpg_file): $(sha256_file) + @echo "Please enter your GPG password to sign the checksum." + gpg --armor --sign $^ + +release-files: $(tar_file) $(sha256_file) $(gpg_file) + + +-include $(top_srcdir)/git.mk diff --git a/Makefile.in b/Makefile.in new file mode 100644 index 0000000..cf38c96 --- /dev/null +++ b/Makefile.in @@ -0,0 +1,940 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# Process this file with automake to produce Makefile.in +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = . +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog THANKS \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in COPYING TODO ar-lib compile config.guess \ + config.sub depcomp install-sh missing ltmain.sh +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno config.status.lineno +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +CSCOPE = cscope +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" +GZIP_ENV = --best +DIST_ARCHIVES = $(distdir).tar.bz2 +DIST_TARGETS = dist-bzip2 +distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' +distcleancheck_listfiles = find . -type f -print +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CAIRO_CFLAGS = @CAIRO_CFLAGS@ +CAIRO_FT_CFLAGS = @CAIRO_FT_CFLAGS@ +CAIRO_FT_LIBS = @CAIRO_FT_LIBS@ +CAIRO_LIBS = @CAIRO_LIBS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CORETEXT_CFLAGS = @CORETEXT_CFLAGS@ +CORETEXT_LIBS = @CORETEXT_LIBS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DIRECTWRITE_CXXFLAGS = @DIRECTWRITE_CXXFLAGS@ +DIRECTWRITE_LIBS = @DIRECTWRITE_LIBS@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ +FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ +FREETYPE_DEPS = @FREETYPE_DEPS@ +FREETYPE_LIBS = @FREETYPE_LIBS@ +GIT = @GIT@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_DEPS = @GLIB_DEPS@ +GLIB_LIBS = @GLIB_LIBS@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ +GOBJECT_LIBS = @GOBJECT_LIBS@ +GRAPHITE2_CFLAGS = @GRAPHITE2_CFLAGS@ +GRAPHITE2_DEPS = @GRAPHITE2_DEPS@ +GRAPHITE2_LIBS = @GRAPHITE2_LIBS@ +GREP = @GREP@ +GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ +HB_LIBTOOL_VERSION_INFO = @HB_LIBTOOL_VERSION_INFO@ +HB_VERSION = @HB_VERSION@ +HB_VERSION_MAJOR = @HB_VERSION_MAJOR@ +HB_VERSION_MICRO = @HB_VERSION_MICRO@ +HB_VERSION_MINOR = @HB_VERSION_MINOR@ +HTML_DIR = @HTML_DIR@ +ICU_CFLAGS = @ICU_CFLAGS@ +ICU_CONFIG = @ICU_CONFIG@ +ICU_LIBS = @ICU_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PTHREAD_CC = @PTHREAD_CC@ +PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ +PTHREAD_LIBS = @PTHREAD_LIBS@ +RAGEL = @RAGEL@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +UNISCRIBE_CFLAGS = @UNISCRIBE_CFLAGS@ +UNISCRIBE_LIBS = @UNISCRIBE_LIBS@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +ax_pthread_config = @ax_pthread_config@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +NULL = +ACLOCAL_AMFLAGS = -I m4 +SUBDIRS = src util test docs win32 +EXTRA_DIST = \ + autogen.sh \ + harfbuzz.doap \ + README.python \ + BUILD.md \ + $(NULL) + +MAINTAINERCLEANFILES = \ + $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \ + $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \ + $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \ + $(srcdir)/INSTALL \ + $(srcdir)/ChangeLog \ + $(srcdir)/gtk-doc.make \ + $(srcdir)/m4/gtk-doc.m4 \ + $(NULL) + + +# +# ChangeLog generation +# +CHANGELOG_RANGE = + +# +# Release engineering +# +DISTCHECK_CONFIGURE_FLAGS = \ + --enable-gtk-doc \ + --disable-doc-cross-references \ + --with-gobject \ + --enable-introspection \ + $(NULL) + + +# TODO: Copy infrastructure from cairo + +# TAR_OPTIONS is not set as env var for 'make dist'. How to fix that? +TAR_OPTIONS = --owner=0 --group=0 +tar_file = $(PACKAGE_TARNAME)-$(VERSION).tar.bz2 +sha256_file = $(tar_file).sha256 +gpg_file = $(sha256_file).asc +all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +.SUFFIXES: +am--refresh: Makefile + @: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + echo ' cd $(srcdir) && $(AUTOMAKE) --gnits'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --gnits \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnits Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + +$(top_srcdir)/configure: $(am__configure_deps) + $(am__cd) $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(am__aclocal_m4_deps): + +config.h: stamp-h1 + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 + +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h +$(srcdir)/config.h.in: $(am__configure_deps) + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) + rm -f stamp-h1 + touch $@ + +distclean-hdr: + -rm -f config.h stamp-h1 + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool config.lt + +# This directory's subdirectories are mostly independent; you can cd +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files + +distdir: $(DISTFILES) + @case `sed 15q $(srcdir)/NEWS` in \ + *"$(VERSION)"*) : ;; \ + *) \ + echo "NEWS not updated; not releasing" 1>&2; \ + exit 1;; \ + esac + $(am__remove_distdir) + test -d "$(distdir)" || mkdir "$(distdir)" + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook + -test -n "$(am__skip_mode_fix)" \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r "$(distdir)" +dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__post_remove_distdir) +dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) + +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) + +dist-xz: distdir + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) + +dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__post_remove_distdir) + +dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__post_remove_distdir) + +dist-zip: distdir + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) + $(am__post_remove_distdir) + +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) + +# This target untars the dist file and tries a VPATH configuration. Then +# it guarantees that the distribution is self-contained by making another +# tarfile. +distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst + chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && am__cwd=`pwd` \ + && $(am__cd) $(distdir)/_build \ + && ../configure \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ + && cd "$$am__cwd" \ + || exit 1 + $(am__post_remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' +distuninstallcheck: + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 +distcleancheck: distclean + @if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ + exit 1 ; \ + fi + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left in build directory after distclean:" ; \ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 +check-am: all-am +check: check-recursive +all-am: Makefile config.h +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-hdr \ + distclean-libtool distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +html-am: + +info: info-recursive + +info-am: + +install-data-am: + +install-dvi: install-dvi-recursive + +install-dvi-am: + +install-exec-am: + +install-html: install-html-recursive + +install-html-am: + +install-info: install-info-recursive + +install-info-am: + +install-man: + +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf $(top_srcdir)/autom4te.cache + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: + +.MAKE: $(am__recursive_targets) all install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ + dist-tarZ dist-xz dist-zip distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +ChangeLog: $(srcdir)/ChangeLog +$(srcdir)/ChangeLog: + $(AM_V_GEN) if test -d "$(top_srcdir)/.git"; then \ + (GIT_DIR=$(top_srcdir)/.git \ + $(GIT) log $(CHANGELOG_RANGE) --stat) | fmt --split-only > $@.tmp \ + && mv -f $@.tmp "$(srcdir)/ChangeLog" \ + || ($(RM) $@.tmp; \ + echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \ + (test -f $@ || echo git-log is required to generate this file >> "$(srcdir)/$@")); \ + else \ + test -f $@ || \ + (echo A git checkout and git-log is required to generate ChangeLog >&2 && \ + echo A git checkout and git-log is required to generate this file >> "$(srcdir)/$@"); \ + fi +.PHONY: ChangeLog $(srcdir)/ChangeLog + +dist-hook: dist-clear-sticky-bits +# Clean up any sticky bits we may inherit from parent dir +dist-clear-sticky-bits: + chmod -R a-s $(distdir) +$(sha256_file): $(tar_file) + sha256sum $^ > $@ +$(gpg_file): $(sha256_file) + @echo "Please enter your GPG password to sign the checksum." + gpg --armor --sign $^ + +release-files: $(tar_file) $(sha256_file) $(gpg_file) + +-include $(top_srcdir)/git.mk + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/NEWS b/NEWS new file mode 100644 index 0000000..43a3bac --- /dev/null +++ b/NEWS @@ -0,0 +1,1581 @@ +Overview of changes leading to 1.4.2 +Monday, January 23, 2017 +==================================== + +- Implement OpenType Font Variation tables avar/fvar/HVAR/VVAR. +- hb-shape and hb-view now accept --variations. +- New API: + +hb_variation_t +hb_variation_from_string() +hb_variation_to_string() + +hb_font_set_variations() +hb_font_set_var_coords_design() +hb_font_get_var_coords_normalized() + +hb-ot-var.h: +hb_ot_var_axis_t +hb_ot_var_has_data() +hb_ot_var_get_axis_count() +hb_ot_var_get_axes() +hb_ot_var_find_axis() +hb_ot_var_normalize_variations() +hb_ot_var_normalize_coords() + +- MVAR to be implemented later. Access to named instances to be + implemented later as well. + +- Misc fixes. + + +Overview of changes leading to 1.4.1 +Thursday, January 5, 2017 +==================================== + +- Always build and use UCDN for Unicode data by default. + Reduces dependence on version of Unicode data in glib, + specially in the Windows bundles we are shipping, which + have very old glib. + + +Overview of changes leading to 1.4.0 +Thursday, January 5, 2017 +==================================== + +- Merged "OpenType GX" branch which adds core of support for + OpenType 1.8 Font Variations. To that extent, the relevant + new API is: + +New API: +hb_font_set_var_coords_normalized() + + with supporting API: + +New API: +HB_OT_LAYOUT_NO_VARIATIONS_INDEX +hb_ot_layout_table_find_feature_variations() +hb_ot_layout_feature_with_variations_get_lookups() +hb_shape_plan_create2() +hb_shape_plan_create_cached2() + + Currently variations in GSUB/GPOS/GDEF are fully supported, + and no other tables are supported. In particular, fvar/avar + are NOT supported, hence the hb_font_set_var_coords_normalized() + taking normalized coordinates. API to take design coordinates + will be added in the future. + + HVAR/VVAR/MVAR support will also be added to hb-ot-font in the + future. + +- Fix regression in GDEF glyph class processing. +- Add decompositions for Chakma, Limbu, and Balinese in USE shaper. +- Misc fixes. + + +Overview of changes leading to 1.3.4 +Monday, December 5, 2016 +==================================== + +- Fix vertical glyph origin in hb-ot-font. +- Implement CBDT/CBLC color font glyph extents in hb-ot-font. + + +Overview of changes leading to 1.3.3 +Wednesday, September 28, 2016 +==================================== + +- Implement parsing of OpenType MATH table. +New API: +HB_OT_TAG_MATH +HB_OT_MATH_SCRIPT +hb_ot_math_constant_t +hb_ot_math_kern_t +hb_ot_math_glyph_variant_t +hb_ot_math_glyph_part_flags_t +hb_ot_math_glyph_part_t +hb_ot_math_has_data +hb_ot_math_get_constant +hb_ot_math_get_glyph_italics_correction +hb_ot_math_get_glyph_top_accent_attachment +hb_ot_math_get_glyph_kerning +hb_ot_math_is_glyph_extended_shape +hb_ot_math_get_glyph_variants +hb_ot_math_get_min_connector_overlap +hb_ot_math_get_glyph_assembly + + +Overview of changes leading to 1.3.2 +Wednesday, September 27, 2016 +==================================== + +- Fix build of hb-coretext on older OS X versions. + + +Overview of changes leading to 1.3.1 +Wednesday, September 7, 2016 +==================================== + +- Blacklist bad GDEF of more fonts (Padauk). +- More CoreText backend crash fixes with OS X 10.9.5. +- Misc fixes. + + +Overview of changes leading to 1.3.0 +Thursday, July 21, 2016 +==================================== + +- Update to Unicode 9.0.0 +- Move Javanese from Indic shaper to Universal Shaping Engine. +- Allow MultipleSubst to delete a glyph (matching Windows engine). +- Update Universal Shaping Engine to latest draft from Microsoft. +- DirectWrite backend improvements. Note: this backend is for testing ONLY. +- CoreText backend improvements with unreachable fonts. +- Implement symbol fonts (cmap 3.0.0) in hb-ft and hb-ot-font. +- Blacklist bad GDEF of more fonts (Tahoma & others). +- Misc fixes. + + +Overview of changes leading to 1.2.7 +Monday, May 2, 2016 +==================================== + +- Blacklist another version of Times New Roman (Bold) Italic from Windows 7. +- Fix Mongolian Free Variation Selectors shaping with certain fonts. +- Fix Tibetan shorthand contractions shaping. +- Improved list of language tag mappings. +- Unbreak build on Windows CE. +- Make 'glyf' table loading lazy in hb-ot-font. + + +Overview of changes leading to 1.2.6 +Friday, April 8, 2016 +==================================== + +- Blacklist GDEF table of another set of Times New Roman (Bold) Italic. +- DirectWrite backend improvements. Note: DirectWrite backend is + exclusively for our internal testing and should NOT be used in any + production system whatsoever. + + +Overview of changes leading to 1.2.5 +Monday, April 4, 2016 +==================================== + +- Fix GDEF mark-filtering-set, which was broken in 1.2.3. + + +Overview of changes leading to 1.2.4 +Thursday, March 17, 2016 +==================================== + +- Synthesize GDEF glyph class for any glyph that does not have one in GDEF. + I really hope we don't discover broken fonts that shape badly with this + change. +- Misc build and other minor fixes. +- API changes: + - Added HB_NDEBUG. It's fine for production systems to define this to + disable high-overhead debugging checks. However, I also reduced the + overhead of those checks, so it's a non-issue right now. You can + forget it. Just not defining anything at all is fine. + + +Overview of changes leading to 1.2.3 +Thursday, February 25, 2016 +==================================== + +- Blacklist GDEF table of certain versions of Times New Roman (Bold) Italic, + due to bug in glyph class of ASCII double-quote character. This should + address "regression" introduced in 1.2.0 when we switched mark zeroing + in most shapers from BY_UNICODE_LATE to BY_GDEF_LATE. + This fourth release in a week should finally stablize things... + +- hb-ot-font's get_glyph() implementation saw some optimizations. Though, + might be really hard to measure in real-world situations. + +- Also, two rather small API changes: + +We now disable some time-consuming internal bookkeeping if built with NDEBUG +defined. This is a first time that we use NDEBUG to disable debug code. If +there exist production systems that do NOT want to enable NDEBUG, please let +me know and I'll add HB_NDEBUG. + +Added get_nominal_glyph() and get_variation_glyph() instead of get_glyph() + +New API: +- hb_font_get_nominal_glyph_func_t +- hb_font_get_variation_glyph_func_t +- hb_font_funcs_set_nominal_glyph_func() +- hb_font_funcs_set_variation_glyph_func() +- hb_font_get_nominal_glyph() +- hb_font_get_variation_glyph() + +Deprecated API: +- hb_font_get_glyph_func_t +- hb_font_funcs_set_glyph_func() + +Clients that implement their own font-funcs are encouraged to replace +their get_glyph() implementation with a get_nominal_glyph() and +get_variation_glyph() pair. The variation version can assume that +variation_selector argument is not zero. Old (deprecated) functions +will continue working indefinitely using internal gymnastics; it is +just more efficient to use the new functions. + + +Overview of changes leading to 1.2.2 +Wednesday, February 24, 2016 +==================================== + +- Fix regression with mark positioning with fonts that have + non-zero mark advances. This was introduced in 1.2.0 while + trying to make mark and cursive attachments to work together. + I have partially reverted that, so this version is much more + like what we had before. All clients who updated to 1.2.0 + should update to this version. + + +Overview of changes leading to 1.2.1 +Tuesday, February 23, 2016 +==================================== + +- CoreText: Fix bug with wrong scale if font scale was changed later. + https://github.com/libass/libass/issues/212 +- CoreText: Drastically speed up font initialization. +- CoreText: Fix tiny leak. +- Group ZWJ/ZWNJ with previous syllable under cluster-level=0. + https://github.com/behdad/harfbuzz/issues/217 +- Add test/shaping/README.md about how to add tests to the suite. + + +Overview of changes leading to 1.2.0 +Friday, February 19, 2016 +==================================== + +- Fix various issues (hangs mostly) in case of memory allocation failure. +- Change mark zeroing types of most shapers from BY_UNICODE_LATE to + BY_GDEF_LATE. This seems to be what Uniscribe does. +- Change mark zeroing of USE shaper from NONE to BY_GDEF_EARLY. That's + what Windows does. +- Allow GPOS cursive connection on marks, and fix the interaction with + mark attachment. This work resulted in some changes to how mark + attachments work. See: + https://github.com/behdad/harfbuzz/issues/211 + https://github.com/behdad/harfbuzz/commit/86c68c7a2c971efe8e35b1f1bd99401dc8b688d2 +- Graphite2 shaper: improved negative advance handling (eg. Nastaliq). +- Add nmake-based build system for Windows. +- Minor speedup. +- Misc. improvements. + + +Overview of changes leading to 1.1.3 +Monday, January 11, 2016 +==================================== + +- Ported Indic shaper to Unicode 8.0 data. +- Universal Shaping Engine fixes. +- Speed up CoreText shaper when font fallback happens in CoreText. +- Documentation improvements, thanks to Khaled Hosny. +- Very rough directwrite shaper for testing, thanks to Ebrahim Byagowi. +- Misc bug fixes. +- New API: + + * Font extents: + hb_font_extents_t + hb_font_get_font_extents_func_t + hb_font_get_font_h_extents_func_t + hb_font_get_font_v_extents_func_t + hb_font_funcs_set_font_h_extents_func + hb_font_funcs_set_font_v_extents_func + hb_font_get_h_extents + hb_font_get_v_extents + hb_font_get_extents_for_direction + + * Buffer message (aka debug): + hb_buffer_message_func_t + hb_buffer_set_message_func() + Actual message protocol to be fleshed out later. + + +Overview of changes leading to 1.1.2 +Wednesday, November 26, 2015 +==================================== + +- Fix badly-broken fallback shaper that affected terminology. + https://github.com/behdad/harfbuzz/issues/187 +- Fix y_scaling in Graphite shaper. +- API changes: + * An unset glyph_h_origin() function in font-funcs now (sensibly) + implies horizontal origin at 0,0. Ie, the nil callback returns + true instead of false. As such, implementations that have a + glyph_h_origin() that simply returns true, can remove that function + with HarfBuzz >= 1.1.2. This results in a tiny speedup. + + +Overview of changes leading to 1.1.1 +Wednesday, November 24, 2015 +==================================== + +- Build fixes, specially for hb-coretext. + + +Overview of changes leading to 1.1.0 +Wednesday, November 18, 2015 +==================================== + +- Implement 'stch' stretch feature for Syriac Abbreviation Mark. + https://github.com/behdad/harfbuzz/issues/141 +- Disable use of decompose_compatibility() callback. +- Implement "shaping" of various Unicode space characters, even + if the font does not support them. + https://github.com/behdad/harfbuzz/issues/153 +- If font does not support U+2011 NO-BREAK HYPHEN, fallback to + U+2010 HYPHEN. +- Changes resulting from libFuzzer continuous fuzzing: + * Reject font tables that need more than 8 edits, + * Bound buffer growth during shaping to 32x, + * Fix assertions and other issues at OOM / buffer max-growth. +- Misc fixes and optimizations. +- API changes: + * All fonts created with hb_font_create() now inherit from + (ie. have parent) hb_font_get_empty(). + + +Overview of changes leading to 1.0.6 +Thursday, October 15, 2015 +==================================== + +- Reduce max nesting level in OT lookups from 8 to 6. + Should not affect any real font as far as I know. +- Fix memory access issue in ot-font. +- Revert default load-flags of fonts created using hb_ft_font_create() + back to FT_LOAD_DEFAULT|FT_LOAD_NO_HINTING. This was changed in + last release (1.0.5), but caused major issues, so revert. + https://github.com/behdad/harfbuzz/issues/143 + + +Overview of changes leading to 1.0.5 +Tuesday, October 13, 2015 +==================================== + +- Fix multiple memory access bugs discovered using libFuzzer. + https://github.com/behdad/harfbuzz/issues/139 + Everyone should upgrade to this version as soon as possible. + We now have continuous fuzzing set up, to avoid issues like + these creeping in again. +- Misc fixes. + +- New API: + * hb_font_set_parent(). + * hb_ft_font_[sg]et_load_flags() + The default flags for fonts created using hb_ft_font_create() + has changed to default to FT_LOAD_DEFAULT now. Previously it + was defaulting to FT_LOAD_DFEAULT|FT_LOAD_NO_HINTING. + +- API changes: + * Fonts now default to units-per-EM as their scale, instead of 0. + * hb_font_create_sub_font() does NOT make parent font immutable + anymore. hb_font_make_immutable() does. + + +Overview of changes leading to 1.0.4 +Wednesday, September 30, 2015 +==================================== + +- Fix minor out-of-bounds read error. + + +Overview of changes leading to 1.0.3 +Tuesday, September 1, 2015 +==================================== + +- Start of user documentation, from Simon Cozens! +- Implement glyph_extents() for TrueType fonts in hb-ot-font. +- Improve GPOS cursive attachments with conflicting lookups. +- More fixes for cluster-level = 1. +- Uniscribe positioning fix. + + +Overview of changes leading to 1.0.2 +Wednesday, August 19, 2015 +==================================== + +- Fix shaping with cluster-level > 0. +- Fix Uniscribe backend font-size scaling. +- Declare dependencies in harfbuzz.pc. + FreeType is not declared though, to avoid bugs in pkg-config + 0.26 with recursive dependencies. +- Slightly improved debug infrastructure. More to come later. +- Misc build fixes. + + +Overview of changes leading to 1.0.1 +Monday, July 27, 2015 +==================================== + +- Fix out-of-bounds access in USE shaper. + + +Overview of changes leading to 1.0.0 +Sunday, July 26, 2015 +==================================== + +- Implement Universal Shaping Engine: + https://www.microsoft.com/typography/OpenTypeDev/USE/intro.htm + http://blogs.windows.com/bloggingwindows/2015/02/23/windows-shapes-the-worlds-languages/ +- Bump version to 1.0.0. The soname was NOT bumped. + + +Overview of changes leading to 0.9.42 +Thursday, July 26, 2015 +===================================== + +- New API to allow for retrieving finer-grained cluster + mappings if the client desires to handle them. Default + behavior is unchanged. +- Fix cluster merging when removing default-ignorables. +- Update to Unicode 8.0 +- hb-graphite2 fixes. +- Misc fixes. +- Removed HB_NO_MERGE_CLUSTERS hack. +- New API: + hb_buffer_cluster_level_t enum + hb_buffer_get_cluster_level() + hb_buffer_set_cluster_level() + hb-shape / hb-view --cluster-level + + +Overview of changes leading to 0.9.41 +Thursday, June 18, 2015 +===================================== + +- Fix hb-coretext with trailing whitespace in right-to-left. +- New API: hb_buffer_reverse_range(). +- Allow implementing atomic ops in config.h. +- Fix hb_language_t in language bindings. +- Misc fixes. + + +Overview of changes leading to 0.9.40 +Friday, March 20, 2015 +===================================== + +- Another hb-coretext crasher fix. Ouch! +- Happy Norouz! + + +Overview of changes leading to 0.9.39 +Wednesday, March 4, 2015 +===================================== + +- Critical hb-coretext fixes. +- Optimizations and refactoring; no functional change + expected. +- Misc build fixes. + + +Overview of changes leading to 0.9.38 +Friday, January 23, 2015 +===================================== + +- Fix minor out-of-bounds access in Indic shaper. +- Change New Tai Lue shaping engine from South-East Asian to default, + reflecting change in Unicode encoding model. +- Add hb-shape --font-size. Can take up to two numbers for separate + x / y size. +- Fix CoreText and FreeType scale issues with negative scales. +- Reject blobs larger than 2GB. This might break some icu-le-hb clients + that need security fixes. See: + http://www.icu-project.org/trac/ticket/11450 +- Avoid accessing font tables during face destruction, in casce rogue + clients released face data already. +- Fix up gobject-introspection a bit. Python bindings kinda working. + See README.python. +- Misc fixes. +- API additions: + hb_ft_face_create_referenced() + hb_ft_font_create_referenced() + + +Overview of changes leading to 0.9.37 +Wednesday, December 17, 2014 +===================================== + +- Fix out-of-bounds access in Context lookup format 3. +- Indic: Allow ZWJ/ZWNJ before syllable modifiers. + + +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 +===================================== + +- Fix major shape-plan caching bug when more than one shaper were + provided to hb_shape_full() (as exercised by XeTeX). + http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1246370.html +- Fix Arabic fallback shaping regression. This was broken in 0.9.32. +- Major hb-coretext fixes. That backend is complete now, including + respecing buffer direction and language, down to vertical writing. +- Build fixes for Windows CE. Should build fine now. +- Misc fixes: + Use atexit() only if it's safe to call from shared library + https://bugs.freedesktop.org/show_bug.cgi?id=82246 + Mandaic had errors in its Unicode Joining_Type + https://bugs.freedesktop.org/show_bug.cgi?id=82306 +- API changes: + + * hb_buffer_clear_contents() does not reset buffer flags now. + + After 763e5466c0a03a7c27020e1e2598e488612529a7, one doesn't + need to set flags for different pieces of text. The flags now + are something the client sets up once, depending on how it + actually uses the buffer. As such, don't clear it in + clear_contents(). + + I don't expect any changes to be needed to any existing client. + + +Overview of changes leading to 0.9.34 +Saturday, August 2, 2014 +===================================== + +- hb_feature_from_string() now accepts CSS font-feature-settings format. +- As a result, hb-shape / hb-view --features also accept CSS-style strings. + Eg, "'liga' off" is accepted now. +- Add old-spec Myanmar shaper: + https://bugs.freedesktop.org/show_bug.cgi?id=81775 +- Don't apply 'calt' in Hangul shaper. +- Fix mark advance zeroing for Hebrew shaper: + https://bugs.freedesktop.org/show_bug.cgi?id=76767 +- Implement Windows-1256 custom Arabic shaping. Only built on Windows, + and requires help from get_glyph(). Used by Firefox. + https://bugzilla.mozilla.org/show_bug.cgi?id=1045139 +- Disable 'liga' in vertical text. +- Build fixes. +- API changes: + + * Make HB_BUFFER_FLAG_BOT/EOT easier to use. + + Previously, we expected users to provide BOT/EOT flags when the + text *segment* was at paragraph boundaries. This meant that for + clients that provide full paragraph to HarfBuzz (eg. Pango), they + had code like this: + + hb_buffer_set_flags (hb_buffer, + (item_offset == 0 ? HB_BUFFER_FLAG_BOT : 0) | + (item_offset + item_length == paragraph_length ? + HB_BUFFER_FLAG_EOT : 0)); + + hb_buffer_add_utf8 (hb_buffer, + paragraph_text, paragraph_length, + item_offset, item_length); + + After this change such clients can simply say: + + hb_buffer_set_flags (hb_buffer, + HB_BUFFER_FLAG_BOT | HB_BUFFER_FLAG_EOT); + + hb_buffer_add_utf8 (hb_buffer, + paragraph_text, paragraph_length, + item_offset, item_length); + + Ie, HarfBuzz itself checks whether the segment is at the beginning/end + of the paragraph. Clients that only pass item-at-a-time to HarfBuzz + continue not setting any flags whatsoever. + + Another way to put it is: if there's pre-context text in the buffer, + HarfBuzz ignores the BOT flag. If there's post-context, it ignores + EOT flag. + + +Overview of changes leading to 0.9.33 +Tuesday, July 22, 2014 +===================================== + +- Turn off ARabic 'cswh' feature that was accidentally turned on. +- Add HB_TAG_MAX_SIGNED. +- Make hb_face_make_immutable() really make face immutable! +- Windows build fixes. + + +Overview of changes leading to 0.9.32 +Thursday, July 17, 2014 +===================================== + +- Apply Arabic shaping features in spec order exactly. +- Another fix for Mongolian free variation selectors. +- For non-Arabic scripts in Arabic shaper apply 'rlig' and 'calt' + together. +- Minor adjustment to U+FFFD logic. +- Fix hb-coretext build. + + +Overview of changes leading to 0.9.31 +Wednesday, July 16, 2014 +===================================== + +- Only accept valid UTF-8/16/32; we missed many cases before. +- Better shaping of invalid UTF-8/16/32. Falls back to + U+FFFD REPLACEMENT CHARACTER now. +- With all changes in this release, the buffer will contain fully + valid Unicode after hb_buffer_add_utf8/16/32 no matter how + broken the input is. This can be overriden though. See below. +- Fix Mongolian Variation Selectors for fonts without GDEF. +- Fix minor invalid buffer access. +- Accept zh-Hant and zh-Hans language tags. hb_ot_tag_to_language() + now uses these instead of private tags. +- Build fixes. +- New API: + * hb_buffer_add_codepoints(). This does what hb_buffer_add_utf32() + used to do, ie. no validity check on the input at all. add_utf32 + now replaces invalid Unicode codepoints with the replacement + character (see below). + * hb_buffer_set_replacement_codepoint() + * hb_buffer_get_replacement_codepoint() + Previously, in hb_buffer_add_utf8 and hb_buffer_add_utf16, when + we detected broken input, we replaced that with (hb_codepoint_t)-1. + This has changed to use U+FFFD now, but can be changed using these + new API. + + +Overview of changes leading to 0.9.30 +Wednesday, July 9, 2014 +===================================== + +- Update to Unicode 7.0.0: + * New scripts Manichaean and Psalter Pahlavi are shaped using + Arabic shaper. + * All the other new scripts to through the generic shaper for + now. +- Minor Indic improvements. +- Fix graphite2 backend cluster mapping [crasher!] +- API changes: + * New HB_SCRIPT_* values for Unicode 7.0 scripts. + * New function hb_ot_layout_language_get_required_feature(). +- Build fixes. + + +Overview of changes leading to 0.9.29 +Thursday, May 29, 2014 +===================================== + +- Implement cmap in hb-ot-font.h. No variation-selectors yet. +- Myanmar: Allow MedialYa+Asat. +- Various Indic fixes: + * Support most characters in Extended Devanagary and Vedic + Unicode blocks. + * Allow digits and a some punctuation as consonant placeholders. +- Build fixes. + + +Overview of changes leading to 0.9.28 +Monday, April 28, 2014 +===================================== + +- Unbreak old-spec Indic shaping. (bug 76705) +- Fix shaping of U+17DD and U+0FC6. +- Add HB_NO_MERGE_CLUSTERS build option. NOT to be enabled by default + for shipping libraries. It's an option for further experimentation + right now. When we are sure how to do it properly, we will add + public run-time API for the functionality. +- Build fixes. + + +Overview of changes leading to 0.9.27 +Tuesday, March 18, 2014 +===================================== + +- Don't use "register" storage class specifier +- Wrap definition of free_langs() with HAVE_ATEXIT +- Add coretext_aat shaper and hb_coretext_face_create() constructor +- If HAVE_ICU_BUILTIN is defined, use hb-icu Unicode callbacks +- Add Myanmar test case from OpenType Myanmar spec +- Only do fallback Hebrew composition if no GPOS 'mark' available +- Allow bootstrapping without gtk-doc +- Use AM_MISSING_PROG for ragel and git +- Typo in ucdn's Makefile.am +- Improve MemoryBarrier() implementation + + +Overview of changes leading to 0.9.26 +Thursday, January 30, 2014 +===================================== + +- Misc fixes. +- Fix application of 'rtlm' feature. +- Automatically apply frac/numr/dnom around U+2044 FRACTION SLASH. +- New header: hb-ot-shape.h +- Uniscribe: fix scratch-buffer accounting. +- Reorder Tai Tham SAKOT to after tone-marks. +- Add Hangul shaper. +- New files: + hb-ot-shape-complex-hangul.cc + hb-ot-shape-complex-hebrew.cc + hb-ot-shape-complex-tibetan.cc +- Disable 'cswh' feature in Arabic shaper. +- Coretext: better handle surrogate pairs. +- Add HB_TAG_MAX and _HB_SCRIPT_MAX_VALUE. + + +Overview of changes leading to 0.9.25 +Wednesday, December 4, 2013 +===================================== + +- Myanmar shaper improvements. +- Avoid font fallback in CoreText backend. +- Additional OpenType language tag mappiongs. +- More aggressive shape-plan caching. +- Build with / require automake 1.13. +- Build with libtool 2.4.2.418 alpha to support ppc64le. + + +Overview of changes leading to 0.9.24 +Tuesday, November 13, 2013 +===================================== + +- Misc compiler warning fixes with clang. +- No functional changes. + + +Overview of changes leading to 0.9.23 +Monday, October 28, 2013 +===================================== + +- "Udupi HarfBuzz Hackfest", Paris, October 14..18 2013. +- Fix (Chain)Context recursion with non-monotone lookup positions. +- Misc Indic bug fixes. +- New Javanese / Buginese shaping, similar to Windows 8.1. + + +Overview of changes leading to 0.9.22 +Thursday, October 3, 2013 +===================================== + +- Fix use-after-end-of-scope in hb_language_from_string(). +- Fix hiding of default_ignorables if font doesn't have space glyph. +- Protect against out-of-range lookup indices. + +- API Changes: + + * Added hb_ot_layout_table_get_lookup_count() + + +Overview of changes leading to 0.9.21 +Monday, September 16, 2013 +===================================== + +- Rename gobject-introspection library name from harfbuzz to HarfBuzz. +- Remove (long disabled) hb-old and hb-icu-le test shapers. +- Misc gtk-doc and gobject-introspection annotations. +- Misc fixes. +- API changes: + + * Add HB_SET_VALUE_INVALID + +Overview of changes leading to 0.9.20 +Thursday, August 29, 2013 +===================================== + +General: +- Misc substitute_closure() fixes. +- Build fixes. + +Documentation: +- gtk-doc boilerplate integrated. Docs are built now, but + contain no contents. By next release hopefully we have + some content in. Enable using --enable-gtk-doc. + +GObject and Introspection: +- Added harfbuzz-gobject library (hb-gobject.h) that has type + bindings for all HarfBuzz objects and enums. Enable using + --with-gobject. +- Added gobject-introspection boilerplate. Nothing useful + right now. Work in progress. Gets enabled automatically if + --with-gobject is used. Override with --disable-introspection. + +OpenType shaper: +- Apply 'mark' in Myanmar shaper. +- Don't apply 'dlig' by default. + +Uniscribe shaper: +- Support user features. +- Fix loading of fonts that are also installed on the system. +- Fix shaping of Arabic Presentation Forms. +- Fix build with wide chars. + +CoreText shaper: +- Support user features. + +Source changes: +- hb_face_t code moved to hb-face.h / hb-face.cc. +- Added hb-deprecated.h. + +API changes: +- Added HB_DISABLE_DEPRECATED. +- Deprecated HB_SCRIPT_CANADIAN_ABORIGINAL; replaced by + HB_SCRIPT_CANADIAN_SYLLABICS. +- Deprecated HB_BUFFER_FLAGS_DEFAULT; replaced by + HB_BUFFER_FLAG_DEFAULT. +- Deprecated HB_BUFFER_SERIALIZE_FLAGS_DEFAULT; replaced by + HB_BUFFER_SERIALIZE_FLAG_DEFAULT. + + +Overview of changes leading to 0.9.19 +Tuesday, July 16, 2013 +===================================== + +- Build fixes. +- Better handling of multiple variation selectors in a row. +- Pass on variation selector to GSUB if not consumed by cmap. +- Fix undefined memory access. +- Add Javanese config to Indic shaper. +- Misc bug fixes. + +Overview of changes leading to 0.9.18 +Tuesday, May 28, 2013 +===================================== + +New build system: + +- All unneeded code is all disabled by default, + +- Uniscribe and CoreText shapers can be enabled with their --with options, + +- icu_le and old shapers cannot be enabled for now, + +- glib, freetype, and cairo will be detected automatically. + They can be force on/off'ed with their --with options, + +- icu and graphite2 are default off, can be enabled with their --with + options, + +Moreover, ICU support is now build into a separate library: +libharfbuzz-icu.so, and a new harfbuzz-icu.pc is shipped for it. +Distros can enable ICU now without every application on earth +getting linked to via libharfbuzz.so. + +For distros I recommend that they make sure they are building --with-glib +--with-freetype --with-cairo, --with-icu, and optionally --with-graphite2; +And package harfbuzz and harfbuzz-icu separately. + + +Overview of changes leading to 0.9.17 +Monday, May 20, 2013 +===================================== + +- Build fixes. +- Fix bug in hb_set_get_min(). +- Fix regression with Arabic mark positioning / width-zeroing. + +Overview of changes leading to 0.9.16 +Friday, April 19, 2013 +===================================== + +- Major speedup in OpenType lookup processing. With the Amiri + Arabic font, this release is over 3x faster than previous + release. All scripts / languages should see this speedup. + +- New --num-iterations option for hb-shape / hb-view; useful for + profiling. + +Overview of changes leading to 0.9.15 +Friday, April 05, 2013 +===================================== + +- Build fixes. +- Fix crasher in graphite2 shaper. +- Fix Arabic mark width zeroing regression. +- Don't compose Hangul jamo into Unicode syllables. + + +Overview of changes leading to 0.9.14 +Thursday, March 21, 2013 +===================================== + +- Build fixes. +- Fix time-consuming sanitize with malicious fonts. +- Implement hb_buffer_deserialize_glyphs() for both json and text. +- Do not ignore Hangul filler characters. +- Indic fixes: + * Fix Malayalam pre-base reordering interaction with post-forms. + * Further adjust ZWJ handling. Should fix known regressions from + 0.9.13. + + +Overview of changes leading to 0.9.13 +Thursday, February 25, 2013 +===================================== + +- Build fixes. +- Ngapi HarfBuzz Hackfest in London (February 2013): + * Fixed all known Indic bugs, + * New Win8-style Myanmar shaper, + * New South-East Asian shaper for Tai Tham, Cham, and New Tai Lue, + * Smartly ignore Default_Ignorable characters (joiners, etc) wheb + matching GSUB/GPOS lookups, + * Fix 'Phags-Pa U+A872 shaping, + * Fix partial disabling of default-on features, + * Allow disabling of TrueType kerning. +- Fix possible crasher with broken fonts with overlapping tables. +- Removed generated files from git again. So, one needs ragel to + bootstrap from the git tree. + +API changes: +- hb_shape() and related APIs now abort if buffer direction is + HB_DIRECTION_INVALID. Previously, hb_shape() was calling + hb_buffer_guess_segment_properties() on the buffer before + shaping. The heuristics in that function are fragile. If the + user really wants the old behvaior, they can call that function + right before calling hb_shape() to get the old behavior. +- hb_blob_create_sub_blob() always creates sub-blob with + HB_MEMORY_MODE_READONLY. See comments for the reason. + + +Overview of changes leading to 0.9.12 +Thursday, January 18, 2013 +===================================== + +- Build fixes for Sun compiler. +- Minor bug fix. + +Overview of changes leading to 0.9.11 +Thursday, January 10, 2013 +===================================== + +- Build fixes. +- Fix GPOS mark attachment with null Anchor offsets. +- [Indic] Fix old-spec reordering of viramas if sequence ends in one. +- Fix multi-threaded shaper data creation crash. +- Add atomic ops for Solaris. + +API changes: +- Rename hb_buffer_clear() to hb_buffer_clear_contents(). + + +Overview of changes leading to 0.9.10 +Thursday, January 3, 2013 +===================================== + +- [Indic] Fixed rendering of Malayalam dot-reph +- Updated OT language tags. +- Updated graphite2 backend. +- Improved hb_ot_layout_get_size_params() logic. +- Improve hb-shape/hb-view help output. +- Fixed hb-set.h implementation to not crash. +- Fixed various issues with hb_ot_layout_collect_lookups(). +- Various build fixes. + +New API: + +hb_graphite2_face_get_gr_face() +hb_graphite2_font_get_gr_font() +hb_coretext_face_get_cg_font() + +Modified API: + +hb_ot_layout_get_size_params() + + +Overview of changes leading to 0.9.9 +Wednesday, December 5, 2012 +==================================== + +- Fix build on Windows. +- Minor improvements. + + +Overview of changes leading to 0.9.8 +Tuesday, December 4, 2012 +==================================== + + +- Actually implement hb_shape_plan_get_shaper (). +- Make UCDB data tables const. +- Lots of internal refactoring in OTLayout tables. +- Flesh out hb_ot_layout_lookup_collect_glyphs(). + +New API: + +hb_ot_layout_collect_lookups() +hb_ot_layout_get_size_params() + + +Overview of changes leading to 0.9.7 +Sunday, November 21, 2012 +==================================== + + +HarfBuzz "All-You-Can-Eat-Sushi" (aka Vancouver) Hackfest and follow-on fixes. + +- Fix Arabic contextual joining using pre-context text. +- Fix Sinhala "split matra" mess. +- Fix Khmer shaping with broken fonts. +- Implement Thai "PUA" shaping for old fonts. +- Do NOT route Kharoshthi script through the Indic shaper. +- Disable fallback positioning for Indic and Thai shapers. +- Misc fixes. + + +hb-shape / hb-view changes: + +- Add --text-before and --text-after +- Add --bot / --eot / --preserve-default-ignorables +- hb-shape --output-format=json + + +New API: + +hb_buffer_clear() + +hb_buffer_flags_t + +HB_BUFFER_FLAGS_DEFAULT +HB_BUFFER_FLAG_BOT +HB_BUFFER_FLAG_EOT +HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES + +hb_buffer_set_flags() +hb_buffer_get_flags() + +HB_BUFFER_SERIALIZE_FLAGS +hb_buffer_serialize_glyphs() +hb_buffer_deserialize_glyphs() +hb_buffer_serialize_list_formats() + +hb_set_add_range() +hb_set_del_range() +hb_set_get_population() +hb_set_next_range() + +hb_face_[sg]et_glyph_count() + +hb_segment_properties_t +HB_SEGMENT_PROPERTIES_DEFAULT +hb_segment_properties_equal() +hb_segment_properties_hash() + +hb_buffer_set_segment_properties() +hb_buffer_get_segment_properties() + +hb_ot_layout_glyph_class_t +hb_ot_layout_get_glyph_class() +hb_ot_layout_get_glyphs_in_class() + +hb_shape_plan_t +hb_shape_plan_create() +hb_shape_plan_create_cached() +hb_shape_plan_get_empty() +hb_shape_plan_reference() +hb_shape_plan_destroy() +hb_shape_plan_set_user_data() +hb_shape_plan_get_user_data() +hb_shape_plan_execute() +hb_shape_plan_get_shaper() + +hb_ot_shape_plan_collect_lookups() + + +API changes: + +- Remove "mask" parameter from hb_buffer_add(). +- Rename hb_ot_layout_would_substitute_lookup() and hb_ot_layout_substitute_closure_lookup(). +- hb-set.h API const correction. +- Renamed hb_set_min/max() to hb_set_get_min/max(). +- Rename hb_ot_layout_feature_get_lookup_indexes() to hb_ot_layout_feature_get_lookups(). +- Rename hb_buffer_guess_properties() to hb_buffer_guess_segment_properties(). + + + +Overview of changes leading to 0.9.6 +Sunday, November 13, 2012 +==================================== + +- Don't clear pre-context text if no new context is provided. +- Fix ReverseChainingSubstLookup, which was totally borked. +- Adjust output format of hb-shape a bit. +- Include config.h.in in-tree. Makes it easier for alternate build systems. +- Fix hb_buffer_set_length(buffer, 0) invalid memory allocation. +- Use ICU LayoutEngine's C API instead of C++. Avoids much headache. +- Drop glyphs for all of Unicode Default_Ignorable characters. +- Misc build fixes. + +Arabic shaper: +- Enable 'dlig' and 'mset' features in Arabic shaper. +- Implement 'Phags-pa shaping, improve Mongolian. + +Indic shaper: +- Decompose Sinhala split matras the way old HarfBuzz / Pango did. +- Initial support for Consonant Medials. +- Start adding new-style Myanmar shaping. +- Make reph and 'pref' logic introspect the font. +- Route Meetei-Mayek through the Indic shaper. +- Don't apply 'liga' in Indic shaper. +- Improve Malayalam pre-base reordering Ra interaction with Chillus. + + + +Overview of changes leading to 0.9.5 +Sunday, October 14, 2012 +==================================== + +- Synthetic-GSUB Arabic fallback shaping. + +- Misc Indic improvements. + +- Add build system support for pthread. + +- Imported UCDN for in-tree Unicode callbacks implementation. + +- Context-aware Arabic joining. + +- Misc other fixes. + +- New API: + + hb_feature_to/from-string() + hb_buffer_[sg]et_content_type() + + + +Overview of changes leading to 0.9.4 +Tuesday, Sep 03, 2012 +==================================== + +- Indic improvements with old-spec Malayalam. + +- Better fallback glyph positioning, specially with Thai / Lao marks. + +- Implement dotted-circle insertion. + +- Better Arabic fallback shaping / ligation. + +- Added ICU LayoutEngine backend for testing. Call it by the 'icu_le' name. + +- Misc fixes. + + + +Overview of changes leading to 0.9.3 +Friday, Aug 18, 2012 +==================================== + +- Fixed fallback mark positioning for left-to-right text. + +- Improve mark positioning for the remaining combining classes. + +- Unbreak Thai and fallback Arabic shaping. + +- Port Arabic shaper to shape-plan caching. + +- Use new ICU normalizer functions. + + + +Overview of changes leading to 0.9.2 +Friday, Aug 10, 2012 +==================================== + +- Over a thousand commits! This is the first major release of HarfBuzz. + +- HarfBuzz is feature-complete now! It should be in par, or better, than + both Pango's shapers and old HarfBuzz / Qt shapers. + +- New Indic shaper, supporting main Indic scripts, Sinhala, and Khmer. + +- Improved Arabic shaper, with fallback Arabic shaping, supporting Arabic, + Sinhala, N'ko, Mongolian, and Mandaic. + +- New Thai / Lao shaper. + +- Tibetan / Hangul support in the generic shaper. + +- Synthetic GDEF support for fonts without a GDEF table. + +- Fallback mark positioning for fonts without a GPOS table. + +- Unicode normalization shaping heuristic during glyph mapping. + +- New experimental Graphite2 backend. + +- New Uniscribe backend (primarily for testing). + +- New CoreText backend (primarily for testing). + +- Major optimization and speedup. + +- Test suites and testing infrastructure (work in progress). + +- Greatly improved hb-view cmdline tool. + +- hb-shape cmdline tool. + +- Unicode 6.1 support. + +Summary of API changes: + +o Changed API: + + - Users are expected to only include main header files now (ie. hb.h, + hb-glib.h, hb-ft.h, ...) + + - All struct tag names had their initial underscore removed. + Ie. "struct _hb_buffer_t" is "struct hb_buffer_t" now. + + - All set_user_data() functions now take a "replace" boolean parameter. + + - hb_buffer_create() takes zero arguments now. + Use hb_buffer_pre_allocate() to pre-allocate. + + - hb_buffer_add_utf*() now accept -1 for length parameteres, + meaning "nul-terminated". + + - hb_direction_t enum values changed. + + - All *_from_string() APIs now take a length parameter to allow for + non-nul-terminated strings. A -1 length means "nul-terminated". + + - Typedef for hb_language_t changed. + + - hb_get_table_func_t renamed to hb_reference_table_func_t. + + - hb_ot_layout_table_choose_script() + + - Various renames in hb-unicode.h. + +o New API: + + - hb_buffer_guess_properties() + Automatically called by hb_shape(). + + - hb_buffer_normalize_glyphs() + + - hb_tag_from_string() + + - hb-coretext.h + + - hb-uniscribe.h + + - hb_face_reference_blob() + - hb_face_[sg]et_index() + - hb_face_set_upem() + + - hb_font_get_glyph_name_func_t + hb_font_get_glyph_from_name_func_t + hb_font_funcs_set_glyph_name_func() + hb_font_funcs_set_glyph_from_name_func() + hb_font_get_glyph_name() + hb_font_get_glyph_from_name() + hb_font_glyph_to_string() + hb_font_glyph_from_string() + + - hb_font_set_funcs_data() + + - hb_ft_font_set_funcs() + - hb_ft_font_get_face() + + - hb-gobject.h (work in progress) + + - hb_ot_shape_glyphs_closure() + hb_ot_layout_substitute_closure_lookup() + + - hb-set.h + + - hb_shape_full() + + - hb_unicode_combining_class_t + + - hb_unicode_compose_func_t + hb_unicode_decompose_func_t + hb_unicode_decompose_compatibility_func_t + hb_unicode_funcs_set_compose_func() + hb_unicode_funcs_set_decompose_func() + hb_unicode_funcs_set_decompose_compatibility_func() + hb_unicode_compose() + hb_unicode_decompose() + hb_unicode_decompose_compatibility() + +o Removed API: + + - hb_ft_get_font_funcs() + + - hb_ot_layout_substitute_start() + hb_ot_layout_substitute_lookup() + hb_ot_layout_substitute_finish() + hb_ot_layout_position_start() + hb_ot_layout_position_lookup() + hb_ot_layout_position_finish() + + + +Overview of changes leading to 0.6.0 +Friday, May 27, 2011 +==================================== + +- Vertical text support in GPOS +- Almost all API entries have unit tests now, under test/ +- All thread-safety issues are fixed + +Summary of API changes follows. + + +* Simple Types API: + + o New API: + HB_LANGUAGE_INVALID + hb_language_get_default() + hb_direction_to_string() + hb_direction_from_string() + hb_script_get_horizontal_direction() + HB_UNTAG() + + o Renamed API: + hb_category_t renamed to hb_unicode_general_category_t + + o Changed API: + hb_language_t is a typed pointers now + + o Removed API: + HB_TAG_STR() + + +* Use ISO 15924 tags for hb_script_t: + + o New API: + hb_script_from_iso15924_tag() + hb_script_to_iso15924_tag() + hb_script_from_string() + + o Changed API: + HB_SCRIPT_* enum members changed value. + + +* Buffer API streamlined: + + o New API: + hb_buffer_reset() + hb_buffer_set_length() + hb_buffer_allocation_successful() + + o Renamed API: + hb_buffer_ensure() renamed to hb_buffer_pre_allocate() + hb_buffer_add_glyph() renamed to hb_buffer_add() + + o Removed API: + hb_buffer_clear() + hb_buffer_clear_positions() + + o Changed API: + hb_buffer_get_glyph_infos() takes an out length parameter now + hb_buffer_get_glyph_positions() takes an out length parameter now + + +* Blob API streamlined: + + o New API: + hb_blob_get_data() + hb_blob_get_data_writable() + + o Renamed API: + hb_blob_create_empty() renamed to hb_blob_get_empty() + + o Removed API: + hb_blob_lock() + hb_blob_unlock() + hb_blob_is_writable() + hb_blob_try_writable() + + o Changed API: + hb_blob_create() takes user_data before destroy now + + +* Unicode functions API: + + o Unicode function vectors can subclass other unicode function vectors now. + Unimplemented callbacks in the subclass automatically chainup to the parent. + + o All hb_unicode_funcs_t callbacks take a user_data now. Their setters + take a user_data and its respective destroy callback. + + o New API: + hb_unicode_funcs_get_empty() + hb_unicode_funcs_get_default() + hb_unicode_funcs_get_parent() + + o Changed API: + hb_unicode_funcs_create() now takes a parent_funcs. + + o Removed func getter functions: + hb_unicode_funcs_get_mirroring_func() + hb_unicode_funcs_get_general_category_func() + hb_unicode_funcs_get_script_func() + hb_unicode_funcs_get_combining_class_func() + hb_unicode_funcs_get_eastasian_width_func() + + +* Face API: + + o Renamed API: + hb_face_get_table() renamed to hb_face_reference_table() + hb_face_create_for_data() renamed to hb_face_create() + + o Changed API: + hb_face_create_for_tables() takes user_data before destroy now + hb_face_reference_table() returns empty blob instead of NULL + hb_get_table_func_t accepts the face as first parameter now + +* Font API: + + o Fonts can subclass other fonts now. Unimplemented callbacks in the + subclass automatically chainup to the parent. When chaining up, + scale is adjusted if the parent font has a different scale. + + o All hb_font_funcs_t callbacks take a user_data now. Their setters + take a user_data and its respective destroy callback. + + o New API: + hb_font_get_parent() + hb_font_funcs_get_empty() + hb_font_create_sub_font() + + o Removed API: + hb_font_funcs_copy() + hb_font_unset_funcs() + + o Removed func getter functions: + hb_font_funcs_get_glyph_func() + hb_font_funcs_get_glyph_advance_func() + hb_font_funcs_get_glyph_extents_func() + hb_font_funcs_get_contour_point_func() + hb_font_funcs_get_kerning_func() + + o Changed API: + hb_font_create() takes a face and references it now + hb_font_set_funcs() takes user_data before destroy now + hb_font_set_scale() accepts signed integers now + hb_font_get_contour_point_func_t now takes glyph first, then point_index + hb_font_get_glyph_func_t returns a success boolean now + + +* Changed object model: + + o All object types have a _get_empty() now: + hb_blob_get_empty() + hb_buffer_get_empty() + hb_face_get_empty() + hb_font_get_empty() + hb_font_funcs_get_empty() + hb_unicode_funcs_get_empty() + + o Added _set_user_data() and _get_user_data() for all object types: + hb_blob_get_user_data() + hb_blob_set_user_data() + hb_buffer_get_user_data() + hb_buffer_set_user_data() + hb_face_get_user_data() + hb_face_set_user_data() + hb_font_funcs_get_user_data() + hb_font_funcs_set_user_data() + hb_font_get_user_data() + hb_font_set_user_data() + hb_unicode_funcs_get_user_data() + hb_unicode_funcs_set_user_data() + + o Removed the _get_reference_count() from all object types: + hb_blob_get_reference_count() + hb_buffer_get_reference_count() + hb_face_get_reference_count() + hb_font_funcs_get_reference_count() + hb_font_get_reference_count() + hb_unicode_funcs_get_reference_count() + + o Added _make_immutable() and _is_immutable() for all object types except for buffer: + hb_blob_make_immutable() + hb_blob_is_immutable() + hb_face_make_immutable() + hb_face_is_immutable() + + +* Changed API for vertical text support + + o The following callbacks where removed: + hb_font_get_glyph_advance_func_t + hb_font_get_kerning_func_t + + o The following new callbacks added instead: + hb_font_get_glyph_h_advance_func_t + hb_font_get_glyph_v_advance_func_t + hb_font_get_glyph_h_origin_func_t + hb_font_get_glyph_v_origin_func_t + hb_font_get_glyph_h_kerning_func_t + hb_font_get_glyph_v_kerning_func_t + + o The following API removed as such: + hb_font_funcs_set_glyph_advance_func() + hb_font_funcs_set_kerning_func() + hb_font_get_glyph_advance() + hb_font_get_kerning() + + o New API added instead: + hb_font_funcs_set_glyph_h_advance_func() + hb_font_funcs_set_glyph_v_advance_func() + hb_font_funcs_set_glyph_h_origin_func() + hb_font_funcs_set_glyph_v_origin_func() + hb_font_funcs_set_glyph_h_kerning_func() + hb_font_funcs_set_glyph_v_kerning_func() + hb_font_get_glyph_h_advance() + hb_font_get_glyph_v_advance() + hb_font_get_glyph_h_origin() + hb_font_get_glyph_v_origin() + hb_font_get_glyph_h_kerning() + hb_font_get_glyph_v_kerning() + + o The following higher-leve API added for convenience: + hb_font_get_glyph_advance_for_direction() + hb_font_get_glyph_origin_for_direction() + hb_font_add_glyph_origin_for_direction() + hb_font_subtract_glyph_origin_for_direction() + hb_font_get_glyph_kerning_for_direction() + hb_font_get_glyph_extents_for_origin() + hb_font_get_glyph_contour_point_for_origin() + + +* OpenType Layout API: + + o New API: + hb_ot_layout_position_start() + hb_ot_layout_substitute_start() + hb_ot_layout_substitute_finish() + + +* Glue code: + + o New API: + hb_glib_script_to_script() + hb_glib_script_from_script() + hb_icu_script_to_script() + hb_icu_script_from_script() + + +* Version API added: + + o New API: + HB_VERSION_MAJOR + HB_VERSION_MINOR + HB_VERSION_MICRO + HB_VERSION_STRING + HB_VERSION_CHECK() + hb_version() + hb_version_string() + hb_version_check() + + diff --git a/README b/README new file mode 100644 index 0000000..69a1bdd --- /dev/null +++ b/README @@ -0,0 +1,12 @@ +[![Build Status](https://travis-ci.org/behdad/harfbuzz.svg)](https://travis-ci.org/behdad/harfbuzz) +[![Build Status](https://ci.appveyor.com/api/projects/status/4oaq58ns2h0m2soa?svg=true)](https://ci.appveyor.com/project/behdad/harfbuzz) +[![Coverage Status](https://img.shields.io/coveralls/behdad/harfbuzz.svg)](https://coveralls.io/r/behdad/harfbuzz) +[ABI Tracker](http://abi-laboratory.pro/tracker/timeline/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/README.python b/README.python new file mode 100644 index 0000000..cd31264 --- /dev/null +++ b/README.python @@ -0,0 +1,30 @@ +To enable HarfBuzz bindings for Python among other languages, make sure +you have latest version of gobject-introspection available. On Ubuntu, +you can install that this way: + + sudo apt-get install libgirepository1.0-dev + +And then run autogen.sh (if building from git), and then: + + ./configure --with-gobject --enable-introspection + +Make sure that gobject-introspection is enabled then in the final report. + +Compile and install. + +Make sure you have the installation lib dir in LD_LIBRARY_PATH, as needed +for the linker to find the library. + +Then make sure you also have GI_TYPELIB_PATH pointing to the resulting +$prefix/lib/girepository-* directory. + +Make sure you have pygobject installed. Then check that the following +import works in your Python interpretter: + + from gi.repository import HarfBuzz + +If it does, you are ready to call HarfBuzz from Python! Congratulations. +See src/sample.py. + +The Python API will change. Let us know on the mailing list if you are +using it, and send lots of feedback. diff --git a/THANKS b/THANKS new file mode 100644 index 0000000..940cfde --- /dev/null +++ b/THANKS @@ -0,0 +1,7 @@ +Bradley Grainger +Khaled Hosny +Kenichi Ishibashi +Ryan Lortie +Jeff Muizelaar +suzuki toshiya +Philip Withnall diff --git a/TODO b/TODO new file mode 100644 index 0000000..4f37f60 --- /dev/null +++ b/TODO @@ -0,0 +1,69 @@ +General fixes: +============= + +- AAT 'morx' implementation. + +- Return "safe-to-break" bit from shaping. + +- Implement 'rand' feature. + +- mask propagation? (when ligation, "or" the masks). + + +API issues: +=========== + +- API to accept a list of languages? + +- Add init_func to font_funcs. Adjust ft. + +- 'const' for getter APIs? (use mutable internally) + +- Remove hb_ot_shape_glyphs_closure()? + + +API additions +============= + +- Language to/from script. + +- blob_from_file? + +- Add hb-cairo glue + +- Add sanitize API (and a cached version, that saves result on blob user-data) + +- BCP 47 language handling / API (language_matches?) + +- Add hb_font_create_unscaled()? + +- Add query / enumeration API for aalt-like features? + +- SFNT api? get_num_faces? get_table_tags? (there's something in stash) + +- Add segmentation API + +- Add hb-fribidi glue? + + +hb-view / hb-shape enhancements: +=============================== + +- Add --width, --height, --auto-size, --ink-box, --align, etc? + + +Tests to write: +============== + +- ot-layout enumeration API (needs font) + +- Finish test-shape.c, grep for TODO + +- Finish test-unicode.c, grep for TODO + +- GObject, FreeType, etc + +- hb_cache_t and relatives + +- hb_feature_to/from_string +- hb_buffer_[sg]et_contents diff --git a/aclocal.m4 b/aclocal.m4 new file mode 100644 index 0000000..c0e8135 --- /dev/null +++ b/aclocal.m4 @@ -0,0 +1,1314 @@ +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. + +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) + +dnl -*- mode: autoconf -*- +dnl Copyright 2009 Johan Dahlin +dnl +dnl This file is free software; the author(s) gives unlimited +dnl permission to copy and/or distribute it, with or without +dnl modifications, as long as this notice is preserved. +dnl + +# serial 1 + +m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], +[ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([LT_INIT],[$0])dnl setup libtool first + + dnl enable/disable introspection + m4_if([$2], [require], + [dnl + enable_introspection=yes + ],[dnl + AC_ARG_ENABLE(introspection, + AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], + [Enable introspection for this build]),, + [enable_introspection=auto]) + ])dnl + + AC_MSG_CHECKING([for gobject-introspection]) + + dnl presence/version checking + AS_CASE([$enable_introspection], + [no], [dnl + found_introspection="no (disabled, use --enable-introspection to enable)" + ],dnl + [yes],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0],, + AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], + found_introspection=yes, + AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) + ],dnl + [auto],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) + dnl Canonicalize enable_introspection + enable_introspection=$found_introspection + ],dnl + [dnl + AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) + ])dnl + + AC_MSG_RESULT([$found_introspection]) + + INTROSPECTION_SCANNER= + INTROSPECTION_COMPILER= + INTROSPECTION_GENERATE= + INTROSPECTION_GIRDIR= + INTROSPECTION_TYPELIBDIR= + if test "x$found_introspection" = "xyes"; then + INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection + fi + AC_SUBST(INTROSPECTION_SCANNER) + AC_SUBST(INTROSPECTION_COMPILER) + AC_SUBST(INTROSPECTION_GENERATE) + AC_SUBST(INTROSPECTION_GIRDIR) + AC_SUBST(INTROSPECTION_TYPELIBDIR) + AC_SUBST(INTROSPECTION_CFLAGS) + AC_SUBST(INTROSPECTION_LIBS) + AC_SUBST(INTROSPECTION_MAKEFILE) + + AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") +]) + + +dnl Usage: +dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) + +AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) +]) + +dnl Usage: +dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) + + +AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) +]) + +# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.14' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.14.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.14.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + +# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_AR([ACT-IF-FAIL]) +# ------------------------- +# Try to determine the archiver interface, and trigger the ar-lib wrapper +# if it is needed. If the detection of archiver interface fails, run +# ACT-IF-FAIL (default is to abort configure with a proper error message). +AC_DEFUN([AM_PROG_AR], +[AC_BEFORE([$0], [LT_INIT])dnl +AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl +AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([ar-lib])dnl +AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false]) +: ${AR=ar} + +AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface], + [AC_LANG_PUSH([C]) + am_cv_ar_interface=ar + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])], + [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD' + AC_TRY_EVAL([am_ar_try]) + if test "$ac_status" -eq 0; then + am_cv_ar_interface=ar + else + am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&AS_MESSAGE_LOG_FD' + AC_TRY_EVAL([am_ar_try]) + if test "$ac_status" -eq 0; then + am_cv_ar_interface=lib + else + am_cv_ar_interface=unknown + fi + fi + rm -f conftest.lib libconftest.a + ]) + AC_LANG_POP([C])]) + +case $am_cv_ar_interface in +ar) + ;; +lib) + # Microsoft lib, so override with the ar-lib wrapper script. + # FIXME: It is wrong to rewrite AR. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__AR in this case, + # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something + # similar. + AR="$am_aux_dir/ar-lib $AR" + ;; +unknown) + m4_default([$1], + [AC_MSG_ERROR([could not determine $AR interface])]) + ;; +esac +AC_SUBST([AR])dnl +]) + +# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is '.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` +]) + +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + + +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl + +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) + + +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) + + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl +]) + +# Generate code to set up dependency tracking. -*- Autoconf -*- + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + + +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named 'Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running 'make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "$am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each '.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) + +# Do all the work for Automake. -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.65])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) + +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) + +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi +AC_SUBST([install_sh])]) + +# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) + +# Check to see how 'make' treats includes. -*- Autoconf -*- + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) + +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " +else + am_missing_run= + AC_MSG_WARN(['missing' script is too old or missing]) +fi +]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# -------------------- +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) + +# _AM_SET_OPTIONS(OPTIONS) +# ------------------------ +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; +esac + +# Do 'set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) + +# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor 'install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in "make install-strip", and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + +# AM_SUBST_NOTMAKE(VARIABLE) +# -------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +# +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' + +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done + rm -rf conftest.dir + + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + +m4_include([m4/ax_pthread.m4]) +m4_include([m4/gtk-doc.m4]) +m4_include([m4/libtool.m4]) +m4_include([m4/ltoptions.m4]) +m4_include([m4/ltsugar.m4]) +m4_include([m4/ltversion.m4]) +m4_include([m4/lt~obsolete.m4]) +m4_include([m4/pkg.m4]) diff --git a/ar-lib b/ar-lib new file mode 100755 index 0000000..fe2301e --- /dev/null +++ b/ar-lib @@ -0,0 +1,270 @@ +#! /bin/sh +# Wrapper for Microsoft lib.exe + +me=ar-lib +scriptversion=2012-03-01.08; # UTC + +# Copyright (C) 2010-2013 Free Software Foundation, Inc. +# Written by Peter Rosin . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + + +# func_error message +func_error () +{ + echo "$me: $1" 1>&2 + exit 1 +} + +file_conv= + +# func_file_conv build_file +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv in + mingw) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_at_file at_file operation archive +# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE +# for each of them. +# When interpreting the content of the @FILE, do NOT use func_file_conv, +# since the user would need to supply preconverted file names to +# binutils ar, at least for MinGW. +func_at_file () +{ + operation=$2 + archive=$3 + at_file_contents=`cat "$1"` + eval set x "$at_file_contents" + shift + + for member + do + $AR -NOLOGO $operation:"$member" "$archive" || exit $? + done +} + +case $1 in + '') + func_error "no command. Try '$0 --help' for more information." + ;; + -h | --h*) + cat <. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/config.guess b/config.guess new file mode 100755 index 0000000..b79252d --- /dev/null +++ b/config.guess @@ -0,0 +1,1558 @@ +#! /bin/sh +# Attempt to guess a canonical system name. +# Copyright 1992-2013 Free Software Foundation, Inc. + +timestamp='2013-06-10' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, see . +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). +# +# Originally written by Per Bothner. +# +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system \`$me' is run on. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright 1992-2013 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + +trap 'exit 1' 1 2 15 + +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. + +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ; set_cc_for_build= ;' + +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +# (ghazi@noc.rutgers.edu 1994-08-24) +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then + PATH=$PATH:/.attbin ; export PATH +fi + +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + +# Note: order is significant - the case branches are not exclusive. + +case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac + # The OS release + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; + alpha:OSF1:*:*) + case $UNAME_RELEASE in + *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix + exit ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 + exit ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 + exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos + exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos + exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; + arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp + exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi + exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 + exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) + UNAME_RELEASE=`uname -v` + ;; + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} + exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) + echo m68k-sun-sunos${UNAME_RELEASE} + ;; + sun4) + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac + exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} + exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" + # to the lowercase version "mint" (or "freemint"). Finally + # the system name "TOS" denotes a system which is actually not + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 + exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} + exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} + exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} + exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) + printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_SVR4) + printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) + printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + #endif + #endif + exit (-1); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} + exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax + exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix + exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 + exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 + exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then + echo m88k-dg-dgux${UNAME_RELEASE} + else + echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} + fi + exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 + exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 + exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd + exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix + exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + + main() + { + if (!__power_pc()) + exit(1); + puts("powerpc-ibm-aix3.2.5"); + exit(0); + } +EOF + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi + exit ;; + *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix + exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 + exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx + exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 + exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd + exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 + exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + esac ;; + esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } +EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; + esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} + exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit ;; + 3050*:HI-UX:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + int + main () + { + long cpu = sysconf (_SC_CPU_VERSION); + /* The order matters, because CPU_IS_HP_MC68K erroneously returns + true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct + results, however. */ + if (CPU_IS_PA_RISC (cpu)) + { + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; + case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; + default: puts ("hppa-hitachi-hiuxwe2"); break; + } + } + else if (CPU_IS_HP_MC68K (cpu)) + puts ("m68k-hitachi-hiuxwe2"); + else puts ("unknown-hitachi-hiuxwe2"); + exit (0); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 + exit ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd + exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd + exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf + exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf + exit ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi + exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd + exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd + exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd + exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd + exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; + *:Interix*:*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix + exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + *:GNU:*:*) + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + else + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + else + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + fi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + cris:Linux:*:*) + echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + crisv32:Linux:*:*) + echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + frv:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:Linux:*:*) + echo ${UNAME_MACHINE}-pc-linux-${LIBC} + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + or32:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-${LIBC} + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-${LIBC} + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; + esac + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-${LIBC} + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-${LIBC} + exit ;; + x86_64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + else + echo ${UNAME_MACHINE}-pc-sysv32 + fi + exit ;; + pc:*:*:*) + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp + exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; + paragon:*:*:*) + echo i860-intel-osf1 + exit ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi + exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv + exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 + exit ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} + exit ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} + exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` + echo ${UNAME_MACHINE}-sni-sysv4 + else + echo ns32k-sni-sysv + fi + exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 + exit ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} + exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then + echo mips-nec-sysv${UNAME_RELEASE} + else + echo mips-unknown-sysv${UNAME_RELEASE} + fi + exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos + exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + exit ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; + NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. + if test "$cputype" = "386"; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 + exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 + exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex + exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 + exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 + exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 + exit ;; + *:ITS:*:*) + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; +esac + +eval $set_cc_for_build +cat >$dummy.c < +# include +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (__arm) && defined (__acorn) && defined (__unix) + printf ("arm-acorn-riscix\n"); exit (0); +#endif + +#if defined (hp300) && !defined (hpux) + printf ("m68k-hp-bsd\n"); exit (0); +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); + +#endif + +#if defined (vax) +# if !defined (ultrix) +# include +# if defined (BSD) +# if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +# else +# if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# endif +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# else + printf ("vax-dec-ultrix\n"); exit (0); +# endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + +# Apollos put the system type in the environment. + +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } + +# Convex versions that predate uname can use getsysinfo(1) + +if [ -x /usr/convex/getsysinfo ] +then + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd + exit ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + c34*) + echo c34-convex-bsd + exit ;; + c38*) + echo c38-convex-bsd + exit ;; + c4*) + echo c4-convex-bsd + exit ;; + esac +fi + +cat >&2 < in order to provide the needed +information to handle your system. + +config.guess timestamp = $timestamp + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF + +exit 1 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/config.h.in b/config.h.in new file mode 100644 index 0000000..0e85859 --- /dev/null +++ b/config.h.in @@ -0,0 +1,202 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* The normal alignment of `struct{char;}', in bytes. */ +#undef ALIGNOF_STRUCT_CHAR__ + +/* Define to 1 if you have the `atexit' function. */ +#undef HAVE_ATEXIT + +/* Have cairo graphics library */ +#undef HAVE_CAIRO + +/* Have cairo-ft support in cairo graphics library */ +#undef HAVE_CAIRO_FT + +/* Have Core Text backend */ +#undef HAVE_CORETEXT + +/* Have DirectWrite library */ +#undef HAVE_DIRECTWRITE + +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_DWRITE_H + +/* Have simple TrueType Layout backend */ +#undef HAVE_FALLBACK + +/* Have fontconfig library */ +#undef HAVE_FONTCONFIG + +/* Have FreeType 2 library */ +#undef HAVE_FREETYPE + +/* Define to 1 if you have the `FT_Get_Var_Blend_Coordinates' function. */ +#undef HAVE_FT_GET_VAR_BLEND_COORDINATES + +/* Define to 1 if you have the `getpagesize' function. */ +#undef HAVE_GETPAGESIZE + +/* Have glib2 library */ +#undef HAVE_GLIB + +/* Have gobject2 library */ +#undef HAVE_GOBJECT + +/* Have Graphite2 library */ +#undef HAVE_GRAPHITE2 + +/* Have ICU library */ +#undef HAVE_ICU + +/* Use hb-icu Unicode callbacks */ +#undef HAVE_ICU_BUILTIN + +/* Have Intel __sync_* atomic primitives */ +#undef HAVE_INTEL_ATOMIC_PRIMITIVES + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the `isatty' function. */ +#undef HAVE_ISATTY + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the `mmap' function. */ +#undef HAVE_MMAP + +/* Define to 1 if you have the `mprotect' function. */ +#undef HAVE_MPROTECT + +/* Have native OpenType Layout backend */ +#undef HAVE_OT + +/* Have POSIX threads */ +#undef HAVE_PTHREAD + +/* Have PTHREAD_PRIO_INHERIT. */ +#undef HAVE_PTHREAD_PRIO_INHERIT + +/* Define to 1 if you have the header file. */ +#undef HAVE_SCHED_H + +/* Have sched_yield */ +#undef HAVE_SCHED_YIELD + +/* Have Solaris __machine_*_barrier and atomic_* operations */ +#undef HAVE_SOLARIS_ATOMIC_OPS + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the `sysconf' function. */ +#undef HAVE_SYSCONF + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_MMAN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Have UCDN Unicode functions */ +#undef HAVE_UCDN + +/* Have Uniscribe library */ +#undef HAVE_UNISCRIBE + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_USP10_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_WINDOWS_H + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to necessary symbol if this constant uses a non-standard name on + your system. */ +#undef PTHREAD_CREATE_JOINABLE + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif + + +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + +/* Number of bits in a file offset, on hosts where this is settable. */ +#undef _FILE_OFFSET_BITS + +/* Define for large files, on AIX-style hosts. */ +#undef _LARGE_FILES + +/* Define to 1 if on MINIX. */ +#undef _MINIX + +/* Define to 2 if the system does not provide POSIX.1 features except with + this defined. */ +#undef _POSIX_1_SOURCE + +/* Define to 1 if you need to in order for `stat' and other things to work. */ +#undef _POSIX_SOURCE diff --git a/config.sub b/config.sub new file mode 100755 index 0000000..9633db7 --- /dev/null +++ b/config.sub @@ -0,0 +1,1791 @@ +#! /bin/sh +# Configuration validation subroutine script. +# Copyright 1992-2013 Free Software Foundation, Inc. + +timestamp='2013-08-10' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, see . +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). + + +# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. +# If it is invalid, we print an error message on stderr and exit with code 1. +# Otherwise, we print the canonical config type on stdout and succeed. + +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + +# This file is supposed to be the same for all GNU packages +# and recognize all the CPU types, system types and aliases +# that are meaningful with *any* GNU software. +# Each package is responsible for reporting which valid configurations +# it does not support. The user should be able to distinguish +# a failure to support a valid configuration from a meaningless +# configuration. + +# The goal of this file is to map all the various variations of a given +# machine specification into a single specification in the form: +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or in some cases, the newer four-part form: +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# It is wrong to echo any other type of specification. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.sub ($timestamp) + +Copyright 1992-2013 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit ;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; +esac + +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] + then os=`echo $1 | sed 's/.*-/-/'` + else os=; fi + ;; +esac + +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. + ;; + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; + -bluegene*) + os=-cnk + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` + ;; + -windowsnt*) + os=`echo $os | sed -e 's/windowsnt/winnt/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; +esac + +# Decode aliases for certain CPU-COMPANY combinations. +case $basic_machine in + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ + | bfin \ + | c4x | c8051 | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | epiphany \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ + | ns16k | ns32k \ + | open8 \ + | or1k | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ + | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | we32k \ + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown + ;; + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; + ms1) + basic_machine=mt-unknown + ;; + + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ + | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ + | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pyramid-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ + | tron-* \ + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att + ;; + 3b*) + basic_machine=we32k-att + ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + abacus) + basic_machine=abacus-unknown + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-unknown + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aros) + basic_machine=i386-pc + os=-aros + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | j90) + basic_machine=j90-cray + os=-unicos + ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx + ;; + dpx2* | dpx2*-bull) + basic_machine=m68k-bull + os=-sysv3 + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon + ;; + elxsi) + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; + fx2800) + basic_machine=i860-alliant + ;; + genix) + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; + h3050r* | hiux*) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux + ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + basic_machine=m68000-hp + ;; + hp9k3[2-9][0-9]) + basic_machine=m68k-hp + ;; + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hppa-next) + os=-nextstep3 + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 + ;; + i*86v4*) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv4 + ;; + i*86v) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv + ;; + i*86sol2) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; + iris | iris4d) + basic_machine=mips-sgi + case $os in + -irix*) + ;; + *) + os=-irix4 + ;; + esac + ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + m88k-omron*) + basic_machine=m88k-omron + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + microblaze*) + basic_machine=microblaze-xilinx + ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; + mingw32) + basic_machine=i686-pc + os=-mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; + miniframe) + basic_machine=m68000-convergent + ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; + msys) + basic_machine=i686-pc + os=-msys + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos + ;; + news1000) + basic_machine=m68030-sony + os=-newsos + ;; + news-3600 | risc-news) + basic_machine=mips-sony + os=-newsos + ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; + next | m*-next ) + basic_machine=m68k-next + case $os in + -nextstep* ) + ;; + -ns2*) + os=-nextstep2 + ;; + *) + os=-nextstep3 + ;; + esac + ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; + np1) + basic_machine=np1-gould + ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; + pa-hitachi) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + pbd) + basic_machine=sparc-tti + ;; + pbb) + basic_machine=m68k-tti + ;; + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; + pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc + ;; + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pn) + basic_machine=pn-gould + ;; + power) basic_machine=power-ibm + ;; + ppc | ppcbe) basic_machine=powerpc-unknown + ;; + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown + ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ps2) + basic_machine=i386-ibm + ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) + basic_machine=i386-pc + os=-rdos + ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; + rm[46]00) + basic_machine=mips-siemens + ;; + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; + sequent) + basic_machine=i386-sequent + ;; + sh) + basic_machine=sh-hitachi + os=-hms + ;; + sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; + sps7) + basic_machine=m68k-bull + os=-sysv2 + ;; + spur) + basic_machine=spur-unknown + ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + sun2) + basic_machine=m68000-sun + ;; + sun2os3) + basic_machine=m68000-sun + os=-sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=-sunos4 + ;; + sun3os3) + basic_machine=m68k-sun + os=-sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=-sunos4 + ;; + sun4os3) + basic_machine=sparc-sun + os=-sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=-sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=-solaris2 + ;; + sun3 | sun3-*) + basic_machine=m68k-sun + ;; + sun4) + basic_machine=sparc-sun + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; + symmetry) + basic_machine=i386-sequent + os=-dynix + ;; + t3e) + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray + os=-unicos + ;; + tile*) + basic_machine=$basic_machine-unknown + os=-linux-gnu + ;; + tx39) + basic_machine=mipstx39-unknown + ;; + tx39el) + basic_machine=mipstx39el-unknown + ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; + udi29k) + basic_machine=a29k-amd + os=-udi + ;; + ultra3) + basic_machine=a29k-nyu + os=-sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; + vaxv) + basic_machine=vax-dec + os=-sysv + ;; + vms) + basic_machine=vax-dec + os=-vms + ;; + vpp*|vx|vx-*) + basic_machine=f301-fujitsu + ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=-vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=-vxworks + ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; + none) + basic_machine=none-none + os=-none + ;; + +# Here we handle the default manufacturer of certain CPU types. It is in +# some cases the only manufacturer, in others, it is the most popular. + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; + romp) + basic_machine=romp-ibm + ;; + mmix) + basic_machine=mmix-knuth + ;; + rs6000) + basic_machine=rs6000-ibm + ;; + vax) + basic_machine=vax-dec + ;; + pdp10) + # there are many clones, so DEC is not a safe bet + basic_machine=pdp10-unknown + ;; + pdp11) + basic_machine=pdp11-dec + ;; + we32k) + basic_machine=we32k-att + ;; + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + basic_machine=sparc-sun + ;; + cydra) + basic_machine=cydra-cydrome + ;; + orion) + basic_machine=orion-highlevel + ;; + orion105) + basic_machine=clipper-highlevel + ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; + *) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; +esac + +# Here we canonicalize certain aliases for manufacturers. +case $basic_machine in + *-digital*) + basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + ;; + *-commodore*) + basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + ;; + *) + ;; +esac + +# Decode manufacturer-specific aliases for certain operating systems. + +if [ x"$os" != x"" ] +then +case $os in + # First match some system type aliases + # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; + -solaris) + os=-solaris2 + ;; + -svr4*) + os=-sysv4 + ;; + -unixware*) + os=-sysv4.2uw + ;; + -gnu/linux*) + os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` + ;; + # First accept the basic system types. + # The portable systems comes first. + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* | -plan9* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) + case $basic_machine in + x86-* | i*86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto-qnx*) + ;; + -nto*) + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; + -sunos5*) + os=`echo $os | sed -e 's|sunos5|solaris2|'` + ;; + -sunos6*) + os=`echo $os | sed -e 's|sunos6|solaris3|'` + ;; + -opened*) + os=-openedition + ;; + -os400*) + os=-os400 + ;; + -wince*) + os=-wince + ;; + -osfrose*) + os=-osfrose + ;; + -osf*) + os=-osf + ;; + -utek*) + os=-bsd + ;; + -dynix*) + os=-bsd + ;; + -acis*) + os=-aos + ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; + -386bsd) + os=-bsd + ;; + -ctix* | -uts*) + os=-sysv + ;; + -nova*) + os=-rtmk-nova + ;; + -ns2 ) + os=-nextstep2 + ;; + -nsk*) + os=-nsk + ;; + # Preserve the version number of sinix5. + -sinix5.*) + os=`echo $os | sed -e 's|sinix|sysv|'` + ;; + -sinix*) + os=-sysv4 + ;; + -tpf*) + os=-tpf + ;; + -triton*) + os=-sysv3 + ;; + -oss*) + os=-sysv3 + ;; + -svr4) + os=-sysv4 + ;; + -svr3) + os=-sysv3 + ;; + -sysvr4) + os=-sysv4 + ;; + # This must come after -sysvr4. + -sysv*) + ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; + -xenix) + os=-xenix + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -zvmoe) + os=-zvmoe + ;; + -dicos*) + os=-dicos + ;; + -nacl*) + ;; + -none) + ;; + *) + # Get rid of the `-' at the beginning of $os. + os=`echo $os | sed 's/[^-]*-//'` + echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + exit 1 + ;; +esac +else + +# Here we handle the default operating systems that come with various machines. +# The value should be what the vendor currently ships out the door with their +# machine or put another way, the most popular os provided with the machine. + +# Note that if you're going to try to match "-MANUFACTURER" here (say, +# "-sun"), then you have to tell the case statement up towards the top +# that MANUFACTURER isn't an operating system. Otherwise, code above +# will signal an error saying that MANUFACTURER isn't an operating +# system, and we'll never get to this point. + +case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; + *-acorn) + os=-riscix1.2 + ;; + arm*-rebel) + os=-linux + ;; + arm*-semi) + os=-aout + ;; + c4x-* | tic4x-*) + os=-coff + ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 + ;; + pdp11-*) + os=-none + ;; + *-dec | vax-*) + os=-ultrix4.2 + ;; + m68*-apollo) + os=-domain + ;; + i386-sun) + os=-sunos4.0.2 + ;; + m68000-sun) + os=-sunos3 + ;; + m68*-cisco) + os=-aout + ;; + mep-*) + os=-elf + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; + or1k-*) + os=-elf + ;; + or32-*) + os=-coff + ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; + sparc-* | *-sun) + os=-sunos4.1.1 + ;; + *-be) + os=-beos + ;; + *-haiku) + os=-haiku + ;; + *-ibm) + os=-aix + ;; + *-knuth) + os=-mmixware + ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; + *-hp) + os=-hpux + ;; + *-hitachi) + os=-hiux + ;; + i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) + os=-sysv + ;; + *-cbm) + os=-amigaos + ;; + *-dg) + os=-dgux + ;; + *-dolphin) + os=-sysv3 + ;; + m68k-ccur) + os=-rtu + ;; + m88k-omron*) + os=-luna + ;; + *-next ) + os=-nextstep + ;; + *-sequent) + os=-ptx + ;; + *-crds) + os=-unos + ;; + *-ns) + os=-genix + ;; + i370-*) + os=-mvs + ;; + *-next) + os=-nextstep3 + ;; + *-gould) + os=-sysv + ;; + *-highlevel) + os=-bsd + ;; + *-encore) + os=-bsd + ;; + *-sgi) + os=-irix + ;; + *-siemens) + os=-sysv4 + ;; + *-masscomp) + os=-rtu + ;; + f30[01]-fujitsu | f700-fujitsu) + os=-uxpv + ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; + *) + os=-none + ;; +esac +fi + +# Here we handle the case where we know the os, and the CPU type, but not the +# manufacturer. We pick the logical manufacturer. +vendor=unknown +case $basic_machine in + *-unknown) + case $os in + -riscix*) + vendor=acorn + ;; + -sunos*) + vendor=sun + ;; + -cnk*|-aix*) + vendor=ibm + ;; + -beos*) + vendor=be + ;; + -hpux*) + vendor=hp + ;; + -mpeix*) + vendor=hp + ;; + -hiux*) + vendor=hitachi + ;; + -unos*) + vendor=crds + ;; + -dgux*) + vendor=dg + ;; + -luna*) + vendor=omron + ;; + -genix*) + vendor=ns + ;; + -mvs* | -opened*) + vendor=ibm + ;; + -os400*) + vendor=ibm + ;; + -ptx*) + vendor=sequent + ;; + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; + -aux*) + vendor=apple + ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + vendor=atari + ;; + -vos*) + vendor=stratus + ;; + esac + basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + ;; +esac + +echo $basic_machine$os +exit + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/configure b/configure new file mode 100755 index 0000000..4652c02 --- /dev/null +++ b/configure @@ -0,0 +1,22344 @@ +#! /bin/sh +# Guess values for system-dependent variables and create Makefiles. +# Generated by GNU Autoconf 2.69 for HarfBuzz 1.4.2. +# +# Report bugs to . +# +# +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# +# +# This configure script is free software; the Free Software Foundation +# gives unlimited permission to copy, distribute and modify it. +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi + + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} +if test "x$CONFIG_SHELL" = x; then + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } + +exitcode=0 +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 + + test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ + || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes +else + as_have_required=no +fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + as_found=: + case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi + done;; + esac + as_found=false +done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } +IFS=$as_save_IFS + + + if test "x$CONFIG_SHELL" != x; then : + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 +fi + + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org and +$0: https://github.com/behdad/harfbuzz/issues/new about +$0: your system, including any error possibly output before +$0: this message. Then install a modern shell, or manually +$0: run the script under such a shell if you do have one." + fi + exit 1 +fi +fi +fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS + +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + + + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +as_test_x='test -x' +as_executable_p=as_fn_executable_p + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + +SHELL=${CONFIG_SHELL-/bin/sh} + + +test -n "$DJDIR" || exec 7<&0 &1 + +# Name of the host. +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, +# so uname gets run too. +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +# +# Initializations. +# +ac_default_prefix=/usr/local +ac_clean_files= +ac_config_libobj_dir=. +LIBOBJS= +cross_compiling=no +subdirs= +MFLAGS= +MAKEFLAGS= + +# Identity of this package. +PACKAGE_NAME='HarfBuzz' +PACKAGE_TARNAME='harfbuzz' +PACKAGE_VERSION='1.4.2' +PACKAGE_STRING='HarfBuzz 1.4.2' +PACKAGE_BUGREPORT='https://github.com/behdad/harfbuzz/issues/new' +PACKAGE_URL='http://harfbuzz.org/' + +ac_unique_file="src/harfbuzz.pc.in" +# Factoring default headers for most tests. +ac_includes_default="\ +#include +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif +#ifdef STDC_HEADERS +# include +# include +#else +# ifdef HAVE_STDLIB_H +# include +# endif +#endif +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H +# include +# endif +# include +#endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_INTTYPES_H +# include +#endif +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_UNISTD_H +# include +#endif" + +ac_subst_vars='am__EXEEXT_FALSE +am__EXEEXT_TRUE +LTLIBOBJS +LIBOBJS +HAVE_CORETEXT_FALSE +HAVE_CORETEXT_TRUE +CORETEXT_LIBS +CORETEXT_CFLAGS +HAVE_DIRECTWRITE_FALSE +HAVE_DIRECTWRITE_TRUE +DIRECTWRITE_LIBS +DIRECTWRITE_CXXFLAGS +HAVE_UNISCRIBE_FALSE +HAVE_UNISCRIBE_TRUE +UNISCRIBE_LIBS +UNISCRIBE_CFLAGS +HAVE_FREETYPE_FALSE +HAVE_FREETYPE_TRUE +FREETYPE_LIBS +FREETYPE_CFLAGS +FREETYPE_DEPS +HAVE_GRAPHITE2_FALSE +HAVE_GRAPHITE2_TRUE +GRAPHITE2_LIBS +GRAPHITE2_CFLAGS +GRAPHITE2_DEPS +HAVE_UCDN_FALSE +HAVE_UCDN_TRUE +HAVE_ICU_BUILTIN_FALSE +HAVE_ICU_BUILTIN_TRUE +HAVE_ICU_FALSE +HAVE_ICU_TRUE +ICU_CONFIG +ICU_LIBS +ICU_CFLAGS +HAVE_FONTCONFIG_FALSE +HAVE_FONTCONFIG_TRUE +FONTCONFIG_LIBS +FONTCONFIG_CFLAGS +HAVE_CAIRO_FT_FALSE +HAVE_CAIRO_FT_TRUE +CAIRO_FT_LIBS +CAIRO_FT_CFLAGS +HAVE_CAIRO_FALSE +HAVE_CAIRO_TRUE +CAIRO_LIBS +CAIRO_CFLAGS +HAVE_INTROSPECTION_FALSE +HAVE_INTROSPECTION_TRUE +INTROSPECTION_MAKEFILE +INTROSPECTION_LIBS +INTROSPECTION_CFLAGS +INTROSPECTION_TYPELIBDIR +INTROSPECTION_GIRDIR +INTROSPECTION_GENERATE +INTROSPECTION_COMPILER +INTROSPECTION_SCANNER +HAVE_GOBJECT_FALSE +HAVE_GOBJECT_TRUE +GLIB_MKENUMS +GOBJECT_LIBS +GOBJECT_CFLAGS +HAVE_GLIB_FALSE +HAVE_GLIB_TRUE +GLIB_LIBS +GLIB_CFLAGS +GLIB_DEPS +HAVE_FALLBACK_FALSE +HAVE_FALLBACK_TRUE +HAVE_OT_FALSE +HAVE_OT_TRUE +HAVE_PTHREAD_FALSE +HAVE_PTHREAD_TRUE +PTHREAD_CFLAGS +PTHREAD_LIBS +PTHREAD_CC +ax_pthread_config +OS_WIN32_FALSE +OS_WIN32_TRUE +HAVE_GCC_FALSE +HAVE_GCC_TRUE +GTK_DOC_USE_REBASE_FALSE +GTK_DOC_USE_REBASE_TRUE +GTK_DOC_USE_LIBTOOL_FALSE +GTK_DOC_USE_LIBTOOL_TRUE +GTK_DOC_BUILD_PDF_FALSE +GTK_DOC_BUILD_PDF_TRUE +GTK_DOC_BUILD_HTML_FALSE +GTK_DOC_BUILD_HTML_TRUE +ENABLE_GTK_DOC_FALSE +ENABLE_GTK_DOC_TRUE +HAVE_GTK_DOC_FALSE +HAVE_GTK_DOC_TRUE +GTKDOC_DEPS_LIBS +GTKDOC_DEPS_CFLAGS +HTML_DIR +GTKDOC_MKPDF +GTKDOC_REBASE +GTKDOC_CHECK_PATH +GTKDOC_CHECK +HB_LIBTOOL_VERSION_INFO +HB_VERSION +HB_VERSION_MICRO +HB_VERSION_MINOR +HB_VERSION_MAJOR +GIT +RAGEL +PKG_CONFIG +CXXCPP +am__fastdepCXX_FALSE +am__fastdepCXX_TRUE +CXXDEPMODE +ac_ct_CXX +CXXFLAGS +CXX +CPP +OTOOL64 +OTOOL +LIPO +NMEDIT +DSYMUTIL +MANIFEST_TOOL +RANLIB +DLLTOOL +OBJDUMP +LN_S +NM +ac_ct_DUMPBIN +DUMPBIN +LD +FGREP +EGREP +GREP +SED +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build +LIBTOOL +am__fastdepCC_FALSE +am__fastdepCC_TRUE +CCDEPMODE +am__nodep +AMDEPBACKSLASH +AMDEP_FALSE +AMDEP_TRUE +am__quote +am__include +DEPDIR +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +ac_ct_AR +AR +AUTOMAKE_OLDER_THAN_1_13_FALSE +AUTOMAKE_OLDER_THAN_1_13_TRUE +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V +am__untar +am__tar +AMTAR +am__leading_dot +SET_MAKE +AWK +mkdir_p +MKDIR_P +INSTALL_STRIP_PROGRAM +STRIP +install_sh +MAKEINFO +AUTOHEADER +AUTOMAKE +AUTOCONF +ACLOCAL +VERSION +PACKAGE +CYGPATH_W +am__isrc +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_URL +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' +ac_subst_files='' +ac_user_opts=' +enable_option_checking +enable_silent_rules +enable_dependency_tracking +enable_static +enable_shared +with_pic +enable_fast_install +with_gnu_ld +with_sysroot +enable_libtool_lock +enable_largefile +with_html_dir +enable_gtk_doc +enable_gtk_doc_html +enable_gtk_doc_pdf +with_glib +with_gobject +enable_introspection +with_cairo +with_fontconfig +with_icu +with_ucdn +with_graphite2 +with_freetype +with_uniscribe +with_directwrite +with_coretext +' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS +CPP +CXX +CXXFLAGS +CCC +CXXCPP +PKG_CONFIG +GTKDOC_DEPS_CFLAGS +GTKDOC_DEPS_LIBS +GLIB_CFLAGS +GLIB_LIBS +GOBJECT_CFLAGS +GOBJECT_LIBS +CAIRO_CFLAGS +CAIRO_LIBS +CAIRO_FT_CFLAGS +CAIRO_FT_LIBS +FONTCONFIG_CFLAGS +FONTCONFIG_LIBS +ICU_CFLAGS +ICU_LIBS +GRAPHITE2_CFLAGS +GRAPHITE2_LIBS +FREETYPE_CFLAGS +FREETYPE_LIBS' + + +# Initialize some variables set by options. +ac_init_help= +ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= +# The variables have the same names as the options, with +# dashes changed to underlines. +cache_file=/dev/null +exec_prefix=NONE +no_create= +no_recursion= +prefix=NONE +program_prefix=NONE +program_suffix=NONE +program_transform_name=s,x,x, +silent= +site= +srcdir= +verbose= +x_includes=NONE +x_libraries=NONE + +# Installation directory options. +# These are left unexpanded so users can "make install exec_prefix=/foo" +# and all the variables that are supposed to be based on exec_prefix +# by default will actually change. +# Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datarootdir='${prefix}/share' +datadir='${datarootdir}' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +includedir='${prefix}/include' +oldincludedir='/usr/include' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' + +ac_prev= +ac_dashdash= +for ac_option +do + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval $ac_prev=\$ac_option + ac_prev= + continue + fi + + case $ac_option in + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. + + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir=$ac_optarg ;; + + -build | --build | --buil | --bui | --bu) + ac_prev=build_alias ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) + build_alias=$ac_optarg ;; + + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + cache_file=$ac_optarg ;; + + --config-cache | -C) + cache_file=config.cache ;; + + -datadir | --datadir | --datadi | --datad) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=*) + datadir=$ac_optarg ;; + + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + + -disable-* | --disable-*) + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; + + -enable-* | --enable-*) + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ + | --exec | --exe | --ex) + ac_prev=exec_prefix ;; + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) + exec_prefix=$ac_optarg ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + + -help | --help | --hel | --he | -h) + ac_init_help=long ;; + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) + ac_init_help=recursive ;; + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) + ac_init_help=short ;; + + -host | --host | --hos | --ho) + ac_prev=host_alias ;; + -host=* | --host=* | --hos=* | --ho=*) + host_alias=$ac_optarg ;; + + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir=$ac_optarg ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir=$ac_optarg ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir=$ac_optarg ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir=$ac_optarg ;; + + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst | --locals) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + localstatedir=$ac_optarg ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir=$ac_optarg ;; + + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c | -n) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + no_recursion=yes ;; + + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir=$ac_optarg ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix=$ac_optarg ;; + + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) + program_prefix=$ac_optarg ;; + + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) + program_suffix=$ac_optarg ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ + | --program-transform-n | --program-transform- \ + | --program-transform | --program-transfor \ + | --program-transfo | --program-transf \ + | --program-trans | --program-tran \ + | --progr-tra | --program-tr | --program-t) + ac_prev=program_transform_name ;; + -program-transform-name=* | --program-transform-name=* \ + | --program-transform-nam=* | --program-transform-na=* \ + | --program-transform-n=* | --program-transform-=* \ + | --program-transform=* | --program-transfor=* \ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name=$ac_optarg ;; + + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir=$ac_optarg ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir=$ac_optarg ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) + site=$ac_optarg ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + srcdir=$ac_optarg ;; + + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir=$ac_optarg ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) + ac_prev=target_alias ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) + target_alias=$ac_optarg ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; + + -with-* | --with-*) + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; + + -without-* | --without-*) + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; + + --x) + # Obsolete; use --with-x. + with_x=yes ;; + + -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ + | --x-incl | --x-inc | --x-in | --x-i) + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) + x_includes=$ac_optarg ;; + + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + ;; + + esac +done + +if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` + as_fn_error $? "missing argument to $ac_option" +fi + +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac +fi + +# Check all directory arguments for consistency. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir +do + eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" +done + +# There might be people who depend on the old broken behavior: `$host' +# used to hold the argument of --host etc. +# FIXME: To remove some day. +build=$build_alias +host=$host_alias +target=$target_alias + +# FIXME: To remove some day. +if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +fi + +ac_tool_prefix= +test -n "$host_alias" && ac_tool_prefix=$host_alias- + +test "$silent" = yes && exec 6>/dev/null + + +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + as_fn_error $? "working directory cannot be determined" +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + as_fn_error $? "pwd does not report name of working directory" + + +# Find the source files, if location was not specified. +if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + srcdir=$ac_confdir + if test ! -r "$srcdir/$ac_unique_file"; then + srcdir=.. + fi +else + ac_srcdir_defaulted=no +fi +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" +fi +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done + +# +# Report the --help message. +# +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 1.4.2 to adapt to many kinds of systems. + +Usage: $0 [OPTION]... [VAR=VALUE]... + +To assign environment variables (e.g., CC, CFLAGS...), specify them as +VAR=VALUE. See below for descriptions of some of the useful variables. + +Defaults for the options are specified in brackets. + +Configuration: + -h, --help display this help and exit + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit + -q, --quiet, --silent do not print \`checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or \`..'] + +Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] + +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. + +For better control, use the options below. + +Fine tuning of the installation directories: + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/harfbuzz] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] +_ACEOF + + cat <<\_ACEOF + +Program names: + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM run sed PROGRAM on installed program names + +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST cross-compile to build programs to run on HOST [BUILD] +_ACEOF +fi + +if test -n "$ac_init_help"; then + case $ac_init_help in + short | recursive ) echo "Configuration of HarfBuzz 1.4.2:";; + esac + cat <<\_ACEOF + +Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build + --enable-static[=PKGS] build static libraries [default=no] + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-fast-install[=PKGS] + optimize for fast installation [default=yes] + --disable-libtool-lock avoid locking (might break parallel builds) + --disable-largefile omit support for large files + --enable-gtk-doc use gtk-doc to build documentation [[default=no]] + --enable-gtk-doc-html build documentation in html format [[default=yes]] + --enable-gtk-doc-pdf build documentation in pdf format [[default=no]] + --enable-introspection=[no/auto/yes] + Enable introspection for this build + +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). + --with-html-dir=PATH path to installed docs + --with-glib=[yes/no/auto] + Use glib [default=auto] + --with-gobject=[yes/no/auto] + Use gobject [default=auto] + --with-cairo=[yes/no/auto] + Use cairo [default=auto] + --with-fontconfig=[yes/no/auto] + Use fontconfig [default=auto] + --with-icu=[yes/no/builtin/auto] + Use ICU [default=auto] + --with-ucdn=[yes/no] Use builtin UCDN library [default=yes] + --with-graphite2=[yes/no/auto] + Use the graphite2 library [default=no] + --with-freetype=[yes/no/auto] + Use the FreeType library [default=auto] + --with-uniscribe=[yes/no/auto] + Use the Uniscribe library [default=no] + --with-directwrite=[yes/no/auto] + Use the DirectWrite library (experimental) + [default=no] + --with-coretext=[yes/no/auto] + Use CoreText [default=no] + +Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CPP C preprocessor + CXX C++ compiler command + CXXFLAGS C++ compiler flags + CXXCPP C++ preprocessor + PKG_CONFIG path to pkg-config utility + GTKDOC_DEPS_CFLAGS + C compiler flags for GTKDOC_DEPS, overriding pkg-config + GTKDOC_DEPS_LIBS + linker flags for GTKDOC_DEPS, overriding pkg-config + GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config + GLIB_LIBS linker flags for GLIB, overriding pkg-config + GOBJECT_CFLAGS + C compiler flags for GOBJECT, overriding pkg-config + GOBJECT_LIBS + linker flags for GOBJECT, overriding pkg-config + CAIRO_CFLAGS + C compiler flags for CAIRO, overriding pkg-config + CAIRO_LIBS linker flags for CAIRO, overriding pkg-config + CAIRO_FT_CFLAGS + C compiler flags for CAIRO_FT, overriding pkg-config + CAIRO_FT_LIBS + linker flags for CAIRO_FT, overriding pkg-config + FONTCONFIG_CFLAGS + C compiler flags for FONTCONFIG, overriding pkg-config + FONTCONFIG_LIBS + linker flags for FONTCONFIG, overriding pkg-config + ICU_CFLAGS C compiler flags for ICU, overriding pkg-config + ICU_LIBS linker flags for ICU, overriding pkg-config + GRAPHITE2_CFLAGS + C compiler flags for GRAPHITE2, overriding pkg-config + GRAPHITE2_LIBS + linker flags for GRAPHITE2, overriding pkg-config + FREETYPE_CFLAGS + C compiler flags for FREETYPE, overriding pkg-config + FREETYPE_LIBS + linker flags for FREETYPE, overriding pkg-config + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + +Report bugs to . +HarfBuzz home page: . +_ACEOF +ac_status=$? +fi + +if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +fi + +test -n "$ac_init_help" && exit $ac_status +if $ac_init_version; then + cat <<\_ACEOF +HarfBuzz configure 1.4.2 +generated by GNU Autoconf 2.69 + +Copyright (C) 2012 Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. +_ACEOF + exit +fi + +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_compile + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + test -x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_func + +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if eval \${$3+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.i conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +( $as_echo "## ------------------------------------------------------------ ## +## Report this to https://github.com/behdad/harfbuzz/issues/new ## +## ------------------------------------------------------------ ##" + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_mongrel + +# ac_fn_cxx_try_compile LINENO +# ---------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_compile + +# ac_fn_cxx_try_cpp LINENO +# ------------------------ +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_cpp + +# ac_fn_cxx_try_link LINENO +# ------------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + test -x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_link + +# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES +# -------------------------------------------- +# Tries to find the compile-time value of EXPR in a program that includes +# INCLUDES, setting VAR accordingly. Returns whether the value could be +# computed +ac_fn_c_compute_int () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) >= 0)]; +test_array [0] = 0; +return test_array [0]; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=0 ac_mid=0 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0; +return test_array [0]; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid; break +else + as_fn_arith $ac_mid + 1 && ac_lo=$as_val + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) < 0)]; +test_array [0] = 0; +return test_array [0]; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=-1 ac_mid=-1 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) >= $ac_mid)]; +test_array [0] = 0; +return test_array [0]; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=$ac_mid; break +else + as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + ac_lo= ac_hi= +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0; +return test_array [0]; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid +else + as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in #(( +?*) eval "$3=\$ac_lo"; ac_retval=0 ;; +'') ac_retval=1 ;; +esac + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +static long int longval () { return $2; } +static unsigned long int ulongval () { return $2; } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (($2) < 0) + { + long int i = longval (); + if (i != ($2)) + return 1; + fprintf (f, "%ld", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ($2)) + return 1; + fprintf (f, "%lu", i); + } + /* Do not output a trailing newline, as this causes \r\n confusion + on some platforms. */ + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + echo >>conftest.val; read $3 &5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.i conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +( $as_echo "## ------------------------------------------------------------ ## +## Report this to https://github.com/behdad/harfbuzz/issues/new ## +## ------------------------------------------------------------ ##" + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_cxx_check_header_mongrel + +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES +# ------------------------------------------- +# Tests whether TYPE exists after having included INCLUDES, setting cache +# variable VAR accordingly. +ac_fn_c_check_type () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof ($2)) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof (($2))) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + eval "$3=yes" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_type +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 $as_me 1.4.2, which was +generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ + +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## + +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + +_ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" + done +IFS=$as_save_IFS + +} >&5 + +cat >&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF + + +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. +# Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. +ac_configure_args= +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 +do + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) + as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done +done +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} + +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo + + $as_echo "## ---------------- ## +## Cache variables. ## +## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + (set) 2>&1 | + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + sed -n \ + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( + *) + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) + echo + + $as_echo "## ----------------- ## +## Output variables. ## +## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then + $as_echo "## ------------------- ## +## File substitutions. ## +## ------------------- ##" + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then + $as_echo "## ----------- ## +## confdefs.h. ## +## ----------- ##" + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal +done +ac_signal=0 + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h + +$as_echo "/* confdefs.h */" > confdefs.h + +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + + +# Let the site file select an alternate cache file if it wants to. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE +if test -n "$CONFIG_SITE"; then + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac +elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +else + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site +fi +for ac_site_file in "$ac_site_file1" "$ac_site_file2" +do + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } + fi +done + +if test -r "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file +fi + +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + +ac_config_headers="$ac_config_headers config.h" + + +am__api_version='1.14' + +ac_aux_dir= +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi +done +if test -z "$ac_aux_dir"; then + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 +fi + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } +if test -z "$INSTALL"; then +if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi + done + done + ;; +esac + + done +IFS=$as_save_IFS + +rm -rf conftest.one conftest.two conftest.dir + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; +esac +case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; +esac + +# Do 'set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$2" = conftest.file + ) +then + # Ok. + : +else + as_fn_error $? "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + +test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" +# Use a double $ so make ignores it. +test "$program_suffix" != NONE && + program_transform_name="s&\$&$program_suffix&;$program_transform_name" +# Double any \ or $. +# By default was `s,x,x', remove it if useless. +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` + +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` + +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " +else + am_missing_run= + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} +fi + +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi + +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the 'STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } +if test -z "$MKDIR_P"; then + if ${ac_cv_path_mkdir+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done + done +IFS=$as_save_IFS + +fi + + test -d ./--version && rmdir ./--version + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + MKDIR_P="$ac_install_sh -d" + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } + +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AWK" && break +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat >conftest.make <<\_ACEOF +SHELL = /bin/sh +all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +_ACEOF +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac +rm -f conftest.make +fi +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + SET_MAKE= +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" +fi + +rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null + +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi + + +# Define the identity of the package. + PACKAGE='harfbuzz' + VERSION='1.4.2' + + +# Some tools Automake needs. + +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} + + +AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + + +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} + + +AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + + +MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' + + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar plaintar pax cpio none' + +# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5 +$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; } + if test $am_uid -le $am_max_uid; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + _am_tools=none + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5 +$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; } + if test $am_gid -le $am_max_gid; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + _am_tools=none + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 +$as_echo_n "checking how to create a ustar tar archive... " >&6; } + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_ustar-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + { echo "$as_me:$LINENO: $_am_tar --version" >&5 + ($_am_tar --version) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && break + done + am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x ustar -w "$$tardir"' + am__tar_='pax -L -x ustar -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H ustar -L' + am__tar_='find "$tardir" -print | cpio -o -H ustar -L' + am__untar='cpio -i -H ustar -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_ustar}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 + (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + rm -rf conftest.dir + if test -s conftest.tar; then + { echo "$as_me:$LINENO: $am__untar &5 + ($am__untar &5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + { echo "$as_me:$LINENO: cat conftest.dir/file" >&5 + (cat conftest.dir/file) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi + done + rm -rf conftest.dir + + if ${am_cv_prog_tar_ustar+:} false; then : + $as_echo_n "(cached) " >&6 +else + am_cv_prog_tar_ustar=$_am_tool +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 +$as_echo "$am_cv_prog_tar_ustar" >&6; } + + + + + + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + if test $am__api_version = 1.11 -o $am__api_version = 1.12; then + AUTOMAKE_OLDER_THAN_1_13_TRUE= + AUTOMAKE_OLDER_THAN_1_13_FALSE='#' +else + AUTOMAKE_OLDER_THAN_1_13_TRUE='#' + AUTOMAKE_OLDER_THAN_1_13_FALSE= +fi + +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=0;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + + +# Initialize libtool +DEPDIR="${am__leading_dot}deps" + +ac_config_commands="$ac_config_commands depfiles" + + +am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 +$as_echo_n "checking for style of include used by $am_make... " >&6; } +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } +rm -f confinc confmf + +# Check whether --enable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; +fi + +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' +else + AMDEP_TRUE='#' + AMDEP_FALSE= +fi + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + fi +fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi + + +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } + +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +# Try to create an executable without -o first, disregard a.out. +# It will help us diagnose broken compilers, and finding out an intuition +# of exeext. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { { ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' +do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; + * ) + break;; + esac +done +test "$ac_cv_exeext" = no && ac_cv_exeext= + +else + ac_file='' +fi +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } +ac_exeext=$ac_cv_exeext + +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac +done +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } + +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if ${ac_cv_objext+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest.$ac_cv_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +else + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +else + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : + +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +depcc="$CC" am_compiler_list= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi + + + +if test -n "$ac_tool_prefix"; then + for ac_prog in ar lib "link -lib" + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AR" && break + done +fi +if test -z "$AR"; then + ac_ct_AR=$AR + for ac_prog in ar lib "link -lib" +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_AR" && break +done + + if test "x$ac_ct_AR" = x; then + AR="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi +fi + +: ${AR=ar} + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5 +$as_echo_n "checking the archiver ($AR) interface... " >&6; } +if ${am_cv_ar_interface+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + am_cv_ar_interface=ar + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int some_variable = 0; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5 + (eval $am_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + am_cv_ar_interface=ar + else + am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5 + (eval $am_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + am_cv_ar_interface=lib + else + am_cv_ar_interface=unknown + fi + fi + rm -f conftest.lib libconftest.a + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5 +$as_echo "$am_cv_ar_interface" >&6; } + +case $am_cv_ar_interface in +ar) + ;; +lib) + # Microsoft lib, so override with the ar-lib wrapper script. + # FIXME: It is wrong to rewrite AR. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__AR in this case, + # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something + # similar. + AR="$am_aux_dir/ar-lib $AR" + ;; +unknown) + as_fn_error $? "could not determine $AR interface" "$LINENO" 5 + ;; +esac + + +case `pwd` in + *\ * | *\ *) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; +esac + + + +macro_version='2.4.2' +macro_revision='1.3337' + + + + + + + + + + + + + +ltmain="$ac_aux_dir/ltmain.sh" + +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if ${ac_cv_build+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if ${ac_cv_host+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +$as_echo_n "checking how to print strings... " >&6; } +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' +else + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' +fi + +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "" +} + +case "$ECHO" in + printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +$as_echo "printf" >&6; } ;; + print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +$as_echo "print -r" >&6; } ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +$as_echo "cat" >&6; } ;; +esac + + + + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if ${ac_cv_path_SED+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_SED" || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_SED_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi +else + ac_cv_path_SED=$SED +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed + +test -z "$SED" && SED=sed +Xsed="$SED -e 1s/^X//" + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_GREP" || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_GREP=$GREP +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if ${ac_cv_path_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_EGREP" || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_EGREP=$EGREP +fi + + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +$as_echo_n "checking for fgrep... " >&6; } +if ${ac_cv_path_FGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 + then ac_cv_path_FGREP="$GREP -F" + else + if test -z "$FGREP"; then + ac_path_FGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in fgrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_FGREP" || continue +# Check for GNU ac_path_FGREP and select it if it is found. + # Check for GNU $ac_path_FGREP +case `"$ac_path_FGREP" --version 2>&1` in +*GNU*) + ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'FGREP' >> "conftest.nl" + "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_FGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_FGREP="$ac_path_FGREP" + ac_path_FGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_FGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_FGREP"; then + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_FGREP=$FGREP +fi + + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +$as_echo "$ac_cv_path_FGREP" >&6; } + FGREP="$ac_cv_path_FGREP" + + +test -z "$GREP" && GREP=grep + + + + + + + + + + + + + + + + + + + +# Check whether --with-gnu-ld was given. +if test "${with_gnu_ld+set}" = set; then : + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes +else + with_gnu_ld=no +fi + +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } +fi +if ${lt_cv_path_LD+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &5 +$as_echo "$LD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if ${lt_cv_prog_gnu_ld+:} false; then : + $as_echo_n "(cached) " >&6 +else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +case `$LD -v 2>&1 &5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } +with_gnu_ld=$lt_cv_prog_gnu_ld + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +if ${lt_cv_path_NM+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM="$NM" +else + lt_nm_to_check="${ac_tool_prefix}nm" + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac + ;; + esac + fi + done + IFS="$lt_save_ifs" + done + : ${lt_cv_path_NM=no} +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 +$as_echo "$lt_cv_path_NM" >&6; } +if test "$lt_cv_path_NM" != "no"; then + NM="$lt_cv_path_NM" +else + # Didn't find any BSD compatible name lister, look for dumpbin. + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + if test -n "$ac_tool_prefix"; then + for ac_prog in dumpbin "link -dump" + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DUMPBIN"; then + ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DUMPBIN=$ac_cv_prog_DUMPBIN +if test -n "$DUMPBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +$as_echo "$DUMPBIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$DUMPBIN" && break + done +fi +if test -z "$DUMPBIN"; then + ac_ct_DUMPBIN=$DUMPBIN + for ac_prog in dumpbin "link -dump" +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DUMPBIN"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN +if test -n "$ac_ct_DUMPBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +$as_echo "$ac_ct_DUMPBIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_DUMPBIN" && break +done + + if test "x$ac_ct_DUMPBIN" = x; then + DUMPBIN=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DUMPBIN=$ac_ct_DUMPBIN + fi +fi + + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols" + ;; + *) + DUMPBIN=: + ;; + esac + fi + + if test "$DUMPBIN" != ":"; then + NM="$DUMPBIN" + fi +fi +test -z "$NM" && NM=nm + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +$as_echo_n "checking the name lister ($NM) interface... " >&6; } +if ${lt_cv_nm_interface+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 + (eval echo "\"\$as_me:$LINENO: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +$as_echo "$lt_cv_nm_interface" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +$as_echo_n "checking whether ln -s works... " >&6; } +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } +fi + +# find the maximum length of command line arguments +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 +$as_echo_n "checking the maximum length of command line arguments... " >&6; } +if ${lt_cv_sys_max_cmd_len+:} false; then : + $as_echo_n "(cached) " >&6 +else + i=0 + teststring="ABCD" + + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; + + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + + cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; + + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; + *) + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. + for i in 1 2 3 4 5 6 7 8 ; do + teststring=$teststring$teststring + done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + teststring= + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi + ;; + esac + +fi + +if test -n $lt_cv_sys_max_cmd_len ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 +$as_echo "$lt_cv_sys_max_cmd_len" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } +fi +max_cmd_len=$lt_cv_sys_max_cmd_len + + + + + + +: ${CP="cp -f"} +: ${MV="mv -f"} +: ${RM="rm -f"} + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 +$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } +# Try some XSI features +xsi_shell=no +( _lt_dummy="a/b/c" + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 +$as_echo "$xsi_shell" >&6; } + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 +$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } +lt_shell_append=no +( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ + >/dev/null 2>&1 \ + && lt_shell_append=yes +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 +$as_echo "$lt_shell_append" >&6; } + + +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset +else + lt_unset=false +fi + + + + + +# test EBCDIC or ASCII +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + lt_SP2NL='tr \040 \012' + lt_NL2SP='tr \015\012 \040\040' + ;; + *) # EBCDIC based system + lt_SP2NL='tr \100 \n' + lt_NL2SP='tr \r\n \100\100' + ;; +esac + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } +if ${lt_cv_to_host_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac + +fi + +to_host_file_cmd=$lt_cv_to_host_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +$as_echo "$lt_cv_to_host_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } +if ${lt_cv_to_tool_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + #assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac + +fi + +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +$as_echo_n "checking for $LD option to reload object files... " >&6; } +if ${lt_cv_ld_reload_flag+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_reload_flag='-r' +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +$as_echo "$lt_cv_ld_reload_flag" >&6; } +reload_flag=$lt_cv_ld_reload_flag +case $reload_flag in +"" | " "*) ;; +*) reload_flag=" $reload_flag" ;; +esac +reload_cmds='$LD$reload_flag -o $output$reload_objs' +case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + if test "$GCC" != yes; then + reload_cmds=false + fi + ;; + darwin*) + if test "$GCC" = yes; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + else + reload_cmds='$LD$reload_flag -o $output$reload_objs' + fi + ;; +esac + + + + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. +set dummy ${ac_tool_prefix}objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +OBJDUMP=$ac_cv_prog_OBJDUMP +if test -n "$OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +$as_echo "$OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_OBJDUMP"; then + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. +set dummy objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +if test -n "$ac_ct_OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +$as_echo "$ac_ct_OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_OBJDUMP" = x; then + OBJDUMP="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OBJDUMP=$ac_ct_OBJDUMP + fi +else + OBJDUMP="$ac_cv_prog_OBJDUMP" +fi + +test -z "$OBJDUMP" && OBJDUMP=objdump + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 +$as_echo_n "checking how to recognize dependent libraries... " >&6; } +if ${lt_cv_deplibs_check_method+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_file_magic_cmd='$MAGIC_CMD' +lt_cv_file_magic_test_file= +lt_cv_deplibs_check_method='unknown' +# Need to set the preceding variable on all platforms that support +# interlibrary dependencies. +# 'none' -- dependencies not supported. +# `unknown' -- same as none, but documents that we really don't know. +# 'pass_all' -- all dependencies passed with no checks. +# 'test_compile' -- check by making test program. +# 'file_magic [[regex]]' -- check by looking for files in library path +# which responds to the $file_magic_cmd with a given extended regex. +# If you have `file' or equivalent on your system and you're not sure +# whether `pass_all' will *always* work, you probably want this one. + +case $host_os in +aix[4-9]*) + lt_cv_deplibs_check_method=pass_all + ;; + +beos*) + lt_cv_deplibs_check_method=pass_all + ;; + +bsdi[45]*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' + lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_test_file=/shlib/libc.so + ;; + +cygwin*) + # func_win32_libid is a shell function defined in ltmain.sh + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + ;; + +mingw* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; + +cegcc*) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; + +darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; + +freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; + +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; + +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; + +interix[3-9]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' + ;; + +irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + +netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' + fi + ;; + +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +*nto* | *qnx*) + lt_cv_deplibs_check_method=pass_all + ;; + +openbsd*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + fi + ;; + +osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; + +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + +solaris*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; + esac + ;; + +tpf*) + lt_cv_deplibs_check_method=pass_all + ;; +esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +$as_echo "$lt_cv_deplibs_check_method" >&6; } + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` + fi + ;; + esac +fi + +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown + + + + + + + + + + + + + + + + + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DLLTOOL=$ac_cv_prog_DLLTOOL +if test -n "$DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +$as_echo "$DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DLLTOOL"; then + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. +set dummy dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +if test -n "$ac_ct_DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +$as_echo "$ac_ct_DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DLLTOOL=$ac_ct_DLLTOOL + fi +else + DLLTOOL="$ac_cv_prog_DLLTOOL" +fi + +test -z "$DLLTOOL" && DLLTOOL=dlltool + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_sharedlib_from_linklib_cmd='unknown' + +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + + + + + + + +if test -n "$ac_tool_prefix"; then + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AR" && break + done +fi +if test -z "$AR"; then + ac_ct_AR=$AR + for ac_prog in ar +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_AR" && break +done + + if test "x$ac_ct_AR" = x; then + AR="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi +fi + +: ${AR=ar} +: ${AR_FLAGS=cru} + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ar_at_file=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -ne 0; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi + + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +test -z "$STRIP" && STRIP=: + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi +else + RANLIB="$ac_cv_prog_RANLIB" +fi + +test -z "$RANLIB" && RANLIB=: + + + + + + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" +fi + +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC + + +# Check for command to grab the raw symbol name followed by C symbol from nm. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 +$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } +if ${lt_cv_sys_global_symbol_pipe+:} false; then : + $as_echo_n "(cached) " >&6 +else + +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] + +# Character class describing NM global symbol codes. +symcode='[BCDEGRST]' + +# Regexp to match symbols that can be accessed directly from C. +sympat='\([_A-Za-z][_A-Za-z0-9]*\)' + +# Define system-specific variables. +case $host_os in +aix*) + symcode='[BCDT]' + ;; +cygwin* | mingw* | pw32* | cegcc*) + symcode='[ABCDGISTW]' + ;; +hpux*) + if test "$host_cpu" = ia64; then + symcode='[ABCDEGRST]' + fi + ;; +irix* | nonstopux*) + symcode='[BCDEGRST]' + ;; +osf*) + symcode='[BCDEGQRST]' + ;; +solaris*) + symcode='[BDRT]' + ;; +sco3.2v5*) + symcode='[DT]' + ;; +sysv4.2uw2*) + symcode='[DT]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[ABDT]' + ;; +sysv4) + symcode='[DFNSTU]' + ;; +esac + +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[ABCDGIRSTW]' ;; +esac + +# Transform an extracted symbol line into a proper C declaration. +# Some systems (esp. on ia64) link data and code symbols differently, +# so use this general approach. +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" + +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in +mingw*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; +esac + +# Try without a prefix underscore, then with it. +for ac_symprfx in "" "_"; do + + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + + # Write the raw and C identifiers. + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function + # and D for any global variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK '"\ +" {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ +" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" \$ 0!~/External *\|/{next};"\ +" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +" {if(hide[section]) next};"\ +" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ +" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ +" s[1]~/^[@?]/{print s[1], s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" ' prfx=^$ac_symprfx" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + + # Check to see that the pipe works correctly. + pipe_works=no + + rm -f conftest* + cat > conftest.$ac_ext <<_LT_EOF +#ifdef __cplusplus +extern "C" { +#endif +char nm_test_var; +void nm_test_func(void); +void nm_test_func(void){} +#ifdef __cplusplus +} +#endif +int main(){nm_test_var='a';nm_test_func();return(0);} +_LT_EOF + + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + # Now try to grab the symbols. + nlist=conftest.nm + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 + (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + else + rm -f "$nlist"T + fi + + # Make sure that we snagged all the symbols we need. + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +_LT_EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' + + cat <<_LT_EOF >> conftest.$ac_ext + +/* The mapping between symbol names and symbols. */ +LT_DLSYM_CONST struct { + const char *name; + void *address; +} +lt__PROGRAM__LTX_preloaded_symbols[] = +{ + { "@PROGRAM@", (void *) 0 }, +_LT_EOF + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} +}; + +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt__PROGRAM__LTX_preloaded_symbols; +} +#endif + +#ifdef __cplusplus +} +#endif +_LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext}; then + pipe_works=yes + fi + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS + else + echo "cannot find nm_test_func in $nlist" >&5 + fi + else + echo "cannot find nm_test_var in $nlist" >&5 + fi + else + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 + fi + else + echo "$progname: failed program was:" >&5 + cat conftest.$ac_ext >&5 + fi + rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then + break + else + lt_cv_sys_global_symbol_pipe= + fi +done + +fi + +if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= +fi +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +$as_echo "failed" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } +fi + +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + + + + + + + + + + + + + + + + + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + +# Check whether --with-sysroot was given. +if test "${with_sysroot+set}" = set; then : + withval=$with_sysroot; +else + with_sysroot=no +fi + + +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +$as_echo "${with_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } + + + + + +# Check whether --enable-libtool-lock was given. +if test "${enable_libtool_lock+set}" = set; then : + enableval=$enable_libtool_lock; +fi + +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; + esac + fi + rm -rf conftest* + ;; +*-*-irix6*) + # Find out which ABI we are using. + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi + fi + rm -rf conftest* + ;; + +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac + ;; + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 +$as_echo_n "checking whether the C compiler needs -belf... " >&6; } +if ${lt_cv_cc_needs_belf+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_cc_needs_belf=yes +else + lt_cv_cc_needs_belf=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +$as_echo "$lt_cv_cc_needs_belf" >&6; } + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS="$SAVE_CFLAGS" + fi + ;; +*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; +esac + +need_locks="$enable_libtool_lock" + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. +set dummy ${ac_tool_prefix}mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$MANIFEST_TOOL"; then + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL +if test -n "$MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +$as_echo "$MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL + # Extract the first word of "mt", so it can be a program name with args. +set dummy mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_MANIFEST_TOOL"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL +if test -n "$ac_ct_MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_MANIFEST_TOOL" = x; then + MANIFEST_TOOL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL + fi +else + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" +fi + +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +if ${lt_cv_path_mainfest_tool+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&5 + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 +$as_echo "$lt_cv_path_mainfest_tool" >&6; } +if test "x$lt_cv_path_mainfest_tool" != xyes; then + MANIFEST_TOOL=: +fi + + + + + + + case $host_os in + rhapsody* | darwin*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. +set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DSYMUTIL"; then + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DSYMUTIL=$ac_cv_prog_DSYMUTIL +if test -n "$DSYMUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +$as_echo "$DSYMUTIL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DSYMUTIL"; then + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. +set dummy dsymutil; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL +if test -n "$ac_ct_DSYMUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +$as_echo "$ac_ct_DSYMUTIL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_DSYMUTIL" = x; then + DSYMUTIL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DSYMUTIL=$ac_ct_DSYMUTIL + fi +else + DSYMUTIL="$ac_cv_prog_DSYMUTIL" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. +set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$NMEDIT"; then + ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +NMEDIT=$ac_cv_prog_NMEDIT +if test -n "$NMEDIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +$as_echo "$NMEDIT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_NMEDIT"; then + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. +set dummy nmedit; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_NMEDIT"; then + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_NMEDIT="nmedit" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT +if test -n "$ac_ct_NMEDIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +$as_echo "$ac_ct_NMEDIT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_NMEDIT" = x; then + NMEDIT=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + NMEDIT=$ac_ct_NMEDIT + fi +else + NMEDIT="$ac_cv_prog_NMEDIT" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. +set dummy ${ac_tool_prefix}lipo; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LIPO+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$LIPO"; then + ac_cv_prog_LIPO="$LIPO" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_LIPO="${ac_tool_prefix}lipo" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +LIPO=$ac_cv_prog_LIPO +if test -n "$LIPO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 +$as_echo "$LIPO" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_LIPO"; then + ac_ct_LIPO=$LIPO + # Extract the first word of "lipo", so it can be a program name with args. +set dummy lipo; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_LIPO+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_LIPO"; then + ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_LIPO="lipo" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO +if test -n "$ac_ct_LIPO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 +$as_echo "$ac_ct_LIPO" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_LIPO" = x; then + LIPO=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + LIPO=$ac_ct_LIPO + fi +else + LIPO="$ac_cv_prog_LIPO" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. +set dummy ${ac_tool_prefix}otool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OTOOL"; then + ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OTOOL="${ac_tool_prefix}otool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +OTOOL=$ac_cv_prog_OTOOL +if test -n "$OTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 +$as_echo "$OTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_OTOOL"; then + ac_ct_OTOOL=$OTOOL + # Extract the first word of "otool", so it can be a program name with args. +set dummy otool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OTOOL"; then + ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OTOOL="otool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL +if test -n "$ac_ct_OTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 +$as_echo "$ac_ct_OTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_OTOOL" = x; then + OTOOL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OTOOL=$ac_ct_OTOOL + fi +else + OTOOL="$ac_cv_prog_OTOOL" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. +set dummy ${ac_tool_prefix}otool64; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OTOOL64"; then + ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +OTOOL64=$ac_cv_prog_OTOOL64 +if test -n "$OTOOL64"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 +$as_echo "$OTOOL64" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_OTOOL64"; then + ac_ct_OTOOL64=$OTOOL64 + # Extract the first word of "otool64", so it can be a program name with args. +set dummy otool64; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OTOOL64"; then + ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OTOOL64="otool64" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 +if test -n "$ac_ct_OTOOL64"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 +$as_echo "$ac_ct_OTOOL64" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_OTOOL64" = x; then + OTOOL64=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OTOOL64=$ac_ct_OTOOL64 + fi +else + OTOOL64="$ac_cv_prog_OTOOL64" +fi + + + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 +$as_echo_n "checking for -single_module linker flag... " >&6; } +if ${lt_cv_apple_cc_single_mod+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + rm -rf libconftest.dylib* + echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&5 + fi + rm -rf libconftest.dylib* + rm -f conftest.* + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 +$as_echo "$lt_cv_apple_cc_single_mod" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 +$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } +if ${lt_cv_ld_exported_symbols_list+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_ld_exported_symbols_list=yes +else + lt_cv_ld_exported_symbols_list=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +$as_echo_n "checking for -force_load linker flag... " >&6; } +if ${lt_cv_ld_force_load+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 + echo "$AR cru libconftest.a conftest.o" >&5 + $AR cru libconftest.a conftest.o 2>&5 + echo "$RANLIB libconftest.a" >&5 + $RANLIB libconftest.a 2>&5 + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&5 + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +$as_echo "$lt_cv_ld_force_load" >&6; } + case $host_os in + rhapsody* | darwin1.[012]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[91]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[012]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= + fi + ;; + esac + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi + + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes +else + ac_cv_header_stdc=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + +else + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +$as_echo "#define STDC_HEADERS 1" >>confdefs.h + +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + +for ac_header in dlfcn.h +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +" +if test "x$ac_cv_header_dlfcn_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DLFCN_H 1 +_ACEOF + +fi + +done + + + + + +# Set options +# Check whether --enable-static was given. +if test "${enable_static+set}" = set; then : + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_static=no +fi + + + + + + + + + + + enable_dlopen=no + + + enable_win32_dll=no + + + # Check whether --enable-shared was given. +if test "${enable_shared+set}" = set; then : + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_shared=yes +fi + + + + + + + + + + + +# Check whether --with-pic was given. +if test "${with_pic+set}" = set; then : + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + pic_mode=default +fi + + +test -z "$pic_mode" && pic_mode=default + + + + + + + + # Check whether --enable-fast-install was given. +if test "${enable_fast_install+set}" = set; then : + enableval=$enable_fast_install; p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_fast_install=yes +fi + + + + + + + + + + + +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ltmain" + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +test -z "$LN_S" && LN_S="ln -s" + + + + + + + + + + + + + + +if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +$as_echo_n "checking for objdir... " >&6; } +if ${lt_cv_objdir+:} false; then : + $as_echo_n "(cached) " >&6 +else + rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs +else + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs +fi +rmdir .libs 2>/dev/null +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 +$as_echo "$lt_cv_objdir" >&6; } +objdir=$lt_cv_objdir + + + + + +cat >>confdefs.h <<_ACEOF +#define LT_OBJDIR "$lt_cv_objdir/" +_ACEOF + + + + +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac + +# Global variables: +ofile=libtool +can_build_shared=yes + +# All known linkers require a `.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a + +with_gnu_ld="$lt_cv_prog_gnu_ld" + +old_CC="$CC" +old_CFLAGS="$CFLAGS" + +# Set sane defaults for various variables +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$LD" && LD=ld +test -z "$ac_objext" && ac_objext=o + +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` + + +# Only perform the check for file, if the check method requires it +test -z "$MAGIC_CMD" && MAGIC_CMD=file +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 +$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/${ac_tool_prefix}file; then + lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +_LT_EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac +fi + +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + + +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 +$as_echo_n "checking for file... " >&6; } +if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/file; then + lt_cv_path_MAGIC_CMD="$ac_dir/file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +_LT_EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac +fi + +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + else + MAGIC_CMD=: + fi +fi + + fi + ;; +esac + +# Use C for the default configuration in the libtool script + +lt_save_CC="$CC" +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +# Source file extension for C test sources. +ac_ext=c + +# Object file extension for compiled C test sources. +objext=o +objext=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}' + + + + + + + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC + +# Save the default compiler, since it gets overwritten when the other +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. +compiler_DEFAULT=$CC + +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$RM conftest* + +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$RM -r conftest* + + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + +lt_prog_compiler_no_builtin_flag= + +if test "$GCC" = yes; then + case $cc_basename in + nvcc*) + lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; + *) + lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; + esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-fno-rtti -fno-exceptions" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_rtti_exceptions=yes + fi + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } + +if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then + lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" +else + : +fi + +fi + + + + + + + lt_prog_compiler_wl= +lt_prog_compiler_pic= +lt_prog_compiler_static= + + + if test "$GCC" = yes; then + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_static='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + ;; + + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + lt_prog_compiler_static= + ;; + + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac + ;; + + interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + lt_prog_compiler_can_build_shared=no + enable_shared=no + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic='-fPIC -shared' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic=-Kconform_pic + fi + ;; + + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + lt_prog_compiler_wl='-Xlinker ' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + lt_prog_compiler_wl='-Wl,' + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + else + lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' + fi + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; + + hpux9* | hpux10* | hpux11*) + lt_prog_compiler_wl='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + lt_prog_compiler_static='${wl}-a ${wl}archive' + ;; + + irix5* | irix6* | nonstopux*) + lt_prog_compiler_wl='-Wl,' + # PIC (with -KPIC) is the default. + lt_prog_compiler_static='-non_shared' + ;; + + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-static' + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='--shared' + lt_prog_compiler_static='--static' + ;; + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; + ccc*) + lt_prog_compiler_wl='-Wl,' + # All Alpha code is PIC. + lt_prog_compiler_static='-non_shared' + ;; + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-qpic' + lt_prog_compiler_static='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='' + ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; + *Sun\ C*) + # Sun C 5.9 + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Wl,' + ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; + esac + ;; + esac + ;; + + newsos6) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic='-fPIC -shared' + ;; + + osf3* | osf4* | osf5*) + lt_prog_compiler_wl='-Wl,' + # All OSF/1 code is PIC. + lt_prog_compiler_static='-non_shared' + ;; + + rdos*) + lt_prog_compiler_static='-non_shared' + ;; + + solaris*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + case $cc_basename in + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + lt_prog_compiler_wl='-Qoption ld ';; + *) + lt_prog_compiler_wl='-Wl,';; + esac + ;; + + sunos4*) + lt_prog_compiler_wl='-Qoption ld ' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + + sysv4 | sysv4.2uw2* | sysv4.3*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + sysv4*MP*) + if test -d /usr/nec ;then + lt_prog_compiler_pic='-Kconform_pic' + lt_prog_compiler_static='-Bstatic' + fi + ;; + + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + unicos*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_can_build_shared=no + ;; + + uts4*) + lt_prog_compiler_pic='-pic' + lt_prog_compiler_static='-Bstatic' + ;; + + *) + lt_prog_compiler_can_build_shared=no + ;; + esac + fi + +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic= + ;; + *) + lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" + ;; +esac + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +$as_echo "$lt_cv_prog_compiler_pic" >&6; } +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$lt_prog_compiler_pic"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +if ${lt_cv_prog_compiler_pic_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_pic_works=yes + fi + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 +$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } + +if test x"$lt_cv_prog_compiler_pic_works" = xyes; then + case $lt_prog_compiler_pic in + "" | " "*) ;; + *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; + esac +else + lt_prog_compiler_pic= + lt_prog_compiler_can_build_shared=no +fi + +fi + + + + + + + + + + + +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if ${lt_cv_prog_compiler_static_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_static_works=yes + fi + else + lt_cv_prog_compiler_static_works=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 +$as_echo "$lt_cv_prog_compiler_static_works" >&6; } + +if test x"$lt_cv_prog_compiler_static_works" = xyes; then + : +else + lt_prog_compiler_static= +fi + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + + + +hard_links="nottested" +if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +$as_echo_n "checking if we can lock with hard links... " >&6; } + hard_links=yes + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +$as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi +else + need_locks=no +fi + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + + runpath_var= + allow_undefined_flag= + always_export_symbols=no + archive_cmds= + archive_expsym_cmds= + compiler_needs_object=no + enable_shared_with_static_runtimes=no + export_dynamic_flag_spec= + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + hardcode_automatic=no + hardcode_direct=no + hardcode_direct_absolute=no + hardcode_libdir_flag_spec= + hardcode_libdir_separator= + hardcode_minus_L=no + hardcode_shlibpath_var=unsupported + inherit_rpath=no + link_all_deplibs=unknown + module_cmds= + module_expsym_cmds= + old_archive_from_new_cmds= + old_archive_from_expsyms_cmds= + thread_safe_flag_spec= + whole_archive_flag_spec= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + include_expsyms= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. + exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. + extract_expsyms_cmds= + + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd*) + with_gnu_ld=no + ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; + esac + + ld_shlibs=yes + + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no + if test "$with_gnu_ld" = yes; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; + *\ \(GNU\ Binutils\)\ [3-9]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi + + if test "$lt_use_gnu_ld_interface" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' + + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec= + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + + # See if GNU ld supports shared libraries. + case $host_os in + aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs=no + cat <<_LT_EOF 1>&2 + +*** Warning: the GNU linker, at least up to release 2.19, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. + +_LT_EOF + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac + ;; + + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + ld_shlibs=no + fi + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' + export_dynamic_flag_spec='${wl}--export-all-symbols' + allow_undefined_flag=unsupported + always_export_symbols=no + enable_shared_with_static_runtimes=yes + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs=no + fi + ;; + + haiku*) + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + link_all_deplibs=yes + ;; + + interix[3-9]*) + hardcode_direct=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) + esac + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test "$tmp_diet" = no + then + tmp_addflag=' $pic_flag' + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + whole_archive_flag_spec= + tmp_sharedflag='--shared' ;; + xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object=yes + ;; + esac + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + + case $cc_basename in + xlf* | bgf* | bgxlf* | mpixlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac + else + ld_shlibs=no + fi + ;; + + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + + solaris*) + if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + ld_shlibs=no + cat <<_LT_EOF 1>&2 + +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac + ;; + + sunos4*) + archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac + + if test "$ld_shlibs" = no; then + runpath_var= + hardcode_libdir_flag_spec= + export_dynamic_flag_spec= + whole_archive_flag_spec= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + allow_undefined_flag=unsupported + always_export_symbols=yes + archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + hardcode_minus_L=yes + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + hardcode_direct=unsupported + fi + ;; + + aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global + # defined symbols, whereas GNU nm marks them as "W". + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + archive_cmds='' + hardcode_direct=yes + hardcode_direct_absolute=yes + hardcode_libdir_separator=':' + link_all_deplibs=yes + file_list_spec='${wl}-f,' + + if test "$GCC" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + hardcode_direct=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L=yes + hardcode_libdir_flag_spec='-L$libdir' + hardcode_libdir_separator= + fi + ;; + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + link_all_deplibs=no + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + export_dynamic_flag_spec='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi + +fi + + aix_libpath=$lt_cv_aix_libpath_ +fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag="-z nodefs" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi + +fi + + aix_libpath=$lt_cv_aix_libpath_ +fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + no_undefined_flag=' ${wl}-bernotok' + allow_undefined_flag=' ${wl}-berok' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec='$convenience' + fi + archive_cmds_need_lc=yes + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac + ;; + + bsdi[45]*) + export_dynamic_flag_spec=-rdynamic + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + case $cc_basename in + cl*) + # Native MSVC + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + always_export_symbols=yes + file_list_spec='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' + enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + old_postinstall_cmds='chmod 644 $oldlib' + postlink_cmds='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + enable_shared_with_static_runtimes=yes + ;; + esac + ;; + + darwin* | rhapsody*) + + + archive_cmds_need_lc=no + hardcode_direct=no + hardcode_automatic=yes + hardcode_shlibpath_var=unsupported + if test "$lt_cv_ld_force_load" = "yes"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + + else + whole_archive_flag_spec='' + fi + link_all_deplibs=yes + allow_undefined_flag="$_lt_dar_allow_undefined" + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=func_echo_all + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + + else + ld_shlibs=no + fi + + ;; + + dgux*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2.*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + hpux9*) + if test "$GCC" = yes; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + export_dynamic_flag_spec='${wl}-E' + ;; + + hpux10*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + hardcode_direct_absolute=yes + export_dynamic_flag_spec='${wl}-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + fi + ;; + + hpux11*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +$as_echo_n "checking if $CC understands -b... " >&6; } +if ${lt_cv_prog_compiler__b+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler__b=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -b" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler__b=yes + fi + else + lt_cv_prog_compiler__b=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 +$as_echo "$lt_cv_prog_compiler__b" >&6; } + +if test x"$lt_cv_prog_compiler__b" = xyes; then + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' +fi + + ;; + esac + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + + case $host_cpu in + hppa*64*|ia64*) + hardcode_direct=no + hardcode_shlibpath_var=no + ;; + *) + hardcode_direct=yes + hardcode_direct_absolute=yes + export_dynamic_flag_spec='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; + esac + fi + ;; + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int foo (void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_irix_exported_symbol=yes +else + lt_cv_irix_exported_symbol=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +$as_echo "$lt_cv_irix_exported_symbol" >&6; } + if test "$lt_cv_irix_exported_symbol" = yes; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + fi + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + inherit_rpath=yes + link_all_deplibs=yes + ;; + + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + newsos6) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_shlibpath_var=no + ;; + + *nto* | *qnx*) + ;; + + openbsd*) + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + hardcode_shlibpath_var=no + hardcode_direct_absolute=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi + else + ld_shlibs=no + fi + ;; + + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + + osf3*) + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + fi + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + + # Both c and cxx compiler support -rpath directly + hardcode_libdir_flag_spec='-rpath $libdir' + fi + archive_cmds_need_lc='no' + hardcode_libdir_separator=: + ;; + + solaris*) + no_undefined_flag=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) + wlarc='' + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + ;; + *) + wlarc='${wl}' + archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + ;; + esac + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_shlibpath_var=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test "$GCC" = yes; then + whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' + fi + ;; + esac + link_all_deplibs=yes + ;; + + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; + + sysv4) + case $host_vendor in + sni) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' + reload_cmds='$CC -r -o $output$reload_objs' + hardcode_direct=no + ;; + motorola) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var=no + ;; + + sysv4.3*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + export_dynamic_flag_spec='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ld_shlibs=yes + fi + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag='${wl}-z,text' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag='${wl}-z,text' + allow_undefined_flag='${wl}-z,nodefs' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-R,$libdir' + hardcode_libdir_separator=':' + link_all_deplibs=yes + export_dynamic_flag_spec='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + uts4*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; + + *) + ld_shlibs=no + ;; + esac + + if test x$host_vendor = xsni; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + export_dynamic_flag_spec='${wl}-Blargedynsym' + ;; + esac + fi + fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +$as_echo "$ld_shlibs" >&6; } +test "$ld_shlibs" = no && can_build_shared=no + +with_gnu_ld=$with_gnu_ld + + + + + + + + + + + + + + + +# +# Do we need to explicitly link libc? +# +case "x$archive_cmds_need_lc" in +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $archive_cmds in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } +if ${lt_cv_archive_cmds_need_lc+:} false; then : + $as_echo_n "(cached) " >&6 +else + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl + pic_flag=$lt_prog_compiler_pic + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + then + lt_cv_archive_cmds_need_lc=no + else + lt_cv_archive_cmds_need_lc=yes + fi + allow_undefined_flag=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } + archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc + ;; + esac + fi + ;; +esac + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +$as_echo_n "checking dynamic linker characteristics... " >&6; } + +if test "$GCC" = yes; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; + *) lt_sed_strip_eq="s,=/,/,g" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[lt_foo]++; } + if (lt_freq[lt_foo] == 1) { print lt_foo; } +}'` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's,/\([A-Za-z]:\),\1,g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown + +case $host_os in +aix3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +aix[4-9]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + esac + ;; + +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi[45]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$cc_basename in + yes,*) + # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' + ;; + + *) + # Assume MSVC wrapper + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' + ;; + esac + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[23].*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2.*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[01]* | freebsdelf3.[01]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; + +haiku*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... + postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 + ;; + +interix[3-9]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux # correct to gnu/linux during the next big refactor + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + lt_cv_shlibpath_overrides_runpath=yes +fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + +fi + + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +*nto* | *qnx*) + version_type=qnx + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' + ;; + +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; + +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +rdos*) + dynamic_linker=no + ;; + +solaris*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +uts4*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +*) + dynamic_linker=no + ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +$as_echo "$dynamic_linker" >&6; } +test "$dynamic_linker" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +fi +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +fi + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } +hardcode_action= +if test -n "$hardcode_libdir_flag_spec" || + test -n "$runpath_var" || + test "X$hardcode_automatic" = "Xyes" ; then + + # We can hardcode non-existent directories. + if test "$hardcode_direct" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && + test "$hardcode_minus_L" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action=unsupported +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +$as_echo "$hardcode_action" >&6; } + +if test "$hardcode_action" = relink || + test "$inherit_rpath" = yes; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + + + + + + + if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32* | cegcc*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes +else + ac_cv_lib_dl_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + +fi + + ;; + + *) + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" +if test "x$ac_cv_func_shl_load" = xyes; then : + lt_cv_dlopen="shl_load" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +$as_echo_n "checking for shl_load in -ldld... " >&6; } +if ${ac_cv_lib_dld_shl_load+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char shl_load (); +int +main () +{ +return shl_load (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_shl_load=yes +else + ac_cv_lib_dld_shl_load=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +$as_echo "$ac_cv_lib_dld_shl_load" >&6; } +if test "x$ac_cv_lib_dld_shl_load" = xyes; then : + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" +else + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +if test "x$ac_cv_func_dlopen" = xyes; then : + lt_cv_dlopen="dlopen" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes +else + ac_cv_lib_dl_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 +$as_echo_n "checking for dlopen in -lsvld... " >&6; } +if ${ac_cv_lib_svld_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsvld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_svld_dlopen=yes +else + ac_cv_lib_svld_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 +$as_echo "$ac_cv_lib_svld_dlopen" >&6; } +if test "x$ac_cv_lib_svld_dlopen" = xyes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 +$as_echo_n "checking for dld_link in -ldld... " >&6; } +if ${ac_cv_lib_dld_dld_link+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dld_link (); +int +main () +{ +return dld_link (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_dld_link=yes +else + ac_cv_lib_dld_dld_link=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 +$as_echo "$ac_cv_lib_dld_dld_link" >&6; } +if test "x$ac_cv_lib_dld_dld_link" = xyes; then : + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" +fi + + +fi + + +fi + + +fi + + +fi + + +fi + + ;; + esac + + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +$as_echo_n "checking whether a program can dlopen itself... " >&6; } +if ${lt_cv_dlopen_self+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +#line $LINENO "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } + /* dlclose (self); */ + } + else + puts (dlerror ()); + + return status; +} +_LT_EOF + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self=no + fi +fi +rm -fr conftest* + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 +$as_echo "$lt_cv_dlopen_self" >&6; } + + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 +$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } +if ${lt_cv_dlopen_self_static+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +#line $LINENO "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } + /* dlclose (self); */ + } + else + puts (dlerror ()); + + return status; +} +_LT_EOF + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self_static=no + fi +fi +rm -fr conftest* + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +$as_echo "$lt_cv_dlopen_self_static" >&6; } + fi + + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi + + + + + + + + + + + + + + + + + +striplib= +old_striplib= +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +$as_echo_n "checking whether stripping libraries is possible... " >&6; } +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ;; + esac +fi + + + + + + + + + + + + + # Report which library types will actually be built + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +$as_echo_n "checking if libtool supports shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +$as_echo "$can_build_shared" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +$as_echo_n "checking whether to build shared libraries... " >&6; } + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + + aix[4-9]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +$as_echo "$enable_shared" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +$as_echo_n "checking whether to build static libraries... " >&6; } + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +$as_echo "$enable_static" >&6; } + + + + +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +CC="$lt_save_CC" + + + + + + + + + + + + + + + + ac_config_commands="$ac_config_commands libtool" + + + + +# Only expand once: + + + +# Check for programs + + ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" +if test "x$ac_cv_header_minix_config_h" = xyes; then : + MINIX=yes +else + MINIX= +fi + + + if test "$MINIX" = yes; then + +$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h + + +$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h + + +$as_echo "#define _MINIX 1" >>confdefs.h + + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if ${ac_cv_safe_to_define___extensions__+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +# define __EXTENSIONS__ 1 + $ac_includes_default +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_safe_to_define___extensions__=yes +else + ac_cv_safe_to_define___extensions__=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +$as_echo "$ac_cv_safe_to_define___extensions__" >&6; } + test $ac_cv_safe_to_define___extensions__ = yes && + $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h + + $as_echo "#define _ALL_SOURCE 1" >>confdefs.h + + $as_echo "#define _GNU_SOURCE 1" >>confdefs.h + + $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + fi +fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi + + +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } + +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +else + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +else + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : + +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +depcc="$CC" am_compiler_list= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi + + + +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CXX=$ac_cv_prog_CXX +if test -n "$CXX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +$as_echo "$CXX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$CXX" && break + done +fi +if test -z "$CXX"; then + ac_ct_CXX=$CXX + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CXX="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX +if test -n "$ac_ct_CXX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +$as_echo "$ac_ct_CXX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CXX" && break +done + + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi +fi + + fi +fi +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 +$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +if ${ac_cv_cxx_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +else + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GXX=yes +else + GXX= +fi +ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_save_CXXFLAGS=$CXXFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +$as_echo_n "checking whether $CXX accepts -g... " >&6; } +if ${ac_cv_prog_cxx_g+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_prog_cxx_g=yes +else + CXXFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + +else + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_prog_cxx_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +$as_echo "$ac_cv_prog_cxx_g" >&6; } +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +depcc="$CXX" am_compiler_list= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CXX_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CXX_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CXX_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CXX_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } +CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= + am__fastdepCXX_FALSE='#' +else + am__fastdepCXX_TRUE='#' + am__fastdepCXX_FALSE= +fi + + + + +func_stripname_cnf () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname_cnf + + if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 +$as_echo_n "checking how to run the C++ preprocessor... " >&6; } +if test -z "$CXXCPP"; then + if ${ac_cv_prog_CXXCPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" + do + ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi + + done + ac_cv_prog_CXXCPP=$CXXCPP + +fi + CXXCPP=$ac_cv_prog_CXXCPP +else + ac_cv_prog_CXXCPP=$CXXCPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 +$as_echo "$CXXCPP" >&6; } +ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +else + _lt_caught_CXX_error=yes +fi + +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +archive_cmds_need_lc_CXX=no +allow_undefined_flag_CXX= +always_export_symbols_CXX=no +archive_expsym_cmds_CXX= +compiler_needs_object_CXX=no +export_dynamic_flag_spec_CXX= +hardcode_direct_CXX=no +hardcode_direct_absolute_CXX=no +hardcode_libdir_flag_spec_CXX= +hardcode_libdir_separator_CXX= +hardcode_minus_L_CXX=no +hardcode_shlibpath_var_CXX=unsupported +hardcode_automatic_CXX=no +inherit_rpath_CXX=no +module_cmds_CXX= +module_expsym_cmds_CXX= +link_all_deplibs_CXX=unknown +old_archive_cmds_CXX=$old_archive_cmds +reload_flag_CXX=$reload_flag +reload_cmds_CXX=$reload_cmds +no_undefined_flag_CXX= +whole_archive_flag_spec_CXX= +enable_shared_with_static_runtimes_CXX=no + +# Source file extension for C++ test sources. +ac_ext=cpp + +# Object file extension for compiled C++ test sources. +objext=o +objext_CXX=$objext + +# No sense in running all these tests if we already determined that +# the CXX compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_caught_CXX_error" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="int some_variable = 0;" + + # Code to be used in simple link tests + lt_simple_link_test_code='int main(int, char *[]) { return(0); }' + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + + + + + + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC + + + # save warnings/boilerplate of simple test code + ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$RM conftest* + + ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$RM -r conftest* + + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_CFLAGS=$CFLAGS + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX + lt_save_with_gnu_ld=$with_gnu_ld + lt_save_path_LD=$lt_cv_path_LD + if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx + else + $as_unset lt_cv_prog_gnu_ld + fi + if test -n "${lt_cv_path_LDCXX+set}"; then + lt_cv_path_LD=$lt_cv_path_LDCXX + else + $as_unset lt_cv_path_LD + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} + CFLAGS=$CXXFLAGS + compiler=$CC + compiler_CXX=$CC + for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` + + + if test -n "$compiler"; then + # We don't want -fno-exception when compiling C++ code, so set the + # no_builtin_flag separately + if test "$GXX" = yes; then + lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' + else + lt_prog_compiler_no_builtin_flag_CXX= + fi + + if test "$GXX" = yes; then + # Set up default GNU C++ configuration + + + +# Check whether --with-gnu-ld was given. +if test "${with_gnu_ld+set}" = set; then : + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes +else + with_gnu_ld=no +fi + +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } +fi +if ${lt_cv_path_LD+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &5 +$as_echo "$LD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if ${lt_cv_prog_gnu_ld+:} false; then : + $as_echo_n "(cached) " >&6 +else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +case `$LD -v 2>&1 &5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } +with_gnu_ld=$lt_cv_prog_gnu_ld + + + + + + + + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test "$with_gnu_ld" = yes; then + archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + + # If archive_cmds runs LD, not CC, wlarc should be empty + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to + # investigate it a little bit more. (MM) + wlarc='${wl}' + + # ancient GNU ld didn't support --whole-archive et. al. + if eval "`$CC -print-prog-name=ld` --help 2>&1" | + $GREP 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec_CXX= + fi + else + with_gnu_ld=no + wlarc= + + # A generic and very simple default shared library creation + # command for GNU C++ for the case where it uses the native + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + + else + GXX=no + with_gnu_ld=no + wlarc= + fi + + # PORTME: fill in a description of your system's C++ link characteristics + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + ld_shlibs_CXX=yes + case $host_os in + aix3*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) + aix_use_runtimelinking=yes + break + ;; + esac + done + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + archive_cmds_CXX='' + hardcode_direct_CXX=yes + hardcode_direct_absolute_CXX=yes + hardcode_libdir_separator_CXX=':' + link_all_deplibs_CXX=yes + file_list_spec_CXX='${wl}-f,' + + if test "$GXX" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + hardcode_direct_CXX=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L_CXX=yes + hardcode_libdir_flag_spec_CXX='-L$libdir' + hardcode_libdir_separator_CXX= + fi + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + export_dynamic_flag_spec_CXX='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to + # export. + always_export_symbols_CXX=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag_CXX='-berok' + # Determine the default libpath from the value encoded in an empty + # executable. + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath__CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX="/usr/lib:/lib" + fi + +fi + + aix_libpath=$lt_cv_aix_libpath__CXX +fi + + hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + + archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag_CXX="-z nodefs" + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath__CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX="/usr/lib:/lib" + fi + +fi + + aix_libpath=$lt_cv_aix_libpath__CXX +fi + + hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + no_undefined_flag_CXX=' ${wl}-bernotok' + allow_undefined_flag_CXX=' ${wl}-berok' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec_CXX='$convenience' + fi + archive_cmds_need_lc_CXX=yes + # This is similar to how AIX traditionally builds its shared + # libraries. + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag_CXX=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + ld_shlibs_CXX=no + fi + ;; + + chorus*) + case $cc_basename in + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + + cygwin* | mingw* | pw32* | cegcc*) + case $GXX,$cc_basename in + ,cl* | no,cl*) + # Native MSVC + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec_CXX=' ' + allow_undefined_flag_CXX=unsupported + always_export_symbols_CXX=yes + file_list_spec_CXX='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' + enable_shared_with_static_runtimes_CXX=yes + # Don't use ranlib + old_postinstall_cmds_CXX='chmod 644 $oldlib' + postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # g++ + # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec_CXX='-L$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' + allow_undefined_flag_CXX=unsupported + always_export_symbols_CXX=no + enable_shared_with_static_runtimes_CXX=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs_CXX=no + fi + ;; + esac + ;; + darwin* | rhapsody*) + + + archive_cmds_need_lc_CXX=no + hardcode_direct_CXX=no + hardcode_automatic_CXX=yes + hardcode_shlibpath_var_CXX=unsupported + if test "$lt_cv_ld_force_load" = "yes"; then + whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + + else + whole_archive_flag_spec_CXX='' + fi + link_all_deplibs_CXX=yes + allow_undefined_flag_CXX="$_lt_dar_allow_undefined" + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=func_echo_all + archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + if test "$lt_cv_apple_cc_single_mod" != "yes"; then + archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" + fi + + else + ld_shlibs_CXX=no + fi + + ;; + + dgux*) + case $cc_basename in + ec++*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + ghcx*) + # Green Hills C++ Compiler + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + + freebsd2.*) + # C++ shared libraries reported to be fairly broken before + # switch to ELF + ld_shlibs_CXX=no + ;; + + freebsd-elf*) + archive_cmds_need_lc_CXX=no + ;; + + freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + ld_shlibs_CXX=yes + ;; + + haiku*) + archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + link_all_deplibs_CXX=yes + ;; + + hpux9*) + hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_CXX=: + export_dynamic_flag_spec_CXX='${wl}-E' + hardcode_direct_CXX=yes + hardcode_minus_L_CXX=yes # Not in the search PATH, + # but as the default + # location of the library. + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + aCC*) + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test "$GXX" = yes; then + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + fi + ;; + esac + ;; + + hpux10*|hpux11*) + if test $with_gnu_ld = no; then + hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_CXX=: + + case $host_cpu in + hppa*64*|ia64*) + ;; + *) + export_dynamic_flag_spec_CXX='${wl}-E' + ;; + esac + fi + case $host_cpu in + hppa*64*|ia64*) + hardcode_direct_CXX=no + hardcode_shlibpath_var_CXX=no + ;; + *) + hardcode_direct_CXX=yes + hardcode_direct_absolute_CXX=yes + hardcode_minus_L_CXX=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; + esac + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + aCC*) + case $host_cpu in + hppa*64*) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test "$GXX" = yes; then + if test $with_gnu_ld = no; then + case $host_cpu in + hppa*64*) + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + fi + ;; + esac + ;; + + interix[3-9]*) + hardcode_direct_CXX=no + hardcode_shlibpath_var_CXX=no + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + irix5* | irix6*) + case $cc_basename in + CC*) + # SGI C++ + archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' + ;; + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + fi + fi + link_all_deplibs_CXX=yes + ;; + esac + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_CXX=: + inherit_rpath_CXX=yes + ;; + + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' + ;; + icpc* | ecpc* ) + # Intel C++ + with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac + archive_cmds_need_lc_CXX=no + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + case `$CC -V` in + *pgCC\ [1-5].* | *pgcpp\ [1-5].*) + prelink_cmds_CXX='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + old_archive_cmds_CXX='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' + archive_cmds_CXX='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + archive_expsym_cmds_CXX='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + *) # Version 6 and above use weak symbols + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + esac + + hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + ;; + cxx*) + # Compaq C++ + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec_CXX='-rpath $libdir' + hardcode_libdir_separator_CXX=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + ;; + xl* | mpixl* | bgxl*) + # IBM XL 8.0 on PPC, with GNU ld + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + no_undefined_flag_CXX=' -zdefs' + archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + hardcode_libdir_flag_spec_CXX='-R$libdir' + whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object_CXX=yes + + # Not sure whether something based on + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 + # would be better. + output_verbose_link_cmd='func_echo_all' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' + ;; + esac + ;; + esac + ;; + + lynxos*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + + m88k*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + + mvs*) + case $cc_basename in + cxx*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= + hardcode_libdir_flag_spec_CXX='-R$libdir' + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no + fi + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; + + *nto* | *qnx*) + ld_shlibs_CXX=yes + ;; + + openbsd2*) + # C++ shared libraries are fairly broken + ld_shlibs_CXX=no + ;; + + openbsd*) + if test -f /usr/libexec/ld.so; then + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no + hardcode_direct_absolute_CXX=yes + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + export_dynamic_flag_spec_CXX='${wl}-E' + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd=func_echo_all + else + ld_shlibs_CXX=no + fi + ;; + + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + hardcode_libdir_separator_CXX=: + + # Archives containing C++ object files must be created using + # the KAI C++ compiler. + case $host in + osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; + *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;; + esac + ;; + RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + cxx*) + case $host in + osf3*) + allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + ;; + *) + allow_undefined_flag_CXX=' -expect_unresolved \*' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ + $RM $lib.exp' + hardcode_libdir_flag_spec_CXX='-rpath $libdir' + ;; + esac + + hardcode_libdir_separator_CXX=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' + case $host in + osf3*) + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + *) + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + esac + + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_CXX=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + fi + ;; + esac + ;; + + psos*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + lcc*) + # Lucid + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + + solaris*) + case $cc_basename in + CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + archive_cmds_need_lc_CXX=yes + no_undefined_flag_CXX=' -zdefs' + archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + hardcode_libdir_flag_spec_CXX='-R$libdir' + hardcode_shlibpath_var_CXX=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. + # Supported since Solaris 2.6 (maybe 2.5.1?) + whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' + ;; + esac + link_all_deplibs_CXX=yes + + output_verbose_link_cmd='func_echo_all' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' + ;; + gcx*) + # Green Hills C++ Compiler + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + + # The C++ compiler must be used to create the archive. + old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; + *) + # GNU C++ compiler with Solaris linker + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + no_undefined_flag_CXX=' ${wl}-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + else + # g++ 2.7 appears to require `-G' NOT `-shared' on this + # platform. + archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + fi + + hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + ;; + esac + fi + ;; + esac + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag_CXX='${wl}-z,text' + archive_cmds_need_lc_CXX=no + hardcode_shlibpath_var_CXX=no + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag_CXX='${wl}-z,text' + allow_undefined_flag_CXX='${wl}-z,nodefs' + archive_cmds_need_lc_CXX=no + hardcode_shlibpath_var_CXX=no + hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir' + hardcode_libdir_separator_CXX=':' + link_all_deplibs_CXX=yes + export_dynamic_flag_spec_CXX='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~ + '"$old_archive_cmds_CXX" + reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~ + '"$reload_cmds_CXX" + ;; + *) + archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + + vxworks*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 +$as_echo "$ld_shlibs_CXX" >&6; } + test "$ld_shlibs_CXX" = no && can_build_shared=no + + GCC_CXX="$GXX" + LD_CXX="$LD" + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + # Dependencies to place before and after the object being linked: +predep_objects_CXX= +postdep_objects_CXX= +predeps_CXX= +postdeps_CXX= +compiler_lib_search_path_CXX= + +cat > conftest.$ac_ext <<_LT_EOF +class Foo +{ +public: + Foo (void) { a = 0; } +private: + int a; +}; +_LT_EOF + + +_lt_libdeps_save_CFLAGS=$CFLAGS +case "$CC $CFLAGS " in #( +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; +esac + +if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. + + # Sentinel used to keep track of whether or not we are before + # the conftest object file. + pre_test_object_deps_done=no + + for p in `eval "$output_verbose_link_cmd"`; do + case ${prev}${p} in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. + # Remove the space. + if test $p = "-L" || + test $p = "-R"; then + prev=$p + continue + fi + + # Expand the sysroot to ease extracting the directories later. + if test -z "$prev"; then + case $p in + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; + esac + fi + case $p in + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; + esac + if test "$pre_test_object_deps_done" = no; then + case ${prev} in + -L | -R) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. + if test -z "$compiler_lib_search_path_CXX"; then + compiler_lib_search_path_CXX="${prev}${p}" + else + compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" + fi + ;; + # The "-l" case would never come before the object being + # linked, so don't bother handling this case. + esac + else + if test -z "$postdeps_CXX"; then + postdeps_CXX="${prev}${p}" + else + postdeps_CXX="${postdeps_CXX} ${prev}${p}" + fi + fi + prev= + ;; + + *.lto.$objext) ;; # Ignore GCC LTO objects + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. + if test "$p" = "conftest.$objext"; then + pre_test_object_deps_done=yes + continue + fi + + if test "$pre_test_object_deps_done" = no; then + if test -z "$predep_objects_CXX"; then + predep_objects_CXX="$p" + else + predep_objects_CXX="$predep_objects_CXX $p" + fi + else + if test -z "$postdep_objects_CXX"; then + postdep_objects_CXX="$p" + else + postdep_objects_CXX="$postdep_objects_CXX $p" + fi + fi + ;; + + *) ;; # Ignore the rest. + + esac + done + + # Clean up. + rm -f a.out a.exe +else + echo "libtool.m4: error: problem compiling CXX test program" +fi + +$RM -f confest.$objext +CFLAGS=$_lt_libdeps_save_CFLAGS + +# PORTME: override above test on systems where it is broken +case $host_os in +interix[3-9]*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + predep_objects_CXX= + postdep_objects_CXX= + postdeps_CXX= + ;; + +linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + + if test "$solaris_use_stlport4" != yes; then + postdeps_CXX='-library=Cstd -library=Crun' + fi + ;; + esac + ;; + +solaris*) + case $cc_basename in + CC* | sunCC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + + # Adding this requires a known-good setup of shared libraries for + # Sun compiler versions before 5.6, else PIC objects from an old + # archive will be linked into the output, leading to subtle bugs. + if test "$solaris_use_stlport4" != yes; then + postdeps_CXX='-library=Cstd -library=Crun' + fi + ;; + esac + ;; +esac + + +case " $postdeps_CXX " in +*" -lc "*) archive_cmds_need_lc_CXX=no ;; +esac + compiler_lib_search_dirs_CXX= +if test -n "${compiler_lib_search_path_CXX}"; then + compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` +fi + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + lt_prog_compiler_wl_CXX= +lt_prog_compiler_pic_CXX= +lt_prog_compiler_static_CXX= + + + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static_CXX='-Bstatic' + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic_CXX='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic_CXX='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all + lt_prog_compiler_pic_CXX= + ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + lt_prog_compiler_static_CXX= + ;; + interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic_CXX=-Kconform_pic + fi + ;; + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + ;; + *) + lt_prog_compiler_pic_CXX='-fPIC' + ;; + esac + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic_CXX='-fPIC -shared' + ;; + *) + lt_prog_compiler_pic_CXX='-fPIC' + ;; + esac + else + case $host_os in + aix[4-9]*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static_CXX='-Bstatic' + else + lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' + fi + ;; + chorus*) + case $cc_basename in + cxch68*) + # Green Hills C++ Compiler + # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" + ;; + esac + ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + ;; + dgux*) + case $cc_basename in + ec++*) + lt_prog_compiler_pic_CXX='-KPIC' + ;; + ghcx*) + # Green Hills C++ Compiler + lt_prog_compiler_pic_CXX='-pic' + ;; + *) + ;; + esac + ;; + freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) + case $cc_basename in + CC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' + if test "$host_cpu" != ia64; then + lt_prog_compiler_pic_CXX='+Z' + fi + ;; + aCC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic_CXX='+Z' + ;; + esac + ;; + *) + ;; + esac + ;; + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? + ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in + CC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='-non_shared' + # CC pic flag -KPIC is the default. + ;; + *) + ;; + esac + ;; + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in + KCC*) + # KAI C++ Compiler + lt_prog_compiler_wl_CXX='--backend -Wl,' + lt_prog_compiler_pic_CXX='-fPIC' + ;; + ecpc* ) + # old Intel C++ for x86_64 which still supported -KPIC. + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-static' + ;; + icpc* ) + # Intel C++, used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-fPIC' + lt_prog_compiler_static_CXX='-static' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-fpic' + lt_prog_compiler_static_CXX='-Bstatic' + ;; + cxx*) + # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + lt_prog_compiler_pic_CXX= + lt_prog_compiler_static_CXX='-non_shared' + ;; + xlc* | xlC* | bgxl[cC]* | mpixl[cC]*) + # IBM XL 8.0, 9.0 on PPC and BlueGene + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-qpic' + lt_prog_compiler_static_CXX='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-Bstatic' + lt_prog_compiler_wl_CXX='-Qoption ld ' + ;; + esac + ;; + esac + ;; + lynxos*) + ;; + m88k*) + ;; + mvs*) + case $cc_basename in + cxx*) + lt_prog_compiler_pic_CXX='-W c,exportall' + ;; + *) + ;; + esac + ;; + netbsd* | netbsdelf*-gnu) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic_CXX='-fPIC -shared' + ;; + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + lt_prog_compiler_wl_CXX='--backend -Wl,' + ;; + RCC*) + # Rational C++ 2.4.1 + lt_prog_compiler_pic_CXX='-pic' + ;; + cxx*) + # Digital/Compaq C++ + lt_prog_compiler_wl_CXX='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + lt_prog_compiler_pic_CXX= + lt_prog_compiler_static_CXX='-non_shared' + ;; + *) + ;; + esac + ;; + psos*) + ;; + solaris*) + case $cc_basename in + CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-Bstatic' + lt_prog_compiler_wl_CXX='-Qoption ld ' + ;; + gcx*) + # Green Hills C++ Compiler + lt_prog_compiler_pic_CXX='-PIC' + ;; + *) + ;; + esac + ;; + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + lt_prog_compiler_pic_CXX='-pic' + lt_prog_compiler_static_CXX='-Bstatic' + ;; + lcc*) + # Lucid + lt_prog_compiler_pic_CXX='-pic' + ;; + *) + ;; + esac + ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-Bstatic' + ;; + esac + ;; + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + lt_prog_compiler_pic_CXX='-KPIC' + ;; + *) + ;; + esac + ;; + vxworks*) + ;; + *) + lt_prog_compiler_can_build_shared_CXX=no + ;; + esac + fi + +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic_CXX= + ;; + *) + lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" + ;; +esac + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } +lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$lt_prog_compiler_pic_CXX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } +if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic_works_CXX=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_pic_works_CXX=yes + fi + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } + +if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then + case $lt_prog_compiler_pic_CXX in + "" | " "*) ;; + *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; + esac +else + lt_prog_compiler_pic_CXX= + lt_prog_compiler_can_build_shared_CXX=no +fi + +fi + + + + + +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if ${lt_cv_prog_compiler_static_works_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_static_works_CXX=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_static_works_CXX=yes + fi + else + lt_cv_prog_compiler_static_works_CXX=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } + +if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then + : +else + lt_prog_compiler_static_CXX= +fi + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o_CXX=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o_CXX=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o_CXX=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o_CXX=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } + + + + +hard_links="nottested" +if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +$as_echo_n "checking if we can lock with hard links... " >&6; } + hard_links=yes + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +$as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi +else + need_locks=no +fi + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + case $host_os in + aix[4-9]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global defined + # symbols, whereas GNU nm marks them as "W". + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + export_symbols_cmds_CXX="$ltdll_cmds" + ;; + cygwin* | mingw* | cegcc*) + case $cc_basename in + cl*) + exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' + ;; + esac + ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs_CXX=no + ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 +$as_echo "$ld_shlibs_CXX" >&6; } +test "$ld_shlibs_CXX" = no && can_build_shared=no + +with_gnu_ld_CXX=$with_gnu_ld + + + + + + +# +# Do we need to explicitly link libc? +# +case "x$archive_cmds_need_lc_CXX" in +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc_CXX=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $archive_cmds_CXX in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } +if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl_CXX + pic_flag=$lt_prog_compiler_pic_CXX + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag_CXX + allow_undefined_flag_CXX= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + then + lt_cv_archive_cmds_need_lc_CXX=no + else + lt_cv_archive_cmds_need_lc_CXX=yes + fi + allow_undefined_flag_CXX=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; } + archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX + ;; + esac + fi + ;; +esac + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +$as_echo_n "checking dynamic linker characteristics... " >&6; } + +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown + +case $host_os in +aix3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +aix[4-9]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + esac + ;; + +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi[45]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$cc_basename in + yes,*) + # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' + ;; + + *) + # Assume MSVC wrapper + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' + ;; + esac + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[23].*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2.*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[01]* | freebsdelf3.[01]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; + +haiku*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... + postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 + ;; + +interix[3-9]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux # correct to gnu/linux during the next big refactor + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + lt_cv_shlibpath_overrides_runpath=yes +fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + +fi + + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +*nto* | *qnx*) + version_type=qnx + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' + ;; + +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; + +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +rdos*) + dynamic_linker=no + ;; + +solaris*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +uts4*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +*) + dynamic_linker=no + ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +$as_echo "$dynamic_linker" >&6; } +test "$dynamic_linker" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +fi +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +fi + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } +hardcode_action_CXX= +if test -n "$hardcode_libdir_flag_spec_CXX" || + test -n "$runpath_var_CXX" || + test "X$hardcode_automatic_CXX" = "Xyes" ; then + + # We can hardcode non-existent directories. + if test "$hardcode_direct_CXX" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no && + test "$hardcode_minus_L_CXX" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_CXX=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_CXX=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_CXX=unsupported +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 +$as_echo "$hardcode_action_CXX" >&6; } + +if test "$hardcode_action_CXX" = relink || + test "$inherit_rpath_CXX" = yes; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + + + + + + + + fi # test -n "$compiler" + + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC + with_gnu_ld=$lt_save_with_gnu_ld + lt_cv_path_LDCXX=$lt_cv_path_LD + lt_cv_path_LD=$lt_save_path_LD + lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld + lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +fi # test "$_lt_caught_CXX_error" != yes + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +# Check whether --enable-largefile was given. +if test "${enable_largefile+set}" = set; then : + enableval=$enable_largefile; +fi + +if test "$enable_largefile" != no; then + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 +$as_echo_n "checking for special C compiler options needed for large files... " >&6; } +if ${ac_cv_sys_largefile_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + ac_save_CC=$CC + while :; do + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF + if ac_fn_c_try_compile "$LINENO"; then : + break +fi +rm -f core conftest.err conftest.$ac_objext + CC="$CC -n32" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_largefile_CC=' -n32'; break +fi +rm -f core conftest.err conftest.$ac_objext + break + done + CC=$ac_save_CC + rm -f conftest.$ac_ext + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 +$as_echo "$ac_cv_sys_largefile_CC" >&6; } + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } +if ${ac_cv_sys_file_offset_bits+:} false; then : + $as_echo_n "(cached) " >&6 +else + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_file_offset_bits=no; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _FILE_OFFSET_BITS 64 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_file_offset_bits=64; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_sys_file_offset_bits=unknown + break +done +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 +$as_echo "$ac_cv_sys_file_offset_bits" >&6; } +case $ac_cv_sys_file_offset_bits in #( + no | unknown) ;; + *) +cat >>confdefs.h <<_ACEOF +#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits +_ACEOF +;; +esac +rm -rf conftest* + if test $ac_cv_sys_file_offset_bits = unknown; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 +$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } +if ${ac_cv_sys_large_files+:} false; then : + $as_echo_n "(cached) " >&6 +else + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_large_files=no; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _LARGE_FILES 1 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_large_files=1; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_sys_large_files=unknown + break +done +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 +$as_echo "$ac_cv_sys_large_files" >&6; } +case $ac_cv_sys_large_files in #( + no | unknown) ;; + *) +cat >>confdefs.h <<_ACEOF +#define _LARGE_FILES $ac_cv_sys_large_files +_ACEOF +;; +esac +rm -rf conftest* + fi + + +fi + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.20 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi + +fi + +RAGEL=${RAGEL-"${am_missing_run}ragel"} + + +GIT=${GIT-"${am_missing_run}git"} + + +# Version + + + + +HB_VERSION_MAJOR=1 +HB_VERSION_MINOR=4 +HB_VERSION_MICRO=2 +HB_VERSION=1.4.2 + + + + + +# Libtool version + + + + +HB_LIBTOOL_VERSION_INFO=10400:2:10400 + + +# Documentation +have_gtk_doc=false + + + + + gtk_doc_requires="gtk-doc >= 1.15" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk-doc" >&5 +$as_echo_n "checking for gtk-doc... " >&6; } + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_doc_requires\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$gtk_doc_requires") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + have_gtk_doc=yes +else + have_gtk_doc=no +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gtk_doc" >&5 +$as_echo "$have_gtk_doc" >&6; } + + if test "$have_gtk_doc" = "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: + You will not be able to create source packages with 'make dist' + because $gtk_doc_requires is not found." >&5 +$as_echo "$as_me: WARNING: + You will not be able to create source packages with 'make dist' + because $gtk_doc_requires is not found." >&2;} + fi + + # Extract the first word of "gtkdoc-check", so it can be a program name with args. +set dummy gtkdoc-check; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_GTKDOC_CHECK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$GTKDOC_CHECK"; then + ac_cv_prog_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_GTKDOC_CHECK="gtkdoc-check.test" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +GTKDOC_CHECK=$ac_cv_prog_GTKDOC_CHECK +if test -n "$GTKDOC_CHECK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 +$as_echo "$GTKDOC_CHECK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + # Extract the first word of "gtkdoc-check", so it can be a program name with args. +set dummy gtkdoc-check; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GTKDOC_CHECK_PATH+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GTKDOC_CHECK_PATH in + [\\/]* | ?:[\\/]*) + ac_cv_path_GTKDOC_CHECK_PATH="$GTKDOC_CHECK_PATH" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GTKDOC_CHECK_PATH="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +GTKDOC_CHECK_PATH=$ac_cv_path_GTKDOC_CHECK_PATH +if test -n "$GTKDOC_CHECK_PATH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK_PATH" >&5 +$as_echo "$GTKDOC_CHECK_PATH" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + for ac_prog in gtkdoc-rebase +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GTKDOC_REBASE+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GTKDOC_REBASE in + [\\/]* | ?:[\\/]*) + ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE +if test -n "$GTKDOC_REBASE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5 +$as_echo "$GTKDOC_REBASE" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$GTKDOC_REBASE" && break +done +test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true" + + # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args. +set dummy gtkdoc-mkpdf; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GTKDOC_MKPDF+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GTKDOC_MKPDF in + [\\/]* | ?:[\\/]*) + ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF +if test -n "$GTKDOC_MKPDF"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5 +$as_echo "$GTKDOC_MKPDF" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + +# Check whether --with-html-dir was given. +if test "${with_html_dir+set}" = set; then : + withval=$with_html_dir; +else + with_html_dir='${datadir}/gtk-doc/html' +fi + + HTML_DIR="$with_html_dir" + + + # Check whether --enable-gtk-doc was given. +if test "${enable_gtk_doc+set}" = set; then : + enableval=$enable_gtk_doc; +else + enable_gtk_doc=no +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 +$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 +$as_echo "$enable_gtk_doc" >&6; } + + if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then + as_fn_error $? " + You must have $gtk_doc_requires installed to build documentation for + $PACKAGE_NAME. Please install gtk-doc or disable building the + documentation by adding '--disable-gtk-doc' to '$0'." "$LINENO" 5 + fi + + if test "x$PACKAGE_NAME" != "xglib"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 +$as_echo_n "checking for GTKDOC_DEPS... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$GTKDOC_DEPS_CFLAGS"; then + pkg_cv_GTKDOC_DEPS_CFLAGS="$GTKDOC_DEPS_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$GTKDOC_DEPS_LIBS"; then + pkg_cv_GTKDOC_DEPS_LIBS="$GTKDOC_DEPS_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0"` + else + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + : +elif test $pkg_failed = untried; then + : +else + GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS + GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + : +fi + fi + + # Check whether --enable-gtk-doc-html was given. +if test "${enable_gtk_doc_html+set}" = set; then : + enableval=$enable_gtk_doc_html; +else + enable_gtk_doc_html=yes +fi + + # Check whether --enable-gtk-doc-pdf was given. +if test "${enable_gtk_doc_pdf+set}" = set; then : + enableval=$enable_gtk_doc_pdf; +else + enable_gtk_doc_pdf=no +fi + + + if test -z "$GTKDOC_MKPDF"; then + enable_gtk_doc_pdf=no + fi + + if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 + fi + + + if test x$have_gtk_doc = xyes; then + HAVE_GTK_DOC_TRUE= + HAVE_GTK_DOC_FALSE='#' +else + HAVE_GTK_DOC_TRUE='#' + HAVE_GTK_DOC_FALSE= +fi + + if test x$enable_gtk_doc = xyes; then + ENABLE_GTK_DOC_TRUE= + ENABLE_GTK_DOC_FALSE='#' +else + ENABLE_GTK_DOC_TRUE='#' + ENABLE_GTK_DOC_FALSE= +fi + + if test x$enable_gtk_doc_html = xyes; then + GTK_DOC_BUILD_HTML_TRUE= + GTK_DOC_BUILD_HTML_FALSE='#' +else + GTK_DOC_BUILD_HTML_TRUE='#' + GTK_DOC_BUILD_HTML_FALSE= +fi + + if test x$enable_gtk_doc_pdf = xyes; then + GTK_DOC_BUILD_PDF_TRUE= + GTK_DOC_BUILD_PDF_FALSE='#' +else + GTK_DOC_BUILD_PDF_TRUE='#' + GTK_DOC_BUILD_PDF_FALSE= +fi + + if test -n "$LIBTOOL"; then + GTK_DOC_USE_LIBTOOL_TRUE= + GTK_DOC_USE_LIBTOOL_FALSE='#' +else + GTK_DOC_USE_LIBTOOL_TRUE='#' + GTK_DOC_USE_LIBTOOL_FALSE= +fi + + if test -n "$GTKDOC_REBASE"; then + GTK_DOC_USE_REBASE_TRUE= + GTK_DOC_USE_REBASE_FALSE='#' +else + GTK_DOC_USE_REBASE_TRUE='#' + GTK_DOC_USE_REBASE_FALSE= +fi + + + if test "x$enable_gtk_doc" = xyes; then + have_gtk_doc=true + fi + + +# Functions and headers +for ac_func in atexit mprotect sysconf getpagesize mmap isatty +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + +for ac_header in unistd.h sys/mman.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + +# Compiler flags + +# The cast to long int works around a bug in the HP C Compiler, +# see AC_CHECK_SIZEOF for more information. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of struct{char;}" >&5 +$as_echo_n "checking alignment of struct{char;}... " >&6; } +if ${ac_cv_alignof_struct_char__+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_struct_char__" "$ac_includes_default +#ifndef offsetof +# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0) +#endif +typedef struct { char x; struct{char;} y; } ac__type_alignof_;"; then : + +else + if test "$ac_cv_type_struct_char__" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute alignment of struct{char;} +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_alignof_struct_char__=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_struct_char__" >&5 +$as_echo "$ac_cv_alignof_struct_char__" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define ALIGNOF_STRUCT_CHAR__ $ac_cv_alignof_struct_char__ +_ACEOF + + +if test "x$GCC" = "xyes"; then + + # Make symbols link locally + LDFLAGS="$LDFLAGS -Bsymbolic-functions" + + # Make sure we don't link to libstdc++ + CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions" + + # Assorted warnings + CXXFLAGS="$CXXFLAGS -Wcast-align" + + case "$host" in + *-*-mingw*) + ;; + *) + # Hide inline methods + CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden" + ;; + esac + + case "$host" in + arm-*-*) + if test "x$ac_cv_alignof_struct_char__" != x1; then + # Request byte alignment + CXXFLAGS="$CXXFLAGS -mstructure-size-boundary=8" + fi + ;; + esac +fi + + if test "x$GCC" = "xyes"; then + HAVE_GCC_TRUE= + HAVE_GCC_FALSE='#' +else + HAVE_GCC_TRUE='#' + HAVE_GCC_FALSE= +fi + + +hb_os_win32=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native Win32" >&5 +$as_echo_n "checking for native Win32... " >&6; } +case "$host" in + *-*-mingw*) + hb_os_win32=yes + ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hb_os_win32" >&5 +$as_echo "$hb_os_win32" >&6; } + if test "$hb_os_win32" = "yes"; then + OS_WIN32_TRUE= + OS_WIN32_FALSE='#' +else + OS_WIN32_TRUE='#' + OS_WIN32_FALSE= +fi + + +have_pthread=false +if test "$hb_os_win32" = no; then + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ax_pthread_ok=no + +# We used to check for pthread.h first, but this fails if pthread.h +# requires special compiler flags (e.g. on True64 or Sequent). +# It gets checked for in the link test anyway. + +# First of all, check if the user has set any of the PTHREAD_LIBS, +# etcetera environment variables, and if threads linking works using +# them: +if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 +$as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_join (); +int +main () +{ +return pthread_join (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_pthread_ok=yes +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5 +$as_echo "$ax_pthread_ok" >&6; } + if test x"$ax_pthread_ok" = xno; then + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" + fi + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" +fi + +# We must check for the threads library under a number of different +# names; the ordering is very important because some systems +# (e.g. DEC) have both -lpthread and -lpthreads, where one of the +# libraries is broken (non-POSIX). + +# Create a list of thread flags to try. Items starting with a "-" are +# C compiler flags, and other items are library names, except for "none" +# which indicates that we try without any flags at all, and "pthread-config" +# which is a program returning the flags for the Pth emulation library. + +ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" + +# The ordering *is* (sometimes) important. Some notes on the +# individual items follow: + +# pthreads: AIX (must check this before -lpthread) +# none: in case threads are in libc; should be tried before -Kthread and +# other compiler flags to prevent continual compiler warnings +# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) +# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) +# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) +# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) +# -pthreads: Solaris/gcc +# -mthreads: Mingw32/gcc, Lynx/gcc +# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it +# doesn't hurt to check since this sometimes defines pthreads too; +# also defines -D_REENTRANT) +# ... -mt is also the pthreads flag for HP/aCC +# pthread: Linux, etcetera +# --thread-safe: KAI C++ +# pthread-config: use pthread-config program (for GNU Pth library) + +case ${host_os} in + solaris*) + + # On Solaris (at least, for some versions), libc contains stubbed + # (non-functional) versions of the pthreads routines, so link-based + # tests will erroneously succeed. (We need to link with -pthreads/-mt/ + # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather + # a function called by this macro, so we could check for that, but + # who knows whether they'll stub that too in a future libc.) So, + # we'll just look for -pthreads and -lpthread first: + + ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags" + ;; + + darwin*) + ax_pthread_flags="-pthread $ax_pthread_flags" + ;; +esac + +if test x"$ax_pthread_ok" = xno; then +for flag in $ax_pthread_flags; do + + case $flag in + none) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5 +$as_echo_n "checking whether pthreads work without any flags... " >&6; } + ;; + + -*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5 +$as_echo_n "checking whether pthreads work with $flag... " >&6; } + PTHREAD_CFLAGS="$flag" + ;; + + pthread-config) + # Extract the first word of "pthread-config", so it can be a program name with args. +set dummy pthread-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ax_pthread_config+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ax_pthread_config"; then + ac_cv_prog_ax_pthread_config="$ax_pthread_config" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ax_pthread_config="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_ax_pthread_config" && ac_cv_prog_ax_pthread_config="no" +fi +fi +ax_pthread_config=$ac_cv_prog_ax_pthread_config +if test -n "$ax_pthread_config"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_config" >&5 +$as_echo "$ax_pthread_config" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test x"$ax_pthread_config" = xno; then continue; fi + PTHREAD_CFLAGS="`pthread-config --cflags`" + PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" + ;; + + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5 +$as_echo_n "checking for the pthreads library -l$flag... " >&6; } + PTHREAD_LIBS="-l$flag" + ;; + esac + + save_LIBS="$LIBS" + save_CFLAGS="$CFLAGS" + LIBS="$PTHREAD_LIBS $LIBS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + + # Check for various functions. We must include pthread.h, + # since some functions may be macros. (On the Sequent, we + # need a special flag -Kthread to make this header compile.) + # We check for pthread_join because it is in -lpthread on IRIX + # while pthread_create is in libc. We check for pthread_attr_init + # due to DEC craziness with -lpthreads. We check for + # pthread_cleanup_push because it is one of the few pthread + # functions on Solaris that doesn't have a non-functional libc stub. + # We try pthread_create on general principles. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + static void routine(void *a) { a = 0; } + static void *start_routine(void *a) { return a; } +int +main () +{ +pthread_t th; pthread_attr_t attr; + pthread_create(&th, 0, start_routine, 0); + pthread_join(th, 0); + pthread_attr_init(&attr); + pthread_cleanup_push(routine, 0); + pthread_cleanup_pop(0) /* ; */ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_pthread_ok=yes +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5 +$as_echo "$ax_pthread_ok" >&6; } + if test "x$ax_pthread_ok" = xyes; then + break; + fi + + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" +done +fi + +# Various other checks: +if test "x$ax_pthread_ok" = xyes; then + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + + # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 +$as_echo_n "checking for joinable pthread attribute... " >&6; } + attr_name=unknown + for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +int attr = $attr; return attr /* ; */ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + attr_name=$attr; break +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + done + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $attr_name" >&5 +$as_echo "$attr_name" >&6; } + if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then + +cat >>confdefs.h <<_ACEOF +#define PTHREAD_CREATE_JOINABLE $attr_name +_ACEOF + + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5 +$as_echo_n "checking if more special flags are required for pthreads... " >&6; } + flag=no + case ${host_os} in + aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";; + osf* | hpux*) flag="-D_REENTRANT";; + solaris*) + if test "$GCC" = "yes"; then + flag="-D_REENTRANT" + else + flag="-mt -D_REENTRANT" + fi + ;; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5 +$as_echo "${flag}" >&6; } + if test "x$flag" != xno; then + PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_PRIO_INHERIT" >&5 +$as_echo_n "checking for PTHREAD_PRIO_INHERIT... " >&6; } +if ${ax_cv_PTHREAD_PRIO_INHERIT+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include +int +main () +{ +int i = PTHREAD_PRIO_INHERIT; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_PTHREAD_PRIO_INHERIT=yes +else + ax_cv_PTHREAD_PRIO_INHERIT=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_PRIO_INHERIT" >&5 +$as_echo "$ax_cv_PTHREAD_PRIO_INHERIT" >&6; } + if test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"; then : + +$as_echo "#define HAVE_PTHREAD_PRIO_INHERIT 1" >>confdefs.h + +fi + + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" + + # More AIX lossage: must compile with xlc_r or cc_r + if test x"$GCC" != xyes; then + for ac_prog in xlc_r cc_r +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_PTHREAD_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$PTHREAD_CC"; then + ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_PTHREAD_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +PTHREAD_CC=$ac_cv_prog_PTHREAD_CC +if test -n "$PTHREAD_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5 +$as_echo "$PTHREAD_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$PTHREAD_CC" && break +done +test -n "$PTHREAD_CC" || PTHREAD_CC="${CC}" + + else + PTHREAD_CC=$CC + fi +else + PTHREAD_CC="$CC" +fi + + + + + +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: +if test x"$ax_pthread_ok" = xyes; then + have_pthread=true + : +else + ax_pthread_ok=no + +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +fi +if $have_pthread; then + +$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h + +fi + if $have_pthread; then + HAVE_PTHREAD_TRUE= + HAVE_PTHREAD_FALSE='#' +else + HAVE_PTHREAD_TRUE='#' + HAVE_PTHREAD_FALSE= +fi + + + +have_ot=true +if $have_ot; then + +$as_echo "#define HAVE_OT 1" >>confdefs.h + +fi + if $have_ot; then + HAVE_OT_TRUE= + HAVE_OT_FALSE='#' +else + HAVE_OT_TRUE='#' + HAVE_OT_FALSE= +fi + + +have_fallback=true +if $have_fallback; then + +$as_echo "#define HAVE_FALLBACK 1" >>confdefs.h + +fi + if $have_fallback; then + HAVE_FALLBACK_TRUE= + HAVE_FALLBACK_FALSE='#' +else + HAVE_FALLBACK_TRUE='#' + HAVE_FALLBACK_FALSE= +fi + + + + +# Check whether --with-glib was given. +if test "${with_glib+set}" = set; then : + withval=$with_glib; +else + with_glib=auto +fi + +have_glib=false +GLIB_DEPS="glib-2.0 >= 2.19.1" + +if test "x$with_glib" = "xyes" -o "x$with_glib" = "xauto"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 +$as_echo_n "checking for GLIB... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$GLIB_CFLAGS"; then + pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GLIB_DEPS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$GLIB_DEPS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "$GLIB_DEPS" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$GLIB_LIBS"; then + pkg_cv_GLIB_LIBS="$GLIB_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GLIB_DEPS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$GLIB_DEPS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "$GLIB_DEPS" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GLIB_DEPS"` + else + GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GLIB_DEPS"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GLIB_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + : +elif test $pkg_failed = untried; then + : +else + GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS + GLIB_LIBS=$pkg_cv_GLIB_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_glib=true +fi +fi +if test "x$with_glib" = "xyes" -a "x$have_glib" != "xtrue"; then + as_fn_error $? "glib support requested but glib-2.0 not found" "$LINENO" 5 +fi +if $have_glib; then + +$as_echo "#define HAVE_GLIB 1" >>confdefs.h + +fi + if $have_glib; then + HAVE_GLIB_TRUE= + HAVE_GLIB_FALSE='#' +else + HAVE_GLIB_TRUE='#' + HAVE_GLIB_FALSE= +fi + + + + +# Check whether --with-gobject was given. +if test "${with_gobject+set}" = set; then : + withval=$with_gobject; +else + with_gobject=no +fi + +have_gobject=false +if test "x$with_gobject" = "xyes" -o "x$with_gobject" = "xauto"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOBJECT" >&5 +$as_echo_n "checking for GOBJECT... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$GOBJECT_CFLAGS"; then + pkg_cv_GOBJECT_CFLAGS="$GOBJECT_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 glib-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gobject-2.0 glib-2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GOBJECT_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0 glib-2.0" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$GOBJECT_LIBS"; then + pkg_cv_GOBJECT_LIBS="$GOBJECT_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 glib-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gobject-2.0 glib-2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GOBJECT_LIBS=`$PKG_CONFIG --libs "gobject-2.0 glib-2.0" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GOBJECT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gobject-2.0 glib-2.0"` + else + GOBJECT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gobject-2.0 glib-2.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GOBJECT_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + : +elif test $pkg_failed = untried; then + : +else + GOBJECT_CFLAGS=$pkg_cv_GOBJECT_CFLAGS + GOBJECT_LIBS=$pkg_cv_GOBJECT_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_gobject=true +fi +fi +if test "x$with_gobject" = "xyes" -a "x$have_gobject" != "xtrue"; then + as_fn_error $? "gobject support requested but gobject-2.0 / glib-2.0 not found" "$LINENO" 5 +fi +if $have_gobject; then + +$as_echo "#define HAVE_GOBJECT 1" >>confdefs.h + + GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` + +fi + if $have_gobject; then + HAVE_GOBJECT_TRUE= + HAVE_GOBJECT_FALSE='#' +else + HAVE_GOBJECT_TRUE='#' + HAVE_GOBJECT_FALSE= +fi + + + + +# Gobject-Introspection +have_introspection=false + + if $have_gobject; then + + + + # Check whether --enable-introspection was given. +if test "${enable_introspection+set}" = set; then : + enableval=$enable_introspection; +else + enable_introspection=auto +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-introspection" >&5 +$as_echo_n "checking for gobject-introspection... " >&6; } + + case $enable_introspection in #( + no) : + found_introspection="no (disabled, use --enable-introspection to enable)" + ;; #( + yes) : + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + : +else + as_fn_error $? "gobject-introspection-1.0 is not installed" "$LINENO" 5 +fi + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 1.34.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 1.34.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + found_introspection=yes +else + as_fn_error $? "You need to have gobject-introspection >= 1.34.0 installed to build HarfBuzz" "$LINENO" 5 +fi + ;; #( + auto) : + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 1.34.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 1.34.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + found_introspection=yes +else + found_introspection=no +fi + enable_introspection=$found_introspection + ;; #( + *) : + as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5 + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5 +$as_echo "$found_introspection" >&6; } + + INTROSPECTION_SCANNER= + INTROSPECTION_COMPILER= + INTROSPECTION_GENERATE= + INTROSPECTION_GIRDIR= + INTROSPECTION_TYPELIBDIR= + if test "x$found_introspection" = "xyes"; then + INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection + fi + + + + + + + + + + if test "x$found_introspection" = "xyes"; then + HAVE_INTROSPECTION_TRUE= + HAVE_INTROSPECTION_FALSE='#' +else + HAVE_INTROSPECTION_TRUE='#' + HAVE_INTROSPECTION_FALSE= +fi + + + + if test "x$found_introspection" = xyes; then + have_introspection=true + fi + else + if false; then + HAVE_INTROSPECTION_TRUE= + HAVE_INTROSPECTION_FALSE='#' +else + HAVE_INTROSPECTION_TRUE='#' + HAVE_INTROSPECTION_FALSE= +fi + + fi + + + + +# Check whether --with-cairo was given. +if test "${with_cairo+set}" = set; then : + withval=$with_cairo; +else + with_cairo=auto +fi + +have_cairo=false +if test "x$with_cairo" = "xyes" -o "x$with_cairo" = "xauto"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO" >&5 +$as_echo_n "checking for CAIRO... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$CAIRO_CFLAGS"; then + pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.8.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "cairo >= 1.8.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 1.8.0" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$CAIRO_LIBS"; then + pkg_cv_CAIRO_LIBS="$CAIRO_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.8.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "cairo >= 1.8.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= 1.8.0" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "cairo >= 1.8.0"` + else + CAIRO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo >= 1.8.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$CAIRO_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + : +elif test $pkg_failed = untried; then + : +else + CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS + CAIRO_LIBS=$pkg_cv_CAIRO_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_cairo=true +fi +fi +if test "x$with_cairo" = "xyes" -a "x$have_cairo" != "xtrue"; then + as_fn_error $? "cairo support requested but not found" "$LINENO" 5 +fi +if $have_cairo; then + +$as_echo "#define HAVE_CAIRO 1" >>confdefs.h + +fi + if $have_cairo; then + HAVE_CAIRO_TRUE= + HAVE_CAIRO_FALSE='#' +else + HAVE_CAIRO_TRUE='#' + HAVE_CAIRO_FALSE= +fi + + +have_cairo_ft=false +if $have_cairo; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO_FT" >&5 +$as_echo_n "checking for CAIRO_FT... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$CAIRO_FT_CFLAGS"; then + pkg_cv_CAIRO_FT_CFLAGS="$CAIRO_FT_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-ft\""; } >&5 + ($PKG_CONFIG --exists --print-errors "cairo-ft") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_CAIRO_FT_CFLAGS=`$PKG_CONFIG --cflags "cairo-ft" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$CAIRO_FT_LIBS"; then + pkg_cv_CAIRO_FT_LIBS="$CAIRO_FT_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-ft\""; } >&5 + ($PKG_CONFIG --exists --print-errors "cairo-ft") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_CAIRO_FT_LIBS=`$PKG_CONFIG --libs "cairo-ft" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + CAIRO_FT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "cairo-ft"` + else + CAIRO_FT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo-ft"` + fi + # Put the nasty error message in config.log where it belongs + echo "$CAIRO_FT_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + : +elif test $pkg_failed = untried; then + : +else + CAIRO_FT_CFLAGS=$pkg_cv_CAIRO_FT_CFLAGS + CAIRO_FT_LIBS=$pkg_cv_CAIRO_FT_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_cairo_ft=true +fi +fi +if $have_cairo_ft; then + +$as_echo "#define HAVE_CAIRO_FT 1" >>confdefs.h + +fi + if $have_cairo_ft; then + HAVE_CAIRO_FT_TRUE= + HAVE_CAIRO_FT_FALSE='#' +else + HAVE_CAIRO_FT_TRUE='#' + HAVE_CAIRO_FT_FALSE= +fi + + + + +# Check whether --with-fontconfig was given. +if test "${with_fontconfig+set}" = set; then : + withval=$with_fontconfig; +else + with_fontconfig=auto +fi + +have_fontconfig=false +if test "x$with_fontconfig" = "xyes" -o "x$with_fontconfig" = "xauto"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FONTCONFIG" >&5 +$as_echo_n "checking for FONTCONFIG... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$FONTCONFIG_CFLAGS"; then + pkg_cv_FONTCONFIG_CFLAGS="$FONTCONFIG_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig\""; } >&5 + ($PKG_CONFIG --exists --print-errors "fontconfig") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_FONTCONFIG_CFLAGS=`$PKG_CONFIG --cflags "fontconfig" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$FONTCONFIG_LIBS"; then + pkg_cv_FONTCONFIG_LIBS="$FONTCONFIG_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig\""; } >&5 + ($PKG_CONFIG --exists --print-errors "fontconfig") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_FONTCONFIG_LIBS=`$PKG_CONFIG --libs "fontconfig" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "fontconfig"` + else + FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "fontconfig"` + fi + # Put the nasty error message in config.log where it belongs + echo "$FONTCONFIG_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + : +elif test $pkg_failed = untried; then + : +else + FONTCONFIG_CFLAGS=$pkg_cv_FONTCONFIG_CFLAGS + FONTCONFIG_LIBS=$pkg_cv_FONTCONFIG_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_fontconfig=true +fi +fi +if test "x$with_fontconfig" = "xyes" -a "x$have_fontconfig" != "xtrue"; then + as_fn_error $? "fontconfig support requested but not found" "$LINENO" 5 +fi +if $have_fontconfig; then + +$as_echo "#define HAVE_FONTCONFIG 1" >>confdefs.h + +fi + if $have_fontconfig; then + HAVE_FONTCONFIG_TRUE= + HAVE_FONTCONFIG_FALSE='#' +else + HAVE_FONTCONFIG_TRUE='#' + HAVE_FONTCONFIG_FALSE= +fi + + + + +# Check whether --with-icu was given. +if test "${with_icu+set}" = set; then : + withval=$with_icu; +else + with_icu=auto +fi + +have_icu=false +if test "x$with_icu" = "xyes" -o "x$with_icu" = "xbuiltin" -o "x$with_icu" = "xauto"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ICU" >&5 +$as_echo_n "checking for ICU... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$ICU_CFLAGS"; then + pkg_cv_ICU_CFLAGS="$ICU_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc\""; } >&5 + ($PKG_CONFIG --exists --print-errors "icu-uc") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-uc" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$ICU_LIBS"; then + pkg_cv_ICU_LIBS="$ICU_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc\""; } >&5 + ($PKG_CONFIG --exists --print-errors "icu-uc") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ICU_LIBS=`$PKG_CONFIG --libs "icu-uc" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + ICU_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "icu-uc"` + else + ICU_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "icu-uc"` + fi + # Put the nasty error message in config.log where it belongs + echo "$ICU_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + : +elif test $pkg_failed = untried; then + : +else + ICU_CFLAGS=$pkg_cv_ICU_CFLAGS + ICU_LIBS=$pkg_cv_ICU_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_icu=true +fi + + if test "$have_icu" != "true"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}icu-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}icu-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ICU_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ICU_CONFIG"; then + ac_cv_prog_ICU_CONFIG="$ICU_CONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ICU_CONFIG="${ac_tool_prefix}icu-config" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ICU_CONFIG=$ac_cv_prog_ICU_CONFIG +if test -n "$ICU_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ICU_CONFIG" >&5 +$as_echo "$ICU_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_ICU_CONFIG"; then + ac_ct_ICU_CONFIG=$ICU_CONFIG + # Extract the first word of "icu-config", so it can be a program name with args. +set dummy icu-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_ICU_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_ICU_CONFIG"; then + ac_cv_prog_ac_ct_ICU_CONFIG="$ac_ct_ICU_CONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_ICU_CONFIG="icu-config" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_ICU_CONFIG=$ac_cv_prog_ac_ct_ICU_CONFIG +if test -n "$ac_ct_ICU_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_ICU_CONFIG" >&5 +$as_echo "$ac_ct_ICU_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_ICU_CONFIG" = x; then + ICU_CONFIG="no" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + ICU_CONFIG=$ac_ct_ICU_CONFIG + fi +else + ICU_CONFIG="$ac_cv_prog_ICU_CONFIG" +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ICU by using icu-config fallback" >&5 +$as_echo_n "checking for ICU by using icu-config fallback... " >&6; } + if test "$ICU_CONFIG" != "no" && "$ICU_CONFIG" --version >/dev/null; then + have_icu=true + # We don't use --cflags as this gives us a lot of things that we don't + # necessarily want, like debugging and optimization flags + # See man (1) icu-config for more info. + ICU_CFLAGS=`$ICU_CONFIG --cppflags` + ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-libsonly` + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + fi +fi +if test \( "x$with_icu" = "xyes" -o "x$with_icu" = "xbuiltin" \) -a "x$have_icu" != "xtrue"; then + as_fn_error $? "icu support requested but icu-uc not found" "$LINENO" 5 +fi + +if $have_icu; then + CXXFLAGS="$CXXFLAGS `$PKG_CONFIG --variable=CXXFLAGS icu-uc`" + +$as_echo "#define HAVE_ICU 1" >>confdefs.h + + if test "x$with_icu" = "xbuiltin"; then + +$as_echo "#define HAVE_ICU_BUILTIN 1" >>confdefs.h + + fi +fi + if $have_icu; then + HAVE_ICU_TRUE= + HAVE_ICU_FALSE='#' +else + HAVE_ICU_TRUE='#' + HAVE_ICU_FALSE= +fi + + if $have_icu && test "x$with_icu" = "xbuiltin"; then + HAVE_ICU_BUILTIN_TRUE= + HAVE_ICU_BUILTIN_FALSE='#' +else + HAVE_ICU_BUILTIN_TRUE='#' + HAVE_ICU_BUILTIN_FALSE= +fi + + + + +# Check whether --with-ucdn was given. +if test "${with_ucdn+set}" = set; then : + withval=$with_ucdn; +else + with_ucdn=yes +fi + +have_ucdn=false +if test "x$with_ucdn" = "xyes"; then + have_ucdn=true +fi +if $have_ucdn; then + +$as_echo "#define HAVE_UCDN 1" >>confdefs.h + +fi + if $have_ucdn; then + HAVE_UCDN_TRUE= + HAVE_UCDN_FALSE='#' +else + HAVE_UCDN_TRUE='#' + HAVE_UCDN_FALSE= +fi + + + + +# Check whether --with-graphite2 was given. +if test "${with_graphite2+set}" = set; then : + withval=$with_graphite2; +else + with_graphite2=no +fi + +have_graphite2=false +GRAPHITE2_DEPS="graphite2" + +if test "x$with_graphite2" = "xyes" -o "x$with_graphite2" = "xauto"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GRAPHITE2" >&5 +$as_echo_n "checking for GRAPHITE2... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$GRAPHITE2_CFLAGS"; then + pkg_cv_GRAPHITE2_CFLAGS="$GRAPHITE2_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GRAPHITE2_DEPS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$GRAPHITE2_DEPS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GRAPHITE2_CFLAGS=`$PKG_CONFIG --cflags "$GRAPHITE2_DEPS" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$GRAPHITE2_LIBS"; then + pkg_cv_GRAPHITE2_LIBS="$GRAPHITE2_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GRAPHITE2_DEPS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$GRAPHITE2_DEPS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GRAPHITE2_LIBS=`$PKG_CONFIG --libs "$GRAPHITE2_DEPS" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GRAPHITE2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GRAPHITE2_DEPS"` + else + GRAPHITE2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GRAPHITE2_DEPS"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GRAPHITE2_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + : +elif test $pkg_failed = untried; then + : +else + GRAPHITE2_CFLAGS=$pkg_cv_GRAPHITE2_CFLAGS + GRAPHITE2_LIBS=$pkg_cv_GRAPHITE2_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_graphite2=true +fi + if test "x$have_graphite2" != "xtrue"; then + # If pkg-config is not available, graphite2 can still be there + ac_save_CFLAGS="$CFLAGS" + ac_save_CPPFLAGS="$CPPFLAGS" + CFLAGS="$CFLAGS $GRAPHITE2_CFLAGS" + CPPFLAGS="$CPPFLAGS $GRAPHITE2_CFLAGS" + ac_fn_c_check_header_mongrel "$LINENO" "graphite2/Segment.h" "ac_cv_header_graphite2_Segment_h" "$ac_includes_default" +if test "x$ac_cv_header_graphite2_Segment_h" = xyes; then : + have_graphite2=true +else + : +fi + + + CPPFLAGS="$ac_save_CPPFLAGS" + CFLAGS="$ac_save_CFLAGS" + fi +fi +if test "x$with_graphite2" = "xyes" -a "x$have_graphite2" != "xtrue"; then + as_fn_error $? "graphite2 support requested but libgraphite2 not found" "$LINENO" 5 +fi +if $have_graphite2; then + +$as_echo "#define HAVE_GRAPHITE2 1" >>confdefs.h + +fi + if $have_graphite2; then + HAVE_GRAPHITE2_TRUE= + HAVE_GRAPHITE2_FALSE='#' +else + HAVE_GRAPHITE2_TRUE='#' + HAVE_GRAPHITE2_FALSE= +fi + + + + +# Check whether --with-freetype was given. +if test "${with_freetype+set}" = set; then : + withval=$with_freetype; +else + with_freetype=auto +fi + +have_freetype=false +FREETYPE_DEPS="freetype2 >= 12.0.6" + +if test "x$with_freetype" = "xyes" -o "x$with_freetype" = "xauto"; then + # See freetype/docs/VERSION.DLL; 12.0.6 means freetype-2.4.2 + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FREETYPE" >&5 +$as_echo_n "checking for FREETYPE... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$FREETYPE_CFLAGS"; then + pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$FREETYPE_DEPS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$FREETYPE_DEPS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "$FREETYPE_DEPS" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$FREETYPE_LIBS"; then + pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$FREETYPE_DEPS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$FREETYPE_DEPS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "$FREETYPE_DEPS" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$FREETYPE_DEPS"` + else + FREETYPE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$FREETYPE_DEPS"` + fi + # Put the nasty error message in config.log where it belongs + echo "$FREETYPE_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + : +elif test $pkg_failed = untried; then + : +else + FREETYPE_CFLAGS=$pkg_cv_FREETYPE_CFLAGS + FREETYPE_LIBS=$pkg_cv_FREETYPE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_freetype=true +fi +fi +if test "x$with_freetype" = "xyes" -a "x$have_freetype" != "xtrue"; then + as_fn_error $? "FreeType support requested but libfreetype2 not found" "$LINENO" 5 +fi +if $have_freetype; then + +$as_echo "#define HAVE_FREETYPE 1" >>confdefs.h + + save_libs=$LIBS + LIBS="$LIBS $FREETYPE_LIBS" + for ac_func in FT_Get_Var_Blend_Coordinates +do : + ac_fn_c_check_func "$LINENO" "FT_Get_Var_Blend_Coordinates" "ac_cv_func_FT_Get_Var_Blend_Coordinates" +if test "x$ac_cv_func_FT_Get_Var_Blend_Coordinates" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_FT_GET_VAR_BLEND_COORDINATES 1 +_ACEOF + +fi +done + + LIBS=$save_libs +fi + if $have_freetype; then + HAVE_FREETYPE_TRUE= + HAVE_FREETYPE_FALSE='#' +else + HAVE_FREETYPE_TRUE='#' + HAVE_FREETYPE_FALSE= +fi + + + + +# Check whether --with-uniscribe was given. +if test "${with_uniscribe+set}" = set; then : + withval=$with_uniscribe; +else + with_uniscribe=no +fi + +have_uniscribe=false +if test "x$with_uniscribe" = "xyes" -o "x$with_uniscribe" = "xauto"; then + for ac_header in usp10.h windows.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + have_uniscribe=true +fi + +done + +fi +if test "x$with_uniscribe" = "xyes" -a "x$have_uniscribe" != "xtrue"; then + as_fn_error $? "uniscribe support requested but not found" "$LINENO" 5 +fi +if $have_uniscribe; then + UNISCRIBE_CFLAGS= + UNISCRIBE_LIBS="-lusp10 -lgdi32 -lrpcrt4" + + + +$as_echo "#define HAVE_UNISCRIBE 1" >>confdefs.h + +fi + if $have_uniscribe; then + HAVE_UNISCRIBE_TRUE= + HAVE_UNISCRIBE_FALSE='#' +else + HAVE_UNISCRIBE_TRUE='#' + HAVE_UNISCRIBE_FALSE= +fi + + + + +# Check whether --with-directwrite was given. +if test "${with_directwrite+set}" = set; then : + withval=$with_directwrite; +else + with_directwrite=no +fi + +have_directwrite=false +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +if test "x$with_directwrite" = "xyes" -o "x$with_directwrite" = "xauto"; then + +for ac_header in dwrite.h +do : + ac_fn_cxx_check_header_mongrel "$LINENO" "dwrite.h" "ac_cv_header_dwrite_h" "$ac_includes_default" +if test "x$ac_cv_header_dwrite_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DWRITE_H 1 +_ACEOF + have_directwrite=true +fi + +done + +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +if test "x$with_directwrite" = "xyes" -a "x$have_directwrite" != "xtrue"; then + as_fn_error $? "directwrite support requested but not found" "$LINENO" 5 +fi +if $have_directwrite; then + DIRECTWRITE_CXXFLAGS= + DIRECTWRITE_LIBS="-ldwrite" + + + +$as_echo "#define HAVE_DIRECTWRITE 1" >>confdefs.h + +fi + if $have_directwrite; then + HAVE_DIRECTWRITE_TRUE= + HAVE_DIRECTWRITE_FALSE='#' +else + HAVE_DIRECTWRITE_TRUE='#' + HAVE_DIRECTWRITE_FALSE= +fi + + + + +# Check whether --with-coretext was given. +if test "${with_coretext+set}" = set; then : + withval=$with_coretext; +else + with_coretext=no +fi + +have_coretext=false +if test "x$with_coretext" = "xyes" -o "x$with_coretext" = "xauto"; then + ac_fn_c_check_type "$LINENO" "CTFontRef" "ac_cv_type_CTFontRef" "#include +" +if test "x$ac_cv_type_CTFontRef" = xyes; then : + have_coretext=true +fi + + + if $have_coretext; then + CORETEXT_CFLAGS= + CORETEXT_LIBS="-framework ApplicationServices" + + + else + # On iOS CoreText and CoreGraphics are stand-alone frameworks + if test "x$have_coretext" != "xtrue"; then + # Check for a different symbol to avoid getting cached result. + ac_fn_c_check_type "$LINENO" "CTRunRef" "ac_cv_type_CTRunRef" "#include +" +if test "x$ac_cv_type_CTRunRef" = xyes; then : + have_coretext=true +fi + + fi + + if $have_coretext; then + CORETEXT_CFLAGS= + CORETEXT_LIBS="-framework CoreText -framework CoreGraphics" + + + fi + fi +fi +if test "x$with_coretext" = "xyes" -a "x$have_coretext" != "xtrue"; then + as_fn_error $? "CoreText support requested but libcoretext not found" "$LINENO" 5 +fi +if $have_coretext; then + +$as_echo "#define HAVE_CORETEXT 1" >>confdefs.h + +fi + if $have_coretext; then + HAVE_CORETEXT_TRUE= + HAVE_CORETEXT_FALSE='#' +else + HAVE_CORETEXT_TRUE='#' + HAVE_CORETEXT_FALSE= +fi + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Intel atomic primitives" >&5 +$as_echo_n "checking for Intel atomic primitives... " >&6; } +if ${hb_cv_have_intel_atomic_primitives+:} false; then : + $as_echo_n "(cached) " >&6 +else + + hb_cv_have_intel_atomic_primitives=false + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + void memory_barrier (void) { __sync_synchronize (); } + int atomic_add (int *i) { return __sync_fetch_and_add (i, 1); } + int mutex_trylock (int *m) { return __sync_lock_test_and_set (m, 1); } + void mutex_unlock (int *m) { __sync_lock_release (m); } + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + hb_cv_have_intel_atomic_primitives=true + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hb_cv_have_intel_atomic_primitives" >&5 +$as_echo "$hb_cv_have_intel_atomic_primitives" >&6; } +if $hb_cv_have_intel_atomic_primitives; then + +$as_echo "#define HAVE_INTEL_ATOMIC_PRIMITIVES 1" >>confdefs.h + +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Solaris atomic operations" >&5 +$as_echo_n "checking for Solaris atomic operations... " >&6; } +if ${hb_cv_have_solaris_atomic_ops+:} false; then : + $as_echo_n "(cached) " >&6 +else + + hb_cv_have_solaris_atomic_ops=false + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + /* This requires Solaris Studio 12.2 or newer: */ + #include + void memory_barrier (void) { __machine_rw_barrier (); } + int atomic_add (volatile unsigned *i) { return atomic_add_int_nv (i, 1); } + void *atomic_ptr_cmpxchg (volatile void **target, void *cmp, void *newval) { return atomic_cas_ptr (target, cmp, newval); } + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + hb_cv_have_solaris_atomic_ops=true + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hb_cv_have_solaris_atomic_ops" >&5 +$as_echo "$hb_cv_have_solaris_atomic_ops" >&6; } +if $hb_cv_have_solaris_atomic_ops; then + +$as_echo "#define HAVE_SOLARIS_ATOMIC_OPS 1" >>confdefs.h + +fi + +if test "$os_win32" = no && ! $have_pthread; then + for ac_header in sched.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sched.h" "ac_cv_header_sched_h" "$ac_includes_default" +if test "x$ac_cv_header_sched_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SCHED_H 1 +_ACEOF + +fi + +done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sched_yield" >&5 +$as_echo_n "checking for library containing sched_yield... " >&6; } +if ${ac_cv_search_sched_yield+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sched_yield (); +int +main () +{ +return sched_yield (); + ; + return 0; +} +_ACEOF +for ac_lib in '' rt; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_sched_yield=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_sched_yield+:} false; then : + break +fi +done +if ${ac_cv_search_sched_yield+:} false; then : + +else + ac_cv_search_sched_yield=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sched_yield" >&5 +$as_echo "$ac_cv_search_sched_yield" >&6; } +ac_res=$ac_cv_search_sched_yield +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +$as_echo "#define HAVE_SCHED_YIELD 1" >>confdefs.h + +fi + +fi + + +ac_config_files="$ac_config_files Makefile src/Makefile src/hb-version.h src/hb-ucdn/Makefile util/Makefile test/Makefile test/api/Makefile test/fuzzing/Makefile test/shaping/Makefile docs/Makefile docs/version.xml win32/Makefile win32/config.h.win32" + + +cat >confcache <<\_ACEOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. +# +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. +# +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. + +_ACEOF + +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, we kill variables containing newlines. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) | + sed ' + /^ac_cv_env_/b end + t clear + :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + if test "x$cache_file" != "x/dev/null"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi +fi +rm -f confcache + +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +DEFS=-DHAVE_CONFIG_H + +ac_libobjs= +ac_ltlibobjs= +U= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } + if test -n "$EXEEXT"; then + am__EXEEXT_TRUE= + am__EXEEXT_FALSE='#' +else + am__EXEEXT_TRUE='#' + am__EXEEXT_FALSE= +fi + +if test -z "${AUTOMAKE_OLDER_THAN_1_13_TRUE}" && test -z "${AUTOMAKE_OLDER_THAN_1_13_FALSE}"; then + as_fn_error $? "conditional \"AUTOMAKE_OLDER_THAN_1_13\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then + as_fn_error $? "conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_GTK_DOC_TRUE}" && test -z "${HAVE_GTK_DOC_FALSE}"; then + as_fn_error $? "conditional \"HAVE_GTK_DOC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then + as_fn_error $? "conditional \"GTK_DOC_BUILD_HTML\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then + as_fn_error $? "conditional \"GTK_DOC_BUILD_PDF\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then + as_fn_error $? "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then + as_fn_error $? "conditional \"GTK_DOC_USE_REBASE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_GCC_TRUE}" && test -z "${HAVE_GCC_FALSE}"; then + as_fn_error $? "conditional \"HAVE_GCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${OS_WIN32_TRUE}" && test -z "${OS_WIN32_FALSE}"; then + as_fn_error $? "conditional \"OS_WIN32\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_PTHREAD_TRUE}" && test -z "${HAVE_PTHREAD_FALSE}"; then + as_fn_error $? "conditional \"HAVE_PTHREAD\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_OT_TRUE}" && test -z "${HAVE_OT_FALSE}"; then + as_fn_error $? "conditional \"HAVE_OT\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_FALLBACK_TRUE}" && test -z "${HAVE_FALLBACK_FALSE}"; then + as_fn_error $? "conditional \"HAVE_FALLBACK\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_GLIB_TRUE}" && test -z "${HAVE_GLIB_FALSE}"; then + as_fn_error $? "conditional \"HAVE_GLIB\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_GOBJECT_TRUE}" && test -z "${HAVE_GOBJECT_FALSE}"; then + as_fn_error $? "conditional \"HAVE_GOBJECT\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then + as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then + as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_CAIRO_TRUE}" && test -z "${HAVE_CAIRO_FALSE}"; then + as_fn_error $? "conditional \"HAVE_CAIRO\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_CAIRO_FT_TRUE}" && test -z "${HAVE_CAIRO_FT_FALSE}"; then + as_fn_error $? "conditional \"HAVE_CAIRO_FT\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_FONTCONFIG_TRUE}" && test -z "${HAVE_FONTCONFIG_FALSE}"; then + as_fn_error $? "conditional \"HAVE_FONTCONFIG\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_ICU_TRUE}" && test -z "${HAVE_ICU_FALSE}"; then + as_fn_error $? "conditional \"HAVE_ICU\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_ICU_BUILTIN_TRUE}" && test -z "${HAVE_ICU_BUILTIN_FALSE}"; then + as_fn_error $? "conditional \"HAVE_ICU_BUILTIN\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_UCDN_TRUE}" && test -z "${HAVE_UCDN_FALSE}"; then + as_fn_error $? "conditional \"HAVE_UCDN\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_GRAPHITE2_TRUE}" && test -z "${HAVE_GRAPHITE2_FALSE}"; then + as_fn_error $? "conditional \"HAVE_GRAPHITE2\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_FREETYPE_TRUE}" && test -z "${HAVE_FREETYPE_FALSE}"; then + as_fn_error $? "conditional \"HAVE_FREETYPE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_UNISCRIBE_TRUE}" && test -z "${HAVE_UNISCRIBE_FALSE}"; then + as_fn_error $? "conditional \"HAVE_UNISCRIBE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_DIRECTWRITE_TRUE}" && test -z "${HAVE_DIRECTWRITE_FALSE}"; then + as_fn_error $? "conditional \"HAVE_DIRECTWRITE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_CORETEXT_TRUE}" && test -z "${HAVE_CORETEXT_FALSE}"; then + as_fn_error $? "conditional \"HAVE_CORETEXT\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi + +: "${CONFIG_STATUS=./config.status}" +ac_write_fail=0 +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files $CONFIG_STATUS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 +#! $SHELL +# Generated by $as_me. +# Run this file to recreate the current configuration. +# Compiler output produced by configure, useful for debugging +# configure, is in config.log if it exists. + +debug=false +ac_cs_recheck=false +ac_cs_silent=false + +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi + + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. +ac_log=" +This file was extended by HarfBuzz $as_me 1.4.2, which was +generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + +_ACEOF + +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac + +case $ac_config_headers in *" +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +esac + + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# Files that config.status was made for. +config_files="$ac_config_files" +config_headers="$ac_config_headers" +config_commands="$ac_config_commands" + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +ac_cs_usage="\ +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. + +Usage: $0 [OPTION]... [TAG]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit + --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE + +Configuration files: +$config_files + +Configuration headers: +$config_headers + +Configuration commands: +$config_commands + +Report bugs to . +HarfBuzz home page: ." + +_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 config.status 1.4.2 +configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +Copyright (C) 2012 Free Software Foundation, Inc. +This config.status script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it." + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' +AWK='$AWK' +test -n "\$AWK" || AWK=awk +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. +ac_need_defaults=: +while test $# != 0 +do + case $1 in + --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; + *) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift + ;; + esac + + case $ac_option in + # Handling of the options. + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + as_fn_error $? "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; + + *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; + + esac + shift +done + +ac_configure_extra_args= + +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +if \$ac_cs_recheck; then + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' + export CONFIG_SHELL + exec "\$@" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + $as_echo "$ac_log" +} >&5 + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# +# INIT-COMMANDS +# +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" + + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +sed_quote_subst='$sed_quote_subst' +double_quote_subst='$double_quote_subst' +delay_variable_subst='$delay_variable_subst' +macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' +macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' +enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' +enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' +pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' +enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' +ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' +host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' +host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' +host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' +build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' +build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' +build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' +SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' +Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' +GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' +EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' +FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' +LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' +NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' +LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' +max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' +ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' +exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' +lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' +lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' +reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' +reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' +OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' +deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' +file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' +AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' +AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' +STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' +RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' +old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' +old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' +lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' +CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' +CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' +compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' +GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' +MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' +need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' +DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' +NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' +LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' +OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' +OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' +libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' +shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' +extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' +export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' +whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' +compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' +old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' +archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' +module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' +module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' +with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' +allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' +no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' +hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' +hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' +hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' +hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' +hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' +inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' +link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' +always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' +export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' +exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' +include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' +prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' +file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' +variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' +need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' +need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' +version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' +runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' +libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' +library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' +soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' +install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' +postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' +postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' +finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' +hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' +sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' +sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' +enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' +old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' +striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`' +predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`' +postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`' +predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`' +postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`' +LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`' +reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`' +reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`' +old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' +compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' +GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' +archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`' +export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`' +old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`' +archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' +archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' +module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`' +module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' +with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`' +allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' +no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' +inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' +link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' +always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' +export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' +exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' +include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' +prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' +postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' +file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' +predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`' +postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`' +predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`' +postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`' + +LTCC='$LTCC' +LTCFLAGS='$LTCFLAGS' +compiler='$compiler_DEFAULT' + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} + +# Quote evaled strings. +for var in SHELL \ +ECHO \ +PATH_SEPARATOR \ +SED \ +GREP \ +EGREP \ +FGREP \ +LD \ +NM \ +LN_S \ +lt_SP2NL \ +lt_NL2SP \ +reload_flag \ +OBJDUMP \ +deplibs_check_method \ +file_magic_cmd \ +file_magic_glob \ +want_nocaseglob \ +DLLTOOL \ +sharedlib_from_linklib_cmd \ +AR \ +AR_FLAGS \ +archiver_list_spec \ +STRIP \ +RANLIB \ +CC \ +CFLAGS \ +compiler \ +lt_cv_sys_global_symbol_pipe \ +lt_cv_sys_global_symbol_to_cdecl \ +lt_cv_sys_global_symbol_to_c_name_address \ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +nm_file_list_spec \ +lt_prog_compiler_no_builtin_flag \ +lt_prog_compiler_pic \ +lt_prog_compiler_wl \ +lt_prog_compiler_static \ +lt_cv_prog_compiler_c_o \ +need_locks \ +MANIFEST_TOOL \ +DSYMUTIL \ +NMEDIT \ +LIPO \ +OTOOL \ +OTOOL64 \ +shrext_cmds \ +export_dynamic_flag_spec \ +whole_archive_flag_spec \ +compiler_needs_object \ +with_gnu_ld \ +allow_undefined_flag \ +no_undefined_flag \ +hardcode_libdir_flag_spec \ +hardcode_libdir_separator \ +exclude_expsyms \ +include_expsyms \ +file_list_spec \ +variables_saved_for_relink \ +libname_spec \ +library_names_spec \ +soname_spec \ +install_override_mode \ +finish_eval \ +old_striplib \ +striplib \ +compiler_lib_search_dirs \ +predep_objects \ +postdep_objects \ +predeps \ +postdeps \ +compiler_lib_search_path \ +LD_CXX \ +reload_flag_CXX \ +compiler_CXX \ +lt_prog_compiler_no_builtin_flag_CXX \ +lt_prog_compiler_pic_CXX \ +lt_prog_compiler_wl_CXX \ +lt_prog_compiler_static_CXX \ +lt_cv_prog_compiler_c_o_CXX \ +export_dynamic_flag_spec_CXX \ +whole_archive_flag_spec_CXX \ +compiler_needs_object_CXX \ +with_gnu_ld_CXX \ +allow_undefined_flag_CXX \ +no_undefined_flag_CXX \ +hardcode_libdir_flag_spec_CXX \ +hardcode_libdir_separator_CXX \ +exclude_expsyms_CXX \ +include_expsyms_CXX \ +file_list_spec_CXX \ +compiler_lib_search_dirs_CXX \ +predep_objects_CXX \ +postdep_objects_CXX \ +predeps_CXX \ +postdeps_CXX \ +compiler_lib_search_path_CXX; do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[\\\\\\\`\\"\\\$]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +# Double-quote double-evaled strings. +for var in reload_cmds \ +old_postinstall_cmds \ +old_postuninstall_cmds \ +old_archive_cmds \ +extract_expsyms_cmds \ +old_archive_from_new_cmds \ +old_archive_from_expsyms_cmds \ +archive_cmds \ +archive_expsym_cmds \ +module_cmds \ +module_expsym_cmds \ +export_symbols_cmds \ +prelink_cmds \ +postlink_cmds \ +postinstall_cmds \ +postuninstall_cmds \ +finish_cmds \ +sys_lib_search_path_spec \ +sys_lib_dlsearch_path_spec \ +reload_cmds_CXX \ +old_archive_cmds_CXX \ +old_archive_from_new_cmds_CXX \ +old_archive_from_expsyms_cmds_CXX \ +archive_cmds_CXX \ +archive_expsym_cmds_CXX \ +module_cmds_CXX \ +module_expsym_cmds_CXX \ +export_symbols_cmds_CXX \ +prelink_cmds_CXX \ +postlink_cmds_CXX; do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[\\\\\\\`\\"\\\$]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +ac_aux_dir='$ac_aux_dir' +xsi_shell='$xsi_shell' +lt_shell_append='$lt_shell_append' + +# See if we are running on zsh, and set the options which allow our +# commands through without removal of \ escapes INIT. +if test -n "\${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi + + + PACKAGE='$PACKAGE' + VERSION='$VERSION' + TIMESTAMP='$TIMESTAMP' + RM='$RM' + ofile='$ofile' + + + + + + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + +# Handling of arguments. +for ac_config_target in $ac_config_targets +do + case $ac_config_target in + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; + "src/hb-version.h") CONFIG_FILES="$CONFIG_FILES src/hb-version.h" ;; + "src/hb-ucdn/Makefile") CONFIG_FILES="$CONFIG_FILES src/hb-ucdn/Makefile" ;; + "util/Makefile") CONFIG_FILES="$CONFIG_FILES util/Makefile" ;; + "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; + "test/api/Makefile") CONFIG_FILES="$CONFIG_FILES test/api/Makefile" ;; + "test/fuzzing/Makefile") CONFIG_FILES="$CONFIG_FILES test/fuzzing/Makefile" ;; + "test/shaping/Makefile") CONFIG_FILES="$CONFIG_FILES test/shaping/Makefile" ;; + "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; + "docs/version.xml") CONFIG_FILES="$CONFIG_FILES docs/version.xml" ;; + "win32/Makefile") CONFIG_FILES="$CONFIG_FILES win32/Makefile" ;; + "win32/config.h.win32") CONFIG_FILES="$CONFIG_FILES win32/config.h.win32" ;; + + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac +done + + +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely +# bizarre bug on SunOS 4.1.3. +if $ac_need_defaults; then + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands +fi + +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason against having it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. +$debug || +{ + tmp= ac_tmp= + trap 'exit_status=$? + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status +' 0 + trap 'as_fn_exit 1' 1 2 13 15 +} +# Create a (secure) tmp directory for tmp files. + +{ + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -d "$tmp" +} || +{ + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp + +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. +if test -n "$CONFIG_FILES"; then + + +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\\r' +else + ac_cs_awk_cr=$ac_cr +fi + +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && +_ACEOF + + +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done +rm -f conf$$subs.sh + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && +_ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\)..*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\)..*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } + + print line +} + +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 +_ACEOF + +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// +s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// +s/^[^=]*=[ ]*$// +}' +fi + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +fi # test -n "$CONFIG_FILES" + +# Set up the scripts for CONFIG_HEADERS section. +# No need to generate them if there are no CONFIG_HEADERS. +# This happens for instance with `./config.status Makefile'. +if test -n "$CONFIG_HEADERS"; then +cat >"$ac_tmp/defines.awk" <<\_ACAWK || +BEGIN { +_ACEOF + +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. + +# Create a delimiter string that does not exist in confdefs.h, to ease +# handling of long lines. +ac_delim='%!_!# ' +for ac_last_try in false false :; do + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +# For the awk script, D is an array of macro values keyed by name, +# likewise P contains macro parameters if any. Preserve backslash +# newline sequences. + +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +sed -n ' +s/.\{148\}/&'"$ac_delim"'/g +t rset +:rset +s/^[ ]*#[ ]*define[ ][ ]*/ / +t def +d +:def +s/\\$// +t bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3"/p +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +d +:bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3\\\\\\n"\\/p +t cont +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +t cont +d +:cont +n +s/.\{148\}/&'"$ac_delim"'/g +t clear +:clear +s/\\$// +t bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/"/p +d +:bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +b cont +' >$CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { + line = \$ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # Replace #undef with comments. This is necessary, for example, + # in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + if (defundef == "undef") { + print "/*", prefix defundef, macro, "*/" + next + } + } +} +{ print } +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 +fi # test -n "$CONFIG_HEADERS" + + +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +shift +for ac_tag +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$ac_tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input='Generated from '` + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac + + case $ac_tag in + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac + + ac_dir=`$as_dirname -- "$ac_file" || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + + case $ac_mode in + :F) + # + # CONFIG_FILE + # + + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= +ac_sed_dataroot=' +/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub +$extrasub +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s|@configure_input@|$ac_sed_conf_input|;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t +$ac_datarootdir_hack +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&5 +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&2;} + + rm -f "$ac_tmp/stdin" + case $ac_file in + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + esac \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # + # CONFIG_HEADER + # + if test x"$ac_file" != x-; then + { + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" + mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 + fi +# Compute "$ac_file"'s index in $config_headers. +_am_arg="$ac_file" +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; + + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +$as_echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac + + + case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || { + # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named 'Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running 'make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "$am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`$as_dirname -- "$file" || +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} + ;; + "libtool":C) + + # See if we are running on zsh, and set the options which allow our + # commands through without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi + + cfgfile="${ofile}T" + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 + $RM "$cfgfile" + + cat <<_LT_EOF >> "$cfgfile" +#! $SHELL + +# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# NOTE: Changes made to this file will be lost: look at ltmain.sh. +# +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is part of GNU Libtool. +# +# GNU Libtool is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, or +# obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + +# The names of the tagged configurations supported by this script. +available_tags="CXX " + +# ### BEGIN LIBTOOL CONFIG + +# Which release of libtool.m4 was used? +macro_version=$macro_version +macro_revision=$macro_revision + +# Whether or not to build static libraries. +build_old_libs=$enable_static + +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared + +# What type of objects to build. +pic_mode=$pic_mode + +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install + +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# An echo program that protects backslashes. +ECHO=$lt_ECHO + +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + +# The host system. +host_alias=$host_alias +host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os + +# A sed program that does not truncate output. +SED=$lt_SED + +# Sed that helps us avoid accidentally triggering echo(1) options like -n. +Xsed="\$SED -e 1s/^X//" + +# A grep program that handles long lines. +GREP=$lt_GREP + +# An ERE matcher. +EGREP=$lt_EGREP + +# A literal string matcher. +FGREP=$lt_FGREP + +# A BSD- or MS-compatible name lister. +NM=$lt_NM + +# Whether we need soft or hard links. +LN_S=$lt_LN_S + +# What is the maximum length of a command? +max_cmd_len=$max_cmd_len + +# Object file suffix (normally "o"). +objext=$ac_objext + +# Executable file suffix (normally ""). +exeext=$exeext + +# whether the shell understands "unset". +lt_unset=$lt_unset + +# turn spaces into newlines. +SP2NL=$lt_lt_SP2NL + +# turn newlines into spaces. +NL2SP=$lt_lt_NL2SP + +# convert \$build file names to \$host format. +to_host_file_cmd=$lt_cv_to_host_file_cmd + +# convert \$build files to toolchain format. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd + +# An object symbol dumper. +OBJDUMP=$lt_OBJDUMP + +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method + +# Command to use when deplibs_check_method = "file_magic". +file_magic_cmd=$lt_file_magic_cmd + +# How to find potential files when deplibs_check_method = "file_magic". +file_magic_glob=$lt_file_magic_glob + +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". +want_nocaseglob=$lt_want_nocaseglob + +# DLL creation program. +DLLTOOL=$lt_DLLTOOL + +# Command to associate shared and link libraries. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd + +# The archiver. +AR=$lt_AR + +# Flags to create an archive. +AR_FLAGS=$lt_AR_FLAGS + +# How to feed a file listing to the archiver. +archiver_list_spec=$lt_archiver_list_spec + +# A symbol stripping program. +STRIP=$lt_STRIP + +# Commands used to install an old-style archive. +RANLIB=$lt_RANLIB +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds + +# Whether to use a lock for old archive extraction. +lock_old_archive_extraction=$lock_old_archive_extraction + +# A C compiler. +LTCC=$lt_CC + +# LTCC compiler flags. +LTCFLAGS=$lt_CFLAGS + +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe + +# Transform the output of nm in a proper C declaration. +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + +# Transform the output of nm in a C name address pair. +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + +# Transform the output of nm in a C name address pair when lib prefix is needed. +global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix + +# Specify filename containing input files for \$NM. +nm_file_list_spec=$lt_nm_file_list_spec + +# The root where to search for dependent libraries,and in which our libraries should be installed. +lt_sysroot=$lt_sysroot + +# The name of the directory that contains temporary libtool files. +objdir=$objdir + +# Used to examine libraries when file_magic_cmd begins with "file". +MAGIC_CMD=$MAGIC_CMD + +# Must we lock files when doing compilation? +need_locks=$lt_need_locks + +# Manifest tool. +MANIFEST_TOOL=$lt_MANIFEST_TOOL + +# Tool to manipulate archived DWARF debug symbol files on Mac OS X. +DSYMUTIL=$lt_DSYMUTIL + +# Tool to change global to local symbols on Mac OS X. +NMEDIT=$lt_NMEDIT + +# Tool to manipulate fat objects and archives on Mac OS X. +LIPO=$lt_LIPO + +# ldd/readelf like tool for Mach-O binaries on Mac OS X. +OTOOL=$lt_OTOOL + +# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. +OTOOL64=$lt_OTOOL64 + +# Old archive suffix (normally "a"). +libext=$libext + +# Shared library suffix (normally ".so"). +shrext_cmds=$lt_shrext_cmds + +# The commands to extract the exported symbol list from a shared archive. +extract_expsyms_cmds=$lt_extract_expsyms_cmds + +# Variables whose values should be saved in libtool wrapper scripts and +# restored at link time. +variables_saved_for_relink=$lt_variables_saved_for_relink + +# Do we need the "lib" prefix for modules? +need_lib_prefix=$need_lib_prefix + +# Do we need a version for libraries? +need_version=$need_version + +# Library versioning type. +version_type=$version_type + +# Shared library runtime path variable. +runpath_var=$runpath_var + +# Shared library path variable. +shlibpath_var=$shlibpath_var + +# Is shlibpath searched before the hard-coded library search path? +shlibpath_overrides_runpath=$shlibpath_overrides_runpath + +# Format of library name prefix. +libname_spec=$lt_libname_spec + +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME +library_names_spec=$lt_library_names_spec + +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec + +# Permission mode override for installation of shared libraries. +install_override_mode=$lt_install_override_mode + +# Command to use after installation of a shared archive. +postinstall_cmds=$lt_postinstall_cmds + +# Command to use after uninstallation of a shared archive. +postuninstall_cmds=$lt_postuninstall_cmds + +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds + +# As "finish_cmds", except a single script fragment to be evaled but +# not shown. +finish_eval=$lt_finish_eval + +# Whether we should hardcode library paths into libraries. +hardcode_into_libs=$hardcode_into_libs + +# Compile-time system search path for libraries. +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + +# Run-time system search path for libraries. +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + +# Whether dlopen is supported. +dlopen_support=$enable_dlopen + +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self + +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static + +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib + + +# The linker used to build libraries. +LD=$lt_LD + +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds + +# Commands used to build an old-style archive. +old_archive_cmds=$lt_old_archive_cmds + +# A language specific compiler. +CC=$lt_compiler + +# Is the compiler the GNU compiler? +with_gcc=$GCC + +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag + +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic + +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl + +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static + +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o + +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc + +# Whether or not to disallow shared libs when runtime libs are static. +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes + +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec + +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec + +# Whether the compiler copes with passing no objects directly. +compiler_needs_object=$lt_compiler_needs_object + +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds + +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds + +# Commands used to build a shared archive. +archive_cmds=$lt_archive_cmds +archive_expsym_cmds=$lt_archive_expsym_cmds + +# Commands used to build a loadable module if different from building +# a shared archive. +module_cmds=$lt_module_cmds +module_expsym_cmds=$lt_module_expsym_cmds + +# Whether we are building with GNU ld or not. +with_gnu_ld=$lt_with_gnu_ld + +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag + +# Flag that enforces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag + +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec + +# Whether we need a single "-rpath" flag with a separated argument. +hardcode_libdir_separator=$lt_hardcode_libdir_separator + +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# DIR into the resulting binary. +hardcode_direct=$hardcode_direct + +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# DIR into the resulting binary and the resulting library dependency is +# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# library is relocated. +hardcode_direct_absolute=$hardcode_direct_absolute + +# Set to "yes" if using the -LDIR flag during linking hardcodes DIR +# into the resulting binary. +hardcode_minus_L=$hardcode_minus_L + +# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR +# into the resulting binary. +hardcode_shlibpath_var=$hardcode_shlibpath_var + +# Set to "yes" if building a shared library automatically hardcodes DIR +# into the library and all subsequent libraries and executables linked +# against it. +hardcode_automatic=$hardcode_automatic + +# Set to yes if linker adds runtime paths of dependent libraries +# to runtime path list. +inherit_rpath=$inherit_rpath + +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs + +# Set to "yes" if exported symbols are required. +always_export_symbols=$always_export_symbols + +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds + +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms + +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms + +# Commands necessary for linking programs (against libraries) with templates. +prelink_cmds=$lt_prelink_cmds + +# Commands necessary for finishing linking programs. +postlink_cmds=$lt_postlink_cmds + +# Specify filename containing input files. +file_list_spec=$lt_file_list_spec + +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action + +# The directories searched by this compiler when creating a shared library. +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs + +# Dependencies to place before and after the objects being linked to +# create a shared library. +predep_objects=$lt_predep_objects +postdep_objects=$lt_postdep_objects +predeps=$lt_predeps +postdeps=$lt_postdeps + +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path + +# ### END LIBTOOL CONFIG + +_LT_EOF + + case $host_os in + aix3*) + cat <<\_LT_EOF >> "$cfgfile" +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. +if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES +fi +_LT_EOF + ;; + esac + + +ltmain="$ac_aux_dir/ltmain.sh" + + + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_basename ()$/,/^} # func_basename /c\ +func_basename ()\ +{\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ +func_dirname_and_basename ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ +func_stripname ()\ +{\ +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ +\ # positional parameters, so assign one to ordinary parameter first.\ +\ func_stripname_result=${3}\ +\ func_stripname_result=${func_stripname_result#"${1}"}\ +\ func_stripname_result=${func_stripname_result%"${2}"}\ +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ +func_split_long_opt ()\ +{\ +\ func_split_long_opt_name=${1%%=*}\ +\ func_split_long_opt_arg=${1#*=}\ +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ +func_split_short_opt ()\ +{\ +\ func_split_short_opt_arg=${1#??}\ +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ +func_lo2o ()\ +{\ +\ case ${1} in\ +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ +\ *) func_lo2o_result=${1} ;;\ +\ esac\ +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_xform ()$/,/^} # func_xform /c\ +func_xform ()\ +{\ + func_xform_result=${1%.*}.lo\ +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_arith ()$/,/^} # func_arith /c\ +func_arith ()\ +{\ + func_arith_result=$(( $* ))\ +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_len ()$/,/^} # func_len /c\ +func_len ()\ +{\ + func_len_result=${#1}\ +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + +fi + +if test x"$lt_shell_append" = xyes; then + sed -e '/^func_append ()$/,/^} # func_append /c\ +func_append ()\ +{\ + eval "${1}+=\\${2}"\ +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ +func_append_quoted ()\ +{\ +\ func_quote_for_eval "${2}"\ +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +else + # Save a `func_append' function call even when '+=' is not available + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +fi + +if test x"$_lt_function_replace_fail" = x":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi + + + mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" + + + cat <<_LT_EOF >> "$ofile" + +# ### BEGIN LIBTOOL TAG CONFIG: CXX + +# The linker used to build libraries. +LD=$lt_LD_CXX + +# How to create reloadable object files. +reload_flag=$lt_reload_flag_CXX +reload_cmds=$lt_reload_cmds_CXX + +# Commands used to build an old-style archive. +old_archive_cmds=$lt_old_archive_cmds_CXX + +# A language specific compiler. +CC=$lt_compiler_CXX + +# Is the compiler the GNU compiler? +with_gcc=$GCC_CXX + +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX + +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic_CXX + +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl_CXX + +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static_CXX + +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX + +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc_CXX + +# Whether or not to disallow shared libs when runtime libs are static. +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX + +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX + +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX + +# Whether the compiler copes with passing no objects directly. +compiler_needs_object=$lt_compiler_needs_object_CXX + +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX + +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX + +# Commands used to build a shared archive. +archive_cmds=$lt_archive_cmds_CXX +archive_expsym_cmds=$lt_archive_expsym_cmds_CXX + +# Commands used to build a loadable module if different from building +# a shared archive. +module_cmds=$lt_module_cmds_CXX +module_expsym_cmds=$lt_module_expsym_cmds_CXX + +# Whether we are building with GNU ld or not. +with_gnu_ld=$lt_with_gnu_ld_CXX + +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag_CXX + +# Flag that enforces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag_CXX + +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX + +# Whether we need a single "-rpath" flag with a separated argument. +hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX + +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# DIR into the resulting binary. +hardcode_direct=$hardcode_direct_CXX + +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# DIR into the resulting binary and the resulting library dependency is +# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# library is relocated. +hardcode_direct_absolute=$hardcode_direct_absolute_CXX + +# Set to "yes" if using the -LDIR flag during linking hardcodes DIR +# into the resulting binary. +hardcode_minus_L=$hardcode_minus_L_CXX + +# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR +# into the resulting binary. +hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX + +# Set to "yes" if building a shared library automatically hardcodes DIR +# into the library and all subsequent libraries and executables linked +# against it. +hardcode_automatic=$hardcode_automatic_CXX + +# Set to yes if linker adds runtime paths of dependent libraries +# to runtime path list. +inherit_rpath=$inherit_rpath_CXX + +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs_CXX + +# Set to "yes" if exported symbols are required. +always_export_symbols=$always_export_symbols_CXX + +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds_CXX + +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms_CXX + +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms_CXX + +# Commands necessary for linking programs (against libraries) with templates. +prelink_cmds=$lt_prelink_cmds_CXX + +# Commands necessary for finishing linking programs. +postlink_cmds=$lt_postlink_cmds_CXX + +# Specify filename containing input files. +file_list_spec=$lt_file_list_spec_CXX + +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action_CXX + +# The directories searched by this compiler when creating a shared library. +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX + +# Dependencies to place before and after the objects being linked to +# create a shared library. +predep_objects=$lt_predep_objects_CXX +postdep_objects=$lt_postdep_objects_CXX +predeps=$lt_predeps_CXX +postdeps=$lt_postdeps_CXX + +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path_CXX + +# ### END LIBTOOL TAG CONFIG: CXX +_LT_EOF + + ;; + + esac +done # for ac_tag + + +as_fn_exit 0 +_ACEOF +ac_clean_files=$ac_clean_files_save + +test $ac_write_fail = 0 || + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + +# configure is writing to config.log, and then calls config.status. +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" + exec 5>/dev/null + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || as_fn_exit 1 +fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: + +Build configuration: + +Unicode callbacks (you want at least one): + Builtin (UCDN): ${have_ucdn} + Glib: ${have_glib} + ICU: ${have_icu} + +Font callbacks (the more the better): + FreeType: ${have_freetype} + +Tools used for command-line utilities: + Cairo: ${have_cairo} + Fontconfig: ${have_fontconfig} + +Additional shapers (the more the better): + Graphite2: ${have_graphite2} + +Platform shapers (not normally needed): + CoreText: ${have_coretext} + Uniscribe: ${have_uniscribe} + DirectWrite: ${have_directwrite} + +Other features: + Documentation: ${have_gtk_doc} + GObject bindings: ${have_gobject} + Introspection: ${have_introspection} +" >&5 +$as_echo "$as_me: + +Build configuration: + +Unicode callbacks (you want at least one): + Builtin (UCDN): ${have_ucdn} + Glib: ${have_glib} + ICU: ${have_icu} + +Font callbacks (the more the better): + FreeType: ${have_freetype} + +Tools used for command-line utilities: + Cairo: ${have_cairo} + Fontconfig: ${have_fontconfig} + +Additional shapers (the more the better): + Graphite2: ${have_graphite2} + +Platform shapers (not normally needed): + CoreText: ${have_coretext} + Uniscribe: ${have_uniscribe} + DirectWrite: ${have_directwrite} + +Other features: + Documentation: ${have_gtk_doc} + GObject bindings: ${have_gobject} + Introspection: ${have_introspection} +" >&6;} diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..31fa97d --- /dev/null +++ b/configure.ac @@ -0,0 +1,531 @@ +AC_PREREQ([2.64]) +AC_INIT([HarfBuzz], + [1.4.2], + [https://github.com/behdad/harfbuzz/issues/new], + [harfbuzz], + [http://harfbuzz.org/]) + +AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_SRCDIR([src/harfbuzz.pc.in]) +AC_CONFIG_HEADERS([config.h]) + +AM_INIT_AUTOMAKE([1.11.1 gnits tar-ustar dist-bzip2 no-dist-gzip -Wall no-define color-tests -Wno-portability]) +AM_CONDITIONAL(AUTOMAKE_OLDER_THAN_1_13, test $am__api_version = 1.11 -o $am__api_version = 1.12) +AM_SILENT_RULES([yes]) + +# Initialize libtool +m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) +LT_PREREQ([2.2]) +LT_INIT([disable-static]) + +# Check for programs +AC_USE_SYSTEM_EXTENSIONS +AC_PROG_CC +AM_PROG_CC_C_O +AC_PROG_CXX +AC_SYS_LARGEFILE +PKG_PROG_PKG_CONFIG([0.20]) +AM_MISSING_PROG([RAGEL], [ragel]) +AM_MISSING_PROG([GIT], [git]) + +# Version +m4_define(hb_version_triplet,m4_split(AC_PACKAGE_VERSION,[[.]])) +m4_define(hb_version_major,m4_argn(1,hb_version_triplet)) +m4_define(hb_version_minor,m4_argn(2,hb_version_triplet)) +m4_define(hb_version_micro,m4_argn(3,hb_version_triplet)) +HB_VERSION_MAJOR=hb_version_major +HB_VERSION_MINOR=hb_version_minor +HB_VERSION_MICRO=hb_version_micro +HB_VERSION=AC_PACKAGE_VERSION +AC_SUBST(HB_VERSION_MAJOR) +AC_SUBST(HB_VERSION_MINOR) +AC_SUBST(HB_VERSION_MICRO) +AC_SUBST(HB_VERSION) + +# Libtool version +m4_define([hb_version_int], + m4_eval(hb_version_major*10000 + hb_version_minor*100 + hb_version_micro)) +m4_if(m4_eval(hb_version_minor % 2), [1], + dnl for unstable releases + [m4_define([hb_libtool_revision], 0)], + dnl for stable releases + [m4_define([hb_libtool_revision], hb_version_micro)]) +m4_define([hb_libtool_age], + m4_eval(hb_version_int - hb_libtool_revision)) +m4_define([hb_libtool_current], + m4_eval(hb_libtool_age)) +HB_LIBTOOL_VERSION_INFO=hb_libtool_current:hb_libtool_revision:hb_libtool_age +AC_SUBST(HB_LIBTOOL_VERSION_INFO) + +# Documentation +have_gtk_doc=false +m4_ifdef([GTK_DOC_CHECK], [ +GTK_DOC_CHECK([1.15],[--flavour no-tmpl]) + if test "x$enable_gtk_doc" = xyes; then + have_gtk_doc=true + fi +], [ + AM_CONDITIONAL([ENABLE_GTK_DOC], false) +]) + +# Functions and headers +AC_CHECK_FUNCS(atexit mprotect sysconf getpagesize mmap isatty) +AC_CHECK_HEADERS(unistd.h sys/mman.h) + +# Compiler flags +AC_CANONICAL_HOST +AC_CHECK_ALIGNOF([struct{char;}]) +if test "x$GCC" = "xyes"; then + + # Make symbols link locally + LDFLAGS="$LDFLAGS -Bsymbolic-functions" + + # Make sure we don't link to libstdc++ + CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions" + + # Assorted warnings + CXXFLAGS="$CXXFLAGS -Wcast-align" + + case "$host" in + *-*-mingw*) + ;; + *) + # Hide inline methods + CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden" + ;; + esac + + case "$host" in + arm-*-*) + if test "x$ac_cv_alignof_struct_char__" != x1; then + # Request byte alignment + CXXFLAGS="$CXXFLAGS -mstructure-size-boundary=8" + fi + ;; + esac +fi + +AM_CONDITIONAL(HAVE_GCC, test "x$GCC" = "xyes") + +hb_os_win32=no +AC_MSG_CHECKING([for native Win32]) +case "$host" in + *-*-mingw*) + hb_os_win32=yes + ;; +esac +AC_MSG_RESULT([$hb_os_win32]) +AM_CONDITIONAL(OS_WIN32, test "$hb_os_win32" = "yes") + +have_pthread=false +if test "$hb_os_win32" = no; then + AX_PTHREAD([have_pthread=true]) +fi +if $have_pthread; then + AC_DEFINE(HAVE_PTHREAD, 1, [Have POSIX threads]) +fi +AM_CONDITIONAL(HAVE_PTHREAD, $have_pthread) + +dnl ========================================================================== + +have_ot=true +if $have_ot; then + AC_DEFINE(HAVE_OT, 1, [Have native OpenType Layout backend]) +fi +AM_CONDITIONAL(HAVE_OT, $have_ot) + +have_fallback=true +if $have_fallback; then + AC_DEFINE(HAVE_FALLBACK, 1, [Have simple TrueType Layout backend]) +fi +AM_CONDITIONAL(HAVE_FALLBACK, $have_fallback) + +dnl =========================================================================== + +AC_ARG_WITH(glib, + [AS_HELP_STRING([--with-glib=@<:@yes/no/auto@:>@], + [Use glib @<:@default=auto@:>@])],, + [with_glib=auto]) +have_glib=false +GLIB_DEPS="glib-2.0 >= 2.19.1" +AC_SUBST(GLIB_DEPS) +if test "x$with_glib" = "xyes" -o "x$with_glib" = "xauto"; then + PKG_CHECK_MODULES(GLIB, $GLIB_DEPS, have_glib=true, :) +fi +if test "x$with_glib" = "xyes" -a "x$have_glib" != "xtrue"; then + AC_MSG_ERROR([glib support requested but glib-2.0 not found]) +fi +if $have_glib; then + AC_DEFINE(HAVE_GLIB, 1, [Have glib2 library]) +fi +AM_CONDITIONAL(HAVE_GLIB, $have_glib) + +dnl =========================================================================== + +AC_ARG_WITH(gobject, + [AS_HELP_STRING([--with-gobject=@<:@yes/no/auto@:>@], + [Use gobject @<:@default=auto@:>@])],, + [with_gobject=no]) +have_gobject=false +if test "x$with_gobject" = "xyes" -o "x$with_gobject" = "xauto"; then + PKG_CHECK_MODULES(GOBJECT, gobject-2.0 glib-2.0, have_gobject=true, :) +fi +if test "x$with_gobject" = "xyes" -a "x$have_gobject" != "xtrue"; then + AC_MSG_ERROR([gobject support requested but gobject-2.0 / glib-2.0 not found]) +fi +if $have_gobject; then + AC_DEFINE(HAVE_GOBJECT, 1, [Have gobject2 library]) + GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` + AC_SUBST(GLIB_MKENUMS) +fi +AM_CONDITIONAL(HAVE_GOBJECT, $have_gobject) + +dnl =========================================================================== + + +dnl =========================================================================== +# Gobject-Introspection +have_introspection=false +m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [ + if $have_gobject; then + GOBJECT_INTROSPECTION_CHECK([1.34.0]) + if test "x$found_introspection" = xyes; then + have_introspection=true + fi + else + AM_CONDITIONAL([HAVE_INTROSPECTION], false) + fi +], [ + AM_CONDITIONAL([HAVE_INTROSPECTION], false) +]) + +dnl ========================================================================== + +AC_ARG_WITH(cairo, + [AS_HELP_STRING([--with-cairo=@<:@yes/no/auto@:>@], + [Use cairo @<:@default=auto@:>@])],, + [with_cairo=auto]) +have_cairo=false +if test "x$with_cairo" = "xyes" -o "x$with_cairo" = "xauto"; then + PKG_CHECK_MODULES(CAIRO, cairo >= 1.8.0, have_cairo=true, :) +fi +if test "x$with_cairo" = "xyes" -a "x$have_cairo" != "xtrue"; then + AC_MSG_ERROR([cairo support requested but not found]) +fi +if $have_cairo; then + AC_DEFINE(HAVE_CAIRO, 1, [Have cairo graphics library]) +fi +AM_CONDITIONAL(HAVE_CAIRO, $have_cairo) + +have_cairo_ft=false +if $have_cairo; then + PKG_CHECK_MODULES(CAIRO_FT, cairo-ft, have_cairo_ft=true, :) +fi +if $have_cairo_ft; then + AC_DEFINE(HAVE_CAIRO_FT, 1, [Have cairo-ft support in cairo graphics library]) +fi +AM_CONDITIONAL(HAVE_CAIRO_FT, $have_cairo_ft) + +dnl ========================================================================== + +AC_ARG_WITH(fontconfig, + [AS_HELP_STRING([--with-fontconfig=@<:@yes/no/auto@:>@], + [Use fontconfig @<:@default=auto@:>@])],, + [with_fontconfig=auto]) +have_fontconfig=false +if test "x$with_fontconfig" = "xyes" -o "x$with_fontconfig" = "xauto"; then + PKG_CHECK_MODULES(FONTCONFIG, fontconfig, have_fontconfig=true, :) +fi +if test "x$with_fontconfig" = "xyes" -a "x$have_fontconfig" != "xtrue"; then + AC_MSG_ERROR([fontconfig support requested but not found]) +fi +if $have_fontconfig; then + AC_DEFINE(HAVE_FONTCONFIG, 1, [Have fontconfig library]) +fi +AM_CONDITIONAL(HAVE_FONTCONFIG, $have_fontconfig) + +dnl ========================================================================== + +AC_ARG_WITH(icu, + [AS_HELP_STRING([--with-icu=@<:@yes/no/builtin/auto@:>@], + [Use ICU @<:@default=auto@:>@])],, + [with_icu=auto]) +have_icu=false +if test "x$with_icu" = "xyes" -o "x$with_icu" = "xbuiltin" -o "x$with_icu" = "xauto"; then + PKG_CHECK_MODULES(ICU, icu-uc, have_icu=true, :) + + dnl Fallback to icu-config if ICU pkg-config files could not be found + if test "$have_icu" != "true"; then + AC_CHECK_TOOL(ICU_CONFIG, icu-config, no) + AC_MSG_CHECKING([for ICU by using icu-config fallback]) + if test "$ICU_CONFIG" != "no" && "$ICU_CONFIG" --version >/dev/null; then + have_icu=true + # We don't use --cflags as this gives us a lot of things that we don't + # necessarily want, like debugging and optimization flags + # See man (1) icu-config for more info. + ICU_CFLAGS=`$ICU_CONFIG --cppflags` + ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-libsonly` + AC_SUBST(ICU_CFLAGS) + AC_SUBST(ICU_LIBS) + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + fi +fi +if test \( "x$with_icu" = "xyes" -o "x$with_icu" = "xbuiltin" \) -a "x$have_icu" != "xtrue"; then + AC_MSG_ERROR([icu support requested but icu-uc not found]) +fi + +if $have_icu; then + CXXFLAGS="$CXXFLAGS `$PKG_CONFIG --variable=CXXFLAGS icu-uc`" + AC_DEFINE(HAVE_ICU, 1, [Have ICU library]) + if test "x$with_icu" = "xbuiltin"; then + AC_DEFINE(HAVE_ICU_BUILTIN, 1, [Use hb-icu Unicode callbacks]) + fi +fi +AM_CONDITIONAL(HAVE_ICU, $have_icu) +AM_CONDITIONAL(HAVE_ICU_BUILTIN, $have_icu && test "x$with_icu" = "xbuiltin") + +dnl =========================================================================== + +AC_ARG_WITH(ucdn, + [AS_HELP_STRING([--with-ucdn=@<:@yes/no@:>@], + [Use builtin UCDN library @<:@default=yes@:>@])],, + [with_ucdn=yes]) +have_ucdn=false +if test "x$with_ucdn" = "xyes"; then + have_ucdn=true +fi +if $have_ucdn; then + AC_DEFINE(HAVE_UCDN, 1, [Have UCDN Unicode functions]) +fi +AM_CONDITIONAL(HAVE_UCDN, $have_ucdn) + +dnl ========================================================================== + +AC_ARG_WITH(graphite2, + [AS_HELP_STRING([--with-graphite2=@<:@yes/no/auto@:>@], + [Use the graphite2 library @<:@default=no@:>@])],, + [with_graphite2=no]) +have_graphite2=false +GRAPHITE2_DEPS="graphite2" +AC_SUBST(GRAPHITE2_DEPS) +if test "x$with_graphite2" = "xyes" -o "x$with_graphite2" = "xauto"; then + PKG_CHECK_MODULES(GRAPHITE2, $GRAPHITE2_DEPS, have_graphite2=true, :) + if test "x$have_graphite2" != "xtrue"; then + # If pkg-config is not available, graphite2 can still be there + ac_save_CFLAGS="$CFLAGS" + ac_save_CPPFLAGS="$CPPFLAGS" + CFLAGS="$CFLAGS $GRAPHITE2_CFLAGS" + CPPFLAGS="$CPPFLAGS $GRAPHITE2_CFLAGS" + AC_CHECK_HEADER(graphite2/Segment.h, have_graphite2=true, :) + CPPFLAGS="$ac_save_CPPFLAGS" + CFLAGS="$ac_save_CFLAGS" + fi +fi +if test "x$with_graphite2" = "xyes" -a "x$have_graphite2" != "xtrue"; then + AC_MSG_ERROR([graphite2 support requested but libgraphite2 not found]) +fi +if $have_graphite2; then + AC_DEFINE(HAVE_GRAPHITE2, 1, [Have Graphite2 library]) +fi +AM_CONDITIONAL(HAVE_GRAPHITE2, $have_graphite2) + +dnl ========================================================================== + +AC_ARG_WITH(freetype, + [AS_HELP_STRING([--with-freetype=@<:@yes/no/auto@:>@], + [Use the FreeType library @<:@default=auto@:>@])],, + [with_freetype=auto]) +have_freetype=false +FREETYPE_DEPS="freetype2 >= 12.0.6" +AC_SUBST(FREETYPE_DEPS) +if test "x$with_freetype" = "xyes" -o "x$with_freetype" = "xauto"; then + # See freetype/docs/VERSION.DLL; 12.0.6 means freetype-2.4.2 + PKG_CHECK_MODULES(FREETYPE, $FREETYPE_DEPS, have_freetype=true, :) +fi +if test "x$with_freetype" = "xyes" -a "x$have_freetype" != "xtrue"; then + AC_MSG_ERROR([FreeType support requested but libfreetype2 not found]) +fi +if $have_freetype; then + AC_DEFINE(HAVE_FREETYPE, 1, [Have FreeType 2 library]) + save_libs=$LIBS + LIBS="$LIBS $FREETYPE_LIBS" + AC_CHECK_FUNCS(FT_Get_Var_Blend_Coordinates) + LIBS=$save_libs +fi +AM_CONDITIONAL(HAVE_FREETYPE, $have_freetype) + +dnl =========================================================================== + +AC_ARG_WITH(uniscribe, + [AS_HELP_STRING([--with-uniscribe=@<:@yes/no/auto@:>@], + [Use the Uniscribe library @<:@default=no@:>@])],, + [with_uniscribe=no]) +have_uniscribe=false +if test "x$with_uniscribe" = "xyes" -o "x$with_uniscribe" = "xauto"; then + AC_CHECK_HEADERS(usp10.h windows.h, have_uniscribe=true) +fi +if test "x$with_uniscribe" = "xyes" -a "x$have_uniscribe" != "xtrue"; then + AC_MSG_ERROR([uniscribe support requested but not found]) +fi +if $have_uniscribe; then + UNISCRIBE_CFLAGS= + UNISCRIBE_LIBS="-lusp10 -lgdi32 -lrpcrt4" + AC_SUBST(UNISCRIBE_CFLAGS) + AC_SUBST(UNISCRIBE_LIBS) + AC_DEFINE(HAVE_UNISCRIBE, 1, [Have Uniscribe library]) +fi +AM_CONDITIONAL(HAVE_UNISCRIBE, $have_uniscribe) + +dnl =========================================================================== + +AC_ARG_WITH(directwrite, + [AS_HELP_STRING([--with-directwrite=@<:@yes/no/auto@:>@], + [Use the DirectWrite library (experimental) @<:@default=no@:>@])],, + [with_directwrite=no]) +have_directwrite=false +AC_LANG_PUSH([C++]) +if test "x$with_directwrite" = "xyes" -o "x$with_directwrite" = "xauto"; then + AC_CHECK_HEADERS(dwrite.h, have_directwrite=true) +fi +AC_LANG_POP([C++]) +if test "x$with_directwrite" = "xyes" -a "x$have_directwrite" != "xtrue"; then + AC_MSG_ERROR([directwrite support requested but not found]) +fi +if $have_directwrite; then + DIRECTWRITE_CXXFLAGS= + DIRECTWRITE_LIBS="-ldwrite" + AC_SUBST(DIRECTWRITE_CXXFLAGS) + AC_SUBST(DIRECTWRITE_LIBS) + AC_DEFINE(HAVE_DIRECTWRITE, 1, [Have DirectWrite library]) +fi +AM_CONDITIONAL(HAVE_DIRECTWRITE, $have_directwrite) + +dnl =========================================================================== + +AC_ARG_WITH(coretext, + [AS_HELP_STRING([--with-coretext=@<:@yes/no/auto@:>@], + [Use CoreText @<:@default=no@:>@])],, + [with_coretext=no]) +have_coretext=false +if test "x$with_coretext" = "xyes" -o "x$with_coretext" = "xauto"; then + AC_CHECK_TYPE(CTFontRef, have_coretext=true,, [#include ]) + + if $have_coretext; then + CORETEXT_CFLAGS= + CORETEXT_LIBS="-framework ApplicationServices" + AC_SUBST(CORETEXT_CFLAGS) + AC_SUBST(CORETEXT_LIBS) + else + # On iOS CoreText and CoreGraphics are stand-alone frameworks + if test "x$have_coretext" != "xtrue"; then + # Check for a different symbol to avoid getting cached result. + AC_CHECK_TYPE(CTRunRef, have_coretext=true,, [#include ]) + fi + + if $have_coretext; then + CORETEXT_CFLAGS= + CORETEXT_LIBS="-framework CoreText -framework CoreGraphics" + AC_SUBST(CORETEXT_CFLAGS) + AC_SUBST(CORETEXT_LIBS) + fi + fi +fi +if test "x$with_coretext" = "xyes" -a "x$have_coretext" != "xtrue"; then + AC_MSG_ERROR([CoreText support requested but libcoretext not found]) +fi +if $have_coretext; then + AC_DEFINE(HAVE_CORETEXT, 1, [Have Core Text backend]) +fi +AM_CONDITIONAL(HAVE_CORETEXT, $have_coretext) + +dnl =========================================================================== + +AC_CACHE_CHECK([for Intel atomic primitives], hb_cv_have_intel_atomic_primitives, [ + hb_cv_have_intel_atomic_primitives=false + AC_TRY_LINK([ + void memory_barrier (void) { __sync_synchronize (); } + int atomic_add (int *i) { return __sync_fetch_and_add (i, 1); } + int mutex_trylock (int *m) { return __sync_lock_test_and_set (m, 1); } + void mutex_unlock (int *m) { __sync_lock_release (m); } + ], [], hb_cv_have_intel_atomic_primitives=true + ) +]) +if $hb_cv_have_intel_atomic_primitives; then + AC_DEFINE(HAVE_INTEL_ATOMIC_PRIMITIVES, 1, [Have Intel __sync_* atomic primitives]) +fi + +dnl =========================================================================== + +AC_CACHE_CHECK([for Solaris atomic operations], hb_cv_have_solaris_atomic_ops, [ + hb_cv_have_solaris_atomic_ops=false + AC_TRY_LINK([ + #include + /* This requires Solaris Studio 12.2 or newer: */ + #include + void memory_barrier (void) { __machine_rw_barrier (); } + int atomic_add (volatile unsigned *i) { return atomic_add_int_nv (i, 1); } + void *atomic_ptr_cmpxchg (volatile void **target, void *cmp, void *newval) { return atomic_cas_ptr (target, cmp, newval); } + ], [], hb_cv_have_solaris_atomic_ops=true + ) +]) +if $hb_cv_have_solaris_atomic_ops; then + AC_DEFINE(HAVE_SOLARIS_ATOMIC_OPS, 1, [Have Solaris __machine_*_barrier and atomic_* operations]) +fi + +if test "$os_win32" = no && ! $have_pthread; then + AC_CHECK_HEADERS(sched.h) + AC_SEARCH_LIBS(sched_yield,rt,AC_DEFINE(HAVE_SCHED_YIELD, 1, [Have sched_yield])) +fi + +dnl =========================================================================== + +AC_CONFIG_FILES([ +Makefile +src/Makefile +src/hb-version.h +src/hb-ucdn/Makefile +util/Makefile +test/Makefile +test/api/Makefile +test/fuzzing/Makefile +test/shaping/Makefile +docs/Makefile +docs/version.xml +win32/Makefile +win32/config.h.win32 +]) + +AC_OUTPUT + +AC_MSG_NOTICE([ + +Build configuration: + +Unicode callbacks (you want at least one): + Builtin (UCDN): ${have_ucdn} + Glib: ${have_glib} + ICU: ${have_icu} + +Font callbacks (the more the better): + FreeType: ${have_freetype} + +Tools used for command-line utilities: + Cairo: ${have_cairo} + Fontconfig: ${have_fontconfig} + +Additional shapers (the more the better): + Graphite2: ${have_graphite2} + +Platform shapers (not normally needed): + CoreText: ${have_coretext} + Uniscribe: ${have_uniscribe} + DirectWrite: ${have_directwrite} + +Other features: + Documentation: ${have_gtk_doc} + GObject bindings: ${have_gobject} + Introspection: ${have_introspection} +]) diff --git a/depcomp b/depcomp new file mode 100755 index 0000000..4ebd5b3 --- /dev/null +++ b/depcomp @@ -0,0 +1,791 @@ +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects + +scriptversion=2013-05-30.07; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Originally written by Alexandre Oliva . + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: depcomp [--help] [--version] PROGRAM [ARGS] + +Run PROGRAMS ARGS to compile a file, generating dependencies +as side-effects. + +Environment variables: + depmode Dependency tracking mode. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. + DEPDIR directory where to store dependencies. + depfile Dependency file to output. + tmpdepfile Temporary file to use when outputting dependencies. + libtool Whether libtool is used (yes/no). + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "depcomp $scriptversion" + exit $? + ;; +esac + +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} + +if test -z "$depmode" || test -z "$source" || test -z "$object"; then + echo "depcomp: Variables source, object and depmode must be set" 1>&2 + exit 1 +fi + +# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. +depfile=${depfile-`echo "$object" | + sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} +tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} + +rm -f "$tmpdepfile" + +# Avoid interferences from the environment. +gccflag= dashmflag= + +# Some modes work just like other modes, but use different flags. We +# parameterize here, but still list the modes in the big case below, +# to make depend.m4 easier to write. Note that we *cannot* use a case +# here, because this file can only contain one case statement. +if test "$depmode" = hp; then + # HP compiler uses -M and no extra arg. + gccflag=-M + depmode=gcc +fi + +if test "$depmode" = dashXmstdout; then + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout +fi + +cygpath_u="cygpath -u -f -" +if test "$depmode" = msvcmsys; then + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp +fi + +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc +fi + +case "$depmode" in +gcc3) +## gcc 3 implements dependency tracking that does exactly what +## we want. Yay! Note: for some reason libtool 1.4 doesn't like +## it if -MD -MP comes after the -MF stuff. Hmm. +## Unfortunately, FreeBSD c89 acceptance of flags depends upon +## the command line argument order; so add the flags where they +## appear in depend2.am. Note that the slowdown incurred here +## affects only configure: in makefiles, %FASTDEP% shortcuts this. + for arg + do + case $arg in + -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; + *) set fnord "$@" "$arg" ;; + esac + shift # fnord + shift # $arg + done + "$@" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + mv "$tmpdepfile" "$depfile" + ;; + +gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). +## There are various ways to get dependency output from gcc. Here's +## why we pick this rather obscure method: +## - Don't want to use -MD because we'd like the dependencies to end +## up in a subdir. Having to rename by hand is ugly. +## (We might end up doing this anyway to support other compilers.) +## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. +## - Using -M directly means running the compiler twice (even worse +## than renaming). + if test -z "$gccflag"; then + gccflag=-MD, + fi + "$@" -Wp,"$gccflag$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The second -e expression handles DOS-style file names with drive + # letters. + sed -e 's/^[^:]*: / /' \ + -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" +## This next piece of magic avoids the "deleted header file" problem. +## The problem is that when a header file which appears in a .P file +## is deleted, the dependency causes make to die (because there is +## typically no way to rebuild the header). We avoid this by adding +## dummy dependencies for each header file. Too bad gcc doesn't do +## this for us directly. +## Some versions of gcc put a space before the ':'. On the theory +## that the space means something, we add a space to the output as +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +hp) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + +sgi) + if test "$libtool" = yes; then + "$@" "-Wp,-MDupdate,$tmpdepfile" + else + "$@" -MDupdate "$tmpdepfile" + fi + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + + if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files + echo "$object : \\" > "$depfile" + # Clip off the initial element (the dependent). Don't try to be + # clever and replace this with sed code, as IRIX sed won't handle + # lines with more than a fixed number of characters (4096 in + # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; + # the IRIX cc adds comments like '#:fec' to the end of the + # dependency line. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" + echo >> "$depfile" + # The second pass generates a dummy entry for each header file. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" + else + make_dummy_depfile + fi + rm -f "$tmpdepfile" + ;; + +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + +aix) + # The C for AIX Compiler uses -M and outputs the dependencies + # in a .u file. In older versions, this file always lives in the + # current directory. Also, the AIX compiler puts '$object:' at the + # start of each line; $object doesn't have directory information. + # Version 6 uses the directory in both cases. + set_dir_from "$object" + set_base_from "$object" + if test "$libtool" = yes; then + tmpdepfile1=$dir$base.u + tmpdepfile2=$base.u + tmpdepfile3=$dir.libs/$base.u + "$@" -Wc,-M + else + tmpdepfile1=$dir$base.u + tmpdepfile2=$dir$base.u + tmpdepfile3=$dir$base.u + "$@" -M + fi + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" + rm -f "$tmpdepfile" + ;; + +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output + # foo.o: sub/foo.c sub/foo.h + # and will wrap long lines using '\' : + # foo.o: sub/foo.c ... \ + # sub/foo.h ... \ + # ... + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi + + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +hp2) + # The "hp" stanza above does not work with aCC (C++) and HP's ia64 + # compilers, which have integrated preprocessors. The correct option + # to use with these is +Maked; it writes dependencies to a file named + # 'foo.d', which lands next to the object file, wherever that + # happens to be. + # Much of this is similar to the tru64 case; see comments there. + set_dir_from "$object" + set_base_from "$object" + if test "$libtool" = yes; then + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir.libs/$base.d + "$@" -Wc,+Maked + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + "$@" +Maked + fi + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" + do + test -f "$tmpdepfile" && break + done + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" + # Add 'dependent.h:' lines. + sed -ne '2,${ + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" + else + make_dummy_depfile + fi + rm -f "$tmpdepfile" "$tmpdepfile2" + ;; + +tru64) + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; + +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/'"$tab"'\1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/'"$tab"'/ + G + p +}' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + +#nosideeffect) + # This comment above is used by automake to tell side-effect + # dependency tracking mechanisms from slower ones. + +dashmstdout) + # Important note: in order to support this mode, a compiler *must* + # always write the preprocessed file to stdout, regardless of -o. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + + # Remove '-o $object'. + IFS=" " + for arg + do + case $arg in + -o) + shift + ;; + $object) + shift + ;; + *) + set fnord "$@" "$arg" + shift # fnord + shift # $arg + ;; + esac + done + + test -z "$dashmflag" && dashmflag=-M + # Require at least two characters before searching for ':' + # in the target name. This is to cope with DOS-style filenames: + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. + "$@" $dashmflag | + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +dashXmstdout) + # This case only exists to satisfy depend.m4. It is never actually + # run, as this mode is specially recognized in the preamble. + exit 1 + ;; + +makedepend) + "$@" || exit $? + # Remove any Libtool call + if test "$libtool" = yes; then + while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + # X makedepend + shift + cleared=no eat=no + for arg + do + case $cleared in + no) + set ""; shift + cleared=yes ;; + esac + if test $eat = yes; then + eat=no + continue + fi + case "$arg" in + -D*|-I*) + set fnord "$@" "$arg"; shift ;; + # Strip any option that makedepend may not understand. Remove + # the object too, otherwise makedepend will parse it as a source file. + -arch) + eat=yes ;; + -*|$object) + ;; + *) + set fnord "$@" "$arg"; shift ;; + esac + done + obj_suffix=`echo "$object" | sed 's/^.*\././'` + touch "$tmpdepfile" + ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" + rm -f "$depfile" + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" "$tmpdepfile".bak + ;; + +cpp) + # Important note: in order to support this mode, a compiler *must* + # always write the preprocessed file to stdout. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + + # Remove '-o $object'. + IFS=" " + for arg + do + case $arg in + -o) + shift + ;; + $object) + shift + ;; + *) + set fnord "$@" "$arg" + shift # fnord + shift # $arg + ;; + esac + done + + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" + cat < "$tmpdepfile" >> "$depfile" + sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvisualcpp) + # Important note: in order to support this mode, a compiler *must* + # always write the preprocessed file to stdout. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + + IFS=" " + for arg + do + case "$arg" in + -o) + shift + ;; + $object) + shift + ;; + "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") + set fnord "$@" + shift + shift + ;; + *) + set fnord "$@" "$arg" + shift + shift + ;; + esac + done + "$@" -E 2>/dev/null | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvcmsys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + +none) + exec "$@" + ;; + +*) + echo "Unknown depmode $depmode" 1>&2 + exit 1 + ;; +esac + +exit 0 + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/docs/HarfBuzz.png b/docs/HarfBuzz.png new file mode 100644 index 0000000000000000000000000000000000000000..d58d9fc5a58424a657f01416b49a697c71eae149 GIT binary patch literal 3419 zcma)1I(4g|`1rpZ&;foTI zTLI@8Oy&a-M@M^9GY}}hh)C4N4Bd9khgQP9J1d3R z?2#_EZ{GToIL~D*GI~@cq|^Fyw9}ad9eY=T~Yfo4uHCOmlgn zmacAbV?cbTix`;givJ{2eOyZT?#BJFu;#~bJ-v=5zX|&T6E_L#`To3_nHjZ*q{t)csK0j@ z?U7wK8jWUp^W%pNZJThg{;@bW_bYj`t*tGVh0Va!)YQ#Qe4;#-V{2!JQM$489DWy> z;~Xu}*6nYFaE{(PQx1aaNo7>DvUpx2&ve_9aK!-a@fv=Y|$%W=;;- z3V8bmY$}epI5adA7Z-=ILN!I~tfi%KdM@W!pl4@ip>BdaJUoJe76~bUXKIH(g>1~| zAM%b?J1$_M@7`TEGBKf1smixoOiGiJlk;{D2Zx70*>V#B*KLZbdiDqQR5;3J&Ck#0 zmo+pt;*V$(*Y{k4gM)!69bon>0*<@w3B_Jk?!6Y6?Yvg`ptn3%z~uX&xlhaoaxwec zKK}l=nwkJ7r>TyP*g@}=_4OJY&icj;b~d)AufiN0dVk`)5LF!ulue8x?EMVfG9D_6 ze!g0y8>1uMCzsUS61tjCm8`aNw6!&`@8P|4cl+<4IIXo54u?O(wL~AaF5kSMtz9@z z$mshMN)i}n= zDdbohB3fHDG*RB(-mhEV+EscD6s2&mu(GbKtwm4eOA{E=GBbHNI5vnkbRC=@1O%Ma zP`djbjyL!yNJ;X5!4)G9@>yvCLa^45izDc$1KR8Xw7#y+H*ily@d{~l)cHfGl^Dk> zr>O0}oX3U|T=#P;SIIh$mw2KWoSmo5AGBgH3^^R)5J>3SWDiR>WoJ4D`N9l}F^OYQ zs4yAw%2n~`b#Is;66+r?+fC963Jd*E86s|nMS*T}>5`UasvP&xxMmHpgwG>0mmmxL z`oL57smmTJ0tPZtQl8|`DNP5e{LOXDr{ijCm4{eA73B>NLq~6k;+*gn;CUp+7KKu} z#ES|#KHNLOllV=zp({4$3@S(F*5R(M5FZA-6S7i+=}mwC^_(h45o#U_vN!^ zVnsWn&M}Q;SMW|Jos6Q_mkwU$!hH>%p_QdkAN)}$RJAIQl27$s6Bo;$yYXX2mmRF* zfEZhyXhsSBxZ*qJ;#HWJm-kj;tj^;_r;7_G*bWCvp8kowUFltir+nA^q*|aJ{8^(r zP24mxGP3-+w1k9M0s{ksy=5E@hXeGT>k(x3Vzvc3wB3i4?QkBMlab+eSun5l2}8Nf z?c2ta&gSOK_uM?+k*c=gQBdgcWJ_?xb23A(&{h9;DRd^Ko6XbFmgeTQ*-M-TISTjc zf_=iNBX_>Z0g`8JW#uuM=cNc9exOzh+1iWT7un*C3IWoSQmL-4&U9fi)&i?Pi)ItP z)^VQ8Od=h~{v-tAX7${3BqgQLN?0?rzpX1FAt8xf)cSM%nB^G?WvnS++B$=%@$L(e zsH&=3-}0~R0f|Dm+AOLW`m$k{x;)B^`gJ;Gbog+7mp->)tsOLwQla-&U zT?PXSlz}2`%_jpMd|-J;jG9dWX)zw*9S-_{Gt_A=a#&%z^m`O`pn_X1L_ry;o%K`!$r1Ru= ztV$6~@f^k7`+^j0eujFjNFZ-2v6dqD36D?PYCYNd1n~$7**@H(yw^<}STHpQnVE5kiHXrEUSD4Bn+;TA?N(yVS$}Cl9vjQGs~qvZ{Gjn}1vE7^RhEaP1*VYE zqoJuOsvA8yJsnU-edSndAG!70Ja{zz+wM|j4Fe-%kSZGS;l8a){A>3MKOhNqRrbnh zb>u|SFo|TFm4ZZieaw5(mwkx^5tkO0`3y><(boR{4eWsI3PY9nS(DgA>ev?kJZf28 zUFEL0zdGJ{`G_A3Hoirpjyij(GCMu_lO=ZtrzDx}>F&;((O7c27?O5#di;V>D%h{Qk_NKev zP*;(?B4lsbhK2_Fzdwj&H%>OX*%h7JeS|D{f~}z zrhonV1+axe4p3aNBM++W0Gtca5J|i*%=TqsVq$c3bb4A>Mn*DwNLqUzPjnUMHaHX&>WR(cZ43pulEANby8;C$VQl z`!53}H0eT+xNJETTT%iUvINi;@o#+y@Je@gH)#>z&}C9}{68DufT8W}?T|8244rGK z;o!sss-Pf}GH*rsRB@}UskvEmX5}>Kh3A; literal 0 HcmV?d00001 diff --git a/docs/Makefile.am b/docs/Makefile.am new file mode 100644 index 0000000..3916801 --- /dev/null +++ b/docs/Makefile.am @@ -0,0 +1,122 @@ +# Process this file with automake to produce Makefile.in + +# We require automake 1.6 at least. +AUTOMAKE_OPTIONS = 1.6 + +# This is a blank Makefile.am for using gtk-doc. +# Copy this to your project's API docs directory and modify the variables to +# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples +# of using the various options. + +# The name of the module, e.g. 'glib'. +DOC_MODULE=harfbuzz + +# Uncomment for versioned docs and specify the version of the module, e.g. '2'. +#DOC_MODULE_VERSION=$(HB_VERSION_MAJOR) + +# The top-level SGML file. You can change this if you want to. +DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml + +# Directories containing the source code. +# gtk-doc will search all .c and .h files beneath these paths +# for inline comments documenting functions and macros. +# e.g. DOC_SOURCE_DIR=$(top_srcdir)/gtk $(top_srcdir)/gdk +DOC_SOURCE_DIR=$(top_srcdir)/src $(top_builddir)/src + +# Extra options to pass to gtkdoc-scangobj. Not normally needed. +SCANGOBJ_OPTIONS= + +# Extra options to supply to gtkdoc-scan. +# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" +SCAN_OPTIONS=--rebuild-types --deprecated-guards="HB_DISABLE_DEPRECATED" \ + --ignore-decorators="HB_EXTERN" + +# Header files or dirs to ignore when scanning. Use base file/dir names +# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code +IGNORE_HFILES=`cd $(top_srcdir)/src; find . -path './hb-*/*.h' | sed 's@^.*/@@'` +if HAVE_GOBJECT +else +IGNORE_HFILES+=hb-gobject.h hb-gobject-enums.h hb-gobject-structs.h +endif + +# Extra options to supply to gtkdoc-mkdb. +# e.g. MKDB_OPTIONS=--xml-mode --output-format=xml +MKDB_OPTIONS=--source-suffixes=h,cc --xml-mode --output-format=xml --ignore-files="$(IGNORE_HFILES)" + +# Extra options to supply to gtkdoc-mktmpl +# e.g. MKTMPL_OPTIONS=--only-section-tmpl +MKTMPL_OPTIONS= + +# Extra options to supply to gtkdoc-mkhtml +MKHTML_OPTIONS= + +# Extra options to supply to gtkdoc-fixref. Not normally needed. +# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html +FIXXREF_OPTIONS= + +# Used for dependencies. The docs will be rebuilt if any of these change. +# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h +# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c +HFILE_GLOB=$(top_srcdir)/src/hb.h $(top_srcdir)/src/hb-*.h +CFILE_GLOB=$(top_srcdir)/src/hb-*.cc + +# Extra header to include when scanning, which are not under DOC_SOURCE_DIR +# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h +EXTRA_HFILES=$(top_builddir)/src/hb-version.h + +# Images to copy into HTML directory. +# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png +HTML_IMAGES= \ + HarfBuzz.png + +# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). +# e.g. content_files=running.sgml building.sgml changes-2.0.sgml +content_files= \ + usermanual-buffers-language-script-and-direction.xml \ + usermanual-clusters.xml \ + usermanual-fonts-and-faces.xml \ + usermanual-glyph-information.xml \ + usermanual-hello-harfbuzz.xml \ + usermanual-install-harfbuzz.xml \ + usermanual-opentype-features.xml \ + usermanual-what-is-harfbuzz.xml \ + version.xml + +# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded +# These files must be listed here *and* in content_files +# e.g. expand_content_files=running.sgml +expand_content_files= + +# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library. +# Only needed if you are using gtkdoc-scangobj to dynamically query widget +# signals and properties. +# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) +# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) +GTKDOC_CFLAGS= +GTKDOC_LIBS=$(top_builddir)/src/libharfbuzz.la +if HAVE_GOBJECT +GTKDOC_LIBS+=$(top_builddir)/src/libharfbuzz-gobject.la +endif + +# This includes the standard gtk-doc make rules, copied by gtkdocize. +include $(top_srcdir)/gtk-doc.make + +# Other files to distribute +# e.g. EXTRA_DIST += version.xml.in +EXTRA_DIST += version.xml.in + +# Files not to distribute +# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types +# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt +#DISTCLEANFILES += + +# Comment this out if you want 'make check' to test you doc status +# and run some sanity checks +if ENABLE_GTK_DOC +TESTS_ENVIRONMENT = cd $(srcdir) && \ + DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \ + SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) +#TESTS = $(GTKDOC_CHECK) +endif + +-include $(top_srcdir)/git.mk diff --git a/docs/Makefile.in b/docs/Makefile.in new file mode 100644 index 0000000..04b9a15 --- /dev/null +++ b/docs/Makefile.in @@ -0,0 +1,873 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# Process this file with automake to produce Makefile.in + +# -*- mode: makefile -*- + +#################################### +# Everything below here is generic # +#################################### +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +@HAVE_GOBJECT_FALSE@am__append_1 = hb-gobject.h hb-gobject-enums.h hb-gobject-structs.h +@HAVE_GOBJECT_TRUE@am__append_2 = $(top_builddir)/src/libharfbuzz-gobject.la +DIST_COMMON = $(top_srcdir)/gtk-doc.make $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(srcdir)/version.xml.in +subdir = docs +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = version.xml +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CAIRO_CFLAGS = @CAIRO_CFLAGS@ +CAIRO_FT_CFLAGS = @CAIRO_FT_CFLAGS@ +CAIRO_FT_LIBS = @CAIRO_FT_LIBS@ +CAIRO_LIBS = @CAIRO_LIBS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CORETEXT_CFLAGS = @CORETEXT_CFLAGS@ +CORETEXT_LIBS = @CORETEXT_LIBS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DIRECTWRITE_CXXFLAGS = @DIRECTWRITE_CXXFLAGS@ +DIRECTWRITE_LIBS = @DIRECTWRITE_LIBS@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ +FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ +FREETYPE_DEPS = @FREETYPE_DEPS@ +FREETYPE_LIBS = @FREETYPE_LIBS@ +GIT = @GIT@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_DEPS = @GLIB_DEPS@ +GLIB_LIBS = @GLIB_LIBS@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ +GOBJECT_LIBS = @GOBJECT_LIBS@ +GRAPHITE2_CFLAGS = @GRAPHITE2_CFLAGS@ +GRAPHITE2_DEPS = @GRAPHITE2_DEPS@ +GRAPHITE2_LIBS = @GRAPHITE2_LIBS@ +GREP = @GREP@ +GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ +HB_LIBTOOL_VERSION_INFO = @HB_LIBTOOL_VERSION_INFO@ +HB_VERSION = @HB_VERSION@ +HB_VERSION_MAJOR = @HB_VERSION_MAJOR@ +HB_VERSION_MICRO = @HB_VERSION_MICRO@ +HB_VERSION_MINOR = @HB_VERSION_MINOR@ +HTML_DIR = @HTML_DIR@ +ICU_CFLAGS = @ICU_CFLAGS@ +ICU_CONFIG = @ICU_CONFIG@ +ICU_LIBS = @ICU_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PTHREAD_CC = @PTHREAD_CC@ +PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ +PTHREAD_LIBS = @PTHREAD_LIBS@ +RAGEL = @RAGEL@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +UNISCRIBE_CFLAGS = @UNISCRIBE_CFLAGS@ +UNISCRIBE_LIBS = @UNISCRIBE_LIBS@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +ax_pthread_config = @ax_pthread_config@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# We require automake 1.6 at least. +AUTOMAKE_OPTIONS = 1.6 + +# This is a blank Makefile.am for using gtk-doc. +# Copy this to your project's API docs directory and modify the variables to +# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples +# of using the various options. + +# The name of the module, e.g. 'glib'. +DOC_MODULE = harfbuzz + +# Uncomment for versioned docs and specify the version of the module, e.g. '2'. +#DOC_MODULE_VERSION=$(HB_VERSION_MAJOR) + +# The top-level SGML file. You can change this if you want to. +DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml + +# Directories containing the source code. +# gtk-doc will search all .c and .h files beneath these paths +# for inline comments documenting functions and macros. +# e.g. DOC_SOURCE_DIR=$(top_srcdir)/gtk $(top_srcdir)/gdk +DOC_SOURCE_DIR = $(top_srcdir)/src $(top_builddir)/src + +# Extra options to pass to gtkdoc-scangobj. Not normally needed. +SCANGOBJ_OPTIONS = + +# Extra options to supply to gtkdoc-scan. +# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" +SCAN_OPTIONS = --rebuild-types --deprecated-guards="HB_DISABLE_DEPRECATED" \ + --ignore-decorators="HB_EXTERN" + + +# Header files or dirs to ignore when scanning. Use base file/dir names +# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code +IGNORE_HFILES = `cd $(top_srcdir)/src; find . -path './hb-*/*.h' | sed \ + 's@^.*/@@'` $(am__append_1) + +# Extra options to supply to gtkdoc-mkdb. +# e.g. MKDB_OPTIONS=--xml-mode --output-format=xml +MKDB_OPTIONS = --source-suffixes=h,cc --xml-mode --output-format=xml --ignore-files="$(IGNORE_HFILES)" + +# Extra options to supply to gtkdoc-mktmpl +# e.g. MKTMPL_OPTIONS=--only-section-tmpl +MKTMPL_OPTIONS = + +# Extra options to supply to gtkdoc-mkhtml +MKHTML_OPTIONS = + +# Extra options to supply to gtkdoc-fixref. Not normally needed. +# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html +FIXXREF_OPTIONS = + +# Used for dependencies. The docs will be rebuilt if any of these change. +# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h +# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c +HFILE_GLOB = $(top_srcdir)/src/hb.h $(top_srcdir)/src/hb-*.h +CFILE_GLOB = $(top_srcdir)/src/hb-*.cc + +# Extra header to include when scanning, which are not under DOC_SOURCE_DIR +# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h +EXTRA_HFILES = $(top_builddir)/src/hb-version.h + +# Images to copy into HTML directory. +# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png +HTML_IMAGES = \ + HarfBuzz.png + + +# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). +# e.g. content_files=running.sgml building.sgml changes-2.0.sgml +content_files = \ + usermanual-buffers-language-script-and-direction.xml \ + usermanual-clusters.xml \ + usermanual-fonts-and-faces.xml \ + usermanual-glyph-information.xml \ + usermanual-hello-harfbuzz.xml \ + usermanual-install-harfbuzz.xml \ + usermanual-opentype-features.xml \ + usermanual-what-is-harfbuzz.xml \ + version.xml + + +# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded +# These files must be listed here *and* in content_files +# e.g. expand_content_files=running.sgml +expand_content_files = + +# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library. +# Only needed if you are using gtkdoc-scangobj to dynamically query widget +# signals and properties. +# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) +# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) +GTKDOC_CFLAGS = +GTKDOC_LIBS = $(top_builddir)/src/libharfbuzz.la $(am__append_2) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute + +# We set GPATH here; this gives us semantics for GNU make +# which are more like other make's VPATH, when it comes to +# whether a source that is a target of one rule is then +# searched for in VPATH/GPATH. +# +GPATH = $(srcdir) +TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) +SETUP_FILES = \ + $(content_files) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt + + +# This includes the standard gtk-doc make rules, copied by gtkdocize. + +# Other files to distribute +# e.g. EXTRA_DIST += version.xml.in +EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in +DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \ + html-build.stamp pdf-build.stamp \ + sgml.stamp html.stamp pdf.stamp + +SCANOBJ_FILES = \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ + $(DOC_MODULE).interfaces \ + $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals + +REPORT_FILES = \ + $(DOC_MODULE)-undocumented.txt \ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt + +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test +@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = +@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp +@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = +@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + +#### setup #### +GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V)) +GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SETUP_0 = @echo " DOC Preparing build"; + +#### scan #### +GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V)) +GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SCAN_0 = @echo " DOC Scanning header files"; +GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V)) +GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_INTROSPECT_0 = @echo " DOC Introspecting gobjects"; + +#### xml #### +GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V)) +GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XML_0 = @echo " DOC Building XML"; + +#### html #### +GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V)) +GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_HTML_0 = @echo " DOC Building HTML"; +GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V)) +GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XREF_0 = @echo " DOC Fixing cross-references"; + +#### pdf #### +GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V)) +GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_PDF_0 = @echo " DOC Building PDF"; + +# Files not to distribute +# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types +# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt +#DISTCLEANFILES += + +# Comment this out if you want 'make check' to test you doc status +# and run some sanity checks +@ENABLE_GTK_DOC_TRUE@TESTS_ENVIRONMENT = cd $(srcdir) && \ +@ENABLE_GTK_DOC_TRUE@ DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \ +@ENABLE_GTK_DOC_TRUE@ SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) + +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/gtk-doc.make $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits docs/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnits docs/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; +$(top_srcdir)/gtk-doc.make: + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook +check-am: all-am +check: check-am +@ENABLE_GTK_DOC_FALSE@all-local: +all-am: Makefile all-local +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-local mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-local + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-data-local + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic \ + maintainer-clean-local + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-local + +.MAKE: install-am install-strip + +.PHONY: all all-am all-local check check-am clean clean-generic \ + clean-libtool clean-local cscopelist-am ctags-am dist-hook \ + distclean distclean-generic distclean-libtool distclean-local \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-data-local \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + maintainer-clean-local mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-local + + +gtkdoc-check.test: Makefile + $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \ + echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \ + chmod +x $@ + +all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +.PHONY: all-gtk-doc + +@ENABLE_GTK_DOC_TRUE@all-local: all-gtk-doc + +docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) + +$(REPORT_FILES): sgml-build.stamp + +setup-build.stamp: + -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ + if test "x$$files" != "x" ; then \ + for file in $$files ; do \ + destdir=`dirname $(abs_builddir)/$$file`; \ + test -d "$$destdir" || mkdir -p "$$destdir"; \ + test -f $(abs_srcdir)/$$file && \ + cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ + done; \ + fi; \ + fi + $(AM_V_at)touch setup-build.stamp + +scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) + $(GTK_DOC_V_SCAN)_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ + gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) + $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ + scanobj_options=""; \ + gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + scanobj_options="--verbose"; \ + fi; \ + fi; \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ + gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ + else \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ + fi + $(AM_V_at)touch scan-build.stamp + +$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true + +sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) + $(GTK_DOC_V_XML)_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ + gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) + $(AM_V_at)touch sgml-build.stamp + +sgml.stamp: sgml-build.stamp + @true + +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ + mkhtml_options=""; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkhtml_options="$$mkhtml_options --verbose"; \ + fi; \ + fi; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ + if test "$(?)" = "0"; then \ + mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ + fi; \ + cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + -@test "x$(HTML_IMAGES)" = "x" || \ + for file in $(HTML_IMAGES) ; do \ + if test -f $(abs_srcdir)/$$file ; then \ + cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ + fi; \ + if test -f $(abs_builddir)/$$file ; then \ + cp $(abs_builddir)/$$file $(abs_builddir)/html; \ + fi; \ + done; + $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + $(AM_V_at)touch html-build.stamp + +pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ + mkpdf_options=""; \ + gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkpdf_options="$$mkpdf_options --verbose"; \ + fi; \ + fi; \ + if test "x$(HTML_IMAGES)" != "x"; then \ + for img in $(HTML_IMAGES); do \ + part=`dirname $$img`; \ + echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \ + if test $$? != 0; then \ + mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ + fi; \ + done; \ + fi; \ + gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) + $(AM_V_at)touch pdf-build.stamp + +############## + +clean-local: + @rm -f *~ *.bak + @rm -rf .libs + @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ + rm -f $(DOC_MODULE).types; \ + fi + +distclean-local: + @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ + fi + +maintainer-clean-local: + @rm -rf xml html + +install-data-local: + @installfiles=`echo $(builddir)/html/*`; \ + if test "$$installfiles" = '$(builddir)/html/*'; \ + then echo 1>&2 'Nothing to install' ; \ + else \ + if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ + else \ + installdir="$(DESTDIR)$(TARGET_DIR)"; \ + fi; \ + $(mkinstalldirs) $${installdir} ; \ + for i in $$installfiles; do \ + echo ' $(INSTALL_DATA) '$$i ; \ + $(INSTALL_DATA) $$i $${installdir}; \ + done; \ + if test -n "$(DOC_MODULE_VERSION)"; then \ + mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ + $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ + fi; \ + $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ + fi + +uninstall-local: + @if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ + else \ + installdir="$(DESTDIR)$(TARGET_DIR)"; \ + fi; \ + rm -rf $${installdir} + +# +# Require gtk-doc when making dist +# +@HAVE_GTK_DOC_TRUE@dist-check-gtkdoc: docs +@HAVE_GTK_DOC_FALSE@dist-check-gtkdoc: +@HAVE_GTK_DOC_FALSE@ @echo "*** gtk-doc is needed to run 'make dist'. ***" +@HAVE_GTK_DOC_FALSE@ @echo "*** gtk-doc was not found when 'configure' ran. ***" +@HAVE_GTK_DOC_FALSE@ @echo "*** please install gtk-doc and rerun 'configure'. ***" +@HAVE_GTK_DOC_FALSE@ @false + +dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local + @mkdir $(distdir)/html + @cp ./html/* $(distdir)/html + @-cp ./$(DOC_MODULE).pdf $(distdir)/ + @-cp ./$(DOC_MODULE).types $(distdir)/ + @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/ + @cd $(distdir) && rm -f $(DISTCLEANFILES) + @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html + +.PHONY : dist-hook-local docs +#TESTS = $(GTKDOC_CHECK) + +-include $(top_srcdir)/git.mk + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/docs/harfbuzz-docs.xml b/docs/harfbuzz-docs.xml new file mode 100644 index 0000000..00113e9 --- /dev/null +++ b/docs/harfbuzz-docs.xml @@ -0,0 +1,194 @@ + + + +]> + + + HarfBuzz Manual + + HarfBuzz + + + HarfBuzz is an OpenType + text shaping engine. + + + The current HarfBuzz codebase, formerly known as harfbuzz-ng, is + versioned 1.x.x and is stable and under active maintenance. This is + what is used in latest versions of Firefox, GNOME, ChromeOS, Chrome, + LibreOffice, XeTeX, Android, and KDE, among other places. The canonical + source tree is available + here. + Also available on + github. + See for release tarballs. + + + The old HarfBuzz codebase, these days known as harfbuzz-old, was + derived from FreeType, + Pango, and + Qt and is available + here. + It is not actively developed or maintained, and is extremely buggy. All + users are encouraged to switch over to the new HarfBuzz as soon as + possible. There are no release tarballs of old HarfBuzz whatsoever. + + + + + + User's manual + + + + + + + + + + + + + + This document is for HarfBuzz &version;. + + + + Reference manual + + Harfbuzz API + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Object Hierarchy + + + + API Index + + + + Index of new symbols in 0.9.2 + + + + Index of new symbols in 0.9.5 + + + + Index of new symbols in 0.9.7 + + + + Index of new symbols in 0.9.8 + + + + Index of new symbols in 0.9.10 + + + + Index of new symbols in 0.9.11 + + + + Index of new symbols in 0.9.20 + + + + Index of new symbols in 0.9.22 + + + + Index of new symbols in 0.9.28 + + + + Index of new symbols in 0.9.30 + + + + Index of new symbols in 0.9.31 + + + + Index of new symbols in 0.9.38 + + + + Index of new symbols in 0.9.39 + + + + Index of new symbols in 0.9.41 + + + + Index of new symbols in 0.9.42 + + + + Index of new symbols in 1.0.5 + + + + Index of new symbols in 1.1.2 + + + + Index of new symbols in 1.1.3 + + + + Index of new symbols in 1.2.3 + + + + Index of new symbols in 1.3.3 + + + + Index of deprecated API + + + + + + diff --git a/docs/harfbuzz-overrides.txt b/docs/harfbuzz-overrides.txt new file mode 100644 index 0000000..e69de29 diff --git a/docs/harfbuzz-sections.txt b/docs/harfbuzz-sections.txt new file mode 100644 index 0000000..fcf4e52 --- /dev/null +++ b/docs/harfbuzz-sections.txt @@ -0,0 +1,599 @@ +
+hb + +HB_H_IN +HB_EXTERN +
+ +
+hb-blob +hb_blob_create +hb_blob_create_sub_blob +hb_blob_destroy +hb_blob_get_data +hb_blob_get_data_writable +hb_blob_get_empty +hb_blob_get_length +hb_blob_get_user_data +hb_blob_is_immutable +hb_blob_make_immutable +hb_blob_reference +hb_blob_set_user_data +hb_blob_t +hb_memory_mode_t +
+ +
+hb-buffer +HB_SEGMENT_PROPERTIES_DEFAULT +HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT +hb_buffer_create +hb_buffer_reference +hb_buffer_get_empty +hb_buffer_destroy +hb_buffer_reset +hb_buffer_clear_contents +hb_buffer_pre_allocate +hb_buffer_allocation_successful +hb_buffer_add +hb_buffer_add_codepoints +hb_buffer_add_utf32 +hb_buffer_add_utf16 +hb_buffer_add_utf8 +hb_buffer_add_latin1 +hb_buffer_set_content_type +hb_buffer_get_content_type +hb_buffer_set_direction +hb_buffer_get_direction +hb_buffer_set_script +hb_buffer_get_script +hb_buffer_set_language +hb_buffer_get_language +hb_buffer_set_flags +hb_buffer_get_flags +hb_buffer_set_cluster_level +hb_buffer_get_cluster_level +hb_buffer_set_length +hb_buffer_get_length +hb_buffer_set_segment_properties +hb_buffer_get_segment_properties +hb_buffer_guess_segment_properties +hb_buffer_set_unicode_funcs +hb_buffer_get_unicode_funcs +hb_buffer_set_user_data +hb_buffer_get_user_data +hb_buffer_get_glyph_infos +hb_buffer_get_glyph_positions +hb_buffer_set_replacement_codepoint +hb_buffer_get_replacement_codepoint +hb_buffer_normalize_glyphs +hb_buffer_reverse +hb_buffer_reverse_range +hb_buffer_reverse_clusters +hb_buffer_serialize_glyphs +hb_buffer_deserialize_glyphs +hb_buffer_serialize_format_from_string +hb_buffer_serialize_format_to_string +hb_buffer_serialize_list_formats +hb_segment_properties_equal +hb_segment_properties_hash +hb_buffer_set_message_func +hb_buffer_t +hb_glyph_info_t +hb_glyph_position_t +hb_buffer_content_type_t +hb_buffer_flags_t +hb_buffer_cluster_level_t +hb_segment_properties_t +hb_buffer_serialize_format_t +hb_buffer_serialize_flags_t +hb_buffer_message_func_t +
+ +
+hb-common +hb_tag_from_string +hb_tag_to_string +hb_direction_from_string +hb_direction_to_string +hb_script_from_iso15924_tag +hb_script_from_string +hb_script_to_iso15924_tag +hb_script_get_horizontal_direction +hb_language_from_string +hb_language_to_string +hb_language_get_default +hb_bool_t +hb_codepoint_t +hb_destroy_func_t +hb_direction_t +hb_language_t +hb_mask_t +hb_position_t +hb_tag_t +hb_script_t +hb_user_data_key_t +hb_var_int_t +HB_TAG +HB_TAG_NONE +HB_TAG_MAX +HB_TAG_MAX_SIGNED +HB_UNTAG +HB_DIRECTION_REVERSE +HB_DIRECTION_IS_BACKWARD +HB_DIRECTION_IS_FORWARD +HB_DIRECTION_IS_HORIZONTAL +HB_DIRECTION_IS_VALID +HB_DIRECTION_IS_VERTICAL +HB_LANGUAGE_INVALID + +HB_BEGIN_DECLS +HB_END_DECLS +int16_t +int32_t +int64_t +int8_t +uint16_t +uint32_t +uint64_t +uint8_t +
+ +
+hb-deprecated +HB_BUFFER_FLAGS_DEFAULT +HB_BUFFER_SERIALIZE_FLAGS_DEFAULT +HB_SCRIPT_CANADIAN_ABORIGINAL +hb_font_funcs_set_glyph_func +hb_font_get_glyph_func_t +
+ +
+hb-coretext +HB_CORETEXT_TAG_MORT +HB_CORETEXT_TAG_MORX +hb_coretext_face_create +hb_coretext_face_get_cg_font +hb_coretext_font_get_ct_font +
+ +
+hb-face +hb_face_create +hb_face_create_for_tables +hb_face_destroy +hb_face_get_empty +hb_face_get_glyph_count +hb_face_get_index +hb_face_get_upem +hb_face_get_user_data +hb_face_is_immutable +hb_face_make_immutable +hb_face_reference +hb_face_reference_blob +hb_face_reference_table +hb_face_set_glyph_count +hb_face_set_index +hb_face_set_upem +hb_face_set_user_data +hb_face_t +
+ +
+hb-font +hb_font_add_glyph_origin_for_direction +hb_font_create +hb_font_create_sub_font +hb_font_destroy +hb_font_funcs_create +hb_font_funcs_destroy +hb_font_funcs_get_empty +hb_font_funcs_get_user_data +hb_font_funcs_is_immutable +hb_font_funcs_make_immutable +hb_font_funcs_reference +hb_font_funcs_set_glyph_contour_point_func +hb_font_funcs_set_glyph_extents_func +hb_font_funcs_set_glyph_from_name_func +hb_font_funcs_set_glyph_h_advance_func +hb_font_funcs_set_glyph_h_kerning_func +hb_font_funcs_set_glyph_h_origin_func +hb_font_funcs_set_glyph_name_func +hb_font_funcs_set_glyph_v_advance_func +hb_font_funcs_set_glyph_v_kerning_func +hb_font_funcs_set_glyph_v_origin_func +hb_font_funcs_set_nominal_glyph_func +hb_font_funcs_set_user_data +hb_font_funcs_set_variation_glyph_func +hb_font_funcs_t +hb_font_get_empty +hb_font_get_face +hb_font_get_glyph +hb_font_get_glyph_advance_for_direction +hb_font_get_glyph_advance_func_t +hb_font_get_glyph_contour_point +hb_font_get_glyph_contour_point_for_origin +hb_font_get_glyph_contour_point_func_t +hb_font_get_glyph_extents +hb_font_get_glyph_extents_for_origin +hb_font_get_glyph_extents_func_t +hb_font_get_glyph_from_name +hb_font_get_glyph_from_name_func_t +hb_font_get_glyph_h_advance +hb_font_get_glyph_h_advance_func_t +hb_font_get_glyph_h_kerning +hb_font_get_glyph_h_kerning_func_t +hb_font_get_glyph_h_origin +hb_font_get_glyph_h_origin_func_t +hb_font_get_glyph_kerning_for_direction +hb_font_get_glyph_kerning_func_t +hb_font_get_glyph_name +hb_font_get_glyph_name_func_t +hb_font_get_glyph_origin_for_direction +hb_font_get_glyph_origin_func_t +hb_font_get_glyph_v_advance +hb_font_get_glyph_v_advance_func_t +hb_font_get_glyph_v_kerning +hb_font_get_glyph_v_kerning_func_t +hb_font_get_glyph_v_origin +hb_font_get_glyph_v_origin_func_t +hb_font_get_nominal_glyph +hb_font_get_nominal_glyph_func_t +hb_font_get_parent +hb_font_get_ppem +hb_font_get_scale +hb_font_get_user_data +hb_font_get_variation_glyph +hb_font_get_variation_glyph_func_t +hb_font_get_var_coords_normalized +hb_font_glyph_from_string +hb_font_glyph_to_string +hb_font_is_immutable +hb_font_make_immutable +hb_font_reference +hb_font_set_funcs +hb_font_set_funcs_data +hb_font_set_parent +hb_font_set_ppem +hb_font_set_scale +hb_font_set_user_data +hb_variation_t +hb_variation_from_string +hb_variation_to_string +hb_font_set_variations +hb_font_set_var_coords_design +hb_font_set_var_coords_normalized +hb_font_subtract_glyph_origin_for_direction +hb_font_t +hb_reference_table_func_t +hb_font_funcs_set_font_h_extents_func +hb_font_funcs_set_font_v_extents_func +hb_font_get_extents_for_direction +hb_font_get_font_extents_func_t +hb_font_get_font_h_extents_func_t +hb_font_get_font_v_extents_func_t +hb_font_get_h_extents +hb_font_get_v_extents +
+ +
+hb-ft +hb_ft_face_create +hb_ft_face_create_cached +hb_ft_face_create_referenced +hb_ft_font_create +hb_ft_font_create_referenced +hb_ft_font_get_face +hb_ft_font_set_load_flags +hb_ft_font_get_load_flags +hb_ft_font_set_funcs +
+ +
+hb-glib +hb_glib_get_unicode_funcs +hb_glib_script_from_script +hb_glib_script_to_script +hb_glib_blob_create +
+ +
+hb-gobject +HB_GOBJECT_TYPE_BLOB +HB_GOBJECT_TYPE_BUFFER +HB_GOBJECT_TYPE_BUFFER_CONTENT_TYPE +HB_GOBJECT_TYPE_BUFFER_FLAGS +HB_GOBJECT_TYPE_BUFFER_SERIALIZE_FLAGS +HB_GOBJECT_TYPE_BUFFER_SERIALIZE_FORMAT +HB_GOBJECT_TYPE_DIRECTION +HB_GOBJECT_TYPE_FACE +HB_GOBJECT_TYPE_FONT +HB_GOBJECT_TYPE_FONT_FUNCS +HB_GOBJECT_TYPE_MEMORY_MODE +HB_GOBJECT_TYPE_OT_LAYOUT_GLYPH_CLASS +HB_GOBJECT_TYPE_OT_MATH_CONSTANT +HB_GOBJECT_TYPE_OT_MATH_GLYPH_PART_FLAGS +HB_GOBJECT_TYPE_OT_MATH_KERN +HB_GOBJECT_TYPE_SCRIPT +HB_GOBJECT_TYPE_SHAPE_PLAN +HB_GOBJECT_TYPE_UNICODE_COMBINING_CLASS +HB_GOBJECT_TYPE_UNICODE_FUNCS +HB_GOBJECT_TYPE_UNICODE_GENERAL_CATEGORY +HB_GOBJECT_TYPE_BUFFER_CLUSTER_LEVEL +HB_GOBJECT_TYPE_FEATURE +HB_GOBJECT_TYPE_GLYPH_INFO +HB_GOBJECT_TYPE_GLYPH_POSITION +HB_GOBJECT_TYPE_SEGMENT_PROPERTIES +HB_GOBJECT_TYPE_SET +HB_GOBJECT_TYPE_USER_DATA_KEY +hb_gobject_blob_get_type +hb_gobject_buffer_content_type_get_type +hb_gobject_buffer_flags_get_type +hb_gobject_buffer_get_type +hb_gobject_buffer_serialize_flags_get_type +hb_gobject_buffer_serialize_format_get_type +hb_gobject_direction_get_type +hb_gobject_face_get_type +hb_gobject_font_funcs_get_type +hb_gobject_font_get_type +hb_gobject_memory_mode_get_type +hb_gobject_ot_layout_glyph_class_get_type +hb_gobject_ot_math_constant_get_type +hb_gobject_ot_math_glyph_part_flags_get_type +hb_gobject_ot_math_kern_get_type +hb_gobject_script_get_type +hb_gobject_shape_plan_get_type +hb_gobject_unicode_combining_class_get_type +hb_gobject_unicode_funcs_get_type +hb_gobject_unicode_general_category_get_type +hb_gobject_buffer_cluster_level_get_type +hb_gobject_feature_get_type +hb_gobject_glyph_info_get_type +hb_gobject_glyph_position_get_type +hb_gobject_segment_properties_get_type +hb_gobject_set_get_type +hb_gobject_user_data_key_get_type + +HB_GOBJECT_H_IN +
+ +
+hb-gobject + +
+ +
+hb-graphite2 +HB_GRAPHITE2_TAG_SILF +hb_graphite2_face_get_gr_face +hb_graphite2_font_get_gr_font +
+ +
+hb-icu +hb_icu_get_unicode_funcs +hb_icu_script_from_script +hb_icu_script_to_script +
+ +
+hb-ot + +HB_OT_H_IN +
+ +
+hb-ot-font +hb_ot_font_set_funcs +
+ +
+hb-ot-shape +hb_ot_shape_glyphs_closure +
+ +
+hb-ot-layout +HB_OT_LAYOUT_DEFAULT_LANGUAGE_INDEX +HB_OT_LAYOUT_NO_FEATURE_INDEX +HB_OT_LAYOUT_NO_SCRIPT_INDEX +HB_OT_LAYOUT_NO_VARIATIONS_INDEX +HB_OT_TAG_GDEF +HB_OT_TAG_GPOS +HB_OT_TAG_GSUB +HB_OT_TAG_JSTF +hb_ot_layout_collect_lookups +hb_ot_layout_feature_get_lookups +hb_ot_layout_feature_with_variations_get_lookups +hb_ot_layout_get_attach_points +hb_ot_layout_get_glyph_class +hb_ot_layout_get_glyphs_in_class +hb_ot_layout_get_ligature_carets +hb_ot_layout_get_size_params +hb_ot_layout_glyph_class_t +hb_ot_layout_glyph_sequence_func_t +hb_ot_layout_has_glyph_classes +hb_ot_layout_has_positioning +hb_ot_layout_has_substitution +hb_ot_layout_language_find_feature +hb_ot_layout_language_get_feature_indexes +hb_ot_layout_language_get_feature_tags +hb_ot_layout_language_get_required_feature +hb_ot_layout_lookup_collect_glyphs +hb_ot_layout_lookup_substitute_closure +hb_ot_layout_lookup_would_substitute +hb_ot_layout_script_find_language +hb_ot_layout_script_get_language_tags +hb_ot_layout_table_choose_script +hb_ot_layout_table_find_feature_variations +hb_ot_layout_table_find_script +hb_ot_layout_table_get_feature_tags +hb_ot_layout_table_get_script_tags +hb_ot_layout_table_get_lookup_count +hb_ot_shape_plan_collect_lookups +hb_ot_layout_language_get_required_feature_index + +Xhb_ot_layout_lookup_enumerate_sequences +Xhb_ot_layout_lookup_position +Xhb_ot_layout_lookup_substitute +
+ +
+hb-ot-var +HB_OT_TAG_avar +HB_OT_TAG_fvar +HB_OT_VAR_NO_AXIS_INDEX +hb_ot_var_axis_t +hb_ot_var_has_data +hb_ot_var_find_axis +hb_ot_var_get_axis_count +hb_ot_var_get_axes +hb_ot_var_normalize_variations +hb_ot_var_normalize_coords +
+ +
+hb-ot-math +HB_OT_TAG_MATH +HB_OT_MATH_SCRIPT +hb_ot_math_constant_t +hb_ot_math_kern_t +hb_ot_math_glyph_variant_t +hb_ot_math_glyph_part_flags_t +hb_ot_math_glyph_part_t +hb_ot_math_has_data +hb_ot_math_get_constant +hb_ot_math_get_glyph_italics_correction +hb_ot_math_get_glyph_top_accent_attachment +hb_ot_math_get_glyph_kerning +hb_ot_math_is_glyph_extended_shape +hb_ot_math_get_glyph_variants +hb_ot_math_get_min_connector_overlap +hb_ot_math_get_glyph_assembly +
+ +
+hb-ot-tag +HB_OT_TAG_DEFAULT_LANGUAGE +HB_OT_TAG_DEFAULT_SCRIPT +hb_ot_tag_from_language +hb_ot_tag_to_language +hb_ot_tag_to_script +hb_ot_tags_from_script +
+ +
+hb-set +HB_SET_VALUE_INVALID +hb_set_add +hb_set_add_range +hb_set_allocation_successful +hb_set_clear +hb_set_create +hb_set_del +hb_set_del_range +hb_set_destroy +hb_set_get_empty +hb_set_get_max +hb_set_get_min +hb_set_get_population +hb_set_get_user_data +hb_set_has +hb_set_intersect +hb_set_invert +hb_set_is_empty +hb_set_is_equal +hb_set_next +hb_set_next_range +hb_set_reference +hb_set_set +hb_set_set_user_data +hb_set_subtract +hb_set_symmetric_difference +hb_set_t +hb_set_union +
+ +
+hb-shape +hb_feature_t +hb_feature_from_string +hb_feature_to_string +hb_shape +hb_shape_full +hb_shape_list_shapers +
+ +
+hb-shape-plan +hb_shape_plan_create +hb_shape_plan_create_cached +hb_shape_plan_create2 +hb_shape_plan_create_cached2 +hb_shape_plan_destroy +hb_shape_plan_execute +hb_shape_plan_get_empty +hb_shape_plan_get_shaper +hb_shape_plan_get_user_data +hb_shape_plan_reference +hb_shape_plan_set_user_data +hb_shape_plan_t +
+ +
+hb-unicode +HB_UNICODE_MAX_DECOMPOSITION_LEN +hb_unicode_combining_class +hb_unicode_combining_class_func_t +hb_unicode_combining_class_t +hb_unicode_compose +hb_unicode_compose_func_t +hb_unicode_decompose +hb_unicode_decompose_compatibility +hb_unicode_decompose_func_t +hb_unicode_eastasian_width +hb_unicode_funcs_create +hb_unicode_funcs_destroy +hb_unicode_funcs_get_default +hb_unicode_funcs_get_empty +hb_unicode_funcs_get_parent +hb_unicode_funcs_get_user_data +hb_unicode_funcs_is_immutable +hb_unicode_funcs_make_immutable +hb_unicode_funcs_reference +hb_unicode_funcs_set_combining_class_func +hb_unicode_funcs_set_compose_func +hb_unicode_funcs_set_decompose_compatibility_func +hb_unicode_funcs_set_decompose_func +hb_unicode_funcs_set_eastasian_width_func +hb_unicode_funcs_set_general_category_func +hb_unicode_funcs_set_mirroring_func +hb_unicode_funcs_set_script_func +hb_unicode_funcs_set_user_data +hb_unicode_funcs_t +hb_unicode_general_category +hb_unicode_general_category_func_t +hb_unicode_general_category_t +hb_unicode_mirroring +hb_unicode_mirroring_func_t +hb_unicode_script +hb_unicode_script_func_t +
+ +
+hb-uniscribe +hb_uniscribe_font_get_hfont +hb_uniscribe_font_get_logfontw +
+ +
+hb-version +HB_VERSION_ATLEAST +HB_VERSION_MAJOR +HB_VERSION_MICRO +HB_VERSION_MINOR +HB_VERSION_STRING +hb_version +hb_version_atleast +hb_version_string +
diff --git a/docs/harfbuzz.types b/docs/harfbuzz.types new file mode 100644 index 0000000..0494e23 --- /dev/null +++ b/docs/harfbuzz.types @@ -0,0 +1,27 @@ +hb_gobject_blob_get_type +hb_gobject_buffer_cluster_level_get_type +hb_gobject_buffer_content_type_get_type +hb_gobject_buffer_flags_get_type +hb_gobject_buffer_get_type +hb_gobject_buffer_serialize_flags_get_type +hb_gobject_buffer_serialize_format_get_type +hb_gobject_direction_get_type +hb_gobject_face_get_type +hb_gobject_feature_get_type +hb_gobject_font_funcs_get_type +hb_gobject_font_get_type +hb_gobject_glyph_info_get_type +hb_gobject_glyph_position_get_type +hb_gobject_memory_mode_get_type +hb_gobject_ot_layout_glyph_class_get_type +hb_gobject_ot_math_constant_get_type +hb_gobject_ot_math_glyph_part_flags_get_type +hb_gobject_ot_math_kern_get_type +hb_gobject_script_get_type +hb_gobject_segment_properties_get_type +hb_gobject_set_get_type +hb_gobject_shape_plan_get_type +hb_gobject_unicode_combining_class_get_type +hb_gobject_unicode_funcs_get_type +hb_gobject_unicode_general_category_get_type +hb_gobject_user_data_key_get_type diff --git a/docs/html/HarfBuzz.png b/docs/html/HarfBuzz.png new file mode 100644 index 0000000000000000000000000000000000000000..d58d9fc5a58424a657f01416b49a697c71eae149 GIT binary patch literal 3419 zcma)1I(4g|`1rpZ&;foTI zTLI@8Oy&a-M@M^9GY}}hh)C4N4Bd9khgQP9J1d3R z?2#_EZ{GToIL~D*GI~@cq|^Fyw9}ad9eY=T~Yfo4uHCOmlgn zmacAbV?cbTix`;givJ{2eOyZT?#BJFu;#~bJ-v=5zX|&T6E_L#`To3_nHjZ*q{t)csK0j@ z?U7wK8jWUp^W%pNZJThg{;@bW_bYj`t*tGVh0Va!)YQ#Qe4;#-V{2!JQM$489DWy> z;~Xu}*6nYFaE{(PQx1aaNo7>DvUpx2&ve_9aK!-a@fv=Y|$%W=;;- z3V8bmY$}epI5adA7Z-=ILN!I~tfi%KdM@W!pl4@ip>BdaJUoJe76~bUXKIH(g>1~| zAM%b?J1$_M@7`TEGBKf1smixoOiGiJlk;{D2Zx70*>V#B*KLZbdiDqQR5;3J&Ck#0 zmo+pt;*V$(*Y{k4gM)!69bon>0*<@w3B_Jk?!6Y6?Yvg`ptn3%z~uX&xlhaoaxwec zKK}l=nwkJ7r>TyP*g@}=_4OJY&icj;b~d)AufiN0dVk`)5LF!ulue8x?EMVfG9D_6 ze!g0y8>1uMCzsUS61tjCm8`aNw6!&`@8P|4cl+<4IIXo54u?O(wL~AaF5kSMtz9@z z$mshMN)i}n= zDdbohB3fHDG*RB(-mhEV+EscD6s2&mu(GbKtwm4eOA{E=GBbHNI5vnkbRC=@1O%Ma zP`djbjyL!yNJ;X5!4)G9@>yvCLa^45izDc$1KR8Xw7#y+H*ily@d{~l)cHfGl^Dk> zr>O0}oX3U|T=#P;SIIh$mw2KWoSmo5AGBgH3^^R)5J>3SWDiR>WoJ4D`N9l}F^OYQ zs4yAw%2n~`b#Is;66+r?+fC963Jd*E86s|nMS*T}>5`UasvP&xxMmHpgwG>0mmmxL z`oL57smmTJ0tPZtQl8|`DNP5e{LOXDr{ijCm4{eA73B>NLq~6k;+*gn;CUp+7KKu} z#ES|#KHNLOllV=zp({4$3@S(F*5R(M5FZA-6S7i+=}mwC^_(h45o#U_vN!^ zVnsWn&M}Q;SMW|Jos6Q_mkwU$!hH>%p_QdkAN)}$RJAIQl27$s6Bo;$yYXX2mmRF* zfEZhyXhsSBxZ*qJ;#HWJm-kj;tj^;_r;7_G*bWCvp8kowUFltir+nA^q*|aJ{8^(r zP24mxGP3-+w1k9M0s{ksy=5E@hXeGT>k(x3Vzvc3wB3i4?QkBMlab+eSun5l2}8Nf z?c2ta&gSOK_uM?+k*c=gQBdgcWJ_?xb23A(&{h9;DRd^Ko6XbFmgeTQ*-M-TISTjc zf_=iNBX_>Z0g`8JW#uuM=cNc9exOzh+1iWT7un*C3IWoSQmL-4&U9fi)&i?Pi)ItP z)^VQ8Od=h~{v-tAX7${3BqgQLN?0?rzpX1FAt8xf)cSM%nB^G?WvnS++B$=%@$L(e zsH&=3-}0~R0f|Dm+AOLW`m$k{x;)B^`gJ;Gbog+7mp->)tsOLwQla-&U zT?PXSlz}2`%_jpMd|-J;jG9dWX)zw*9S-_{Gt_A=a#&%z^m`O`pn_X1L_ry;o%K`!$r1Ru= ztV$6~@f^k7`+^j0eujFjNFZ-2v6dqD36D?PYCYNd1n~$7**@H(yw^<}STHpQnVE5kiHXrEUSD4Bn+;TA?N(yVS$}Cl9vjQGs~qvZ{Gjn}1vE7^RhEaP1*VYE zqoJuOsvA8yJsnU-edSndAG!70Ja{zz+wM|j4Fe-%kSZGS;l8a){A>3MKOhNqRrbnh zb>u|SFo|TFm4ZZieaw5(mwkx^5tkO0`3y><(boR{4eWsI3PY9nS(DgA>ev?kJZf28 zUFEL0zdGJ{`G_A3Hoirpjyij(GCMu_lO=ZtrzDx}>F&;((O7c27?O5#di;V>D%h{Qk_NKev zP*;(?B4lsbhK2_Fzdwj&H%>OX*%h7JeS|D{f~}z zrhonV1+axe4p3aNBM++W0Gtca5J|i*%=TqsVq$c3bb4A>Mn*DwNLqUzPjnUMHaHX&>WR(cZ43pulEANby8;C$VQl z`!53}H0eT+xNJETTT%iUvINi;@o#+y@Je@gH)#>z&}C9}{68DufT8W}?T|8244rGK z;o!sss-Pf}GH*rsRB@}UskvEmX5}>Kh3A; literal 0 HcmV?d00001 diff --git a/docs/html/a-clustering-example-for-levels-0-and-1.html b/docs/html/a-clustering-example-for-levels-0-and-1.html new file mode 100644 index 0000000..6e5a20e --- /dev/null +++ b/docs/html/a-clustering-example-for-levels-0-and-1.html @@ -0,0 +1,81 @@ + + + + +A clustering example for levels 0 and 1: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+A clustering example for levels 0 and 1

+

+ Let's say we start with the following character sequence and cluster + values: +

+
+   A,B,C,D,E
+   0,1,2,3,4
+
+

+ We then map the characters to glyphs. For simplicity, let's assume + that each character maps to the corresponding, identical-looking + glyph: +

+
+   A,B,C,D,E
+   0,1,2,3,4
+
+

+ Now if, for example, B and C + ligate, then the clusters to which they belong "merge". + This merged cluster takes for its cluster number the minimum of all + the cluster numbers of the clusters that went in. In this case, we + get: +

+
+   A,BC,D,E
+   0,1 ,3,4
+
+

+ Now let's assume that the BC glyph decomposes + into three components, and D also decomposes into + two. The components each inherit the cluster value of their parent: +

+
+   A,BC0,BC1,BC2,D0,D1,E
+   0,1  ,1  ,1  ,3 ,3 ,4
+
+

+ Now if BC2 and D0 ligate, then + their clusters (numbers 1 and 3) merge into + min(1,3) = 1: +

+
+   A,BC0,BC1,BC2D0,D1,E
+   0,1  ,1  ,1    ,1 ,4
+
+

+ At this point, cluster 1 means: the character sequence + BCD is represented by glyphs + BC0,BC1,BC2D0,D1 and cannot be broken down any + further. +

+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/adding-text-to-the-buffer.html b/docs/html/adding-text-to-the-buffer.html new file mode 100644 index 0000000..1f82756 --- /dev/null +++ b/docs/html/adding-text-to-the-buffer.html @@ -0,0 +1,35 @@ + + + + +Adding text to the buffer: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Adding text to the buffer

+

+ Now we have a brand new Harfbuzz buffer. Let's start filling it + with text! From Harfbuzz's perspective, a buffer is just a stream + of Unicode codepoints, but your input string is probably in one of + the standard Unicode character encodings (UTF-8, UTF-16, UTF-32) +

+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/annotation-glossary.html b/docs/html/annotation-glossary.html new file mode 100644 index 0000000..14edc5e --- /dev/null +++ b/docs/html/annotation-glossary.html @@ -0,0 +1,72 @@ + + + + +Annotation Glossary: HarfBuzz Manual + + + + + + + + + + + + + + + +
+

+Annotation Glossary

+

A

+
allow-none
+

NULL is ok, both for passing and for returning.

+
array
+

Parameter points to an array of items.

+

C

+
closure
+

This parameter is a 'user_data', for callbacks; many bindings can pass NULL here.

+

D

+
destroy
+

This parameter is a 'destroy_data', for callbacks.

+

E

+
element-type
+

Generics and defining elements of containers and arrays.

+

I

+
inout
+

Parameter for input and for returning results. Default is transfer full.

+

O

+
out
+

Parameter for returning results. Default is transfer full.

+
out caller-allocates
+

Out parameter, where caller must allocate storage.

+

S

+
scope notified
+

The callback is valid until the GDestroyNotify argument is called.

+

T

+
transfer full
+

Free data after the code is done.

+
transfer none
+

Don't free data after the code is done.

+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/api-index-0-9-10.html b/docs/html/api-index-0-9-10.html new file mode 100644 index 0000000..49ac07f --- /dev/null +++ b/docs/html/api-index-0-9-10.html @@ -0,0 +1,41 @@ + + + + +Index of new symbols in 0.9.10: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.9.10

+

O

+
+hb_ot_layout_get_size_params, function in hb-ot-layout +
+
+

S

+
+hb_set_invert, function in hb-set +
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/api-index-0-9-11.html b/docs/html/api-index-0-9-11.html new file mode 100644 index 0000000..2395975 --- /dev/null +++ b/docs/html/api-index-0-9-11.html @@ -0,0 +1,34 @@ + + + + +Index of new symbols in 0.9.11: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.9.11

+

B

+
+hb_buffer_clear_contents, function in Buffers +
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/api-index-0-9-2.html b/docs/html/api-index-0-9-2.html new file mode 100644 index 0000000..94ef16f --- /dev/null +++ b/docs/html/api-index-0-9-2.html @@ -0,0 +1,749 @@ + + + + +Index of new symbols in 0.9.2: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.9.2

+

B

+
+hb_blob_create, function in hb-blob +
+
+
+hb_blob_create_sub_blob, function in hb-blob +
+
+
+hb_blob_destroy, function in hb-blob +
+
+
+hb_blob_get_data, function in hb-blob +
+
+
+hb_blob_get_data_writable, function in hb-blob +
+
+
+hb_blob_get_empty, function in hb-blob +
+
+
+hb_blob_get_length, function in hb-blob +
+
+
+hb_blob_get_user_data, function in hb-blob +
+
+
+hb_blob_is_immutable, function in hb-blob +
+
+
+hb_blob_make_immutable, function in hb-blob +
+
+
+hb_blob_reference, function in hb-blob +
+
+
+hb_blob_set_user_data, function in hb-blob +
+
+
+hb_buffer_add_utf16, function in Buffers +
+
+
+hb_buffer_add_utf32, function in Buffers +
+
+
+hb_buffer_add_utf8, function in Buffers +
+
+
+hb_buffer_allocation_successful, function in Buffers +
+
+
+hb_buffer_destroy, function in Buffers +
+
+
+hb_buffer_get_direction, function in Buffers +
+
+
+hb_buffer_get_empty, function in Buffers +
+
+
+hb_buffer_get_glyph_infos, function in Buffers +
+
+
+hb_buffer_get_glyph_positions, function in Buffers +
+
+
+hb_buffer_get_language, function in Buffers +
+
+
+hb_buffer_get_length, function in Buffers +
+
+
+hb_buffer_get_script, function in Buffers +
+
+
+hb_buffer_get_unicode_funcs, function in Buffers +
+
+
+hb_buffer_get_user_data, function in Buffers +
+
+
+hb_buffer_normalize_glyphs, function in Buffers +
+
+
+hb_buffer_pre_allocate, function in Buffers +
+
+
+hb_buffer_reference, function in Buffers +
+
+
+hb_buffer_reset, function in Buffers +
+
+
+hb_buffer_reverse, function in Buffers +
+
+
+hb_buffer_reverse_clusters, function in Buffers +
+
+
+hb_buffer_serialize_format_t, enum in Buffers +
+
+
+hb_buffer_set_direction, function in Buffers +
+
+
+hb_buffer_set_language, function in Buffers +
+
+
+hb_buffer_set_length, function in Buffers +
+
+
+hb_buffer_set_script, function in Buffers +
+
+
+hb_buffer_set_unicode_funcs, function in Buffers +
+
+
+hb_buffer_set_user_data, function in Buffers +
+
+

D

+
+hb_direction_from_string, function in hb-common +
+
+
+hb_direction_to_string, function in hb-common +
+
+

F

+
+hb_face_create_for_tables, function in hb-face +
+
+
+hb_face_destroy, function in hb-face +
+
+
+hb_face_get_empty, function in hb-face +
+
+
+hb_face_get_index, function in hb-face +
+
+
+hb_face_get_upem, function in hb-face +
+
+
+hb_face_get_user_data, function in hb-face +
+
+
+hb_face_is_immutable, function in hb-face +
+
+
+hb_face_make_immutable, function in hb-face +
+
+
+hb_face_reference, function in hb-face +
+
+
+hb_face_reference_blob, function in hb-face +
+
+
+hb_face_reference_table, function in hb-face +
+
+
+hb_face_set_index, function in hb-face +
+
+
+hb_face_set_upem, function in hb-face +
+
+
+hb_face_set_user_data, function in hb-face +
+
+
+hb_font_add_glyph_origin_for_direction, function in hb-font +
+
+
+hb_font_create_sub_font, function in hb-font +
+
+
+hb_font_destroy, function in hb-font +
+
+
+hb_font_funcs_destroy, function in hb-font +
+
+
+hb_font_funcs_get_empty, function in hb-font +
+
+
+hb_font_funcs_get_user_data, function in hb-font +
+
+
+hb_font_funcs_is_immutable, function in hb-font +
+
+
+hb_font_funcs_make_immutable, function in hb-font +
+
+
+hb_font_funcs_reference, function in hb-font +
+
+
+hb_font_funcs_set_glyph_contour_point_func, function in hb-font +
+
+
+hb_font_funcs_set_glyph_extents_func, function in hb-font +
+
+
+hb_font_funcs_set_glyph_from_name_func, function in hb-font +
+
+
+hb_font_funcs_set_glyph_func, function in hb-deprecated +
+
+
+hb_font_funcs_set_glyph_h_advance_func, function in hb-font +
+
+
+hb_font_funcs_set_glyph_h_kerning_func, function in hb-font +
+
+
+hb_font_funcs_set_glyph_h_origin_func, function in hb-font +
+
+
+hb_font_funcs_set_glyph_name_func, function in hb-font +
+
+
+hb_font_funcs_set_glyph_v_advance_func, function in hb-font +
+
+
+hb_font_funcs_set_glyph_v_kerning_func, function in hb-font +
+
+
+hb_font_funcs_set_glyph_v_origin_func, function in hb-font +
+
+
+hb_font_funcs_set_user_data, function in hb-font +
+
+
+hb_font_get_empty, function in hb-font +
+
+
+hb_font_get_face, function in hb-font +
+
+
+hb_font_get_glyph, function in hb-font +
+
+
+hb_font_get_glyph_advance_for_direction, function in hb-font +
+
+
+hb_font_get_glyph_contour_point, function in hb-font +
+
+
+hb_font_get_glyph_contour_point_for_origin, function in hb-font +
+
+
+hb_font_get_glyph_extents, function in hb-font +
+
+
+hb_font_get_glyph_extents_for_origin, function in hb-font +
+
+
+hb_font_get_glyph_from_name, function in hb-font +
+
+
+hb_font_get_glyph_h_advance, function in hb-font +
+
+
+hb_font_get_glyph_h_kerning, function in hb-font +
+
+
+hb_font_get_glyph_h_origin, function in hb-font +
+
+
+hb_font_get_glyph_kerning_for_direction, function in hb-font +
+
+
+hb_font_get_glyph_name, function in hb-font +
+
+
+hb_font_get_glyph_origin_for_direction, function in hb-font +
+
+
+hb_font_get_glyph_v_advance, function in hb-font +
+
+
+hb_font_get_glyph_v_kerning, function in hb-font +
+
+
+hb_font_get_glyph_v_origin, function in hb-font +
+
+
+hb_font_get_parent, function in hb-font +
+
+
+hb_font_get_ppem, function in hb-font +
+
+
+hb_font_get_scale, function in hb-font +
+
+
+hb_font_get_user_data, function in hb-font +
+
+
+hb_font_glyph_from_string, function in hb-font +
+
+
+hb_font_glyph_to_string, function in hb-font +
+
+
+hb_font_is_immutable, function in hb-font +
+
+
+hb_font_make_immutable, function in hb-font +
+
+
+hb_font_reference, function in hb-font +
+
+
+hb_font_set_funcs, function in hb-font +
+
+
+hb_font_set_funcs_data, function in hb-font +
+
+
+hb_font_set_ppem, function in hb-font +
+
+
+hb_font_set_scale, function in hb-font +
+
+
+hb_font_set_user_data, function in hb-font +
+
+
+hb_font_subtract_glyph_origin_for_direction, function in hb-font +
+
+
+hb_ft_face_create, function in hb-ft +
+
+
+hb_ft_face_create_cached, function in hb-ft +
+
+
+hb_ft_font_create, function in hb-ft +
+
+

G

+
+hb_gobject_blob_get_type, function in hb-gobject +
+
+
+hb_gobject_buffer_get_type, function in hb-gobject +
+
+
+hb_gobject_face_get_type, function in hb-gobject +
+
+
+hb_gobject_font_funcs_get_type, function in hb-gobject +
+
+
+hb_gobject_font_get_type, function in hb-gobject +
+
+
+hb_gobject_unicode_funcs_get_type, function in hb-gobject +
+
+

L

+
+hb_language_from_string, function in hb-common +
+
+
+hb_language_get_default, function in hb-common +
+
+
+hb_language_to_string, function in hb-common +
+
+

O

+
+hb_ot_shape_glyphs_closure, function in hb-ot-shape +
+
+
+hb_ot_tag_to_language, function in hb-ot-tag +
+
+

S

+
+hb_script_from_iso15924_tag, function in hb-common +
+
+
+hb_script_from_string, function in hb-common +
+
+
+hb_script_get_horizontal_direction, function in hb-common +
+
+
+hb_script_to_iso15924_tag, function in hb-common +
+
+
+hb_set_add, function in hb-set +
+
+
+hb_set_allocation_successful, function in hb-set +
+
+
+hb_set_clear, function in hb-set +
+
+
+hb_set_del, function in hb-set +
+
+
+hb_set_destroy, function in hb-set +
+
+
+hb_set_get_empty, function in hb-set +
+
+
+hb_set_get_user_data, function in hb-set +
+
+
+hb_set_has, function in hb-set +
+
+
+hb_set_intersect, function in hb-set +
+
+
+hb_set_next, function in hb-set +
+
+
+hb_set_reference, function in hb-set +
+
+
+hb_set_set, function in hb-set +
+
+
+hb_set_set_user_data, function in hb-set +
+
+
+hb_set_subtract, function in hb-set +
+
+
+hb_set_symmetric_difference, function in hb-set +
+
+
+hb_set_union, function in hb-set +
+
+
+hb_shape, function in Shaping +
+
+
+hb_shape_full, function in Shaping +
+
+
+hb_shape_list_shapers, function in Shaping +
+
+

T

+
+hb_tag_from_string, function in hb-common +
+
+

U

+
+hb_unicode_combining_class, function in hb-unicode +
+
+
+hb_unicode_compose, function in hb-unicode +
+
+
+hb_unicode_decompose, function in hb-unicode +
+
+
+hb_unicode_decompose_compatibility, function in hb-unicode +
+
+
+hb_unicode_eastasian_width, function in hb-unicode +
+
+
+hb_unicode_funcs_destroy, function in hb-unicode +
+
+
+hb_unicode_funcs_get_empty, function in hb-unicode +
+
+
+hb_unicode_funcs_get_parent, function in hb-unicode +
+
+
+hb_unicode_funcs_get_user_data, function in hb-unicode +
+
+
+hb_unicode_funcs_is_immutable, function in hb-unicode +
+
+
+hb_unicode_funcs_make_immutable, function in hb-unicode +
+
+
+hb_unicode_funcs_reference, function in hb-unicode +
+
+
+hb_unicode_funcs_set_combining_class_func, function in hb-unicode +
+
+
+hb_unicode_funcs_set_compose_func, function in hb-unicode +
+
+
+hb_unicode_funcs_set_decompose_compatibility_func, function in hb-unicode +
+
+
+hb_unicode_funcs_set_decompose_func, function in hb-unicode +
+
+
+hb_unicode_funcs_set_eastasian_width_func, function in hb-unicode +
+
+
+hb_unicode_funcs_set_general_category_func, function in hb-unicode +
+
+
+hb_unicode_funcs_set_mirroring_func, function in hb-unicode +
+
+
+hb_unicode_funcs_set_script_func, function in hb-unicode +
+
+
+hb_unicode_funcs_set_user_data, function in hb-unicode +
+
+
+hb_unicode_general_category, function in hb-unicode +
+
+
+hb_unicode_mirroring, function in hb-unicode +
+
+
+hb_unicode_script, function in hb-unicode +
+
+

V

+
+hb_version, function in hb-version +
+
+
+hb_version_string, function in hb-version +
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/api-index-0-9-20.html b/docs/html/api-index-0-9-20.html new file mode 100644 index 0000000..d99be33 --- /dev/null +++ b/docs/html/api-index-0-9-20.html @@ -0,0 +1,38 @@ + + + + +Index of new symbols in 0.9.20: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.9.20

+

B

+
+hb_buffer_flags_t, enum in Buffers +
+
+
+hb_buffer_serialize_flags_t, enum in Buffers +
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/api-index-0-9-22.html b/docs/html/api-index-0-9-22.html new file mode 100644 index 0000000..5622d2d --- /dev/null +++ b/docs/html/api-index-0-9-22.html @@ -0,0 +1,34 @@ + + + + +Index of new symbols in 0.9.22: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.9.22

+

O

+
+hb_ot_layout_table_get_lookup_count, function in hb-ot-layout +
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/api-index-0-9-28.html b/docs/html/api-index-0-9-28.html new file mode 100644 index 0000000..99487fd --- /dev/null +++ b/docs/html/api-index-0-9-28.html @@ -0,0 +1,34 @@ + + + + +Index of new symbols in 0.9.28: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.9.28

+

O

+
+hb_ot_font_set_funcs, function in hb-ot-font +
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/api-index-0-9-30.html b/docs/html/api-index-0-9-30.html new file mode 100644 index 0000000..7218a0d --- /dev/null +++ b/docs/html/api-index-0-9-30.html @@ -0,0 +1,41 @@ + + + + +Index of new symbols in 0.9.30: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.9.30

+

O

+
+hb_ot_layout_language_get_required_feature, function in hb-ot-layout +
+
+

V

+
+hb_version_atleast, function in hb-version +
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/api-index-0-9-31.html b/docs/html/api-index-0-9-31.html new file mode 100644 index 0000000..ddfa666 --- /dev/null +++ b/docs/html/api-index-0-9-31.html @@ -0,0 +1,46 @@ + + + + +Index of new symbols in 0.9.31: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.9.31

+

B

+
+hb_buffer_add_codepoints, function in Buffers +
+
+
+hb_buffer_get_replacement_codepoint, function in Buffers +
+
+
+HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT, macro in Buffers +
+
+
+hb_buffer_set_replacement_codepoint, function in Buffers +
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/api-index-0-9-38.html b/docs/html/api-index-0-9-38.html new file mode 100644 index 0000000..73297b7 --- /dev/null +++ b/docs/html/api-index-0-9-38.html @@ -0,0 +1,45 @@ + + + + +Index of new symbols in 0.9.38: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.9.38

+

F

+
+hb_ft_face_create_referenced, function in hb-ft +
+
+
+hb_ft_font_create_referenced, function in hb-ft +
+
+

G

+
+hb_glib_blob_create, function in hb-glib +
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/api-index-0-9-39.html b/docs/html/api-index-0-9-39.html new file mode 100644 index 0000000..e93c0fc --- /dev/null +++ b/docs/html/api-index-0-9-39.html @@ -0,0 +1,34 @@ + + + + +Index of new symbols in 0.9.39: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.9.39

+

B

+
+hb_buffer_add_latin1, function in Buffers +
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/api-index-0-9-41.html b/docs/html/api-index-0-9-41.html new file mode 100644 index 0000000..334bc77 --- /dev/null +++ b/docs/html/api-index-0-9-41.html @@ -0,0 +1,34 @@ + + + + +Index of new symbols in 0.9.41: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.9.41

+

B

+
+hb_buffer_reverse_range, function in Buffers +
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/api-index-0-9-42.html b/docs/html/api-index-0-9-42.html new file mode 100644 index 0000000..9ff9faa --- /dev/null +++ b/docs/html/api-index-0-9-42.html @@ -0,0 +1,38 @@ + + + + +Index of new symbols in 0.9.42: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.9.42

+

B

+
+hb_buffer_get_cluster_level, function in Buffers +
+
+
+hb_buffer_set_cluster_level, function in Buffers +
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/api-index-0-9-5.html b/docs/html/api-index-0-9-5.html new file mode 100644 index 0000000..3a1ca0f --- /dev/null +++ b/docs/html/api-index-0-9-5.html @@ -0,0 +1,56 @@ + + + + +Index of new symbols in 0.9.5: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.9.5

+

B

+
+hb_buffer_get_content_type, function in Buffers +
+
+
+hb_buffer_set_content_type, function in Buffers +
+
+

F

+
+hb_feature_from_string, function in Shaping +
+
+
+hb_feature_to_string, function in Shaping +
+
+

T

+
+hb_tag_to_string, function in hb-common +
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/api-index-0-9-7.html b/docs/html/api-index-0-9-7.html new file mode 100644 index 0000000..c2f43bb --- /dev/null +++ b/docs/html/api-index-0-9-7.html @@ -0,0 +1,191 @@ + + + + +Index of new symbols in 0.9.7: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.9.7

+

B

+
+hb_buffer_add, function in Buffers +
+
+
+hb_buffer_deserialize_glyphs, function in Buffers +
+
+
+hb_buffer_get_flags, function in Buffers +
+
+
+hb_buffer_get_segment_properties, function in Buffers +
+
+
+hb_buffer_guess_segment_properties, function in Buffers +
+
+
+hb_buffer_serialize_format_from_string, function in Buffers +
+
+
+hb_buffer_serialize_format_to_string, function in Buffers +
+
+
+hb_buffer_serialize_glyphs, function in Buffers +
+
+
+hb_buffer_serialize_list_formats, function in Buffers +
+
+
+hb_buffer_set_flags, function in Buffers +
+
+
+hb_buffer_set_segment_properties, function in Buffers +
+
+

F

+
+hb_face_get_glyph_count, function in hb-face +
+
+
+hb_face_set_glyph_count, function in hb-face +
+
+

O

+
+hb_ot_layout_feature_get_lookups, function in hb-ot-layout +
+
+
+hb_ot_layout_get_glyphs_in_class, function in hb-ot-layout +
+
+
+hb_ot_layout_get_glyph_class, function in hb-ot-layout +
+
+
+hb_ot_layout_lookup_collect_glyphs, function in hb-ot-layout +
+
+
+hb_ot_layout_lookup_substitute_closure, function in hb-ot-layout +
+
+
+hb_ot_layout_lookup_would_substitute, function in hb-ot-layout +
+
+
+hb_ot_shape_plan_collect_lookups, function in hb-ot-layout +
+
+

S

+
+hb_segment_properties_equal, function in Buffers +
+
+
+hb_segment_properties_hash, function in Buffers +
+
+
+hb_set_add_range, function in hb-set +
+
+
+hb_set_del_range, function in hb-set +
+
+
+hb_set_get_max, function in hb-set +
+
+
+hb_set_get_min, function in hb-set +
+
+
+hb_set_get_population, function in hb-set +
+
+
+hb_set_is_empty, function in hb-set +
+
+
+hb_set_is_equal, function in hb-set +
+
+
+hb_set_next_range, function in hb-set +
+
+
+hb_shape_plan_create_cached, function in hb-shape-plan +
+
+
+hb_shape_plan_destroy, function in hb-shape-plan +
+
+
+hb_shape_plan_execute, function in hb-shape-plan +
+
+
+hb_shape_plan_get_empty, function in hb-shape-plan +
+
+
+hb_shape_plan_get_shaper, function in hb-shape-plan +
+
+
+hb_shape_plan_get_user_data, function in hb-shape-plan +
+
+
+hb_shape_plan_reference, function in hb-shape-plan +
+
+
+hb_shape_plan_set_user_data, function in hb-shape-plan +
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/api-index-0-9-8.html b/docs/html/api-index-0-9-8.html new file mode 100644 index 0000000..afd2059 --- /dev/null +++ b/docs/html/api-index-0-9-8.html @@ -0,0 +1,34 @@ + + + + +Index of new symbols in 0.9.8: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.9.8

+

O

+
+hb_ot_layout_collect_lookups, function in hb-ot-layout +
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/api-index-1-0-5.html b/docs/html/api-index-1-0-5.html new file mode 100644 index 0000000..8dc856f --- /dev/null +++ b/docs/html/api-index-1-0-5.html @@ -0,0 +1,42 @@ + + + + +Index of new symbols in 1.0.5: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 1.0.5

+

F

+
+hb_font_set_parent, function in hb-font +
+
+
+hb_ft_font_get_load_flags, function in hb-ft +
+
+
+hb_ft_font_set_load_flags, function in hb-ft +
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/api-index-1-1-2.html b/docs/html/api-index-1-1-2.html new file mode 100644 index 0000000..2a6df8b --- /dev/null +++ b/docs/html/api-index-1-1-2.html @@ -0,0 +1,38 @@ + + + + +Index of new symbols in 1.1.2: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 1.1.2

+

F

+
+hb_font_funcs_set_font_h_extents_func, function in hb-font +
+
+
+hb_font_funcs_set_font_v_extents_func, function in hb-font +
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/api-index-1-1-3.html b/docs/html/api-index-1-1-3.html new file mode 100644 index 0000000..4613fc4 --- /dev/null +++ b/docs/html/api-index-1-1-3.html @@ -0,0 +1,49 @@ + + + + +Index of new symbols in 1.1.3: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 1.1.3

+

B

+
+hb_buffer_set_message_func, function in Buffers +
+
+

F

+
+hb_font_get_extents_for_direction, function in hb-font +
+
+
+hb_font_get_h_extents, function in hb-font +
+
+
+hb_font_get_v_extents, function in hb-font +
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/api-index-1-2-3.html b/docs/html/api-index-1-2-3.html new file mode 100644 index 0000000..ac06343 --- /dev/null +++ b/docs/html/api-index-1-2-3.html @@ -0,0 +1,46 @@ + + + + +Index of new symbols in 1.2.3: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 1.2.3

+

F

+
+hb_font_funcs_set_nominal_glyph_func, function in hb-font +
+
+
+hb_font_funcs_set_variation_glyph_func, function in hb-font +
+
+
+hb_font_get_nominal_glyph, function in hb-font +
+
+
+hb_font_get_variation_glyph, function in hb-font +
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/api-index-1-3-3.html b/docs/html/api-index-1-3-3.html new file mode 100644 index 0000000..53361a9 --- /dev/null +++ b/docs/html/api-index-1-3-3.html @@ -0,0 +1,86 @@ + + + + +Index of new symbols in 1.3.3: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 1.3.3

+

O

+
+hb_ot_math_constant_t, enum in hb-ot-math +
+
+
+hb_ot_math_get_constant, function in hb-ot-math +
+
+
+hb_ot_math_get_glyph_assembly, function in hb-ot-math +
+
+
+hb_ot_math_get_glyph_italics_correction, function in hb-ot-math +
+
+
+hb_ot_math_get_glyph_kerning, function in hb-ot-math +
+
+
+hb_ot_math_get_glyph_top_accent_attachment, function in hb-ot-math +
+
+
+hb_ot_math_get_glyph_variants, function in hb-ot-math +
+
+
+hb_ot_math_get_min_connector_overlap, function in hb-ot-math +
+
+
+hb_ot_math_glyph_part_flags_t, enum in hb-ot-math +
+
+
+hb_ot_math_glyph_part_t, struct in hb-ot-math +
+
+
+hb_ot_math_glyph_variant_t, struct in hb-ot-math +
+
+
+hb_ot_math_has_data, function in hb-ot-math +
+
+
+hb_ot_math_is_glyph_extended_shape, function in hb-ot-math +
+
+
+hb_ot_math_kern_t, enum in hb-ot-math +
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/api-index-full.html b/docs/html/api-index-full.html new file mode 100644 index 0000000..fa21f39 --- /dev/null +++ b/docs/html/api-index-full.html @@ -0,0 +1,1940 @@ + + + + +API Index: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+API Index

+

B

+
+hb_blob_create, function in hb-blob +
+
+
+hb_blob_create_sub_blob, function in hb-blob +
+
+
+hb_blob_destroy, function in hb-blob +
+
+
+hb_blob_get_data, function in hb-blob +
+
+
+hb_blob_get_data_writable, function in hb-blob +
+
+
+hb_blob_get_empty, function in hb-blob +
+
+
+hb_blob_get_length, function in hb-blob +
+
+
+hb_blob_get_user_data, function in hb-blob +
+
+
+hb_blob_is_immutable, function in hb-blob +
+
+
+hb_blob_make_immutable, function in hb-blob +
+
+
+hb_blob_reference, function in hb-blob +
+
+
+hb_blob_set_user_data, function in hb-blob +
+
+
+hb_blob_t, typedef in hb-blob +
+
+
+hb_bool_t, typedef in hb-common +
+
+
+hb_buffer_add, function in Buffers +
+
+
+hb_buffer_add_codepoints, function in Buffers +
+
+
+hb_buffer_add_latin1, function in Buffers +
+
+
+hb_buffer_add_utf16, function in Buffers +
+
+
+hb_buffer_add_utf32, function in Buffers +
+
+
+hb_buffer_add_utf8, function in Buffers +
+
+
+hb_buffer_allocation_successful, function in Buffers +
+
+
+hb_buffer_clear_contents, function in Buffers +
+
+
+hb_buffer_cluster_level_t, enum in Buffers +
+
+
+hb_buffer_content_type_t, enum in Buffers +
+
+
+hb_buffer_create, function in Buffers +
+
+
+hb_buffer_deserialize_glyphs, function in Buffers +
+
+
+hb_buffer_destroy, function in Buffers +
+
+
+HB_BUFFER_FLAGS_DEFAULT, macro in hb-deprecated +
+
+
+hb_buffer_flags_t, enum in Buffers +
+
+
+hb_buffer_get_cluster_level, function in Buffers +
+
+
+hb_buffer_get_content_type, function in Buffers +
+
+
+hb_buffer_get_direction, function in Buffers +
+
+
+hb_buffer_get_empty, function in Buffers +
+
+
+hb_buffer_get_flags, function in Buffers +
+
+
+hb_buffer_get_glyph_infos, function in Buffers +
+
+
+hb_buffer_get_glyph_positions, function in Buffers +
+
+
+hb_buffer_get_language, function in Buffers +
+
+
+hb_buffer_get_length, function in Buffers +
+
+
+hb_buffer_get_replacement_codepoint, function in Buffers +
+
+
+hb_buffer_get_script, function in Buffers +
+
+
+hb_buffer_get_segment_properties, function in Buffers +
+
+
+hb_buffer_get_unicode_funcs, function in Buffers +
+
+
+hb_buffer_get_user_data, function in Buffers +
+
+
+hb_buffer_guess_segment_properties, function in Buffers +
+
+
+hb_buffer_message_func_t, user_function in Buffers +
+
+
+hb_buffer_normalize_glyphs, function in Buffers +
+
+
+hb_buffer_pre_allocate, function in Buffers +
+
+
+hb_buffer_reference, function in Buffers +
+
+
+HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT, macro in Buffers +
+
+
+hb_buffer_reset, function in Buffers +
+
+
+hb_buffer_reverse, function in Buffers +
+
+
+hb_buffer_reverse_clusters, function in Buffers +
+
+
+hb_buffer_reverse_range, function in Buffers +
+
+
+HB_BUFFER_SERIALIZE_FLAGS_DEFAULT, macro in hb-deprecated +
+
+
+hb_buffer_serialize_flags_t, enum in Buffers +
+
+
+hb_buffer_serialize_format_from_string, function in Buffers +
+
+
+hb_buffer_serialize_format_t, enum in Buffers +
+
+
+hb_buffer_serialize_format_to_string, function in Buffers +
+
+
+hb_buffer_serialize_glyphs, function in Buffers +
+
+
+hb_buffer_serialize_list_formats, function in Buffers +
+
+
+hb_buffer_set_cluster_level, function in Buffers +
+
+
+hb_buffer_set_content_type, function in Buffers +
+
+
+hb_buffer_set_direction, function in Buffers +
+
+
+hb_buffer_set_flags, function in Buffers +
+
+
+hb_buffer_set_language, function in Buffers +
+
+
+hb_buffer_set_length, function in Buffers +
+
+
+hb_buffer_set_message_func, function in Buffers +
+
+
+hb_buffer_set_replacement_codepoint, function in Buffers +
+
+
+hb_buffer_set_script, function in Buffers +
+
+
+hb_buffer_set_segment_properties, function in Buffers +
+
+
+hb_buffer_set_unicode_funcs, function in Buffers +
+
+
+hb_buffer_set_user_data, function in Buffers +
+
+
+hb_buffer_t, typedef in Buffers +
+
+

C

+
+hb_codepoint_t, typedef in hb-common +
+
+
+hb_coretext_face_create, function in hb-coretext +
+
+
+hb_coretext_face_get_cg_font, function in hb-coretext +
+
+
+hb_coretext_font_get_ct_font, function in hb-coretext +
+
+
+HB_CORETEXT_TAG_MORT, macro in hb-coretext +
+
+
+HB_CORETEXT_TAG_MORX, macro in hb-coretext +
+
+

D

+
+hb_destroy_func_t, user_function in hb-common +
+
+
+hb_direction_from_string, function in hb-common +
+
+
+HB_DIRECTION_IS_BACKWARD, macro in hb-common +
+
+
+HB_DIRECTION_IS_FORWARD, macro in hb-common +
+
+
+HB_DIRECTION_IS_HORIZONTAL, macro in hb-common +
+
+
+HB_DIRECTION_IS_VALID, macro in hb-common +
+
+
+HB_DIRECTION_IS_VERTICAL, macro in hb-common +
+
+
+HB_DIRECTION_REVERSE, macro in hb-common +
+
+
+hb_direction_t, enum in hb-common +
+
+
+hb_direction_to_string, function in hb-common +
+
+

F

+
+hb_face_create, function in hb-face +
+
+
+hb_face_create_for_tables, function in hb-face +
+
+
+hb_face_destroy, function in hb-face +
+
+
+hb_face_get_empty, function in hb-face +
+
+
+hb_face_get_glyph_count, function in hb-face +
+
+
+hb_face_get_index, function in hb-face +
+
+
+hb_face_get_upem, function in hb-face +
+
+
+hb_face_get_user_data, function in hb-face +
+
+
+hb_face_is_immutable, function in hb-face +
+
+
+hb_face_make_immutable, function in hb-face +
+
+
+hb_face_reference, function in hb-face +
+
+
+hb_face_reference_blob, function in hb-face +
+
+
+hb_face_reference_table, function in hb-face +
+
+
+hb_face_set_glyph_count, function in hb-face +
+
+
+hb_face_set_index, function in hb-face +
+
+
+hb_face_set_upem, function in hb-face +
+
+
+hb_face_set_user_data, function in hb-face +
+
+
+hb_face_t, typedef in hb-face +
+
+
+hb_feature_from_string, function in Shaping +
+
+
+hb_feature_t, struct in Shaping +
+
+
+hb_feature_to_string, function in Shaping +
+
+
+hb_font_add_glyph_origin_for_direction, function in hb-font +
+
+
+hb_font_create, function in hb-font +
+
+
+hb_font_create_sub_font, function in hb-font +
+
+
+hb_font_destroy, function in hb-font +
+
+
+hb_font_funcs_create, function in hb-font +
+
+
+hb_font_funcs_destroy, function in hb-font +
+
+
+hb_font_funcs_get_empty, function in hb-font +
+
+
+hb_font_funcs_get_user_data, function in hb-font +
+
+
+hb_font_funcs_is_immutable, function in hb-font +
+
+
+hb_font_funcs_make_immutable, function in hb-font +
+
+
+hb_font_funcs_reference, function in hb-font +
+
+
+hb_font_funcs_set_font_h_extents_func, function in hb-font +
+
+
+hb_font_funcs_set_font_v_extents_func, function in hb-font +
+
+
+hb_font_funcs_set_glyph_contour_point_func, function in hb-font +
+
+
+hb_font_funcs_set_glyph_extents_func, function in hb-font +
+
+
+hb_font_funcs_set_glyph_from_name_func, function in hb-font +
+
+
+hb_font_funcs_set_glyph_func, function in hb-deprecated +
+
+
+hb_font_funcs_set_glyph_h_advance_func, function in hb-font +
+
+
+hb_font_funcs_set_glyph_h_kerning_func, function in hb-font +
+
+
+hb_font_funcs_set_glyph_h_origin_func, function in hb-font +
+
+
+hb_font_funcs_set_glyph_name_func, function in hb-font +
+
+
+hb_font_funcs_set_glyph_v_advance_func, function in hb-font +
+
+
+hb_font_funcs_set_glyph_v_kerning_func, function in hb-font +
+
+
+hb_font_funcs_set_glyph_v_origin_func, function in hb-font +
+
+
+hb_font_funcs_set_nominal_glyph_func, function in hb-font +
+
+
+hb_font_funcs_set_user_data, function in hb-font +
+
+
+hb_font_funcs_set_variation_glyph_func, function in hb-font +
+
+
+hb_font_funcs_t, typedef in hb-font +
+
+
+hb_font_get_empty, function in hb-font +
+
+
+hb_font_get_extents_for_direction, function in hb-font +
+
+
+hb_font_get_face, function in hb-font +
+
+
+hb_font_get_font_extents_func_t, user_function in hb-font +
+
+
+hb_font_get_font_h_extents_func_t, typedef in hb-font +
+
+
+hb_font_get_font_v_extents_func_t, typedef in hb-font +
+
+
+hb_font_get_glyph, function in hb-font +
+
+
+hb_font_get_glyph_advance_for_direction, function in hb-font +
+
+
+hb_font_get_glyph_advance_func_t, user_function in hb-font +
+
+
+hb_font_get_glyph_contour_point, function in hb-font +
+
+
+hb_font_get_glyph_contour_point_for_origin, function in hb-font +
+
+
+hb_font_get_glyph_contour_point_func_t, user_function in hb-font +
+
+
+hb_font_get_glyph_extents, function in hb-font +
+
+
+hb_font_get_glyph_extents_for_origin, function in hb-font +
+
+
+hb_font_get_glyph_extents_func_t, user_function in hb-font +
+
+
+hb_font_get_glyph_from_name, function in hb-font +
+
+
+hb_font_get_glyph_from_name_func_t, user_function in hb-font +
+
+
+hb_font_get_glyph_func_t, user_function in hb-deprecated +
+
+
+hb_font_get_glyph_h_advance, function in hb-font +
+
+
+hb_font_get_glyph_h_advance_func_t, typedef in hb-font +
+
+
+hb_font_get_glyph_h_kerning, function in hb-font +
+
+
+hb_font_get_glyph_h_kerning_func_t, typedef in hb-font +
+
+
+hb_font_get_glyph_h_origin, function in hb-font +
+
+
+hb_font_get_glyph_h_origin_func_t, typedef in hb-font +
+
+
+hb_font_get_glyph_kerning_for_direction, function in hb-font +
+
+
+hb_font_get_glyph_kerning_func_t, user_function in hb-font +
+
+
+hb_font_get_glyph_name, function in hb-font +
+
+
+hb_font_get_glyph_name_func_t, user_function in hb-font +
+
+
+hb_font_get_glyph_origin_for_direction, function in hb-font +
+
+
+hb_font_get_glyph_origin_func_t, user_function in hb-font +
+
+
+hb_font_get_glyph_v_advance, function in hb-font +
+
+
+hb_font_get_glyph_v_advance_func_t, typedef in hb-font +
+
+
+hb_font_get_glyph_v_kerning, function in hb-font +
+
+
+hb_font_get_glyph_v_kerning_func_t, typedef in hb-font +
+
+
+hb_font_get_glyph_v_origin, function in hb-font +
+
+
+hb_font_get_glyph_v_origin_func_t, typedef in hb-font +
+
+
+hb_font_get_h_extents, function in hb-font +
+
+
+hb_font_get_nominal_glyph, function in hb-font +
+
+
+hb_font_get_nominal_glyph_func_t, user_function in hb-font +
+
+
+hb_font_get_parent, function in hb-font +
+
+
+hb_font_get_ppem, function in hb-font +
+
+
+hb_font_get_scale, function in hb-font +
+
+
+hb_font_get_user_data, function in hb-font +
+
+
+hb_font_get_variation_glyph, function in hb-font +
+
+
+hb_font_get_variation_glyph_func_t, user_function in hb-font +
+
+
+hb_font_get_var_coords_normalized, function in hb-font +
+
+
+hb_font_get_v_extents, function in hb-font +
+
+
+hb_font_glyph_from_string, function in hb-font +
+
+
+hb_font_glyph_to_string, function in hb-font +
+
+
+hb_font_is_immutable, function in hb-font +
+
+
+hb_font_make_immutable, function in hb-font +
+
+
+hb_font_reference, function in hb-font +
+
+
+hb_font_set_funcs, function in hb-font +
+
+
+hb_font_set_funcs_data, function in hb-font +
+
+
+hb_font_set_parent, function in hb-font +
+
+
+hb_font_set_ppem, function in hb-font +
+
+
+hb_font_set_scale, function in hb-font +
+
+
+hb_font_set_user_data, function in hb-font +
+
+
+hb_font_set_variations, function in hb-font +
+
+
+hb_font_set_var_coords_design, function in hb-font +
+
+
+hb_font_set_var_coords_normalized, function in hb-font +
+
+
+hb_font_subtract_glyph_origin_for_direction, function in hb-font +
+
+
+hb_font_t, typedef in hb-font +
+
+
+hb_ft_face_create, function in hb-ft +
+
+
+hb_ft_face_create_cached, function in hb-ft +
+
+
+hb_ft_face_create_referenced, function in hb-ft +
+
+
+hb_ft_font_create, function in hb-ft +
+
+
+hb_ft_font_create_referenced, function in hb-ft +
+
+
+hb_ft_font_get_face, function in hb-ft +
+
+
+hb_ft_font_get_load_flags, function in hb-ft +
+
+
+hb_ft_font_set_funcs, function in hb-ft +
+
+
+hb_ft_font_set_load_flags, function in hb-ft +
+
+

G

+
+hb_glib_blob_create, function in hb-glib +
+
+
+hb_glib_get_unicode_funcs, function in hb-glib +
+
+
+hb_glib_script_from_script, function in hb-glib +
+
+
+hb_glib_script_to_script, function in hb-glib +
+
+
+hb_glyph_info_t, struct in Buffers +
+
+
+hb_glyph_position_t, struct in Buffers +
+
+
+hb_gobject_blob_get_type, function in hb-gobject +
+
+
+hb_gobject_buffer_cluster_level_get_type, function in hb-gobject +
+
+
+hb_gobject_buffer_content_type_get_type, function in hb-gobject +
+
+
+hb_gobject_buffer_flags_get_type, function in hb-gobject +
+
+
+hb_gobject_buffer_get_type, function in hb-gobject +
+
+
+hb_gobject_buffer_serialize_flags_get_type, function in hb-gobject +
+
+
+hb_gobject_buffer_serialize_format_get_type, function in hb-gobject +
+
+
+hb_gobject_direction_get_type, function in hb-gobject +
+
+
+hb_gobject_face_get_type, function in hb-gobject +
+
+
+hb_gobject_feature_get_type, function in hb-gobject +
+
+
+hb_gobject_font_funcs_get_type, function in hb-gobject +
+
+
+hb_gobject_font_get_type, function in hb-gobject +
+
+
+hb_gobject_glyph_info_get_type, function in hb-gobject +
+
+
+hb_gobject_glyph_position_get_type, function in hb-gobject +
+
+
+hb_gobject_memory_mode_get_type, function in hb-gobject +
+
+
+hb_gobject_ot_layout_glyph_class_get_type, function in hb-gobject +
+
+
+hb_gobject_ot_math_constant_get_type, function in hb-gobject +
+
+
+hb_gobject_ot_math_glyph_part_flags_get_type, function in hb-gobject +
+
+
+hb_gobject_ot_math_kern_get_type, function in hb-gobject +
+
+
+hb_gobject_script_get_type, function in hb-gobject +
+
+
+hb_gobject_segment_properties_get_type, function in hb-gobject +
+
+
+hb_gobject_set_get_type, function in hb-gobject +
+
+
+hb_gobject_shape_plan_get_type, function in hb-gobject +
+
+
+HB_GOBJECT_TYPE_BLOB, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_BUFFER, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_BUFFER_CLUSTER_LEVEL, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_BUFFER_CONTENT_TYPE, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_BUFFER_FLAGS, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_BUFFER_SERIALIZE_FLAGS, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_BUFFER_SERIALIZE_FORMAT, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_DIRECTION, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_FACE, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_FEATURE, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_FONT, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_FONT_FUNCS, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_GLYPH_INFO, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_GLYPH_POSITION, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_MEMORY_MODE, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_OT_LAYOUT_GLYPH_CLASS, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_OT_MATH_CONSTANT, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_OT_MATH_GLYPH_PART_FLAGS, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_OT_MATH_KERN, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_SCRIPT, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_SEGMENT_PROPERTIES, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_SET, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_SHAPE_PLAN, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_UNICODE_COMBINING_CLASS, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_UNICODE_FUNCS, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_UNICODE_GENERAL_CATEGORY, macro in hb-gobject +
+
+
+HB_GOBJECT_TYPE_USER_DATA_KEY, macro in hb-gobject +
+
+
+hb_gobject_unicode_combining_class_get_type, function in hb-gobject +
+
+
+hb_gobject_unicode_funcs_get_type, function in hb-gobject +
+
+
+hb_gobject_unicode_general_category_get_type, function in hb-gobject +
+
+
+hb_gobject_user_data_key_get_type, function in hb-gobject +
+
+
+hb_graphite2_face_get_gr_face, function in hb-graphite2 +
+
+
+hb_graphite2_font_get_gr_font, function in hb-graphite2 +
+
+
+HB_GRAPHITE2_TAG_SILF, macro in hb-graphite2 +
+
+

I

+
+hb_icu_get_unicode_funcs, function in hb-icu +
+
+
+hb_icu_script_from_script, function in hb-icu +
+
+
+hb_icu_script_to_script, function in hb-icu +
+
+

L

+
+hb_language_from_string, function in hb-common +
+
+
+hb_language_get_default, function in hb-common +
+
+
+HB_LANGUAGE_INVALID, macro in hb-common +
+
+
+hb_language_t, typedef in hb-common +
+
+
+hb_language_to_string, function in hb-common +
+
+

M

+
+hb_mask_t, typedef in hb-common +
+
+
+hb_memory_mode_t, enum in hb-blob +
+
+

O

+
+hb_ot_font_set_funcs, function in hb-ot-font +
+
+
+hb_ot_layout_collect_lookups, function in hb-ot-layout +
+
+
+HB_OT_LAYOUT_DEFAULT_LANGUAGE_INDEX, macro in hb-ot-layout +
+
+
+hb_ot_layout_feature_get_lookups, function in hb-ot-layout +
+
+
+hb_ot_layout_feature_with_variations_get_lookups, function in hb-ot-layout +
+
+
+hb_ot_layout_get_attach_points, function in hb-ot-layout +
+
+
+hb_ot_layout_get_glyphs_in_class, function in hb-ot-layout +
+
+
+hb_ot_layout_get_glyph_class, function in hb-ot-layout +
+
+
+hb_ot_layout_get_ligature_carets, function in hb-ot-layout +
+
+
+hb_ot_layout_get_size_params, function in hb-ot-layout +
+
+
+hb_ot_layout_glyph_class_t, enum in hb-ot-layout +
+
+
+hb_ot_layout_glyph_sequence_func_t, user_function in hb-ot-layout +
+
+
+hb_ot_layout_has_glyph_classes, function in hb-ot-layout +
+
+
+hb_ot_layout_has_positioning, function in hb-ot-layout +
+
+
+hb_ot_layout_has_substitution, function in hb-ot-layout +
+
+
+hb_ot_layout_language_find_feature, function in hb-ot-layout +
+
+
+hb_ot_layout_language_get_feature_indexes, function in hb-ot-layout +
+
+
+hb_ot_layout_language_get_feature_tags, function in hb-ot-layout +
+
+
+hb_ot_layout_language_get_required_feature, function in hb-ot-layout +
+
+
+hb_ot_layout_language_get_required_feature_index, function in hb-ot-layout +
+
+
+hb_ot_layout_lookup_collect_glyphs, function in hb-ot-layout +
+
+
+hb_ot_layout_lookup_substitute_closure, function in hb-ot-layout +
+
+
+hb_ot_layout_lookup_would_substitute, function in hb-ot-layout +
+
+
+HB_OT_LAYOUT_NO_FEATURE_INDEX, macro in hb-ot-layout +
+
+
+HB_OT_LAYOUT_NO_SCRIPT_INDEX, macro in hb-ot-layout +
+
+
+HB_OT_LAYOUT_NO_VARIATIONS_INDEX, macro in hb-ot-layout +
+
+
+hb_ot_layout_script_find_language, function in hb-ot-layout +
+
+
+hb_ot_layout_script_get_language_tags, function in hb-ot-layout +
+
+
+hb_ot_layout_table_choose_script, function in hb-ot-layout +
+
+
+hb_ot_layout_table_find_feature_variations, function in hb-ot-layout +
+
+
+hb_ot_layout_table_find_script, function in hb-ot-layout +
+
+
+hb_ot_layout_table_get_feature_tags, function in hb-ot-layout +
+
+
+hb_ot_layout_table_get_lookup_count, function in hb-ot-layout +
+
+
+hb_ot_layout_table_get_script_tags, function in hb-ot-layout +
+
+
+hb_ot_math_constant_t, enum in hb-ot-math +
+
+
+hb_ot_math_get_constant, function in hb-ot-math +
+
+
+hb_ot_math_get_glyph_assembly, function in hb-ot-math +
+
+
+hb_ot_math_get_glyph_italics_correction, function in hb-ot-math +
+
+
+hb_ot_math_get_glyph_kerning, function in hb-ot-math +
+
+
+hb_ot_math_get_glyph_top_accent_attachment, function in hb-ot-math +
+
+
+hb_ot_math_get_glyph_variants, function in hb-ot-math +
+
+
+hb_ot_math_get_min_connector_overlap, function in hb-ot-math +
+
+
+hb_ot_math_glyph_part_flags_t, enum in hb-ot-math +
+
+
+hb_ot_math_glyph_part_t, struct in hb-ot-math +
+
+
+hb_ot_math_glyph_variant_t, struct in hb-ot-math +
+
+
+hb_ot_math_has_data, function in hb-ot-math +
+
+
+hb_ot_math_is_glyph_extended_shape, function in hb-ot-math +
+
+
+hb_ot_math_kern_t, enum in hb-ot-math +
+
+
+HB_OT_MATH_SCRIPT, macro in hb-ot-math +
+
+
+hb_ot_shape_glyphs_closure, function in hb-ot-shape +
+
+
+hb_ot_shape_plan_collect_lookups, function in hb-ot-layout +
+
+
+hb_ot_tags_from_script, function in hb-ot-tag +
+
+
+HB_OT_TAG_DEFAULT_LANGUAGE, macro in hb-ot-tag +
+
+
+HB_OT_TAG_DEFAULT_SCRIPT, macro in hb-ot-tag +
+
+
+hb_ot_tag_from_language, function in hb-ot-tag +
+
+
+HB_OT_TAG_GDEF, macro in hb-ot-layout +
+
+
+HB_OT_TAG_GPOS, macro in hb-ot-layout +
+
+
+HB_OT_TAG_GSUB, macro in hb-ot-layout +
+
+
+HB_OT_TAG_JSTF, macro in hb-ot-layout +
+
+
+HB_OT_TAG_MATH, macro in hb-ot-math +
+
+
+hb_ot_tag_to_language, function in hb-ot-tag +
+
+
+hb_ot_tag_to_script, function in hb-ot-tag +
+
+
+hb_ot_var_axis_t, struct in hb-ot-var +
+
+
+hb_ot_var_find_axis, function in hb-ot-var +
+
+
+hb_ot_var_get_axes, function in hb-ot-var +
+
+
+hb_ot_var_get_axis_count, function in hb-ot-var +
+
+
+hb_ot_var_has_data, function in hb-ot-var +
+
+
+hb_ot_var_normalize_coords, function in hb-ot-var +
+
+
+hb_ot_var_normalize_variations, function in hb-ot-var +
+
+
+HB_OT_VAR_NO_AXIS_INDEX, macro in hb-ot-var +
+
+

P

+
+hb_position_t, typedef in hb-common +
+
+

R

+
+hb_reference_table_func_t, user_function in hb-font +
+
+

S

+
+HB_SCRIPT_CANADIAN_ABORIGINAL, macro in hb-deprecated +
+
+
+hb_script_from_iso15924_tag, function in hb-common +
+
+
+hb_script_from_string, function in hb-common +
+
+
+hb_script_get_horizontal_direction, function in hb-common +
+
+
+hb_script_t, enum in hb-common +
+
+
+hb_script_to_iso15924_tag, function in hb-common +
+
+
+HB_SEGMENT_PROPERTIES_DEFAULT, macro in Buffers +
+
+
+hb_segment_properties_equal, function in Buffers +
+
+
+hb_segment_properties_hash, function in Buffers +
+
+
+hb_segment_properties_t, struct in Buffers +
+
+
+hb_set_add, function in hb-set +
+
+
+hb_set_add_range, function in hb-set +
+
+
+hb_set_allocation_successful, function in hb-set +
+
+
+hb_set_clear, function in hb-set +
+
+
+hb_set_create, function in hb-set +
+
+
+hb_set_del, function in hb-set +
+
+
+hb_set_del_range, function in hb-set +
+
+
+hb_set_destroy, function in hb-set +
+
+
+hb_set_get_empty, function in hb-set +
+
+
+hb_set_get_max, function in hb-set +
+
+
+hb_set_get_min, function in hb-set +
+
+
+hb_set_get_population, function in hb-set +
+
+
+hb_set_get_user_data, function in hb-set +
+
+
+hb_set_has, function in hb-set +
+
+
+hb_set_intersect, function in hb-set +
+
+
+hb_set_invert, function in hb-set +
+
+
+hb_set_is_empty, function in hb-set +
+
+
+hb_set_is_equal, function in hb-set +
+
+
+hb_set_next, function in hb-set +
+
+
+hb_set_next_range, function in hb-set +
+
+
+hb_set_reference, function in hb-set +
+
+
+hb_set_set, function in hb-set +
+
+
+hb_set_set_user_data, function in hb-set +
+
+
+hb_set_subtract, function in hb-set +
+
+
+hb_set_symmetric_difference, function in hb-set +
+
+
+hb_set_t, typedef in hb-set +
+
+
+hb_set_union, function in hb-set +
+
+
+HB_SET_VALUE_INVALID, macro in hb-set +
+
+
+hb_shape, function in Shaping +
+
+
+hb_shape_full, function in Shaping +
+
+
+hb_shape_list_shapers, function in Shaping +
+
+
+hb_shape_plan_create, function in hb-shape-plan +
+
+
+hb_shape_plan_create2, function in hb-shape-plan +
+
+
+hb_shape_plan_create_cached, function in hb-shape-plan +
+
+
+hb_shape_plan_create_cached2, function in hb-shape-plan +
+
+
+hb_shape_plan_destroy, function in hb-shape-plan +
+
+
+hb_shape_plan_execute, function in hb-shape-plan +
+
+
+hb_shape_plan_get_empty, function in hb-shape-plan +
+
+
+hb_shape_plan_get_shaper, function in hb-shape-plan +
+
+
+hb_shape_plan_get_user_data, function in hb-shape-plan +
+
+
+hb_shape_plan_reference, function in hb-shape-plan +
+
+
+hb_shape_plan_set_user_data, function in hb-shape-plan +
+
+
+hb_shape_plan_t, typedef in hb-shape-plan +
+
+

T

+
+HB_TAG, macro in hb-common +
+
+
+hb_tag_from_string, function in hb-common +
+
+
+HB_TAG_MAX, macro in hb-common +
+
+
+HB_TAG_MAX_SIGNED, macro in hb-common +
+
+
+HB_TAG_NONE, macro in hb-common +
+
+
+hb_tag_t, typedef in hb-common +
+
+
+hb_tag_to_string, function in hb-common +
+
+

U

+
+hb_unicode_combining_class, function in hb-unicode +
+
+
+hb_unicode_combining_class_func_t, user_function in hb-unicode +
+
+
+hb_unicode_combining_class_t, enum in hb-unicode +
+
+
+hb_unicode_compose, function in hb-unicode +
+
+
+hb_unicode_compose_func_t, user_function in hb-unicode +
+
+
+hb_unicode_decompose, function in hb-unicode +
+
+
+hb_unicode_decompose_compatibility, function in hb-unicode +
+
+
+hb_unicode_decompose_func_t, user_function in hb-unicode +
+
+
+hb_unicode_eastasian_width, function in hb-unicode +
+
+
+hb_unicode_funcs_create, function in hb-unicode +
+
+
+hb_unicode_funcs_destroy, function in hb-unicode +
+
+
+hb_unicode_funcs_get_default, function in hb-unicode +
+
+
+hb_unicode_funcs_get_empty, function in hb-unicode +
+
+
+hb_unicode_funcs_get_parent, function in hb-unicode +
+
+
+hb_unicode_funcs_get_user_data, function in hb-unicode +
+
+
+hb_unicode_funcs_is_immutable, function in hb-unicode +
+
+
+hb_unicode_funcs_make_immutable, function in hb-unicode +
+
+
+hb_unicode_funcs_reference, function in hb-unicode +
+
+
+hb_unicode_funcs_set_combining_class_func, function in hb-unicode +
+
+
+hb_unicode_funcs_set_compose_func, function in hb-unicode +
+
+
+hb_unicode_funcs_set_decompose_compatibility_func, function in hb-unicode +
+
+
+hb_unicode_funcs_set_decompose_func, function in hb-unicode +
+
+
+hb_unicode_funcs_set_eastasian_width_func, function in hb-unicode +
+
+
+hb_unicode_funcs_set_general_category_func, function in hb-unicode +
+
+
+hb_unicode_funcs_set_mirroring_func, function in hb-unicode +
+
+
+hb_unicode_funcs_set_script_func, function in hb-unicode +
+
+
+hb_unicode_funcs_set_user_data, function in hb-unicode +
+
+
+hb_unicode_funcs_t, typedef in hb-unicode +
+
+
+hb_unicode_general_category, function in hb-unicode +
+
+
+hb_unicode_general_category_func_t, user_function in hb-unicode +
+
+
+hb_unicode_general_category_t, enum in hb-unicode +
+
+
+HB_UNICODE_MAX_DECOMPOSITION_LEN, macro in hb-unicode +
+
+
+hb_unicode_mirroring, function in hb-unicode +
+
+
+hb_unicode_mirroring_func_t, user_function in hb-unicode +
+
+
+hb_unicode_script, function in hb-unicode +
+
+
+hb_unicode_script_func_t, user_function in hb-unicode +
+
+
+hb_uniscribe_font_get_hfont, function in hb-uniscribe +
+
+
+hb_uniscribe_font_get_logfontw, function in hb-uniscribe +
+
+
+HB_UNTAG, macro in hb-common +
+
+
+hb_user_data_key_t, struct in hb-common +
+
+

V

+
+hb_variation_from_string, function in hb-font +
+
+
+hb_variation_t, struct in hb-font +
+
+
+hb_variation_to_string, function in hb-font +
+
+
+hb_var_int_t, union in hb-common +
+
+
+hb_version, function in hb-version +
+
+
+HB_VERSION_ATLEAST, macro in hb-version +
+
+
+hb_version_atleast, function in hb-version +
+
+
+HB_VERSION_MAJOR, macro in hb-version +
+
+
+HB_VERSION_MICRO, macro in hb-version +
+
+
+HB_VERSION_MINOR, macro in hb-version +
+
+
+hb_version_string, function in hb-version +
+
+
+HB_VERSION_STRING, macro in hb-version +
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/buffers-language-script-and-direction.html b/docs/html/buffers-language-script-and-direction.html new file mode 100644 index 0000000..013239c --- /dev/null +++ b/docs/html/buffers-language-script-and-direction.html @@ -0,0 +1,87 @@ + + + + +Buffers, language, script and direction: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Buffers, language, script and direction

+
+
Creating and destroying buffers
+
Adding text to the buffer
+
Setting buffer properties
+
What about the other scripts?
+
Customizing Unicode functions
+
+

+ The input to Harfbuzz is a series of Unicode characters, stored in a + buffer. In this chapter, we'll look at how to set up a buffer with + the text that we want and then customize the properties of the + buffer. +

+
+

+Creating and destroying buffers

+

+ As we saw in our initial example, a buffer is created and + initialized with hb_buffer_create(). This + produces a new, empty buffer object, instantiated with some + default values and ready to accept your Unicode strings. +

+

+ Harfbuzz manages the memory of objects that it creates (such as + buffers), so you don't have to. When you have finished working on + a buffer, you can call hb_buffer_destroy(): +

+
+  hb_buffer_t *buffer = hb_buffer_create();
+  ...
+  hb_buffer_destroy(buffer);
+
+

+ This will destroy the object and free its associated memory - + unless some other part of the program holds a reference to this + buffer. If you acquire a Harfbuzz buffer from another subsystem + and want to ensure that it is not garbage collected by someone + else destroying it, you should increase its reference count: +

+
+void somefunc(hb_buffer_t *buffer) {
+  buffer = hb_buffer_reference(buffer);
+  ...
+
+

+ And then decrease it once you're done with it: +

+
+  hb_buffer_destroy(buffer);
+}
+
+

+ To throw away all the data in your buffer and start from scratch, + call hb_buffer_reset(buffer). If you want to + throw away the string in the buffer but keep the options, you can + instead call hb_buffer_clear_contents(buffer). +

+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/building.html b/docs/html/building.html new file mode 100644 index 0000000..3173586 --- /dev/null +++ b/docs/html/building.html @@ -0,0 +1,80 @@ + + + + +Building: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Building

+

+ On Linux, install the development packages for FreeType, Cairo, and GLib. + For example, on Ubuntu / Debian, you would do: +

+
+sudo apt-get install gcc g++ libfreetype6-dev libglib2.0-dev libcairo2-dev
+
+

+ whereas on Fedora, RHEL, CentOS, and other Red Hat based systems you would do: +

+
+sudo yum install gcc gcc-c++ freetype-devel glib2-devel cairo-devel
+
+

+ or using MacPorts: +

+
+sudo port install freetype glib2 cairo
+
+

+

+

+ If you are using a tarball, you can now proceed to running + configure and make as with any + other standard package. That should leave you with a shared library in + src/, and a few utility programs including hb-view + and hb-shape under util/. +

+

+ If you are bootstraping from git, you need a few more tools before you + can run autogen.sh for the first time. Namely, + pkg-config and ragel. + Again, on Ubuntu / Debian: +

+
+sudo apt-get install autoconf automake libtool pkg-config ragel gtk-doc-tools
+
+

+ and on Fedora, RHEL, CentOS: +

+
+sudo yum install autoconf automake libtool pkgconfig ragel gtk-doc
+
+

+ or using MacPorts: +

+
+sudo port install autoconf automake libtool pkgconfig ragel gtk-doc
+
+

+

+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/ch08.html b/docs/html/ch08.html new file mode 100644 index 0000000..883a101 --- /dev/null +++ b/docs/html/ch08.html @@ -0,0 +1,106 @@ + + + + +Harfbuzz API: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Harfbuzz API

+
+
+hb +
+
+hb-common +
+
+hb-unicode +
+
+Buffers — Input and output buffers +
+
+hb-blob +
+
+hb-face +
+
+hb-font +
+
+Shaping — Conversion of text strings into positioned glyphs +
+
+hb-version +
+
+hb-deprecated +
+
+hb-set +
+
+hb-ot +
+
+hb-ot-layout +
+
+hb-ot-tag +
+
+hb-ot-font +
+
+hb-ot-shape +
+
+hb-ot-math +
+
+hb-shape-plan +
+
+hb-glib +
+
+hb-icu +
+
+hb-ft +
+
+hb-graphite2 +
+
+hb-uniscribe +
+
+hb-coretext +
+
+hb-gobject +
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/clusters.html b/docs/html/clusters.html new file mode 100644 index 0000000..7f92278 --- /dev/null +++ b/docs/html/clusters.html @@ -0,0 +1,97 @@ + + + + +: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+
+
+
Clusters
+
A clustering example for levels 0 and 1
+
Reordering in levels 0 and 1
+
The distinction between levels 0 and 1
+
Level 2
+
+
Ligatures with combining marks
+
Reordering
+
+
+
+

+Clusters

+

+ In shaping text, a cluster is a sequence of + code points that needs to be treated as a single, indivisible unit. +

+

+ When you add text to a HB buffer, each character is associated with + a cluster value. This is an arbitrary number as + far as HB is concerned. +

+

+ Most clients will use UTF-8, UTF-16, or UTF-32 indices, but the + actual number does not matter. Moreover, it is not required for the + cluster values to be monotonically increasing, but pretty much all + of HB's tests are performed on monotonically increasing cluster + numbers. Nevertheless, there is no such assumption in the code + itself. With that in mind, let's examine what happens with cluster + values during shaping under each cluster-level. +

+

+ HarfBuzz provides three levels of clustering + support. Level 0 is the default behavior and reproduces the behavior + of the old HarfBuzz library. Level 1 tweaks this behavior slightly + to produce better results, so level 1 clustering is recommended for + code that is not required to implement backward compatibility with + the old HarfBuzz. +

+

+ Level 2 differs significantly in how it treats cluster values. + Levels 0 and 1 both process ligatures and glyph decomposition by + merging clusters; level 2 does not. +

+

+ The conceptual model for what the cluster values mean, in levels 0 + and 1, is this: +

+
    +

  • + the sequence of cluster values will always remain monotone +

    • +

  • + each value represents a single cluster +

    • +

  • + each cluster contains one or more glyphs and one or more + characters +

    • +
+

+ Assuming that initial cluster numbers were monotonically increasing + and distinct, then all adjacent glyphs having the same cluster + number belong to the same cluster, and all characters belong to the + cluster that has the highest number not larger than their initial + cluster number. This will become clearer with an example. +

+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/customizing-unicode-functions.html b/docs/html/customizing-unicode-functions.html new file mode 100644 index 0000000..103747c --- /dev/null +++ b/docs/html/customizing-unicode-functions.html @@ -0,0 +1,31 @@ + + + + +Customizing Unicode functions: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Customizing Unicode functions

+

+

+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/deprecated-api-index.html b/docs/html/deprecated-api-index.html new file mode 100644 index 0000000..bcb07e5 --- /dev/null +++ b/docs/html/deprecated-api-index.html @@ -0,0 +1,56 @@ + + + + +Index of deprecated API: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Index of deprecated API

+

B

+
+HB_BUFFER_FLAGS_DEFAULT, macro in hb-deprecated +
+
+
+HB_BUFFER_SERIALIZE_FLAGS_DEFAULT, macro in hb-deprecated +
+
+

F

+
+hb_font_funcs_set_glyph_func, function in hb-deprecated +
+
+
+hb_font_get_glyph_func_t, user_function in hb-deprecated +
+
+

S

+
+HB_SCRIPT_CANADIAN_ABORIGINAL, macro in hb-deprecated +
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/fonts-and-faces.html b/docs/html/fonts-and-faces.html new file mode 100644 index 0000000..80488d3 --- /dev/null +++ b/docs/html/fonts-and-faces.html @@ -0,0 +1,40 @@ + + + + +Fonts and faces: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Fonts and faces

+
+
Using FreeType
+
Using Harfbuzz's native OpenType implementation
+
Using your own font functions
+
+
+

+Using FreeType

+

+

+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/harfbuzz-Buffers.html b/docs/html/harfbuzz-Buffers.html new file mode 100644 index 0000000..b8443a3 --- /dev/null +++ b/docs/html/harfbuzz-Buffers.html @@ -0,0 +1,2738 @@ + + + + +Buffers: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

Buffers

+

Buffers — Input and output buffers

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+hb_buffer_t * + +hb_buffer_create () +
+hb_buffer_t * + +hb_buffer_reference () +
+hb_buffer_t * + +hb_buffer_get_empty () +
+void + +hb_buffer_destroy () +
+void + +hb_buffer_reset () +
+void + +hb_buffer_clear_contents () +
+hb_bool_t + +hb_buffer_pre_allocate () +
+hb_bool_t + +hb_buffer_allocation_successful () +
+void + +hb_buffer_add () +
+void + +hb_buffer_add_codepoints () +
+void + +hb_buffer_add_utf32 () +
+void + +hb_buffer_add_utf16 () +
+void + +hb_buffer_add_utf8 () +
+void + +hb_buffer_add_latin1 () +
+void + +hb_buffer_set_content_type () +
+hb_buffer_content_type_t + +hb_buffer_get_content_type () +
+void + +hb_buffer_set_direction () +
+hb_direction_t + +hb_buffer_get_direction () +
+void + +hb_buffer_set_script () +
+hb_script_t + +hb_buffer_get_script () +
+void + +hb_buffer_set_language () +
+hb_language_t + +hb_buffer_get_language () +
+void + +hb_buffer_set_flags () +
+hb_buffer_flags_t + +hb_buffer_get_flags () +
+void + +hb_buffer_set_cluster_level () +
+hb_buffer_cluster_level_t + +hb_buffer_get_cluster_level () +
+hb_bool_t + +hb_buffer_set_length () +
unsigned int + +hb_buffer_get_length () +
+void + +hb_buffer_set_segment_properties () +
+void + +hb_buffer_get_segment_properties () +
+void + +hb_buffer_guess_segment_properties () +
+void + +hb_buffer_set_unicode_funcs () +
+hb_unicode_funcs_t * + +hb_buffer_get_unicode_funcs () +
+hb_bool_t + +hb_buffer_set_user_data () +
+void * + +hb_buffer_get_user_data () +
+hb_glyph_info_t * + +hb_buffer_get_glyph_infos () +
+hb_glyph_position_t * + +hb_buffer_get_glyph_positions () +
+void + +hb_buffer_set_replacement_codepoint () +
+hb_codepoint_t + +hb_buffer_get_replacement_codepoint () +
+void + +hb_buffer_normalize_glyphs () +
+void + +hb_buffer_reverse () +
+void + +hb_buffer_reverse_range () +
+void + +hb_buffer_reverse_clusters () +
unsigned int + +hb_buffer_serialize_glyphs () +
+hb_bool_t + +hb_buffer_deserialize_glyphs () +
+hb_buffer_serialize_format_t + +hb_buffer_serialize_format_from_string () +
const char * + +hb_buffer_serialize_format_to_string () +
const char ** + +hb_buffer_serialize_list_formats () +
+hb_bool_t + +hb_segment_properties_equal () +
unsigned int + +hb_segment_properties_hash () +
+void + +hb_buffer_set_message_func () +
+hb_bool_t + +(*hb_buffer_message_func_t) () +
+
+
+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#defineHB_SEGMENT_PROPERTIES_DEFAULT
#defineHB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT
typedefhb_buffer_t
 hb_glyph_info_t
 hb_glyph_position_t
enumhb_buffer_content_type_t
enumhb_buffer_flags_t
enumhb_buffer_cluster_level_t
 hb_segment_properties_t
enumhb_buffer_serialize_format_t
enumhb_buffer_serialize_flags_t
+
+
+

Object Hierarchy

+
    GBoxed
+    ├── hb_buffer_t
+    ├── hb_glyph_info_t
+    ├── hb_glyph_position_t
+    ╰── hb_segment_properties_t
+    GEnum
+    ├── hb_buffer_cluster_level_t
+    ├── hb_buffer_content_type_t
+    ╰── hb_buffer_serialize_format_t
+    GFlags
+    ├── hb_buffer_flags_t
+    ╰── hb_buffer_serialize_flags_t
+
+
+
+

Includes

+
#include <hb.h>
+
+
+
+

Description

+

Buffers serve dual role in HarfBuzz; they hold the input characters that are +passed hb_shape(), and after shaping they hold the output glyphs.

+
+
+

Functions

+
+

hb_buffer_create ()

+
hb_buffer_t *
+hb_buffer_create (void);
+
+
+
+

hb_buffer_reference ()

+
hb_buffer_t *
+hb_buffer_reference (hb_buffer_t *buffer);
+

Increases the reference count on buffer + by one. This prevents buffer + from +being destroyed until a matching call to hb_buffer_destroy() is made.

+
+

Parameters

+
+++++ + + + + + +

buffer

an hb_buffer_t.

 
+
+
+

Returns

+

The referenced hb_buffer_t.

+

[transfer full]

+
+

Since 0.9.2

+
+
+
+

hb_buffer_get_empty ()

+
hb_buffer_t *
+hb_buffer_get_empty (void);
+
+

Returns

+

.

+

[transfer full]

+
+

Since 0.9.2

+
+
+
+

hb_buffer_destroy ()

+
void
+hb_buffer_destroy (hb_buffer_t *buffer);
+

Deallocate the buffer +. +Decreases the reference count on buffer + by one. If the result is zero, then +buffer + and all associated resources are freed. See hb_buffer_reference().

+
+

Parameters

+
+++++ + + + + + +

buffer

an hb_buffer_t.

 
+
+

Since 0.9.2

+
+
+
+

hb_buffer_reset ()

+
void
+hb_buffer_reset (hb_buffer_t *buffer);
+

Resets the buffer to its initial status, as if it was just newly created +with hb_buffer_create().

+
+

Parameters

+
+++++ + + + + + +

buffer

an hb_buffer_t.

 
+
+

Since 0.9.2

+
+
+
+

hb_buffer_clear_contents ()

+
void
+hb_buffer_clear_contents (hb_buffer_t *buffer);
+

Similar to hb_buffer_reset(), but does not clear the Unicode functions and +the replacement code point.

+
+

Parameters

+
+++++ + + + + + +

buffer

an hb_buffer_t.

 
+
+

Since 0.9.11

+
+
+
+

hb_buffer_pre_allocate ()

+
hb_bool_t
+hb_buffer_pre_allocate (hb_buffer_t *buffer,
+                        unsigned int size);
+

Pre allocates memory for buffer + to fit at least size + number of items.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

buffer

an hb_buffer_t.

 

size

number of items to pre allocate.

 
+
+
+

Returns

+

true if buffer +memory allocation succeeded, false otherwise.

+

+
+

Since 0.9.2

+
+
+
+

hb_buffer_allocation_successful ()

+
hb_bool_t
+hb_buffer_allocation_successful (hb_buffer_t *buffer);
+

Check if allocating memory for the buffer succeeded.

+
+

Parameters

+
+++++ + + + + + +

buffer

an hb_buffer_t.

 
+
+
+

Returns

+

true if buffer +memory allocation succeeded, false otherwise.

+

+
+

Since 0.9.2

+
+
+
+

hb_buffer_add ()

+
void
+hb_buffer_add (hb_buffer_t *buffer,
+               hb_codepoint_t codepoint,
+               unsigned int cluster);
+

Appends a character with the Unicode value of codepoint + to buffer +, and +gives it the initial cluster value of cluster +. Clusters can be any thing +the client wants, they are usually used to refer to the index of the +character in the input text stream and are output in +hb_glyph_info_t.cluster field.

+

This function does not check the validity of codepoint +, it is up to the +caller to ensure it is a valid Unicode code point.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

buffer

an hb_buffer_t.

 

codepoint

a Unicode code point.

 

cluster

the cluster value of codepoint +.

 
+
+

Since 0.9.7

+
+
+
+

hb_buffer_add_codepoints ()

+
void
+hb_buffer_add_codepoints (hb_buffer_t *buffer,
+                          const hb_codepoint_t *text,
+                          int text_length,
+                          unsigned int item_offset,
+                          int item_length);
+

Appends characters from text + array to buffer +. The item_offset + is the +position of the first character from text + that will be appended, and +item_length + is the number of character. When shaping part of a larger text +(e.g. a run of text from a paragraph), instead of passing just the substring +corresponding to the run, it is preferable to pass the whole +paragraph and specify the run start and length as item_offset + and +item_length +, respectively, to give HarfBuzz the full context to be able, +for example, to do cross-run Arabic shaping or properly handle combining +marks at stat of run.

+

This function does not check the validity of text +, it is up to the caller +to ensure it contains a valid Unicode code points.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

buffer

a hb_buffer_t to append characters to.

 

text

an array of Unicode code points to append.

[array length=text_length]

text_length

the length of the text +, or -1 if it is NULL terminated.

 

item_offset

the offset of the first code point to add to the buffer +.

 

item_length

the number of code points to add to the buffer +, or -1 for the +end of text +(assuming it is NULL terminated).

 
+
+

Since 0.9.31

+
+
+
+

hb_buffer_add_utf32 ()

+
void
+hb_buffer_add_utf32 (hb_buffer_t *buffer,
+                     const uint32_t *text,
+                     int text_length,
+                     unsigned int item_offset,
+                     int item_length);
+

See hb_buffer_add_codepoints().

+

Replaces invalid UTF-32 characters with the buffer + replacement code point, +see hb_buffer_set_replacement_codepoint().

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

buffer

an hb_buffer_t.

 

text

an array of UTF-32 characters to append.

[array length=text_length]

text_length

the length of the text +, or -1 if it is NULL terminated.

 

item_offset

the offset of the first character to add to the buffer +.

 

item_length

the number of characters to add to the buffer +, or -1 for the +end of text +(assuming it is NULL terminated).

 
+
+

Since 0.9.2

+
+
+
+

hb_buffer_add_utf16 ()

+
void
+hb_buffer_add_utf16 (hb_buffer_t *buffer,
+                     const uint16_t *text,
+                     int text_length,
+                     unsigned int item_offset,
+                     int item_length);
+

See hb_buffer_add_codepoints().

+

Replaces invalid UTF-16 characters with the buffer + replacement code point, +see hb_buffer_set_replacement_codepoint().

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

buffer

an hb_buffer_t.

 

text

an array of UTF-16 characters to append.

[array length=text_length]

text_length

the length of the text +, or -1 if it is NULL terminated.

 

item_offset

the offset of the first character to add to the buffer +.

 

item_length

the number of characters to add to the buffer +, or -1 for the +end of text +(assuming it is NULL terminated).

 
+
+

Since 0.9.2

+
+
+
+

hb_buffer_add_utf8 ()

+
void
+hb_buffer_add_utf8 (hb_buffer_t *buffer,
+                    const char *text,
+                    int text_length,
+                    unsigned int item_offset,
+                    int item_length);
+

See hb_buffer_add_codepoints().

+

Replaces invalid UTF-8 characters with the buffer + replacement code point, +see hb_buffer_set_replacement_codepoint().

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

buffer

an hb_buffer_t.

 

text

an array of UTF-8 +characters to append.

[array length=text_length][element-type uint8_t]

text_length

the length of the text +, or -1 if it is NULL terminated.

 

item_offset

the offset of the first character to add to the buffer +.

 

item_length

the number of characters to add to the buffer +, or -1 for the +end of text +(assuming it is NULL terminated).

 
+
+

Since 0.9.2

+
+
+
+

hb_buffer_add_latin1 ()

+
void
+hb_buffer_add_latin1 (hb_buffer_t *buffer,
+                      const uint8_t *text,
+                      int text_length,
+                      unsigned int item_offset,
+                      int item_length);
+

Similar to hb_buffer_add_codepoints(), but allows only access to first 256 +Unicode code points that can fit in 8-bit strings.

+
Has nothing to do with non-Unicode Latin-1 encoding.
+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

buffer

an hb_buffer_t.

 

text

an array of UTF-8 +characters to append.

[array length=text_length][element-type uint8_t]

text_length

the length of the text +, or -1 if it is NULL terminated.

 

item_offset

the offset of the first character to add to the buffer +.

 

item_length

the number of characters to add to the buffer +, or -1 for the +end of text +(assuming it is NULL terminated).

 
+
+

Since 0.9.39

+
+
+
+

hb_buffer_set_content_type ()

+
void
+hb_buffer_set_content_type (hb_buffer_t *buffer,
+                            hb_buffer_content_type_t content_type);
+

Sets the type of buffer + contents, buffers are either empty, contain +characters (before shaping) or glyphs (the result of shaping).

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

buffer

an hb_buffer_t.

 

content_type

the type of buffer contents to set

 
+
+

Since 0.9.5

+
+
+
+

hb_buffer_get_content_type ()

+
hb_buffer_content_type_t
+hb_buffer_get_content_type (hb_buffer_t *buffer);
+

see hb_buffer_set_content_type().

+
+

Parameters

+
+++++ + + + + + +

buffer

an hb_buffer_t.

 
+
+
+

Returns

+

The type of buffer +contents.

+

+
+

Since 0.9.5

+
+
+
+

hb_buffer_set_direction ()

+
void
+hb_buffer_set_direction (hb_buffer_t *buffer,
+                         hb_direction_t direction);
+

Set the text flow direction of the buffer. No shaping can happen without +setting buffer + direction, and it controls the visual direction for the +output glyphs; for RTL direction the glyphs will be reversed. Many layout +features depend on the proper setting of the direction, for example, +reversing RTL text before shaping, then shaping with LTR direction is not +the same as keeping the text in logical order and shaping with RTL +direction.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

buffer

an hb_buffer_t.

 

direction

the hb_direction_t of the buffer +

 
+
+

Since 0.9.2

+
+
+
+

hb_buffer_get_direction ()

+
hb_direction_t
+hb_buffer_get_direction (hb_buffer_t *buffer);
+

See hb_buffer_set_direction()

+
+

Parameters

+
+++++ + + + + + +

buffer

an hb_buffer_t.

 
+
+
+

Returns

+

The direction of the buffer +.

+

+
+

Since 0.9.2

+
+
+
+

hb_buffer_set_script ()

+
void
+hb_buffer_set_script (hb_buffer_t *buffer,
+                      hb_script_t script);
+

Sets the script of buffer + to script +.

+

Script is crucial for choosing the proper shaping behaviour for scripts that +require it (e.g. Arabic) and the which OpenType features defined in the font +to be applied.

+

You can pass one of the predefined hb_script_t values, or use +hb_script_from_string() or hb_script_from_iso15924_tag() to get the +corresponding script from an ISO 15924 script tag.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

buffer

an hb_buffer_t.

 

script

an hb_script_t to set.

 
+
+

Since 0.9.2

+
+
+
+

hb_buffer_get_script ()

+
hb_script_t
+hb_buffer_get_script (hb_buffer_t *buffer);
+

See hb_buffer_set_script().

+
+

Parameters

+
+++++ + + + + + +

buffer

an hb_buffer_t.

 
+
+
+

Returns

+

The hb_script_t of the buffer +.

+

+
+

Since 0.9.2

+
+
+
+

hb_buffer_set_language ()

+
void
+hb_buffer_set_language (hb_buffer_t *buffer,
+                        hb_language_t language);
+

Sets the language of buffer + to language +.

+

Languages are crucial for selecting which OpenType feature to apply to the +buffer which can result in applying language-specific behaviour. Languages +are orthogonal to the scripts, and though they are related, they are +different concepts and should not be confused with each other.

+

Use hb_language_from_string() to convert from ISO 639 language codes to +hb_language_t.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

buffer

an hb_buffer_t.

 

language

an hb_language_t to set.

 
+
+

Since 0.9.2

+
+
+
+

hb_buffer_get_language ()

+
hb_language_t
+hb_buffer_get_language (hb_buffer_t *buffer);
+

See hb_buffer_set_language().

+
+

Parameters

+
+++++ + + + + + +

buffer

an hb_buffer_t.

 
+
+
+

Returns

+

The hb_language_t of the buffer. Must not be freed by the caller.

+

[transfer none]

+
+

Since 0.9.2

+
+
+
+

hb_buffer_set_flags ()

+
void
+hb_buffer_set_flags (hb_buffer_t *buffer,
+                     hb_buffer_flags_t flags);
+

Sets buffer + flags to flags +. See hb_buffer_flags_t.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

buffer

an hb_buffer_t.

 

flags

the buffer flags to set.

 
+
+

Since 0.9.7

+
+
+
+

hb_buffer_get_flags ()

+
hb_buffer_flags_t
+hb_buffer_get_flags (hb_buffer_t *buffer);
+

See hb_buffer_set_flags().

+
+

Parameters

+
+++++ + + + + + +

buffer

an hb_buffer_t.

 
+
+
+

Returns

+

The buffer +flags.

+

+
+

Since 0.9.7

+
+
+
+

hb_buffer_set_cluster_level ()

+
void
+hb_buffer_set_cluster_level (hb_buffer_t *buffer,
+                             hb_buffer_cluster_level_t cluster_level);
+
+

Parameters

+
+++++ + + + + + +

buffer

an hb_buffer_t.

 
+
+

Since 0.9.42

+
+
+
+

hb_buffer_get_cluster_level ()

+
hb_buffer_cluster_level_t
+hb_buffer_get_cluster_level (hb_buffer_t *buffer);
+
+

Parameters

+
+++++ + + + + + +

buffer

an hb_buffer_t.

 
+
+
+

Returns

+

+
+

Since 0.9.42

+
+
+
+

hb_buffer_set_length ()

+
hb_bool_t
+hb_buffer_set_length (hb_buffer_t *buffer,
+                      unsigned int length);
+

Similar to hb_buffer_pre_allocate(), but clears any new items added at the +end.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

buffer

an hb_buffer_t.

 

length

the new length of buffer +.

 
+
+
+

Returns

+

true if buffer +memory allocation succeeded, false otherwise.

+

+
+

Since 0.9.2

+
+
+
+

hb_buffer_get_length ()

+
unsigned int
+hb_buffer_get_length (hb_buffer_t *buffer);
+

Returns the number of items in the buffer.

+
+

Parameters

+
+++++ + + + + + +

buffer

an hb_buffer_t.

 
+
+
+

Returns

+

The buffer +length. +The value valid as long as buffer has not been modified.

+

+
+

Since 0.9.2

+
+
+
+

hb_buffer_set_segment_properties ()

+
void
+hb_buffer_set_segment_properties (hb_buffer_t *buffer,
+                                  const hb_segment_properties_t *props);
+

Sets the segment properties of the buffer, a shortcut for calling +hb_buffer_set_direction(), hb_buffer_set_script() and +hb_buffer_set_language() individually.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

buffer

an hb_buffer_t.

 

props

an hb_segment_properties_t to use.

 
+
+

Since 0.9.7

+
+
+
+

hb_buffer_get_segment_properties ()

+
void
+hb_buffer_get_segment_properties (hb_buffer_t *buffer,
+                                  hb_segment_properties_t *props);
+

Sets props + to the hb_segment_properties_t of buffer +.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

buffer

an hb_buffer_t.

 

props

the output hb_segment_properties_t.

[out]
+
+

Since 0.9.7

+
+
+
+

hb_buffer_guess_segment_properties ()

+
void
+hb_buffer_guess_segment_properties (hb_buffer_t *buffer);
+

Sets unset buffer segment properties based on buffer Unicode +contents. If buffer is not empty, it must have content type +HB_BUFFER_CONTENT_TYPE_UNICODE.

+

If buffer script is not set (ie. is HB_SCRIPT_INVALID), it +will be set to the Unicode script of the first character in +the buffer that has a script other than HB_SCRIPT_COMMON, +HB_SCRIPT_INHERITED, and HB_SCRIPT_UNKNOWN.

+

Next, if buffer direction is not set (ie. is HB_DIRECTION_INVALID), +it will be set to the natural horizontal direction of the +buffer script as returned by hb_script_get_horizontal_direction().

+

Finally, if buffer language is not set (ie. is HB_LANGUAGE_INVALID), +it will be set to the process's default language as returned by +hb_language_get_default(). This may change in the future by +taking buffer script into consideration when choosing a language.

+
+

Parameters

+
+++++ + + + + + +

buffer

an hb_buffer_t.

 
+
+

Since 0.9.7

+
+
+
+

hb_buffer_set_unicode_funcs ()

+
void
+hb_buffer_set_unicode_funcs (hb_buffer_t *buffer,
+                             hb_unicode_funcs_t *unicode_funcs);
+
+

Parameters

+
+++++ + + + + + +

buffer

an hb_buffer_t.

 
+
+

Since 0.9.2

+
+
+
+

hb_buffer_get_unicode_funcs ()

+
hb_unicode_funcs_t *
+hb_buffer_get_unicode_funcs (hb_buffer_t *buffer);
+
+

Parameters

+
+++++ + + + + + +

buffer

an hb_buffer_t.

 
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_buffer_set_user_data ()

+
hb_bool_t
+hb_buffer_set_user_data (hb_buffer_t *buffer,
+                         hb_user_data_key_t *key,
+                         void *data,
+                         hb_destroy_func_t destroy,
+                         hb_bool_t replace);
+
+

Parameters

+
+++++ + + + + + +

buffer

an hb_buffer_t.

 
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_buffer_get_user_data ()

+
void *
+hb_buffer_get_user_data (hb_buffer_t *buffer,
+                         hb_user_data_key_t *key);
+
+

Parameters

+
+++++ + + + + + +

buffer

an hb_buffer_t.

 
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_buffer_get_glyph_infos ()

+
hb_glyph_info_t *
+hb_buffer_get_glyph_infos (hb_buffer_t *buffer,
+                           unsigned int *length);
+

Returns buffer + glyph information array. Returned pointer +is valid as long as buffer + contents are not modified.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

buffer

an hb_buffer_t.

 

length

output array length.

[out]
+
+
+

Returns

+

The buffer +glyph information array. +The value valid as long as buffer has not been modified.

+

[transfer none][array length=length]

+
+

Since 0.9.2

+
+
+
+

hb_buffer_get_glyph_positions ()

+
hb_glyph_position_t *
+hb_buffer_get_glyph_positions (hb_buffer_t *buffer,
+                               unsigned int *length);
+

Returns buffer + glyph position array. Returned pointer +is valid as long as buffer + contents are not modified.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

buffer

an hb_buffer_t.

 

length

output length.

[out]
+
+
+

Returns

+

The buffer +glyph position array. +The value valid as long as buffer has not been modified.

+

[transfer none][array length=length]

+
+

Since 0.9.2

+
+
+
+

hb_buffer_set_replacement_codepoint ()

+
void
+hb_buffer_set_replacement_codepoint (hb_buffer_t *buffer,
+                                     hb_codepoint_t replacement);
+

Sets the hb_codepoint_t that replaces invalid entries for a given encoding +when adding text to buffer +.

+

Default is HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

buffer

an hb_buffer_t.

 

replacement

the replacement hb_codepoint_t

 
+
+

Since 0.9.31

+
+
+
+

hb_buffer_get_replacement_codepoint ()

+
hb_codepoint_t
+hb_buffer_get_replacement_codepoint (hb_buffer_t *buffer);
+

See hb_buffer_set_replacement_codepoint().

+
+

Parameters

+
+++++ + + + + + +

buffer

an hb_buffer_t.

 
+
+
+

Returns

+

The buffer +replacement hb_codepoint_t.

+

+
+

Since 0.9.31

+
+
+
+

hb_buffer_normalize_glyphs ()

+
void
+hb_buffer_normalize_glyphs (hb_buffer_t *buffer);
+

Reorders a glyph buffer to have canonical in-cluster glyph order / position. +The resulting clusters should behave identical to pre-reordering clusters.

+
This has nothing to do with Unicode normalization.
+
+

Parameters

+
+++++ + + + + + +

buffer

an hb_buffer_t.

 
+
+

Since 0.9.2

+
+
+
+

hb_buffer_reverse ()

+
void
+hb_buffer_reverse (hb_buffer_t *buffer);
+

Reverses buffer contents.

+
+

Parameters

+
+++++ + + + + + +

buffer

an hb_buffer_t.

 
+
+

Since 0.9.2

+
+
+
+

hb_buffer_reverse_range ()

+
void
+hb_buffer_reverse_range (hb_buffer_t *buffer,
+                         unsigned int start,
+                         unsigned int end);
+

Reverses buffer contents between start to end.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

buffer

an hb_buffer_t.

 

start

start index.

 

end

end index.

 
+
+

Since 0.9.41

+
+
+
+

hb_buffer_reverse_clusters ()

+
void
+hb_buffer_reverse_clusters (hb_buffer_t *buffer);
+

Reverses buffer clusters. That is, the buffer contents are +reversed, then each cluster (consecutive items having the +same cluster number) are reversed again.

+
+

Parameters

+
+++++ + + + + + +

buffer

an hb_buffer_t.

 
+
+

Since 0.9.2

+
+
+
+

hb_buffer_serialize_glyphs ()

+
unsigned int
+hb_buffer_serialize_glyphs (hb_buffer_t *buffer,
+                            unsigned int start,
+                            unsigned int end,
+                            char *buf,
+                            unsigned int buf_size,
+                            unsigned int *buf_consumed,
+                            hb_font_t *font,
+                            hb_buffer_serialize_format_t format,
+                            hb_buffer_serialize_flags_t flags);
+

Serializes buffer + into a textual representation of its glyph content, +useful for showing the contents of the buffer, for example during debugging. +There are currently two supported serialization formats:

+
+

text

+

A human-readable, plain text format. +The serialized glyphs will look something like:

+

+[uni0651=0@518,0+0|uni0628=0+1897] +

+
+
+
+

json

+

TODO.

+
+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

buffer

an hb_buffer_t buffer.

 

start

the first item in buffer +to serialize.

 

end

the last item in buffer +to serialize.

 

buf

output string to +write serialized buffer into.

[out][array length=buf_size][element-type uint8_t]

buf_size

the size of buf +.

 

buf_consumed

if not NULL, will be set to the number of byes written into buf +.

[out][allow-none]

font

the hb_font_t used to shape this buffer, needed to +read glyph names and extents. If NULL, and empty font will be used.

[allow-none]

format

the hb_buffer_serialize_format_t to use for formatting the output.

 

flags

the hb_buffer_serialize_flags_t that control what glyph properties +to serialize.

 
+
+
+

Returns

+

The number of serialized items.

+

+
+

Since 0.9.7

+
+
+
+

hb_buffer_deserialize_glyphs ()

+
hb_bool_t
+hb_buffer_deserialize_glyphs (hb_buffer_t *buffer,
+                              const char *buf,
+                              int buf_len,
+                              const char **end_ptr,
+                              hb_font_t *font,
+                              hb_buffer_serialize_format_t format);
+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

buffer

an hb_buffer_t buffer.

 

buf

.

[array length=buf_len]

end_ptr

.

[out]
+
+
+

Returns

+

+
+

Since 0.9.7

+
+
+
+

hb_buffer_serialize_format_from_string ()

+
hb_buffer_serialize_format_t
+hb_buffer_serialize_format_from_string
+                               (const char *str,
+                                int len);
+

Parses a string into an hb_buffer_serialize_format_t. Does not check if +str + is a valid buffer serialization format, use +hb_buffer_serialize_list_formats() to get the list of supported formats.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

str

a string to parse.

[array length=len][element-type uint8_t]

len

length of str +, or -1 if string is NULL terminated

 
+
+
+

Returns

+

The parsed hb_buffer_serialize_format_t.

+

+
+

Since 0.9.7

+
+
+
+

hb_buffer_serialize_format_to_string ()

+
const char *
+hb_buffer_serialize_format_to_string (hb_buffer_serialize_format_t format);
+

Converts format + to the string corresponding it, or NULL if it is not a valid +hb_buffer_serialize_format_t.

+
+

Parameters

+
+++++ + + + + + +

format

an hb_buffer_serialize_format_t to convert.

 
+
+
+

Returns

+

A NULL terminated string corresponding to format +. Should not be freed.

+

[transfer none]

+
+

Since 0.9.7

+
+
+
+

hb_buffer_serialize_list_formats ()

+
const char **
+hb_buffer_serialize_list_formats (void);
+

Returns a list of supported buffer serialization formats.

+
+

Returns

+

A string array of buffer serialization formats. Should not be freed.

+

[transfer none]

+
+

Since 0.9.7

+
+
+
+

hb_segment_properties_equal ()

+
hb_bool_t
+hb_segment_properties_equal (const hb_segment_properties_t *a,
+                             const hb_segment_properties_t *b);
+

Checks the equality of two hb_segment_properties_t's.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

a

first hb_segment_properties_t to compare.

 

b

second hb_segment_properties_t to compare.

 
+
+
+

Returns

+

true if all properties of a +equal those of b +, false otherwise.

+

+
+

Since 0.9.7

+
+
+
+

hb_segment_properties_hash ()

+
unsigned int
+hb_segment_properties_hash (const hb_segment_properties_t *p);
+

Creates a hash representing p +.

+
+

Parameters

+
+++++ + + + + + +

p

hb_segment_properties_t to hash.

 
+
+
+

Returns

+

A hash of p +.

+

+
+

Since 0.9.7

+
+
+
+

hb_buffer_set_message_func ()

+
void
+hb_buffer_set_message_func (hb_buffer_t *buffer,
+                            hb_buffer_message_func_t func,
+                            void *user_data,
+                            hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

buffer

an hb_buffer_t.

 

func

.

[closure user_data][destroy destroy][scope notified]
+
+

Since 1.1.3

+
+
+
+

hb_buffer_message_func_t ()

+
hb_bool_t
+(*hb_buffer_message_func_t) (hb_buffer_t *buffer,
+                             hb_font_t *font,
+                             const char *message,
+                             void *user_data);
+
+
+
+

Types and Values

+
+

HB_SEGMENT_PROPERTIES_DEFAULT

+
#define             HB_SEGMENT_PROPERTIES_DEFAULT
+
+
+
+

HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT

+
#define HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT 0xFFFDu
+
+

The default code point for replacing invalid characters in a given encoding. +Set to U+FFFD REPLACEMENT CHARACTER.

+

Since 0.9.31

+
+
+
+

hb_buffer_t

+
typedef struct hb_buffer_t hb_buffer_t;
+
+

The main structure holding the input text and its properties before shaping, +and output glyphs and their information after shaping.

+
+
+
+

hb_glyph_info_t

+
typedef struct {
+  hb_codepoint_t codepoint;
+  hb_mask_t      mask;
+  uint32_t       cluster;
+} hb_glyph_info_t;
+
+

The hb_glyph_info_t is the structure that holds information about the +glyphs and their relation to input text.

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + +

hb_codepoint_t codepoint;

either a Unicode code point (before shaping) or a glyph index +(after shaping).

 

hb_mask_t mask;

  

uint32_t cluster;

the index of the character in the original text that corresponds +to this hb_glyph_info_t, or whatever the client passes to +hb_buffer_add(). More than one hb_glyph_info_t can have the same +cluster +value, if they resulted from the same character (e.g. one +to many glyph substitution), and when more than one character gets +merged in the same glyph (e.g. many to one glyph substitution) the +hb_glyph_info_t will have the smallest cluster value of them. +By default some characters are merged into the same cluster +(e.g. combining marks have the same cluster as their bases) +even if they are separate glyphs, hb_buffer_set_cluster_level() +allow selecting more fine-grained cluster handling.

 
+
+
+
+
+

hb_glyph_position_t

+
typedef struct {
+  hb_position_t  x_advance;
+  hb_position_t  y_advance;
+  hb_position_t  x_offset;
+  hb_position_t  y_offset;
+} hb_glyph_position_t;
+
+

The hb_glyph_position_t is the structure that holds the positions of the +glyph in both horizontal and vertical directions. All positions in +hb_glyph_position_t are relative to the current point.

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

hb_position_t x_advance;

how much the line advances after drawing this glyph when setting +text in horizontal direction.

 

hb_position_t y_advance;

how much the line advances after drawing this glyph when setting +text in vertical direction.

 

hb_position_t x_offset;

how much the glyph moves on the X-axis before drawing it, this +should not affect how much the line advances.

 

hb_position_t y_offset;

how much the glyph moves on the Y-axis before drawing it, this +should not affect how much the line advances.

 
+
+
+
+
+

enum hb_buffer_content_type_t

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + +

HB_BUFFER_CONTENT_TYPE_INVALID

 +

Initial value for new buffer.

+		 

HB_BUFFER_CONTENT_TYPE_UNICODE

 +

The buffer contains input characters (before shaping).

+		 

HB_BUFFER_CONTENT_TYPE_GLYPHS

 +

The buffer contains output glyphs (after shaping).

+		 
+
+
+
+
+

enum hb_buffer_flags_t

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

HB_BUFFER_FLAG_DEFAULT

 +

the default buffer flag.

+		 

HB_BUFFER_FLAG_BOT

 +

flag indicating that special handling of the beginning + of text paragraph can be applied to this buffer. Should usually + be set, unless you are passing to the buffer only part + of the text without the full context.

+		 

HB_BUFFER_FLAG_EOT

 +

flag indicating that special handling of the end of text + paragraph can be applied to this buffer, similar to + HB_BUFFER_FLAG_EOT +.

+		 

HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES

 +

flag indication that character with Default_Ignorable + Unicode property should use the corresponding glyph + from the font, instead of hiding them (currently done + by replacing them with the space glyph and zeroing the + advance width.)

+		 
+
+

Since 0.9.20

+
+
+
+

enum hb_buffer_cluster_level_t

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES

  

HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS

  

HB_BUFFER_CLUSTER_LEVEL_CHARACTERS

  

HB_BUFFER_CLUSTER_LEVEL_DEFAULT

  
+
+
+
+
+

hb_segment_properties_t

+
typedef struct {
+  hb_direction_t  direction;
+  hb_script_t     script;
+  hb_language_t   language;
+} hb_segment_properties_t;
+
+

The structure that holds various text properties of an hb_buffer_t. Can be +set and retrieved using hb_buffer_set_segment_properties() and +hb_buffer_get_segment_properties(), respectively.

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + +

hb_direction_t direction;

the hb_direction_t of the buffer, see hb_buffer_set_direction().

 

hb_script_t script;

the hb_script_t of the buffer, see hb_buffer_set_script().

 

hb_language_t language;

the hb_language_t of the buffer, see hb_buffer_set_language().

 
+
+
+
+
+

enum hb_buffer_serialize_format_t

+

The buffer serialization and de-serialization format used in +hb_buffer_serialize_glyphs() and hb_buffer_deserialize_glyphs().

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + +

HB_BUFFER_SERIALIZE_FORMAT_TEXT

 +

a human-readable, plain text format.

+		 

HB_BUFFER_SERIALIZE_FORMAT_JSON

 +

a machine-readable JSON format.

+		 

HB_BUFFER_SERIALIZE_FORMAT_INVALID

 +

invalid format.

+		 
+
+

Since 0.9.2

+
+
+
+

enum hb_buffer_serialize_flags_t

+

Flags that control what glyph information are serialized in hb_buffer_serialize_glyphs().

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

HB_BUFFER_SERIALIZE_FLAG_DEFAULT

 +

serialize glyph names, clusters and positions.

+		 

HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS

 +

do not serialize glyph cluster.

+		 

HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS

 +

do not serialize glyph position information.

+		 

HB_BUFFER_SERIALIZE_FLAG_NO_GLYPH_NAMES

 +

do no serialize glyph name.

+		 

HB_BUFFER_SERIALIZE_FLAG_GLYPH_EXTENTS

 +

serialize glyph extents.

+		 
+
+

Since 0.9.20

+
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/harfbuzz-Shaping.html b/docs/html/harfbuzz-Shaping.html new file mode 100644 index 0000000..09d80ca --- /dev/null +++ b/docs/html/harfbuzz-Shaping.html @@ -0,0 +1,345 @@ + + + + +Shaping: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

Shaping

+

Shaping — Conversion of text strings into positioned glyphs

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + +
+hb_bool_t + +hb_feature_from_string () +
+void + +hb_feature_to_string () +
+void + +hb_shape () +
+hb_bool_t + +hb_shape_full () +
const char ** + +hb_shape_list_shapers () +
+
+
+

Types and Values

+
++++ + + + + +
 hb_feature_t
+
+
+

Object Hierarchy

+
    GBoxed
+    ╰── hb_feature_t
+
+
+
+

Includes

+
#include <hb.h>
+
+
+
+

Description

+

Shaping is the central operation of HarfBuzz. Shaping operates on buffers, +which are sequences of Unicode characters that use the same font and have +the same text direction, script and language. After shaping the buffer +contains the output glyphs and their positions.

+
+
+

Functions

+
+

hb_feature_from_string ()

+
hb_bool_t
+hb_feature_from_string (const char *str,
+                        int len,
+                        hb_feature_t *feature);
+

Parses a string into a hb_feature_t.

+

TODO: document the syntax here.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

str

a string to parse.

[array length=len][element-type uint8_t]

len

length of str +, or -1 if string is NULL terminated

 

feature

the hb_feature_t to initialize with the parsed values.

[out]
+
+
+

Returns

+

true if str +is successfully parsed, false otherwise.

+

+
+

Since 0.9.5

+
+
+
+

hb_feature_to_string ()

+
void
+hb_feature_to_string (hb_feature_t *feature,
+                      char *buf,
+                      unsigned int size);
+

Converts a hb_feature_t into a NULL-terminated string in the format +understood by hb_feature_from_string(). The client in responsible for +allocating big enough size for buf +, 128 bytes is more than enough.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

feature

an hb_feature_t to convert

 

buf

output string.

[array length=size][out]

size

the allocated size of buf +

 
+
+

Since 0.9.5

+
+
+
+

hb_shape ()

+
void
+hb_shape (hb_font_t *font,
+          hb_buffer_t *buffer,
+          const hb_feature_t *features,
+          unsigned int num_features);
+

Shapes buffer + using font + turning its Unicode characters content to +positioned glyphs. If features + is not NULL, it will be used to control the +features applied during shaping.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

font

an hb_font_t to use for shaping

 

buffer

an hb_buffer_t to shape

 

features

an array of user +specified hb_feature_t or NULL.

[array length=num_features][allow-none]

num_features

the length of features +array

 
+
+

Since 0.9.2

+
+
+
+

hb_shape_full ()

+
hb_bool_t
+hb_shape_full (hb_font_t *font,
+               hb_buffer_t *buffer,
+               const hb_feature_t *features,
+               unsigned int num_features,
+               const char * const *shaper_list);
+

See hb_shape() for details. If shaper_list + is not NULL, the specified +shapers will be used in the given order, otherwise the default shapers list +will be used.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

font

an hb_font_t to use for shaping

 

buffer

an hb_buffer_t to shape

 

features

an array of user +specified hb_feature_t or NULL.

[array length=num_features][allow-none]

num_features

the length of features +array

 

shaper_list

a NULL-terminated +array of shapers to use or NULL.

[array zero-terminated=1][allow-none]
+
+
+

Returns

+

false if all shapers failed, true otherwise

+

+
+

Since 0.9.2

+
+
+
+

hb_shape_list_shapers ()

+
const char **
+hb_shape_list_shapers (void);
+

Retrieves the list of shapers supported by HarfBuzz.

+
+

Returns

+

an array of +constant strings.

+

[transfer none][array zero-terminated=1]

+
+

Since 0.9.2

+
+
+
+

Types and Values

+
+

hb_feature_t

+
typedef struct {
+  hb_tag_t      tag;
+  uint32_t      value;
+  unsigned int  start;
+  unsigned int  end;
+} hb_feature_t;
+
+
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/harfbuzz-hb-blob.html b/docs/html/harfbuzz-hb-blob.html new file mode 100644 index 0000000..4e599d1 --- /dev/null +++ b/docs/html/harfbuzz-hb-blob.html @@ -0,0 +1,651 @@ + + + + +hb-blob: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

hb-blob

+

hb-blob

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+hb_blob_t * + +hb_blob_create () +
+hb_blob_t * + +hb_blob_create_sub_blob () +
+void + +hb_blob_destroy () +
const char * + +hb_blob_get_data () +
+char * + +hb_blob_get_data_writable () +
+hb_blob_t * + +hb_blob_get_empty () +
unsigned int + +hb_blob_get_length () +
+void * + +hb_blob_get_user_data () +
+hb_bool_t + +hb_blob_is_immutable () +
+void + +hb_blob_make_immutable () +
+hb_blob_t * + +hb_blob_reference () +
+hb_bool_t + +hb_blob_set_user_data () +
+
+
+

Types and Values

+
++++ + + + + + + + + + + +
typedefhb_blob_t
enumhb_memory_mode_t
+
+
+

Object Hierarchy

+
    GBoxed
+    ╰── hb_blob_t
+    GEnum
+    ╰── hb_memory_mode_t
+
+
+
+

Description

+
+
+

Functions

+
+

hb_blob_create ()

+
hb_blob_t *
+hb_blob_create (const char *data,
+                unsigned int length,
+                hb_memory_mode_t mode,
+                void *user_data,
+                hb_destroy_func_t destroy);
+

Creates a new "blob" object wrapping data +. The mode + parameter is used +to negotiate ownership and lifecycle of data +.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

data

Pointer to blob data.

 

length

Length of data +in bytes.

 

mode

Memory mode for data +.

 

user_data

Data parameter to pass to destroy +.

 

destroy

Callback to call when data +is not needed anymore.

 
+
+
+

Returns

+

New blob, or the empty blob if something failed or if length +is +zero. Destroy with hb_blob_destroy().

+

+
+

Since 0.9.2

+
+
+
+

hb_blob_create_sub_blob ()

+
hb_blob_t *
+hb_blob_create_sub_blob (hb_blob_t *parent,
+                         unsigned int offset,
+                         unsigned int length);
+

Returns a blob that represents a range of bytes in parent +. The new +blob is always created with HB_MEMORY_MODE_READONLY, meaning that it +will never modify data in the parent blob. The parent data is not +expected to be modified, and will result in undefined behavior if it +is.

+

Makes parent + immutable.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

parent

Parent blob.

 

offset

Start offset of sub-blob within parent +, in bytes.

 

length

Length of sub-blob.

 
+
+
+

Returns

+

New blob, or the empty blob if something failed or if +length +is zero or offset +is beyond the end of parent +'s data. Destroy +with hb_blob_destroy().

+

+
+

Since 0.9.2

+
+
+
+

hb_blob_destroy ()

+
void
+hb_blob_destroy (hb_blob_t *blob);
+

Descreases the reference count on blob +, and if it reaches zero, destroys +blob +, freeing all memory, possibly calling the destroy-callback the blob +was created for if it has not been called already.

+

See TODO:link object types for more information.

+
+

Parameters

+
+++++ + + + + + +

blob

a blob.

 
+
+

Since 0.9.2

+
+
+
+

hb_blob_get_data ()

+
const char *
+hb_blob_get_data (hb_blob_t *blob,
+                  unsigned int *length);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

blob

a blob.

 

length

.

[out]
+
+
+

Returns

+

.

+

[transfer none][array length=length]

+
+

Since 0.9.2

+
+
+
+

hb_blob_get_data_writable ()

+
char *
+hb_blob_get_data_writable (hb_blob_t *blob,
+                           unsigned int *length);
+

Tries to make blob data writable (possibly copying it) and +return pointer to data.

+

Fails if blob has been made immutable, or if memory allocation +fails.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

blob

a blob.

 

length

output length of the writable data.

[out]
+
+
+

Returns

+

Writable blob data, +or NULL if failed.

+

[transfer none][array length=length]

+
+

Since 0.9.2

+
+
+
+

hb_blob_get_empty ()

+
hb_blob_t *
+hb_blob_get_empty (void);
+

Returns the singleton empty blob.

+

See TODO:link object types for more information.

+
+

Returns

+

the empty blob.

+

[transfer full]

+
+

Since 0.9.2

+
+
+
+

hb_blob_get_length ()

+
unsigned int
+hb_blob_get_length (hb_blob_t *blob);
+
+

Parameters

+
+++++ + + + + + +

blob

a blob.

 
+
+
+

Returns

+

the length of blob data in bytes.

+

+
+

Since 0.9.2

+
+
+
+

hb_blob_get_user_data ()

+
void *
+hb_blob_get_user_data (hb_blob_t *blob,
+                       hb_user_data_key_t *key);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

blob

a blob.

 

key

key for data to get.

 
+
+
+

Returns

+

.

+

[transfer none]

+
+

Since 0.9.2

+
+
+
+

hb_blob_is_immutable ()

+
hb_bool_t
+hb_blob_is_immutable (hb_blob_t *blob);
+
+

Parameters

+
+++++ + + + + + +

blob

a blob.

 
+
+
+

Returns

+

TODO

+

+
+

Since 0.9.2

+
+
+
+

hb_blob_make_immutable ()

+
void
+hb_blob_make_immutable (hb_blob_t *blob);
+
+

Parameters

+
+++++ + + + + + +

blob

a blob.

 
+
+

Since 0.9.2

+
+
+
+

hb_blob_reference ()

+
hb_blob_t *
+hb_blob_reference (hb_blob_t *blob);
+

Increases the reference count on blob +.

+

See TODO:link object types for more information.

+
+

Parameters

+
+++++ + + + + + +

blob

a blob.

 
+
+
+

Returns

+

blob +.

+

+
+

Since 0.9.2

+
+
+
+

hb_blob_set_user_data ()

+
hb_bool_t
+hb_blob_set_user_data (hb_blob_t *blob,
+                       hb_user_data_key_t *key,
+                       void *data,
+                       hb_destroy_func_t destroy,
+                       hb_bool_t replace);
+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

blob

a blob.

 

key

key for data to set.

 

data

data to set.

 

destroy

callback to call when data +is not needed anymore.

 

replace

whether to replace an existing data with the same key.

 
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

Types and Values

+
+

hb_blob_t

+
typedef struct hb_blob_t hb_blob_t;
+
+
+
+
+

enum hb_memory_mode_t

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

HB_MEMORY_MODE_DUPLICATE

  

HB_MEMORY_MODE_READONLY

  

HB_MEMORY_MODE_WRITABLE

  

HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE

  
+
+
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/harfbuzz-hb-common.html b/docs/html/harfbuzz-hb-common.html new file mode 100644 index 0000000..d9d231f --- /dev/null +++ b/docs/html/harfbuzz-hb-common.html @@ -0,0 +1,1451 @@ + + + + +hb-common: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

hb-common

+

hb-common

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+hb_tag_t + +hb_tag_from_string () +
+void + +hb_tag_to_string () +
+hb_direction_t + +hb_direction_from_string () +
const char * + +hb_direction_to_string () +
+hb_script_t + +hb_script_from_iso15924_tag () +
+hb_script_t + +hb_script_from_string () +
+hb_tag_t + +hb_script_to_iso15924_tag () +
+hb_direction_t + +hb_script_get_horizontal_direction () +
+hb_language_t + +hb_language_from_string () +
const char * + +hb_language_to_string () +
+hb_language_t + +hb_language_get_default () +
+void + +(*hb_destroy_func_t) () +
#define +HB_TAG() +
#define +HB_UNTAG() +
#define +HB_DIRECTION_REVERSE() +
#define +HB_DIRECTION_IS_BACKWARD() +
#define +HB_DIRECTION_IS_FORWARD() +
#define +HB_DIRECTION_IS_HORIZONTAL() +
#define +HB_DIRECTION_IS_VALID() +
#define +HB_DIRECTION_IS_VERTICAL() +
#defineHB_LANGUAGE_INVALID
+
+
+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
typedefhb_bool_t
typedefhb_codepoint_t
enumhb_direction_t
typedefhb_language_t
typedefhb_mask_t
typedefhb_position_t
typedefhb_tag_t
enumhb_script_t
 hb_user_data_key_t
 hb_var_int_t
#defineHB_TAG_NONE
#defineHB_TAG_MAX
#defineHB_TAG_MAX_SIGNED
+
+
+

Object Hierarchy

+
    GBoxed
+    ╰── hb_user_data_key_t
+    GEnum
+    ├── hb_direction_t
+    ╰── hb_script_t
+
+
+
+

Description

+
+
+

Functions

+
+

hb_tag_from_string ()

+
hb_tag_t
+hb_tag_from_string (const char *str,
+                    int len);
+
+

Parameters

+
+++++ + + + + + +

str

.

[array length=len][element-type uint8_t]
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_tag_to_string ()

+
void
+hb_tag_to_string (hb_tag_t tag,
+                  char *buf);
+
+

Parameters

+
+++++ + + + + + +

buf

.

[out caller-allocates][array fixed-size=4][element-type uint8_t]
+
+

Since 0.9.5

+
+
+
+

hb_direction_from_string ()

+
hb_direction_t
+hb_direction_from_string (const char *str,
+                          int len);
+
+

Parameters

+
+++++ + + + + + +

str

.

[array length=len][element-type uint8_t]
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_direction_to_string ()

+
const char *
+hb_direction_to_string (hb_direction_t direction);
+
+

Returns

+

.

+

[transfer none]

+
+

Since 0.9.2

+
+
+
+

hb_script_from_iso15924_tag ()

+
hb_script_t
+hb_script_from_iso15924_tag (hb_tag_t tag);
+

Converts an ISO 15924 script tag to a corresponding hb_script_t.

+
+

Parameters

+
+++++ + + + + + +

tag

an hb_tag_t representing an ISO 15924 tag.

 
+
+
+

Returns

+

An hb_script_t corresponding to the ISO 15924 tag.

+

+
+

Since 0.9.2

+
+
+
+

hb_script_from_string ()

+
hb_script_t
+hb_script_from_string (const char *str,
+                       int len);
+

Converts a string str + representing an ISO 15924 script tag to a +corresponding hb_script_t. Shorthand for hb_tag_from_string() then +hb_script_from_iso15924_tag().

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

str

a string representing an +ISO 15924 tag.

[array length=len][element-type uint8_t]

len

length of the str +, or -1 if it is NULL-terminated.

 
+
+
+

Returns

+

An hb_script_t corresponding to the ISO 15924 tag.

+

+
+

Since 0.9.2

+
+
+
+

hb_script_to_iso15924_tag ()

+
hb_tag_t
+hb_script_to_iso15924_tag (hb_script_t script);
+

See hb_script_from_iso15924_tag().

+
+

Parameters

+
+++++ + + + + + +

script

an hb_script_ to convert.

 
+
+
+

Returns

+

An hb_tag_t representing an ISO 15924 script tag.

+

+
+

Since 0.9.2

+
+
+
+

hb_script_get_horizontal_direction ()

+
hb_direction_t
+hb_script_get_horizontal_direction (hb_script_t script);
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_language_from_string ()

+
hb_language_t
+hb_language_from_string (const char *str,
+                         int len);
+

Converts str + representing an ISO 639 language code to the corresponding +hb_language_t.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

str

a string representing +ISO 639 language code.

[array length=len][element-type uint8_t]

len

length of the str +, or -1 if it is NULL-terminated.

 
+
+
+

Returns

+

The hb_language_t corresponding to the ISO 639 language code.

+

[transfer none]

+
+

Since 0.9.2

+
+
+
+

hb_language_to_string ()

+
const char *
+hb_language_to_string (hb_language_t language);
+

See hb_language_from_string().

+
+

Parameters

+
+++++ + + + + + +

language

an hb_language_t to convert.

 
+
+
+

Returns

+

A NULL-terminated string representing the language +. Must not be freed by +the caller.

+

[transfer none]

+
+

Since 0.9.2

+
+
+
+

hb_language_get_default ()

+
hb_language_t
+hb_language_get_default (void);
+
+

Returns

+

.

+

[transfer none]

+
+

Since 0.9.2

+
+
+
+

hb_destroy_func_t ()

+
void
+(*hb_destroy_func_t) (void *user_data);
+
+
+
+

HB_TAG()

+
#define HB_TAG(c1,c2,c3,c4) ((hb_tag_t)((((uint8_t)(c1))<<24)|(((uint8_t)(c2))<<16)|(((uint8_t)(c3))<<8)|((uint8_t)(c4))))
+
+
+
+
+

HB_UNTAG()

+
#define HB_UNTAG(tag)   ((uint8_t)((tag)>>24)), ((uint8_t)((tag)>>16)), ((uint8_t)((tag)>>8)), ((uint8_t)(tag))
+
+
+
+
+

HB_DIRECTION_REVERSE()

+
#define HB_DIRECTION_REVERSE(dir) ((hb_direction_t) (((unsigned int) (dir)) ^ 1))
+
+
+
+
+

HB_DIRECTION_IS_BACKWARD()

+
#define HB_DIRECTION_IS_BACKWARD(dir) ((((unsigned int) (dir)) & ~2U) == 5)
+
+
+
+
+

HB_DIRECTION_IS_FORWARD()

+
#define HB_DIRECTION_IS_FORWARD(dir) ((((unsigned int) (dir)) & ~2U) == 4)
+
+
+
+
+

HB_DIRECTION_IS_HORIZONTAL()

+
#define HB_DIRECTION_IS_HORIZONTAL(dir) ((((unsigned int) (dir)) & ~1U) == 4)
+
+
+
+
+

HB_DIRECTION_IS_VALID()

+
#define HB_DIRECTION_IS_VALID(dir) ((((unsigned int) (dir)) & ~3U) == 4)
+
+
+
+
+

HB_DIRECTION_IS_VERTICAL()

+
#define HB_DIRECTION_IS_VERTICAL(dir) ((((unsigned int) (dir)) & ~1U) == 6)
+
+
+
+
+

HB_LANGUAGE_INVALID

+
#define HB_LANGUAGE_INVALID ((hb_language_t) NULL)
+
+
+
+
+

Types and Values

+
+

hb_bool_t

+
typedef int hb_bool_t;
+
+
+
+
+

hb_codepoint_t

+
typedef uint32_t hb_codepoint_t;
+
+
+
+
+

enum hb_direction_t

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

HB_DIRECTION_INVALID

 +

Initial, unset direction.

+		 

HB_DIRECTION_LTR

 +

Text is set horizontally from left to right.

+		 

HB_DIRECTION_RTL

 +

Text is set horizontally from right to left.

+		 

HB_DIRECTION_TTB

 +

Text is set vertically from top to bottom.

+		 

HB_DIRECTION_BTT

 +

Text is set vertically from bottom to top.

+		 
+
+
+
+
+

hb_language_t

+
typedef const struct hb_language_impl_t *hb_language_t;
+
+
+
+
+

hb_mask_t

+
typedef uint32_t hb_mask_t;
+
+
+
+
+

hb_position_t

+
typedef int32_t hb_position_t;
+
+
+
+
+

hb_tag_t

+
typedef uint32_t hb_tag_t;
+
+
+
+
+

enum hb_script_t

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

HB_SCRIPT_COMMON

  

HB_SCRIPT_INHERITED

  

HB_SCRIPT_UNKNOWN

  

HB_SCRIPT_ARABIC

  

HB_SCRIPT_ARMENIAN

  

HB_SCRIPT_BENGALI

  

HB_SCRIPT_CYRILLIC

  

HB_SCRIPT_DEVANAGARI

  

HB_SCRIPT_GEORGIAN

  

HB_SCRIPT_GREEK

  

HB_SCRIPT_GUJARATI

  

HB_SCRIPT_GURMUKHI

  

HB_SCRIPT_HANGUL

  

HB_SCRIPT_HAN

  

HB_SCRIPT_HEBREW

  

HB_SCRIPT_HIRAGANA

  

HB_SCRIPT_KANNADA

  

HB_SCRIPT_KATAKANA

  

HB_SCRIPT_LAO

  

HB_SCRIPT_LATIN

  

HB_SCRIPT_MALAYALAM

  

HB_SCRIPT_ORIYA

  

HB_SCRIPT_TAMIL

  

HB_SCRIPT_TELUGU

  

HB_SCRIPT_THAI

  

HB_SCRIPT_TIBETAN

  

HB_SCRIPT_BOPOMOFO

  

HB_SCRIPT_BRAILLE

  

HB_SCRIPT_CANADIAN_SYLLABICS

  

HB_SCRIPT_CHEROKEE

  

HB_SCRIPT_ETHIOPIC

  

HB_SCRIPT_KHMER

  

HB_SCRIPT_MONGOLIAN

  

HB_SCRIPT_MYANMAR

  

HB_SCRIPT_OGHAM

  

HB_SCRIPT_RUNIC

  

HB_SCRIPT_SINHALA

  

HB_SCRIPT_SYRIAC

  

HB_SCRIPT_THAANA

  

HB_SCRIPT_YI

  

HB_SCRIPT_DESERET

  

HB_SCRIPT_GOTHIC

  

HB_SCRIPT_OLD_ITALIC

  

HB_SCRIPT_BUHID

  

HB_SCRIPT_HANUNOO

  

HB_SCRIPT_TAGALOG

  

HB_SCRIPT_TAGBANWA

  

HB_SCRIPT_CYPRIOT

  

HB_SCRIPT_LIMBU

  

HB_SCRIPT_LINEAR_B

  

HB_SCRIPT_OSMANYA

  

HB_SCRIPT_SHAVIAN

  

HB_SCRIPT_TAI_LE

  

HB_SCRIPT_UGARITIC

  

HB_SCRIPT_BUGINESE

  

HB_SCRIPT_COPTIC

  

HB_SCRIPT_GLAGOLITIC

  

HB_SCRIPT_KHAROSHTHI

  

HB_SCRIPT_NEW_TAI_LUE

  

HB_SCRIPT_OLD_PERSIAN

  

HB_SCRIPT_SYLOTI_NAGRI

  

HB_SCRIPT_TIFINAGH

  

HB_SCRIPT_BALINESE

  

HB_SCRIPT_CUNEIFORM

  

HB_SCRIPT_NKO

  

HB_SCRIPT_PHAGS_PA

  

HB_SCRIPT_PHOENICIAN

  

HB_SCRIPT_CARIAN

  

HB_SCRIPT_CHAM

  

HB_SCRIPT_KAYAH_LI

  

HB_SCRIPT_LEPCHA

  

HB_SCRIPT_LYCIAN

  

HB_SCRIPT_LYDIAN

  

HB_SCRIPT_OL_CHIKI

  

HB_SCRIPT_REJANG

  

HB_SCRIPT_SAURASHTRA

  

HB_SCRIPT_SUNDANESE

  

HB_SCRIPT_VAI

  

HB_SCRIPT_AVESTAN

  

HB_SCRIPT_BAMUM

  

HB_SCRIPT_EGYPTIAN_HIEROGLYPHS

  

HB_SCRIPT_IMPERIAL_ARAMAIC

  

HB_SCRIPT_INSCRIPTIONAL_PAHLAVI

  

HB_SCRIPT_INSCRIPTIONAL_PARTHIAN

  

HB_SCRIPT_JAVANESE

  

HB_SCRIPT_KAITHI

  

HB_SCRIPT_LISU

  

HB_SCRIPT_MEETEI_MAYEK

  

HB_SCRIPT_OLD_SOUTH_ARABIAN

  

HB_SCRIPT_OLD_TURKIC

  

HB_SCRIPT_SAMARITAN

  

HB_SCRIPT_TAI_THAM

  

HB_SCRIPT_TAI_VIET

  

HB_SCRIPT_BATAK

  

HB_SCRIPT_BRAHMI

  

HB_SCRIPT_MANDAIC

  

HB_SCRIPT_CHAKMA

  

HB_SCRIPT_MEROITIC_CURSIVE

  

HB_SCRIPT_MEROITIC_HIEROGLYPHS

  

HB_SCRIPT_MIAO

  

HB_SCRIPT_SHARADA

  

HB_SCRIPT_SORA_SOMPENG

  

HB_SCRIPT_TAKRI

  

HB_SCRIPT_BASSA_VAH

  

HB_SCRIPT_CAUCASIAN_ALBANIAN

  

HB_SCRIPT_DUPLOYAN

  

HB_SCRIPT_ELBASAN

  

HB_SCRIPT_GRANTHA

  

HB_SCRIPT_KHOJKI

  

HB_SCRIPT_KHUDAWADI

  

HB_SCRIPT_LINEAR_A

  

HB_SCRIPT_MAHAJANI

  

HB_SCRIPT_MANICHAEAN

  

HB_SCRIPT_MENDE_KIKAKUI

  

HB_SCRIPT_MODI

  

HB_SCRIPT_MRO

  

HB_SCRIPT_NABATAEAN

  

HB_SCRIPT_OLD_NORTH_ARABIAN

  

HB_SCRIPT_OLD_PERMIC

  

HB_SCRIPT_PAHAWH_HMONG

  

HB_SCRIPT_PALMYRENE

  

HB_SCRIPT_PAU_CIN_HAU

  

HB_SCRIPT_PSALTER_PAHLAVI

  

HB_SCRIPT_SIDDHAM

  

HB_SCRIPT_TIRHUTA

  

HB_SCRIPT_WARANG_CITI

  

HB_SCRIPT_AHOM

  

HB_SCRIPT_ANATOLIAN_HIEROGLYPHS

  

HB_SCRIPT_HATRAN

  

HB_SCRIPT_MULTANI

  

HB_SCRIPT_OLD_HUNGARIAN

  

HB_SCRIPT_SIGNWRITING

  

HB_SCRIPT_ADLAM

  

HB_SCRIPT_BHAIKSUKI

  

HB_SCRIPT_MARCHEN

  

HB_SCRIPT_OSAGE

  

HB_SCRIPT_TANGUT

  

HB_SCRIPT_NEWA

  

HB_SCRIPT_INVALID

  

_HB_SCRIPT_MAX_VALUE

  

_HB_SCRIPT_MAX_VALUE_SIGNED

  
+
+
+
+
+

hb_user_data_key_t

+
typedef struct {
+} hb_user_data_key_t;
+
+
+
+
+

hb_var_int_t

+
+
+
+

HB_TAG_NONE

+
#define HB_TAG_NONE HB_TAG(0,0,0,0)
+
+
+
+
+

HB_TAG_MAX

+
#define HB_TAG_MAX HB_TAG(0xff,0xff,0xff,0xff)
+
+
+
+
+

HB_TAG_MAX_SIGNED

+
#define HB_TAG_MAX_SIGNED HB_TAG(0x7f,0xff,0xff,0xff)
+
+
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/harfbuzz-hb-coretext.html b/docs/html/harfbuzz-hb-coretext.html new file mode 100644 index 0000000..b6cbf19 --- /dev/null +++ b/docs/html/harfbuzz-hb-coretext.html @@ -0,0 +1,135 @@ + + + + +hb-coretext: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

hb-coretext

+

hb-coretext

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + +
+hb_face_t * + +hb_coretext_face_create () +
+CGFontRef + +hb_coretext_face_get_cg_font () +
+CTFontRef + +hb_coretext_font_get_ct_font () +
+
+
+

Types and Values

+
++++ + + + + + + + + + + +
#defineHB_CORETEXT_TAG_MORT
#defineHB_CORETEXT_TAG_MORX
+
+
+

Object Hierarchy

+
+
+
+
+

Description

+
+
+

Functions

+
+

hb_coretext_face_create ()

+
hb_face_t *
+hb_coretext_face_create (CGFontRef cg_font);
+
+
+
+

hb_coretext_face_get_cg_font ()

+
CGFontRef
+hb_coretext_face_get_cg_font (hb_face_t *face);
+
+
+
+

hb_coretext_font_get_ct_font ()

+
CTFontRef
+hb_coretext_font_get_ct_font (hb_font_t *font);
+
+
+
+

Types and Values

+
+

HB_CORETEXT_TAG_MORT

+
#define HB_CORETEXT_TAG_MORT HB_TAG('m','o','r','t')
+
+
+
+
+

HB_CORETEXT_TAG_MORX

+
#define HB_CORETEXT_TAG_MORX HB_TAG('m','o','r','x')
+
+
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/harfbuzz-hb-deprecated.html b/docs/html/harfbuzz-hb-deprecated.html new file mode 100644 index 0000000..3c85f88 --- /dev/null +++ b/docs/html/harfbuzz-hb-deprecated.html @@ -0,0 +1,169 @@ + + + + +hb-deprecated: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

hb-deprecated

+

hb-deprecated

+
+
+

Functions

+
++++ + + + + + + + + + + +
+void + +hb_font_funcs_set_glyph_func () +
+hb_bool_t + +(*hb_font_get_glyph_func_t) () +
+
+
+

Types and Values

+
++++ + + + + + + + + + + + + + + +
#defineHB_BUFFER_FLAGS_DEFAULT
#defineHB_BUFFER_SERIALIZE_FLAGS_DEFAULT
#defineHB_SCRIPT_CANADIAN_ABORIGINAL
+
+
+

Object Hierarchy

+
+
+
+
+

Description

+
+
+

Functions

+
+

hb_font_funcs_set_glyph_func ()

+
void
+hb_font_funcs_set_glyph_func (hb_font_funcs_t *ffuncs,
+                              hb_font_get_glyph_func_t func,
+                              void *user_data,
+                              hb_destroy_func_t destroy);
+

hb_font_funcs_set_glyph_func has been deprecated since version 1.2.3 and should not be used in newly-written code.

+

Deprecated. Use hb_font_funcs_set_nominal_glyph_func() and +hb_font_funcs_set_variation_glyph_func() instead.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

ffuncs

font functions.

 

func

.

[closure user_data][destroy destroy][scope notified]
+
+

Since 0.9.2

+
+
+
+

hb_font_get_glyph_func_t ()

+
hb_bool_t
+(*hb_font_get_glyph_func_t) (hb_font_t *font,
+                             void *font_data,
+                             hb_codepoint_t unicode,
+                             hb_codepoint_t variation_selector,
+                             hb_codepoint_t *glyph,
+                             void *user_data);
+

hb_font_get_glyph_func_t is deprecated and should not be used in newly-written code.

+
+
+
+

Types and Values

+
+

HB_BUFFER_FLAGS_DEFAULT

+
#define HB_BUFFER_FLAGS_DEFAULT			HB_BUFFER_FLAG_DEFAULT
+
+

HB_BUFFER_FLAGS_DEFAULT is deprecated and should not be used in newly-written code.

+
+
+
+

HB_BUFFER_SERIALIZE_FLAGS_DEFAULT

+
#define HB_BUFFER_SERIALIZE_FLAGS_DEFAULT HB_BUFFER_SERIALIZE_FLAG_DEFAULT
+
+

HB_BUFFER_SERIALIZE_FLAGS_DEFAULT is deprecated and should not be used in newly-written code.

+
+
+
+

HB_SCRIPT_CANADIAN_ABORIGINAL

+
#define HB_SCRIPT_CANADIAN_ABORIGINAL		HB_SCRIPT_CANADIAN_SYLLABICS
+
+

HB_SCRIPT_CANADIAN_ABORIGINAL is deprecated and should not be used in newly-written code.

+
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/harfbuzz-hb-face.html b/docs/html/harfbuzz-hb-face.html new file mode 100644 index 0000000..2902121 --- /dev/null +++ b/docs/html/harfbuzz-hb-face.html @@ -0,0 +1,619 @@ + + + + +hb-face: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

hb-face

+

hb-face

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+hb_face_t * + +hb_face_create () +
+hb_face_t * + +hb_face_create_for_tables () +
+void + +hb_face_destroy () +
+hb_face_t * + +hb_face_get_empty () +
unsigned int + +hb_face_get_glyph_count () +
unsigned int + +hb_face_get_index () +
unsigned int + +hb_face_get_upem () +
+void * + +hb_face_get_user_data () +
+hb_bool_t + +hb_face_is_immutable () +
+void + +hb_face_make_immutable () +
+hb_face_t * + +hb_face_reference () +
+hb_blob_t * + +hb_face_reference_blob () +
+hb_blob_t * + +hb_face_reference_table () +
+void + +hb_face_set_glyph_count () +
+void + +hb_face_set_index () +
+void + +hb_face_set_upem () +
+hb_bool_t + +hb_face_set_user_data () +
+
+
+

Types and Values

+
++++ + + + + +
typedefhb_face_t
+
+
+

Object Hierarchy

+
    GBoxed
+    ╰── hb_face_t
+
+
+
+

Description

+
+
+

Functions

+
+

hb_face_create ()

+
hb_face_t *
+hb_face_create (hb_blob_t *blob,
+                unsigned int index);
+
+
+
+

hb_face_create_for_tables ()

+
hb_face_t *
+hb_face_create_for_tables (hb_reference_table_func_t reference_table_func,
+                           void *user_data,
+                           hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + +

reference_table_func

.

[closure user_data][destroy destroy][scope notified]
+
+
+

Returns

+

(transfer full)

+

+
+

Since 0.9.2

+
+
+
+

hb_face_destroy ()

+
void
+hb_face_destroy (hb_face_t *face);
+
+

Parameters

+
+++++ + + + + + +

face

a face.

 
+
+

Since 0.9.2

+
+
+
+

hb_face_get_empty ()

+
hb_face_t *
+hb_face_get_empty (void);
+
+

Returns

+

(transfer full)

+

+
+

Since 0.9.2

+
+
+
+

hb_face_get_glyph_count ()

+
unsigned int
+hb_face_get_glyph_count (hb_face_t *face);
+
+

Parameters

+
+++++ + + + + + +

face

a face.

 
+
+
+

Returns

+

+
+

Since 0.9.7

+
+
+
+

hb_face_get_index ()

+
unsigned int
+hb_face_get_index (hb_face_t *face);
+
+

Parameters

+
+++++ + + + + + +

face

a face.

 
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_face_get_upem ()

+
unsigned int
+hb_face_get_upem (hb_face_t *face);
+
+

Parameters

+
+++++ + + + + + +

face

a face.

 
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_face_get_user_data ()

+
void *
+hb_face_get_user_data (hb_face_t *face,
+                       hb_user_data_key_t *key);
+
+

Parameters

+
+++++ + + + + + +

face

a face.

 
+
+
+

Returns

+

.

+

[transfer none]

+
+

Since 0.9.2

+
+
+
+

hb_face_is_immutable ()

+
hb_bool_t
+hb_face_is_immutable (hb_face_t *face);
+
+

Parameters

+
+++++ + + + + + +

face

a face.

 
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_face_make_immutable ()

+
void
+hb_face_make_immutable (hb_face_t *face);
+
+

Parameters

+
+++++ + + + + + +

face

a face.

 
+
+

Since 0.9.2

+
+
+
+

hb_face_reference ()

+
hb_face_t *
+hb_face_reference (hb_face_t *face);
+
+

Parameters

+
+++++ + + + + + +

face

a face.

 
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_face_reference_blob ()

+
hb_blob_t *
+hb_face_reference_blob (hb_face_t *face);
+
+

Parameters

+
+++++ + + + + + +

face

a face.

 
+
+
+

Returns

+

.

+

[transfer full]

+
+

Since 0.9.2

+
+
+
+

hb_face_reference_table ()

+
hb_blob_t *
+hb_face_reference_table (hb_face_t *face,
+                         hb_tag_t tag);
+
+

Parameters

+
+++++ + + + + + +

face

a face.

 
+
+
+

Returns

+

.

+

[transfer full]

+
+

Since 0.9.2

+
+
+
+

hb_face_set_glyph_count ()

+
void
+hb_face_set_glyph_count (hb_face_t *face,
+                         unsigned int glyph_count);
+
+

Parameters

+
+++++ + + + + + +

face

a face.

 
+
+

Since 0.9.7

+
+
+
+

hb_face_set_index ()

+
void
+hb_face_set_index (hb_face_t *face,
+                   unsigned int index);
+
+

Parameters

+
+++++ + + + + + +

face

a face.

 
+
+

Since 0.9.2

+
+
+
+

hb_face_set_upem ()

+
void
+hb_face_set_upem (hb_face_t *face,
+                  unsigned int upem);
+
+

Parameters

+
+++++ + + + + + +

face

a face.

 
+
+

Since 0.9.2

+
+
+
+

hb_face_set_user_data ()

+
hb_bool_t
+hb_face_set_user_data (hb_face_t *face,
+                       hb_user_data_key_t *key,
+                       void *data,
+                       hb_destroy_func_t destroy,
+                       hb_bool_t replace);
+
+

Parameters

+
+++++ + + + + + +

face

a face.

 
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

Types and Values

+
+

hb_face_t

+
typedef struct hb_face_t hb_face_t;
+
+
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/harfbuzz-hb-font.html b/docs/html/harfbuzz-hb-font.html new file mode 100644 index 0000000..f69faa5 --- /dev/null +++ b/docs/html/harfbuzz-hb-font.html @@ -0,0 +1,2999 @@ + + + + +hb-font: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

hb-font

+

hb-font

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+void + +hb_font_add_glyph_origin_for_direction () +
+hb_font_t * + +hb_font_create () +
+hb_font_t * + +hb_font_create_sub_font () +
+void + +hb_font_destroy () +
+hb_font_funcs_t * + +hb_font_funcs_create () +
+void + +hb_font_funcs_destroy () +
+hb_font_funcs_t * + +hb_font_funcs_get_empty () +
+void * + +hb_font_funcs_get_user_data () +
+hb_bool_t + +hb_font_funcs_is_immutable () +
+void + +hb_font_funcs_make_immutable () +
+hb_font_funcs_t * + +hb_font_funcs_reference () +
+void + +hb_font_funcs_set_glyph_contour_point_func () +
+void + +hb_font_funcs_set_glyph_extents_func () +
+void + +hb_font_funcs_set_glyph_from_name_func () +
+void + +hb_font_funcs_set_glyph_h_advance_func () +
+void + +hb_font_funcs_set_glyph_h_kerning_func () +
+void + +hb_font_funcs_set_glyph_h_origin_func () +
+void + +hb_font_funcs_set_glyph_name_func () +
+void + +hb_font_funcs_set_glyph_v_advance_func () +
+void + +hb_font_funcs_set_glyph_v_kerning_func () +
+void + +hb_font_funcs_set_glyph_v_origin_func () +
+void + +hb_font_funcs_set_nominal_glyph_func () +
+hb_bool_t + +hb_font_funcs_set_user_data () +
+void + +hb_font_funcs_set_variation_glyph_func () +
+hb_font_t * + +hb_font_get_empty () +
+hb_face_t * + +hb_font_get_face () +
+hb_bool_t + +hb_font_get_glyph () +
+void + +hb_font_get_glyph_advance_for_direction () +
+hb_position_t + +(*hb_font_get_glyph_advance_func_t) () +
+hb_bool_t + +hb_font_get_glyph_contour_point () +
+hb_bool_t + +hb_font_get_glyph_contour_point_for_origin () +
+hb_bool_t + +(*hb_font_get_glyph_contour_point_func_t) () +
+hb_bool_t + +hb_font_get_glyph_extents () +
+hb_bool_t + +hb_font_get_glyph_extents_for_origin () +
+hb_bool_t + +(*hb_font_get_glyph_extents_func_t) () +
+hb_bool_t + +hb_font_get_glyph_from_name () +
+hb_bool_t + +(*hb_font_get_glyph_from_name_func_t) () +
+hb_position_t + +hb_font_get_glyph_h_advance () +
+hb_position_t + +hb_font_get_glyph_h_kerning () +
+hb_bool_t + +hb_font_get_glyph_h_origin () +
+void + +hb_font_get_glyph_kerning_for_direction () +
+hb_position_t + +(*hb_font_get_glyph_kerning_func_t) () +
+hb_bool_t + +hb_font_get_glyph_name () +
+hb_bool_t + +(*hb_font_get_glyph_name_func_t) () +
+void + +hb_font_get_glyph_origin_for_direction () +
+hb_bool_t + +(*hb_font_get_glyph_origin_func_t) () +
+hb_position_t + +hb_font_get_glyph_v_advance () +
+hb_position_t + +hb_font_get_glyph_v_kerning () +
+hb_bool_t + +hb_font_get_glyph_v_origin () +
+hb_bool_t + +hb_font_get_nominal_glyph () +
+hb_bool_t + +(*hb_font_get_nominal_glyph_func_t) () +
+hb_font_t * + +hb_font_get_parent () +
+void + +hb_font_get_ppem () +
+void + +hb_font_get_scale () +
+void * + +hb_font_get_user_data () +
+hb_bool_t + +hb_font_get_variation_glyph () +
+hb_bool_t + +(*hb_font_get_variation_glyph_func_t) () +
const int * + +hb_font_get_var_coords_normalized () +
+hb_bool_t + +hb_font_glyph_from_string () +
+void + +hb_font_glyph_to_string () +
+hb_bool_t + +hb_font_is_immutable () +
+void + +hb_font_make_immutable () +
+hb_font_t * + +hb_font_reference () +
+void + +hb_font_set_funcs () +
+void + +hb_font_set_funcs_data () +
+void + +hb_font_set_parent () +
+void + +hb_font_set_ppem () +
+void + +hb_font_set_scale () +
+hb_bool_t + +hb_font_set_user_data () +
+hb_bool_t + +hb_variation_from_string () +
+void + +hb_variation_to_string () +
+void + +hb_font_set_variations () +
+void + +hb_font_set_var_coords_design () +
+void + +hb_font_set_var_coords_normalized () +
+void + +hb_font_subtract_glyph_origin_for_direction () +
+hb_blob_t * + +(*hb_reference_table_func_t) () +
+void + +hb_font_funcs_set_font_h_extents_func () +
+void + +hb_font_funcs_set_font_v_extents_func () +
+void + +hb_font_get_extents_for_direction () +
+hb_bool_t + +(*hb_font_get_font_extents_func_t) () +
+hb_bool_t + +hb_font_get_h_extents () +
+hb_bool_t + +hb_font_get_v_extents () +
+
+
+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
typedefhb_font_funcs_t
typedefhb_font_get_glyph_h_advance_func_t
typedefhb_font_get_glyph_h_kerning_func_t
typedefhb_font_get_glyph_h_origin_func_t
typedefhb_font_get_glyph_v_advance_func_t
typedefhb_font_get_glyph_v_kerning_func_t
typedefhb_font_get_glyph_v_origin_func_t
 hb_variation_t
typedefhb_font_t
typedefhb_font_get_font_h_extents_func_t
typedefhb_font_get_font_v_extents_func_t
+
+
+

Object Hierarchy

+
    GBoxed
+    ├── hb_font_funcs_t
+    ╰── hb_font_t
+
+
+
+

Description

+
+
+

Functions

+
+

hb_font_add_glyph_origin_for_direction ()

+
void
+hb_font_add_glyph_origin_for_direction
+                               (hb_font_t *font,
+                                hb_codepoint_t glyph,
+                                hb_direction_t direction,
+                                hb_position_t *x,
+                                hb_position_t *y);
+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

font

a font.

 

x

.

[out]

y

.

[out]
+
+

Since 0.9.2

+
+
+
+

hb_font_create ()

+
hb_font_t *
+hb_font_create (hb_face_t *face);
+
+
+
+

hb_font_create_sub_font ()

+
hb_font_t *
+hb_font_create_sub_font (hb_font_t *parent);
+
+

Parameters

+
+++++ + + + + + +

parent

parent font.

 
+
+
+

Returns

+

.

+

[transfer full]

+
+

Since 0.9.2

+
+
+
+

hb_font_destroy ()

+
void
+hb_font_destroy (hb_font_t *font);
+
+

Parameters

+
+++++ + + + + + +

font

a font.

 
+
+

Since 0.9.2

+
+
+
+

hb_font_funcs_create ()

+
hb_font_funcs_t *
+hb_font_funcs_create (void);
+
+
+
+

hb_font_funcs_destroy ()

+
void
+hb_font_funcs_destroy (hb_font_funcs_t *ffuncs);
+
+

Parameters

+
+++++ + + + + + +

ffuncs

font functions.

 
+
+

Since 0.9.2

+
+
+
+

hb_font_funcs_get_empty ()

+
hb_font_funcs_t *
+hb_font_funcs_get_empty (void);
+
+

Returns

+

.

+

[transfer full]

+
+

Since 0.9.2

+
+
+
+

hb_font_funcs_get_user_data ()

+
void *
+hb_font_funcs_get_user_data (hb_font_funcs_t *ffuncs,
+                             hb_user_data_key_t *key);
+
+

Parameters

+
+++++ + + + + + +

ffuncs

font functions.

 
+
+
+

Returns

+

.

+

[transfer none]

+
+

Since 0.9.2

+
+
+
+

hb_font_funcs_is_immutable ()

+
hb_bool_t
+hb_font_funcs_is_immutable (hb_font_funcs_t *ffuncs);
+
+

Parameters

+
+++++ + + + + + +

ffuncs

font functions.

 
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_font_funcs_make_immutable ()

+
void
+hb_font_funcs_make_immutable (hb_font_funcs_t *ffuncs);
+
+

Parameters

+
+++++ + + + + + +

ffuncs

font functions.

 
+
+

Since 0.9.2

+
+
+
+

hb_font_funcs_reference ()

+
hb_font_funcs_t *
+hb_font_funcs_reference (hb_font_funcs_t *ffuncs);
+
+

Parameters

+
+++++ + + + + + +

ffuncs

font functions.

 
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_font_funcs_set_glyph_contour_point_func ()

+
void
+hb_font_funcs_set_glyph_contour_point_func
+                               (hb_font_funcs_t *ffuncs,
+                                hb_font_get_glyph_contour_point_func_t func,
+                                void *user_data,
+                                hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

ffuncs

font functions.

 

func

.

[closure user_data][destroy destroy][scope notified]
+
+

Since 0.9.2

+
+
+
+

hb_font_funcs_set_glyph_extents_func ()

+
void
+hb_font_funcs_set_glyph_extents_func (hb_font_funcs_t *ffuncs,
+                                      hb_font_get_glyph_extents_func_t func,
+                                      void *user_data,
+                                      hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

ffuncs

font functions.

 

func

.

[closure user_data][destroy destroy][scope notified]
+
+

Since 0.9.2

+
+
+
+

hb_font_funcs_set_glyph_from_name_func ()

+
void
+hb_font_funcs_set_glyph_from_name_func
+                               (hb_font_funcs_t *ffuncs,
+                                hb_font_get_glyph_from_name_func_t func,
+                                void *user_data,
+                                hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

ffuncs

font functions.

 

func

.

[closure user_data][destroy destroy][scope notified]
+
+

Since 0.9.2

+
+
+
+

hb_font_funcs_set_glyph_h_advance_func ()

+
void
+hb_font_funcs_set_glyph_h_advance_func
+                               (hb_font_funcs_t *ffuncs,
+                                hb_font_get_glyph_h_advance_func_t func,
+                                void *user_data,
+                                hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

ffuncs

font functions.

 

func

.

[closure user_data][destroy destroy][scope notified]
+
+

Since 0.9.2

+
+
+
+

hb_font_funcs_set_glyph_h_kerning_func ()

+
void
+hb_font_funcs_set_glyph_h_kerning_func
+                               (hb_font_funcs_t *ffuncs,
+                                hb_font_get_glyph_h_kerning_func_t func,
+                                void *user_data,
+                                hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

ffuncs

font functions.

 

func

.

[closure user_data][destroy destroy][scope notified]
+
+

Since 0.9.2

+
+
+
+

hb_font_funcs_set_glyph_h_origin_func ()

+
void
+hb_font_funcs_set_glyph_h_origin_func (hb_font_funcs_t *ffuncs,
+                                       hb_font_get_glyph_h_origin_func_t func,
+                                       void *user_data,
+                                       hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

ffuncs

font functions.

 

func

.

[closure user_data][destroy destroy][scope notified]
+
+

Since 0.9.2

+
+
+
+

hb_font_funcs_set_glyph_name_func ()

+
void
+hb_font_funcs_set_glyph_name_func (hb_font_funcs_t *ffuncs,
+                                   hb_font_get_glyph_name_func_t func,
+                                   void *user_data,
+                                   hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

ffuncs

font functions.

 

func

.

[closure user_data][destroy destroy][scope notified]
+
+

Since 0.9.2

+
+
+
+

hb_font_funcs_set_glyph_v_advance_func ()

+
void
+hb_font_funcs_set_glyph_v_advance_func
+                               (hb_font_funcs_t *ffuncs,
+                                hb_font_get_glyph_v_advance_func_t func,
+                                void *user_data,
+                                hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

ffuncs

font functions.

 

func

.

[closure user_data][destroy destroy][scope notified]
+
+

Since 0.9.2

+
+
+
+

hb_font_funcs_set_glyph_v_kerning_func ()

+
void
+hb_font_funcs_set_glyph_v_kerning_func
+                               (hb_font_funcs_t *ffuncs,
+                                hb_font_get_glyph_v_kerning_func_t func,
+                                void *user_data,
+                                hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

ffuncs

font functions.

 

func

.

[closure user_data][destroy destroy][scope notified]
+
+

Since 0.9.2

+
+
+
+

hb_font_funcs_set_glyph_v_origin_func ()

+
void
+hb_font_funcs_set_glyph_v_origin_func (hb_font_funcs_t *ffuncs,
+                                       hb_font_get_glyph_v_origin_func_t func,
+                                       void *user_data,
+                                       hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

ffuncs

font functions.

 

func

.

[closure user_data][destroy destroy][scope notified]
+
+

Since 0.9.2

+
+
+
+

hb_font_funcs_set_nominal_glyph_func ()

+
void
+hb_font_funcs_set_nominal_glyph_func (hb_font_funcs_t *ffuncs,
+                                      hb_font_get_nominal_glyph_func_t func,
+                                      void *user_data,
+                                      hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

ffuncs

font functions.

 

func

.

[closure user_data][destroy destroy][scope notified]
+
+

Since 1.2.3

+
+
+
+

hb_font_funcs_set_user_data ()

+
hb_bool_t
+hb_font_funcs_set_user_data (hb_font_funcs_t *ffuncs,
+                             hb_user_data_key_t *key,
+                             void *data,
+                             hb_destroy_func_t destroy,
+                             hb_bool_t replace);
+
+

Parameters

+
+++++ + + + + + +

ffuncs

font functions.

 
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_font_funcs_set_variation_glyph_func ()

+
void
+hb_font_funcs_set_variation_glyph_func
+                               (hb_font_funcs_t *ffuncs,
+                                hb_font_get_variation_glyph_func_t func,
+                                void *user_data,
+                                hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

ffuncs

font functions.

 

func

.

[closure user_data][destroy destroy][scope notified]
+
+

Since 1.2.3

+
+
+
+

hb_font_get_empty ()

+
hb_font_t *
+hb_font_get_empty (void);
+
+

Returns

+

(transfer full)

+

+
+

Since 0.9.2

+
+
+
+

hb_font_get_face ()

+
hb_face_t *
+hb_font_get_face (hb_font_t *font);
+
+

Parameters

+
+++++ + + + + + +

font

a font.

 
+
+
+

Returns

+

.

+

[transfer none]

+
+

Since 0.9.2

+
+
+
+

hb_font_get_glyph ()

+
hb_bool_t
+hb_font_get_glyph (hb_font_t *font,
+                   hb_codepoint_t unicode,
+                   hb_codepoint_t variation_selector,
+                   hb_codepoint_t *glyph);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

font

a font.

 

glyph

.

[out]
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_font_get_glyph_advance_for_direction ()

+
void
+hb_font_get_glyph_advance_for_direction
+                               (hb_font_t *font,
+                                hb_codepoint_t glyph,
+                                hb_direction_t direction,
+                                hb_position_t *x,
+                                hb_position_t *y);
+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

font

a font.

 

x

.

[out]

y

.

[out]
+
+

Since 0.9.2

+
+
+
+

hb_font_get_glyph_advance_func_t ()

+
hb_position_t
+(*hb_font_get_glyph_advance_func_t) (hb_font_t *font,
+                                     void *font_data,
+                                     hb_codepoint_t glyph,
+                                     void *user_data);
+
+
+
+

hb_font_get_glyph_contour_point ()

+
hb_bool_t
+hb_font_get_glyph_contour_point (hb_font_t *font,
+                                 hb_codepoint_t glyph,
+                                 unsigned int point_index,
+                                 hb_position_t *x,
+                                 hb_position_t *y);
+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

font

a font.

 

x

.

[out]

y

.

[out]
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_font_get_glyph_contour_point_for_origin ()

+
hb_bool_t
+hb_font_get_glyph_contour_point_for_origin
+                               (hb_font_t *font,
+                                hb_codepoint_t glyph,
+                                unsigned int point_index,
+                                hb_direction_t direction,
+                                hb_position_t *x,
+                                hb_position_t *y);
+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

font

a font.

 

x

.

[out]

y

.

[out]
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_font_get_glyph_contour_point_func_t ()

+
hb_bool_t
+(*hb_font_get_glyph_contour_point_func_t)
+                               (hb_font_t *font,
+                                void *font_data,
+                                hb_codepoint_t glyph,
+                                unsigned int point_index,
+                                hb_position_t *x,
+                                hb_position_t *y,
+                                void *user_data);
+
+
+
+

hb_font_get_glyph_extents ()

+
hb_bool_t
+hb_font_get_glyph_extents (hb_font_t *font,
+                           hb_codepoint_t glyph,
+                           hb_glyph_extents_t *extents);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

font

a font.

 

extents

.

[out]
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_font_get_glyph_extents_for_origin ()

+
hb_bool_t
+hb_font_get_glyph_extents_for_origin (hb_font_t *font,
+                                      hb_codepoint_t glyph,
+                                      hb_direction_t direction,
+                                      hb_glyph_extents_t *extents);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

font

a font.

 

extents

.

[out]
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_font_get_glyph_extents_func_t ()

+
hb_bool_t
+(*hb_font_get_glyph_extents_func_t) (hb_font_t *font,
+                                     void *font_data,
+                                     hb_codepoint_t glyph,
+                                     hb_glyph_extents_t *extents,
+                                     void *user_data);
+
+
+
+

hb_font_get_glyph_from_name ()

+
hb_bool_t
+hb_font_get_glyph_from_name (hb_font_t *font,
+                             const char *name,
+                             int len,
+                             hb_codepoint_t *glyph);
+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

font

a font.

 

name

.

[array length=len]

glyph

.

[out]
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_font_get_glyph_from_name_func_t ()

+
hb_bool_t
+(*hb_font_get_glyph_from_name_func_t) (hb_font_t *font,
+                                       void *font_data,
+                                       const char *name,
+                                       int len);
+
+
+
+

hb_font_get_glyph_h_advance ()

+
hb_position_t
+hb_font_get_glyph_h_advance (hb_font_t *font,
+                             hb_codepoint_t glyph);
+
+

Parameters

+
+++++ + + + + + +

font

a font.

 
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_font_get_glyph_h_kerning ()

+
hb_position_t
+hb_font_get_glyph_h_kerning (hb_font_t *font,
+                             hb_codepoint_t left_glyph,
+                             hb_codepoint_t right_glyph);
+
+

Parameters

+
+++++ + + + + + +

font

a font.

 
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_font_get_glyph_h_origin ()

+
hb_bool_t
+hb_font_get_glyph_h_origin (hb_font_t *font,
+                            hb_codepoint_t glyph,
+                            hb_position_t *x,
+                            hb_position_t *y);
+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

font

a font.

 

x

.

[out]

y

.

[out]
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_font_get_glyph_kerning_for_direction ()

+
void
+hb_font_get_glyph_kerning_for_direction
+                               (hb_font_t *font,
+                                hb_codepoint_t first_glyph,
+                                hb_codepoint_t second_glyph,
+                                hb_direction_t direction,
+                                hb_position_t *x,
+                                hb_position_t *y);
+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

font

a font.

 

x

.

[out]

y

.

[out]
+
+

Since 0.9.2

+
+
+
+

hb_font_get_glyph_kerning_func_t ()

+
hb_position_t
+(*hb_font_get_glyph_kerning_func_t) (hb_font_t *font,
+                                     void *font_data,
+                                     hb_codepoint_t first_glyph,
+                                     hb_codepoint_t second_glyph,
+                                     void *user_data);
+
+
+
+

hb_font_get_glyph_name ()

+
hb_bool_t
+hb_font_get_glyph_name (hb_font_t *font,
+                        hb_codepoint_t glyph,
+                        char *name,
+                        unsigned int size);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

font

a font.

 

name

.

[array length=size]
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_font_get_glyph_name_func_t ()

+
hb_bool_t
+(*hb_font_get_glyph_name_func_t) (hb_font_t *font,
+                                  void *font_data,
+                                  hb_codepoint_t glyph,
+                                  char *name,
+                                  unsigned int size,
+                                  void *user_data);
+
+
+
+

hb_font_get_glyph_origin_for_direction ()

+
void
+hb_font_get_glyph_origin_for_direction
+                               (hb_font_t *font,
+                                hb_codepoint_t glyph,
+                                hb_direction_t direction,
+                                hb_position_t *x,
+                                hb_position_t *y);
+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

font

a font.

 

x

.

[out]

y

.

[out]
+
+

Since 0.9.2

+
+
+
+

hb_font_get_glyph_origin_func_t ()

+
hb_bool_t
+(*hb_font_get_glyph_origin_func_t) (hb_font_t *font,
+                                    void *font_data,
+                                    hb_codepoint_t glyph,
+                                    hb_position_t *x,
+                                    hb_position_t *y,
+                                    void *user_data);
+
+
+
+

hb_font_get_glyph_v_advance ()

+
hb_position_t
+hb_font_get_glyph_v_advance (hb_font_t *font,
+                             hb_codepoint_t glyph);
+
+

Parameters

+
+++++ + + + + + +

font

a font.

 
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_font_get_glyph_v_kerning ()

+
hb_position_t
+hb_font_get_glyph_v_kerning (hb_font_t *font,
+                             hb_codepoint_t top_glyph,
+                             hb_codepoint_t bottom_glyph);
+
+

Parameters

+
+++++ + + + + + +

font

a font.

 
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_font_get_glyph_v_origin ()

+
hb_bool_t
+hb_font_get_glyph_v_origin (hb_font_t *font,
+                            hb_codepoint_t glyph,
+                            hb_position_t *x,
+                            hb_position_t *y);
+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

font

a font.

 

x

.

[out]

y

.

[out]
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_font_get_nominal_glyph ()

+
hb_bool_t
+hb_font_get_nominal_glyph (hb_font_t *font,
+                           hb_codepoint_t unicode,
+                           hb_codepoint_t *glyph);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

font

a font.

 

glyph

.

[out]
+
+
+

Returns

+

+
+

Since 1.2.3

+
+
+
+

hb_font_get_nominal_glyph_func_t ()

+
hb_bool_t
+(*hb_font_get_nominal_glyph_func_t) (hb_font_t *font,
+                                     void *font_data,
+                                     hb_codepoint_t unicode,
+                                     hb_codepoint_t *glyph,
+                                     void *user_data);
+
+
+
+

hb_font_get_parent ()

+
hb_font_t *
+hb_font_get_parent (hb_font_t *font);
+
+

Parameters

+
+++++ + + + + + +

font

a font.

 
+
+
+

Returns

+

.

+

[transfer none]

+
+

Since 0.9.2

+
+
+
+

hb_font_get_ppem ()

+
void
+hb_font_get_ppem (hb_font_t *font,
+                  unsigned int *x_ppem,
+                  unsigned int *y_ppem);
+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

font

a font.

 

x_ppem

.

[out]

y_ppem

.

[out]
+
+

Since 0.9.2

+
+
+
+

hb_font_get_scale ()

+
void
+hb_font_get_scale (hb_font_t *font,
+                   int *x_scale,
+                   int *y_scale);
+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

font

a font.

 

x_scale

.

[out]

y_scale

.

[out]
+
+

Since 0.9.2

+
+
+
+

hb_font_get_user_data ()

+
void *
+hb_font_get_user_data (hb_font_t *font,
+                       hb_user_data_key_t *key);
+
+

Parameters

+
+++++ + + + + + +

font

a font.

 
+
+
+

Returns

+

.

+

[transfer none]

+
+

Since 0.9.2

+
+
+
+

hb_font_get_variation_glyph ()

+
hb_bool_t
+hb_font_get_variation_glyph (hb_font_t *font,
+                             hb_codepoint_t unicode,
+                             hb_codepoint_t variation_selector,
+                             hb_codepoint_t *glyph);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

font

a font.

 

glyph

.

[out]
+
+
+

Returns

+

+
+

Since 1.2.3

+
+
+
+

hb_font_get_variation_glyph_func_t ()

+
hb_bool_t
+(*hb_font_get_variation_glyph_func_t) (hb_font_t *font,
+                                       void *font_data,
+                                       hb_codepoint_t unicode,
+                                       hb_codepoint_t variation_selector,
+                                       hb_codepoint_t *glyph,
+                                       void *user_data);
+
+
+
+

hb_font_get_var_coords_normalized ()

+
const int *
+hb_font_get_var_coords_normalized (hb_font_t *font,
+                                   unsigned int *length);
+
+
+
+

hb_font_glyph_from_string ()

+
hb_bool_t
+hb_font_glyph_from_string (hb_font_t *font,
+                           const char *s,
+                           int len,
+                           hb_codepoint_t *glyph);
+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

font

a font.

 

s

.

[array length=len][element-type uint8_t]

glyph

.

[out]
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_font_glyph_to_string ()

+
void
+hb_font_glyph_to_string (hb_font_t *font,
+                         hb_codepoint_t glyph,
+                         char *s,
+                         unsigned int size);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

font

a font.

 

s

.

[array length=size]
+
+

Since 0.9.2

+
+
+
+

hb_font_is_immutable ()

+
hb_bool_t
+hb_font_is_immutable (hb_font_t *font);
+
+

Parameters

+
+++++ + + + + + +

font

a font.

 
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_font_make_immutable ()

+
void
+hb_font_make_immutable (hb_font_t *font);
+
+

Parameters

+
+++++ + + + + + +

font

a font.

 
+
+

Since 0.9.2

+
+
+
+

hb_font_reference ()

+
hb_font_t *
+hb_font_reference (hb_font_t *font);
+
+

Parameters

+
+++++ + + + + + +

font

a font.

 
+
+
+

Returns

+

.

+

[transfer full]

+
+

Since 0.9.2

+
+
+
+

hb_font_set_funcs ()

+
void
+hb_font_set_funcs (hb_font_t *font,
+                   hb_font_funcs_t *klass,
+                   void *font_data,
+                   hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

font

a font.

 

klass

.

[closure font_data][destroy destroy][scope notified]
+
+

Since 0.9.2

+
+
+
+

hb_font_set_funcs_data ()

+
void
+hb_font_set_funcs_data (hb_font_t *font,
+                        void *font_data,
+                        hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

font

a font.

 

font_data

.

[destroy destroy][scope notified]
+
+

Since 0.9.2

+
+
+
+

hb_font_set_parent ()

+
void
+hb_font_set_parent (hb_font_t *font,
+                    hb_font_t *parent);
+

Sets parent font of font +.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

font

a font.

 

parent

new parent.

 
+
+

Since 1.0.5

+
+
+
+

hb_font_set_ppem ()

+
void
+hb_font_set_ppem (hb_font_t *font,
+                  unsigned int x_ppem,
+                  unsigned int y_ppem);
+
+

Parameters

+
+++++ + + + + + +

font

a font.

 
+
+

Since 0.9.2

+
+
+
+

hb_font_set_scale ()

+
void
+hb_font_set_scale (hb_font_t *font,
+                   int x_scale,
+                   int y_scale);
+
+

Parameters

+
+++++ + + + + + +

font

a font.

 
+
+

Since 0.9.2

+
+
+
+

hb_font_set_user_data ()

+
hb_bool_t
+hb_font_set_user_data (hb_font_t *font,
+                       hb_user_data_key_t *key,
+                       void *data,
+                       hb_destroy_func_t destroy,
+                       hb_bool_t replace);
+
+

Parameters

+
+++++ + + + + + +

font

a font.

 
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_variation_from_string ()

+
hb_bool_t
+hb_variation_from_string (const char *str,
+                          int len,
+                          hb_variation_t *variation);
+

Since 1.4.2

+
+
+
+

hb_variation_to_string ()

+
void
+hb_variation_to_string (hb_variation_t *variation,
+                        char *buf,
+                        unsigned int size);
+

Since 1.4.2

+
+
+
+

hb_font_set_variations ()

+
void
+hb_font_set_variations (hb_font_t *font,
+                        const hb_variation_t *variations,
+                        unsigned int variations_length);
+

Since 1.4.2

+
+
+
+

hb_font_set_var_coords_design ()

+
void
+hb_font_set_var_coords_design (hb_font_t *font,
+                               const float *coords,
+                               unsigned int coords_length);
+

Since 1.4.2

+
+
+
+

hb_font_set_var_coords_normalized ()

+
void
+hb_font_set_var_coords_normalized (hb_font_t *font,
+                                   const int *coords,
+                                   unsigned int coords_length);
+

Return value is valid as long as variation coordinates of the font +are not modified.

+

Since 1.4.2

+
+
+
+

hb_font_subtract_glyph_origin_for_direction ()

+
void
+hb_font_subtract_glyph_origin_for_direction
+                               (hb_font_t *font,
+                                hb_codepoint_t glyph,
+                                hb_direction_t direction,
+                                hb_position_t *x,
+                                hb_position_t *y);
+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

font

a font.

 

x

.

[out]

y

.

[out]
+
+

Since 0.9.2

+
+
+
+

hb_reference_table_func_t ()

+
hb_blob_t *
+(*hb_reference_table_func_t) (hb_face_t *face,
+                              hb_tag_t tag,
+                              void *user_data);
+
+
+
+

hb_font_funcs_set_font_h_extents_func ()

+
void
+hb_font_funcs_set_font_h_extents_func (hb_font_funcs_t *ffuncs,
+                                       hb_font_get_font_h_extents_func_t func,
+                                       void *user_data,
+                                       hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

ffuncs

font functions.

 

func

.

[closure user_data][destroy destroy][scope notified]
+
+

Since 1.1.2

+
+
+
+

hb_font_funcs_set_font_v_extents_func ()

+
void
+hb_font_funcs_set_font_v_extents_func (hb_font_funcs_t *ffuncs,
+                                       hb_font_get_font_v_extents_func_t func,
+                                       void *user_data,
+                                       hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

ffuncs

font functions.

 

func

.

[closure user_data][destroy destroy][scope notified]
+
+

Since 1.1.2

+
+
+
+

hb_font_get_extents_for_direction ()

+
void
+hb_font_get_extents_for_direction (hb_font_t *font,
+                                   hb_direction_t direction,
+                                   hb_font_extents_t *extents);
+
+

Parameters

+
+++++ + + + + + +

font

a font.

 
+
+

Since 1.1.3

+
+
+
+

hb_font_get_font_extents_func_t ()

+
hb_bool_t
+(*hb_font_get_font_extents_func_t) (hb_font_t *font,
+                                    void *font_data,
+                                    hb_font_extents_t *metrics,
+                                    void *user_data);
+
+
+
+

hb_font_get_h_extents ()

+
hb_bool_t
+hb_font_get_h_extents (hb_font_t *font,
+                       hb_font_extents_t *extents);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

font

a font.

 

extents

.

[out]
+
+
+

Returns

+

+
+

Since 1.1.3

+
+
+
+

hb_font_get_v_extents ()

+
hb_bool_t
+hb_font_get_v_extents (hb_font_t *font,
+                       hb_font_extents_t *extents);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

font

a font.

 

extents

.

[out]
+
+
+

Returns

+

+
+

Since 1.1.3

+
+
+
+

Types and Values

+
+

hb_font_funcs_t

+
typedef struct hb_font_funcs_t hb_font_funcs_t;
+
+
+
+
+

hb_font_get_glyph_h_advance_func_t

+
typedef hb_font_get_glyph_advance_func_t hb_font_get_glyph_h_advance_func_t;
+
+
+
+
+

hb_font_get_glyph_h_kerning_func_t

+
typedef hb_font_get_glyph_kerning_func_t hb_font_get_glyph_h_kerning_func_t;
+
+
+
+
+

hb_font_get_glyph_h_origin_func_t

+
typedef hb_font_get_glyph_origin_func_t hb_font_get_glyph_h_origin_func_t;
+
+
+
+
+

hb_font_get_glyph_v_advance_func_t

+
typedef hb_font_get_glyph_advance_func_t hb_font_get_glyph_v_advance_func_t;
+
+
+
+
+

hb_font_get_glyph_v_kerning_func_t

+
typedef hb_font_get_glyph_kerning_func_t hb_font_get_glyph_v_kerning_func_t;
+
+
+
+
+

hb_font_get_glyph_v_origin_func_t

+
typedef hb_font_get_glyph_origin_func_t hb_font_get_glyph_v_origin_func_t;
+
+
+
+
+

hb_variation_t

+
typedef struct {
+  hb_tag_t tag;
+  float    value;
+} hb_variation_t;
+
+

Since 1.4.2

+
+
+
+

hb_font_t

+
typedef struct hb_font_t hb_font_t;
+
+
+
+
+

hb_font_get_font_h_extents_func_t

+
typedef hb_font_get_font_extents_func_t hb_font_get_font_h_extents_func_t;
+
+
+
+
+

hb_font_get_font_v_extents_func_t

+
typedef hb_font_get_font_extents_func_t hb_font_get_font_v_extents_func_t;
+
+
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/harfbuzz-hb-ft.html b/docs/html/harfbuzz-hb-ft.html new file mode 100644 index 0000000..ecb4e23 --- /dev/null +++ b/docs/html/harfbuzz-hb-ft.html @@ -0,0 +1,258 @@ + + + + +hb-ft: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

hb-ft

+

hb-ft

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+hb_face_t * + +hb_ft_face_create () +
+hb_face_t * + +hb_ft_face_create_cached () +
+hb_face_t * + +hb_ft_face_create_referenced () +
+hb_font_t * + +hb_ft_font_create () +
+hb_font_t * + +hb_ft_font_create_referenced () +
+FT_Face + +hb_ft_font_get_face () +
+void + +hb_ft_font_set_load_flags () +
+int + +hb_ft_font_get_load_flags () +
+void + +hb_ft_font_set_funcs () +
+
+
+

Object Hierarchy

+
+
+
+
+

Description

+
+
+

Functions

+
+

hb_ft_face_create ()

+
hb_face_t *
+hb_ft_face_create (FT_Face ft_face,
+                   hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + +

ft_face

.

[destroy destroy][scope notified]
+
+
+

Returns

+

.

+

[transfer full]

+
+

Since 0.9.2

+
+
+
+

hb_ft_face_create_cached ()

+
hb_face_t *
+hb_ft_face_create_cached (FT_Face ft_face);
+
+

Returns

+

.

+

[transfer full]

+
+

Since 0.9.2

+
+
+
+

hb_ft_face_create_referenced ()

+
hb_face_t *
+hb_ft_face_create_referenced (FT_Face ft_face);
+
+

Returns

+

.

+

[transfer full]

+
+

Since 0.9.38

+
+
+
+

hb_ft_font_create ()

+
hb_font_t *
+hb_ft_font_create (FT_Face ft_face,
+                   hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + +

ft_face

.

[destroy destroy][scope notified]
+
+
+

Returns

+

.

+

[transfer full]

+
+

Since 0.9.2

+
+
+
+

hb_ft_font_create_referenced ()

+
hb_font_t *
+hb_ft_font_create_referenced (FT_Face ft_face);
+
+

Returns

+

.

+

[transfer full]

+
+

Since 0.9.38

+
+
+
+

hb_ft_font_get_face ()

+
FT_Face
+hb_ft_font_get_face (hb_font_t *font);
+
+
+
+

hb_ft_font_set_load_flags ()

+
void
+hb_ft_font_set_load_flags (hb_font_t *font,
+                           int load_flags);
+

Since 1.0.5

+
+
+
+

hb_ft_font_get_load_flags ()

+
int
+hb_ft_font_get_load_flags (hb_font_t *font);
+
+

Returns

+

+
+

Since 1.0.5

+
+
+
+

hb_ft_font_set_funcs ()

+
void
+hb_ft_font_set_funcs (hb_font_t *font);
+
+
+
+

Types and Values

+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/harfbuzz-hb-glib.html b/docs/html/harfbuzz-hb-glib.html new file mode 100644 index 0000000..2a0ce86 --- /dev/null +++ b/docs/html/harfbuzz-hb-glib.html @@ -0,0 +1,120 @@ + + + + +hb-glib: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

hb-glib

+

hb-glib

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + +
+hb_unicode_funcs_t * + +hb_glib_get_unicode_funcs () +
+GUnicodeScript + +hb_glib_script_from_script () +
+hb_script_t + +hb_glib_script_to_script () +
+hb_blob_t * + +hb_glib_blob_create () +
+
+
+

Object Hierarchy

+
+
+
+
+

Description

+
+
+

Functions

+
+

hb_glib_get_unicode_funcs ()

+
hb_unicode_funcs_t *
+hb_glib_get_unicode_funcs (void);
+
+
+
+

hb_glib_script_from_script ()

+
GUnicodeScript
+hb_glib_script_from_script (hb_script_t script);
+
+
+
+

hb_glib_script_to_script ()

+
hb_script_t
+hb_glib_script_to_script (GUnicodeScript script);
+
+
+
+

hb_glib_blob_create ()

+
hb_blob_t *
+hb_glib_blob_create (GBytes *gbytes);
+

Since 0.9.38

+
+
+
+

Types and Values

+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/harfbuzz-hb-gobject.html b/docs/html/harfbuzz-hb-gobject.html new file mode 100644 index 0000000..793adb3 --- /dev/null +++ b/docs/html/harfbuzz-hb-gobject.html @@ -0,0 +1,726 @@ + + + + +hb-gobject: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

hb-gobject

+

hb-gobject

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#defineHB_GOBJECT_TYPE_BLOB
#defineHB_GOBJECT_TYPE_BUFFER
#defineHB_GOBJECT_TYPE_BUFFER_CONTENT_TYPE
#defineHB_GOBJECT_TYPE_BUFFER_FLAGS
#defineHB_GOBJECT_TYPE_BUFFER_SERIALIZE_FLAGS
#defineHB_GOBJECT_TYPE_BUFFER_SERIALIZE_FORMAT
#defineHB_GOBJECT_TYPE_DIRECTION
#defineHB_GOBJECT_TYPE_FACE
#defineHB_GOBJECT_TYPE_FONT
#defineHB_GOBJECT_TYPE_FONT_FUNCS
#defineHB_GOBJECT_TYPE_MEMORY_MODE
#defineHB_GOBJECT_TYPE_OT_LAYOUT_GLYPH_CLASS
#defineHB_GOBJECT_TYPE_OT_MATH_CONSTANT
#defineHB_GOBJECT_TYPE_OT_MATH_GLYPH_PART_FLAGS
#defineHB_GOBJECT_TYPE_OT_MATH_KERN
#defineHB_GOBJECT_TYPE_SCRIPT
#defineHB_GOBJECT_TYPE_SHAPE_PLAN
#defineHB_GOBJECT_TYPE_UNICODE_COMBINING_CLASS
#defineHB_GOBJECT_TYPE_UNICODE_FUNCS
#defineHB_GOBJECT_TYPE_UNICODE_GENERAL_CATEGORY
#defineHB_GOBJECT_TYPE_BUFFER_CLUSTER_LEVEL
#defineHB_GOBJECT_TYPE_FEATURE
#defineHB_GOBJECT_TYPE_GLYPH_INFO
#defineHB_GOBJECT_TYPE_GLYPH_POSITION
#defineHB_GOBJECT_TYPE_SEGMENT_PROPERTIES
#defineHB_GOBJECT_TYPE_SET
#defineHB_GOBJECT_TYPE_USER_DATA_KEY
+GType + +hb_gobject_blob_get_type () +
+GType + +hb_gobject_buffer_content_type_get_type () +
+GType + +hb_gobject_buffer_flags_get_type () +
+GType + +hb_gobject_buffer_get_type () +
+GType + +hb_gobject_buffer_serialize_flags_get_type () +
+GType + +hb_gobject_buffer_serialize_format_get_type () +
+GType + +hb_gobject_direction_get_type () +
+GType + +hb_gobject_face_get_type () +
+GType + +hb_gobject_font_funcs_get_type () +
+GType + +hb_gobject_font_get_type () +
+GType + +hb_gobject_memory_mode_get_type () +
+GType + +hb_gobject_ot_layout_glyph_class_get_type () +
+GType + +hb_gobject_ot_math_constant_get_type () +
+GType + +hb_gobject_ot_math_glyph_part_flags_get_type () +
+GType + +hb_gobject_ot_math_kern_get_type () +
+GType + +hb_gobject_script_get_type () +
+GType + +hb_gobject_shape_plan_get_type () +
+GType + +hb_gobject_unicode_combining_class_get_type () +
+GType + +hb_gobject_unicode_funcs_get_type () +
+GType + +hb_gobject_unicode_general_category_get_type () +
+GType + +hb_gobject_buffer_cluster_level_get_type () +
+GType + +hb_gobject_feature_get_type () +
+GType + +hb_gobject_glyph_info_get_type () +
+GType + +hb_gobject_glyph_position_get_type () +
+GType + +hb_gobject_segment_properties_get_type () +
+GType + +hb_gobject_set_get_type () +
+GType + +hb_gobject_user_data_key_get_type () +
+
+
+

Object Hierarchy

+
+
+
+
+

Description

+
+
+

Functions

+
+

HB_GOBJECT_TYPE_BLOB

+
#define HB_GOBJECT_TYPE_BLOB (hb_gobject_blob_get_type ())
+
+
+
+
+

HB_GOBJECT_TYPE_BUFFER

+
#define HB_GOBJECT_TYPE_BUFFER (hb_gobject_buffer_get_type ())
+
+
+
+
+

HB_GOBJECT_TYPE_BUFFER_CONTENT_TYPE

+
#define HB_GOBJECT_TYPE_BUFFER_CONTENT_TYPE (hb_gobject_buffer_content_type_get_type ())
+
+
+
+
+

HB_GOBJECT_TYPE_BUFFER_FLAGS

+
#define HB_GOBJECT_TYPE_BUFFER_FLAGS (hb_gobject_buffer_flags_get_type ())
+
+
+
+
+

HB_GOBJECT_TYPE_BUFFER_SERIALIZE_FLAGS

+
#define HB_GOBJECT_TYPE_BUFFER_SERIALIZE_FLAGS (hb_gobject_buffer_serialize_flags_get_type ())
+
+
+
+
+

HB_GOBJECT_TYPE_BUFFER_SERIALIZE_FORMAT

+
#define HB_GOBJECT_TYPE_BUFFER_SERIALIZE_FORMAT (hb_gobject_buffer_serialize_format_get_type ())
+
+
+
+
+

HB_GOBJECT_TYPE_DIRECTION

+
#define HB_GOBJECT_TYPE_DIRECTION (hb_gobject_direction_get_type ())
+
+
+
+
+

HB_GOBJECT_TYPE_FACE

+
#define HB_GOBJECT_TYPE_FACE (hb_gobject_face_get_type ())
+
+
+
+
+

HB_GOBJECT_TYPE_FONT

+
#define HB_GOBJECT_TYPE_FONT (hb_gobject_font_get_type ())
+
+
+
+
+

HB_GOBJECT_TYPE_FONT_FUNCS

+
#define HB_GOBJECT_TYPE_FONT_FUNCS (hb_gobject_font_funcs_get_type ())
+
+
+
+
+

HB_GOBJECT_TYPE_MEMORY_MODE

+
#define HB_GOBJECT_TYPE_MEMORY_MODE (hb_gobject_memory_mode_get_type ())
+
+
+
+
+

HB_GOBJECT_TYPE_OT_LAYOUT_GLYPH_CLASS

+
#define HB_GOBJECT_TYPE_OT_LAYOUT_GLYPH_CLASS (hb_gobject_ot_layout_glyph_class_get_type ())
+
+
+
+
+

HB_GOBJECT_TYPE_OT_MATH_CONSTANT

+
#define HB_GOBJECT_TYPE_OT_MATH_CONSTANT (hb_gobject_ot_math_constant_get_type ())
+
+
+
+
+

HB_GOBJECT_TYPE_OT_MATH_GLYPH_PART_FLAGS

+
#define HB_GOBJECT_TYPE_OT_MATH_GLYPH_PART_FLAGS (hb_gobject_ot_math_glyph_part_flags_get_type ())
+
+
+
+
+

HB_GOBJECT_TYPE_OT_MATH_KERN

+
#define HB_GOBJECT_TYPE_OT_MATH_KERN (hb_gobject_ot_math_kern_get_type ())
+
+
+
+
+

HB_GOBJECT_TYPE_SCRIPT

+
#define HB_GOBJECT_TYPE_SCRIPT (hb_gobject_script_get_type ())
+
+
+
+
+

HB_GOBJECT_TYPE_SHAPE_PLAN

+
#define HB_GOBJECT_TYPE_SHAPE_PLAN (hb_gobject_shape_plan_get_type ())
+
+
+
+
+

HB_GOBJECT_TYPE_UNICODE_COMBINING_CLASS

+
#define HB_GOBJECT_TYPE_UNICODE_COMBINING_CLASS (hb_gobject_unicode_combining_class_get_type ())
+
+
+
+
+

HB_GOBJECT_TYPE_UNICODE_FUNCS

+
#define HB_GOBJECT_TYPE_UNICODE_FUNCS (hb_gobject_unicode_funcs_get_type ())
+
+
+
+
+

HB_GOBJECT_TYPE_UNICODE_GENERAL_CATEGORY

+
#define HB_GOBJECT_TYPE_UNICODE_GENERAL_CATEGORY (hb_gobject_unicode_general_category_get_type ())
+
+
+
+
+

HB_GOBJECT_TYPE_BUFFER_CLUSTER_LEVEL

+
#define HB_GOBJECT_TYPE_BUFFER_CLUSTER_LEVEL (hb_gobject_buffer_cluster_level_get_type ())
+
+
+
+
+

HB_GOBJECT_TYPE_FEATURE

+
#define HB_GOBJECT_TYPE_FEATURE (hb_gobject_feature_get_type ())
+
+
+
+
+

HB_GOBJECT_TYPE_GLYPH_INFO

+
#define HB_GOBJECT_TYPE_GLYPH_INFO (hb_gobject_glyph_info_get_type ())
+
+
+
+
+

HB_GOBJECT_TYPE_GLYPH_POSITION

+
#define HB_GOBJECT_TYPE_GLYPH_POSITION (hb_gobject_glyph_position_get_type ())
+
+
+
+
+

HB_GOBJECT_TYPE_SEGMENT_PROPERTIES

+
#define HB_GOBJECT_TYPE_SEGMENT_PROPERTIES (hb_gobject_segment_properties_get_type ())
+
+
+
+
+

HB_GOBJECT_TYPE_SET

+
#define HB_GOBJECT_TYPE_SET (hb_gobject_set_get_type ())
+
+
+
+
+

HB_GOBJECT_TYPE_USER_DATA_KEY

+
#define HB_GOBJECT_TYPE_USER_DATA_KEY (hb_gobject_user_data_key_get_type ())
+
+
+
+
+

hb_gobject_blob_get_type ()

+
GType
+hb_gobject_blob_get_type (void);
+

Since 0.9.2

+
+
+
+

hb_gobject_buffer_content_type_get_type ()

+
GType
+hb_gobject_buffer_content_type_get_type
+                               (void);
+
+
+
+

hb_gobject_buffer_flags_get_type ()

+
GType
+hb_gobject_buffer_flags_get_type (void);
+
+
+
+

hb_gobject_buffer_get_type ()

+
GType
+hb_gobject_buffer_get_type (void);
+

Since 0.9.2

+
+
+
+

hb_gobject_buffer_serialize_flags_get_type ()

+
GType
+hb_gobject_buffer_serialize_flags_get_type
+                               (void);
+
+
+
+

hb_gobject_buffer_serialize_format_get_type ()

+
GType
+hb_gobject_buffer_serialize_format_get_type
+                               (void);
+
+
+
+

hb_gobject_direction_get_type ()

+
GType
+hb_gobject_direction_get_type (void);
+
+
+
+

hb_gobject_face_get_type ()

+
GType
+hb_gobject_face_get_type (void);
+

Since 0.9.2

+
+
+
+

hb_gobject_font_funcs_get_type ()

+
GType
+hb_gobject_font_funcs_get_type (void);
+

Since 0.9.2

+
+
+
+

hb_gobject_font_get_type ()

+
GType
+hb_gobject_font_get_type (void);
+

Since 0.9.2

+
+
+
+

hb_gobject_memory_mode_get_type ()

+
GType
+hb_gobject_memory_mode_get_type (void);
+
+
+
+

hb_gobject_ot_layout_glyph_class_get_type ()

+
GType
+hb_gobject_ot_layout_glyph_class_get_type
+                               (void);
+
+
+
+

hb_gobject_ot_math_constant_get_type ()

+
GType
+hb_gobject_ot_math_constant_get_type (void);
+
+
+
+

hb_gobject_ot_math_glyph_part_flags_get_type ()

+
GType
+hb_gobject_ot_math_glyph_part_flags_get_type
+                               (void);
+
+
+
+

hb_gobject_ot_math_kern_get_type ()

+
GType
+hb_gobject_ot_math_kern_get_type (void);
+
+
+
+

hb_gobject_script_get_type ()

+
GType
+hb_gobject_script_get_type (void);
+
+
+
+

hb_gobject_shape_plan_get_type ()

+
GType
+hb_gobject_shape_plan_get_type (void);
+
+
+
+

hb_gobject_unicode_combining_class_get_type ()

+
GType
+hb_gobject_unicode_combining_class_get_type
+                               (void);
+
+
+
+

hb_gobject_unicode_funcs_get_type ()

+
GType
+hb_gobject_unicode_funcs_get_type (void);
+

Since 0.9.2

+
+
+
+

hb_gobject_unicode_general_category_get_type ()

+
GType
+hb_gobject_unicode_general_category_get_type
+                               (void);
+
+
+
+

hb_gobject_buffer_cluster_level_get_type ()

+
GType
+hb_gobject_buffer_cluster_level_get_type
+                               (void);
+
+
+
+

hb_gobject_feature_get_type ()

+
GType
+hb_gobject_feature_get_type (void);
+
+
+
+

hb_gobject_glyph_info_get_type ()

+
GType
+hb_gobject_glyph_info_get_type (void);
+
+
+
+

hb_gobject_glyph_position_get_type ()

+
GType
+hb_gobject_glyph_position_get_type (void);
+
+
+
+

hb_gobject_segment_properties_get_type ()

+
GType
+hb_gobject_segment_properties_get_type
+                               (void);
+
+
+
+

hb_gobject_set_get_type ()

+
GType
+hb_gobject_set_get_type (void);
+
+
+
+

hb_gobject_user_data_key_get_type ()

+
GType
+hb_gobject_user_data_key_get_type (void);
+
+
+
+

Types and Values

+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/harfbuzz-hb-graphite2.html b/docs/html/harfbuzz-hb-graphite2.html new file mode 100644 index 0000000..0fcd1e2 --- /dev/null +++ b/docs/html/harfbuzz-hb-graphite2.html @@ -0,0 +1,109 @@ + + + + +hb-graphite2: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

hb-graphite2

+

hb-graphite2

+
+
+

Functions

+
++++ + + + + + + + + + + +
+gr_face * + +hb_graphite2_face_get_gr_face () +
+gr_font * + +hb_graphite2_font_get_gr_font () +
+
+
+

Types and Values

+
++++ + + + + +
#defineHB_GRAPHITE2_TAG_SILF
+
+
+

Object Hierarchy

+
+
+
+
+

Description

+
+
+

Functions

+
+

hb_graphite2_face_get_gr_face ()

+
gr_face *
+hb_graphite2_face_get_gr_face (hb_face_t *face);
+
+
+
+

hb_graphite2_font_get_gr_font ()

+
gr_font *
+hb_graphite2_font_get_gr_font (hb_font_t *font);
+
+
+
+

Types and Values

+
+

HB_GRAPHITE2_TAG_SILF

+
#define HB_GRAPHITE2_TAG_SILF HB_TAG('S','i','l','f')
+
+
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/harfbuzz-hb-icu.html b/docs/html/harfbuzz-hb-icu.html new file mode 100644 index 0000000..1890e12 --- /dev/null +++ b/docs/html/harfbuzz-hb-icu.html @@ -0,0 +1,105 @@ + + + + +hb-icu: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

hb-icu

+

hb-icu

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + +
+hb_unicode_funcs_t * + +hb_icu_get_unicode_funcs () +
+UScriptCode + +hb_icu_script_from_script () +
+hb_script_t + +hb_icu_script_to_script () +
+
+
+

Object Hierarchy

+
+
+
+
+

Description

+
+
+

Functions

+
+

hb_icu_get_unicode_funcs ()

+
hb_unicode_funcs_t *
+hb_icu_get_unicode_funcs (void);
+
+
+
+

hb_icu_script_from_script ()

+
UScriptCode
+hb_icu_script_from_script (hb_script_t script);
+
+
+
+

hb_icu_script_to_script ()

+
hb_script_t
+hb_icu_script_to_script (UScriptCode script);
+
+
+
+

Types and Values

+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/harfbuzz-hb-ot-font.html b/docs/html/harfbuzz-hb-ot-font.html new file mode 100644 index 0000000..2b50e0d --- /dev/null +++ b/docs/html/harfbuzz-hb-ot-font.html @@ -0,0 +1,76 @@ + + + + +hb-ot-font: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

hb-ot-font

+

hb-ot-font

+
+
+

Functions

+
++++ + + + + +
+void + +hb_ot_font_set_funcs () +
+
+
+

Object Hierarchy

+
+
+
+
+

Description

+
+
+

Functions

+
+

hb_ot_font_set_funcs ()

+
void
+hb_ot_font_set_funcs (hb_font_t *font);
+

Since 0.9.28

+
+
+
+

Types and Values

+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/harfbuzz-hb-ot-layout.html b/docs/html/harfbuzz-hb-ot-layout.html new file mode 100644 index 0000000..51bd1f9 --- /dev/null +++ b/docs/html/harfbuzz-hb-ot-layout.html @@ -0,0 +1,719 @@ + + + + +hb-ot-layout: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

hb-ot-layout

+

hb-ot-layout

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+void + +hb_ot_layout_collect_lookups () +
unsigned int + +hb_ot_layout_feature_get_lookups () +
unsigned int + +hb_ot_layout_feature_with_variations_get_lookups () +
unsigned int + +hb_ot_layout_get_attach_points () +
+hb_ot_layout_glyph_class_t + +hb_ot_layout_get_glyph_class () +
+void + +hb_ot_layout_get_glyphs_in_class () +
unsigned int + +hb_ot_layout_get_ligature_carets () +
+hb_bool_t + +hb_ot_layout_get_size_params () +
+hb_bool_t + +(*hb_ot_layout_glyph_sequence_func_t) () +
+hb_bool_t + +hb_ot_layout_has_glyph_classes () +
+hb_bool_t + +hb_ot_layout_has_positioning () +
+hb_bool_t + +hb_ot_layout_has_substitution () +
+hb_bool_t + +hb_ot_layout_language_find_feature () +
unsigned int + +hb_ot_layout_language_get_feature_indexes () +
unsigned int + +hb_ot_layout_language_get_feature_tags () +
+hb_bool_t + +hb_ot_layout_language_get_required_feature () +
+void + +hb_ot_layout_lookup_collect_glyphs () +
+void + +hb_ot_layout_lookup_substitute_closure () +
+hb_bool_t + +hb_ot_layout_lookup_would_substitute () +
+hb_bool_t + +hb_ot_layout_script_find_language () +
unsigned int + +hb_ot_layout_script_get_language_tags () +
+hb_bool_t + +hb_ot_layout_table_choose_script () +
+hb_bool_t + +hb_ot_layout_table_find_feature_variations () +
+hb_bool_t + +hb_ot_layout_table_find_script () +
unsigned int + +hb_ot_layout_table_get_feature_tags () +
unsigned int + +hb_ot_layout_table_get_script_tags () +
unsigned int + +hb_ot_layout_table_get_lookup_count () +
+void + +hb_ot_shape_plan_collect_lookups () +
+hb_bool_t + +hb_ot_layout_language_get_required_feature_index () +
+
+
+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#defineHB_OT_LAYOUT_DEFAULT_LANGUAGE_INDEX
#defineHB_OT_LAYOUT_NO_FEATURE_INDEX
#defineHB_OT_LAYOUT_NO_SCRIPT_INDEX
#defineHB_OT_LAYOUT_NO_VARIATIONS_INDEX
#defineHB_OT_TAG_GDEF
#defineHB_OT_TAG_GPOS
#defineHB_OT_TAG_GSUB
#defineHB_OT_TAG_JSTF
enumhb_ot_layout_glyph_class_t
+
+
+

Object Hierarchy

+
    GEnum
+    ╰── hb_ot_layout_glyph_class_t
+
+
+
+

Description

+
+
+

Functions

+
+

hb_ot_layout_collect_lookups ()

+
void
+hb_ot_layout_collect_lookups (hb_face_t *face,
+                              hb_tag_t table_tag,
+                              const hb_tag_t *scripts,
+                              const hb_tag_t *languages,
+                              const hb_tag_t *features,
+                              hb_set_t *lookup_indexes);
+

Since 0.9.8

+
+
+
+

hb_ot_layout_feature_get_lookups ()

+
unsigned int
+hb_ot_layout_feature_get_lookups (hb_face_t *face,
+                                  hb_tag_t table_tag,
+                                  unsigned int feature_index,
+                                  unsigned int start_offset,
+                                  unsigned int *lookup_count,
+                                  unsigned int *lookup_indexes);
+

Since 0.9.7

+
+
+
+

hb_ot_layout_feature_with_variations_get_lookups ()

+
unsigned int
+hb_ot_layout_feature_with_variations_get_lookups
+                               (hb_face_t *face,
+                                hb_tag_t table_tag,
+                                unsigned int feature_index,
+                                unsigned int variations_index,
+                                unsigned int start_offset,
+                                unsigned int *lookup_count,
+                                unsigned int *lookup_indexes);
+
+
+
+

hb_ot_layout_get_attach_points ()

+
unsigned int
+hb_ot_layout_get_attach_points (hb_face_t *face,
+                                hb_codepoint_t glyph,
+                                unsigned int start_offset,
+                                unsigned int *point_count,
+                                unsigned int *point_array);
+
+
+
+

hb_ot_layout_get_glyph_class ()

+
hb_ot_layout_glyph_class_t
+hb_ot_layout_get_glyph_class (hb_face_t *face,
+                              hb_codepoint_t glyph);
+

Since 0.9.7

+
+
+
+

hb_ot_layout_get_glyphs_in_class ()

+
void
+hb_ot_layout_get_glyphs_in_class (hb_face_t *face,
+                                  hb_ot_layout_glyph_class_t klass,
+                                  hb_set_t *glyphs);
+

Since 0.9.7

+
+
+
+

hb_ot_layout_get_ligature_carets ()

+
unsigned int
+hb_ot_layout_get_ligature_carets (hb_font_t *font,
+                                  hb_direction_t direction,
+                                  hb_codepoint_t glyph,
+                                  unsigned int start_offset,
+                                  unsigned int *caret_count,
+                                  hb_position_t *caret_array);
+
+
+
+

hb_ot_layout_get_size_params ()

+
hb_bool_t
+hb_ot_layout_get_size_params (hb_face_t *face,
+                              unsigned int *design_size,
+                              unsigned int *subfamily_id,
+                              unsigned int *subfamily_name_id,
+                              unsigned int *range_start,
+                              unsigned int *range_end);
+

Since 0.9.10

+
+
+
+

hb_ot_layout_glyph_sequence_func_t ()

+
hb_bool_t
+(*hb_ot_layout_glyph_sequence_func_t) (hb_font_t *font,
+                                       hb_tag_t table_tag,
+                                       unsigned int lookup_index,
+                                       const hb_ot_layout_glyph_sequence_t *sequence,
+                                       void *user_data);
+
+
+
+

hb_ot_layout_has_glyph_classes ()

+
hb_bool_t
+hb_ot_layout_has_glyph_classes (hb_face_t *face);
+
+
+
+

hb_ot_layout_has_positioning ()

+
hb_bool_t
+hb_ot_layout_has_positioning (hb_face_t *face);
+
+
+
+

hb_ot_layout_has_substitution ()

+
hb_bool_t
+hb_ot_layout_has_substitution (hb_face_t *face);
+
+
+
+

hb_ot_layout_language_find_feature ()

+
hb_bool_t
+hb_ot_layout_language_find_feature (hb_face_t *face,
+                                    hb_tag_t table_tag,
+                                    unsigned int script_index,
+                                    unsigned int language_index,
+                                    hb_tag_t feature_tag,
+                                    unsigned int *feature_index);
+
+
+
+

hb_ot_layout_language_get_feature_indexes ()

+
unsigned int
+hb_ot_layout_language_get_feature_indexes
+                               (hb_face_t *face,
+                                hb_tag_t table_tag,
+                                unsigned int script_index,
+                                unsigned int language_index,
+                                unsigned int start_offset,
+                                unsigned int *feature_count,
+                                unsigned int *feature_indexes);
+
+
+
+

hb_ot_layout_language_get_feature_tags ()

+
unsigned int
+hb_ot_layout_language_get_feature_tags
+                               (hb_face_t *face,
+                                hb_tag_t table_tag,
+                                unsigned int script_index,
+                                unsigned int language_index,
+                                unsigned int start_offset,
+                                unsigned int *feature_count,
+                                hb_tag_t *feature_tags);
+
+
+
+

hb_ot_layout_language_get_required_feature ()

+
hb_bool_t
+hb_ot_layout_language_get_required_feature
+                               (hb_face_t *face,
+                                hb_tag_t table_tag,
+                                unsigned int script_index,
+                                unsigned int language_index,
+                                unsigned int *feature_index,
+                                hb_tag_t *feature_tag);
+

Since 0.9.30

+
+
+
+

hb_ot_layout_lookup_collect_glyphs ()

+
void
+hb_ot_layout_lookup_collect_glyphs (hb_face_t *face,
+                                    hb_tag_t table_tag,
+                                    unsigned int lookup_index,
+                                    hb_set_t *glyphs_before,
+                                    hb_set_t *glyphs_input,
+                                    hb_set_t *glyphs_after,
+                                    hb_set_t *glyphs_output);
+

Since 0.9.7

+
+
+
+

hb_ot_layout_lookup_substitute_closure ()

+
void
+hb_ot_layout_lookup_substitute_closure
+                               (hb_face_t *face,
+                                unsigned int lookup_index,
+                                hb_set_t *glyphs);
+

Since 0.9.7

+
+
+
+

hb_ot_layout_lookup_would_substitute ()

+
hb_bool_t
+hb_ot_layout_lookup_would_substitute (hb_face_t *face,
+                                      unsigned int lookup_index,
+                                      const hb_codepoint_t *glyphs,
+                                      unsigned int glyphs_length,
+                                      hb_bool_t zero_context);
+

Since 0.9.7

+
+
+
+

hb_ot_layout_script_find_language ()

+
hb_bool_t
+hb_ot_layout_script_find_language (hb_face_t *face,
+                                   hb_tag_t table_tag,
+                                   unsigned int script_index,
+                                   hb_tag_t language_tag,
+                                   unsigned int *language_index);
+
+
+
+

hb_ot_layout_script_get_language_tags ()

+
unsigned int
+hb_ot_layout_script_get_language_tags (hb_face_t *face,
+                                       hb_tag_t table_tag,
+                                       unsigned int script_index,
+                                       unsigned int start_offset,
+                                       unsigned int *language_count,
+                                       hb_tag_t *language_tags);
+
+
+
+

hb_ot_layout_table_choose_script ()

+
hb_bool_t
+hb_ot_layout_table_choose_script (hb_face_t *face,
+                                  hb_tag_t table_tag,
+                                  const hb_tag_t *script_tags,
+                                  unsigned int *script_index,
+                                  hb_tag_t *chosen_script);
+
+
+
+

hb_ot_layout_table_find_feature_variations ()

+
hb_bool_t
+hb_ot_layout_table_find_feature_variations
+                               (hb_face_t *face,
+                                hb_tag_t table_tag,
+                                const int *coords,
+                                unsigned int num_coords,
+                                unsigned int *variations_index);
+
+
+
+

hb_ot_layout_table_find_script ()

+
hb_bool_t
+hb_ot_layout_table_find_script (hb_face_t *face,
+                                hb_tag_t table_tag,
+                                hb_tag_t script_tag,
+                                unsigned int *script_index);
+
+
+
+

hb_ot_layout_table_get_feature_tags ()

+
unsigned int
+hb_ot_layout_table_get_feature_tags (hb_face_t *face,
+                                     hb_tag_t table_tag,
+                                     unsigned int start_offset,
+                                     unsigned int *feature_count,
+                                     hb_tag_t *feature_tags);
+
+
+
+

hb_ot_layout_table_get_script_tags ()

+
unsigned int
+hb_ot_layout_table_get_script_tags (hb_face_t *face,
+                                    hb_tag_t table_tag,
+                                    unsigned int start_offset,
+                                    unsigned int *script_count,
+                                    hb_tag_t *script_tags);
+
+
+
+

hb_ot_layout_table_get_lookup_count ()

+
unsigned int
+hb_ot_layout_table_get_lookup_count (hb_face_t *face,
+                                     hb_tag_t table_tag);
+

Since 0.9.22

+
+
+
+

hb_ot_shape_plan_collect_lookups ()

+
void
+hb_ot_shape_plan_collect_lookups (hb_shape_plan_t *shape_plan,
+                                  hb_tag_t table_tag,
+                                  hb_set_t *lookup_indexes);
+

Since 0.9.7

+
+
+
+

hb_ot_layout_language_get_required_feature_index ()

+
hb_bool_t
+hb_ot_layout_language_get_required_feature_index
+                               (hb_face_t *face,
+                                hb_tag_t table_tag,
+                                unsigned int script_index,
+                                unsigned int language_index,
+                                unsigned int *feature_index);
+
+
+
+

Types and Values

+
+

HB_OT_LAYOUT_DEFAULT_LANGUAGE_INDEX

+
#define HB_OT_LAYOUT_DEFAULT_LANGUAGE_INDEX 0xFFFFu
+
+
+
+
+

HB_OT_LAYOUT_NO_FEATURE_INDEX

+
#define HB_OT_LAYOUT_NO_FEATURE_INDEX		0xFFFFu
+
+
+
+
+

HB_OT_LAYOUT_NO_SCRIPT_INDEX

+
#define HB_OT_LAYOUT_NO_SCRIPT_INDEX		0xFFFFu
+
+
+
+
+

HB_OT_LAYOUT_NO_VARIATIONS_INDEX

+
#define HB_OT_LAYOUT_NO_VARIATIONS_INDEX 0xFFFFFFFFu
+
+
+
+
+

HB_OT_TAG_GDEF

+
#define HB_OT_TAG_GDEF HB_TAG('G','D','E','F')
+
+
+
+
+

HB_OT_TAG_GPOS

+
#define HB_OT_TAG_GPOS HB_TAG('G','P','O','S')
+
+
+
+
+

HB_OT_TAG_GSUB

+
#define HB_OT_TAG_GSUB HB_TAG('G','S','U','B')
+
+
+
+
+

HB_OT_TAG_JSTF

+
#define HB_OT_TAG_JSTF HB_TAG('J','S','T','F')
+
+
+
+
+

enum hb_ot_layout_glyph_class_t

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

HB_OT_LAYOUT_GLYPH_CLASS_UNCLASSIFIED

  

HB_OT_LAYOUT_GLYPH_CLASS_BASE_GLYPH

  

HB_OT_LAYOUT_GLYPH_CLASS_LIGATURE

  

HB_OT_LAYOUT_GLYPH_CLASS_MARK

  

HB_OT_LAYOUT_GLYPH_CLASS_COMPONENT

  
+
+
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/harfbuzz-hb-ot-math.html b/docs/html/harfbuzz-hb-ot-math.html new file mode 100644 index 0000000..49e0625 --- /dev/null +++ b/docs/html/harfbuzz-hb-ot-math.html @@ -0,0 +1,967 @@ + + + + +hb-ot-math: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

hb-ot-math

+

hb-ot-math

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+hb_bool_t + +hb_ot_math_has_data () +
+hb_position_t + +hb_ot_math_get_constant () +
+hb_position_t + +hb_ot_math_get_glyph_italics_correction () +
+hb_position_t + +hb_ot_math_get_glyph_top_accent_attachment () +
+hb_position_t + +hb_ot_math_get_glyph_kerning () +
+hb_bool_t + +hb_ot_math_is_glyph_extended_shape () +
unsigned int + +hb_ot_math_get_glyph_variants () +
+hb_position_t + +hb_ot_math_get_min_connector_overlap () +
unsigned int + +hb_ot_math_get_glyph_assembly () +
+
+
+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#defineHB_OT_TAG_MATH
#defineHB_OT_MATH_SCRIPT
enumhb_ot_math_constant_t
enumhb_ot_math_kern_t
 hb_ot_math_glyph_variant_t
enumhb_ot_math_glyph_part_flags_t
 hb_ot_math_glyph_part_t
+
+
+

Object Hierarchy

+
    GEnum
+    ├── hb_ot_math_constant_t
+    ╰── hb_ot_math_kern_t
+    GFlags
+    ╰── hb_ot_math_glyph_part_flags_t
+
+
+
+

Description

+
+
+

Functions

+
+

hb_ot_math_has_data ()

+
hb_bool_t
+hb_ot_math_has_data (hb_face_t *face);
+

This function allows to verify the presence of an OpenType MATH table on the +face.

+
+

Parameters

+
+++++ + + + + + +

face

hb_face_t to test

 
+
+
+

Returns

+

true if face has a MATH table, false otherwise

+

+
+

Since 1.3.3

+
+
+
+

hb_ot_math_get_constant ()

+
hb_position_t
+hb_ot_math_get_constant (hb_font_t *font,
+                         hb_ot_math_constant_t constant);
+

This function returns the requested math constants as a hb_position_t. +If the request constant is HB_OT_MATH_CONSTANT_SCRIPT_PERCENT_SCALE_DOWN, +HB_OT_MATH_CONSTANT_SCRIPT_SCRIPT_PERCENT_SCALE_DOWN or +HB_OT_MATH_CONSTANT_SCRIPT_PERCENT_SCALE_DOWN then the return value is +actually an integer between 0 and 100 representing that percentage.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

font

hb_font_t from which to retrieve the value

 

constant

hb_ot_math_constant_t the constant to retrieve

 
+
+
+

Returns

+

the requested constant or 0

+

+
+

Since 1.3.3

+
+
+
+

hb_ot_math_get_glyph_italics_correction ()

+
hb_position_t
+hb_ot_math_get_glyph_italics_correction
+                               (hb_font_t *font,
+                                hb_codepoint_t glyph);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

font

hb_font_t from which to retrieve the value

 

glyph

glyph index from which to retrieve the value

 
+
+
+

Returns

+

the italics correction of the glyph or 0

+

+
+

Since 1.3.3

+
+
+
+

hb_ot_math_get_glyph_top_accent_attachment ()

+
hb_position_t
+hb_ot_math_get_glyph_top_accent_attachment
+                               (hb_font_t *font,
+                                hb_codepoint_t glyph);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

font

hb_font_t from which to retrieve the value

 

glyph

glyph index from which to retrieve the value

 
+
+
+

Returns

+

the top accent attachment of the glyph or 0

+

+
+

Since 1.3.3

+
+
+
+

hb_ot_math_get_glyph_kerning ()

+
hb_position_t
+hb_ot_math_get_glyph_kerning (hb_font_t *font,
+                              hb_codepoint_t glyph,
+                              hb_ot_math_kern_t kern,
+                              hb_position_t correction_height);
+

This function tries to retrieve the MathKern table for the specified font, +glyph and hb_ot_math_kern_t. Then it browses the list of heights from the +MathKern table to find one value that is greater or equal to specified +correction_height. If one is found the corresponding value from the list of +kerns is returned and otherwise the last kern value is returned.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

font

hb_font_t from which to retrieve the value

 

glyph

glyph index from which to retrieve the value

 

kern

the hb_ot_math_kern_t from which to retrieve the value

 

correction_height

the correction height to use to determine the kerning.

 
+
+
+

Returns

+

requested kerning or 0

+

+
+

Since 1.3.3

+
+
+
+

hb_ot_math_is_glyph_extended_shape ()

+
hb_bool_t
+hb_ot_math_is_glyph_extended_shape (hb_face_t *face,
+                                    hb_codepoint_t glyph);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

face

a hb_face_t to test

 

glyph

a glyph index to test

 
+
+
+

Returns

+

true if the glyph is an extended shape, false otherwise

+

+
+

Since 1.3.3

+
+
+
+

hb_ot_math_get_glyph_variants ()

+
unsigned int
+hb_ot_math_get_glyph_variants (hb_font_t *font,
+                               hb_codepoint_t glyph,
+                               hb_direction_t direction,
+                               unsigned int start_offset,
+                               unsigned int *variants_count,
+                               hb_ot_math_glyph_variant_t *variants);
+

This function tries to retrieve the MathGlyphConstruction for the specified +font, glyph and direction. Note that only the value of +HB_DIRECTION_IS_HORIZONTAL is considered. It provides the corresponding list +of size variants as an array of hb_ot_math_glyph_variant_t structs.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

font

hb_font_t from which to retrieve the values

 

glyph

index of the glyph to stretch

 

direction

direction of the stretching

 

start_offset

offset of the first variant to retrieve

 

variants_count

maximum number of variants to retrieve after start_offset +(IN) and actual number of variants retrieved (OUT)

 

variants

array of size at least variants_count +to store the result

 
+
+
+

Returns

+

the total number of size variants available or 0

+

+
+

Since 1.3.3

+
+
+
+

hb_ot_math_get_min_connector_overlap ()

+
hb_position_t
+hb_ot_math_get_min_connector_overlap (hb_font_t *font,
+                                      hb_direction_t direction);
+

This function tries to retrieve the MathVariants table for the specified +font and returns the minimum overlap of connecting glyphs to draw a glyph +assembly in the specified direction. Note that only the value of +HB_DIRECTION_IS_HORIZONTAL is considered.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

font

hb_font_t from which to retrieve the value

 

direction

direction of the stretching

 
+
+
+

Returns

+

requested min connector overlap or 0

+

+
+

Since 1.3.3

+
+
+
+

hb_ot_math_get_glyph_assembly ()

+
unsigned int
+hb_ot_math_get_glyph_assembly (hb_font_t *font,
+                               hb_codepoint_t glyph,
+                               hb_direction_t direction,
+                               unsigned int start_offset,
+                               unsigned int *parts_count,
+                               hb_ot_math_glyph_part_t *parts,
+                               hb_position_t *italics_correction);
+

This function tries to retrieve the GlyphAssembly for the specified font, +glyph and direction. Note that only the value of HB_DIRECTION_IS_HORIZONTAL +is considered. It provides the information necessary to draw the glyph +assembly as an array of hb_ot_math_glyph_part_t.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

font

hb_font_t from which to retrieve the values

 

glyph

index of the glyph to stretch

 

direction

direction of the stretching

 

start_offset

offset of the first glyph part to retrieve

 

parts_count

maximum number of glyph parts to retrieve after start_offset +(IN) and actual number of parts retrieved (OUT)

 

parts

array of size at least parts_count +to store the result

 

italics_correction

italic correction of the glyph assembly

 
+
+
+

Returns

+

the total number of parts in the glyph assembly

+

+
+

Since 1.3.3

+
+
+
+

Types and Values

+
+

HB_OT_TAG_MATH

+
#define HB_OT_TAG_MATH HB_TAG('M','A','T','H')
+
+
+
+
+

HB_OT_MATH_SCRIPT

+
#define HB_OT_MATH_SCRIPT HB_TAG('m','a','t','h')
+
+
+
+
+

enum hb_ot_math_constant_t

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

HB_OT_MATH_CONSTANT_SCRIPT_PERCENT_SCALE_DOWN

  

HB_OT_MATH_CONSTANT_SCRIPT_SCRIPT_PERCENT_SCALE_DOWN

  

HB_OT_MATH_CONSTANT_DELIMITED_SUB_FORMULA_MIN_HEIGHT

  

HB_OT_MATH_CONSTANT_DISPLAY_OPERATOR_MIN_HEIGHT

  

HB_OT_MATH_CONSTANT_MATH_LEADING

  

HB_OT_MATH_CONSTANT_AXIS_HEIGHT

  

HB_OT_MATH_CONSTANT_ACCENT_BASE_HEIGHT

  

HB_OT_MATH_CONSTANT_FLATTENED_ACCENT_BASE_HEIGHT

  

HB_OT_MATH_CONSTANT_SUBSCRIPT_SHIFT_DOWN

  

HB_OT_MATH_CONSTANT_SUBSCRIPT_TOP_MAX

  

HB_OT_MATH_CONSTANT_SUBSCRIPT_BASELINE_DROP_MIN

  

HB_OT_MATH_CONSTANT_SUPERSCRIPT_SHIFT_UP

  

HB_OT_MATH_CONSTANT_SUPERSCRIPT_SHIFT_UP_CRAMPED

  

HB_OT_MATH_CONSTANT_SUPERSCRIPT_BOTTOM_MIN

  

HB_OT_MATH_CONSTANT_SUPERSCRIPT_BASELINE_DROP_MAX

  

HB_OT_MATH_CONSTANT_SUB_SUPERSCRIPT_GAP_MIN

  

HB_OT_MATH_CONSTANT_SUPERSCRIPT_BOTTOM_MAX_WITH_SUBSCRIPT

  

HB_OT_MATH_CONSTANT_SPACE_AFTER_SCRIPT

  

HB_OT_MATH_CONSTANT_UPPER_LIMIT_GAP_MIN

  

HB_OT_MATH_CONSTANT_UPPER_LIMIT_BASELINE_RISE_MIN

  

HB_OT_MATH_CONSTANT_LOWER_LIMIT_GAP_MIN

  

HB_OT_MATH_CONSTANT_LOWER_LIMIT_BASELINE_DROP_MIN

  

HB_OT_MATH_CONSTANT_STACK_TOP_SHIFT_UP

  

HB_OT_MATH_CONSTANT_STACK_TOP_DISPLAY_STYLE_SHIFT_UP

  

HB_OT_MATH_CONSTANT_STACK_BOTTOM_SHIFT_DOWN

  

HB_OT_MATH_CONSTANT_STACK_BOTTOM_DISPLAY_STYLE_SHIFT_DOWN

  

HB_OT_MATH_CONSTANT_STACK_GAP_MIN

  

HB_OT_MATH_CONSTANT_STACK_DISPLAY_STYLE_GAP_MIN

  

HB_OT_MATH_CONSTANT_STRETCH_STACK_TOP_SHIFT_UP

  

HB_OT_MATH_CONSTANT_STRETCH_STACK_BOTTOM_SHIFT_DOWN

  

HB_OT_MATH_CONSTANT_STRETCH_STACK_GAP_ABOVE_MIN

  

HB_OT_MATH_CONSTANT_STRETCH_STACK_GAP_BELOW_MIN

  

HB_OT_MATH_CONSTANT_FRACTION_NUMERATOR_SHIFT_UP

  

HB_OT_MATH_CONSTANT_FRACTION_NUMERATOR_DISPLAY_STYLE_SHIFT_UP

  

HB_OT_MATH_CONSTANT_FRACTION_DENOMINATOR_SHIFT_DOWN

  

HB_OT_MATH_CONSTANT_FRACTION_DENOMINATOR_DISPLAY_STYLE_SHIFT_DOWN

  

HB_OT_MATH_CONSTANT_FRACTION_NUMERATOR_GAP_MIN

  

HB_OT_MATH_CONSTANT_FRACTION_NUM_DISPLAY_STYLE_GAP_MIN

  

HB_OT_MATH_CONSTANT_FRACTION_RULE_THICKNESS

  

HB_OT_MATH_CONSTANT_FRACTION_DENOMINATOR_GAP_MIN

  

HB_OT_MATH_CONSTANT_FRACTION_DENOM_DISPLAY_STYLE_GAP_MIN

  

HB_OT_MATH_CONSTANT_SKEWED_FRACTION_HORIZONTAL_GAP

  

HB_OT_MATH_CONSTANT_SKEWED_FRACTION_VERTICAL_GAP

  

HB_OT_MATH_CONSTANT_OVERBAR_VERTICAL_GAP

  

HB_OT_MATH_CONSTANT_OVERBAR_RULE_THICKNESS

  

HB_OT_MATH_CONSTANT_OVERBAR_EXTRA_ASCENDER

  

HB_OT_MATH_CONSTANT_UNDERBAR_VERTICAL_GAP

  

HB_OT_MATH_CONSTANT_UNDERBAR_RULE_THICKNESS

  

HB_OT_MATH_CONSTANT_UNDERBAR_EXTRA_DESCENDER

  

HB_OT_MATH_CONSTANT_RADICAL_VERTICAL_GAP

  

HB_OT_MATH_CONSTANT_RADICAL_DISPLAY_STYLE_VERTICAL_GAP

  

HB_OT_MATH_CONSTANT_RADICAL_RULE_THICKNESS

  

HB_OT_MATH_CONSTANT_RADICAL_EXTRA_ASCENDER

  

HB_OT_MATH_CONSTANT_RADICAL_KERN_BEFORE_DEGREE

  

HB_OT_MATH_CONSTANT_RADICAL_KERN_AFTER_DEGREE

  

HB_OT_MATH_CONSTANT_RADICAL_DEGREE_BOTTOM_RAISE_PERCENT

  
+
+

Since 1.3.3

+
+
+
+

enum hb_ot_math_kern_t

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

HB_OT_MATH_KERN_TOP_RIGHT

  

HB_OT_MATH_KERN_TOP_LEFT

  

HB_OT_MATH_KERN_BOTTOM_RIGHT

  

HB_OT_MATH_KERN_BOTTOM_LEFT

  
+
+

Since 1.3.3

+
+
+
+

hb_ot_math_glyph_variant_t

+
typedef struct {
+  hb_codepoint_t glyph;
+  hb_position_t advance;
+} hb_ot_math_glyph_variant_t;
+
+

Since 1.3.3

+
+
+
+

enum hb_ot_math_glyph_part_flags_t

+
+

Members

+
+++++ + + + + + +

HB_MATH_GLYPH_PART_FLAG_EXTENDER

  
+
+

Since 1.3.3

+
+
+
+

hb_ot_math_glyph_part_t

+
typedef struct {
+  hb_codepoint_t glyph;
+  hb_position_t start_connector_length;
+  hb_position_t end_connector_length;
+  hb_position_t full_advance;
+  hb_ot_math_glyph_part_flags_t flags;
+} hb_ot_math_glyph_part_t;
+
+

Since 1.3.3

+
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/harfbuzz-hb-ot-shape.html b/docs/html/harfbuzz-hb-ot-shape.html new file mode 100644 index 0000000..6ab24c3 --- /dev/null +++ b/docs/html/harfbuzz-hb-ot-shape.html @@ -0,0 +1,80 @@ + + + + +hb-ot-shape: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

hb-ot-shape

+

hb-ot-shape

+
+
+

Functions

+
++++ + + + + +
+void + +hb_ot_shape_glyphs_closure () +
+
+
+

Object Hierarchy

+
+
+
+
+

Description

+
+
+

Functions

+
+

hb_ot_shape_glyphs_closure ()

+
void
+hb_ot_shape_glyphs_closure (hb_font_t *font,
+                            hb_buffer_t *buffer,
+                            const hb_feature_t *features,
+                            unsigned int num_features,
+                            hb_set_t *glyphs);
+

Since 0.9.2

+
+
+
+

Types and Values

+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/harfbuzz-hb-ot-tag.html b/docs/html/harfbuzz-hb-ot-tag.html new file mode 100644 index 0000000..c3d1e0c --- /dev/null +++ b/docs/html/harfbuzz-hb-ot-tag.html @@ -0,0 +1,157 @@ + + + + +hb-ot-tag: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

hb-ot-tag

+

hb-ot-tag

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + +
+hb_tag_t + +hb_ot_tag_from_language () +
+hb_language_t + +hb_ot_tag_to_language () +
+hb_script_t + +hb_ot_tag_to_script () +
+void + +hb_ot_tags_from_script () +
+
+
+

Types and Values

+
++++ + + + + + + + + + + +
#defineHB_OT_TAG_DEFAULT_LANGUAGE
#defineHB_OT_TAG_DEFAULT_SCRIPT
+
+
+

Object Hierarchy

+
+
+
+
+

Description

+
+
+

Functions

+
+

hb_ot_tag_from_language ()

+
hb_tag_t
+hb_ot_tag_from_language (hb_language_t language);
+
+
+
+

hb_ot_tag_to_language ()

+
hb_language_t
+hb_ot_tag_to_language (hb_tag_t tag);
+
+

Returns

+

.

+

[transfer none]

+
+

Since 0.9.2

+
+
+
+

hb_ot_tag_to_script ()

+
hb_script_t
+hb_ot_tag_to_script (hb_tag_t tag);
+
+
+
+

hb_ot_tags_from_script ()

+
void
+hb_ot_tags_from_script (hb_script_t script,
+                        hb_tag_t *script_tag_1,
+                        hb_tag_t *script_tag_2);
+
+
+
+

Types and Values

+
+

HB_OT_TAG_DEFAULT_LANGUAGE

+
#define HB_OT_TAG_DEFAULT_LANGUAGE HB_TAG ('d', 'f', 'l', 't')
+
+
+
+
+

HB_OT_TAG_DEFAULT_SCRIPT

+
#define HB_OT_TAG_DEFAULT_SCRIPT HB_TAG ('D', 'F', 'L', 'T')
+
+
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/harfbuzz-hb-ot.html b/docs/html/harfbuzz-hb-ot.html new file mode 100644 index 0000000..78bca17 --- /dev/null +++ b/docs/html/harfbuzz-hb-ot.html @@ -0,0 +1,53 @@ + + + + +hb-ot: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

hb-ot

+

hb-ot

+
+
+

Object Hierarchy

+
+
+
+
+

Description

+
+
+

Functions

+
+
+

Types and Values

+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/harfbuzz-hb-set.html b/docs/html/harfbuzz-hb-set.html new file mode 100644 index 0000000..32f54db --- /dev/null +++ b/docs/html/harfbuzz-hb-set.html @@ -0,0 +1,947 @@ + + + + +hb-set: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

hb-set

+

hb-set

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#defineHB_SET_VALUE_INVALID
+void + +hb_set_add () +
+void + +hb_set_add_range () +
+hb_bool_t + +hb_set_allocation_successful () +
+void + +hb_set_clear () +
+hb_set_t * + +hb_set_create () +
+void + +hb_set_del () +
+void + +hb_set_del_range () +
+void + +hb_set_destroy () +
+hb_set_t * + +hb_set_get_empty () +
+hb_codepoint_t + +hb_set_get_max () +
+hb_codepoint_t + +hb_set_get_min () +
unsigned int + +hb_set_get_population () +
+void * + +hb_set_get_user_data () +
+hb_bool_t + +hb_set_has () +
+void + +hb_set_intersect () +
+void + +hb_set_invert () +
+hb_bool_t + +hb_set_is_empty () +
+hb_bool_t + +hb_set_is_equal () +
+hb_bool_t + +hb_set_next () +
+hb_bool_t + +hb_set_next_range () +
+hb_set_t * + +hb_set_reference () +
+void + +hb_set_set () +
+hb_bool_t + +hb_set_set_user_data () +
+void + +hb_set_subtract () +
+void + +hb_set_symmetric_difference () +
+void + +hb_set_union () +
+
+
+

Types and Values

+
++++ + + + + +
typedefhb_set_t
+
+
+

Object Hierarchy

+
    GBoxed
+    ╰── hb_set_t
+
+
+
+

Description

+
+
+

Functions

+
+

HB_SET_VALUE_INVALID

+
#define HB_SET_VALUE_INVALID ((hb_codepoint_t) -1)
+
+
+
+
+

hb_set_add ()

+
void
+hb_set_add (hb_set_t *set,
+            hb_codepoint_t codepoint);
+
+

Parameters

+
+++++ + + + + + +

set

a set.

 
+
+

Since 0.9.2

+
+
+
+

hb_set_add_range ()

+
void
+hb_set_add_range (hb_set_t *set,
+                  hb_codepoint_t first,
+                  hb_codepoint_t last);
+
+

Parameters

+
+++++ + + + + + +

set

a set.

 
+
+

Since 0.9.7

+
+
+
+

hb_set_allocation_successful ()

+
hb_bool_t
+hb_set_allocation_successful (const hb_set_t *set);
+
+

Parameters

+
+++++ + + + + + +

set

a set.

 
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_set_clear ()

+
void
+hb_set_clear (hb_set_t *set);
+
+

Parameters

+
+++++ + + + + + +

set

a set.

 
+
+

Since 0.9.2

+
+
+
+

hb_set_create ()

+
hb_set_t *
+hb_set_create (void);
+
+
+
+

hb_set_del ()

+
void
+hb_set_del (hb_set_t *set,
+            hb_codepoint_t codepoint);
+
+

Parameters

+
+++++ + + + + + +

set

a set.

 
+
+

Since 0.9.2

+
+
+
+

hb_set_del_range ()

+
void
+hb_set_del_range (hb_set_t *set,
+                  hb_codepoint_t first,
+                  hb_codepoint_t last);
+
+

Parameters

+
+++++ + + + + + +

set

a set.

 
+
+

Since 0.9.7

+
+
+
+

hb_set_destroy ()

+
void
+hb_set_destroy (hb_set_t *set);
+
+

Parameters

+
+++++ + + + + + +

set

a set.

 
+
+

Since 0.9.2

+
+
+
+

hb_set_get_empty ()

+
hb_set_t *
+hb_set_get_empty (void);
+
+

Returns

+

.

+

[transfer full]

+
+

Since 0.9.2

+
+
+
+

hb_set_get_max ()

+
hb_codepoint_t
+hb_set_get_max (const hb_set_t *set);
+

Finds the maximum number in the set.

+
+

Parameters

+
+++++ + + + + + +

set

a set.

 
+
+
+

Returns

+

minimum of the set, or HB_SET_VALUE_INVALID if set is empty.

+

+
+

Since 0.9.7

+
+
+
+

hb_set_get_min ()

+
hb_codepoint_t
+hb_set_get_min (const hb_set_t *set);
+

Finds the minimum number in the set.

+
+

Parameters

+
+++++ + + + + + +

set

a set.

 
+
+
+

Returns

+

minimum of the set, or HB_SET_VALUE_INVALID if set is empty.

+

+
+

Since 0.9.7

+
+
+
+

hb_set_get_population ()

+
unsigned int
+hb_set_get_population (const hb_set_t *set);
+

Returns the number of numbers in the set.

+
+

Parameters

+
+++++ + + + + + +

set

a set.

 
+
+
+

Returns

+

set population.

+

+
+

Since 0.9.7

+
+
+
+

hb_set_get_user_data ()

+
void *
+hb_set_get_user_data (hb_set_t *set,
+                      hb_user_data_key_t *key);
+
+

Parameters

+
+++++ + + + + + +

set

a set.

 
+
+
+

Returns

+

.

+

[transfer none]

+
+

Since 0.9.2

+
+
+
+

hb_set_has ()

+
hb_bool_t
+hb_set_has (const hb_set_t *set,
+            hb_codepoint_t codepoint);
+
+

Parameters

+
+++++ + + + + + +

set

a set.

 
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_set_intersect ()

+
void
+hb_set_intersect (hb_set_t *set,
+                  const hb_set_t *other);
+
+

Parameters

+
+++++ + + + + + +

set

a set.

 
+
+

Since 0.9.2

+
+
+
+

hb_set_invert ()

+
void
+hb_set_invert (hb_set_t *set);
+
+

Parameters

+
+++++ + + + + + +

set

a set.

 
+
+

Since 0.9.10

+
+
+
+

hb_set_is_empty ()

+
hb_bool_t
+hb_set_is_empty (const hb_set_t *set);
+
+

Parameters

+
+++++ + + + + + +

set

a set.

 
+
+
+

Returns

+

+
+

Since 0.9.7

+
+
+
+

hb_set_is_equal ()

+
hb_bool_t
+hb_set_is_equal (const hb_set_t *set,
+                 const hb_set_t *other);
+
+

Parameters

+
+++++ + + + + + +

set

a set.

 
+
+
+

Returns

+

+
+

Since 0.9.7

+
+
+
+

hb_set_next ()

+
hb_bool_t
+hb_set_next (const hb_set_t *set,
+             hb_codepoint_t *codepoint);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

set

a set.

 

codepoint

.

[inout]
+
+
+

Returns

+

whether there was a next value.

+

+
+

Since 0.9.2

+
+
+
+

hb_set_next_range ()

+
hb_bool_t
+hb_set_next_range (const hb_set_t *set,
+                   hb_codepoint_t *first,
+                   hb_codepoint_t *last);
+

Gets the next consecutive range of numbers in set + that +are greater than current value of last +.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

set

a set.

 

first

output first codepoint in the range.

[out]

last

input current last and output last codepoint in the range.

[inout]
+
+
+

Returns

+

whether there was a next range.

+

+
+

Since 0.9.7

+
+
+
+

hb_set_reference ()

+
hb_set_t *
+hb_set_reference (hb_set_t *set);
+
+

Parameters

+
+++++ + + + + + +

set

a set.

 
+
+
+

Returns

+

.

+

[transfer full]

+
+

Since 0.9.2

+
+
+
+

hb_set_set ()

+
void
+hb_set_set (hb_set_t *set,
+            const hb_set_t *other);
+
+

Parameters

+
+++++ + + + + + +

set

a set.

 
+
+

Since 0.9.2

+
+
+
+

hb_set_set_user_data ()

+
hb_bool_t
+hb_set_set_user_data (hb_set_t *set,
+                      hb_user_data_key_t *key,
+                      void *data,
+                      hb_destroy_func_t destroy,
+                      hb_bool_t replace);
+
+

Parameters

+
+++++ + + + + + +

set

a set.

 
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_set_subtract ()

+
void
+hb_set_subtract (hb_set_t *set,
+                 const hb_set_t *other);
+
+

Parameters

+
+++++ + + + + + +

set

a set.

 
+
+

Since 0.9.2

+
+
+
+

hb_set_symmetric_difference ()

+
void
+hb_set_symmetric_difference (hb_set_t *set,
+                             const hb_set_t *other);
+
+

Parameters

+
+++++ + + + + + +

set

a set.

 
+
+

Since 0.9.2

+
+
+
+

hb_set_union ()

+
void
+hb_set_union (hb_set_t *set,
+              const hb_set_t *other);
+
+

Parameters

+
+++++ + + + + + +

set

a set.

 
+
+

Since 0.9.2

+
+
+
+

Types and Values

+
+

hb_set_t

+
typedef struct hb_set_t hb_set_t;
+
+
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/harfbuzz-hb-shape-plan.html b/docs/html/harfbuzz-hb-shape-plan.html new file mode 100644 index 0000000..9225dee --- /dev/null +++ b/docs/html/harfbuzz-hb-shape-plan.html @@ -0,0 +1,434 @@ + + + + +hb-shape-plan: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

hb-shape-plan

+

hb-shape-plan

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+hb_shape_plan_t * + +hb_shape_plan_create () +
+hb_shape_plan_t * + +hb_shape_plan_create_cached () +
+hb_shape_plan_t * + +hb_shape_plan_create2 () +
+hb_shape_plan_t * + +hb_shape_plan_create_cached2 () +
+void + +hb_shape_plan_destroy () +
+hb_bool_t + +hb_shape_plan_execute () +
+hb_shape_plan_t * + +hb_shape_plan_get_empty () +
const char * + +hb_shape_plan_get_shaper () +
+void * + +hb_shape_plan_get_user_data () +
+hb_shape_plan_t * + +hb_shape_plan_reference () +
+hb_bool_t + +hb_shape_plan_set_user_data () +
+
+
+

Types and Values

+
++++ + + + + +
typedefhb_shape_plan_t
+
+
+

Object Hierarchy

+
    GBoxed
+    ╰── hb_shape_plan_t
+
+
+
+

Description

+
+
+

Functions

+
+

hb_shape_plan_create ()

+
hb_shape_plan_t *
+hb_shape_plan_create (hb_face_t *face,
+                      const hb_segment_properties_t *props,
+                      const hb_feature_t *user_features,
+                      unsigned int num_user_features,
+                      const char * const *shaper_list);
+
+
+
+

hb_shape_plan_create_cached ()

+
hb_shape_plan_t *
+hb_shape_plan_create_cached (hb_face_t *face,
+                             const hb_segment_properties_t *props,
+                             const hb_feature_t *user_features,
+                             unsigned int num_user_features,
+                             const char * const *shaper_list);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

user_features

.

[array length=num_user_features]

shaper_list

.

[array zero-terminated=1]
+
+
+

Returns

+

.

+

[transfer full]

+
+

Since 0.9.7

+
+
+
+

hb_shape_plan_create2 ()

+
hb_shape_plan_t *
+hb_shape_plan_create2 (hb_face_t *face,
+                       const hb_segment_properties_t *props,
+                       const hb_feature_t *user_features,
+                       unsigned int num_user_features,
+                       const int *coords,
+                       unsigned int num_coords,
+                       const char * const *shaper_list);
+
+
+
+

hb_shape_plan_create_cached2 ()

+
hb_shape_plan_t *
+hb_shape_plan_create_cached2 (hb_face_t *face,
+                              const hb_segment_properties_t *props,
+                              const hb_feature_t *user_features,
+                              unsigned int num_user_features,
+                              const int *coords,
+                              unsigned int num_coords,
+                              const char * const *shaper_list);
+
+
+
+

hb_shape_plan_destroy ()

+
void
+hb_shape_plan_destroy (hb_shape_plan_t *shape_plan);
+
+

Parameters

+
+++++ + + + + + +

shape_plan

a shape plan.

 
+
+

Since 0.9.7

+
+
+
+

hb_shape_plan_execute ()

+
hb_bool_t
+hb_shape_plan_execute (hb_shape_plan_t *shape_plan,
+                       hb_font_t *font,
+                       hb_buffer_t *buffer,
+                       const hb_feature_t *features,
+                       unsigned int num_features);
+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

shape_plan

a shape plan.

 

font

a font.

 

buffer

a buffer.

 

features

.

[array length=num_features]
+
+
+

Returns

+

+
+

Since 0.9.7

+
+
+
+

hb_shape_plan_get_empty ()

+
hb_shape_plan_t *
+hb_shape_plan_get_empty (void);
+
+

Returns

+

.

+

[transfer full]

+
+

Since 0.9.7

+
+
+
+

hb_shape_plan_get_shaper ()

+
const char *
+hb_shape_plan_get_shaper (hb_shape_plan_t *shape_plan);
+
+

Parameters

+
+++++ + + + + + +

shape_plan

a shape plan.

 
+
+
+

Returns

+

.

+

[transfer none]

+
+

Since 0.9.7

+
+
+
+

hb_shape_plan_get_user_data ()

+
void *
+hb_shape_plan_get_user_data (hb_shape_plan_t *shape_plan,
+                             hb_user_data_key_t *key);
+
+

Parameters

+
+++++ + + + + + +

shape_plan

a shape plan.

 
+
+
+

Returns

+

.

+

[transfer none]

+
+

Since 0.9.7

+
+
+
+

hb_shape_plan_reference ()

+
hb_shape_plan_t *
+hb_shape_plan_reference (hb_shape_plan_t *shape_plan);
+
+

Parameters

+
+++++ + + + + + +

shape_plan

a shape plan.

 
+
+
+

Returns

+

.

+

[transfer full]

+
+

Since 0.9.7

+
+
+
+

hb_shape_plan_set_user_data ()

+
hb_bool_t
+hb_shape_plan_set_user_data (hb_shape_plan_t *shape_plan,
+                             hb_user_data_key_t *key,
+                             void *data,
+                             hb_destroy_func_t destroy,
+                             hb_bool_t replace);
+
+

Parameters

+
+++++ + + + + + +

shape_plan

a shape plan.

 
+
+
+

Returns

+

+
+

Since 0.9.7

+
+
+
+

Types and Values

+
+

hb_shape_plan_t

+
typedef struct hb_shape_plan_t hb_shape_plan_t;
+
+
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/harfbuzz-hb-unicode.html b/docs/html/harfbuzz-hb-unicode.html new file mode 100644 index 0000000..cc46bec --- /dev/null +++ b/docs/html/harfbuzz-hb-unicode.html @@ -0,0 +1,1495 @@ + + + + +hb-unicode: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

hb-unicode

+

hb-unicode

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#defineHB_UNICODE_MAX_DECOMPOSITION_LEN
+hb_unicode_combining_class_t + +hb_unicode_combining_class () +
+hb_unicode_combining_class_t + +(*hb_unicode_combining_class_func_t) () +
+hb_bool_t + +hb_unicode_compose () +
+hb_bool_t + +(*hb_unicode_compose_func_t) () +
+hb_bool_t + +hb_unicode_decompose () +
unsigned int + +hb_unicode_decompose_compatibility () +
+hb_bool_t + +(*hb_unicode_decompose_func_t) () +
unsigned int + +hb_unicode_eastasian_width () +
+hb_unicode_funcs_t * + +hb_unicode_funcs_create () +
+void + +hb_unicode_funcs_destroy () +
+hb_unicode_funcs_t * + +hb_unicode_funcs_get_default () +
+hb_unicode_funcs_t * + +hb_unicode_funcs_get_empty () +
+hb_unicode_funcs_t * + +hb_unicode_funcs_get_parent () +
+void * + +hb_unicode_funcs_get_user_data () +
+hb_bool_t + +hb_unicode_funcs_is_immutable () +
+void + +hb_unicode_funcs_make_immutable () +
+hb_unicode_funcs_t * + +hb_unicode_funcs_reference () +
+void + +hb_unicode_funcs_set_combining_class_func () +
+void + +hb_unicode_funcs_set_compose_func () +
+void + +hb_unicode_funcs_set_decompose_compatibility_func () +
+void + +hb_unicode_funcs_set_decompose_func () +
+void + +hb_unicode_funcs_set_eastasian_width_func () +
+void + +hb_unicode_funcs_set_general_category_func () +
+void + +hb_unicode_funcs_set_mirroring_func () +
+void + +hb_unicode_funcs_set_script_func () +
+hb_bool_t + +hb_unicode_funcs_set_user_data () +
+hb_unicode_general_category_t + +hb_unicode_general_category () +
+hb_unicode_general_category_t + +(*hb_unicode_general_category_func_t) () +
+hb_codepoint_t + +hb_unicode_mirroring () +
+hb_codepoint_t + +(*hb_unicode_mirroring_func_t) () +
+hb_script_t + +hb_unicode_script () +
+hb_script_t + +(*hb_unicode_script_func_t) () +
+
+
+

Types and Values

+
++++ + + + + + + + + + + + + + + +
enumhb_unicode_combining_class_t
typedefhb_unicode_funcs_t
enumhb_unicode_general_category_t
+
+
+

Object Hierarchy

+
    GBoxed
+    ╰── hb_unicode_funcs_t
+    GEnum
+    ├── hb_unicode_combining_class_t
+    ╰── hb_unicode_general_category_t
+
+
+
+

Description

+
+
+

Functions

+
+

HB_UNICODE_MAX_DECOMPOSITION_LEN

+
#define HB_UNICODE_MAX_DECOMPOSITION_LEN (18+1) /* codepoints */
+
+
+
+
+

hb_unicode_combining_class ()

+
hb_unicode_combining_class_t
+hb_unicode_combining_class (hb_unicode_funcs_t *ufuncs,
+                            hb_codepoint_t unicode);
+

Since 0.9.2

+
+
+
+

hb_unicode_combining_class_func_t ()

+
hb_unicode_combining_class_t
+(*hb_unicode_combining_class_func_t) (hb_unicode_funcs_t *ufuncs,
+                                      hb_codepoint_t unicode,
+                                      void *user_data);
+
+
+
+

hb_unicode_compose ()

+
hb_bool_t
+hb_unicode_compose (hb_unicode_funcs_t *ufuncs,
+                    hb_codepoint_t a,
+                    hb_codepoint_t b,
+                    hb_codepoint_t *ab);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

ufuncs

Unicode functions.

 

ab

.

[out]
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_unicode_compose_func_t ()

+
hb_bool_t
+(*hb_unicode_compose_func_t) (hb_unicode_funcs_t *ufuncs,
+                              hb_codepoint_t a,
+                              hb_codepoint_t b,
+                              hb_codepoint_t *ab,
+                              void *user_data);
+
+
+
+

hb_unicode_decompose ()

+
hb_bool_t
+hb_unicode_decompose (hb_unicode_funcs_t *ufuncs,
+                      hb_codepoint_t ab,
+                      hb_codepoint_t *a,
+                      hb_codepoint_t *b);
+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

ufuncs

Unicode functions.

 

a

.

[out]

b

.

[out]
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_unicode_decompose_compatibility ()

+
unsigned int
+hb_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs,
+                                    hb_codepoint_t u,
+                                    hb_codepoint_t *decomposed);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

ufuncs

Unicode functions.

 

decomposed

.

[out]
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_unicode_decompose_func_t ()

+
hb_bool_t
+(*hb_unicode_decompose_func_t) (hb_unicode_funcs_t *ufuncs,
+                                hb_codepoint_t ab,
+                                hb_codepoint_t *a,
+                                hb_codepoint_t *b,
+                                void *user_data);
+
+
+
+

hb_unicode_eastasian_width ()

+
unsigned int
+hb_unicode_eastasian_width (hb_unicode_funcs_t *ufuncs,
+                            hb_codepoint_t unicode);
+

Since 0.9.2

+
+
+
+

hb_unicode_funcs_create ()

+
hb_unicode_funcs_t *
+hb_unicode_funcs_create (hb_unicode_funcs_t *parent);
+
+
+
+

hb_unicode_funcs_destroy ()

+
void
+hb_unicode_funcs_destroy (hb_unicode_funcs_t *ufuncs);
+
+

Parameters

+
+++++ + + + + + +

ufuncs

Unicode functions.

 
+
+

Since 0.9.2

+
+
+
+

hb_unicode_funcs_get_default ()

+
hb_unicode_funcs_t *
+hb_unicode_funcs_get_default (void);
+
+
+
+

hb_unicode_funcs_get_empty ()

+
hb_unicode_funcs_t *
+hb_unicode_funcs_get_empty (void);
+
+

Returns

+

.

+

[transfer full]

+
+

Since 0.9.2

+
+
+
+

hb_unicode_funcs_get_parent ()

+
hb_unicode_funcs_t *
+hb_unicode_funcs_get_parent (hb_unicode_funcs_t *ufuncs);
+
+

Parameters

+
+++++ + + + + + +

ufuncs

Unicode functions.

 
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_unicode_funcs_get_user_data ()

+
void *
+hb_unicode_funcs_get_user_data (hb_unicode_funcs_t *ufuncs,
+                                hb_user_data_key_t *key);
+
+

Parameters

+
+++++ + + + + + +

ufuncs

Unicode functions.

 
+
+
+

Returns

+

.

+

[transfer none]

+
+

Since 0.9.2

+
+
+
+

hb_unicode_funcs_is_immutable ()

+
hb_bool_t
+hb_unicode_funcs_is_immutable (hb_unicode_funcs_t *ufuncs);
+
+

Parameters

+
+++++ + + + + + +

ufuncs

Unicode functions.

 
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_unicode_funcs_make_immutable ()

+
void
+hb_unicode_funcs_make_immutable (hb_unicode_funcs_t *ufuncs);
+
+

Parameters

+
+++++ + + + + + +

ufuncs

Unicode functions.

 
+
+

Since 0.9.2

+
+
+
+

hb_unicode_funcs_reference ()

+
hb_unicode_funcs_t *
+hb_unicode_funcs_reference (hb_unicode_funcs_t *ufuncs);
+
+

Parameters

+
+++++ + + + + + +

ufuncs

Unicode functions.

 
+
+
+

Returns

+

.

+

[transfer full]

+
+

Since 0.9.2

+
+
+
+

hb_unicode_funcs_set_combining_class_func ()

+
void
+hb_unicode_funcs_set_combining_class_func
+                               (hb_unicode_funcs_t *ufuncs,
+                                hb_unicode_combining_class_func_t func,
+                                void *user_data,
+                                hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

ufuncs

a Unicode function structure

 

func

.

[closure user_data][destroy destroy][scope notified]
+
+

Since 0.9.2

+
+
+
+

hb_unicode_funcs_set_compose_func ()

+
void
+hb_unicode_funcs_set_compose_func (hb_unicode_funcs_t *ufuncs,
+                                   hb_unicode_compose_func_t func,
+                                   void *user_data,
+                                   hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

ufuncs

a Unicode function structure

 

func

.

[closure user_data][destroy destroy][scope notified]
+
+

Since 0.9.2

+
+
+
+

hb_unicode_funcs_set_decompose_compatibility_func ()

+
void
+hb_unicode_funcs_set_decompose_compatibility_func
+                               (hb_unicode_funcs_t *ufuncs,
+                                hb_unicode_decompose_compatibility_func_t func,
+                                void *user_data,
+                                hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

ufuncs

a Unicode function structure

 

func

.

[closure user_data][destroy destroy][scope notified]
+
+

Since 0.9.2

+
+
+
+

hb_unicode_funcs_set_decompose_func ()

+
void
+hb_unicode_funcs_set_decompose_func (hb_unicode_funcs_t *ufuncs,
+                                     hb_unicode_decompose_func_t func,
+                                     void *user_data,
+                                     hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

ufuncs

a Unicode function structure

 

func

.

[closure user_data][destroy destroy][scope notified]
+
+

Since 0.9.2

+
+
+
+

hb_unicode_funcs_set_eastasian_width_func ()

+
void
+hb_unicode_funcs_set_eastasian_width_func
+                               (hb_unicode_funcs_t *ufuncs,
+                                hb_unicode_eastasian_width_func_t func,
+                                void *user_data,
+                                hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

ufuncs

a Unicode function structure

 

func

.

[closure user_data][destroy destroy][scope notified]
+
+

Since 0.9.2

+
+
+
+

hb_unicode_funcs_set_general_category_func ()

+
void
+hb_unicode_funcs_set_general_category_func
+                               (hb_unicode_funcs_t *ufuncs,
+                                hb_unicode_general_category_func_t func,
+                                void *user_data,
+                                hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

ufuncs

a Unicode function structure

 

func

.

[closure user_data][destroy destroy][scope notified]
+
+

Since 0.9.2

+
+
+
+

hb_unicode_funcs_set_mirroring_func ()

+
void
+hb_unicode_funcs_set_mirroring_func (hb_unicode_funcs_t *ufuncs,
+                                     hb_unicode_mirroring_func_t func,
+                                     void *user_data,
+                                     hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

ufuncs

a Unicode function structure

 

func

.

[closure user_data][destroy destroy][scope notified]
+
+

Since 0.9.2

+
+
+
+

hb_unicode_funcs_set_script_func ()

+
void
+hb_unicode_funcs_set_script_func (hb_unicode_funcs_t *ufuncs,
+                                  hb_unicode_script_func_t func,
+                                  void *user_data,
+                                  hb_destroy_func_t destroy);
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

ufuncs

a Unicode function structure

 

func

.

[closure user_data][destroy destroy][scope notified]
+
+

Since 0.9.2

+
+
+
+

hb_unicode_funcs_set_user_data ()

+
hb_bool_t
+hb_unicode_funcs_set_user_data (hb_unicode_funcs_t *ufuncs,
+                                hb_user_data_key_t *key,
+                                void *data,
+                                hb_destroy_func_t destroy,
+                                hb_bool_t replace);
+
+

Parameters

+
+++++ + + + + + +

ufuncs

Unicode functions.

 
+
+
+

Returns

+

+
+

Since 0.9.2

+
+
+
+

hb_unicode_general_category ()

+
hb_unicode_general_category_t
+hb_unicode_general_category (hb_unicode_funcs_t *ufuncs,
+                             hb_codepoint_t unicode);
+

Since 0.9.2

+
+
+
+

hb_unicode_general_category_func_t ()

+
hb_unicode_general_category_t
+(*hb_unicode_general_category_func_t) (hb_unicode_funcs_t *ufuncs,
+                                       hb_codepoint_t unicode,
+                                       void *user_data);
+
+
+
+

hb_unicode_mirroring ()

+
hb_codepoint_t
+hb_unicode_mirroring (hb_unicode_funcs_t *ufuncs,
+                      hb_codepoint_t unicode);
+

Since 0.9.2

+
+
+
+

hb_unicode_mirroring_func_t ()

+
hb_codepoint_t
+(*hb_unicode_mirroring_func_t) (hb_unicode_funcs_t *ufuncs,
+                                hb_codepoint_t unicode,
+                                void *user_data);
+
+
+
+

hb_unicode_script ()

+
hb_script_t
+hb_unicode_script (hb_unicode_funcs_t *ufuncs,
+                   hb_codepoint_t unicode);
+

Since 0.9.2

+
+
+
+

hb_unicode_script_func_t ()

+
hb_script_t
+(*hb_unicode_script_func_t) (hb_unicode_funcs_t *ufuncs,
+                             hb_codepoint_t unicode,
+                             void *user_data);
+
+
+
+

Types and Values

+
+

enum hb_unicode_combining_class_t

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

HB_UNICODE_COMBINING_CLASS_NOT_REORDERED

  

HB_UNICODE_COMBINING_CLASS_OVERLAY

  

HB_UNICODE_COMBINING_CLASS_NUKTA

  

HB_UNICODE_COMBINING_CLASS_KANA_VOICING

  

HB_UNICODE_COMBINING_CLASS_VIRAMA

  

HB_UNICODE_COMBINING_CLASS_CCC10

  

HB_UNICODE_COMBINING_CLASS_CCC11

  

HB_UNICODE_COMBINING_CLASS_CCC12

  

HB_UNICODE_COMBINING_CLASS_CCC13

  

HB_UNICODE_COMBINING_CLASS_CCC14

  

HB_UNICODE_COMBINING_CLASS_CCC15

  

HB_UNICODE_COMBINING_CLASS_CCC16

  

HB_UNICODE_COMBINING_CLASS_CCC17

  

HB_UNICODE_COMBINING_CLASS_CCC18

  

HB_UNICODE_COMBINING_CLASS_CCC19

  

HB_UNICODE_COMBINING_CLASS_CCC20

  

HB_UNICODE_COMBINING_CLASS_CCC21

  

HB_UNICODE_COMBINING_CLASS_CCC22

  

HB_UNICODE_COMBINING_CLASS_CCC23

  

HB_UNICODE_COMBINING_CLASS_CCC24

  

HB_UNICODE_COMBINING_CLASS_CCC25

  

HB_UNICODE_COMBINING_CLASS_CCC26

  

HB_UNICODE_COMBINING_CLASS_CCC27

  

HB_UNICODE_COMBINING_CLASS_CCC28

  

HB_UNICODE_COMBINING_CLASS_CCC29

  

HB_UNICODE_COMBINING_CLASS_CCC30

  

HB_UNICODE_COMBINING_CLASS_CCC31

  

HB_UNICODE_COMBINING_CLASS_CCC32

  

HB_UNICODE_COMBINING_CLASS_CCC33

  

HB_UNICODE_COMBINING_CLASS_CCC34

  

HB_UNICODE_COMBINING_CLASS_CCC35

  

HB_UNICODE_COMBINING_CLASS_CCC36

  

HB_UNICODE_COMBINING_CLASS_CCC84

  

HB_UNICODE_COMBINING_CLASS_CCC91

  

HB_UNICODE_COMBINING_CLASS_CCC103

  

HB_UNICODE_COMBINING_CLASS_CCC107

  

HB_UNICODE_COMBINING_CLASS_CCC118

  

HB_UNICODE_COMBINING_CLASS_CCC122

  

HB_UNICODE_COMBINING_CLASS_CCC129

  

HB_UNICODE_COMBINING_CLASS_CCC130

  

HB_UNICODE_COMBINING_CLASS_CCC133

  

HB_UNICODE_COMBINING_CLASS_ATTACHED_BELOW_LEFT

  

HB_UNICODE_COMBINING_CLASS_ATTACHED_BELOW

  

HB_UNICODE_COMBINING_CLASS_ATTACHED_ABOVE

  

HB_UNICODE_COMBINING_CLASS_ATTACHED_ABOVE_RIGHT

  

HB_UNICODE_COMBINING_CLASS_BELOW_LEFT

  

HB_UNICODE_COMBINING_CLASS_BELOW

  

HB_UNICODE_COMBINING_CLASS_BELOW_RIGHT

  

HB_UNICODE_COMBINING_CLASS_LEFT

  

HB_UNICODE_COMBINING_CLASS_RIGHT

  

HB_UNICODE_COMBINING_CLASS_ABOVE_LEFT

  

HB_UNICODE_COMBINING_CLASS_ABOVE

  

HB_UNICODE_COMBINING_CLASS_ABOVE_RIGHT

  

HB_UNICODE_COMBINING_CLASS_DOUBLE_BELOW

  

HB_UNICODE_COMBINING_CLASS_DOUBLE_ABOVE

  

HB_UNICODE_COMBINING_CLASS_IOTA_SUBSCRIPT

  

HB_UNICODE_COMBINING_CLASS_INVALID

  
+
+
+
+
+

hb_unicode_funcs_t

+
typedef struct hb_unicode_funcs_t hb_unicode_funcs_t;
+
+
+
+
+

enum hb_unicode_general_category_t

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

HB_UNICODE_GENERAL_CATEGORY_CONTROL

  

HB_UNICODE_GENERAL_CATEGORY_FORMAT

  

HB_UNICODE_GENERAL_CATEGORY_UNASSIGNED

  

HB_UNICODE_GENERAL_CATEGORY_PRIVATE_USE

  

HB_UNICODE_GENERAL_CATEGORY_SURROGATE

  

HB_UNICODE_GENERAL_CATEGORY_LOWERCASE_LETTER

  

HB_UNICODE_GENERAL_CATEGORY_MODIFIER_LETTER

  

HB_UNICODE_GENERAL_CATEGORY_OTHER_LETTER

  

HB_UNICODE_GENERAL_CATEGORY_TITLECASE_LETTER

  

HB_UNICODE_GENERAL_CATEGORY_UPPERCASE_LETTER

  

HB_UNICODE_GENERAL_CATEGORY_SPACING_MARK

  

HB_UNICODE_GENERAL_CATEGORY_ENCLOSING_MARK

  

HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK

  

HB_UNICODE_GENERAL_CATEGORY_DECIMAL_NUMBER

  

HB_UNICODE_GENERAL_CATEGORY_LETTER_NUMBER

  

HB_UNICODE_GENERAL_CATEGORY_OTHER_NUMBER

  

HB_UNICODE_GENERAL_CATEGORY_CONNECT_PUNCTUATION

  

HB_UNICODE_GENERAL_CATEGORY_DASH_PUNCTUATION

  

HB_UNICODE_GENERAL_CATEGORY_CLOSE_PUNCTUATION

  

HB_UNICODE_GENERAL_CATEGORY_FINAL_PUNCTUATION

  

HB_UNICODE_GENERAL_CATEGORY_INITIAL_PUNCTUATION

  

HB_UNICODE_GENERAL_CATEGORY_OTHER_PUNCTUATION

  

HB_UNICODE_GENERAL_CATEGORY_OPEN_PUNCTUATION

  

HB_UNICODE_GENERAL_CATEGORY_CURRENCY_SYMBOL

  

HB_UNICODE_GENERAL_CATEGORY_MODIFIER_SYMBOL

  

HB_UNICODE_GENERAL_CATEGORY_MATH_SYMBOL

  

HB_UNICODE_GENERAL_CATEGORY_OTHER_SYMBOL

  

HB_UNICODE_GENERAL_CATEGORY_LINE_SEPARATOR

  

HB_UNICODE_GENERAL_CATEGORY_PARAGRAPH_SEPARATOR

  

HB_UNICODE_GENERAL_CATEGORY_SPACE_SEPARATOR

  
+
+
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/harfbuzz-hb-uniscribe.html b/docs/html/harfbuzz-hb-uniscribe.html new file mode 100644 index 0000000..169a376 --- /dev/null +++ b/docs/html/harfbuzz-hb-uniscribe.html @@ -0,0 +1,91 @@ + + + + +hb-uniscribe: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

hb-uniscribe

+

hb-uniscribe

+
+
+

Functions

+
++++ + + + + + + + + + + +
+HFONT + +hb_uniscribe_font_get_hfont () +
+LOGFONTW * + +hb_uniscribe_font_get_logfontw () +
+
+
+

Object Hierarchy

+
+
+
+
+

Description

+
+
+

Functions

+
+

hb_uniscribe_font_get_hfont ()

+
HFONT
+hb_uniscribe_font_get_hfont (hb_font_t *font);
+
+
+
+

hb_uniscribe_font_get_logfontw ()

+
LOGFONTW *
+hb_uniscribe_font_get_logfontw (hb_font_t *font);
+
+
+
+

Types and Values

+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/harfbuzz-hb-version.html b/docs/html/harfbuzz-hb-version.html new file mode 100644 index 0000000..b138f58 --- /dev/null +++ b/docs/html/harfbuzz-hb-version.html @@ -0,0 +1,214 @@ + + + + +hb-version: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

hb-version

+

hb-version

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + +
#define +HB_VERSION_ATLEAST() +
+void + +hb_version () +
+hb_bool_t + +hb_version_atleast () +
const char * + +hb_version_string () +
+
+
+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + +
#defineHB_VERSION_MAJOR
#defineHB_VERSION_MICRO
#defineHB_VERSION_MINOR
#defineHB_VERSION_STRING
+
+
+

Object Hierarchy

+
+
+
+
+

Description

+
+
+

Functions

+
+

HB_VERSION_ATLEAST()

+
#define             HB_VERSION_ATLEAST(major,minor,micro)
+
+
+
+

hb_version ()

+
void
+hb_version (unsigned int *major,
+            unsigned int *minor,
+            unsigned int *micro);
+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

major

Library major version component.

[out]

minor

Library minor version component.

[out]

micro

Library micro version component.

[out]
+
+
+

Returns

+

library version as three integer components.

+

+
+

Since 0.9.2

+
+
+
+

hb_version_atleast ()

+
hb_bool_t
+hb_version_atleast (unsigned int major,
+                    unsigned int minor,
+                    unsigned int micro);
+
+

Returns

+

+
+

Since 0.9.30

+
+
+
+

hb_version_string ()

+
const char *
+hb_version_string (void);
+

Returns library version as a string with three components.

+
+

Returns

+

library version string.

+

+
+

Since 0.9.2

+
+
+
+

Types and Values

+
+

HB_VERSION_MAJOR

+
#define HB_VERSION_MAJOR 1
+
+
+
+
+

HB_VERSION_MICRO

+
#define HB_VERSION_MICRO 1
+
+
+
+
+

HB_VERSION_MINOR

+
#define HB_VERSION_MINOR 4
+
+
+
+
+

HB_VERSION_STRING

+
#define HB_VERSION_STRING "1.4.1"
+
+
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/harfbuzz-hb.html b/docs/html/harfbuzz-hb.html new file mode 100644 index 0000000..acea45f --- /dev/null +++ b/docs/html/harfbuzz-hb.html @@ -0,0 +1,53 @@ + + + + +hb: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

hb

+

hb

+
+
+

Object Hierarchy

+
+
+
+
+

Description

+
+
+

Functions

+
+
+

Types and Values

+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/harfbuzz.devhelp2 b/docs/html/harfbuzz.devhelp2 new file mode 100644 index 0000000..5f8bb19 --- /dev/null +++ b/docs/html/harfbuzz.devhelp2 @@ -0,0 +1,878 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/html/hello-harfbuzz.html b/docs/html/hello-harfbuzz.html new file mode 100644 index 0000000..0bf8ed5 --- /dev/null +++ b/docs/html/hello-harfbuzz.html @@ -0,0 +1,181 @@ + + + + +Hello, Harfbuzz: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Hello, Harfbuzz

+
What Harfbuzz doesn't do
+

+ Here's the simplest Harfbuzz that can possibly work. We will improve + it later. +

+

  1. + Create a buffer and put your text in it. +

+
+  #include <hb.h>
+  hb_buffer_t *buf;
+  buf = hb_buffer_create();
+  hb_buffer_add_utf8(buf, text, strlen(text), 0, strlen(text));
+
+

  1. + Guess the script, language and direction of the buffer. +

+
+  hb_buffer_guess_segment_properties(buf);
+
+

  1. + Create a face and a font, using FreeType for now. +

+
+  #include <hb-ft.h>
+  FT_New_Face(ft_library, font_path, index, &face)
+  hb_font_t *font = hb_ft_font_create(face);
+
+

  1. + Shape! +

+
+  hb_shape(font, buf, NULL, 0);
+
+

  1. + Get the glyph and position information. +

+
+  hb_glyph_info_t *glyph_info    = hb_buffer_get_glyph_infos(buf, &glyph_count);
+  hb_glyph_position_t *glyph_pos = hb_buffer_get_glyph_positions(buf, &glyph_count);
+
+

  1. + Iterate over each glyph. +

+
+  for (i = 0; i < glyph_count; ++i) {
+    glyphid = glyph_info[i].codepoint;
+    x_offset = glyph_pos[i].x_offset / 64.0;
+    y_offset = glyph_pos[i].y_offset / 64.0;
+    x_advance = glyph_pos[i].x_advance / 64.0;
+    y_advance = glyph_pos[i].y_advance / 64.0;
+    draw_glyph(glyphid, cursor_x + x_offset, cursor_y + y_offset);
+    cursor_x += x_advance;
+    cursor_y += y_advance;
+  }
+
+

  1. + Tidy up. +

+
+  hb_buffer_destroy(buf);
+  hb_font_destroy(hb_ft_font);
+
+
+

+What Harfbuzz doesn't do

+

+ The code above will take a UTF8 string, shape it, and give you the + information required to lay it out correctly on a single + horizontal (or vertical) line using the font provided. That is the + extent of Harfbuzz's responsibility. +

+

+ If you are implementing a text layout engine you may have other + responsibilities, that Harfbuzz will not help you with: +

+
    +
  • +

    + Harfbuzz won't help you with bidirectionality. If you want to + lay out text with mixed Hebrew and English, you will need to + ensure that the buffer provided to Harfbuzz has those + characters in the correct layout order. This will be different + from the logical order in which the Unicode text is stored. In + other words, the user will hit the keys in the following + sequence: +

    +
    +A B C [space] ג ב א [space] D E F
+
    +

    + but will expect to see in the output: +

    +
    +ABC אבג DEF
+
    +

    + This reordering is called bidi processing + ("bidi" is short for bidirectional), and there's an + algorithm as an annex to the Unicode Standard which tells you how + to reorder a string from logical order into presentation order. + Before sending your string to Harfbuzz, you may need to apply the + bidi algorithm to it. Libraries such as ICU and fribidi can do + this for you. +

    +
    • +

  • + Harfbuzz won't help you with text that contains different font + properties. For instance, if you have the string "a + huge breakfast", and you expect + "huge" to be italic, you will need to send three + strings to Harfbuzz: a, in your Roman font; + huge using your italic font; and + breakfast using your Roman font again. + Similarly if you change font, font size, script, language or + direction within your string, you will need to shape each run + independently and then output them independently. Harfbuzz + expects to shape a run of characters sharing the same + properties. +

    • +
  • +

    + Harfbuzz won't help you with line breaking, hyphenation or + justification. As mentioned above, it lays out the string + along a single line of, notionally, + infinite length. If you want to find out where the potential + word, sentence and line break points are in your text, you + could use the ICU library's break iterator functions. +

    +

    + Harfbuzz can tell you how wide a shaped piece of text is, which is + useful input to a justification algorithm, but it knows nothing + about paragraphs, lines or line lengths. Nor will it adjust the + space between words to fit them proportionally into a line. If you + want to layout text in paragraphs, you will probably want to send + each word of your text to Harfbuzz to determine its shaped width + after glyph substitutions, then work out how many words will fit + on a line, and then finally output each word of the line separated + by a space of the correct size to fully justify the paragraph. +

    +
    • +
+

+ As a layout engine implementor, Harfbuzz will help you with the + interface between your text and your font, and that's something + that you'll need - what you then do with the glyphs that your font + returns is up to you. The example we saw above enough to get us + started using Harfbuzz. Now we are going to use the remainder of + Harfbuzz's API to refine that example and improve our text shaping + capabilities. +

+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/home.png b/docs/html/home.png new file mode 100644 index 0000000000000000000000000000000000000000..9346b336a784463192c7daab5133a3673dd69845 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b zKpodXn9)gNb_Gz7y~NYkmHjTefRMbARQqaxysz9Q}BI-m)~Y zggoA|1V*z2{cQ=d;!=?fvu4~`n82RKrk1UubNXTJj1GP|o-=>$A29f{JgJ9K`^t{Q z-oWs>M&_hvT&MjX@T4-&sBW+1^4oB5G4r2q!qGktZ!n*!)hjrjd0_4L6;4%u<}orJ u%Vo~x?#i!!ww+1OGuHe}T=cKQUzn^_t)8|WlnDbmjKR~@&t;ucLK6T + + + +HarfBuzz Manual: HarfBuzz Manual + + + + + + + + +
+
+
+
+
+

HarfBuzz

+
+

+ HarfBuzz is an OpenType + text shaping engine. +

+

+ The current HarfBuzz codebase, formerly known as harfbuzz-ng, is + versioned 1.x.x and is stable and under active maintenance. This is + what is used in latest versions of Firefox, GNOME, ChromeOS, Chrome, + LibreOffice, XeTeX, Android, and KDE, among other places. The canonical + source tree is available + here. + Also available on + github. + See Download for release tarballs. +

+

+ The old HarfBuzz codebase, these days known as harfbuzz-old, was + derived from FreeType, + Pango, and + Qt and is available + here. + It is not actively developed or maintained, and is extremely buggy. All + users are encouraged to switch over to the new HarfBuzz as soon as + possible. There are no release tarballs of old HarfBuzz whatsoever. +

+
+
+
+
+
+
I. User's manual
+
+
What is Harfbuzz?
+
+
Why do I need it?
+
Why is it called Harfbuzz?
+
+
Install Harfbuzz
+
+
Download
+
Building
+
+
Hello, Harfbuzz
+
What Harfbuzz doesn't do
+
Buffers, language, script and direction
+
+
Creating and destroying buffers
+
Adding text to the buffer
+
Setting buffer properties
+
What about the other scripts?
+
Customizing Unicode functions
+
+
Fonts and faces
+
+
Using FreeType
+
Using Harfbuzz's native OpenType implementation
+
Using your own font functions
+
+
+
+
Clusters
+
A clustering example for levels 0 and 1
+
Reordering in levels 0 and 1
+
The distinction between levels 0 and 1
+
Level 2
+
+
Ligatures with combining marks
+
Reordering
+
+
+
Shaping and shape plans
+
+
OpenType features
+
Plans and caching
+
+
+
II. Reference manual
+
+
Harfbuzz API
+
+
+hb +
+
+hb-common +
+
+hb-unicode +
+
+Buffers — Input and output buffers +
+
+hb-blob +
+
+hb-face +
+
+hb-font +
+
+Shaping — Conversion of text strings into positioned glyphs +
+
+hb-version +
+
+hb-deprecated +
+
+hb-set +
+
+hb-ot +
+
+hb-ot-layout +
+
+hb-ot-tag +
+
+hb-ot-font +
+
+hb-ot-shape +
+
+hb-ot-math +
+
+hb-shape-plan +
+
+hb-glib +
+
+hb-icu +
+
+hb-ft +
+
+hb-graphite2 +
+
+hb-uniscribe +
+
+hb-coretext +
+
+hb-gobject +
+
+
Object Hierarchy
+
API Index
+
Index of new symbols in 0.9.2
+
Index of new symbols in 0.9.5
+
Index of new symbols in 0.9.7
+
Index of new symbols in 0.9.8
+
Index of new symbols in 0.9.10
+
Index of new symbols in 0.9.11
+
Index of new symbols in 0.9.20
+
Index of new symbols in 0.9.22
+
Index of new symbols in 0.9.28
+
Index of new symbols in 0.9.30
+
Index of new symbols in 0.9.31
+
Index of new symbols in 0.9.38
+
Index of new symbols in 0.9.39
+
Index of new symbols in 0.9.41
+
Index of new symbols in 0.9.42
+
Index of new symbols in 1.0.5
+
Index of new symbols in 1.1.2
+
Index of new symbols in 1.1.3
+
Index of new symbols in 1.2.3
+
Index of new symbols in 1.3.3
+
Index of deprecated API
+
Annotation Glossary
+
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/install-harfbuzz.html b/docs/html/install-harfbuzz.html new file mode 100644 index 0000000..6e76703 --- /dev/null +++ b/docs/html/install-harfbuzz.html @@ -0,0 +1,59 @@ + + + + +Install Harfbuzz: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Install Harfbuzz

+
+
Download
+
Building
+
+
+

+Download

+

+ For tarball releases of HarfBuzz, look + here. + At the same place you will + also find Win32 binary bundles that include libharfbuzz DLL, hb-view.exe, + hb-shape.exe, and all dependencies. +

+

+ The canonical source tree is available + here. + Also available on github. +

+

+ The API that comes with hb.h will + not change incompatibly. Other, peripheral, headers are more likely to go + through minor modifications, but again, will do our best to never change + API in an incompatible way. We will never break the ABI. +

+

+ If you are not sure whether Pango or HarfBuzz is right for you, read + this. +

+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/left-insensitive.png b/docs/html/left-insensitive.png new file mode 100644 index 0000000000000000000000000000000000000000..3269393a7f72af744a772c437bd7b3976c23709d GIT binary patch literal 395 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b zKpodXn9)gNb_Gz7y~NYkmHjTefH0HbvDJm`3=E7Co-U3d7N^fnTIWJ3j{^~q!iyia4kV=mdU|Jhfgdm;SLIpiYJ7wv^kjFiECCc&8T30!RG0~&BG=X zlu#U4@Z`))V`EG9e^NqDr#{!5k|)wT* zYTNt0`@q%TAD$){%#eQ?;$^ly8}yZCU%T~u0XM^%t?f#e znB*EuLv2rP%K3BMvFO}YmnR}KSgH;`EHL$)^!tH~iBxZ#h^zJi*#P5Xb6B50U@nx2 mU;T=yfcwnSOsS9SKd{M#MlNkCuvG>I8-u5-pUXO@geCx5`k@p6 literal 0 HcmV?d00001 diff --git a/docs/html/left.png b/docs/html/left.png new file mode 100644 index 0000000000000000000000000000000000000000..2abde032b0c98b756b12d380da4318205cd78470 GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b zKpodXn9)gNb_Gz7y~NYkmHjTefRMaSLay~*pwMJb7sn8b(^oI8=R24v(*CjE{-BFv z0BhvLm?o9(UC{-Ci?lD?Ve-7-xypA!PTC(0^;>UheG4Altep3@`rO0#Rjs1)RxCLr zE5mee>7m*=%yEk+GVvGkRy0O&*&MTd5SjH(lgq~7r%6oRW$l1p-*S}iC>@fyDsz%y z`UIW8^Ao=maGhj3E8{7Cd_qof`K4oa->23`>&M2+XBtd2J`8jogQu&X%Q~loCIG_? BVG#fT literal 0 HcmV?d00001 diff --git a/docs/html/level-2.html b/docs/html/level-2.html new file mode 100644 index 0000000..86a1846 --- /dev/null +++ b/docs/html/level-2.html @@ -0,0 +1,130 @@ + + + + +Level 2: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Level 2

+

+ Level 2 is a different beast from levels 0 and 1. It is simple to + describe, but hard to make sense of. It simply doesn't do any + cluster merging whatsoever. When things ligate or otherwise multiple + glyphs turn into one, the cluster value of the first glyph is + retained. +

+

+ Here are a few examples of why processing cluster values produced at + this level might be tricky: +

+
+

+Ligatures with combining marks

+

+ Imagine capital letters are bases and lower case letters are + combining marks. With an input sequence like this: +

+
+  A,a,B,b,C,c
+  0,1,2,3,4,5
+
+

+ if A,B,C ligate, then here are the cluster + values one would get under the various levels: +

+

+ level 0: +

+
+  ABC,a,b,c
+  0  ,0,0,0
+
+

+ level 1: +

+
+  ABC,a,b,c
+  0  ,0,0,5
+
+

+ level 2: +

+
+  ABC,a,b,c
+  0  ,1,3,5
+
+

+ Making sense of the last example is the hardest for a client, + because there is nothing in the cluster values to suggest that + B and C ligated with + A. +

+
+
+

+Reordering

+

+ Another tricky case is when things reorder. Under level 2: +

+
+  A,B,C,D,E
+  0,1,2,3,4
+
+

+ Now imagine D moves before + B: +

+
+  A,D,B,C,E
+  0,3,1,2,4
+
+

+ Now, if D ligates with B, we + get: +

+
+  A,DB,C,E
+  0,3 ,2,4
+
+

+ In a different scenario, A and + B could have ligated + before D reordered; that + would have resulted in: +

+
+  AB,D,C,E
+  0 ,3,2,4   
+
+

+ There's no way to differentitate between these two scenarios based + on the cluster numbers alone. +

+

+ Another problem appens with ligatures under level 2 if the + direction of the text is forced to opposite of its natural + direction (e.g. left-to-right Arabic). But that's too much of a + corner case to worry about. +

+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/object-tree.html b/docs/html/object-tree.html new file mode 100644 index 0000000..41f5336 --- /dev/null +++ b/docs/html/object-tree.html @@ -0,0 +1,61 @@ + + + + +Object Hierarchy: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Object Hierarchy

+
+    GBoxed
+    ├── hb_blob_t
+    ├── hb_buffer_t
+    ├── hb_face_t
+    ├── hb_feature_t
+    ├── hb_font_funcs_t
+    ├── hb_font_t
+    ├── hb_glyph_info_t
+    ├── hb_glyph_position_t
+    ├── hb_segment_properties_t
+    ├── hb_set_t
+    ├── hb_shape_plan_t
+    ├── hb_unicode_funcs_t
+    ╰── hb_user_data_key_t
+    GEnum
+    ├── hb_buffer_cluster_level_t
+    ├── hb_buffer_content_type_t
+    ├── hb_buffer_serialize_format_t
+    ├── hb_direction_t
+    ├── hb_memory_mode_t
+    ├── hb_ot_layout_glyph_class_t
+    ├── hb_ot_math_constant_t
+    ├── hb_ot_math_kern_t
+    ├── hb_script_t
+    ├── hb_unicode_combining_class_t
+    ╰── hb_unicode_general_category_t
+    GFlags
+    ├── hb_buffer_flags_t
+    ├── hb_buffer_serialize_flags_t
+    ╰── hb_ot_math_glyph_part_flags_t
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/plans-and-caching.html b/docs/html/plans-and-caching.html new file mode 100644 index 0000000..e3574bc --- /dev/null +++ b/docs/html/plans-and-caching.html @@ -0,0 +1,31 @@ + + + + +Plans and caching: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Plans and caching

+

+

+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/pt01.html b/docs/html/pt01.html new file mode 100644 index 0000000..f74ebd3 --- /dev/null +++ b/docs/html/pt01.html @@ -0,0 +1,87 @@ + + + + +Part I. User's manual: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Part I. User's manual

+
+

Table of Contents

+
+
What is Harfbuzz?
+
+
Why do I need it?
+
Why is it called Harfbuzz?
+
+
Install Harfbuzz
+
+
Download
+
Building
+
+
Hello, Harfbuzz
+
What Harfbuzz doesn't do
+
Buffers, language, script and direction
+
+
Creating and destroying buffers
+
Adding text to the buffer
+
Setting buffer properties
+
What about the other scripts?
+
Customizing Unicode functions
+
+
Fonts and faces
+
+
Using FreeType
+
Using Harfbuzz's native OpenType implementation
+
Using your own font functions
+
+
+
+
Clusters
+
A clustering example for levels 0 and 1
+
Reordering in levels 0 and 1
+
The distinction between levels 0 and 1
+
Level 2
+
+
Ligatures with combining marks
+
Reordering
+
+
+
Shaping and shape plans
+
+
OpenType features
+
Plans and caching
+
+
+
+
+

+Glyph information

+
+

+Names and numbers

+

+

+
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/pt02.html b/docs/html/pt02.html new file mode 100644 index 0000000..35cf7ca --- /dev/null +++ b/docs/html/pt02.html @@ -0,0 +1,143 @@ + + + + +Part II. Reference manual: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+
+

+Part II. Reference manual

+

+ This document is for HarfBuzz 1.4.2 +. + +

+
+
+

Table of Contents

+
+
Harfbuzz API
+
+
+hb +
+
+hb-common +
+
+hb-unicode +
+
+Buffers — Input and output buffers +
+
+hb-blob +
+
+hb-face +
+
+hb-font +
+
+Shaping — Conversion of text strings into positioned glyphs +
+
+hb-version +
+
+hb-deprecated +
+
+hb-set +
+
+hb-ot +
+
+hb-ot-layout +
+
+hb-ot-tag +
+
+hb-ot-font +
+
+hb-ot-shape +
+
+hb-ot-math +
+
+hb-shape-plan +
+
+hb-glib +
+
+hb-icu +
+
+hb-ft +
+
+hb-graphite2 +
+
+hb-uniscribe +
+
+hb-coretext +
+
+hb-gobject +
+
+
Object Hierarchy
+
API Index
+
Index of new symbols in 0.9.2
+
Index of new symbols in 0.9.5
+
Index of new symbols in 0.9.7
+
Index of new symbols in 0.9.8
+
Index of new symbols in 0.9.10
+
Index of new symbols in 0.9.11
+
Index of new symbols in 0.9.20
+
Index of new symbols in 0.9.22
+
Index of new symbols in 0.9.28
+
Index of new symbols in 0.9.30
+
Index of new symbols in 0.9.31
+
Index of new symbols in 0.9.38
+
Index of new symbols in 0.9.39
+
Index of new symbols in 0.9.41
+
Index of new symbols in 0.9.42
+
Index of new symbols in 1.0.5
+
Index of new symbols in 1.1.2
+
Index of new symbols in 1.1.3
+
Index of new symbols in 1.2.3
+
Index of new symbols in 1.3.3
+
Index of deprecated API
+
Annotation Glossary
+
+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/reordering-in-levels-0-and-1.html b/docs/html/reordering-in-levels-0-and-1.html new file mode 100644 index 0000000..f07ef69 --- /dev/null +++ b/docs/html/reordering-in-levels-0-and-1.html @@ -0,0 +1,53 @@ + + + + +Reordering in levels 0 and 1: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Reordering in levels 0 and 1

+

+ Another common operation in the more complex shapers is when things + reorder. In those cases, to maintain monotone clusters, HB merges + the clusters of everything in the reordering sequence. For example, + let's again start with the character sequence: +

+
+   A,B,C,D,E
+   0,1,2,3,4
+
+

+ If D is reordered before B, + then the B, C, and + D clusters merge, and we get: +

+
+   A,D,B,C,E
+   0,1,1,1,4
+
+

+ This is clearly not ideal, but it is the only sensible way to + maintain monotone indices and retain the true relationship between + glyphs and characters. +

+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/right-insensitive.png b/docs/html/right-insensitive.png new file mode 100644 index 0000000000000000000000000000000000000000..4c95785b907b978f36674cd98bf5302669c15c1b GIT binary patch literal 373 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b zKpodXn9)gNb_Gz7y~NYkmHjTefG`u!(zUX23=E7+o-U3d7N^fn+URvSL8NuRG*{E) z?#-+97X-^pidQ*u@StO1(S@7g8g>nnA24$?ty?)cmuaa|Y>ez2*_Ia?6HP4j{3LIs zTr!s1ao_Sz^~3e4zRJGAjKZGn=XP#)Wmuo-QN>teTzzI!&R*jMI^Oa#7_ukLYdicf zOx;1mb-rt04s-c|uIH8fnX}$)XJa^0_-F3(pA%=sGI<|(n_*&=yYt96+n5InXn_GN+EraJI9q(O+n{6MQKErp&KxRvpfn0xh z`sSMqH(2Z%?kaFBTf06W^y=UDA9gR9YrwNS*1pjB((0K%&+SbAx3`XA&dKZ}j*nX7 QfdRze>FVdQ&MBb@09|aA9{>OV literal 0 HcmV?d00001 diff --git a/docs/html/right.png b/docs/html/right.png new file mode 100644 index 0000000000000000000000000000000000000000..76260ec8865f4e13cd269ec62eccd78a33adba3c GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b zKpodXn9)gNb_Gz7y~NYkmHjTefRMbR+#PqI2*V^#7sn8b(^oI8=W9$9IsUQVezxzH zy`G{eu0`y#boSlU-NAlQG~=D)BPJG4k(^0qdDa(AdQvI0d|vJT=i7_<_D6`Cy?Dm; zP0@1EeB~D|O$oQe*sxL-P;q{2UCr}fN-o#M~tpZzsGyfNz46SZlIJCbKH zZQscEqpOfBCPDgx + + + +Setting buffer properties: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Setting buffer properties

+

+

+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/shaping-and-shape-plans.html b/docs/html/shaping-and-shape-plans.html new file mode 100644 index 0000000..32b697d --- /dev/null +++ b/docs/html/shaping-and-shape-plans.html @@ -0,0 +1,39 @@ + + + + +Shaping and shape plans: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Shaping and shape plans

+
+
OpenType features
+
Plans and caching
+
+
+

+OpenType features

+

+

+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/style.css b/docs/html/style.css new file mode 100644 index 0000000..3675420 --- /dev/null +++ b/docs/html/style.css @@ -0,0 +1,479 @@ +body +{ + font-family: cantarell, sans-serif; +} +.synopsis, .classsynopsis +{ + /* tango:aluminium 1/2 */ + background: #eeeeec; + background: rgba(238, 238, 236, 0.5); + border: solid 1px rgb(238, 238, 236); + padding: 0.5em; +} +.programlisting +{ + /* tango:sky blue 0/1 */ + /* fallback for no rgba support */ + background: #e6f3ff; + border: solid 1px #729fcf; + background: rgba(114, 159, 207, 0.1); + border: solid 1px rgba(114, 159, 207, 0.2); + padding: 0.5em; +} +.variablelist +{ + padding: 4px; + margin-left: 3em; +} +.variablelist td:first-child +{ + vertical-align: top; +} + +div.gallery-float +{ + float: left; + padding: 10px; +} +div.gallery-float img +{ + border-style: none; +} +div.gallery-spacer +{ + clear: both; +} + +a, a:visited +{ + text-decoration: none; + /* tango:sky blue 2 */ + color: #3465a4; +} +a:hover +{ + text-decoration: underline; + /* tango:sky blue 1 */ + color: #729fcf; +} + +div.informaltable table +{ + border-collapse: separate; + border-spacing: 1em 0.3em; + border: none; +} + +div.informaltable table td, div.informaltable table th +{ + vertical-align: top; +} + +.function_type, +.variable_type, +.property_type, +.signal_type, +.parameter_name, +.struct_member_name, +.union_member_name, +.define_keyword, +.datatype_keyword, +.typedef_keyword +{ + text-align: right; +} + +/* dim non-primary columns */ +.c_punctuation, +.function_type, +.variable_type, +.property_type, +.signal_type, +.define_keyword, +.datatype_keyword, +.typedef_keyword, +.property_flags, +.signal_flags, +.parameter_annotations, +.enum_member_annotations, +.struct_member_annotations, +.union_member_annotations +{ + color: #888a85; +} + +.function_type a, +.function_type a:visited, +.function_type a:hover, +.property_type a, +.property_type a:visited, +.property_type a:hover, +.signal_type a, +.signal_type a:visited, +.signal_type a:hover, +.signal_flags a, +.signal_flags a:visited, +.signal_flags a:hover +{ + color: #729fcf; +} + +td p +{ + margin: 0.25em; +} + +div.table table +{ + border-collapse: collapse; + border-spacing: 0px; + /* tango:aluminium 3 */ + border: solid 1px #babdb6; +} + +div.table table td, div.table table th +{ + /* tango:aluminium 3 */ + border: solid 1px #babdb6; + padding: 3px; + vertical-align: top; +} + +div.table table th +{ + /* tango:aluminium 2 */ + background-color: #d3d7cf; +} + +h4 +{ + color: #555753; + margin-top: 1em; + margin-bottom: 1em; +} + +hr +{ + /* tango:aluminium 1 */ + color: #d3d7cf; + background: #d3d7cf; + border: none 0px; + height: 1px; + clear: both; + margin: 2.0em 0em 2.0em 0em; +} + +dl.toc dt +{ + padding-bottom: 0.25em; +} + +dl.toc > dt +{ + padding-top: 0.25em; + padding-bottom: 0.25em; + font-weight: bold; +} + +dl.toc > dl +{ + padding-bottom: 0.5em; +} + +.parameter +{ + font-style: normal; +} + +.footer +{ + padding-top: 3.5em; + /* tango:aluminium 3 */ + color: #babdb6; + text-align: center; + font-size: 80%; +} + +.informalfigure, +.figure +{ + margin: 1em; +} + +.informalexample, +.example +{ + margin-top: 1em; + margin-bottom: 1em; +} + +.warning +{ + /* tango:orange 0/1 */ + background: #ffeed9; + background: rgba(252, 175, 62, 0.1); + border-color: #ffb04f; + border-color: rgba(252, 175, 62, 0.2); +} +.note +{ + /* tango:chameleon 0/0.5 */ + background: #d8ffb2; + background: rgba(138, 226, 52, 0.1); + border-color: #abf562; + border-color: rgba(138, 226, 52, 0.2); +} +div.blockquote +{ + border-color: #eeeeec; +} +.note, .warning, div.blockquote +{ + padding: 0.5em; + border-width: 1px; + border-style: solid; + margin: 2em; +} +.note p, .warning p +{ + margin: 0; +} + +div.warning h3.title, +div.note h3.title +{ + display: none; +} + +p + div.section +{ + margin-top: 1em; +} + +div.refnamediv, +div.refsynopsisdiv, +div.refsect1, +div.refsect2, +div.toc, +div.section +{ + margin-bottom: 1em; +} + +/* blob links */ +h2 .extralinks, h3 .extralinks +{ + float: right; + /* tango:aluminium 3 */ + color: #babdb6; + font-size: 80%; + font-weight: normal; +} + +.lineart +{ + color: #d3d7cf; + font-weight: normal; +} + +.annotation +{ + /* tango:aluminium 5 */ + color: #555753; + font-weight: normal; +} + +.structfield +{ + font-style: normal; + font-weight: normal; +} + +acronym,abbr +{ + border-bottom: 1px dotted gray; +} + +/* code listings */ + +.listing_code .programlisting .normal, +.listing_code .programlisting .normal a, +.listing_code .programlisting .number, +.listing_code .programlisting .cbracket, +.listing_code .programlisting .symbol { color: #555753; } +.listing_code .programlisting .comment, +.listing_code .programlisting .linenum { color: #babdb6; } /* tango: aluminium 3 */ +.listing_code .programlisting .function, +.listing_code .programlisting .function a, +.listing_code .programlisting .preproc { color: #204a87; } /* tango: sky blue 3 */ +.listing_code .programlisting .string { color: #ad7fa8; } /* tango: plum */ +.listing_code .programlisting .keyword, +.listing_code .programlisting .usertype, +.listing_code .programlisting .type, +.listing_code .programlisting .type a { color: #4e9a06; } /* tango: chameleon 3 */ + +.listing_frame { + /* tango:sky blue 1 */ + border: solid 1px #729fcf; + border: solid 1px rgba(114, 159, 207, 0.2); + padding: 0px; +} + +.listing_lines, .listing_code { + margin-top: 0px; + margin-bottom: 0px; + padding: 0.5em; +} +.listing_lines { + /* tango:sky blue 0.5 */ + background: #a6c5e3; + background: rgba(114, 159, 207, 0.2); + /* tango:aluminium 6 */ + color: #2e3436; +} +.listing_code { + /* tango:sky blue 0 */ + background: #e6f3ff; + background: rgba(114, 159, 207, 0.1); +} +.listing_code .programlisting { + /* override from previous */ + border: none 0px; + padding: 0px; + background: none; +} +.listing_lines pre, .listing_code pre { + margin: 0px; +} + +@media screen { + /* these have a as a first child, but since there are no parent selectors + * we can't use that. */ + a.footnote + { + position: relative; + top: 0em ! important; + } + /* this is needed so that the local anchors are displayed below the naviagtion */ + div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name] + { + display: inline-block; + position: relative; + top:-5em; + } + /* this seems to be a bug in the xsl style sheets when generating indexes */ + div.index div.index + { + top: 0em; + } + /* make space for the fixed navigation bar and add space at the bottom so that + * link targets appear somewhat close to top + */ + body + { + padding-top: 2.5em; + padding-bottom: 500px; + max-width: 60em; + } + p + { + max-width: 60em; + } + /* style and size the navigation bar */ + table.navigation#top + { + position: fixed; + background: #e2e2e2; + border-bottom: solid 1px #babdb6; + border-spacing: 5px; + margin-top: 0; + margin-bottom: 0; + top: 0; + left: 0; + z-index: 10; + } + table.navigation#top td + { + padding-left: 6px; + padding-right: 6px; + } + .navigation a, .navigation a:visited + { + /* tango:sky blue 3 */ + color: #204a87; + } + .navigation a:hover + { + /* tango:sky blue 2 */ + color: #3465a4; + } + td.shortcuts + { + /* tango:sky blue 2 */ + color: #3465a4; + font-size: 80%; + white-space: nowrap; + } + td.shortcuts .dim + { + color: #babdb6; + } + .navigation .title + { + font-size: 80%; + max-width: none; + margin: 0px; + font-weight: normal; + } +} +@media screen and (min-width: 60em) { + /* screen larger than 60em */ + body { margin: auto; } +} +@media screen and (max-width: 60em) { + /* screen less than 60em */ + #nav_hierarchy { display: none; } + #nav_interfaces { display: none; } + #nav_prerequisites { display: none; } + #nav_derived_interfaces { display: none; } + #nav_implementations { display: none; } + #nav_child_properties { display: none; } + #nav_style_properties { display: none; } + #nav_index { display: none; } + #nav_glossary { display: none; } + .gallery_image { display: none; } + .property_flags { display: none; } + .signal_flags { display: none; } + .parameter_annotations { display: none; } + .enum_member_annotations { display: none; } + .struct_member_annotations { display: none; } + .union_member_annotations { display: none; } + /* now that a column is hidden, optimize space */ + col.parameters_name { width: auto; } + col.parameters_description { width: auto; } + col.struct_members_name { width: auto; } + col.struct_members_description { width: auto; } + col.enum_members_name { width: auto; } + col.enum_members_description { width: auto; } + col.union_members_name { width: auto; } + col.union_members_description { width: auto; } + .listing_lines { display: none; } +} +@media print { + table.navigation { + visibility: collapse; + display: none; + } + div.titlepage table.navigation { + visibility: visible; + display: table; + background: #e2e2e2; + border: solid 1px #babdb6; + margin-top: 0; + margin-bottom: 0; + top: 0; + left: 0; + height: 3em; + } +} + diff --git a/docs/html/the-distinction-between-levels-0-and-1.html b/docs/html/the-distinction-between-levels-0-and-1.html new file mode 100644 index 0000000..2a71910 --- /dev/null +++ b/docs/html/the-distinction-between-levels-0-and-1.html @@ -0,0 +1,81 @@ + + + + +The distinction between levels 0 and 1: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+The distinction between levels 0 and 1

+

+ So, the above is pretty much what cluster levels 0 and 1 do. The + only difference between the two is this: in level 0, at the very + beginning of the shaping process, we also merge clusters between + base characters and all Unicode marks (combining or not) following + them. E.g.: +

+
+  A,acute,B
+  0,1    ,2
+
+

+ will become: +

+
+  A,acute,B
+  0,0    ,2
+
+

+ This is the default behavior. We do it because Windows did it and + old HarfBuzz did it, so this remained the default. But this behavior + makes it impossible to color diacritic marks differently from their + base characters. That's why in level 1 we do not perform this + initial merging step. +

+

+ For clients, level 0 is more convenient if they rely on HarfBuzz + clusters for cursor positioning. But that's wrong anyway: cursor + positions should be determined based on Unicode grapheme boundaries, + NOT shaping clusters. As such, level 1 clusters are preferred. +

+

+ One last note about levels 0 and 1. We currently don't allow a + MultipleSubst lookup to replace a glyph with zero + glyphs (i.e., to delete a glyph). But in some other situations, + glyphs can be deleted. In those cases, if the glyph being deleted is + the last glyph of its cluster, we make sure to merge the cluster + with a neighboring cluster. +

+

+ This is, primarily, to make sure that the starting cluster of the + text always has the cluster index pointing to the start of the text + for the run; more than one client currently relies on this + guarantee. +

+

+ Incidentally, Apple's CoreText does something else to maintain the + same promise: it inserts a glyph with id 65535 at the beginning of + the glyph string if the glyph corresponding to the first character + in the run was deleted. HarfBuzz might do something similar in the + future. +

+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/up-insensitive.png b/docs/html/up-insensitive.png new file mode 100644 index 0000000000000000000000000000000000000000..f40498606db349a7321cf6b470523e836ee7ac2e GIT binary patch literal 374 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b zKpodXn9)gNb_Gz7y~NYkmHjTefG~@Ex#w@70gTL^E{-7zACwHGSRJaopUzr*FR_KPpkxheNzTDP+%{a~ox zRb6~e-_l%s#;V|Jw-)bO$G_X=4F`Y7SBoCzyjAZQ8BPW>ywAP8?pbBsZ|wt?+h6S6&uqY)kkMnwQQEd@7k`4t@sCCO z@7MoiEI4Q_#IB70vhu7Ab+>SXLxu@LWH Qzz|~aboFyt=akR{08E^fv;Y7A literal 0 HcmV?d00001 diff --git a/docs/html/up.png b/docs/html/up.png new file mode 100644 index 0000000000000000000000000000000000000000..80b4b37e997d69b2e128bc3090bc447ccb74bbe9 GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b zKpodXn9)gNb_Gz7y~NYkmHjTefRFevZLys@4W>+6GUE!tU04Ii{0w_tkMIDB?rA5 zttYTN + + + +Using Harfbuzz's native OpenType implementation: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Using Harfbuzz's native OpenType implementation

+

+

+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/using-your-own-font-functions.html b/docs/html/using-your-own-font-functions.html new file mode 100644 index 0000000..40b6344 --- /dev/null +++ b/docs/html/using-your-own-font-functions.html @@ -0,0 +1,31 @@ + + + + +Using your own font functions: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Using your own font functions

+

+

+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/what-about-the-other-scripts.html b/docs/html/what-about-the-other-scripts.html new file mode 100644 index 0000000..5a0efc6 --- /dev/null +++ b/docs/html/what-about-the-other-scripts.html @@ -0,0 +1,31 @@ + + + + +What about the other scripts?: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+What about the other scripts?

+

+

+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/what-is-harfbuzz.html b/docs/html/what-is-harfbuzz.html new file mode 100644 index 0000000..6e4b0ea --- /dev/null +++ b/docs/html/what-is-harfbuzz.html @@ -0,0 +1,124 @@ + + + + +What is Harfbuzz?: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+What is Harfbuzz?

+
+
Why do I need it?
+
Why is it called Harfbuzz?
+
+

+ Harfbuzz is a text shaping engine. It solves + the problem of selecting and positioning glyphs from a font given a + Unicode string. +

+
+

+Why do I need it?

+

+ Text shaping is an integral part of preparing text for display. It + is a fairly low level operation; Harfbuzz is used directly by + graphic rendering libraries such as Pango, and the layout engines + in Firefox, LibreOffice and Chromium. Unless you are + writing one of these layout engines yourself, + you will probably not need to use Harfbuzz - normally higher level + libraries will turn text into glyphs for you. +

+

+ However, if you are writing a layout engine + or graphics library yourself, you will need to perform text + shaping, and this is where Harfbuzz can help you. Here are some + reasons why you need it: +

+
    +

  • + OpenType fonts contain a set of glyphs, indexed by glyph ID. + The glyph ID within the font does not necessarily relate to a + Unicode codepoint. For instance, some fonts have the letter + "a" as glyph ID 1. To pull the right glyph out of + the font in order to display it, you need to consult a table + within the font (the "cmap" table) which maps + Unicode codepoints to glyph IDs. Text shaping turns codepoints + into glyph IDs. +

    • +

  • + Many OpenType fonts contain ligatures: combinations of + characters which are rendered together. For instance, it's + common for the fi combination to appear in + print as the single ligature "fi". Whether you should + render text as fi or "fi" does not + depend on the input text, but on the capabilities of the font + and the level of ligature application you wish to perform. + Text shaping involves querying the font's ligature tables and + determining what substitutions should be made. +

    • +

  • + While ligatures like "fi" are typographic + refinements, some languages require such + substitutions to be made in order to display text correctly. + In Tamil, when the letter "TTA" (ட) letter is + followed by "U" (உ), the combination should appear + as the single glyph "டு". The sequence of Unicode + characters "டஉ" needs to be rendered as a single + glyph from the font - text shaping chooses the correct glyph + from the sequence of characters provided. +

    • +

  • + Similarly, each Arabic character has four different variants: + within a font, there will be glyphs for the initial, medial, + final, and isolated forms of each letter. Unicode only encodes + one codepoint per character, and so a Unicode string will not + tell you which glyph to use. Text shaping chooses the correct + form of the letter and returns the correct glyph from the font + that you need to render. +

    • +

  • + Other languages have marks and accents which need to be + rendered in certain positions around a base character. For + instance, the Moldovan language has the Cyrillic letter + "zhe" (ж) with a breve accent, like so: ӂ. Some + fonts will contain this character as an individual glyph, + whereas other fonts will not contain a zhe-with-breve glyph + but expect the rendering engine to form the character by + overlaying the two glyphs ж and ˘. Where you should draw the + combining breve depends on the height of the preceding glyph. + Again, for Arabic, the correct positioning of vowel marks + depends on the height of the character on which you are + placing the mark. Text shaping tells you whether you have a + precomposed glyph within your font or if you need to compose a + glyph yourself out of combining marks, and if so, where to + position those marks. +

    • +
+

+ If this is something that you need to do, then you need a text + shaping engine: you could use Uniscribe if you are using Windows; + you could use CoreText on OS X; or you could use Harfbuzz. In the + rest of this manual, we are going to assume that you are the + implementor of a text layout engine. +

+
+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/html/why-is-it-called-harfbuzz.html b/docs/html/why-is-it-called-harfbuzz.html new file mode 100644 index 0000000..7a34a9a --- /dev/null +++ b/docs/html/why-is-it-called-harfbuzz.html @@ -0,0 +1,38 @@ + + + + +Why is it called Harfbuzz?: HarfBuzz Manual + + + + + + + + + + + + + + + + +
+

+Why is it called Harfbuzz?

+

+ Harfbuzz began its life as text shaping code within the FreeType + project, (and you will see references to the FreeType authors + within the source code copyright declarations) but was then + abstracted out to its own project. This project is maintained by + Behdad Esfahbod, and named Harfbuzz. Originally, it was a shaping + engine for OpenType fonts - "Harfbuzz" is the Persian + for "open type". +

+
+
+
Generated by GTK-Doc V1.25.1
+ + \ No newline at end of file diff --git a/docs/usermanual-buffers-language-script-and-direction.xml b/docs/usermanual-buffers-language-script-and-direction.xml new file mode 100644 index 0000000..3a26c55 --- /dev/null +++ b/docs/usermanual-buffers-language-script-and-direction.xml @@ -0,0 +1,77 @@ + + Buffers, language, script and direction + + The input to Harfbuzz is a series of Unicode characters, stored in a + buffer. In this chapter, we'll look at how to set up a buffer with + the text that we want and then customize the properties of the + buffer. + +
+ Creating and destroying buffers + + As we saw in our initial example, a buffer is created and + initialized with hb_buffer_create(). This + produces a new, empty buffer object, instantiated with some + default values and ready to accept your Unicode strings. + + + Harfbuzz manages the memory of objects that it creates (such as + buffers), so you don't have to. When you have finished working on + a buffer, you can call hb_buffer_destroy(): + + + hb_buffer_t *buffer = hb_buffer_create(); + ... + hb_buffer_destroy(buffer); + + + This will destroy the object and free its associated memory - + unless some other part of the program holds a reference to this + buffer. If you acquire a Harfbuzz buffer from another subsystem + and want to ensure that it is not garbage collected by someone + else destroying it, you should increase its reference count: + + +void somefunc(hb_buffer_t *buffer) { + buffer = hb_buffer_reference(buffer); + ... + + + And then decrease it once you're done with it: + + + hb_buffer_destroy(buffer); +} + + + To throw away all the data in your buffer and start from scratch, + call hb_buffer_reset(buffer). If you want to + throw away the string in the buffer but keep the options, you can + instead call hb_buffer_clear_contents(buffer). + +
+
+ Adding text to the buffer + + Now we have a brand new Harfbuzz buffer. Let's start filling it + with text! From Harfbuzz's perspective, a buffer is just a stream + of Unicode codepoints, but your input string is probably in one of + the standard Unicode character encodings (UTF-8, UTF-16, UTF-32) + +
+
+ Setting buffer properties + + +
+
+ What about the other scripts? + + +
+
+ Customizing Unicode functions + + +
+ \ No newline at end of file diff --git a/docs/usermanual-clusters.xml b/docs/usermanual-clusters.xml new file mode 100644 index 0000000..8b64bde --- /dev/null +++ b/docs/usermanual-clusters.xml @@ -0,0 +1,304 @@ + + + Clusters + + In shaping text, a cluster is a sequence of + code points that needs to be treated as a single, indivisible unit. + + + When you add text to a HB buffer, each character is associated with + a cluster value. This is an arbitrary number as + far as HB is concerned. + + + Most clients will use UTF-8, UTF-16, or UTF-32 indices, but the + actual number does not matter. Moreover, it is not required for the + cluster values to be monotonically increasing, but pretty much all + of HB's tests are performed on monotonically increasing cluster + numbers. Nevertheless, there is no such assumption in the code + itself. With that in mind, let's examine what happens with cluster + values during shaping under each cluster-level. + + + HarfBuzz provides three levels of clustering + support. Level 0 is the default behavior and reproduces the behavior + of the old HarfBuzz library. Level 1 tweaks this behavior slightly + to produce better results, so level 1 clustering is recommended for + code that is not required to implement backward compatibility with + the old HarfBuzz. + + + Level 2 differs significantly in how it treats cluster values. + Levels 0 and 1 both process ligatures and glyph decomposition by + merging clusters; level 2 does not. + + + The conceptual model for what the cluster values mean, in levels 0 + and 1, is this: + + + + + the sequence of cluster values will always remain monotone + + + + + each value represents a single cluster + + + + + each cluster contains one or more glyphs and one or more + characters + + + + + Assuming that initial cluster numbers were monotonically increasing + and distinct, then all adjacent glyphs having the same cluster + number belong to the same cluster, and all characters belong to the + cluster that has the highest number not larger than their initial + cluster number. This will become clearer with an example. + + + + A clustering example for levels 0 and 1 + + Let's say we start with the following character sequence and cluster + values: + + + A,B,C,D,E + 0,1,2,3,4 + + + We then map the characters to glyphs. For simplicity, let's assume + that each character maps to the corresponding, identical-looking + glyph: + + + A,B,C,D,E + 0,1,2,3,4 + + + Now if, for example, B and C + ligate, then the clusters to which they belong "merge". + This merged cluster takes for its cluster number the minimum of all + the cluster numbers of the clusters that went in. In this case, we + get: + + + A,BC,D,E + 0,1 ,3,4 + + + Now let's assume that the BC glyph decomposes + into three components, and D also decomposes into + two. The components each inherit the cluster value of their parent: + + + A,BC0,BC1,BC2,D0,D1,E + 0,1 ,1 ,1 ,3 ,3 ,4 + + + Now if BC2 and D0 ligate, then + their clusters (numbers 1 and 3) merge into + min(1,3) = 1: + + + A,BC0,BC1,BC2D0,D1,E + 0,1 ,1 ,1 ,1 ,4 + + + At this point, cluster 1 means: the character sequence + BCD is represented by glyphs + BC0,BC1,BC2D0,D1 and cannot be broken down any + further. + + + + Reordering in levels 0 and 1 + + Another common operation in the more complex shapers is when things + reorder. In those cases, to maintain monotone clusters, HB merges + the clusters of everything in the reordering sequence. For example, + let's again start with the character sequence: + + + A,B,C,D,E + 0,1,2,3,4 + + + If D is reordered before B, + then the B, C, and + D clusters merge, and we get: + + + A,D,B,C,E + 0,1,1,1,4 + + + This is clearly not ideal, but it is the only sensible way to + maintain monotone indices and retain the true relationship between + glyphs and characters. + + + + The distinction between levels 0 and 1 + + So, the above is pretty much what cluster levels 0 and 1 do. The + only difference between the two is this: in level 0, at the very + beginning of the shaping process, we also merge clusters between + base characters and all Unicode marks (combining or not) following + them. E.g.: + + + A,acute,B + 0,1 ,2 + + + will become: + + + A,acute,B + 0,0 ,2 + + + This is the default behavior. We do it because Windows did it and + old HarfBuzz did it, so this remained the default. But this behavior + makes it impossible to color diacritic marks differently from their + base characters. That's why in level 1 we do not perform this + initial merging step. + + + For clients, level 0 is more convenient if they rely on HarfBuzz + clusters for cursor positioning. But that's wrong anyway: cursor + positions should be determined based on Unicode grapheme boundaries, + NOT shaping clusters. As such, level 1 clusters are preferred. + + + One last note about levels 0 and 1. We currently don't allow a + MultipleSubst lookup to replace a glyph with zero + glyphs (i.e., to delete a glyph). But in some other situations, + glyphs can be deleted. In those cases, if the glyph being deleted is + the last glyph of its cluster, we make sure to merge the cluster + with a neighboring cluster. + + + This is, primarily, to make sure that the starting cluster of the + text always has the cluster index pointing to the start of the text + for the run; more than one client currently relies on this + guarantee. + + + Incidentally, Apple's CoreText does something else to maintain the + same promise: it inserts a glyph with id 65535 at the beginning of + the glyph string if the glyph corresponding to the first character + in the run was deleted. HarfBuzz might do something similar in the + future. + + + + Level 2 + + Level 2 is a different beast from levels 0 and 1. It is simple to + describe, but hard to make sense of. It simply doesn't do any + cluster merging whatsoever. When things ligate or otherwise multiple + glyphs turn into one, the cluster value of the first glyph is + retained. + + + Here are a few examples of why processing cluster values produced at + this level might be tricky: + + + Ligatures with combining marks + + Imagine capital letters are bases and lower case letters are + combining marks. With an input sequence like this: + + + A,a,B,b,C,c + 0,1,2,3,4,5 + + + if A,B,C ligate, then here are the cluster + values one would get under the various levels: + + + level 0: + + + ABC,a,b,c + 0 ,0,0,0 + + + level 1: + + + ABC,a,b,c + 0 ,0,0,5 + + + level 2: + + + ABC,a,b,c + 0 ,1,3,5 + + + Making sense of the last example is the hardest for a client, + because there is nothing in the cluster values to suggest that + B and C ligated with + A. + + + + Reordering + + Another tricky case is when things reorder. Under level 2: + + + A,B,C,D,E + 0,1,2,3,4 + + + Now imagine D moves before + B: + + + A,D,B,C,E + 0,3,1,2,4 + + + Now, if D ligates with B, we + get: + + + A,DB,C,E + 0,3 ,2,4 + + + In a different scenario, A and + B could have ligated + before D reordered; that + would have resulted in: + + + AB,D,C,E + 0 ,3,2,4 + + + There's no way to differentitate between these two scenarios based + on the cluster numbers alone. + + + Another problem appens with ligatures under level 2 if the + direction of the text is forced to opposite of its natural + direction (e.g. left-to-right Arabic). But that's too much of a + corner case to worry about. + + + + diff --git a/docs/usermanual-fonts-and-faces.xml b/docs/usermanual-fonts-and-faces.xml new file mode 100644 index 0000000..01fcdc9 --- /dev/null +++ b/docs/usermanual-fonts-and-faces.xml @@ -0,0 +1,18 @@ + + Fonts and faces +
+ Using FreeType + + +
+
+ Using Harfbuzz's native OpenType implementation + + +
+
+ Using your own font functions + + +
+ \ No newline at end of file diff --git a/docs/usermanual-glyph-information.xml b/docs/usermanual-glyph-information.xml new file mode 100644 index 0000000..ca674c0 --- /dev/null +++ b/docs/usermanual-glyph-information.xml @@ -0,0 +1,8 @@ + + Glyph information + + Names and numbers + + + + \ No newline at end of file diff --git a/docs/usermanual-hello-harfbuzz.xml b/docs/usermanual-hello-harfbuzz.xml new file mode 100644 index 0000000..34db017 --- /dev/null +++ b/docs/usermanual-hello-harfbuzz.xml @@ -0,0 +1,183 @@ + + Hello, Harfbuzz + + Here's the simplest Harfbuzz that can possibly work. We will improve + it later. + + + + + Create a buffer and put your text in it. + + + + + #include <hb.h> + hb_buffer_t *buf; + buf = hb_buffer_create(); + hb_buffer_add_utf8(buf, text, strlen(text), 0, strlen(text)); + + + + + Guess the script, language and direction of the buffer. + + + + + hb_buffer_guess_segment_properties(buf); + + + + + Create a face and a font, using FreeType for now. + + + + + #include <hb-ft.h> + FT_New_Face(ft_library, font_path, index, &face) + hb_font_t *font = hb_ft_font_create(face); + + + + + Shape! + + + + + hb_shape(font, buf, NULL, 0); + + + + + Get the glyph and position information. + + + + + hb_glyph_info_t *glyph_info = hb_buffer_get_glyph_infos(buf, &glyph_count); + hb_glyph_position_t *glyph_pos = hb_buffer_get_glyph_positions(buf, &glyph_count); + + + + + Iterate over each glyph. + + + + + for (i = 0; i < glyph_count; ++i) { + glyphid = glyph_info[i].codepoint; + x_offset = glyph_pos[i].x_offset / 64.0; + y_offset = glyph_pos[i].y_offset / 64.0; + x_advance = glyph_pos[i].x_advance / 64.0; + y_advance = glyph_pos[i].y_advance / 64.0; + draw_glyph(glyphid, cursor_x + x_offset, cursor_y + y_offset); + cursor_x += x_advance; + cursor_y += y_advance; + } + + + + + Tidy up. + + + + + hb_buffer_destroy(buf); + hb_font_destroy(hb_ft_font); + +
+ What Harfbuzz doesn't do + + The code above will take a UTF8 string, shape it, and give you the + information required to lay it out correctly on a single + horizontal (or vertical) line using the font provided. That is the + extent of Harfbuzz's responsibility. + + + If you are implementing a text layout engine you may have other + responsibilities, that Harfbuzz will not help you with: + + + + + Harfbuzz won't help you with bidirectionality. If you want to + lay out text with mixed Hebrew and English, you will need to + ensure that the buffer provided to Harfbuzz has those + characters in the correct layout order. This will be different + from the logical order in which the Unicode text is stored. In + other words, the user will hit the keys in the following + sequence: + + +A B C [space] ג ב א [space] D E F + + + but will expect to see in the output: + + +ABC אבג DEF + + + This reordering is called bidi processing + ("bidi" is short for bidirectional), and there's an + algorithm as an annex to the Unicode Standard which tells you how + to reorder a string from logical order into presentation order. + Before sending your string to Harfbuzz, you may need to apply the + bidi algorithm to it. Libraries such as ICU and fribidi can do + this for you. + + + + + Harfbuzz won't help you with text that contains different font + properties. For instance, if you have the string "a + huge breakfast", and you expect + "huge" to be italic, you will need to send three + strings to Harfbuzz: a, in your Roman font; + huge using your italic font; and + breakfast using your Roman font again. + Similarly if you change font, font size, script, language or + direction within your string, you will need to shape each run + independently and then output them independently. Harfbuzz + expects to shape a run of characters sharing the same + properties. + + + + + Harfbuzz won't help you with line breaking, hyphenation or + justification. As mentioned above, it lays out the string + along a single line of, notionally, + infinite length. If you want to find out where the potential + word, sentence and line break points are in your text, you + could use the ICU library's break iterator functions. + + + Harfbuzz can tell you how wide a shaped piece of text is, which is + useful input to a justification algorithm, but it knows nothing + about paragraphs, lines or line lengths. Nor will it adjust the + space between words to fit them proportionally into a line. If you + want to layout text in paragraphs, you will probably want to send + each word of your text to Harfbuzz to determine its shaped width + after glyph substitutions, then work out how many words will fit + on a line, and then finally output each word of the line separated + by a space of the correct size to fully justify the paragraph. + + + + + As a layout engine implementor, Harfbuzz will help you with the + interface between your text and your font, and that's something + that you'll need - what you then do with the glyphs that your font + returns is up to you. The example we saw above enough to get us + started using Harfbuzz. Now we are going to use the remainder of + Harfbuzz's API to refine that example and improve our text shaping + capabilities. + +
+ \ No newline at end of file diff --git a/docs/usermanual-install-harfbuzz.xml b/docs/usermanual-install-harfbuzz.xml new file mode 100644 index 0000000..be8ac8d --- /dev/null +++ b/docs/usermanual-install-harfbuzz.xml @@ -0,0 +1,70 @@ + + Install Harfbuzz +
+ Download + + For tarball releases of HarfBuzz, look + here. + At the same place you will + also find Win32 binary bundles that include libharfbuzz DLL, hb-view.exe, + hb-shape.exe, and all dependencies. + + + The canonical source tree is available + here. + Also available on github. + + + The API that comes with hb.h will + not change incompatibly. Other, peripheral, headers are more likely to go + through minor modifications, but again, will do our best to never change + API in an incompatible way. We will never break the ABI. + + + If you are not sure whether Pango or HarfBuzz is right for you, read + this. + +
+
+ Building + + On Linux, install the development packages for FreeType, Cairo, and GLib. + For example, on Ubuntu / Debian, you would do: + +sudo apt-get install gcc g++ libfreetype6-dev libglib2.0-dev libcairo2-dev + + whereas on Fedora, RHEL, CentOS, and other Red Hat based systems you would do: + +sudo yum install gcc gcc-c++ freetype-devel glib2-devel cairo-devel + + or using MacPorts: + +sudo port install freetype glib2 cairo + + + + If you are using a tarball, you can now proceed to running + configure and make as with any + other standard package. That should leave you with a shared library in + src/, and a few utility programs including hb-view + and hb-shape under util/. + + + If you are bootstraping from git, you need a few more tools before you + can run autogen.sh for the first time. Namely, + pkg-config and ragel. + Again, on Ubuntu / Debian: + +sudo apt-get install autoconf automake libtool pkg-config ragel gtk-doc-tools + + and on Fedora, RHEL, CentOS: + +sudo yum install autoconf automake libtool pkgconfig ragel gtk-doc + + or using MacPorts: + +sudo port install autoconf automake libtool pkgconfig ragel gtk-doc + + +
+ diff --git a/docs/usermanual-opentype-features.xml b/docs/usermanual-opentype-features.xml new file mode 100644 index 0000000..470bab8 --- /dev/null +++ b/docs/usermanual-opentype-features.xml @@ -0,0 +1,13 @@ + + Shaping and shape plans +
+ OpenType features + + +
+
+ Plans and caching + + +
+ \ No newline at end of file diff --git a/docs/usermanual-what-is-harfbuzz.xml b/docs/usermanual-what-is-harfbuzz.xml new file mode 100644 index 0000000..3574d75 --- /dev/null +++ b/docs/usermanual-what-is-harfbuzz.xml @@ -0,0 +1,115 @@ + + What is Harfbuzz? + + Harfbuzz is a text shaping engine. It solves + the problem of selecting and positioning glyphs from a font given a + Unicode string. + +
+ Why do I need it? + + Text shaping is an integral part of preparing text for display. It + is a fairly low level operation; Harfbuzz is used directly by + graphic rendering libraries such as Pango, and the layout engines + in Firefox, LibreOffice and Chromium. Unless you are + writing one of these layout engines yourself, + you will probably not need to use Harfbuzz - normally higher level + libraries will turn text into glyphs for you. + + + However, if you are writing a layout engine + or graphics library yourself, you will need to perform text + shaping, and this is where Harfbuzz can help you. Here are some + reasons why you need it: + + + + + OpenType fonts contain a set of glyphs, indexed by glyph ID. + The glyph ID within the font does not necessarily relate to a + Unicode codepoint. For instance, some fonts have the letter + "a" as glyph ID 1. To pull the right glyph out of + the font in order to display it, you need to consult a table + within the font (the "cmap" table) which maps + Unicode codepoints to glyph IDs. Text shaping turns codepoints + into glyph IDs. + + + + + Many OpenType fonts contain ligatures: combinations of + characters which are rendered together. For instance, it's + common for the fi combination to appear in + print as the single ligature "fi". Whether you should + render text as fi or "fi" does not + depend on the input text, but on the capabilities of the font + and the level of ligature application you wish to perform. + Text shaping involves querying the font's ligature tables and + determining what substitutions should be made. + + + + + While ligatures like "fi" are typographic + refinements, some languages require such + substitutions to be made in order to display text correctly. + In Tamil, when the letter "TTA" (ட) letter is + followed by "U" (உ), the combination should appear + as the single glyph "டு". The sequence of Unicode + characters "டஉ" needs to be rendered as a single + glyph from the font - text shaping chooses the correct glyph + from the sequence of characters provided. + + + + + Similarly, each Arabic character has four different variants: + within a font, there will be glyphs for the initial, medial, + final, and isolated forms of each letter. Unicode only encodes + one codepoint per character, and so a Unicode string will not + tell you which glyph to use. Text shaping chooses the correct + form of the letter and returns the correct glyph from the font + that you need to render. + + + + + Other languages have marks and accents which need to be + rendered in certain positions around a base character. For + instance, the Moldovan language has the Cyrillic letter + "zhe" (ж) with a breve accent, like so: ӂ. Some + fonts will contain this character as an individual glyph, + whereas other fonts will not contain a zhe-with-breve glyph + but expect the rendering engine to form the character by + overlaying the two glyphs ж and ˘. Where you should draw the + combining breve depends on the height of the preceding glyph. + Again, for Arabic, the correct positioning of vowel marks + depends on the height of the character on which you are + placing the mark. Text shaping tells you whether you have a + precomposed glyph within your font or if you need to compose a + glyph yourself out of combining marks, and if so, where to + position those marks. + + + + + If this is something that you need to do, then you need a text + shaping engine: you could use Uniscribe if you are using Windows; + you could use CoreText on OS X; or you could use Harfbuzz. In the + rest of this manual, we are going to assume that you are the + implementor of a text layout engine. + +
+
+ Why is it called Harfbuzz? + + Harfbuzz began its life as text shaping code within the FreeType + project, (and you will see references to the FreeType authors + within the source code copyright declarations) but was then + abstracted out to its own project. This project is maintained by + Behdad Esfahbod, and named Harfbuzz. Originally, it was a shaping + engine for OpenType fonts - "Harfbuzz" is the Persian + for "open type". + +
+ \ No newline at end of file diff --git a/docs/version.xml b/docs/version.xml new file mode 100644 index 0000000..9df886c --- /dev/null +++ b/docs/version.xml @@ -0,0 +1 @@ +1.4.2 diff --git a/docs/version.xml.in b/docs/version.xml.in new file mode 100644 index 0000000..de213c2 --- /dev/null +++ b/docs/version.xml.in @@ -0,0 +1 @@ +@HB_VERSION@ diff --git a/gtk-doc.make b/gtk-doc.make new file mode 100644 index 0000000..e791656 --- /dev/null +++ b/gtk-doc.make @@ -0,0 +1,289 @@ +# -*- mode: makefile -*- + +#################################### +# Everything below here is generic # +#################################### + +if GTK_DOC_USE_LIBTOOL +GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +GTKDOC_RUN = $(LIBTOOL) --mode=execute +else +GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +GTKDOC_RUN = +endif + +# We set GPATH here; this gives us semantics for GNU make +# which are more like other make's VPATH, when it comes to +# whether a source that is a target of one rule is then +# searched for in VPATH/GPATH. +# +GPATH = $(srcdir) + +TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) + +SETUP_FILES = \ + $(content_files) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt + +EXTRA_DIST = \ + $(HTML_IMAGES) \ + $(SETUP_FILES) + +DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \ + html-build.stamp pdf-build.stamp \ + sgml.stamp html.stamp pdf.stamp + +SCANOBJ_FILES = \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ + $(DOC_MODULE).interfaces \ + $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals + +REPORT_FILES = \ + $(DOC_MODULE)-undocumented.txt \ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt + +gtkdoc-check.test: Makefile + $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \ + echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \ + chmod +x $@ + +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test + +if GTK_DOC_BUILD_HTML +HTML_BUILD_STAMP=html-build.stamp +else +HTML_BUILD_STAMP= +endif +if GTK_DOC_BUILD_PDF +PDF_BUILD_STAMP=pdf-build.stamp +else +PDF_BUILD_STAMP= +endif + +all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +.PHONY: all-gtk-doc + +if ENABLE_GTK_DOC +all-local: all-gtk-doc +endif + +docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) + +$(REPORT_FILES): sgml-build.stamp + +#### setup #### + +GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_$(V)) +GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SETUP_0=@echo " DOC Preparing build"; + +setup-build.stamp: + -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ + if test "x$$files" != "x" ; then \ + for file in $$files ; do \ + destdir=`dirname $(abs_builddir)/$$file`; \ + test -d "$$destdir" || mkdir -p "$$destdir"; \ + test -f $(abs_srcdir)/$$file && \ + cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ + done; \ + fi; \ + fi + $(AM_V_at)touch setup-build.stamp + + +#### scan #### + +GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V)) +GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SCAN_0=@echo " DOC Scanning header files"; + +GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_$(V)) +GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_INTROSPECT_0=@echo " DOC Introspecting gobjects"; + +scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) + $(GTK_DOC_V_SCAN)_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ + gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) + $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ + scanobj_options=""; \ + gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + scanobj_options="--verbose"; \ + fi; \ + fi; \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ + gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ + else \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ + fi + $(AM_V_at)touch scan-build.stamp + +$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true + +#### xml #### + +GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V)) +GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XML_0=@echo " DOC Building XML"; + +sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) + $(GTK_DOC_V_XML)_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ + gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) + $(AM_V_at)touch sgml-build.stamp + +sgml.stamp: sgml-build.stamp + @true + +#### html #### + +GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V)) +GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_HTML_0=@echo " DOC Building HTML"; + +GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V)) +GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references"; + +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ + mkhtml_options=""; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkhtml_options="$$mkhtml_options --verbose"; \ + fi; \ + fi; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ + if test "$(?)" = "0"; then \ + mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ + fi; \ + cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + -@test "x$(HTML_IMAGES)" = "x" || \ + for file in $(HTML_IMAGES) ; do \ + if test -f $(abs_srcdir)/$$file ; then \ + cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ + fi; \ + if test -f $(abs_builddir)/$$file ; then \ + cp $(abs_builddir)/$$file $(abs_builddir)/html; \ + fi; \ + done; + $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + $(AM_V_at)touch html-build.stamp + +#### pdf #### + +GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V)) +GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_PDF_0=@echo " DOC Building PDF"; + +pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ + mkpdf_options=""; \ + gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkpdf_options="$$mkpdf_options --verbose"; \ + fi; \ + fi; \ + if test "x$(HTML_IMAGES)" != "x"; then \ + for img in $(HTML_IMAGES); do \ + part=`dirname $$img`; \ + echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \ + if test $$? != 0; then \ + mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ + fi; \ + done; \ + fi; \ + gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) + $(AM_V_at)touch pdf-build.stamp + +############## + +clean-local: + @rm -f *~ *.bak + @rm -rf .libs + @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ + rm -f $(DOC_MODULE).types; \ + fi + +distclean-local: + @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ + fi + +maintainer-clean-local: + @rm -rf xml html + +install-data-local: + @installfiles=`echo $(builddir)/html/*`; \ + if test "$$installfiles" = '$(builddir)/html/*'; \ + then echo 1>&2 'Nothing to install' ; \ + else \ + if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ + else \ + installdir="$(DESTDIR)$(TARGET_DIR)"; \ + fi; \ + $(mkinstalldirs) $${installdir} ; \ + for i in $$installfiles; do \ + echo ' $(INSTALL_DATA) '$$i ; \ + $(INSTALL_DATA) $$i $${installdir}; \ + done; \ + if test -n "$(DOC_MODULE_VERSION)"; then \ + mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ + $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ + fi; \ + $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ + fi + +uninstall-local: + @if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ + else \ + installdir="$(DESTDIR)$(TARGET_DIR)"; \ + fi; \ + rm -rf $${installdir} + +# +# Require gtk-doc when making dist +# +if HAVE_GTK_DOC +dist-check-gtkdoc: docs +else +dist-check-gtkdoc: + @echo "*** gtk-doc is needed to run 'make dist'. ***" + @echo "*** gtk-doc was not found when 'configure' ran. ***" + @echo "*** please install gtk-doc and rerun 'configure'. ***" + @false +endif + +dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local + @mkdir $(distdir)/html + @cp ./html/* $(distdir)/html + @-cp ./$(DOC_MODULE).pdf $(distdir)/ + @-cp ./$(DOC_MODULE).types $(distdir)/ + @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/ + @cd $(distdir) && rm -f $(DISTCLEANFILES) + @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html + +.PHONY : dist-hook-local docs diff --git a/harfbuzz.doap b/harfbuzz.doap new file mode 100644 index 0000000..d2896eb --- /dev/null +++ b/harfbuzz.doap @@ -0,0 +1,24 @@ + + + harfbuzz + Text shaping library + + + + + + + + + Behdad Esfahbod + + + + diff --git a/install-sh b/install-sh new file mode 100755 index 0000000..377bb86 --- /dev/null +++ b/install-sh @@ -0,0 +1,527 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2011-11-20.07; # UTC + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# 'make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. + +nl=' +' +IFS=" "" $nl" + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit=${DOITPROG-} +if test -z "$doit"; then + doit_exec=exec +else + doit_exec=$doit +fi + +# Put in absolute file names if you don't have them in your path; +# or use environment vars. + +chgrpprog=${CHGRPPROG-chgrp} +chmodprog=${CHMODPROG-chmod} +chownprog=${CHOWNPROG-chown} +cmpprog=${CMPPROG-cmp} +cpprog=${CPPROG-cp} +mkdirprog=${MKDIRPROG-mkdir} +mvprog=${MVPROG-mv} +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} + +posix_glob='?' +initialize_posix_glob=' + test "$posix_glob" != "?" || { + if (set -f) 2>/dev/null; then + posix_glob= + else + posix_glob=: + fi + } +' + +posix_mkdir= + +# Desired mode of installed file. +mode=0755 + +chgrpcmd= +chmodcmd=$chmodprog +chowncmd= +mvcmd=$mvprog +rmcmd="$rmprog -f" +stripcmd= + +src= +dst= +dir_arg= +dst_arg= + +copy_on_change=false +no_target_directory= + +usage="\ +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: + --help display this help and exit. + --version display version info and exit. + + -c (ignored) + -C install only if different (preserve the last data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -s $stripprog installed files. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG +" + +while test $# -ne 0; do + case $1 in + -c) ;; + + -C) copy_on_change=true;; + + -d) dir_arg=true;; + + -g) chgrpcmd="$chgrpprog $2" + shift;; + + --help) echo "$usage"; exit $?;; + + -m) mode=$2 + case $mode in + *' '* | *' '* | *' +'* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; + + -o) chowncmd="$chownprog $2" + shift;; + + -s) stripcmd=$stripprog;; + + -t) dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; + + -T) no_target_directory=true;; + + --version) echo "$0 $scriptversion"; exit $?;; + + --) shift + break;; + + -*) echo "$0: invalid option: $1" >&2 + exit 1;; + + *) break;; + esac + shift +done + +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then + # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dst_arg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dst_arg" + shift # fnord + fi + shift # arg + dst_arg=$arg + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + done +fi + +if test $# -eq 0; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call 'install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +if test -z "$dir_arg"; then + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 + + # Set umask so as not to create temps with too-generous modes. + # However, 'strip' requires both read and write access to temps. + case $mode in + # Optimize common cases. + *644) cp_umask=133;; + *755) cp_umask=22;; + + *[0-7]) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw='% 200' + fi + cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; + *) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw=,u+rw + fi + cp_umask=$mode$u_plus_rw;; + esac +fi + +for src +do + # Protect names problematic for 'test' and other utilities. + case $src in + -* | [=\(\)!]) src=./$src;; + esac + + if test -n "$dir_arg"; then + dst=$src + dstdir=$dst + test -d "$dstdir" + dstdir_status=$? + else + + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dst_arg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + dst=$dst_arg + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 + fi + dstdir=$dst + dst=$dstdir/`basename "$src"` + dstdir_status=0 + else + # Prefer dirname, but fall back on a substitute if dirname fails. + dstdir=` + (dirname "$dst") 2>/dev/null || + expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$dst" : 'X\(//\)[^/]' \| \ + X"$dst" : 'X\(//\)$' \| \ + X"$dst" : 'X\(/\)' \| . 2>/dev/null || + echo X"$dst" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q' + ` + + test -d "$dstdir" + dstdir_status=$? + fi + fi + + obsolete_mkdir_used=false + + if test $dstdir_status != 0; then + case $posix_mkdir in + '') + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; + esac + + if + $posix_mkdir && ( + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + ) + then : + else + + # The umask is ridiculous, or mkdir does not conform to POSIX, + # or it failed possibly due to a race condition. Create the + # directory the slow way, step by step, checking for races as we go. + + case $dstdir in + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; + esac + + eval "$initialize_posix_glob" + + oIFS=$IFS + IFS=/ + $posix_glob set -f + set fnord $dstdir + shift + $posix_glob set +f + IFS=$oIFS + + prefixes= + + for d + do + test X"$d" = X && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ + done + + if test -n "$prefixes"; then + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true + fi + fi + fi + + if test -n "$dir_arg"; then + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || + test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 + else + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + + # Copy the file name to the temp name. + (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # If -C, don't bother to copy if it wouldn't change the file. + if $copy_on_change && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + + eval "$initialize_posix_glob" && + $posix_glob set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && + $posix_glob set +f && + + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 + then + rm -f "$dsttmp" + else + # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + { + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + fi || exit 1 + + trap '' 0 + fi +done + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/ltmain.sh b/ltmain.sh new file mode 100644 index 0000000..a356aca --- /dev/null +++ b/ltmain.sh @@ -0,0 +1,9661 @@ + +# libtool (GNU libtool) 2.4.2 +# Written by Gordon Matzigkeit , 1996 + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, +# or obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +# Usage: $progname [OPTION]... [MODE-ARG]... +# +# Provide generalized library-building support services. +# +# --config show all configuration variables +# --debug enable verbose shell tracing +# -n, --dry-run display commands without modifying any files +# --features display basic configuration information and exit +# --mode=MODE use operation mode MODE +# --preserve-dup-deps don't remove duplicate dependency libraries +# --quiet, --silent don't print informational messages +# --no-quiet, --no-silent +# print informational messages (default) +# --no-warn don't display warning messages +# --tag=TAG use configuration variables from tag TAG +# -v, --verbose print more informational messages than default +# --no-verbose don't print the extra informational messages +# --version print version information +# -h, --help, --help-all print short, long, or detailed help message +# +# MODE must be one of the following: +# +# clean remove files from the build directory +# compile compile a source file into a libtool object +# execute automatically set library path, then run a program +# finish complete the installation of libtool libraries +# install install libraries or executables +# link create a library or an executable +# uninstall remove libraries from an installed directory +# +# MODE-ARGS vary depending on the MODE. When passed as first option, +# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. +# Try `$progname --help --mode=MODE' for a more detailed description of MODE. +# +# When reporting a bug, please describe a test case to reproduce it and +# include the following information: +# +# host-triplet: $host +# shell: $SHELL +# compiler: $LTCC +# compiler flags: $LTCFLAGS +# linker: $LD (gnu? $with_gnu_ld) +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1 +# automake: $automake_version +# autoconf: $autoconf_version +# +# Report bugs to . +# GNU libtool home page: . +# General help using GNU software: . + +PROGRAM=libtool +PACKAGE=libtool +VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1" +TIMESTAMP="" +package_revision=1.3337 + +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + +# NLS nuisances: We save the old values to restore during execute mode. +lt_user_locale= +lt_safe_locale= +for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +do + eval "if test \"\${$lt_var+set}\" = set; then + save_$lt_var=\$$lt_var + $lt_var=C + export $lt_var + lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" + lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" + fi" +done +LC_ALL=C +LANGUAGE=C +export LANGUAGE LC_ALL + +$lt_unset CDPATH + + +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath="$0" + + + +: ${CP="cp -f"} +test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} +: ${MAKE="make"} +: ${MKDIR="mkdir"} +: ${MV="mv -f"} +: ${RM="rm -f"} +: ${SHELL="${CONFIG_SHELL-/bin/sh}"} +: ${Xsed="$SED -e 1s/^X//"} + +# Global variables: +EXIT_SUCCESS=0 +EXIT_FAILURE=1 +EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. +EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. + +exit_status=$EXIT_SUCCESS + +# Make sure IFS has a sensible default +lt_nl=' +' +IFS=" $lt_nl" + +dirname="s,/[^/]*$,," +basename="s,^.*/,," + +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi +} # func_dirname may be replaced by extended shell implementation + + +# func_basename file +func_basename () +{ + func_basename_result=`$ECHO "${1}" | $SED "$basename"` +} # func_basename may be replaced by extended shell implementation + + +# func_dirname_and_basename file append nondir_replacement +# perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# Implementation must be kept synchronized with func_dirname +# and func_basename. For efficiency, we do not delegate to +# those functions but instead duplicate the functionality here. +func_dirname_and_basename () +{ + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi + func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` +} # func_dirname_and_basename may be replaced by extended shell implementation + + +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# func_strip_suffix prefix name +func_stripname () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname may be replaced by extended shell implementation + + +# These SED scripts presuppose an absolute path with a trailing slash. +pathcar='s,^/\([^/]*\).*$,\1,' +pathcdr='s,^/[^/]*,,' +removedotparts=':dotsl + s@/\./@/@g + t dotsl + s,/\.$,/,' +collapseslashes='s@/\{1,\}@/@g' +finalslash='s,/*$,/,' + +# func_normal_abspath PATH +# Remove doubled-up and trailing slashes, "." path components, +# and cancel out any ".." path components in PATH after making +# it an absolute path. +# value returned in "$func_normal_abspath_result" +func_normal_abspath () +{ + # Start from root dir and reassemble the path. + func_normal_abspath_result= + func_normal_abspath_tpath=$1 + func_normal_abspath_altnamespace= + case $func_normal_abspath_tpath in + "") + # Empty path, that just means $cwd. + func_stripname '' '/' "`pwd`" + func_normal_abspath_result=$func_stripname_result + return + ;; + # The next three entries are used to spot a run of precisely + # two leading slashes without using negated character classes; + # we take advantage of case's first-match behaviour. + ///*) + # Unusual form of absolute path, do nothing. + ;; + //*) + # Not necessarily an ordinary path; POSIX reserves leading '//' + # and for example Cygwin uses it to access remote file shares + # over CIFS/SMB, so we conserve a leading double slash if found. + func_normal_abspath_altnamespace=/ + ;; + /*) + # Absolute path, do nothing. + ;; + *) + # Relative path, prepend $cwd. + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + ;; + esac + # Cancel out all the simple stuff to save iterations. We also want + # the path to end with a slash for ease of parsing, so make sure + # there is one (and only one) here. + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` + while :; do + # Processed it all yet? + if test "$func_normal_abspath_tpath" = / ; then + # If we ascended to the root using ".." the result may be empty now. + if test -z "$func_normal_abspath_result" ; then + func_normal_abspath_result=/ + fi + break + fi + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$pathcdr"` + # Figure out what to do with it + case $func_normal_abspath_tcomponent in + "") + # Trailing empty path component, ignore it. + ;; + ..) + # Parent dir; strip last assembled component from result. + func_dirname "$func_normal_abspath_result" + func_normal_abspath_result=$func_dirname_result + ;; + *) + # Actual path component, append it. + func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent + ;; + esac + done + # Restore leading double-slash if one was found on entry. + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result +} + +# func_relative_path SRCDIR DSTDIR +# generates a relative path from SRCDIR to DSTDIR, with a trailing +# slash if non-empty, suitable for immediately appending a filename +# without needing to append a separator. +# value returned in "$func_relative_path_result" +func_relative_path () +{ + func_relative_path_result= + func_normal_abspath "$1" + func_relative_path_tlibdir=$func_normal_abspath_result + func_normal_abspath "$2" + func_relative_path_tbindir=$func_normal_abspath_result + + # Ascend the tree starting from libdir + while :; do + # check if we have found a prefix of bindir + case $func_relative_path_tbindir in + $func_relative_path_tlibdir) + # found an exact match + func_relative_path_tcancelled= + break + ;; + $func_relative_path_tlibdir*) + # found a matching prefix + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" + func_relative_path_tcancelled=$func_stripname_result + if test -z "$func_relative_path_result"; then + func_relative_path_result=. + fi + break + ;; + *) + func_dirname $func_relative_path_tlibdir + func_relative_path_tlibdir=${func_dirname_result} + if test "x$func_relative_path_tlibdir" = x ; then + # Have to descend all the way to the root! + func_relative_path_result=../$func_relative_path_result + func_relative_path_tcancelled=$func_relative_path_tbindir + break + fi + func_relative_path_result=../$func_relative_path_result + ;; + esac + done + + # Now calculate path; take care to avoid doubling-up slashes. + func_stripname '' '/' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + func_stripname '/' '/' "$func_relative_path_tcancelled" + if test "x$func_stripname_result" != x ; then + func_relative_path_result=${func_relative_path_result}/${func_stripname_result} + fi + + # Normalisation. If bindir is libdir, return empty string, + # else relative path ending with a slash; either way, target + # file name can be directly appended. + if test ! -z "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result/" + func_relative_path_result=$func_stripname_result + fi +} + +# The name of this program: +func_dirname_and_basename "$progpath" +progname=$func_basename_result + +# Make sure we have an absolute path for reexecution: +case $progpath in + [\\/]*|[A-Za-z]:\\*) ;; + *[\\/]*) + progdir=$func_dirname_result + progdir=`cd "$progdir" && pwd` + progpath="$progdir/$progname" + ;; + *) + save_IFS="$IFS" + IFS=${PATH_SEPARATOR-:} + for progdir in $PATH; do + IFS="$save_IFS" + test -x "$progdir/$progname" && break + done + IFS="$save_IFS" + test -n "$progdir" || progdir=`pwd` + progpath="$progdir/$progname" + ;; +esac + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed="${SED}"' -e 1s/^X//' +sed_quote_subst='s/\([`"$\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Sed substitution that turns a string into a regex matching for the +# string literally. +sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' + +# Sed substitution that converts a w32 file name or path +# which contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + +# Re-`\' parameter expansions in output of double_quote_subst that were +# `\'-ed in input to the same. If an odd number of `\' preceded a '$' +# in input to double_quote_subst, that '$' was protected from expansion. +# Since each input `\' is now two `\'s, look for any number of runs of +# four `\'s followed by two `\'s and then a '$'. `\' that '$'. +bs='\\' +bs2='\\\\' +bs4='\\\\\\\\' +dollar='\$' +sed_double_backslash="\ + s/$bs4/&\\ +/g + s/^$bs2$dollar/$bs&/ + s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g + s/\n//g" + +# Standard options: +opt_dry_run=false +opt_help=false +opt_quiet=false +opt_verbose=false +opt_warning=: + +# func_echo arg... +# Echo program name prefixed message, along with the current mode +# name if it has been set yet. +func_echo () +{ + $ECHO "$progname: ${opt_mode+$opt_mode: }$*" +} + +# func_verbose arg... +# Echo program name prefixed message in verbose mode only. +func_verbose () +{ + $opt_verbose && func_echo ${1+"$@"} + + # A bug in bash halts the script if the last line of a function + # fails when set -e is in force, so we need another command to + # work around that: + : +} + +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + +# func_error arg... +# Echo program name prefixed message to standard error. +func_error () +{ + $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 +} + +# func_warning arg... +# Echo program name prefixed warning message to standard error. +func_warning () +{ + $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 + + # bash bug again: + : +} + +# func_fatal_error arg... +# Echo program name prefixed message to standard error, and exit. +func_fatal_error () +{ + func_error ${1+"$@"} + exit $EXIT_FAILURE +} + +# func_fatal_help arg... +# Echo program name prefixed message to standard error, followed by +# a help hint, and exit. +func_fatal_help () +{ + func_error ${1+"$@"} + func_fatal_error "$help" +} +help="Try \`$progname --help' for more information." ## default + + +# func_grep expression filename +# Check whether EXPRESSION matches any line of FILENAME, without output. +func_grep () +{ + $GREP "$1" "$2" >/dev/null 2>&1 +} + + +# func_mkdir_p directory-path +# Make sure the entire path to DIRECTORY-PATH is available. +func_mkdir_p () +{ + my_directory_path="$1" + my_dir_list= + + if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then + + # Protect directory names starting with `-' + case $my_directory_path in + -*) my_directory_path="./$my_directory_path" ;; + esac + + # While some portion of DIR does not yet exist... + while test ! -d "$my_directory_path"; do + # ...make a list in topmost first order. Use a colon delimited + # list incase some portion of path contains whitespace. + my_dir_list="$my_directory_path:$my_dir_list" + + # If the last portion added has no slash in it, the list is done + case $my_directory_path in */*) ;; *) break ;; esac + + # ...otherwise throw away the child directory and loop + my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` + done + my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` + + save_mkdir_p_IFS="$IFS"; IFS=':' + for my_dir in $my_dir_list; do + IFS="$save_mkdir_p_IFS" + # mkdir can fail with a `File exist' error if two processes + # try to create one of the directories concurrently. Don't + # stop in that case! + $MKDIR "$my_dir" 2>/dev/null || : + done + IFS="$save_mkdir_p_IFS" + + # Bail out if we (or some other process) failed to create a directory. + test -d "$my_directory_path" || \ + func_fatal_error "Failed to create \`$1'" + fi +} + + +# func_mktempdir [string] +# Make a temporary directory that won't clash with other running +# libtool processes, and avoids race conditions if possible. If +# given, STRING is the basename for that directory. +func_mktempdir () +{ + my_template="${TMPDIR-/tmp}/${1-$progname}" + + if test "$opt_dry_run" = ":"; then + # Return a directory name, but don't create it in dry-run mode + my_tmpdir="${my_template}-$$" + else + + # If mktemp works, use that first and foremost + my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + + if test ! -d "$my_tmpdir"; then + # Failing that, at least try and use $RANDOM to avoid a race + my_tmpdir="${my_template}-${RANDOM-0}$$" + + save_mktempdir_umask=`umask` + umask 0077 + $MKDIR "$my_tmpdir" + umask $save_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$my_tmpdir" || \ + func_fatal_error "cannot create temporary directory \`$my_tmpdir'" + fi + + $ECHO "$my_tmpdir" +} + + +# func_quote_for_eval arg +# Aesthetically quote ARG to be evaled later. +# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT +# is double-quoted, suitable for a subsequent eval, whereas +# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters +# which are still active within double quotes backslashified. +func_quote_for_eval () +{ + case $1 in + *[\\\`\"\$]*) + func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; + *) + func_quote_for_eval_unquoted_result="$1" ;; + esac + + case $func_quote_for_eval_unquoted_result in + # Double-quote args containing shell metacharacters to delay + # word splitting, command substitution and and variable + # expansion for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" + ;; + *) + func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" + esac +} + + +# func_quote_for_expand arg +# Aesthetically quote ARG to be evaled later; same as above, +# but do not quote variable references. +func_quote_for_expand () +{ + case $1 in + *[\\\`\"]*) + my_arg=`$ECHO "$1" | $SED \ + -e "$double_quote_subst" -e "$sed_double_backslash"` ;; + *) + my_arg="$1" ;; + esac + + case $my_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting and command substitution for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + my_arg="\"$my_arg\"" + ;; + esac + + func_quote_for_expand_result="$my_arg" +} + + +# func_show_eval cmd [fail_exp] +# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. +func_show_eval () +{ + my_cmd="$1" + my_fail_exp="${2-:}" + + ${opt_silent-false} || { + func_quote_for_expand "$my_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + if ${opt_dry_run-false}; then :; else + eval "$my_cmd" + my_status=$? + if test "$my_status" -eq 0; then :; else + eval "(exit $my_status); $my_fail_exp" + fi + fi +} + + +# func_show_eval_locale cmd [fail_exp] +# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. Use the saved locale for evaluation. +func_show_eval_locale () +{ + my_cmd="$1" + my_fail_exp="${2-:}" + + ${opt_silent-false} || { + func_quote_for_expand "$my_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + if ${opt_dry_run-false}; then :; else + eval "$lt_user_locale + $my_cmd" + my_status=$? + eval "$lt_safe_locale" + if test "$my_status" -eq 0; then :; else + eval "(exit $my_status); $my_fail_exp" + fi + fi +} + +# func_tr_sh +# Turn $1 into a string suitable for a shell variable name. +# Result is stored in $func_tr_sh_result. All characters +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, +# if $1 begins with a digit, a '_' is prepended as well. +func_tr_sh () +{ + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac +} + + +# func_version +# Echo version message to standard output and exit. +func_version () +{ + $opt_debug + + $SED -n '/(C)/!b go + :more + /\./!{ + N + s/\n# / / + b more + } + :go + /^# '$PROGRAM' (GNU /,/# warranty; / { + s/^# // + s/^# *$// + s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ + p + }' < "$progpath" + exit $? +} + +# func_usage +# Echo short help message to standard output and exit. +func_usage () +{ + $opt_debug + + $SED -n '/^# Usage:/,/^# *.*--help/ { + s/^# // + s/^# *$// + s/\$progname/'$progname'/ + p + }' < "$progpath" + echo + $ECHO "run \`$progname --help | more' for full usage" + exit $? +} + +# func_help [NOEXIT] +# Echo long help message to standard output and exit, +# unless 'noexit' is passed as argument. +func_help () +{ + $opt_debug + + $SED -n '/^# Usage:/,/# Report bugs to/ { + :print + s/^# // + s/^# *$// + s*\$progname*'$progname'* + s*\$host*'"$host"'* + s*\$SHELL*'"$SHELL"'* + s*\$LTCC*'"$LTCC"'* + s*\$LTCFLAGS*'"$LTCFLAGS"'* + s*\$LD*'"$LD"'* + s/\$with_gnu_ld/'"$with_gnu_ld"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ + p + d + } + /^# .* home page:/b print + /^# General help using/b print + ' < "$progpath" + ret=$? + if test -z "$1"; then + exit $ret + fi +} + +# func_missing_arg argname +# Echo program name prefixed message to standard error and set global +# exit_cmd. +func_missing_arg () +{ + $opt_debug + + func_error "missing argument for $1." + exit_cmd=exit +} + + +# func_split_short_opt shortopt +# Set func_split_short_opt_name and func_split_short_opt_arg shell +# variables after splitting SHORTOPT after the 2nd character. +func_split_short_opt () +{ + my_sed_short_opt='1s/^\(..\).*$/\1/;q' + my_sed_short_rest='1s/^..\(.*\)$/\1/;q' + + func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` + func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` +} # func_split_short_opt may be replaced by extended shell implementation + + +# func_split_long_opt longopt +# Set func_split_long_opt_name and func_split_long_opt_arg shell +# variables after splitting LONGOPT at the `=' sign. +func_split_long_opt () +{ + my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' + my_sed_long_arg='1s/^--[^=]*=//' + + func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` + func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` +} # func_split_long_opt may be replaced by extended shell implementation + +exit_cmd=: + + + + + +magic="%%%MAGIC variable%%%" +magic_exe="%%%MAGIC EXE variable%%%" + +# Global variables. +nonopt= +preserve_args= +lo2o="s/\\.lo\$/.${objext}/" +o2lo="s/\\.${objext}\$/.lo/" +extracted_archives= +extracted_serial=0 + +# If this variable is set in any of the actions, the command in it +# will be execed at the end. This prevents here-documents from being +# left over by shells. +exec_cmd= + +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "${1}=\$${1}\${2}" +} # func_append may be replaced by extended shell implementation + +# func_append_quoted var value +# Quote VALUE and append to the end of shell variable VAR, separated +# by a space. +func_append_quoted () +{ + func_quote_for_eval "${2}" + eval "${1}=\$${1}\\ \$func_quote_for_eval_result" +} # func_append_quoted may be replaced by extended shell implementation + + +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=`expr "${@}"` +} # func_arith may be replaced by extended shell implementation + + +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` +} # func_len may be replaced by extended shell implementation + + +# func_lo2o object +func_lo2o () +{ + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +} # func_lo2o may be replaced by extended shell implementation + + +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` +} # func_xform may be replaced by extended shell implementation + + +# func_fatal_configuration arg... +# Echo program name prefixed message to standard error, followed by +# a configuration failure hint, and exit. +func_fatal_configuration () +{ + func_error ${1+"$@"} + func_error "See the $PACKAGE documentation for more information." + func_fatal_error "Fatal configuration error." +} + + +# func_config +# Display the configuration for all the tags in this script. +func_config () +{ + re_begincf='^# ### BEGIN LIBTOOL' + re_endcf='^# ### END LIBTOOL' + + # Default configuration. + $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" + + # Now print the configurations for the tags. + for tagname in $taglist; do + $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" + done + + exit $? +} + +# func_features +# Display the features supported by this script. +func_features () +{ + echo "host: $host" + if test "$build_libtool_libs" = yes; then + echo "enable shared libraries" + else + echo "disable shared libraries" + fi + if test "$build_old_libs" = yes; then + echo "enable static libraries" + else + echo "disable static libraries" + fi + + exit $? +} + +# func_enable_tag tagname +# Verify that TAGNAME is valid, and either flag an error and exit, or +# enable the TAGNAME tag. We also add TAGNAME to the global $taglist +# variable here. +func_enable_tag () +{ + # Global variable: + tagname="$1" + + re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" + re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" + sed_extractcf="/$re_begincf/,/$re_endcf/p" + + # Validate tagname. + case $tagname in + *[!-_A-Za-z0-9,/]*) + func_fatal_error "invalid tag name: $tagname" + ;; + esac + + # Don't test for the "default" C tag, as we know it's + # there but not specially marked. + case $tagname in + CC) ;; + *) + if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then + taglist="$taglist $tagname" + + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: + extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" + fi + ;; + esac +} + +# func_check_version_match +# Ensure that we are using m4 macros, and libtool script from the same +# release of libtool. +func_check_version_match () +{ + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from an older release. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + fi + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, +$progname: but the definition of this LT_INIT comes from revision $macro_revision. +$progname: You should recreate aclocal.m4 with macros from revision $package_revision +$progname: of $PACKAGE $VERSION and run autoconf again. +_LT_EOF + fi + + exit $EXIT_MISMATCH + fi +} + + +# Shorthand for --mode=foo, only valid as the first argument +case $1 in +clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; +compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; +execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; +finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; +install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; +link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; +uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; +esac + + + +# Option defaults: +opt_debug=: +opt_dry_run=false +opt_config=false +opt_preserve_dup_deps=false +opt_features=false +opt_finish=false +opt_help=false +opt_help_all=false +opt_silent=: +opt_warning=: +opt_verbose=: +opt_silent=false +opt_verbose=false + + +# Parse options once, thoroughly. This comes as soon as possible in the +# script to make things like `--version' happen as quickly as we can. +{ + # this just eases exit handling + while test $# -gt 0; do + opt="$1" + shift + case $opt in + --debug|-x) opt_debug='set -x' + func_echo "enabling shell trace mode" + $opt_debug + ;; + --dry-run|--dryrun|-n) + opt_dry_run=: + ;; + --config) + opt_config=: +func_config + ;; + --dlopen|-dlopen) + optarg="$1" + opt_dlopen="${opt_dlopen+$opt_dlopen +}$optarg" + shift + ;; + --preserve-dup-deps) + opt_preserve_dup_deps=: + ;; + --features) + opt_features=: +func_features + ;; + --finish) + opt_finish=: +set dummy --mode finish ${1+"$@"}; shift + ;; + --help) + opt_help=: + ;; + --help-all) + opt_help_all=: +opt_help=': help-all' + ;; + --mode) + test $# = 0 && func_missing_arg $opt && break + optarg="$1" + opt_mode="$optarg" +case $optarg in + # Valid mode arguments: + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $opt" + exit_cmd=exit + break + ;; +esac + shift + ;; + --no-silent|--no-quiet) + opt_silent=false +func_append preserve_args " $opt" + ;; + --no-warning|--no-warn) + opt_warning=false +func_append preserve_args " $opt" + ;; + --no-verbose) + opt_verbose=false +func_append preserve_args " $opt" + ;; + --silent|--quiet) + opt_silent=: +func_append preserve_args " $opt" + opt_verbose=false + ;; + --verbose|-v) + opt_verbose=: +func_append preserve_args " $opt" +opt_silent=false + ;; + --tag) + test $# = 0 && func_missing_arg $opt && break + optarg="$1" + opt_tag="$optarg" +func_append preserve_args " $opt $optarg" +func_enable_tag "$optarg" + shift + ;; + + -\?|-h) func_usage ;; + --help) func_help ;; + --version) func_version ;; + + # Separate optargs to long options: + --*=*) + func_split_long_opt "$opt" + set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} + shift + ;; + + # Separate non-argument short options: + -\?*|-h*|-n*|-v*) + func_split_short_opt "$opt" + set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + --) break ;; + -*) func_fatal_help "unrecognized option \`$opt'" ;; + *) set dummy "$opt" ${1+"$@"}; shift; break ;; + esac + done + + # Validate options: + + # save first non-option argument + if test "$#" -gt 0; then + nonopt="$opt" + shift + fi + + # preserve --debug + test "$opt_debug" = : || func_append preserve_args " --debug" + + case $host in + *cygwin* | *mingw* | *pw32* | *cegcc*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; + *) + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac + + $opt_help || { + # Sanity checks first: + func_check_version_match + + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then + func_fatal_configuration "not configured to build any kind of library" + fi + + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test "$opt_mode" != execute; then + func_error "unrecognized option \`-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi + + # Change the help message to a mode-specific one. + generic_help="$help" + help="Try \`$progname --help --mode=$opt_mode' for more information." + } + + + # Bail if the options were screwed + $exit_cmd $EXIT_FAILURE +} + + + + +## ----------- ## +## Main. ## +## ----------- ## + +# func_lalib_p file +# True iff FILE is a libtool `.la' library or `.lo' object file. +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_lalib_p () +{ + test -f "$1" && + $SED -e 4q "$1" 2>/dev/null \ + | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 +} + +# func_lalib_unsafe_p file +# True iff FILE is a libtool `.la' library or `.lo' object file. +# This function implements the same check as func_lalib_p without +# resorting to external programs. To this end, it redirects stdin and +# closes it afterwards, without saving the original file descriptor. +# As a safety measure, use it only where a negative result would be +# fatal anyway. Works if `file' does not exist. +func_lalib_unsafe_p () +{ + lalib_p=no + if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then + for lalib_p_l in 1 2 3 4 + do + read lalib_p_line + case "$lalib_p_line" in + \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; + esac + done + exec 0<&5 5<&- + fi + test "$lalib_p" = yes +} + +# func_ltwrapper_script_p file +# True iff FILE is a libtool wrapper script +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_script_p () +{ + func_lalib_p "$1" +} + +# func_ltwrapper_executable_p file +# True iff FILE is a libtool wrapper executable +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_executable_p () +{ + func_ltwrapper_exec_suffix= + case $1 in + *.exe) ;; + *) func_ltwrapper_exec_suffix=.exe ;; + esac + $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1 +} + +# func_ltwrapper_scriptname file +# Assumes file is an ltwrapper_executable +# uses $file to determine the appropriate filename for a +# temporary ltwrapper_script. +func_ltwrapper_scriptname () +{ + func_dirname_and_basename "$1" "" "." + func_stripname '' '.exe' "$func_basename_result" + func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" +} + +# func_ltwrapper_p file +# True iff FILE is a libtool wrapper script or wrapper executable +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_p () +{ + func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1" +} + + +# func_execute_cmds commands fail_cmd +# Execute tilde-delimited COMMANDS. +# If FAIL_CMD is given, eval that upon failure. +# FAIL_CMD may read-access the current command in variable CMD! +func_execute_cmds () +{ + $opt_debug + save_ifs=$IFS; IFS='~' + for cmd in $1; do + IFS=$save_ifs + eval cmd=\"$cmd\" + func_show_eval "$cmd" "${2-:}" + done + IFS=$save_ifs +} + + +# func_source file +# Source FILE, adding directory component if necessary. +# Note that it is not necessary on cygwin/mingw to append a dot to +# FILE even if both FILE and FILE.exe exist: automatic-append-.exe +# behavior happens only for exec(3), not for open(2)! Also, sourcing +# `FILE.' does not work on cygwin managed mounts. +func_source () +{ + $opt_debug + case $1 in + */* | *\\*) . "$1" ;; + *) . "./$1" ;; + esac +} + + +# func_resolve_sysroot PATH +# Replace a leading = in PATH with a sysroot. Store the result into +# func_resolve_sysroot_result +func_resolve_sysroot () +{ + func_resolve_sysroot_result=$1 + case $func_resolve_sysroot_result in + =*) + func_stripname '=' '' "$func_resolve_sysroot_result" + func_resolve_sysroot_result=$lt_sysroot$func_stripname_result + ;; + esac +} + +# func_replace_sysroot PATH +# If PATH begins with the sysroot, replace it with = and +# store the result into func_replace_sysroot_result. +func_replace_sysroot () +{ + case "$lt_sysroot:$1" in + ?*:"$lt_sysroot"*) + func_stripname "$lt_sysroot" '' "$1" + func_replace_sysroot_result="=$func_stripname_result" + ;; + *) + # Including no sysroot. + func_replace_sysroot_result=$1 + ;; + esac +} + +# func_infer_tag arg +# Infer tagged configuration to use if any are available and +# if one wasn't chosen via the "--tag" command line option. +# Only attempt this if the compiler in the base compile +# command doesn't match the default compiler. +# arg is usually of the form 'gcc ...' +func_infer_tag () +{ + $opt_debug + if test -n "$available_tags" && test -z "$tagname"; then + CC_quoted= + for arg in $CC; do + func_append_quoted CC_quoted "$arg" + done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` + case $@ in + # Blanks in the command may have been stripped by the calling shell, + # but not from the CC environment variable when configure was run. + " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ + " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; + # Blanks at the start of $base_compile will cause this to fail + # if we don't check for them as well. + *) + for z in $available_tags; do + if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then + # Evaluate the configuration. + eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + CC_quoted= + for arg in $CC; do + # Double-quote args containing other shell metacharacters. + func_append_quoted CC_quoted "$arg" + done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` + case "$@ " in + " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ + " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) + # The compiler in the base compile command matches + # the one in the tagged configuration. + # Assume this is the tagged configuration we want. + tagname=$z + break + ;; + esac + fi + done + # If $tagname still isn't set, then no tagged configuration + # was found and let the user know that the "--tag" command + # line option must be used. + if test -z "$tagname"; then + func_echo "unable to infer tagged configuration" + func_fatal_error "specify a tag with \`--tag'" +# else +# func_verbose "using $tagname tagged configuration" + fi + ;; + esac + fi +} + + + +# func_write_libtool_object output_name pic_name nonpic_name +# Create a libtool object file (analogous to a ".la" file), +# but don't create it if we're doing a dry run. +func_write_libtool_object () +{ + write_libobj=${1} + if test "$build_libtool_libs" = yes; then + write_lobj=\'${2}\' + else + write_lobj=none + fi + + if test "$build_old_libs" = yes; then + write_oldobj=\'${3}\' + else + write_oldobj=none + fi + + $opt_dry_run || { + cat >${write_libobj}T </dev/null` + if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then + func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | + $SED -e "$lt_sed_naive_backslashify"` + else + func_convert_core_file_wine_to_w32_result= + fi + fi +} +# end: func_convert_core_file_wine_to_w32 + + +# func_convert_core_path_wine_to_w32 ARG +# Helper function used by path conversion functions when $build is *nix, and +# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly +# configured wine environment available, with the winepath program in $build's +# $PATH. Assumes ARG has no leading or trailing path separator characters. +# +# ARG is path to be converted from $build format to win32. +# Result is available in $func_convert_core_path_wine_to_w32_result. +# Unconvertible file (directory) names in ARG are skipped; if no directory names +# are convertible, then the result may be empty. +func_convert_core_path_wine_to_w32 () +{ + $opt_debug + # unfortunately, winepath doesn't convert paths, only file names + func_convert_core_path_wine_to_w32_result="" + if test -n "$1"; then + oldIFS=$IFS + IFS=: + for func_convert_core_path_wine_to_w32_f in $1; do + IFS=$oldIFS + func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" + if test -n "$func_convert_core_file_wine_to_w32_result" ; then + if test -z "$func_convert_core_path_wine_to_w32_result"; then + func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" + else + func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" + fi + fi + done + IFS=$oldIFS + fi +} +# end: func_convert_core_path_wine_to_w32 + + +# func_cygpath ARGS... +# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when +# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) +# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or +# (2), returns the Cygwin file name or path in func_cygpath_result (input +# file name or path is assumed to be in w32 format, as previously converted +# from $build's *nix or MSYS format). In case (3), returns the w32 file name +# or path in func_cygpath_result (input file name or path is assumed to be in +# Cygwin format). Returns an empty string on error. +# +# ARGS are passed to cygpath, with the last one being the file name or path to +# be converted. +# +# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH +# environment variable; do not put it in $PATH. +func_cygpath () +{ + $opt_debug + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then + func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` + if test "$?" -ne 0; then + # on failure, ensure result is empty + func_cygpath_result= + fi + else + func_cygpath_result= + func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + fi +} +#end: func_cygpath + + +# func_convert_core_msys_to_w32 ARG +# Convert file name or path ARG from MSYS format to w32 format. Return +# result in func_convert_core_msys_to_w32_result. +func_convert_core_msys_to_w32 () +{ + $opt_debug + # awkward: cmd appends spaces to result + func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | + $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` +} +#end: func_convert_core_msys_to_w32 + + +# func_convert_file_check ARG1 ARG2 +# Verify that ARG1 (a file name in $build format) was converted to $host +# format in ARG2. Otherwise, emit an error message, but continue (resetting +# func_to_host_file_result to ARG1). +func_convert_file_check () +{ + $opt_debug + if test -z "$2" && test -n "$1" ; then + func_error "Could not determine host file name corresponding to" + func_error " \`$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback: + func_to_host_file_result="$1" + fi +} +# end func_convert_file_check + + +# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH +# Verify that FROM_PATH (a path in $build format) was converted to $host +# format in TO_PATH. Otherwise, emit an error message, but continue, resetting +# func_to_host_file_result to a simplistic fallback value (see below). +func_convert_path_check () +{ + $opt_debug + if test -z "$4" && test -n "$3"; then + func_error "Could not determine the host path corresponding to" + func_error " \`$3'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback. This is a deliberately simplistic "conversion" and + # should not be "improved". See libtool.info. + if test "x$1" != "x$2"; then + lt_replace_pathsep_chars="s|$1|$2|g" + func_to_host_path_result=`echo "$3" | + $SED -e "$lt_replace_pathsep_chars"` + else + func_to_host_path_result="$3" + fi + fi +} +# end func_convert_path_check + + +# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG +# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT +# and appending REPL if ORIG matches BACKPAT. +func_convert_path_front_back_pathsep () +{ + $opt_debug + case $4 in + $1 ) func_to_host_path_result="$3$func_to_host_path_result" + ;; + esac + case $4 in + $2 ) func_append func_to_host_path_result "$3" + ;; + esac +} +# end func_convert_path_front_back_pathsep + + +################################################## +# $build to $host FILE NAME CONVERSION FUNCTIONS # +################################################## +# invoked via `$to_host_file_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# Result will be available in $func_to_host_file_result. + + +# func_to_host_file ARG +# Converts the file name ARG from $build format to $host format. Return result +# in func_to_host_file_result. +func_to_host_file () +{ + $opt_debug + $to_host_file_cmd "$1" +} +# end func_to_host_file + + +# func_to_tool_file ARG LAZY +# converts the file name ARG from $build format to toolchain format. Return +# result in func_to_tool_file_result. If the conversion in use is listed +# in (the comma separated) LAZY, no conversion takes place. +func_to_tool_file () +{ + $opt_debug + case ,$2, in + *,"$to_tool_file_cmd",*) + func_to_tool_file_result=$1 + ;; + *) + $to_tool_file_cmd "$1" + func_to_tool_file_result=$func_to_host_file_result + ;; + esac +} +# end func_to_tool_file + + +# func_convert_file_noop ARG +# Copy ARG to func_to_host_file_result. +func_convert_file_noop () +{ + func_to_host_file_result="$1" +} +# end func_convert_file_noop + + +# func_convert_file_msys_to_w32 ARG +# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_file_result. +func_convert_file_msys_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" + func_to_host_file_result="$func_convert_core_msys_to_w32_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_w32 + + +# func_convert_file_cygwin_to_w32 ARG +# Convert file name ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_file_cygwin_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + # because $build is cygwin, we call "the" cygpath in $PATH; no need to use + # LT_CYGPATH in this case. + func_to_host_file_result=`cygpath -m "$1"` + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_cygwin_to_w32 + + +# func_convert_file_nix_to_w32 ARG +# Convert file name ARG from *nix to w32 format. Requires a wine environment +# and a working winepath. Returns result in func_to_host_file_result. +func_convert_file_nix_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_file_wine_to_w32 "$1" + func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_w32 + + +# func_convert_file_msys_to_cygwin ARG +# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. +# Returns result in func_to_host_file_result. +func_convert_file_msys_to_cygwin () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" + func_cygpath -u "$func_convert_core_msys_to_w32_result" + func_to_host_file_result="$func_cygpath_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_cygwin + + +# func_convert_file_nix_to_cygwin ARG +# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed +# in a wine environment, working winepath, and LT_CYGPATH set. Returns result +# in func_to_host_file_result. +func_convert_file_nix_to_cygwin () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. + func_convert_core_file_wine_to_w32 "$1" + func_cygpath -u "$func_convert_core_file_wine_to_w32_result" + func_to_host_file_result="$func_cygpath_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_cygwin + + +############################################# +# $build to $host PATH CONVERSION FUNCTIONS # +############################################# +# invoked via `$to_host_path_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# The result will be available in $func_to_host_path_result. +# +# Path separators are also converted from $build format to $host format. If +# ARG begins or ends with a path separator character, it is preserved (but +# converted to $host format) on output. +# +# All path conversion functions are named using the following convention: +# file name conversion function : func_convert_file_X_to_Y () +# path conversion function : func_convert_path_X_to_Y () +# where, for any given $build/$host combination the 'X_to_Y' value is the +# same. If conversion functions are added for new $build/$host combinations, +# the two new functions must follow this pattern, or func_init_to_host_path_cmd +# will break. + + +# func_init_to_host_path_cmd +# Ensures that function "pointer" variable $to_host_path_cmd is set to the +# appropriate value, based on the value of $to_host_file_cmd. +to_host_path_cmd= +func_init_to_host_path_cmd () +{ + $opt_debug + if test -z "$to_host_path_cmd"; then + func_stripname 'func_convert_file_' '' "$to_host_file_cmd" + to_host_path_cmd="func_convert_path_${func_stripname_result}" + fi +} + + +# func_to_host_path ARG +# Converts the path ARG from $build format to $host format. Return result +# in func_to_host_path_result. +func_to_host_path () +{ + $opt_debug + func_init_to_host_path_cmd + $to_host_path_cmd "$1" +} +# end func_to_host_path + + +# func_convert_path_noop ARG +# Copy ARG to func_to_host_path_result. +func_convert_path_noop () +{ + func_to_host_path_result="$1" +} +# end func_convert_path_noop + + +# func_convert_path_msys_to_w32 ARG +# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_path_result. +func_convert_path_msys_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # Remove leading and trailing path separator characters from ARG. MSYS + # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; + # and winepath ignores them completely. + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result="$func_convert_core_msys_to_w32_result" + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_msys_to_w32 + + +# func_convert_path_cygwin_to_w32 ARG +# Convert path ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_path_cygwin_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_cygwin_to_w32 + + +# func_convert_path_nix_to_w32 ARG +# Convert path ARG from *nix to w32 format. Requires a wine environment and +# a working winepath. Returns result in func_to_host_file_result. +func_convert_path_nix_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_nix_to_w32 + + +# func_convert_path_msys_to_cygwin ARG +# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. +# Returns result in func_to_host_file_result. +func_convert_path_msys_to_cygwin () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_msys_to_w32_result" + func_to_host_path_result="$func_cygpath_result" + func_convert_path_check : : \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" : "$1" + fi +} +# end func_convert_path_msys_to_cygwin + + +# func_convert_path_nix_to_cygwin ARG +# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a +# a wine environment, working winepath, and LT_CYGPATH set. Returns result in +# func_to_host_file_result. +func_convert_path_nix_to_cygwin () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # Remove leading and trailing path separator characters from + # ARG. msys behavior is inconsistent here, cygpath turns them + # into '.;' and ';.', and winepath ignores them completely. + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" + func_to_host_path_result="$func_cygpath_result" + func_convert_path_check : : \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" : "$1" + fi +} +# end func_convert_path_nix_to_cygwin + + +# func_mode_compile arg... +func_mode_compile () +{ + $opt_debug + # Get the compilation command and the source file. + base_compile= + srcfile="$nonopt" # always keep a non-empty value in "srcfile" + suppress_opt=yes + suppress_output= + arg_mode=normal + libobj= + later= + pie_flag= + + for arg + do + case $arg_mode in + arg ) + # do not "continue". Instead, add this to base_compile + lastarg="$arg" + arg_mode=normal + ;; + + target ) + libobj="$arg" + arg_mode=normal + continue + ;; + + normal ) + # Accept any command-line options. + case $arg in + -o) + test -n "$libobj" && \ + func_fatal_error "you cannot specify \`-o' more than once" + arg_mode=target + continue + ;; + + -pie | -fpie | -fPIE) + func_append pie_flag " $arg" + continue + ;; + + -shared | -static | -prefer-pic | -prefer-non-pic) + func_append later " $arg" + continue + ;; + + -no-suppress) + suppress_opt=no + continue + ;; + + -Xcompiler) + arg_mode=arg # the next one goes into the "base_compile" arg list + continue # The current "srcfile" will either be retained or + ;; # replaced later. I would guess that would be a bug. + + -Wc,*) + func_stripname '-Wc,' '' "$arg" + args=$func_stripname_result + lastarg= + save_ifs="$IFS"; IFS=',' + for arg in $args; do + IFS="$save_ifs" + func_append_quoted lastarg "$arg" + done + IFS="$save_ifs" + func_stripname ' ' '' "$lastarg" + lastarg=$func_stripname_result + + # Add the arguments to base_compile. + func_append base_compile " $lastarg" + continue + ;; + + *) + # Accept the current argument as the source file. + # The previous "srcfile" becomes the current argument. + # + lastarg="$srcfile" + srcfile="$arg" + ;; + esac # case $arg + ;; + esac # case $arg_mode + + # Aesthetically quote the previous argument. + func_append_quoted base_compile "$lastarg" + done # for arg + + case $arg_mode in + arg) + func_fatal_error "you must specify an argument for -Xcompile" + ;; + target) + func_fatal_error "you must specify a target with \`-o'" + ;; + *) + # Get the name of the library object. + test -z "$libobj" && { + func_basename "$srcfile" + libobj="$func_basename_result" + } + ;; + esac + + # Recognize several different file suffixes. + # If the user specifies -o file.o, it is replaced with file.lo + case $libobj in + *.[cCFSifmso] | \ + *.ada | *.adb | *.ads | *.asm | \ + *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) + func_xform "$libobj" + libobj=$func_xform_result + ;; + esac + + case $libobj in + *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; + *) + func_fatal_error "cannot determine name of library object from \`$libobj'" + ;; + esac + + func_infer_tag $base_compile + + for arg in $later; do + case $arg in + -shared) + test "$build_libtool_libs" != yes && \ + func_fatal_configuration "can not build a shared library" + build_old_libs=no + continue + ;; + + -static) + build_libtool_libs=no + build_old_libs=yes + continue + ;; + + -prefer-pic) + pic_mode=yes + continue + ;; + + -prefer-non-pic) + pic_mode=no + continue + ;; + esac + done + + func_quote_for_eval "$libobj" + test "X$libobj" != "X$func_quote_for_eval_result" \ + && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ + && func_warning "libobj name \`$libobj' may not contain shell special characters." + func_dirname_and_basename "$obj" "/" "" + objname="$func_basename_result" + xdir="$func_dirname_result" + lobj=${xdir}$objdir/$objname + + test -z "$base_compile" && \ + func_fatal_help "you must specify a compilation command" + + # Delete any leftover library objects. + if test "$build_old_libs" = yes; then + removelist="$obj $lobj $libobj ${libobj}T" + else + removelist="$lobj $libobj ${libobj}T" + fi + + # On Cygwin there's no "real" PIC flag so we must build both object types + case $host_os in + cygwin* | mingw* | pw32* | os2* | cegcc*) + pic_mode=default + ;; + esac + if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then + # non-PIC code in shared libraries is not supported + pic_mode=default + fi + + # Calculate the filename of the output object if compiler does + # not support -o with -c + if test "$compiler_c_o" = no; then + output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} + lockfile="$output_obj.lock" + else + output_obj= + need_locks=no + lockfile= + fi + + # Lock this critical section if it is needed + # We use this script file to make the link, it avoids creating a new file + if test "$need_locks" = yes; then + until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do + func_echo "Waiting for $lockfile to be removed" + sleep 2 + done + elif test "$need_locks" = warn; then + if test -f "$lockfile"; then + $ECHO "\ +*** ERROR, $lockfile exists and contains: +`cat $lockfile 2>/dev/null` + +This indicates that another process is trying to use the same +temporary object file, and libtool could not work around it because +your compiler does not support \`-c' and \`-o' together. If you +repeat this compilation, it may succeed, by chance, but you had better +avoid parallel builds (make -j) in this platform, or get a better +compiler." + + $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi + func_append removelist " $output_obj" + $ECHO "$srcfile" > "$lockfile" + fi + + $opt_dry_run || $RM $removelist + func_append removelist " $lockfile" + trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 + + func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 + srcfile=$func_to_tool_file_result + func_quote_for_eval "$srcfile" + qsrcfile=$func_quote_for_eval_result + + # Only build a PIC object if we are building libtool libraries. + if test "$build_libtool_libs" = yes; then + # Without this assignment, base_compile gets emptied. + fbsd_hideous_sh_bug=$base_compile + + if test "$pic_mode" != no; then + command="$base_compile $qsrcfile $pic_flag" + else + # Don't build PIC code + command="$base_compile $qsrcfile" + fi + + func_mkdir_p "$xdir$objdir" + + if test -z "$output_obj"; then + # Place PIC objects in $objdir + func_append command " -o $lobj" + fi + + func_show_eval_locale "$command" \ + 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' + + if test "$need_locks" = warn && + test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then + $ECHO "\ +*** ERROR, $lockfile contains: +`cat $lockfile 2>/dev/null` + +but it should contain: +$srcfile + +This indicates that another process is trying to use the same +temporary object file, and libtool could not work around it because +your compiler does not support \`-c' and \`-o' together. If you +repeat this compilation, it may succeed, by chance, but you had better +avoid parallel builds (make -j) in this platform, or get a better +compiler." + + $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi + + # Just move the object if needed, then go on to compile the next one + if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then + func_show_eval '$MV "$output_obj" "$lobj"' \ + 'error=$?; $opt_dry_run || $RM $removelist; exit $error' + fi + + # Allow error messages only from the first compilation. + if test "$suppress_opt" = yes; then + suppress_output=' >/dev/null 2>&1' + fi + fi + + # Only build a position-dependent object if we build old libraries. + if test "$build_old_libs" = yes; then + if test "$pic_mode" != yes; then + # Don't build PIC code + command="$base_compile $qsrcfile$pie_flag" + else + command="$base_compile $qsrcfile $pic_flag" + fi + if test "$compiler_c_o" = yes; then + func_append command " -o $obj" + fi + + # Suppress compiler output if we already did a PIC compilation. + func_append command "$suppress_output" + func_show_eval_locale "$command" \ + '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' + + if test "$need_locks" = warn && + test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then + $ECHO "\ +*** ERROR, $lockfile contains: +`cat $lockfile 2>/dev/null` + +but it should contain: +$srcfile + +This indicates that another process is trying to use the same +temporary object file, and libtool could not work around it because +your compiler does not support \`-c' and \`-o' together. If you +repeat this compilation, it may succeed, by chance, but you had better +avoid parallel builds (make -j) in this platform, or get a better +compiler." + + $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi + + # Just move the object if needed + if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then + func_show_eval '$MV "$output_obj" "$obj"' \ + 'error=$?; $opt_dry_run || $RM $removelist; exit $error' + fi + fi + + $opt_dry_run || { + func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" + + # Unlock the critical section if it was locked + if test "$need_locks" != no; then + removelist=$lockfile + $RM "$lockfile" + fi + } + + exit $EXIT_SUCCESS +} + +$opt_help || { + test "$opt_mode" = compile && func_mode_compile ${1+"$@"} +} + +func_mode_help () +{ + # We need to display help for each of the modes. + case $opt_mode in + "") + # Generic help is extracted from the usage comments + # at the start of this file. + func_help + ;; + + clean) + $ECHO \ +"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE... + +Remove files from the build directory. + +RM is the name of the program to use to delete files associated with each FILE +(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +to RM. + +If FILE is a libtool library, object or program, all the files associated +with it are deleted. Otherwise, only FILE itself is deleted using RM." + ;; + + compile) + $ECHO \ +"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE + +Compile a source file into a libtool library object. + +This mode accepts the following additional options: + + -o OUTPUT-FILE set the output file name to OUTPUT-FILE + -no-suppress do not suppress compiler output for multiple passes + -prefer-pic try to build PIC objects only + -prefer-non-pic try to build non-PIC objects only + -shared do not build a \`.o' file suitable for static linking + -static only build a \`.o' file suitable for static linking + -Wc,FLAG pass FLAG directly to the compiler + +COMPILE-COMMAND is a command to be used in creating a \`standard' object file +from the given SOURCEFILE. + +The output file name is determined by removing the directory component from +SOURCEFILE, then substituting the C source code suffix \`.c' with the +library object suffix, \`.lo'." + ;; + + execute) + $ECHO \ +"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]... + +Automatically set library path, then run a program. + +This mode accepts the following additional options: + + -dlopen FILE add the directory containing FILE to the library path + +This mode sets the library path environment variable according to \`-dlopen' +flags. + +If any of the ARGS are libtool executable wrappers, then they are translated +into their corresponding uninstalled binary, and any of their required library +directories are added to the library path. + +Then, COMMAND is executed, with ARGS as arguments." + ;; + + finish) + $ECHO \ +"Usage: $progname [OPTION]... --mode=finish [LIBDIR]... + +Complete the installation of libtool libraries. + +Each LIBDIR is a directory that contains libtool libraries. + +The commands that this mode executes may require superuser privileges. Use +the \`--dry-run' option if you just want to see what would be executed." + ;; + + install) + $ECHO \ +"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND... + +Install executables or libraries. + +INSTALL-COMMAND is the installation command. The first component should be +either the \`install' or \`cp' program. + +The following components of INSTALL-COMMAND are treated specially: + + -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation + +The rest of the components are interpreted as arguments to that command (only +BSD-compatible install options are recognized)." + ;; + + link) + $ECHO \ +"Usage: $progname [OPTION]... --mode=link LINK-COMMAND... + +Link object files or libraries together to form another library, or to +create an executable program. + +LINK-COMMAND is a command using the C compiler that you would use to create +a program from several object files. + +The following components of LINK-COMMAND are treated specially: + + -all-static do not do any dynamic linking at all + -avoid-version do not add a version suffix if possible + -bindir BINDIR specify path to binaries directory (for systems where + libraries must be found in the PATH setting at runtime) + -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime + -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols + -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) + -export-symbols SYMFILE + try to export only the symbols listed in SYMFILE + -export-symbols-regex REGEX + try to export only the symbols matching REGEX + -LLIBDIR search LIBDIR for required installed libraries + -lNAME OUTPUT-FILE requires the installed library libNAME + -module build a library that can dlopened + -no-fast-install disable the fast-install mode + -no-install link a not-installable executable + -no-undefined declare that a library does not refer to external symbols + -o OUTPUT-FILE create OUTPUT-FILE from the specified objects + -objectlist FILE Use a list of object files found in FILE to specify objects + -precious-files-regex REGEX + don't remove output files matching REGEX + -release RELEASE specify package release information + -rpath LIBDIR the created library will eventually be installed in LIBDIR + -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries + -shared only do dynamic linking of libtool libraries + -shrext SUFFIX override the standard shared library file extension + -static do not do any dynamic linking of uninstalled libtool libraries + -static-libtool-libs + do not do any dynamic linking of libtool libraries + -version-info CURRENT[:REVISION[:AGE]] + specify library version info [each variable defaults to 0] + -weak LIBNAME declare that the target provides the LIBNAME interface + -Wc,FLAG + -Xcompiler FLAG pass linker-specific FLAG directly to the compiler + -Wl,FLAG + -Xlinker FLAG pass linker-specific FLAG directly to the linker + -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) + +All other options (arguments beginning with \`-') are ignored. + +Every other argument is treated as a filename. Files ending in \`.la' are +treated as uninstalled libtool libraries, other files are standard or library +object files. + +If the OUTPUT-FILE ends in \`.la', then a libtool library is created, +only library objects (\`.lo' files) may be specified, and \`-rpath' is +required, except when creating a convenience library. + +If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created +using \`ar' and \`ranlib', or on Windows using \`lib'. + +If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file +is created, otherwise an executable program is created." + ;; + + uninstall) + $ECHO \ +"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... + +Remove libraries from an installation directory. + +RM is the name of the program to use to delete files associated with each FILE +(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +to RM. + +If FILE is a libtool library, all the files associated with it are deleted. +Otherwise, only FILE itself is deleted using RM." + ;; + + *) + func_fatal_help "invalid operation mode \`$opt_mode'" + ;; + esac + + echo + $ECHO "Try \`$progname --help' for more information about other modes." +} + +# Now that we've collected a possible --mode arg, show help if necessary +if $opt_help; then + if test "$opt_help" = :; then + func_mode_help + else + { + func_help noexit + for opt_mode in compile link execute install finish uninstall clean; do + func_mode_help + done + } | sed -n '1p; 2,$s/^Usage:/ or: /p' + { + func_help noexit + for opt_mode in compile link execute install finish uninstall clean; do + echo + func_mode_help + done + } | + sed '1d + /^When reporting/,/^Report/{ + H + d + } + $x + /information about other modes/d + /more detailed .*MODE/d + s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' + fi + exit $? +fi + + +# func_mode_execute arg... +func_mode_execute () +{ + $opt_debug + # The first argument is the command name. + cmd="$nonopt" + test -z "$cmd" && \ + func_fatal_help "you must specify a COMMAND" + + # Handle -dlopen flags immediately. + for file in $opt_dlopen; do + test -f "$file" \ + || func_fatal_help "\`$file' is not a file" + + dir= + case $file in + *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "\`$lib' is not a valid libtool archive" + + # Read the libtool library. + dlname= + library_names= + func_source "$file" + + # Skip this library if it cannot be dlopened. + if test -z "$dlname"; then + # Warn if it was a shared library. + test -n "$library_names" && \ + func_warning "\`$file' was not linked with \`-export-dynamic'" + continue + fi + + func_dirname "$file" "" "." + dir="$func_dirname_result" + + if test -f "$dir/$objdir/$dlname"; then + func_append dir "/$objdir" + else + if test ! -f "$dir/$dlname"; then + func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" + fi + fi + ;; + + *.lo) + # Just add the directory containing the .lo file. + func_dirname "$file" "" "." + dir="$func_dirname_result" + ;; + + *) + func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" + continue + ;; + esac + + # Get the absolute pathname. + absdir=`cd "$dir" && pwd` + test -n "$absdir" && dir="$absdir" + + # Now add the directory to shlibpath_var. + if eval "test -z \"\$$shlibpath_var\""; then + eval "$shlibpath_var=\"\$dir\"" + else + eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" + fi + done + + # This variable tells wrapper scripts just to set shlibpath_var + # rather than running their programs. + libtool_execute_magic="$magic" + + # Check if any of the arguments is a wrapper script. + args= + for file + do + case $file in + -* | *.la | *.lo ) ;; + *) + # Do a test to see if this is really a libtool program. + if func_ltwrapper_script_p "$file"; then + func_source "$file" + # Transform arg to wrapped name. + file="$progdir/$program" + elif func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + func_source "$func_ltwrapper_scriptname_result" + # Transform arg to wrapped name. + file="$progdir/$program" + fi + ;; + esac + # Quote arguments (to preserve shell metacharacters). + func_append_quoted args "$file" + done + + if test "X$opt_dry_run" = Xfalse; then + if test -n "$shlibpath_var"; then + # Export the shlibpath_var. + eval "export $shlibpath_var" + fi + + # Restore saved environment variables + for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + do + eval "if test \"\${save_$lt_var+set}\" = set; then + $lt_var=\$save_$lt_var; export $lt_var + else + $lt_unset $lt_var + fi" + done + + # Now prepare to actually exec the command. + exec_cmd="\$cmd$args" + else + # Display what would be done. + if test -n "$shlibpath_var"; then + eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" + echo "export $shlibpath_var" + fi + $ECHO "$cmd$args" + exit $EXIT_SUCCESS + fi +} + +test "$opt_mode" = execute && func_mode_execute ${1+"$@"} + + +# func_mode_finish arg... +func_mode_finish () +{ + $opt_debug + libs= + libdirs= + admincmds= + + for opt in "$nonopt" ${1+"$@"} + do + if test -d "$opt"; then + func_append libdirs " $opt" + + elif test -f "$opt"; then + if func_lalib_unsafe_p "$opt"; then + func_append libs " $opt" + else + func_warning "\`$opt' is not a valid libtool archive" + fi + + else + func_fatal_error "invalid argument \`$opt'" + fi + done + + if test -n "$libs"; then + if test -n "$lt_sysroot"; then + sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` + sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" + else + sysroot_cmd= + fi + + # Remove sysroot references + if $opt_dry_run; then + for lib in $libs; do + echo "removing references to $lt_sysroot and \`=' prefixes from $lib" + done + else + tmpdir=`func_mktempdir` + for lib in $libs; do + sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + > $tmpdir/tmp-la + mv -f $tmpdir/tmp-la $lib + done + ${RM}r "$tmpdir" + fi + fi + + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + for libdir in $libdirs; do + if test -n "$finish_cmds"; then + # Do each command in the finish commands. + func_execute_cmds "$finish_cmds" 'admincmds="$admincmds +'"$cmd"'"' + fi + if test -n "$finish_eval"; then + # Do the single finish_eval. + eval cmds=\"$finish_eval\" + $opt_dry_run || eval "$cmds" || func_append admincmds " + $cmds" + fi + done + fi + + # Exit here if they wanted silent mode. + $opt_silent && exit $EXIT_SUCCESS + + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + echo "----------------------------------------------------------------------" + echo "Libraries have been installed in:" + for libdir in $libdirs; do + $ECHO " $libdir" + done + echo + echo "If you ever happen to want to link against installed libraries" + echo "in a given directory, LIBDIR, you must either use libtool, and" + echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + echo "flag during linking and do at least one of the following:" + if test -n "$shlibpath_var"; then + echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + echo " during execution" + fi + if test -n "$runpath_var"; then + echo " - add LIBDIR to the \`$runpath_var' environment variable" + echo " during linking" + fi + if test -n "$hardcode_libdir_flag_spec"; then + libdir=LIBDIR + eval flag=\"$hardcode_libdir_flag_spec\" + + $ECHO " - use the \`$flag' linker flag" + fi + if test -n "$admincmds"; then + $ECHO " - have your system administrator run these commands:$admincmds" + fi + if test -f /etc/ld.so.conf; then + echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + fi + echo + + echo "See any operating system documentation about shared libraries for" + case $host in + solaris2.[6789]|solaris2.1[0-9]) + echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" + echo "pages." + ;; + *) + echo "more information, such as the ld(1) and ld.so(8) manual pages." + ;; + esac + echo "----------------------------------------------------------------------" + fi + exit $EXIT_SUCCESS +} + +test "$opt_mode" = finish && func_mode_finish ${1+"$@"} + + +# func_mode_install arg... +func_mode_install () +{ + $opt_debug + # There may be an optional sh(1) argument at the beginning of + # install_prog (especially on Windows NT). + if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || + # Allow the use of GNU shtool's install command. + case $nonopt in *shtool*) :;; *) false;; esac; then + # Aesthetically quote it. + func_quote_for_eval "$nonopt" + install_prog="$func_quote_for_eval_result " + arg=$1 + shift + else + install_prog= + arg=$nonopt + fi + + # The real first argument should be the name of the installation program. + # Aesthetically quote it. + func_quote_for_eval "$arg" + func_append install_prog "$func_quote_for_eval_result" + install_shared_prog=$install_prog + case " $install_prog " in + *[\\\ /]cp\ *) install_cp=: ;; + *) install_cp=false ;; + esac + + # We need to accept at least all the BSD install flags. + dest= + files= + opts= + prev= + install_type= + isdir=no + stripme= + no_mode=: + for arg + do + arg2= + if test -n "$dest"; then + func_append files " $dest" + dest=$arg + continue + fi + + case $arg in + -d) isdir=yes ;; + -f) + if $install_cp; then :; else + prev=$arg + fi + ;; + -g | -m | -o) + prev=$arg + ;; + -s) + stripme=" -s" + continue + ;; + -*) + ;; + *) + # If the previous option needed an argument, then skip it. + if test -n "$prev"; then + if test "x$prev" = x-m && test -n "$install_override_mode"; then + arg2=$install_override_mode + no_mode=false + fi + prev= + else + dest=$arg + continue + fi + ;; + esac + + # Aesthetically quote the argument. + func_quote_for_eval "$arg" + func_append install_prog " $func_quote_for_eval_result" + if test -n "$arg2"; then + func_quote_for_eval "$arg2" + fi + func_append install_shared_prog " $func_quote_for_eval_result" + done + + test -z "$install_prog" && \ + func_fatal_help "you must specify an install program" + + test -n "$prev" && \ + func_fatal_help "the \`$prev' option requires an argument" + + if test -n "$install_override_mode" && $no_mode; then + if $install_cp; then :; else + func_quote_for_eval "$install_override_mode" + func_append install_shared_prog " -m $func_quote_for_eval_result" + fi + fi + + if test -z "$files"; then + if test -z "$dest"; then + func_fatal_help "no file or destination specified" + else + func_fatal_help "you must specify a destination" + fi + fi + + # Strip any trailing slash from the destination. + func_stripname '' '/' "$dest" + dest=$func_stripname_result + + # Check to see that the destination is a directory. + test -d "$dest" && isdir=yes + if test "$isdir" = yes; then + destdir="$dest" + destname= + else + func_dirname_and_basename "$dest" "" "." + destdir="$func_dirname_result" + destname="$func_basename_result" + + # Not a directory, so check to see that there is only one file specified. + set dummy $files; shift + test "$#" -gt 1 && \ + func_fatal_help "\`$dest' is not a directory" + fi + case $destdir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + for file in $files; do + case $file in + *.lo) ;; + *) + func_fatal_help "\`$destdir' must be an absolute directory name" + ;; + esac + done + ;; + esac + + # This variable tells wrapper scripts just to set variables rather + # than running their programs. + libtool_install_magic="$magic" + + staticlibs= + future_libdirs= + current_libdirs= + for file in $files; do + + # Do each installation. + case $file in + *.$libext) + # Do the static libraries later. + func_append staticlibs " $file" + ;; + + *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "\`$file' is not a valid libtool archive" + + library_names= + old_library= + relink_command= + func_source "$file" + + # Add the libdir to current_libdirs if it is the destination. + if test "X$destdir" = "X$libdir"; then + case "$current_libdirs " in + *" $libdir "*) ;; + *) func_append current_libdirs " $libdir" ;; + esac + else + # Note the libdir as a future libdir. + case "$future_libdirs " in + *" $libdir "*) ;; + *) func_append future_libdirs " $libdir" ;; + esac + fi + + func_dirname "$file" "/" "" + dir="$func_dirname_result" + func_append dir "$objdir" + + if test -n "$relink_command"; then + # Determine the prefix the user has applied to our future dir. + inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` + + # Don't allow the user to place us outside of our expected + # location b/c this prevents finding dependent libraries that + # are installed to the same prefix. + # At present, this check doesn't affect windows .dll's that + # are installed into $libdir/../bin (currently, that works fine) + # but it's something to keep an eye on. + test "$inst_prefix_dir" = "$destdir" && \ + func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" + + if test -n "$inst_prefix_dir"; then + # Stick the inst_prefix_dir data into the link command. + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + else + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` + fi + + func_warning "relinking \`$file'" + func_show_eval "$relink_command" \ + 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' + fi + + # See the names of the shared library. + set dummy $library_names; shift + if test -n "$1"; then + realname="$1" + shift + + srcname="$realname" + test -n "$relink_command" && srcname="$realname"T + + # Install the shared library and build the symlinks. + func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ + 'exit $?' + tstripme="$stripme" + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + case $realname in + *.dll.a) + tstripme="" + ;; + esac + ;; + esac + if test -n "$tstripme" && test -n "$striplib"; then + func_show_eval "$striplib $destdir/$realname" 'exit $?' + fi + + if test "$#" -gt 0; then + # Delete the old symlinks, and create new ones. + # Try `ln -sf' first, because the `ln' binary might depend on + # the symlink we replace! Solaris /bin/ln does not understand -f, + # so we also need to try rm && ln -s. + for linkname + do + test "$linkname" != "$realname" \ + && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" + done + fi + + # Do each command in the postinstall commands. + lib="$destdir/$realname" + func_execute_cmds "$postinstall_cmds" 'exit $?' + fi + + # Install the pseudo-library for information purposes. + func_basename "$file" + name="$func_basename_result" + instname="$dir/$name"i + func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' + + # Maybe install the static library, too. + test -n "$old_library" && func_append staticlibs " $dir/$old_library" + ;; + + *.lo) + # Install (i.e. copy) a libtool object. + + # Figure out destination file name, if it wasn't already specified. + if test -n "$destname"; then + destfile="$destdir/$destname" + else + func_basename "$file" + destfile="$func_basename_result" + destfile="$destdir/$destfile" + fi + + # Deduce the name of the destination old-style object file. + case $destfile in + *.lo) + func_lo2o "$destfile" + staticdest=$func_lo2o_result + ;; + *.$objext) + staticdest="$destfile" + destfile= + ;; + *) + func_fatal_help "cannot copy a libtool object to \`$destfile'" + ;; + esac + + # Install the libtool object if requested. + test -n "$destfile" && \ + func_show_eval "$install_prog $file $destfile" 'exit $?' + + # Install the old object if enabled. + if test "$build_old_libs" = yes; then + # Deduce the name of the old-style object file. + func_lo2o "$file" + staticobj=$func_lo2o_result + func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?' + fi + exit $EXIT_SUCCESS + ;; + + *) + # Figure out destination file name, if it wasn't already specified. + if test -n "$destname"; then + destfile="$destdir/$destname" + else + func_basename "$file" + destfile="$func_basename_result" + destfile="$destdir/$destfile" + fi + + # If the file is missing, and there is a .exe on the end, strip it + # because it is most likely a libtool script we actually want to + # install + stripped_ext="" + case $file in + *.exe) + if test ! -f "$file"; then + func_stripname '' '.exe' "$file" + file=$func_stripname_result + stripped_ext=".exe" + fi + ;; + esac + + # Do a test to see if this is really a libtool program. + case $host in + *cygwin* | *mingw*) + if func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + wrapper=$func_ltwrapper_scriptname_result + else + func_stripname '' '.exe' "$file" + wrapper=$func_stripname_result + fi + ;; + *) + wrapper=$file + ;; + esac + if func_ltwrapper_script_p "$wrapper"; then + notinst_deplibs= + relink_command= + + func_source "$wrapper" + + # Check the variables that should have been set. + test -z "$generated_by_libtool_version" && \ + func_fatal_error "invalid libtool wrapper script \`$wrapper'" + + finalize=yes + for lib in $notinst_deplibs; do + # Check to see that each library is installed. + libdir= + if test -f "$lib"; then + func_source "$lib" + fi + libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test + if test -n "$libdir" && test ! -f "$libfile"; then + func_warning "\`$lib' has not been installed in \`$libdir'" + finalize=no + fi + done + + relink_command= + func_source "$wrapper" + + outputname= + if test "$fast_install" = no && test -n "$relink_command"; then + $opt_dry_run || { + if test "$finalize" = yes; then + tmpdir=`func_mktempdir` + func_basename "$file$stripped_ext" + file="$func_basename_result" + outputname="$tmpdir/$file" + # Replace the output file specification. + relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` + + $opt_silent || { + func_quote_for_expand "$relink_command" + eval "func_echo $func_quote_for_expand_result" + } + if eval "$relink_command"; then : + else + func_error "error: relink \`$file' with the above command before installing it" + $opt_dry_run || ${RM}r "$tmpdir" + continue + fi + file="$outputname" + else + func_warning "cannot relink \`$file'" + fi + } + else + # Install the binary that we compiled earlier. + file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` + fi + fi + + # remove .exe since cygwin /usr/bin/install will append another + # one anyway + case $install_prog,$host in + */usr/bin/install*,*cygwin*) + case $file:$destfile in + *.exe:*.exe) + # this is ok + ;; + *.exe:*) + destfile=$destfile.exe + ;; + *:*.exe) + func_stripname '' '.exe' "$destfile" + destfile=$func_stripname_result + ;; + esac + ;; + esac + func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?' + $opt_dry_run || if test -n "$outputname"; then + ${RM}r "$tmpdir" + fi + ;; + esac + done + + for file in $staticlibs; do + func_basename "$file" + name="$func_basename_result" + + # Set up the ranlib parameters. + oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result + + func_show_eval "$install_prog \$file \$oldlib" 'exit $?' + + if test -n "$stripme" && test -n "$old_striplib"; then + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' + fi + + # Do each command in the postinstall commands. + func_execute_cmds "$old_postinstall_cmds" 'exit $?' + done + + test -n "$future_libdirs" && \ + func_warning "remember to run \`$progname --finish$future_libdirs'" + + if test -n "$current_libdirs"; then + # Maybe just do a dry run. + $opt_dry_run && current_libdirs=" -n$current_libdirs" + exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' + else + exit $EXIT_SUCCESS + fi +} + +test "$opt_mode" = install && func_mode_install ${1+"$@"} + + +# func_generate_dlsyms outputname originator pic_p +# Extract symbols from dlprefiles and create ${outputname}S.o with +# a dlpreopen symbol table. +func_generate_dlsyms () +{ + $opt_debug + my_outputname="$1" + my_originator="$2" + my_pic_p="${3-no}" + my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` + my_dlsyms= + + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + if test -n "$NM" && test -n "$global_symbol_pipe"; then + my_dlsyms="${my_outputname}S.c" + else + func_error "not configured to extract global symbols from dlpreopened files" + fi + fi + + if test -n "$my_dlsyms"; then + case $my_dlsyms in + "") ;; + *.c) + # Discover the nlist of each of the dlfiles. + nlist="$output_objdir/${my_outputname}.nm" + + func_show_eval "$RM $nlist ${nlist}S ${nlist}T" + + # Parse the name list into a source file. + func_verbose "creating $output_objdir/$my_dlsyms" + + $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ +/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ +/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ + +#ifdef __cplusplus +extern \"C\" { +#endif + +#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" +#endif + +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + +/* External symbol declarations for the compiler. */\ +" + + if test "$dlself" = yes; then + func_verbose "generating symbol list for \`$output'" + + $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" + + # Add our own program objects to the symbol list. + progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` + for progfile in $progfiles; do + func_to_tool_file "$progfile" func_convert_file_msys_to_w32 + func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" + $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" + done + + if test -n "$exclude_expsyms"; then + $opt_dry_run || { + eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + } + fi + + if test -n "$export_symbols_regex"; then + $opt_dry_run || { + eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + } + fi + + # Prepare the list of exported symbols + if test -z "$export_symbols"; then + export_symbols="$output_objdir/$outputname.exp" + $opt_dry_run || { + $RM $export_symbols + eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + case $host in + *cygwin* | *mingw* | *cegcc* ) + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' + ;; + esac + } + else + $opt_dry_run || { + eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + case $host in + *cygwin* | *mingw* | *cegcc* ) + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' + ;; + esac + } + fi + fi + + for dlprefile in $dlprefiles; do + func_verbose "extracting global C symbols from \`$dlprefile'" + func_basename "$dlprefile" + name="$func_basename_result" + case $host in + *cygwin* | *mingw* | *cegcc* ) + # if an import library, we need to obtain dlname + if func_win32_import_lib_p "$dlprefile"; then + func_tr_sh "$dlprefile" + eval "curr_lafile=\$libfile_$func_tr_sh_result" + dlprefile_dlbasename="" + if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then + # Use subshell, to avoid clobbering current variable values + dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` + if test -n "$dlprefile_dlname" ; then + func_basename "$dlprefile_dlname" + dlprefile_dlbasename="$func_basename_result" + else + # no lafile. user explicitly requested -dlpreopen . + $sharedlib_from_linklib_cmd "$dlprefile" + dlprefile_dlbasename=$sharedlib_from_linklib_result + fi + fi + $opt_dry_run || { + if test -n "$dlprefile_dlbasename" ; then + eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' + else + func_warning "Could not compute DLL name from $name" + eval '$ECHO ": $name " >> "$nlist"' + fi + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | + $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" + } + else # not an import lib + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + fi + ;; + *) + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + ;; + esac + done + + $opt_dry_run || { + # Make sure we have at least an empty file. + test -f "$nlist" || : > "$nlist" + + if test -n "$exclude_expsyms"; then + $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T + $MV "$nlist"T "$nlist" + fi + + # Try sorting and uniquifying the output. + if $GREP -v "^: " < "$nlist" | + if sort -k 3 /dev/null 2>&1; then + sort -k 3 + else + sort +2 + fi | + uniq > "$nlist"S; then + : + else + $GREP -v "^: " < "$nlist" > "$nlist"S + fi + + if test -f "$nlist"S; then + eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' + else + echo '/* NONE */' >> "$output_objdir/$my_dlsyms" + fi + + echo >> "$output_objdir/$my_dlsyms" "\ + +/* The mapping between symbol names and symbols. */ +typedef struct { + const char *name; + void *address; +} lt_dlsymlist; +extern LT_DLSYM_CONST lt_dlsymlist +lt_${my_prefix}_LTX_preloaded_symbols[]; +LT_DLSYM_CONST lt_dlsymlist +lt_${my_prefix}_LTX_preloaded_symbols[] = +{\ + { \"$my_originator\", (void *) 0 }," + + case $need_lib_prefix in + no) + eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms" + ;; + *) + eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" + ;; + esac + echo >> "$output_objdir/$my_dlsyms" "\ + {0, (void *) 0} +}; + +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt_${my_prefix}_LTX_preloaded_symbols; +} +#endif + +#ifdef __cplusplus +} +#endif\ +" + } # !$opt_dry_run + + pic_flag_for_symtable= + case "$compile_command " in + *" -static "*) ;; + *) + case $host in + # compiling the symbol table file with pic_flag works around + # a FreeBSD bug that causes programs to crash when -lm is + # linked before any other PIC object. But we must not use + # pic_flag when linking with -static. The problem exists in + # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; + *-*-hpux*) + pic_flag_for_symtable=" $pic_flag" ;; + *) + if test "X$my_pic_p" != Xno; then + pic_flag_for_symtable=" $pic_flag" + fi + ;; + esac + ;; + esac + symtab_cflags= + for arg in $LTCFLAGS; do + case $arg in + -pie | -fpie | -fPIE) ;; + *) func_append symtab_cflags " $arg" ;; + esac + done + + # Now compile the dynamic symbol file. + func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' + + # Clean up the generated files. + func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' + + # Transform the symbol file into the correct name. + symfileobj="$output_objdir/${my_outputname}S.$objext" + case $host in + *cygwin* | *mingw* | *cegcc* ) + if test -f "$output_objdir/$my_outputname.def"; then + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + else + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` + fi + ;; + *) + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` + ;; + esac + ;; + *) + func_fatal_error "unknown suffix for \`$my_dlsyms'" + ;; + esac + else + # We keep going just in case the user didn't refer to + # lt_preloaded_symbols. The linker will fail if global_symbol_pipe + # really was required. + + # Nullify the symbol file. + compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` + fi +} + +# func_win32_libid arg +# return the library type of file 'arg' +# +# Need a lot of goo to handle *both* DLLs and import libs +# Has to be a shell function in order to 'eat' the argument +# that is supplied when $file_magic_command is called. +# Despite the name, also deal with 64 bit binaries. +func_win32_libid () +{ + $opt_debug + win32_libid_type="unknown" + win32_fileres=`file -L $1 2>/dev/null` + case $win32_fileres in + *ar\ archive\ import\ library*) # definitely import + win32_libid_type="x86 archive import" + ;; + *ar\ archive*) # could be an import, or static + # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. + if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | + $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $SED -n -e ' + 1,100{ + / I /{ + s,.*,import, + p + q + } + }'` + case $win32_nmres in + import*) win32_libid_type="x86 archive import";; + *) win32_libid_type="x86 archive static";; + esac + fi + ;; + *DLL*) + win32_libid_type="x86 DLL" + ;; + *executable*) # but shell scripts are "executable" too... + case $win32_fileres in + *MS\ Windows\ PE\ Intel*) + win32_libid_type="x86 DLL" + ;; + esac + ;; + esac + $ECHO "$win32_libid_type" +} + +# func_cygming_dll_for_implib ARG +# +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib () +{ + $opt_debug + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` +} + +# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs +# +# The is the core of a fallback implementation of a +# platform-specific function to extract the name of the +# DLL associated with the specified import library LIBNAME. +# +# SECTION_NAME is either .idata$6 or .idata$7, depending +# on the platform and compiler that created the implib. +# +# Echos the name of the DLL associated with the +# specified import library. +func_cygming_dll_for_implib_fallback_core () +{ + $opt_debug + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` + $OBJDUMP -s --section "$1" "$2" 2>/dev/null | + $SED '/^Contents of section '"$match_literal"':/{ + # Place marker at beginning of archive member dllname section + s/.*/====MARK====/ + p + d + } + # These lines can sometimes be longer than 43 characters, but + # are always uninteresting + /:[ ]*file format pe[i]\{,1\}-/d + /^In archive [^:]*:/d + # Ensure marker is printed + /^====MARK====/p + # Remove all lines with less than 43 characters + /^.\{43\}/!d + # From remaining lines, remove first 43 characters + s/^.\{43\}//' | + $SED -n ' + # Join marker and all lines until next marker into a single line + /^====MARK====/ b para + H + $ b para + b + :para + x + s/\n//g + # Remove the marker + s/^====MARK====// + # Remove trailing dots and whitespace + s/[\. \t]*$// + # Print + /./p' | + # we now have a list, one entry per line, of the stringified + # contents of the appropriate section of all members of the + # archive which possess that section. Heuristic: eliminate + # all those which have a first or second character that is + # a '.' (that is, objdump's representation of an unprintable + # character.) This should work for all archives with less than + # 0x302f exports -- but will fail for DLLs whose name actually + # begins with a literal '.' or a single character followed by + # a '.'. + # + # Of those that remain, print the first one. + $SED -e '/^\./d;/^.\./d;q' +} + +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $opt_debug + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $opt_debug + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" +} + +# func_cygming_dll_for_implib_fallback ARG +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# +# This fallback implementation is for use when $DLLTOOL +# does not support the --identify-strict option. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib_fallback () +{ + $opt_debug + if func_cygming_gnu_implib_p "$1" ; then + # binutils import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` + elif func_cygming_ms_implib_p "$1" ; then + # ms-generated import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` + else + # unknown + sharedlib_from_linklib_result="" + fi +} + + +# func_extract_an_archive dir oldlib +func_extract_an_archive () +{ + $opt_debug + f_ex_an_ar_dir="$1"; shift + f_ex_an_ar_oldlib="$1" + if test "$lock_old_archive_extraction" = yes; then + lockfile=$f_ex_an_ar_oldlib.lock + until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do + func_echo "Waiting for $lockfile to be removed" + sleep 2 + done + fi + func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ + 'stat=$?; rm -f "$lockfile"; exit $stat' + if test "$lock_old_archive_extraction" = yes; then + $opt_dry_run || rm -f "$lockfile" + fi + if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then + : + else + func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" + fi +} + + +# func_extract_archives gentop oldlib ... +func_extract_archives () +{ + $opt_debug + my_gentop="$1"; shift + my_oldlibs=${1+"$@"} + my_oldobjs="" + my_xlib="" + my_xabs="" + my_xdir="" + + for my_xlib in $my_oldlibs; do + # Extract the objects. + case $my_xlib in + [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; + *) my_xabs=`pwd`"/$my_xlib" ;; + esac + func_basename "$my_xlib" + my_xlib="$func_basename_result" + my_xlib_u=$my_xlib + while :; do + case " $extracted_archives " in + *" $my_xlib_u "*) + func_arith $extracted_serial + 1 + extracted_serial=$func_arith_result + my_xlib_u=lt$extracted_serial-$my_xlib ;; + *) break ;; + esac + done + extracted_archives="$extracted_archives $my_xlib_u" + my_xdir="$my_gentop/$my_xlib_u" + + func_mkdir_p "$my_xdir" + + case $host in + *-darwin*) + func_verbose "Extracting $my_xabs" + # Do not bother doing anything if just a dry run + $opt_dry_run || { + darwin_orig_dir=`pwd` + cd $my_xdir || exit $? + darwin_archive=$my_xabs + darwin_curdir=`pwd` + darwin_base_archive=`basename "$darwin_archive"` + darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` + if test -n "$darwin_arches"; then + darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` + darwin_arch= + func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" + for darwin_arch in $darwin_arches ; do + func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" + $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" + cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" + func_extract_an_archive "`pwd`" "${darwin_base_archive}" + cd "$darwin_curdir" + $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" + done # $darwin_arches + ## Okay now we've a bunch of thin objects, gotta fatten them up :) + darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` + darwin_file= + darwin_files= + for darwin_file in $darwin_filelist; do + darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` + $LIPO -create -output "$darwin_file" $darwin_files + done # $darwin_filelist + $RM -rf unfat-$$ + cd "$darwin_orig_dir" + else + cd $darwin_orig_dir + func_extract_an_archive "$my_xdir" "$my_xabs" + fi # $darwin_arches + } # !$opt_dry_run + ;; + *) + func_extract_an_archive "$my_xdir" "$my_xabs" + ;; + esac + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` + done + + func_extract_archives_result="$my_oldobjs" +} + + +# func_emit_wrapper [arg=no] +# +# Emit a libtool wrapper script on stdout. +# Don't directly open a file because we may want to +# incorporate the script contents within a cygwin/mingw +# wrapper executable. Must ONLY be called from within +# func_mode_link because it depends on a number of variables +# set therein. +# +# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR +# variable will take. If 'yes', then the emitted script +# will assume that the directory in which it is stored is +# the $objdir directory. This is a cygwin/mingw-specific +# behavior. +func_emit_wrapper () +{ + func_emit_wrapper_arg1=${1-no} + + $ECHO "\ +#! $SHELL + +# $output - temporary wrapper script for $objdir/$outputname +# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# +# The $output program cannot be directly executed until all the libtool +# libraries that it depends on are installed. +# +# This wrapper script should never be moved out of the build directory. +# If it is, it will not operate correctly. + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='$sed_quote_subst' + +# Be Bourne compatible +if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +relink_command=\"$relink_command\" + +# This environment variable determines our operation mode. +if test \"\$libtool_install_magic\" = \"$magic\"; then + # install mode needs the following variables: + generated_by_libtool_version='$macro_version' + notinst_deplibs='$notinst_deplibs' +else + # When we are sourced in execute mode, \$file and \$ECHO are already set. + if test \"\$libtool_execute_magic\" != \"$magic\"; then + file=\"\$0\"" + + qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` + $ECHO "\ + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} + ECHO=\"$qECHO\" + fi + +# Very basic option parsing. These options are (a) specific to +# the libtool wrapper, (b) are identical between the wrapper +# /script/ and the wrapper /executable/ which is used only on +# windows platforms, and (c) all begin with the string "--lt-" +# (application programs are unlikely to have options which match +# this pattern). +# +# There are only two supported options: --lt-debug and +# --lt-dump-script. There is, deliberately, no --lt-help. +# +# The first argument to this parsing function should be the +# script's $0 value, followed by "$@". +lt_option_debug= +func_parse_lt_options () +{ + lt_script_arg0=\$0 + shift + for lt_opt + do + case \"\$lt_opt\" in + --lt-debug) lt_option_debug=1 ;; + --lt-dump-script) + lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` + test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. + lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` + cat \"\$lt_dump_D/\$lt_dump_F\" + exit 0 + ;; + --lt-*) + \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 + exit 1 + ;; + esac + done + + # Print the debug banner immediately: + if test -n \"\$lt_option_debug\"; then + echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 + fi +} + +# Used when --lt-debug. Prints its arguments to stdout +# (redirection is the responsibility of the caller) +func_lt_dump_args () +{ + lt_dump_args_N=1; + for lt_arg + do + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" + lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` + done +} + +# Core function for launching the target application +func_exec_program_core () +{ +" + case $host in + # Backslashes separate directories on plain windows + *-*-mingw | *-*-os2* | *-cegcc*) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +" + ;; + + *) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir/\$program\" \${1+\"\$@\"} +" + ;; + esac + $ECHO "\ + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 + exit 1 +} + +# A function to encapsulate launching the target application +# Strips options in the --lt-* namespace from \$@ and +# launches target application with the remaining arguments. +func_exec_program () +{ + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac + func_exec_program_core \${1+\"\$@\"} +} + + # Parse options + func_parse_lt_options \"\$0\" \${1+\"\$@\"} + + # Find the directory that this script lives in. + thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` + test \"x\$thisdir\" = \"x\$file\" && thisdir=. + + # Follow symbolic links until we get to the real thisdir. + file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` + while test -n \"\$file\"; do + destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` + + # If there was a directory component, then change thisdir. + if test \"x\$destdir\" != \"x\$file\"; then + case \"\$destdir\" in + [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; + *) thisdir=\"\$thisdir/\$destdir\" ;; + esac + fi + + file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` + file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` + done + + # Usually 'no', except on cygwin/mingw when embedded into + # the cwrapper. + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 + if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then + # special case for '.' + if test \"\$thisdir\" = \".\"; then + thisdir=\`pwd\` + fi + # remove .libs from thisdir + case \"\$thisdir\" in + *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; + $objdir ) thisdir=. ;; + esac + fi + + # Try to get the absolute directory name. + absdir=\`cd \"\$thisdir\" && pwd\` + test -n \"\$absdir\" && thisdir=\"\$absdir\" +" + + if test "$fast_install" = yes; then + $ECHO "\ + program=lt-'$outputname'$exeext + progdir=\"\$thisdir/$objdir\" + + if test ! -f \"\$progdir/\$program\" || + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ + test \"X\$file\" != \"X\$progdir/\$program\"; }; then + + file=\"\$\$-\$program\" + + if test ! -d \"\$progdir\"; then + $MKDIR \"\$progdir\" + else + $RM \"\$progdir/\$file\" + fi" + + $ECHO "\ + + # relink executable if necessary + if test -n \"\$relink_command\"; then + if relink_command_output=\`eval \$relink_command 2>&1\`; then : + else + $ECHO \"\$relink_command_output\" >&2 + $RM \"\$progdir/\$file\" + exit 1 + fi + fi + + $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || + { $RM \"\$progdir/\$program\"; + $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } + $RM \"\$progdir/\$file\" + fi" + else + $ECHO "\ + program='$outputname' + progdir=\"\$thisdir/$objdir\" +" + fi + + $ECHO "\ + + if test -f \"\$progdir/\$program\"; then" + + # fixup the dll searchpath if we need to. + # + # Fix the DLL searchpath if we need to. Do this before prepending + # to shlibpath, because on Windows, both are PATH and uninstalled + # libraries must come first. + if test -n "$dllsearchpath"; then + $ECHO "\ + # Add the dll search path components to the executable PATH + PATH=$dllsearchpath:\$PATH +" + fi + + # Export our shlibpath_var if we have one. + if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + $ECHO "\ + # Add our own library path to $shlibpath_var + $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" + + # Some systems cannot cope with colon-terminated $shlibpath_var + # The second colon is a workaround for a bug in BeOS R4 sed + $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` + + export $shlibpath_var +" + fi + + $ECHO "\ + if test \"\$libtool_execute_magic\" != \"$magic\"; then + # Run the actual program with our arguments. + func_exec_program \${1+\"\$@\"} + fi + else + # The program doesn't exist. + \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 + \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 + \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 + exit 1 + fi +fi\ +" +} + + +# func_emit_cwrapperexe_src +# emit the source code for a wrapper executable on stdout +# Must ONLY be called from within func_mode_link because +# it depends on a number of variable set therein. +func_emit_cwrapperexe_src () +{ + cat < +#include +#ifdef _MSC_VER +# include +# include +# include +#else +# include +# include +# ifdef __CYGWIN__ +# include +# endif +#endif +#include +#include +#include +#include +#include +#include +#include +#include + +/* declarations of non-ANSI functions */ +#if defined(__MINGW32__) +# ifdef __STRICT_ANSI__ +int _putenv (const char *); +# endif +#elif defined(__CYGWIN__) +# ifdef __STRICT_ANSI__ +char *realpath (const char *, char *); +int putenv (char *); +int setenv (const char *, const char *, int); +# endif +/* #elif defined (other platforms) ... */ +#endif + +/* portability defines, excluding path handling macros */ +#if defined(_MSC_VER) +# define setmode _setmode +# define stat _stat +# define chmod _chmod +# define getcwd _getcwd +# define putenv _putenv +# define S_IXUSR _S_IEXEC +# ifndef _INTPTR_T_DEFINED +# define _INTPTR_T_DEFINED +# define intptr_t int +# endif +#elif defined(__MINGW32__) +# define setmode _setmode +# define stat _stat +# define chmod _chmod +# define getcwd _getcwd +# define putenv _putenv +#elif defined(__CYGWIN__) +# define HAVE_SETENV +# define FOPEN_WB "wb" +/* #elif defined (other platforms) ... */ +#endif + +#if defined(PATH_MAX) +# define LT_PATHMAX PATH_MAX +#elif defined(MAXPATHLEN) +# define LT_PATHMAX MAXPATHLEN +#else +# define LT_PATHMAX 1024 +#endif + +#ifndef S_IXOTH +# define S_IXOTH 0 +#endif +#ifndef S_IXGRP +# define S_IXGRP 0 +#endif + +/* path handling portability macros */ +#ifndef DIR_SEPARATOR +# define DIR_SEPARATOR '/' +# define PATH_SEPARATOR ':' +#endif + +#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ + defined (__OS2__) +# define HAVE_DOS_BASED_FILE_SYSTEM +# define FOPEN_WB "wb" +# ifndef DIR_SEPARATOR_2 +# define DIR_SEPARATOR_2 '\\' +# endif +# ifndef PATH_SEPARATOR_2 +# define PATH_SEPARATOR_2 ';' +# endif +#endif + +#ifndef DIR_SEPARATOR_2 +# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) +#else /* DIR_SEPARATOR_2 */ +# define IS_DIR_SEPARATOR(ch) \ + (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) +#endif /* DIR_SEPARATOR_2 */ + +#ifndef PATH_SEPARATOR_2 +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) +#else /* PATH_SEPARATOR_2 */ +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) +#endif /* PATH_SEPARATOR_2 */ + +#ifndef FOPEN_WB +# define FOPEN_WB "w" +#endif +#ifndef _O_BINARY +# define _O_BINARY 0 +#endif + +#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) +#define XFREE(stale) do { \ + if (stale) { free ((void *) stale); stale = 0; } \ +} while (0) + +#if defined(LT_DEBUGWRAPPER) +static int lt_debug = 1; +#else +static int lt_debug = 0; +#endif + +const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ + +void *xmalloc (size_t num); +char *xstrdup (const char *string); +const char *base_name (const char *name); +char *find_executable (const char *wrapper); +char *chase_symlinks (const char *pathspec); +int make_executable (const char *path); +int check_executable (const char *path); +char *strendzap (char *str, const char *pat); +void lt_debugprintf (const char *file, int line, const char *fmt, ...); +void lt_fatal (const char *file, int line, const char *message, ...); +static const char *nonnull (const char *s); +static const char *nonempty (const char *s); +void lt_setenv (const char *name, const char *value); +char *lt_extend_str (const char *orig_value, const char *add, int to_end); +void lt_update_exe_path (const char *name, const char *value); +void lt_update_lib_path (const char *name, const char *value); +char **prepare_spawn (char **argv); +void lt_dump_script (FILE *f); +EOF + + cat <= 0) + && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) + return 1; + else + return 0; +} + +int +make_executable (const char *path) +{ + int rval = 0; + struct stat st; + + lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", + nonempty (path)); + if ((!path) || (!*path)) + return 0; + + if (stat (path, &st) >= 0) + { + rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR); + } + return rval; +} + +/* Searches for the full path of the wrapper. Returns + newly allocated full path name if found, NULL otherwise + Does not chase symlinks, even on platforms that support them. +*/ +char * +find_executable (const char *wrapper) +{ + int has_slash = 0; + const char *p; + const char *p_next; + /* static buffer for getcwd */ + char tmp[LT_PATHMAX + 1]; + int tmp_len; + char *concat_name; + + lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", + nonempty (wrapper)); + + if ((wrapper == NULL) || (*wrapper == '\0')) + return NULL; + + /* Absolute path? */ +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':') + { + concat_name = xstrdup (wrapper); + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } + else + { +#endif + if (IS_DIR_SEPARATOR (wrapper[0])) + { + concat_name = xstrdup (wrapper); + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + } +#endif + + for (p = wrapper; *p; p++) + if (*p == '/') + { + has_slash = 1; + break; + } + if (!has_slash) + { + /* no slashes; search PATH */ + const char *path = getenv ("PATH"); + if (path != NULL) + { + for (p = path; *p; p = p_next) + { + const char *q; + size_t p_len; + for (q = p; *q; q++) + if (IS_PATH_SEPARATOR (*q)) + break; + p_len = q - p; + p_next = (*q == '\0' ? q : q + 1); + if (p_len == 0) + { + /* empty path: current directory */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", + nonnull (strerror (errno))); + tmp_len = strlen (tmp); + concat_name = + XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); + } + else + { + concat_name = + XMALLOC (char, p_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, p, p_len); + concat_name[p_len] = '/'; + strcpy (concat_name + p_len + 1, wrapper); + } + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } + } + /* not found in PATH; assume curdir */ + } + /* Relative path | not found in path: prepend cwd */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", + nonnull (strerror (errno))); + tmp_len = strlen (tmp); + concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); + + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + return NULL; +} + +char * +chase_symlinks (const char *pathspec) +{ +#ifndef S_ISLNK + return xstrdup (pathspec); +#else + char buf[LT_PATHMAX]; + struct stat s; + char *tmp_pathspec = xstrdup (pathspec); + char *p; + int has_symlinks = 0; + while (strlen (tmp_pathspec) && !has_symlinks) + { + lt_debugprintf (__FILE__, __LINE__, + "checking path component for symlinks: %s\n", + tmp_pathspec); + if (lstat (tmp_pathspec, &s) == 0) + { + if (S_ISLNK (s.st_mode) != 0) + { + has_symlinks = 1; + break; + } + + /* search backwards for last DIR_SEPARATOR */ + p = tmp_pathspec + strlen (tmp_pathspec) - 1; + while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) + p--; + if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) + { + /* no more DIR_SEPARATORS left */ + break; + } + *p = '\0'; + } + else + { + lt_fatal (__FILE__, __LINE__, + "error accessing file \"%s\": %s", + tmp_pathspec, nonnull (strerror (errno))); + } + } + XFREE (tmp_pathspec); + + if (!has_symlinks) + { + return xstrdup (pathspec); + } + + tmp_pathspec = realpath (pathspec, buf); + if (tmp_pathspec == 0) + { + lt_fatal (__FILE__, __LINE__, + "could not follow symlinks for %s", pathspec); + } + return xstrdup (tmp_pathspec); +#endif +} + +char * +strendzap (char *str, const char *pat) +{ + size_t len, patlen; + + assert (str != NULL); + assert (pat != NULL); + + len = strlen (str); + patlen = strlen (pat); + + if (patlen <= len) + { + str += len - patlen; + if (strcmp (str, pat) == 0) + *str = '\0'; + } + return str; +} + +void +lt_debugprintf (const char *file, int line, const char *fmt, ...) +{ + va_list args; + if (lt_debug) + { + (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); + va_start (args, fmt); + (void) vfprintf (stderr, fmt, args); + va_end (args); + } +} + +static void +lt_error_core (int exit_status, const char *file, + int line, const char *mode, + const char *message, va_list ap) +{ + fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); + vfprintf (stderr, message, ap); + fprintf (stderr, ".\n"); + + if (exit_status >= 0) + exit (exit_status); +} + +void +lt_fatal (const char *file, int line, const char *message, ...) +{ + va_list ap; + va_start (ap, message); + lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); + va_end (ap); +} + +static const char * +nonnull (const char *s) +{ + return s ? s : "(null)"; +} + +static const char * +nonempty (const char *s) +{ + return (s && !*s) ? "(empty)" : nonnull (s); +} + +void +lt_setenv (const char *name, const char *value) +{ + lt_debugprintf (__FILE__, __LINE__, + "(lt_setenv) setting '%s' to '%s'\n", + nonnull (name), nonnull (value)); + { +#ifdef HAVE_SETENV + /* always make a copy, for consistency with !HAVE_SETENV */ + char *str = xstrdup (value); + setenv (name, str, 1); +#else + int len = strlen (name) + 1 + strlen (value) + 1; + char *str = XMALLOC (char, len); + sprintf (str, "%s=%s", name, value); + if (putenv (str) != EXIT_SUCCESS) + { + XFREE (str); + } +#endif + } +} + +char * +lt_extend_str (const char *orig_value, const char *add, int to_end) +{ + char *new_value; + if (orig_value && *orig_value) + { + int orig_value_len = strlen (orig_value); + int add_len = strlen (add); + new_value = XMALLOC (char, add_len + orig_value_len + 1); + if (to_end) + { + strcpy (new_value, orig_value); + strcpy (new_value + orig_value_len, add); + } + else + { + strcpy (new_value, add); + strcpy (new_value + add_len, orig_value); + } + } + else + { + new_value = xstrdup (add); + } + return new_value; +} + +void +lt_update_exe_path (const char *name, const char *value) +{ + lt_debugprintf (__FILE__, __LINE__, + "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", + nonnull (name), nonnull (value)); + + if (name && *name && value && *value) + { + char *new_value = lt_extend_str (getenv (name), value, 0); + /* some systems can't cope with a ':'-terminated path #' */ + int len = strlen (new_value); + while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1])) + { + new_value[len-1] = '\0'; + } + lt_setenv (name, new_value); + XFREE (new_value); + } +} + +void +lt_update_lib_path (const char *name, const char *value) +{ + lt_debugprintf (__FILE__, __LINE__, + "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", + nonnull (name), nonnull (value)); + + if (name && *name && value && *value) + { + char *new_value = lt_extend_str (getenv (name), value, 0); + lt_setenv (name, new_value); + XFREE (new_value); + } +} + +EOF + case $host_os in + mingw*) + cat <<"EOF" + +/* Prepares an argument vector before calling spawn(). + Note that spawn() does not by itself call the command interpreter + (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : + ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&v); + v.dwPlatformId == VER_PLATFORM_WIN32_NT; + }) ? "cmd.exe" : "command.com"). + Instead it simply concatenates the arguments, separated by ' ', and calls + CreateProcess(). We must quote the arguments since Win32 CreateProcess() + interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a + special way: + - Space and tab are interpreted as delimiters. They are not treated as + delimiters if they are surrounded by double quotes: "...". + - Unescaped double quotes are removed from the input. Their only effect is + that within double quotes, space and tab are treated like normal + characters. + - Backslashes not followed by double quotes are not special. + - But 2*n+1 backslashes followed by a double quote become + n backslashes followed by a double quote (n >= 0): + \" -> " + \\\" -> \" + \\\\\" -> \\" + */ +#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" +#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" +char ** +prepare_spawn (char **argv) +{ + size_t argc; + char **new_argv; + size_t i; + + /* Count number of arguments. */ + for (argc = 0; argv[argc] != NULL; argc++) + ; + + /* Allocate new argument vector. */ + new_argv = XMALLOC (char *, argc + 1); + + /* Put quoted arguments into the new argument vector. */ + for (i = 0; i < argc; i++) + { + const char *string = argv[i]; + + if (string[0] == '\0') + new_argv[i] = xstrdup ("\"\""); + else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) + { + int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); + size_t length; + unsigned int backslashes; + const char *s; + char *quoted_string; + char *p; + + length = 0; + backslashes = 0; + if (quote_around) + length++; + for (s = string; *s != '\0'; s++) + { + char c = *s; + if (c == '"') + length += backslashes + 1; + length++; + if (c == '\\') + backslashes++; + else + backslashes = 0; + } + if (quote_around) + length += backslashes + 1; + + quoted_string = XMALLOC (char, length + 1); + + p = quoted_string; + backslashes = 0; + if (quote_around) + *p++ = '"'; + for (s = string; *s != '\0'; s++) + { + char c = *s; + if (c == '"') + { + unsigned int j; + for (j = backslashes + 1; j > 0; j--) + *p++ = '\\'; + } + *p++ = c; + if (c == '\\') + backslashes++; + else + backslashes = 0; + } + if (quote_around) + { + unsigned int j; + for (j = backslashes; j > 0; j--) + *p++ = '\\'; + *p++ = '"'; + } + *p = '\0'; + + new_argv[i] = quoted_string; + } + else + new_argv[i] = (char *) string; + } + new_argv[argc] = NULL; + + return new_argv; +} +EOF + ;; + esac + + cat <<"EOF" +void lt_dump_script (FILE* f) +{ +EOF + func_emit_wrapper yes | + $SED -n -e ' +s/^\(.\{79\}\)\(..*\)/\1\ +\2/ +h +s/\([\\"]\)/\\\1/g +s/$/\\n/ +s/\([^\n]*\).*/ fputs ("\1", f);/p +g +D' + cat <<"EOF" +} +EOF +} +# end: func_emit_cwrapperexe_src + +# func_win32_import_lib_p ARG +# True if ARG is an import lib, as indicated by $file_magic_cmd +func_win32_import_lib_p () +{ + $opt_debug + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in + *import*) : ;; + *) false ;; + esac +} + +# func_mode_link arg... +func_mode_link () +{ + $opt_debug + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + # It is impossible to link a dll without this setting, and + # we shouldn't force the makefile maintainer to figure out + # which system we are compiling for in order to pass an extra + # flag for every libtool invocation. + # allow_undefined=no + + # FIXME: Unfortunately, there are problems with the above when trying + # to make a dll which has undefined symbols, in which case not + # even a static library is built. For now, we need to specify + # -no-undefined on the libtool link line when we can be certain + # that all symbols are satisfied, otherwise we get a static library. + allow_undefined=yes + ;; + *) + allow_undefined=yes + ;; + esac + libtool_args=$nonopt + base_compile="$nonopt $@" + compile_command=$nonopt + finalize_command=$nonopt + + compile_rpath= + finalize_rpath= + compile_shlibpath= + finalize_shlibpath= + convenience= + old_convenience= + deplibs= + old_deplibs= + compiler_flags= + linker_flags= + dllsearchpath= + lib_search_path=`pwd` + inst_prefix_dir= + new_inherited_linker_flags= + + avoid_version=no + bindir= + dlfiles= + dlprefiles= + dlself=no + export_dynamic=no + export_symbols= + export_symbols_regex= + generated= + libobjs= + ltlibs= + module=no + no_install=no + objs= + non_pic_objects= + precious_files_regex= + prefer_static_libs=no + preload=no + prev= + prevarg= + release= + rpath= + xrpath= + perm_rpath= + temp_rpath= + thread_safe=no + vinfo= + vinfo_number=no + weak_libs= + single_module="${wl}-single_module" + func_infer_tag $base_compile + + # We need to know -static, to get the right output filenames. + for arg + do + case $arg in + -shared) + test "$build_libtool_libs" != yes && \ + func_fatal_configuration "can not build a shared library" + build_old_libs=no + break + ;; + -all-static | -static | -static-libtool-libs) + case $arg in + -all-static) + if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then + func_warning "complete static linking is impossible in this configuration" + fi + if test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=yes + ;; + -static) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=built + ;; + -static-libtool-libs) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=yes + ;; + esac + build_libtool_libs=no + build_old_libs=yes + break + ;; + esac + done + + # See if our shared archives depend on static archives. + test -n "$old_archive_from_new_cmds" && build_old_libs=yes + + # Go through the arguments, transforming them on the way. + while test "$#" -gt 0; do + arg="$1" + shift + func_quote_for_eval "$arg" + qarg=$func_quote_for_eval_unquoted_result + func_append libtool_args " $func_quote_for_eval_result" + + # If the previous option needs an argument, assign it. + if test -n "$prev"; then + case $prev in + output) + func_append compile_command " @OUTPUT@" + func_append finalize_command " @OUTPUT@" + ;; + esac + + case $prev in + bindir) + bindir="$arg" + prev= + continue + ;; + dlfiles|dlprefiles) + if test "$preload" = no; then + # Add the symbol object into the linking commands. + func_append compile_command " @SYMFILE@" + func_append finalize_command " @SYMFILE@" + preload=yes + fi + case $arg in + *.la | *.lo) ;; # We handle these cases below. + force) + if test "$dlself" = no; then + dlself=needless + export_dynamic=yes + fi + prev= + continue + ;; + self) + if test "$prev" = dlprefiles; then + dlself=yes + elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then + dlself=yes + else + dlself=needless + export_dynamic=yes + fi + prev= + continue + ;; + *) + if test "$prev" = dlfiles; then + func_append dlfiles " $arg" + else + func_append dlprefiles " $arg" + fi + prev= + continue + ;; + esac + ;; + expsyms) + export_symbols="$arg" + test -f "$arg" \ + || func_fatal_error "symbol file \`$arg' does not exist" + prev= + continue + ;; + expsyms_regex) + export_symbols_regex="$arg" + prev= + continue + ;; + framework) + case $host in + *-*-darwin*) + case "$deplibs " in + *" $qarg.ltframework "*) ;; + *) func_append deplibs " $qarg.ltframework" # this is fixed later + ;; + esac + ;; + esac + prev= + continue + ;; + inst_prefix) + inst_prefix_dir="$arg" + prev= + continue + ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg + moreargs= + for fil in `cat "$save_arg"` + do +# func_append moreargs " $fil" + arg=$fil + # A libtool-controlled object. + + # Check to see that this really is a libtool object. + if func_lalib_unsafe_p "$arg"; then + pic_object= + non_pic_object= + + # Read the .lo file + func_source "$arg" + + if test -z "$pic_object" || + test -z "$non_pic_object" || + test "$pic_object" = none && + test "$non_pic_object" = none; then + func_fatal_error "cannot find name of object for \`$arg'" + fi + + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" + + if test "$pic_object" != none; then + # Prepend the subdirectory the object is found in. + pic_object="$xdir$pic_object" + + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + func_append dlfiles " $pic_object" + prev= + continue + else + # If libtool objects are unsupported, then we need to preload. + prev=dlprefiles + fi + fi + + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. + func_append dlprefiles " $pic_object" + prev= + fi + + # A PIC object. + func_append libobjs " $pic_object" + arg="$pic_object" + fi + + # Non-PIC object. + if test "$non_pic_object" != none; then + # Prepend the subdirectory the object is found in. + non_pic_object="$xdir$non_pic_object" + + # A standard non-PIC object + func_append non_pic_objects " $non_pic_object" + if test -z "$pic_object" || test "$pic_object" = none ; then + arg="$non_pic_object" + fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + func_append non_pic_objects " $non_pic_object" + fi + else + # Only an error if not doing a dry-run. + if $opt_dry_run; then + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" + + func_lo2o "$arg" + pic_object=$xdir$objdir/$func_lo2o_result + non_pic_object=$xdir$func_lo2o_result + func_append libobjs " $pic_object" + func_append non_pic_objects " $non_pic_object" + else + func_fatal_error "\`$arg' is not a valid libtool object" + fi + fi + done + else + func_fatal_error "link input file \`$arg' does not exist" + fi + arg=$save_arg + prev= + continue + ;; + precious_regex) + precious_files_regex="$arg" + prev= + continue + ;; + release) + release="-$arg" + prev= + continue + ;; + rpath | xrpath) + # We need an absolute path. + case $arg in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + func_fatal_error "only absolute run-paths are allowed" + ;; + esac + if test "$prev" = rpath; then + case "$rpath " in + *" $arg "*) ;; + *) func_append rpath " $arg" ;; + esac + else + case "$xrpath " in + *" $arg "*) ;; + *) func_append xrpath " $arg" ;; + esac + fi + prev= + continue + ;; + shrext) + shrext_cmds="$arg" + prev= + continue + ;; + weak) + func_append weak_libs " $arg" + prev= + continue + ;; + xcclinker) + func_append linker_flags " $qarg" + func_append compiler_flags " $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xcompiler) + func_append compiler_flags " $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xlinker) + func_append linker_flags " $qarg" + func_append compiler_flags " $wl$qarg" + prev= + func_append compile_command " $wl$qarg" + func_append finalize_command " $wl$qarg" + continue + ;; + *) + eval "$prev=\"\$arg\"" + prev= + continue + ;; + esac + fi # test -n "$prev" + + prevarg="$arg" + + case $arg in + -all-static) + if test -n "$link_static_flag"; then + # See comment for -static flag below, for more details. + func_append compile_command " $link_static_flag" + func_append finalize_command " $link_static_flag" + fi + continue + ;; + + -allow-undefined) + # FIXME: remove this flag sometime in the future. + func_fatal_error "\`-allow-undefined' must not be used because it is the default" + ;; + + -avoid-version) + avoid_version=yes + continue + ;; + + -bindir) + prev=bindir + continue + ;; + + -dlopen) + prev=dlfiles + continue + ;; + + -dlpreopen) + prev=dlprefiles + continue + ;; + + -export-dynamic) + export_dynamic=yes + continue + ;; + + -export-symbols | -export-symbols-regex) + if test -n "$export_symbols" || test -n "$export_symbols_regex"; then + func_fatal_error "more than one -exported-symbols argument is not allowed" + fi + if test "X$arg" = "X-export-symbols"; then + prev=expsyms + else + prev=expsyms_regex + fi + continue + ;; + + -framework) + prev=framework + continue + ;; + + -inst-prefix-dir) + prev=inst_prefix + continue + ;; + + # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* + # so, if we see these flags be careful not to treat them like -L + -L[A-Z][A-Z]*:*) + case $with_gcc/$host in + no/*-*-irix* | /*-*-irix*) + func_append compile_command " $arg" + func_append finalize_command " $arg" + ;; + esac + continue + ;; + + -L*) + func_stripname "-L" '' "$arg" + if test -z "$func_stripname_result"; then + if test "$#" -gt 0; then + func_fatal_error "require no space between \`-L' and \`$1'" + else + func_fatal_error "need path for \`-L' option" + fi + fi + func_resolve_sysroot "$func_stripname_result" + dir=$func_resolve_sysroot_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + absdir=`cd "$dir" && pwd` + test -z "$absdir" && \ + func_fatal_error "cannot determine absolute directory name of \`$dir'" + dir="$absdir" + ;; + esac + case "$deplibs " in + *" -L$dir "* | *" $arg "*) + # Will only happen for absolute or sysroot arguments + ;; + *) + # Preserve sysroot, but never include relative directories + case $dir in + [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; + *) func_append deplibs " -L$dir" ;; + esac + func_append lib_search_path " $dir" + ;; + esac + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$dir:"*) ;; + ::) dllsearchpath=$dir;; + *) func_append dllsearchpath ":$dir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; + *) func_append dllsearchpath ":$testbindir";; + esac + ;; + esac + continue + ;; + + -l*) + if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) + # These systems don't actually have a C or math library (as such) + continue + ;; + *-*-os2*) + # These systems don't actually have a C library (as such) + test "X$arg" = "X-lc" && continue + ;; + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + # Do not include libc due to us having libc/libc_r. + test "X$arg" = "X-lc" && continue + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C and math libraries are in the System framework + func_append deplibs " System.ltframework" + continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + test "X$arg" = "X-lc" && continue + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work + test "X$arg" = "X-lc" && continue + ;; + esac + elif test "X$arg" = "X-lc_r"; then + case $host in + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; + esac + fi + func_append deplibs " $arg" + continue + ;; + + -module) + module=yes + continue + ;; + + # Tru64 UNIX uses -model [arg] to determine the layout of C++ + # classes, name mangling, and exception handling. + # Darwin uses the -arch flag to determine output architecture. + -model|-arch|-isysroot|--sysroot) + func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + prev=xcompiler + continue + ;; + + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) + func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case "$new_inherited_linker_flags " in + *" $arg "*) ;; + * ) func_append new_inherited_linker_flags " $arg" ;; + esac + continue + ;; + + -multi_module) + single_module="${wl}-multi_module" + continue + ;; + + -no-fast-install) + fast_install=no + continue + ;; + + -no-install) + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) + # The PATH hackery in wrapper scripts is required on Windows + # and Darwin in order for the loader to find any dlls it needs. + func_warning "\`-no-install' is ignored for $host" + func_warning "assuming \`-no-fast-install' instead" + fast_install=no + ;; + *) no_install=yes ;; + esac + continue + ;; + + -no-undefined) + allow_undefined=no + continue + ;; + + -objectlist) + prev=objectlist + continue + ;; + + -o) prev=output ;; + + -precious-files-regex) + prev=precious_regex + continue + ;; + + -release) + prev=release + continue + ;; + + -rpath) + prev=rpath + continue + ;; + + -R) + prev=xrpath + continue + ;; + + -R*) + func_stripname '-R' '' "$arg" + dir=$func_stripname_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + =*) + func_stripname '=' '' "$dir" + dir=$lt_sysroot$func_stripname_result + ;; + *) + func_fatal_error "only absolute run-paths are allowed" + ;; + esac + case "$xrpath " in + *" $dir "*) ;; + *) func_append xrpath " $dir" ;; + esac + continue + ;; + + -shared) + # The effects of -shared are defined in a previous loop. + continue + ;; + + -shrext) + prev=shrext + continue + ;; + + -static | -static-libtool-libs) + # The effects of -static are defined in a previous loop. + # We used to do the same as -all-static on platforms that + # didn't have a PIC flag, but the assumption that the effects + # would be equivalent was wrong. It would break on at least + # Digital Unix and AIX. + continue + ;; + + -thread-safe) + thread_safe=yes + continue + ;; + + -version-info) + prev=vinfo + continue + ;; + + -version-number) + prev=vinfo + vinfo_number=yes + continue + ;; + + -weak) + prev=weak + continue + ;; + + -Wc,*) + func_stripname '-Wc,' '' "$arg" + args=$func_stripname_result + arg= + save_ifs="$IFS"; IFS=',' + for flag in $args; do + IFS="$save_ifs" + func_quote_for_eval "$flag" + func_append arg " $func_quote_for_eval_result" + func_append compiler_flags " $func_quote_for_eval_result" + done + IFS="$save_ifs" + func_stripname ' ' '' "$arg" + arg=$func_stripname_result + ;; + + -Wl,*) + func_stripname '-Wl,' '' "$arg" + args=$func_stripname_result + arg= + save_ifs="$IFS"; IFS=',' + for flag in $args; do + IFS="$save_ifs" + func_quote_for_eval "$flag" + func_append arg " $wl$func_quote_for_eval_result" + func_append compiler_flags " $wl$func_quote_for_eval_result" + func_append linker_flags " $func_quote_for_eval_result" + done + IFS="$save_ifs" + func_stripname ' ' '' "$arg" + arg=$func_stripname_result + ;; + + -Xcompiler) + prev=xcompiler + continue + ;; + + -Xlinker) + prev=xlinker + continue + ;; + + -XCClinker) + prev=xcclinker + continue + ;; + + # -msg_* for osf cc + -msg_*) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + ;; + + # Flags to be passed through unchanged, with rationale: + # -64, -mips[0-9] enable 64-bit mode for the SGI compiler + # -r[0-9][0-9]* specify processor for the SGI compiler + # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler + # +DA*, +DD* enable 64-bit mode for the HP compiler + # -q* compiler args for the IBM compiler + # -m*, -t[45]*, -txscale* architecture-specific flags for GCC + # -F/path path to uninstalled frameworks, gcc on darwin + # -p, -pg, --coverage, -fprofile-* profiling flags for GCC + # @file GCC response files + # -tp=* Portland pgcc target processor selection + # --sysroot=* for sysroot support + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ + -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" + func_append finalize_command " $arg" + func_append compiler_flags " $arg" + continue + ;; + + # Some other compiler flag. + -* | +*) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + ;; + + *.$objext) + # A standard object. + func_append objs " $arg" + ;; + + *.lo) + # A libtool-controlled object. + + # Check to see that this really is a libtool object. + if func_lalib_unsafe_p "$arg"; then + pic_object= + non_pic_object= + + # Read the .lo file + func_source "$arg" + + if test -z "$pic_object" || + test -z "$non_pic_object" || + test "$pic_object" = none && + test "$non_pic_object" = none; then + func_fatal_error "cannot find name of object for \`$arg'" + fi + + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" + + if test "$pic_object" != none; then + # Prepend the subdirectory the object is found in. + pic_object="$xdir$pic_object" + + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + func_append dlfiles " $pic_object" + prev= + continue + else + # If libtool objects are unsupported, then we need to preload. + prev=dlprefiles + fi + fi + + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. + func_append dlprefiles " $pic_object" + prev= + fi + + # A PIC object. + func_append libobjs " $pic_object" + arg="$pic_object" + fi + + # Non-PIC object. + if test "$non_pic_object" != none; then + # Prepend the subdirectory the object is found in. + non_pic_object="$xdir$non_pic_object" + + # A standard non-PIC object + func_append non_pic_objects " $non_pic_object" + if test -z "$pic_object" || test "$pic_object" = none ; then + arg="$non_pic_object" + fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + func_append non_pic_objects " $non_pic_object" + fi + else + # Only an error if not doing a dry-run. + if $opt_dry_run; then + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" + + func_lo2o "$arg" + pic_object=$xdir$objdir/$func_lo2o_result + non_pic_object=$xdir$func_lo2o_result + func_append libobjs " $pic_object" + func_append non_pic_objects " $non_pic_object" + else + func_fatal_error "\`$arg' is not a valid libtool object" + fi + fi + ;; + + *.$libext) + # An archive. + func_append deplibs " $arg" + func_append old_deplibs " $arg" + continue + ;; + + *.la) + # A libtool-controlled library. + + func_resolve_sysroot "$arg" + if test "$prev" = dlfiles; then + # This library was specified with -dlopen. + func_append dlfiles " $func_resolve_sysroot_result" + prev= + elif test "$prev" = dlprefiles; then + # The library was specified with -dlpreopen. + func_append dlprefiles " $func_resolve_sysroot_result" + prev= + else + func_append deplibs " $func_resolve_sysroot_result" + fi + continue + ;; + + # Some other compiler argument. + *) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + ;; + esac # arg + + # Now actually substitute the argument into the commands. + if test -n "$arg"; then + func_append compile_command " $arg" + func_append finalize_command " $arg" + fi + done # argument parsing loop + + test -n "$prev" && \ + func_fatal_help "the \`$prevarg' option requires an argument" + + if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then + eval arg=\"$export_dynamic_flag_spec\" + func_append compile_command " $arg" + func_append finalize_command " $arg" + fi + + oldlibs= + # calculate the name of the file, without its directory + func_basename "$output" + outputname="$func_basename_result" + libobjs_save="$libobjs" + + if test -n "$shlibpath_var"; then + # get the directories listed in $shlibpath_var + eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` + else + shlib_search_path= + fi + eval sys_lib_search_path=\"$sys_lib_search_path_spec\" + eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + + func_dirname "$output" "/" "" + output_objdir="$func_dirname_result$objdir" + func_to_tool_file "$output_objdir/" + tool_output_objdir=$func_to_tool_file_result + # Create the object directory. + func_mkdir_p "$output_objdir" + + # Determine the type of output + case $output in + "") + func_fatal_help "you must specify an output file" + ;; + *.$libext) linkmode=oldlib ;; + *.lo | *.$objext) linkmode=obj ;; + *.la) linkmode=lib ;; + *) linkmode=prog ;; # Anything else should be a program. + esac + + specialdeplibs= + + libs= + # Find all interdependent deplibs by searching for libraries + # that are linked more than once (e.g. -la -lb -la) + for deplib in $deplibs; do + if $opt_preserve_dup_deps ; then + case "$libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append libs " $deplib" + done + + if test "$linkmode" = lib; then + libs="$predeps $libs $compiler_lib_search_path $postdeps" + + # Compute libraries that are listed more than once in $predeps + # $postdeps and mark them as special (i.e., whose duplicates are + # not to be eliminated). + pre_post_deps= + if $opt_duplicate_compiler_generated_deps; then + for pre_post_dep in $predeps $postdeps; do + case "$pre_post_deps " in + *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; + esac + func_append pre_post_deps " $pre_post_dep" + done + fi + pre_post_deps= + fi + + deplibs= + newdependency_libs= + newlib_search_path= + need_relink=no # whether we're linking any uninstalled libtool libraries + notinst_deplibs= # not-installed libtool libraries + notinst_path= # paths that contain not-installed libtool libraries + + case $linkmode in + lib) + passes="conv dlpreopen link" + for file in $dlfiles $dlprefiles; do + case $file in + *.la) ;; + *) + func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" + ;; + esac + done + ;; + prog) + compile_deplibs= + finalize_deplibs= + alldeplibs=no + newdlfiles= + newdlprefiles= + passes="conv scan dlopen dlpreopen link" + ;; + *) passes="conv" + ;; + esac + + for pass in $passes; do + # The preopen pass in lib mode reverses $deplibs; put it back here + # so that -L comes before libs that need it for instance... + if test "$linkmode,$pass" = "lib,link"; then + ## FIXME: Find the place where the list is rebuilt in the wrong + ## order, and fix it there properly + tmp_deplibs= + for deplib in $deplibs; do + tmp_deplibs="$deplib $tmp_deplibs" + done + deplibs="$tmp_deplibs" + fi + + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan"; then + libs="$deplibs" + deplibs= + fi + if test "$linkmode" = prog; then + case $pass in + dlopen) libs="$dlfiles" ;; + dlpreopen) libs="$dlprefiles" ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" + ;; + esac + fi + if test "$linkmode,$pass" = "lib,dlpreopen"; then + # Collect and forward deplibs of preopened libtool libs + for lib in $dlprefiles; do + # Ignore non-libtool-libs + dependency_libs= + func_resolve_sysroot "$lib" + case $lib in + *.la) func_source "$func_resolve_sysroot_result" ;; + esac + + # Collect preopened libtool deplibs, except any this library + # has declared as weak libs + for deplib in $dependency_libs; do + func_basename "$deplib" + deplib_base=$func_basename_result + case " $weak_libs " in + *" $deplib_base "*) ;; + *) func_append deplibs " $deplib" ;; + esac + done + done + libs="$dlprefiles" + fi + if test "$pass" = dlopen; then + # Collect dlpreopened libraries + save_deplibs="$deplibs" + deplibs= + fi + + for deplib in $libs; do + lib= + found=no + case $deplib in + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + func_append compiler_flags " $deplib" + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; + * ) func_append new_inherited_linker_flags " $deplib" ;; + esac + fi + fi + continue + ;; + -l*) + if test "$linkmode" != lib && test "$linkmode" != prog; then + func_warning "\`-l' is ignored for archives/objects" + continue + fi + func_stripname '-l' '' "$deplib" + name=$func_stripname_result + if test "$linkmode" = lib; then + searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" + else + searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" + fi + for searchdir in $searchdirs; do + for search_ext in .la $std_shrext .so .a; do + # Search the libtool library + lib="$searchdir/lib${name}${search_ext}" + if test -f "$lib"; then + if test "$search_ext" = ".la"; then + found=yes + else + found=no + fi + break 2 + fi + done + done + if test "$found" != yes; then + # deplib doesn't seem to be a libtool library + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + fi + continue + else # deplib is a libtool library + # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, + # We need to do some special things here, and not later. + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $deplib "*) + if func_lalib_p "$lib"; then + library_names= + old_library= + func_source "$lib" + for l in $old_library $library_names; do + ll="$l" + done + if test "X$ll" = "X$old_library" ; then # only static version available + found=no + func_dirname "$lib" "" "." + ladir="$func_dirname_result" + lib=$ladir/$old_library + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + fi + continue + fi + fi + ;; + *) ;; + esac + fi + fi + ;; # -l + *.ltframework) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; + * ) func_append new_inherited_linker_flags " $deplib" ;; + esac + fi + fi + continue + ;; + -L*) + case $linkmode in + lib) + deplibs="$deplib $deplibs" + test "$pass" = conv && continue + newdependency_libs="$deplib $newdependency_libs" + func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + prog) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + continue + fi + if test "$pass" = scan; then + deplibs="$deplib $deplibs" + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi + func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + *) + func_warning "\`-L' is ignored for archives/objects" + ;; + esac # linkmode + continue + ;; # -L + -R*) + if test "$pass" = link; then + func_stripname '-R' '' "$deplib" + func_resolve_sysroot "$func_stripname_result" + dir=$func_resolve_sysroot_result + # Make sure the xrpath contains only unique directories. + case "$xrpath " in + *" $dir "*) ;; + *) func_append xrpath " $dir" ;; + esac + fi + deplibs="$deplib $deplibs" + continue + ;; + *.la) + func_resolve_sysroot "$deplib" + lib=$func_resolve_sysroot_result + ;; + *.$libext) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + continue + fi + case $linkmode in + lib) + # Linking convenience modules into shared libraries is allowed, + # but linking other static libraries is non-portable. + case " $dlpreconveniencelibs " in + *" $deplib "*) ;; + *) + valid_a_lib=no + case $deplibs_check_method in + match_pattern*) + set dummy $deplibs_check_method; shift + match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` + if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ + | $EGREP "$match_pattern_regex" > /dev/null; then + valid_a_lib=yes + fi + ;; + pass_all) + valid_a_lib=yes + ;; + esac + if test "$valid_a_lib" != yes; then + echo + $ECHO "*** Warning: Trying to link with static lib archive $deplib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because the file extensions .$libext of this argument makes me believe" + echo "*** that it is just a static archive that I should not use here." + else + echo + $ECHO "*** Warning: Linking the shared library $output against the" + $ECHO "*** static library $deplib is not portable!" + deplibs="$deplib $deplibs" + fi + ;; + esac + continue + ;; + prog) + if test "$pass" != link; then + deplibs="$deplib $deplibs" + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi + continue + ;; + esac # linkmode + ;; # *.$libext + *.lo | *.$objext) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + elif test "$linkmode" = prog; then + if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + # If there is no dlopen support or we're linking statically, + # we need to preload. + func_append newdlprefiles " $deplib" + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + func_append newdlfiles " $deplib" + fi + fi + continue + ;; + %DEPLIBS%) + alldeplibs=yes + continue + ;; + esac # case $deplib + + if test "$found" = yes || test -f "$lib"; then : + else + func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" + fi + + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$lib" \ + || func_fatal_error "\`$lib' is not a valid libtool archive" + + func_dirname "$lib" "" "." + ladir="$func_dirname_result" + + dlname= + dlopen= + dlpreopen= + libdir= + library_names= + old_library= + inherited_linker_flags= + # If the library was installed with an old release of libtool, + # it will not redefine variables installed, or shouldnotlink + installed=yes + shouldnotlink=no + avoidtemprpath= + + + # Read the .la file + func_source "$lib" + + # Convert "-framework foo" to "foo.ltframework" + if test -n "$inherited_linker_flags"; then + tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` + for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do + case " $new_inherited_linker_flags " in + *" $tmp_inherited_linker_flag "*) ;; + *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; + esac + done + fi + dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan" || + { test "$linkmode" != prog && test "$linkmode" != lib; }; then + test -n "$dlopen" && func_append dlfiles " $dlopen" + test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" + fi + + if test "$pass" = conv; then + # Only check for convenience libraries + deplibs="$lib $deplibs" + if test -z "$libdir"; then + if test -z "$old_library"; then + func_fatal_error "cannot find name of link library for \`$lib'" + fi + # It is a libtool convenience library, so add in its objects. + func_append convenience " $ladir/$objdir/$old_library" + func_append old_convenience " $ladir/$objdir/$old_library" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps ; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done + elif test "$linkmode" != prog && test "$linkmode" != lib; then + func_fatal_error "\`$lib' is not a convenience library" + fi + continue + fi # $pass = conv + + + # Get the name of the library we link against. + linklib= + if test -n "$old_library" && + { test "$prefer_static_libs" = yes || + test "$prefer_static_libs,$installed" = "built,no"; }; then + linklib=$old_library + else + for l in $old_library $library_names; do + linklib="$l" + done + fi + if test -z "$linklib"; then + func_fatal_error "cannot find name of link library for \`$lib'" + fi + + # This library was specified with -dlopen. + if test "$pass" = dlopen; then + if test -z "$libdir"; then + func_fatal_error "cannot -dlopen a convenience library: \`$lib'" + fi + if test -z "$dlname" || + test "$dlopen_support" != yes || + test "$build_libtool_libs" = no; then + # If there is no dlname, no dlopen support or we're linking + # statically, we need to preload. We also need to preload any + # dependent libraries so libltdl's deplib preloader doesn't + # bomb out in the load deplibs phase. + func_append dlprefiles " $lib $dependency_libs" + else + func_append newdlfiles " $lib" + fi + continue + fi # $pass = dlopen + + # We need an absolute path. + case $ladir in + [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; + *) + abs_ladir=`cd "$ladir" && pwd` + if test -z "$abs_ladir"; then + func_warning "cannot determine absolute directory name of \`$ladir'" + func_warning "passing it literally to the linker, although it might fail" + abs_ladir="$ladir" + fi + ;; + esac + func_basename "$lib" + laname="$func_basename_result" + + # Find the relevant object directory and library name. + if test "X$installed" = Xyes; then + if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then + func_warning "library \`$lib' was moved." + dir="$ladir" + absdir="$abs_ladir" + libdir="$abs_ladir" + else + dir="$lt_sysroot$libdir" + absdir="$lt_sysroot$libdir" + fi + test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + else + if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then + dir="$ladir" + absdir="$abs_ladir" + # Remove this search path later + func_append notinst_path " $abs_ladir" + else + dir="$ladir/$objdir" + absdir="$abs_ladir/$objdir" + # Remove this search path later + func_append notinst_path " $abs_ladir" + fi + fi # $installed = yes + func_stripname 'lib' '.la' "$laname" + name=$func_stripname_result + + # This library was specified with -dlpreopen. + if test "$pass" = dlpreopen; then + if test -z "$libdir" && test "$linkmode" = prog; then + func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" + fi + case "$host" in + # special handling for platforms with PE-DLLs. + *cygwin* | *mingw* | *cegcc* ) + # Linker will automatically link against shared library if both + # static and shared are present. Therefore, ensure we extract + # symbols from the import library if a shared library is present + # (otherwise, the dlopen module name will be incorrect). We do + # this by putting the import library name into $newdlprefiles. + # We recover the dlopen module name by 'saving' the la file + # name in a special purpose variable, and (later) extracting the + # dlname from the la file. + if test -n "$dlname"; then + func_tr_sh "$dir/$linklib" + eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" + func_append newdlprefiles " $dir/$linklib" + else + func_append newdlprefiles " $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + func_append dlpreconveniencelibs " $dir/$old_library" + fi + ;; + * ) + # Prefer using a static library (so that no silly _DYNAMIC symbols + # are required to link). + if test -n "$old_library"; then + func_append newdlprefiles " $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + func_append dlpreconveniencelibs " $dir/$old_library" + # Otherwise, use the dlname, so that lt_dlopen finds it. + elif test -n "$dlname"; then + func_append newdlprefiles " $dir/$dlname" + else + func_append newdlprefiles " $dir/$linklib" + fi + ;; + esac + fi # $pass = dlpreopen + + if test -z "$libdir"; then + # Link the convenience library + if test "$linkmode" = lib; then + deplibs="$dir/$old_library $deplibs" + elif test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$dir/$old_library $compile_deplibs" + finalize_deplibs="$dir/$old_library $finalize_deplibs" + else + deplibs="$lib $deplibs" # used for prog,scan pass + fi + continue + fi + + + if test "$linkmode" = prog && test "$pass" != link; then + func_append newlib_search_path " $ladir" + deplibs="$lib $deplibs" + + linkalldeplibs=no + if test "$link_all_deplibs" != no || test -z "$library_names" || + test "$build_libtool_libs" = no; then + linkalldeplibs=yes + fi + + tmp_libs= + for deplib in $dependency_libs; do + case $deplib in + -L*) func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + esac + # Need to link against all dependency_libs? + if test "$linkalldeplibs" = yes; then + deplibs="$deplib $deplibs" + else + # Need to hardcode shared library paths + # or/and link against static libraries + newdependency_libs="$deplib $newdependency_libs" + fi + if $opt_preserve_dup_deps ; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done # for deplib + continue + fi # $linkmode = prog... + + if test "$linkmode,$pass" = "prog,link"; then + if test -n "$library_names" && + { { test "$prefer_static_libs" = no || + test "$prefer_static_libs,$installed" = "built,yes"; } || + test -z "$old_library"; }; then + # We need to hardcode the library path + if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + # Make sure the rpath contains only unique directories. + case "$temp_rpath:" in + *"$absdir:"*) ;; + *) func_append temp_rpath "$absdir:" ;; + esac + fi + + # Hardcode the library path. + # Skip directories that are in the system default run-time + # search path. + case " $sys_lib_dlsearch_path " in + *" $absdir "*) ;; + *) + case "$compile_rpath " in + *" $absdir "*) ;; + *) func_append compile_rpath " $absdir" ;; + esac + ;; + esac + case " $sys_lib_dlsearch_path " in + *" $libdir "*) ;; + *) + case "$finalize_rpath " in + *" $libdir "*) ;; + *) func_append finalize_rpath " $libdir" ;; + esac + ;; + esac + fi # $linkmode,$pass = prog,link... + + if test "$alldeplibs" = yes && + { test "$deplibs_check_method" = pass_all || + { test "$build_libtool_libs" = yes && + test -n "$library_names"; }; }; then + # We only need to search for static libraries + continue + fi + fi + + link_static=no # Whether the deplib will be linked statically + use_static_libs=$prefer_static_libs + if test "$use_static_libs" = built && test "$installed" = yes; then + use_static_libs=no + fi + if test -n "$library_names" && + { test "$use_static_libs" = no || test -z "$old_library"; }; then + case $host in + *cygwin* | *mingw* | *cegcc*) + # No point in relinking DLLs because paths are not encoded + func_append notinst_deplibs " $lib" + need_relink=no + ;; + *) + if test "$installed" = no; then + func_append notinst_deplibs " $lib" + need_relink=yes + fi + ;; + esac + # This is a shared library + + # Warn about portability, can't link against -module's on some + # systems (darwin). Don't bleat about dlopened modules though! + dlopenmodule="" + for dlpremoduletest in $dlprefiles; do + if test "X$dlpremoduletest" = "X$lib"; then + dlopenmodule="$dlpremoduletest" + break + fi + done + if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then + echo + if test "$linkmode" = prog; then + $ECHO "*** Warning: Linking the executable $output against the loadable module" + else + $ECHO "*** Warning: Linking the shared library $output against the loadable module" + fi + $ECHO "*** $linklib is not portable!" + fi + if test "$linkmode" = lib && + test "$hardcode_into_libs" = yes; then + # Hardcode the library path. + # Skip directories that are in the system default run-time + # search path. + case " $sys_lib_dlsearch_path " in + *" $absdir "*) ;; + *) + case "$compile_rpath " in + *" $absdir "*) ;; + *) func_append compile_rpath " $absdir" ;; + esac + ;; + esac + case " $sys_lib_dlsearch_path " in + *" $libdir "*) ;; + *) + case "$finalize_rpath " in + *" $libdir "*) ;; + *) func_append finalize_rpath " $libdir" ;; + esac + ;; + esac + fi + + if test -n "$old_archive_from_expsyms_cmds"; then + # figure out the soname + set dummy $library_names + shift + realname="$1" + shift + libname=`eval "\\$ECHO \"$libname_spec\""` + # use dlname if we got it. it's perfectly good, no? + if test -n "$dlname"; then + soname="$dlname" + elif test -n "$soname_spec"; then + # bleh windows + case $host in + *cygwin* | mingw* | *cegcc*) + func_arith $current - $age + major=$func_arith_result + versuffix="-$major" + ;; + esac + eval soname=\"$soname_spec\" + else + soname="$realname" + fi + + # Make a new name for the extract_expsyms_cmds to use + soroot="$soname" + func_basename "$soroot" + soname="$func_basename_result" + func_stripname 'lib' '.dll' "$soname" + newlib=libimp-$func_stripname_result.a + + # If the library has no export list, then create one now + if test -f "$output_objdir/$soname-def"; then : + else + func_verbose "extracting exported symbol list from \`$soname'" + func_execute_cmds "$extract_expsyms_cmds" 'exit $?' + fi + + # Create $newlib + if test -f "$output_objdir/$newlib"; then :; else + func_verbose "generating import library for \`$soname'" + func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' + fi + # make sure the library variables are pointing to the new library + dir=$output_objdir + linklib=$newlib + fi # test -n "$old_archive_from_expsyms_cmds" + + if test "$linkmode" = prog || test "$opt_mode" != relink; then + add_shlibpath= + add_dir= + add= + lib_linked=yes + case $hardcode_action in + immediate | unsupported) + if test "$hardcode_direct" = no; then + add="$dir/$linklib" + case $host in + *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; + *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ + *-*-unixware7*) add_dir="-L$dir" ;; + *-*-darwin* ) + # if the lib is a (non-dlopened) module then we can not + # link against it, someone is ignoring the earlier warnings + if /usr/bin/file -L $add 2> /dev/null | + $GREP ": [^:]* bundle" >/dev/null ; then + if test "X$dlopenmodule" != "X$lib"; then + $ECHO "*** Warning: lib $linklib is a module, not a shared library" + if test -z "$old_library" ; then + echo + echo "*** And there doesn't seem to be a static archive available" + echo "*** The link will probably fail, sorry" + else + add="$dir/$old_library" + fi + elif test -n "$old_library"; then + add="$dir/$old_library" + fi + fi + esac + elif test "$hardcode_minus_L" = no; then + case $host in + *-*-sunos*) add_shlibpath="$dir" ;; + esac + add_dir="-L$dir" + add="-l$name" + elif test "$hardcode_shlibpath_var" = no; then + add_shlibpath="$dir" + add="-l$name" + else + lib_linked=no + fi + ;; + relink) + if test "$hardcode_direct" = yes && + test "$hardcode_direct_absolute" = no; then + add="$dir/$linklib" + elif test "$hardcode_minus_L" = yes; then + add_dir="-L$absdir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) + func_append add_dir " -L$inst_prefix_dir$libdir" + ;; + esac + fi + add="-l$name" + elif test "$hardcode_shlibpath_var" = yes; then + add_shlibpath="$dir" + add="-l$name" + else + lib_linked=no + fi + ;; + *) lib_linked=no ;; + esac + + if test "$lib_linked" != yes; then + func_fatal_configuration "unsupported hardcode properties" + fi + + if test -n "$add_shlibpath"; then + case :$compile_shlibpath: in + *":$add_shlibpath:"*) ;; + *) func_append compile_shlibpath "$add_shlibpath:" ;; + esac + fi + if test "$linkmode" = prog; then + test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" + test -n "$add" && compile_deplibs="$add $compile_deplibs" + else + test -n "$add_dir" && deplibs="$add_dir $deplibs" + test -n "$add" && deplibs="$add $deplibs" + if test "$hardcode_direct" != yes && + test "$hardcode_minus_L" != yes && + test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; + *) func_append finalize_shlibpath "$libdir:" ;; + esac + fi + fi + fi + + if test "$linkmode" = prog || test "$opt_mode" = relink; then + add_shlibpath= + add_dir= + add= + # Finalize command for both is simple: just hardcode it. + if test "$hardcode_direct" = yes && + test "$hardcode_direct_absolute" = no; then + add="$libdir/$linklib" + elif test "$hardcode_minus_L" = yes; then + add_dir="-L$libdir" + add="-l$name" + elif test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; + *) func_append finalize_shlibpath "$libdir:" ;; + esac + add="-l$name" + elif test "$hardcode_automatic" = yes; then + if test -n "$inst_prefix_dir" && + test -f "$inst_prefix_dir$libdir/$linklib" ; then + add="$inst_prefix_dir$libdir/$linklib" + else + add="$libdir/$linklib" + fi + else + # We cannot seem to hardcode it, guess we'll fake it. + add_dir="-L$libdir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) + func_append add_dir " -L$inst_prefix_dir$libdir" + ;; + esac + fi + add="-l$name" + fi + + if test "$linkmode" = prog; then + test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" + test -n "$add" && finalize_deplibs="$add $finalize_deplibs" + else + test -n "$add_dir" && deplibs="$add_dir $deplibs" + test -n "$add" && deplibs="$add $deplibs" + fi + fi + elif test "$linkmode" = prog; then + # Here we assume that one of hardcode_direct or hardcode_minus_L + # is not unsupported. This is valid on all known static and + # shared platforms. + if test "$hardcode_direct" != unsupported; then + test -n "$old_library" && linklib="$old_library" + compile_deplibs="$dir/$linklib $compile_deplibs" + finalize_deplibs="$dir/$linklib $finalize_deplibs" + else + compile_deplibs="-l$name -L$dir $compile_deplibs" + finalize_deplibs="-l$name -L$dir $finalize_deplibs" + fi + elif test "$build_libtool_libs" = yes; then + # Not a shared library + if test "$deplibs_check_method" != pass_all; then + # We're trying link a shared library against a static one + # but the system doesn't support it. + + # Just print a warning and add the library to dependency_libs so + # that the program can be linked against the static library. + echo + $ECHO "*** Warning: This system can not link to static lib archive $lib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have." + if test "$module" = yes; then + echo "*** But as you try to build a module library, libtool will still create " + echo "*** a static module, that should work as long as the dlopening application" + echo "*** is linked with the -dlopen flag to resolve symbols at runtime." + if test -z "$global_symbol_pipe"; then + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** \`nm' from GNU binutils and a full rebuild may help." + fi + if test "$build_old_libs" = no; then + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + fi + else + deplibs="$dir/$old_library $deplibs" + link_static=yes + fi + fi # link shared/static library? + + if test "$linkmode" = lib; then + if test -n "$dependency_libs" && + { test "$hardcode_into_libs" != yes || + test "$build_old_libs" = yes || + test "$link_static" = yes; }; then + # Extract -R from dependency_libs + temp_deplibs= + for libdir in $dependency_libs; do + case $libdir in + -R*) func_stripname '-R' '' "$libdir" + temp_xrpath=$func_stripname_result + case " $xrpath " in + *" $temp_xrpath "*) ;; + *) func_append xrpath " $temp_xrpath";; + esac;; + *) func_append temp_deplibs " $libdir";; + esac + done + dependency_libs="$temp_deplibs" + fi + + func_append newlib_search_path " $absdir" + # Link against this library + test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + # ... and its dependency_libs + tmp_libs= + for deplib in $dependency_libs; do + newdependency_libs="$deplib $newdependency_libs" + case $deplib in + -L*) func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result";; + *) func_resolve_sysroot "$deplib" ;; + esac + if $opt_preserve_dup_deps ; then + case "$tmp_libs " in + *" $func_resolve_sysroot_result "*) + func_append specialdeplibs " $func_resolve_sysroot_result" ;; + esac + fi + func_append tmp_libs " $func_resolve_sysroot_result" + done + + if test "$link_all_deplibs" != no; then + # Add the search paths of all dependency libraries + for deplib in $dependency_libs; do + path= + case $deplib in + -L*) path="$deplib" ;; + *.la) + func_resolve_sysroot "$deplib" + deplib=$func_resolve_sysroot_result + func_dirname "$deplib" "" "." + dir=$func_dirname_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; + *) + absdir=`cd "$dir" && pwd` + if test -z "$absdir"; then + func_warning "cannot determine absolute directory name of \`$dir'" + absdir="$dir" + fi + ;; + esac + if $GREP "^installed=no" $deplib > /dev/null; then + case $host in + *-*-darwin*) + depdepl= + eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do + depdepl=$tmp + done + if test -f "$absdir/$objdir/$depdepl" ; then + depdepl="$absdir/$objdir/$depdepl" + darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + if test -z "$darwin_install_name"; then + darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + fi + func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" + func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" + path= + fi + fi + ;; + *) + path="-L$absdir/$objdir" + ;; + esac + else + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + test -z "$libdir" && \ + func_fatal_error "\`$deplib' is not a valid libtool archive" + test "$absdir" != "$libdir" && \ + func_warning "\`$deplib' seems to be moved" + + path="-L$absdir" + fi + ;; + esac + case " $deplibs " in + *" $path "*) ;; + *) deplibs="$path $deplibs" ;; + esac + done + fi # link_all_deplibs != no + fi # linkmode = lib + done # for deplib in $libs + if test "$pass" = link; then + if test "$linkmode" = "prog"; then + compile_deplibs="$new_inherited_linker_flags $compile_deplibs" + finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" + else + compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + fi + fi + dependency_libs="$newdependency_libs" + if test "$pass" = dlpreopen; then + # Link the dlpreopened libraries before other libraries + for deplib in $save_deplibs; do + deplibs="$deplib $deplibs" + done + fi + if test "$pass" != dlopen; then + if test "$pass" != conv; then + # Make sure lib_search_path contains only unique directories. + lib_search_path= + for dir in $newlib_search_path; do + case "$lib_search_path " in + *" $dir "*) ;; + *) func_append lib_search_path " $dir" ;; + esac + done + newlib_search_path= + fi + + if test "$linkmode,$pass" != "prog,link"; then + vars="deplibs" + else + vars="compile_deplibs finalize_deplibs" + fi + for var in $vars dependency_libs; do + # Add libraries to $var in reverse order + eval tmp_libs=\"\$$var\" + new_libs= + for deplib in $tmp_libs; do + # FIXME: Pedantically, this is the right thing to do, so + # that some nasty dependency loop isn't accidentally + # broken: + #new_libs="$deplib $new_libs" + # Pragmatically, this seems to cause very few problems in + # practice: + case $deplib in + -L*) new_libs="$deplib $new_libs" ;; + -R*) ;; + *) + # And here is the reason: when a library appears more + # than once as an explicit dependence of a library, or + # is implicitly linked in more than once by the + # compiler, it is considered special, and multiple + # occurrences thereof are not removed. Compare this + # with having the same library being listed as a + # dependency of multiple other libraries: in this case, + # we know (pedantically, we assume) the library does not + # need to be listed more than once, so we keep only the + # last copy. This is not always right, but it is rare + # enough that we require users that really mean to play + # such unportable linking tricks to link the library + # using -Wl,-lname, so that libtool does not consider it + # for duplicate removal. + case " $specialdeplibs " in + *" $deplib "*) new_libs="$deplib $new_libs" ;; + *) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$deplib $new_libs" ;; + esac + ;; + esac + ;; + esac + done + tmp_libs= + for deplib in $new_libs; do + case $deplib in + -L*) + case " $tmp_libs " in + *" $deplib "*) ;; + *) func_append tmp_libs " $deplib" ;; + esac + ;; + *) func_append tmp_libs " $deplib" ;; + esac + done + eval $var=\"$tmp_libs\" + done # for var + fi + # Last step: remove runtime libs from dependency_libs + # (they stay in deplibs) + tmp_libs= + for i in $dependency_libs ; do + case " $predeps $postdeps $compiler_lib_search_path " in + *" $i "*) + i="" + ;; + esac + if test -n "$i" ; then + func_append tmp_libs " $i" + fi + done + dependency_libs=$tmp_libs + done # for pass + if test "$linkmode" = prog; then + dlfiles="$newdlfiles" + fi + if test "$linkmode" = prog || test "$linkmode" = lib; then + dlprefiles="$newdlprefiles" + fi + + case $linkmode in + oldlib) + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + func_warning "\`-dlopen' is ignored for archives" + fi + + case " $deplibs" in + *\ -l* | *\ -L*) + func_warning "\`-l' and \`-L' are ignored for archives" ;; + esac + + test -n "$rpath" && \ + func_warning "\`-rpath' is ignored for archives" + + test -n "$xrpath" && \ + func_warning "\`-R' is ignored for archives" + + test -n "$vinfo" && \ + func_warning "\`-version-info/-version-number' is ignored for archives" + + test -n "$release" && \ + func_warning "\`-release' is ignored for archives" + + test -n "$export_symbols$export_symbols_regex" && \ + func_warning "\`-export-symbols' is ignored for archives" + + # Now set the variables for building old libraries. + build_libtool_libs=no + oldlibs="$output" + func_append objs "$old_deplibs" + ;; + + lib) + # Make sure we only generate libraries of the form `libNAME.la'. + case $outputname in + lib*) + func_stripname 'lib' '.la' "$outputname" + name=$func_stripname_result + eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + ;; + *) + test "$module" = no && \ + func_fatal_help "libtool library \`$output' must begin with \`lib'" + + if test "$need_lib_prefix" != no; then + # Add the "lib" prefix for modules if required + func_stripname '' '.la' "$outputname" + name=$func_stripname_result + eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + else + func_stripname '' '.la' "$outputname" + libname=$func_stripname_result + fi + ;; + esac + + if test -n "$objs"; then + if test "$deplibs_check_method" != pass_all; then + func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" + else + echo + $ECHO "*** Warning: Linking the shared library $output against the non-libtool" + $ECHO "*** objects $objs is not portable!" + func_append libobjs " $objs" + fi + fi + + test "$dlself" != no && \ + func_warning "\`-dlopen self' is ignored for libtool libraries" + + set dummy $rpath + shift + test "$#" -gt 1 && \ + func_warning "ignoring multiple \`-rpath's for a libtool library" + + install_libdir="$1" + + oldlibs= + if test -z "$rpath"; then + if test "$build_libtool_libs" = yes; then + # Building a libtool convenience library. + # Some compilers have problems with a `.al' extension so + # convenience libraries should have the same extension an + # archive normally would. + oldlibs="$output_objdir/$libname.$libext $oldlibs" + build_libtool_libs=convenience + build_old_libs=yes + fi + + test -n "$vinfo" && \ + func_warning "\`-version-info/-version-number' is ignored for convenience libraries" + + test -n "$release" && \ + func_warning "\`-release' is ignored for convenience libraries" + else + + # Parse the version information argument. + save_ifs="$IFS"; IFS=':' + set dummy $vinfo 0 0 0 + shift + IFS="$save_ifs" + + test -n "$7" && \ + func_fatal_help "too many parameters to \`-version-info'" + + # convert absolute version numbers to libtool ages + # this retains compatibility with .la files and attempts + # to make the code below a bit more comprehensible + + case $vinfo_number in + yes) + number_major="$1" + number_minor="$2" + number_revision="$3" + # + # There are really only two kinds -- those that + # use the current revision as the major version + # and those that subtract age and use age as + # a minor version. But, then there is irix + # which has an extra 1 added just for fun + # + case $version_type in + # correct linux to gnu/linux during the next big refactor + darwin|linux|osf|windows|none) + func_arith $number_major + $number_minor + current=$func_arith_result + age="$number_minor" + revision="$number_revision" + ;; + freebsd-aout|freebsd-elf|qnx|sunos) + current="$number_major" + revision="$number_minor" + age="0" + ;; + irix|nonstopux) + func_arith $number_major + $number_minor + current=$func_arith_result + age="$number_minor" + revision="$number_minor" + lt_irix_increment=no + ;; + *) + func_fatal_configuration "$modename: unknown library version type \`$version_type'" + ;; + esac + ;; + no) + current="$1" + revision="$2" + age="$3" + ;; + esac + + # Check that each of the things are valid numbers. + case $current in + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) + func_error "CURRENT \`$current' must be a nonnegative integer" + func_fatal_error "\`$vinfo' is not valid version information" + ;; + esac + + case $revision in + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) + func_error "REVISION \`$revision' must be a nonnegative integer" + func_fatal_error "\`$vinfo' is not valid version information" + ;; + esac + + case $age in + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) + func_error "AGE \`$age' must be a nonnegative integer" + func_fatal_error "\`$vinfo' is not valid version information" + ;; + esac + + if test "$age" -gt "$current"; then + func_error "AGE \`$age' is greater than the current interface number \`$current'" + func_fatal_error "\`$vinfo' is not valid version information" + fi + + # Calculate the version variables. + major= + versuffix= + verstring= + case $version_type in + none) ;; + + darwin) + # Like Linux, but with the current version available in + # verstring for coding it into the library header + func_arith $current - $age + major=.$func_arith_result + versuffix="$major.$age.$revision" + # Darwin ld doesn't like 0 for these options... + func_arith $current + 1 + minor_current=$func_arith_result + xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + + freebsd-aout) + major=".$current" + versuffix=".$current.$revision"; + ;; + + freebsd-elf) + major=".$current" + versuffix=".$current" + ;; + + irix | nonstopux) + if test "X$lt_irix_increment" = "Xno"; then + func_arith $current - $age + else + func_arith $current - $age + 1 + fi + major=$func_arith_result + + case $version_type in + nonstopux) verstring_prefix=nonstopux ;; + *) verstring_prefix=sgi ;; + esac + verstring="$verstring_prefix$major.$revision" + + # Add in all the interfaces that we are compatible with. + loop=$revision + while test "$loop" -ne 0; do + func_arith $revision - $loop + iface=$func_arith_result + func_arith $loop - 1 + loop=$func_arith_result + verstring="$verstring_prefix$major.$iface:$verstring" + done + + # Before this point, $major must not contain `.'. + major=.$major + versuffix="$major.$revision" + ;; + + linux) # correct to gnu/linux during the next big refactor + func_arith $current - $age + major=.$func_arith_result + versuffix="$major.$age.$revision" + ;; + + osf) + func_arith $current - $age + major=.$func_arith_result + versuffix=".$current.$age.$revision" + verstring="$current.$age.$revision" + + # Add in all the interfaces that we are compatible with. + loop=$age + while test "$loop" -ne 0; do + func_arith $current - $loop + iface=$func_arith_result + func_arith $loop - 1 + loop=$func_arith_result + verstring="$verstring:${iface}.0" + done + + # Make executables depend on our current version. + func_append verstring ":${current}.0" + ;; + + qnx) + major=".$current" + versuffix=".$current" + ;; + + sunos) + major=".$current" + versuffix=".$current.$revision" + ;; + + windows) + # Use '-' rather than '.', since we only want one + # extension on DOS 8.3 filesystems. + func_arith $current - $age + major=$func_arith_result + versuffix="-$major" + ;; + + *) + func_fatal_configuration "unknown library version type \`$version_type'" + ;; + esac + + # Clear the version info if we defaulted, and they specified a release. + if test -z "$vinfo" && test -n "$release"; then + major= + case $version_type in + darwin) + # we can't check for "0.0" in archive_cmds due to quoting + # problems, so we reset it completely + verstring= + ;; + *) + verstring="0.0" + ;; + esac + if test "$need_version" = no; then + versuffix= + else + versuffix=".0.0" + fi + fi + + # Remove version info from name if versioning should be avoided + if test "$avoid_version" = yes && test "$need_version" = no; then + major= + versuffix= + verstring="" + fi + + # Check to see if the archive will have undefined symbols. + if test "$allow_undefined" = yes; then + if test "$allow_undefined_flag" = unsupported; then + func_warning "undefined symbols not allowed in $host shared libraries" + build_libtool_libs=no + build_old_libs=yes + fi + else + # Don't allow undefined symbols. + allow_undefined_flag="$no_undefined_flag" + fi + + fi + + func_generate_dlsyms "$libname" "$libname" "yes" + func_append libobjs " $symfileobj" + test "X$libobjs" = "X " && libobjs= + + if test "$opt_mode" != relink; then + # Remove our outputs, but don't remove object files since they + # may have been created when compiling PIC objects. + removelist= + tempremovelist=`$ECHO "$output_objdir/*"` + for p in $tempremovelist; do + case $p in + *.$objext | *.gcno) + ;; + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) + if test "X$precious_files_regex" != "X"; then + if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 + then + continue + fi + fi + func_append removelist " $p" + ;; + *) ;; + esac + done + test -n "$removelist" && \ + func_show_eval "${RM}r \$removelist" + fi + + # Now set the variables for building old libraries. + if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then + func_append oldlibs " $output_objdir/$libname.$libext" + + # Transform .lo files to .o files. + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` + fi + + # Eliminate all temporary directories. + #for path in $notinst_path; do + # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` + # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` + # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` + #done + + if test -n "$xrpath"; then + # If the user specified any rpath flags, then add them. + temp_xrpath= + for libdir in $xrpath; do + func_replace_sysroot "$libdir" + func_append temp_xrpath " -R$func_replace_sysroot_result" + case "$finalize_rpath " in + *" $libdir "*) ;; + *) func_append finalize_rpath " $libdir" ;; + esac + done + if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then + dependency_libs="$temp_xrpath $dependency_libs" + fi + fi + + # Make sure dlfiles contains only unique files that won't be dlpreopened + old_dlfiles="$dlfiles" + dlfiles= + for lib in $old_dlfiles; do + case " $dlprefiles $dlfiles " in + *" $lib "*) ;; + *) func_append dlfiles " $lib" ;; + esac + done + + # Make sure dlprefiles contains only unique files + old_dlprefiles="$dlprefiles" + dlprefiles= + for lib in $old_dlprefiles; do + case "$dlprefiles " in + *" $lib "*) ;; + *) func_append dlprefiles " $lib" ;; + esac + done + + if test "$build_libtool_libs" = yes; then + if test -n "$rpath"; then + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) + # these systems don't actually have a c library (as such)! + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C library is in the System framework + func_append deplibs " System.ltframework" + ;; + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + # Do not include libc due to us having libc/libc_r. + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work + ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test "$build_libtool_need_lc" = "yes"; then + func_append deplibs " -lc" + fi + ;; + esac + fi + + # Transform deplibs into only deplibs that can be linked in shared. + name_save=$name + libname_save=$libname + release_save=$release + versuffix_save=$versuffix + major_save=$major + # I'm not sure if I'm treating the release correctly. I think + # release should show up in the -l (ie -lgmp5) so we don't want to + # add it in twice. Is that correct? + release="" + versuffix="" + major="" + newdeplibs= + droppeddeps=no + case $deplibs_check_method in + pass_all) + # Don't check for shared/static. Everything works. + # This might be a little naive. We might want to check + # whether the library exists or not. But this is on + # osf3 & osf4 and I'm not really sure... Just + # implementing what was already the behavior. + newdeplibs=$deplibs + ;; + test_compile) + # This code stresses the "libraries are programs" paradigm to its + # limits. Maybe even breaks it. We compile a program, linking it + # against the deplibs as a proxy for the library. Then we can check + # whether they linked in statically or dynamically with ldd. + $opt_dry_run || $RM conftest.c + cat > conftest.c </dev/null` + $nocaseglob + else + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` + fi + for potent_lib in $potential_libs; do + # Follow soft links. + if ls -lLd "$potent_lib" 2>/dev/null | + $GREP " -> " >/dev/null; then + continue + fi + # The statement above tries to avoid entering an + # endless loop below, in case of cyclic links. + # We might still enter an endless loop, since a link + # loop can be closed while we follow links, + # but so what? + potlib="$potent_lib" + while test -h "$potlib" 2>/dev/null; do + potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` + case $potliblink in + [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; + *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + esac + done + if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | + $SED -e 10q | + $EGREP "$file_magic_regex" > /dev/null; then + func_append newdeplibs " $a_deplib" + a_deplib="" + break 2 + fi + done + done + fi + if test -n "$a_deplib" ; then + droppeddeps=yes + echo + $ECHO "*** Warning: linker path does not have real file for library $a_deplib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because I did check the linker path looking for a file starting" + if test -z "$potlib" ; then + $ECHO "*** with $libname but no candidates were found. (...for file magic test)" + else + $ECHO "*** with $libname and none of the candidates passed a file format test" + $ECHO "*** using a file magic. Last file checked: $potlib" + fi + fi + ;; + *) + # Add a -L argument. + func_append newdeplibs " $a_deplib" + ;; + esac + done # Gone through all deplibs. + ;; + match_pattern*) + set dummy $deplibs_check_method; shift + match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` + for a_deplib in $deplibs; do + case $a_deplib in + -l*) + func_stripname -l '' "$a_deplib" + name=$func_stripname_result + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $a_deplib "*) + func_append newdeplibs " $a_deplib" + a_deplib="" + ;; + esac + fi + if test -n "$a_deplib" ; then + libname=`eval "\\$ECHO \"$libname_spec\""` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do + potential_libs=`ls $i/$libname[.-]* 2>/dev/null` + for potent_lib in $potential_libs; do + potlib="$potent_lib" # see symlink-check above in file_magic test + if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ + $EGREP "$match_pattern_regex" > /dev/null; then + func_append newdeplibs " $a_deplib" + a_deplib="" + break 2 + fi + done + done + fi + if test -n "$a_deplib" ; then + droppeddeps=yes + echo + $ECHO "*** Warning: linker path does not have real file for library $a_deplib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because I did check the linker path looking for a file starting" + if test -z "$potlib" ; then + $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" + else + $ECHO "*** with $libname and none of the candidates passed a file format test" + $ECHO "*** using a regex pattern. Last file checked: $potlib" + fi + fi + ;; + *) + # Add a -L argument. + func_append newdeplibs " $a_deplib" + ;; + esac + done # Gone through all deplibs. + ;; + none | unknown | *) + newdeplibs="" + tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + for i in $predeps $postdeps ; do + # can't use Xsed below, because $i might contain '/' + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` + done + fi + case $tmp_deplibs in + *[!\ \ ]*) + echo + if test "X$deplibs_check_method" = "Xnone"; then + echo "*** Warning: inter-library dependencies are not supported in this platform." + else + echo "*** Warning: inter-library dependencies are not known to be supported." + fi + echo "*** All declared inter-library dependencies are being dropped." + droppeddeps=yes + ;; + esac + ;; + esac + versuffix=$versuffix_save + major=$major_save + release=$release_save + libname=$libname_save + name=$name_save + + case $host in + *-*-rhapsody* | *-*-darwin1.[012]) + # On Rhapsody replace the C library with the System framework + newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` + ;; + esac + + if test "$droppeddeps" = yes; then + if test "$module" = yes; then + echo + echo "*** Warning: libtool could not satisfy all declared inter-library" + $ECHO "*** dependencies of module $libname. Therefore, libtool will create" + echo "*** a static module, that should work as long as the dlopening" + echo "*** application is linked with the -dlopen flag." + if test -z "$global_symbol_pipe"; then + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** \`nm' from GNU binutils and a full rebuild may help." + fi + if test "$build_old_libs" = no; then + oldlibs="$output_objdir/$libname.$libext" + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + else + echo "*** The inter-library dependencies that have been dropped here will be" + echo "*** automatically added whenever a program is linked with this library" + echo "*** or is declared to -dlopen it." + + if test "$allow_undefined" = no; then + echo + echo "*** Since this library must not contain undefined symbols," + echo "*** because either the platform does not support them or" + echo "*** it was explicitly requested with -no-undefined," + echo "*** libtool will only create a static version of it." + if test "$build_old_libs" = no; then + oldlibs="$output_objdir/$libname.$libext" + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + fi + fi + fi + # Done checking deplibs! + deplibs=$newdeplibs + fi + # Time to change all our "foo.ltframework" stuff back to "-framework foo" + case $host in + *-*-darwin*) + newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + ;; + esac + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $deplibs " in + *" -L$path/$objdir "*) + func_append new_libs " -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) func_append new_libs " $deplib" ;; + esac + ;; + *) func_append new_libs " $deplib" ;; + esac + done + deplibs="$new_libs" + + # All the library-specific variables (install_libdir is set above). + library_names= + old_library= + dlname= + + # Test again, we may have decided not to build it any more + if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac + if test "$hardcode_into_libs" = yes; then + # Hardcode the library paths + hardcode_libdirs= + dep_rpath= + rpath="$finalize_rpath" + test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + for libdir in $rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + func_replace_sysroot "$libdir" + libdir=$func_replace_sysroot_result + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else + eval flag=\"$hardcode_libdir_flag_spec\" + func_append dep_rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; + *) func_append perm_rpath " $libdir" ;; + esac + fi + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" + fi + if test -n "$runpath_var" && test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do + func_append rpath "$dir:" + done + eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" + fi + test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" + fi + + shlibpath="$finalize_shlibpath" + test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + if test -n "$shlibpath"; then + eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" + fi + + # Get the real and link names of the library. + eval shared_ext=\"$shrext_cmds\" + eval library_names=\"$library_names_spec\" + set dummy $library_names + shift + realname="$1" + shift + + if test -n "$soname_spec"; then + eval soname=\"$soname_spec\" + else + soname="$realname" + fi + if test -z "$dlname"; then + dlname=$soname + fi + + lib="$output_objdir/$realname" + linknames= + for link + do + func_append linknames " $link" + done + + # Use standard objects if they are pic + test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` + test "X$libobjs" = "X " && libobjs= + + delfiles= + if test -n "$export_symbols" && test -n "$include_expsyms"; then + $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" + export_symbols="$output_objdir/$libname.uexp" + func_append delfiles " $export_symbols" + fi + + orig_export_symbols= + case $host_os in + cygwin* | mingw* | cegcc*) + if test -n "$export_symbols" && test -z "$export_symbols_regex"; then + # exporting using user supplied symfile + if test "x`$SED 1q $export_symbols`" != xEXPORTS; then + # and it's NOT already a .def file. Must figure out + # which of the given symbols are data symbols and tag + # them as such. So, trigger use of export_symbols_cmds. + # export_symbols gets reassigned inside the "prepare + # the list of exported symbols" if statement, so the + # include_expsyms logic still works. + orig_export_symbols="$export_symbols" + export_symbols= + always_export_symbols=yes + fi + fi + ;; + esac + + # Prepare the list of exported symbols + if test -z "$export_symbols"; then + if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then + func_verbose "generating symbol list for \`$libname.la'" + export_symbols="$output_objdir/$libname.exp" + $opt_dry_run || $RM $export_symbols + cmds=$export_symbols_cmds + save_ifs="$IFS"; IFS='~' + for cmd1 in $cmds; do + IFS="$save_ifs" + # Take the normal branch if the nm_file_list_spec branch + # doesn't work or if tool conversion is not needed. + case $nm_file_list_spec~$to_tool_file_cmd in + *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) + try_normal_branch=yes + eval cmd=\"$cmd1\" + func_len " $cmd" + len=$func_len_result + ;; + *) + try_normal_branch=no + ;; + esac + if test "$try_normal_branch" = yes \ + && { test "$len" -lt "$max_cmd_len" \ + || test "$max_cmd_len" -le -1; } + then + func_show_eval "$cmd" 'exit $?' + skipped_export=false + elif test -n "$nm_file_list_spec"; then + func_basename "$output" + output_la=$func_basename_result + save_libobjs=$libobjs + save_output=$output + output=${output_objdir}/${output_la}.nm + func_to_tool_file "$output" + libobjs=$nm_file_list_spec$func_to_tool_file_result + func_append delfiles " $output" + func_verbose "creating $NM input file list: $output" + for obj in $save_libobjs; do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > "$output" + eval cmd=\"$cmd1\" + func_show_eval "$cmd" 'exit $?' + output=$save_output + libobjs=$save_libobjs + skipped_export=false + else + # The command line is too long to execute in one step. + func_verbose "using reloadable object file for export list..." + skipped_export=: + # Break out early, otherwise skipped_export may be + # set to false by a later but shorter cmd. + break + fi + done + IFS="$save_ifs" + if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then + func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' + func_show_eval '$MV "${export_symbols}T" "$export_symbols"' + fi + fi + fi + + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols="$export_symbols" + test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + fi + + if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then + # The given exports_symbols file has to be filtered, so filter it. + func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + # FIXME: $output_objdir/$libname.filter potentially contains lots of + # 's' commands which not all seds can handle. GNU sed should be fine + # though. Also, the filter scales superlinearly with the number of + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter + func_append delfiles " $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi + + tmp_deplibs= + for test_deplib in $deplibs; do + case " $convenience " in + *" $test_deplib "*) ;; + *) + func_append tmp_deplibs " $test_deplib" + ;; + esac + done + deplibs="$tmp_deplibs" + + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec" && + test "$compiler_needs_object" = yes && + test -z "$libobjs"; then + # extract the archives, so we have objects to list. + # TODO: could optimize this to just extract one archive. + whole_archive_flag_spec= + fi + if test -n "$whole_archive_flag_spec"; then + save_libobjs=$libobjs + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + else + gentop="$output_objdir/${outputname}x" + func_append generated " $gentop" + + func_extract_archives $gentop $convenience + func_append libobjs " $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi + fi + + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + eval flag=\"$thread_safe_flag_spec\" + func_append linker_flags " $flag" + fi + + # Make a backup of the uninstalled library when relinking + if test "$opt_mode" = relink; then + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? + fi + + # Do each of the archive commands. + if test "$module" = yes && test -n "$module_cmds" ; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then + eval test_cmds=\"$module_expsym_cmds\" + cmds=$module_expsym_cmds + else + eval test_cmds=\"$module_cmds\" + cmds=$module_cmds + fi + else + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then + eval test_cmds=\"$archive_expsym_cmds\" + cmds=$archive_expsym_cmds + else + eval test_cmds=\"$archive_cmds\" + cmds=$archive_cmds + fi + fi + + if test "X$skipped_export" != "X:" && + func_len " $test_cmds" && + len=$func_len_result && + test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + : + else + # The command line is too long to link in one step, link piecewise + # or, if using GNU ld and skipped_export is not :, use a linker + # script. + + # Save the value of $output and $libobjs because we want to + # use them later. If we have whole_archive_flag_spec, we + # want to use save_libobjs as it was before + # whole_archive_flag_spec was expanded, because we can't + # assume the linker understands whole_archive_flag_spec. + # This may have to be revisited, in case too many + # convenience libraries get linked in and end up exceeding + # the spec. + if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then + save_libobjs=$libobjs + fi + save_output=$output + func_basename "$output" + output_la=$func_basename_result + + # Clear the reloadable object creation command queue and + # initialize k to one. + test_cmds= + concat_cmds= + objlist= + last_robj= + k=1 + + if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then + output=${output_objdir}/${output_la}.lnkscript + func_verbose "creating GNU ld script: $output" + echo 'INPUT (' > $output + for obj in $save_libobjs + do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output + done + echo ')' >> $output + func_append delfiles " $output" + func_to_tool_file "$output" + output=$func_to_tool_file_result + elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then + output=${output_objdir}/${output_la}.lnk + func_verbose "creating linker input file list: $output" + : > $output + set x $save_libobjs + shift + firstobj= + if test "$compiler_needs_object" = yes; then + firstobj="$1 " + shift + fi + for obj + do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output + done + func_append delfiles " $output" + func_to_tool_file "$output" + output=$firstobj\"$file_list_spec$func_to_tool_file_result\" + else + if test -n "$save_libobjs"; then + func_verbose "creating reloadable object files..." + output=$output_objdir/$output_la-${k}.$objext + eval test_cmds=\"$reload_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 + + # Loop over the list of objects to be linked. + for obj in $save_libobjs + do + func_len " $obj" + func_arith $len + $func_len_result + len=$func_arith_result + if test "X$objlist" = X || + test "$len" -lt "$max_cmd_len"; then + func_append objlist " $obj" + else + # The command $test_cmds is almost too long, add a + # command to the queue. + if test "$k" -eq 1 ; then + # The first file doesn't have a previous command to add. + reload_objs=$objlist + eval concat_cmds=\"$reload_cmds\" + else + # All subsequent reloadable object files will link in + # the last one created. + reload_objs="$objlist $last_robj" + eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" + fi + last_robj=$output_objdir/$output_la-${k}.$objext + func_arith $k + 1 + k=$func_arith_result + output=$output_objdir/$output_la-${k}.$objext + objlist=" $obj" + func_len " $last_robj" + func_arith $len0 + $func_len_result + len=$func_arith_result + fi + done + # Handle the remaining objects by creating one last + # reloadable object file. All subsequent reloadable object + # files will link in the last one created. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + reload_objs="$objlist $last_robj" + eval concat_cmds=\"\${concat_cmds}$reload_cmds\" + if test -n "$last_robj"; then + eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + fi + func_append delfiles " $output" + + else + output= + fi + + if ${skipped_export-false}; then + func_verbose "generating symbol list for \`$libname.la'" + export_symbols="$output_objdir/$libname.exp" + $opt_dry_run || $RM $export_symbols + libobjs=$output + # Append the command to create the export file. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" + if test -n "$last_robj"; then + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" + fi + fi + + test -n "$save_libobjs" && + func_verbose "creating a temporary reloadable object file: $output" + + # Loop through the commands generated above and execute them. + save_ifs="$IFS"; IFS='~' + for cmd in $concat_cmds; do + IFS="$save_ifs" + $opt_silent || { + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" + } + $opt_dry_run || eval "$cmd" || { + lt_exit=$? + + # Restore the uninstalled library and exit + if test "$opt_mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) + fi + + exit $lt_exit + } + done + IFS="$save_ifs" + + if test -n "$export_symbols_regex" && ${skipped_export-false}; then + func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' + func_show_eval '$MV "${export_symbols}T" "$export_symbols"' + fi + fi + + if ${skipped_export-false}; then + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols="$export_symbols" + test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + fi + + if test -n "$orig_export_symbols"; then + # The given exports_symbols file has to be filtered, so filter it. + func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + # FIXME: $output_objdir/$libname.filter potentially contains lots of + # 's' commands which not all seds can handle. GNU sed should be fine + # though. Also, the filter scales superlinearly with the number of + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter + func_append delfiles " $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi + fi + + libobjs=$output + # Restore the value of output. + output=$save_output + + if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + fi + # Expand the library linking commands again to reset the + # value of $libobjs for piecewise linking. + + # Do each of the archive commands. + if test "$module" = yes && test -n "$module_cmds" ; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then + cmds=$module_expsym_cmds + else + cmds=$module_cmds + fi + else + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then + cmds=$archive_expsym_cmds + else + cmds=$archive_cmds + fi + fi + fi + + if test -n "$delfiles"; then + # Append the command to remove temporary files to $cmds. + eval cmds=\"\$cmds~\$RM $delfiles\" + fi + + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop="$output_objdir/${outputname}x" + func_append generated " $gentop" + + func_extract_archives $gentop $dlprefiles + func_append libobjs " $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi + + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" + eval cmd=\"$cmd\" + $opt_silent || { + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" + } + $opt_dry_run || eval "$cmd" || { + lt_exit=$? + + # Restore the uninstalled library and exit + if test "$opt_mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) + fi + + exit $lt_exit + } + done + IFS="$save_ifs" + + # Restore the uninstalled library and exit + if test "$opt_mode" = relink; then + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? + + if test -n "$convenience"; then + if test -z "$whole_archive_flag_spec"; then + func_show_eval '${RM}r "$gentop"' + fi + fi + + exit $EXIT_SUCCESS + fi + + # Create links to the real library. + for linkname in $linknames; do + if test "$realname" != "$linkname"; then + func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' + fi + done + + # If -module or -export-dynamic was specified, set the dlname. + if test "$module" = yes || test "$export_dynamic" = yes; then + # On all known operating systems, these are identical. + dlname="$soname" + fi + fi + ;; + + obj) + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + func_warning "\`-dlopen' is ignored for objects" + fi + + case " $deplibs" in + *\ -l* | *\ -L*) + func_warning "\`-l' and \`-L' are ignored for objects" ;; + esac + + test -n "$rpath" && \ + func_warning "\`-rpath' is ignored for objects" + + test -n "$xrpath" && \ + func_warning "\`-R' is ignored for objects" + + test -n "$vinfo" && \ + func_warning "\`-version-info' is ignored for objects" + + test -n "$release" && \ + func_warning "\`-release' is ignored for objects" + + case $output in + *.lo) + test -n "$objs$old_deplibs" && \ + func_fatal_error "cannot build library object \`$output' from non-libtool objects" + + libobj=$output + func_lo2o "$libobj" + obj=$func_lo2o_result + ;; + *) + libobj= + obj="$output" + ;; + esac + + # Delete the old objects. + $opt_dry_run || $RM $obj $libobj + + # Objects from convenience libraries. This assumes + # single-version convenience libraries. Whenever we create + # different ones for PIC/non-PIC, this we'll have to duplicate + # the extraction. + reload_conv_objs= + gentop= + # reload_cmds runs $LD directly, so let us get rid of + # -Wl from whole_archive_flag_spec and hope we can get by with + # turning comma into space.. + wl= + + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec"; then + eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" + reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + else + gentop="$output_objdir/${obj}x" + func_append generated " $gentop" + + func_extract_archives $gentop $convenience + reload_conv_objs="$reload_objs $func_extract_archives_result" + fi + fi + + # If we're not building shared, we need to use non_pic_objs + test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" + + # Create the old-style object. + reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + + output="$obj" + func_execute_cmds "$reload_cmds" 'exit $?' + + # Exit if we aren't doing a library object file. + if test -z "$libobj"; then + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi + + exit $EXIT_SUCCESS + fi + + if test "$build_libtool_libs" != yes; then + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi + + # Create an invalid libtool object if no PIC, so that we don't + # accidentally link it into a program. + # $show "echo timestamp > $libobj" + # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? + exit $EXIT_SUCCESS + fi + + if test -n "$pic_flag" || test "$pic_mode" != default; then + # Only do commands if we really have different PIC objects. + reload_objs="$libobjs $reload_conv_objs" + output="$libobj" + func_execute_cmds "$reload_cmds" 'exit $?' + fi + + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi + + exit $EXIT_SUCCESS + ;; + + prog) + case $host in + *cygwin*) func_stripname '' '.exe' "$output" + output=$func_stripname_result.exe;; + esac + test -n "$vinfo" && \ + func_warning "\`-version-info' is ignored for programs" + + test -n "$release" && \ + func_warning "\`-release' is ignored for programs" + + test "$preload" = yes \ + && test "$dlopen_support" = unknown \ + && test "$dlopen_self" = unknown \ + && test "$dlopen_self_static" = unknown && \ + func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." + + case $host in + *-*-rhapsody* | *-*-darwin1.[012]) + # On Rhapsody replace the C library is the System framework + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` + ;; + esac + + case $host in + *-*-darwin*) + # Don't allow lazy linking, it breaks C++ global constructors + # But is supposedly fixed on 10.4 or later (yay!). + if test "$tagname" = CXX ; then + case ${MACOSX_DEPLOYMENT_TARGET-10.0} in + 10.[0123]) + func_append compile_command " ${wl}-bind_at_load" + func_append finalize_command " ${wl}-bind_at_load" + ;; + esac + fi + # Time to change all our "foo.ltframework" stuff back to "-framework foo" + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + ;; + esac + + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $compile_deplibs " in + *" -L$path/$objdir "*) + func_append new_libs " -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $compile_deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) func_append new_libs " $deplib" ;; + esac + ;; + *) func_append new_libs " $deplib" ;; + esac + done + compile_deplibs="$new_libs" + + + func_append compile_command " $compile_deplibs" + func_append finalize_command " $finalize_deplibs" + + if test -n "$rpath$xrpath"; then + # If the user specified any rpath flags, then add them. + for libdir in $rpath $xrpath; do + # This is the magic to use -rpath. + case "$finalize_rpath " in + *" $libdir "*) ;; + *) func_append finalize_rpath " $libdir" ;; + esac + done + fi + + # Now hardcode the library paths + rpath= + hardcode_libdirs= + for libdir in $compile_rpath $finalize_rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else + eval flag=\"$hardcode_libdir_flag_spec\" + func_append rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; + *) func_append perm_rpath " $libdir" ;; + esac + fi + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$libdir:"*) ;; + ::) dllsearchpath=$libdir;; + *) func_append dllsearchpath ":$libdir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; + *) func_append dllsearchpath ":$testbindir";; + esac + ;; + esac + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + eval rpath=\" $hardcode_libdir_flag_spec\" + fi + compile_rpath="$rpath" + + rpath= + hardcode_libdirs= + for libdir in $finalize_rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else + eval flag=\"$hardcode_libdir_flag_spec\" + func_append rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$finalize_perm_rpath " in + *" $libdir "*) ;; + *) func_append finalize_perm_rpath " $libdir" ;; + esac + fi + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + eval rpath=\" $hardcode_libdir_flag_spec\" + fi + finalize_rpath="$rpath" + + if test -n "$libobjs" && test "$build_old_libs" = yes; then + # Transform all the library objects into standard objects. + compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` + finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` + fi + + func_generate_dlsyms "$outputname" "@PROGRAM@" "no" + + # template prelinking step + if test -n "$prelink_cmds"; then + func_execute_cmds "$prelink_cmds" 'exit $?' + fi + + wrappers_required=yes + case $host in + *cegcc* | *mingw32ce*) + # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. + wrappers_required=no + ;; + *cygwin* | *mingw* ) + if test "$build_libtool_libs" != yes; then + wrappers_required=no + fi + ;; + *) + if test "$need_relink" = no || test "$build_libtool_libs" != yes; then + wrappers_required=no + fi + ;; + esac + if test "$wrappers_required" = no; then + # Replace the output file specification. + compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` + link_command="$compile_command$compile_rpath" + + # We have no uninstalled library dependencies, so finalize right now. + exit_status=0 + func_show_eval "$link_command" 'exit_status=$?' + + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + + # Delete the generated files. + if test -f "$output_objdir/${outputname}S.${objext}"; then + func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' + fi + + exit $exit_status + fi + + if test -n "$compile_shlibpath$finalize_shlibpath"; then + compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" + fi + if test -n "$finalize_shlibpath"; then + finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" + fi + + compile_var= + finalize_var= + if test -n "$runpath_var"; then + if test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do + func_append rpath "$dir:" + done + compile_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi + if test -n "$finalize_perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $finalize_perm_rpath; do + func_append rpath "$dir:" + done + finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi + fi + + if test "$no_install" = yes; then + # We don't need to create a wrapper script. + link_command="$compile_var$compile_command$compile_rpath" + # Replace the output file specification. + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` + # Delete the old output file. + $opt_dry_run || $RM $output + # Link the executable and exit + func_show_eval "$link_command" 'exit $?' + + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + + exit $EXIT_SUCCESS + fi + + if test "$hardcode_action" = relink; then + # Fast installation is not supported + link_command="$compile_var$compile_command$compile_rpath" + relink_command="$finalize_var$finalize_command$finalize_rpath" + + func_warning "this platform does not like uninstalled shared libraries" + func_warning "\`$output' will be relinked during installation" + else + if test "$fast_install" != no; then + link_command="$finalize_var$compile_command$finalize_rpath" + if test "$fast_install" = yes; then + relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` + else + # fast_install is set to needless + relink_command= + fi + else + link_command="$compile_var$compile_command$compile_rpath" + relink_command="$finalize_var$finalize_command$finalize_rpath" + fi + fi + + # Replace the output file specification. + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` + + # Delete the old output files. + $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname + + func_show_eval "$link_command" 'exit $?' + + if test -n "$postlink_cmds"; then + func_to_tool_file "$output_objdir/$outputname" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + + # Now create the wrapper script. + func_verbose "creating $output" + + # Quote the relink command for shipping. + if test -n "$relink_command"; then + # Preserve any variables that may affect compiler behavior + for var in $variables_saved_for_relink; do + if eval test -z \"\${$var+set}\"; then + relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" + elif eval var_value=\$$var; test -z "$var_value"; then + relink_command="$var=; export $var; $relink_command" + else + func_quote_for_eval "$var_value" + relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + fi + done + relink_command="(cd `pwd`; $relink_command)" + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + fi + + # Only actually do things if not in dry run mode. + $opt_dry_run || { + # win32 will think the script is a binary if it has + # a .exe suffix, so we strip it off here. + case $output in + *.exe) func_stripname '' '.exe' "$output" + output=$func_stripname_result ;; + esac + # test for cygwin because mv fails w/o .exe extensions + case $host in + *cygwin*) + exeext=.exe + func_stripname '' '.exe' "$outputname" + outputname=$func_stripname_result ;; + *) exeext= ;; + esac + case $host in + *cygwin* | *mingw* ) + func_dirname_and_basename "$output" "" "." + output_name=$func_basename_result + output_path=$func_dirname_result + cwrappersource="$output_path/$objdir/lt-$output_name.c" + cwrapper="$output_path/$output_name.exe" + $RM $cwrappersource $cwrapper + trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 + + func_emit_cwrapperexe_src > $cwrappersource + + # The wrapper executable is built using the $host compiler, + # because it contains $host paths and files. If cross- + # compiling, it, like the target executable, must be + # executed on the $host or under an emulation environment. + $opt_dry_run || { + $LTCC $LTCFLAGS -o $cwrapper $cwrappersource + $STRIP $cwrapper + } + + # Now, create the wrapper script for func_source use: + func_ltwrapper_scriptname $cwrapper + $RM $func_ltwrapper_scriptname_result + trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 + $opt_dry_run || { + # note: this script will not be executed, so do not chmod. + if test "x$build" = "x$host" ; then + $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result + else + func_emit_wrapper no > $func_ltwrapper_scriptname_result + fi + } + ;; + * ) + $RM $output + trap "$RM $output; exit $EXIT_FAILURE" 1 2 15 + + func_emit_wrapper no > $output + chmod +x $output + ;; + esac + } + exit $EXIT_SUCCESS + ;; + esac + + # See if we need to build an old-fashioned archive. + for oldlib in $oldlibs; do + + if test "$build_libtool_libs" = convenience; then + oldobjs="$libobjs_save $symfileobj" + addlibs="$convenience" + build_libtool_libs=no + else + if test "$build_libtool_libs" = module; then + oldobjs="$libobjs_save" + build_libtool_libs=no + else + oldobjs="$old_deplibs $non_pic_objects" + if test "$preload" = yes && test -f "$symfileobj"; then + func_append oldobjs " $symfileobj" + fi + fi + addlibs="$old_convenience" + fi + + if test -n "$addlibs"; then + gentop="$output_objdir/${outputname}x" + func_append generated " $gentop" + + func_extract_archives $gentop $addlibs + func_append oldobjs " $func_extract_archives_result" + fi + + # Do each command in the archive commands. + if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then + cmds=$old_archive_from_new_cmds + else + + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop="$output_objdir/${outputname}x" + func_append generated " $gentop" + + func_extract_archives $gentop $dlprefiles + func_append oldobjs " $func_extract_archives_result" + fi + + # POSIX demands no paths to be encoded in archives. We have + # to avoid creating archives with duplicate basenames if we + # might have to extract them afterwards, e.g., when creating a + # static archive out of a convenience library, or when linking + # the entirety of a libtool archive into another (currently + # not supported by libtool). + if (for obj in $oldobjs + do + func_basename "$obj" + $ECHO "$func_basename_result" + done | sort | sort -uc >/dev/null 2>&1); then + : + else + echo "copying selected object files to avoid basename conflicts..." + gentop="$output_objdir/${outputname}x" + func_append generated " $gentop" + func_mkdir_p "$gentop" + save_oldobjs=$oldobjs + oldobjs= + counter=1 + for obj in $save_oldobjs + do + func_basename "$obj" + objbase="$func_basename_result" + case " $oldobjs " in + " ") oldobjs=$obj ;; + *[\ /]"$objbase "*) + while :; do + # Make sure we don't pick an alternate name that also + # overlaps. + newobj=lt$counter-$objbase + func_arith $counter + 1 + counter=$func_arith_result + case " $oldobjs " in + *[\ /]"$newobj "*) ;; + *) if test ! -f "$gentop/$newobj"; then break; fi ;; + esac + done + func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" + func_append oldobjs " $gentop/$newobj" + ;; + *) func_append oldobjs " $obj" ;; + esac + done + fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result + eval cmds=\"$old_archive_cmds\" + + func_len " $cmds" + len=$func_len_result + if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + cmds=$old_archive_cmds + elif test -n "$archiver_list_spec"; then + func_verbose "using command file archive linking..." + for obj in $oldobjs + do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > $output_objdir/$libname.libcmd + func_to_tool_file "$output_objdir/$libname.libcmd" + oldobjs=" $archiver_list_spec$func_to_tool_file_result" + cmds=$old_archive_cmds + else + # the command line is too long to link in one step, link in parts + func_verbose "using piecewise archive linking..." + save_RANLIB=$RANLIB + RANLIB=: + objlist= + concat_cmds= + save_oldobjs=$oldobjs + oldobjs= + # Is there a better way of finding the last object in the list? + for obj in $save_oldobjs + do + last_oldobj=$obj + done + eval test_cmds=\"$old_archive_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 + for obj in $save_oldobjs + do + func_len " $obj" + func_arith $len + $func_len_result + len=$func_arith_result + func_append objlist " $obj" + if test "$len" -lt "$max_cmd_len"; then + : + else + # the above command should be used before it gets too long + oldobjs=$objlist + if test "$obj" = "$last_oldobj" ; then + RANLIB=$save_RANLIB + fi + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + objlist= + len=$len0 + fi + done + RANLIB=$save_RANLIB + oldobjs=$objlist + if test "X$oldobjs" = "X" ; then + eval cmds=\"\$concat_cmds\" + else + eval cmds=\"\$concat_cmds~\$old_archive_cmds\" + fi + fi + fi + func_execute_cmds "$cmds" 'exit $?' + done + + test -n "$generated" && \ + func_show_eval "${RM}r$generated" + + # Now create the libtool archive. + case $output in + *.la) + old_library= + test "$build_old_libs" = yes && old_library="$libname.$libext" + func_verbose "creating $output" + + # Preserve any variables that may affect compiler behavior + for var in $variables_saved_for_relink; do + if eval test -z \"\${$var+set}\"; then + relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" + elif eval var_value=\$$var; test -z "$var_value"; then + relink_command="$var=; export $var; $relink_command" + else + func_quote_for_eval "$var_value" + relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + fi + done + # Quote the link command for shipping. + relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + if test "$hardcode_automatic" = yes ; then + relink_command= + fi + + # Only create the output if not a dry run. + $opt_dry_run || { + for installed in no yes; do + if test "$installed" = yes; then + if test -z "$install_libdir"; then + break + fi + output="$output_objdir/$outputname"i + # Replace all uninstalled libtool libraries with the installed ones + newdependency_libs= + for deplib in $dependency_libs; do + case $deplib in + *.la) + func_basename "$deplib" + name="$func_basename_result" + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + test -z "$libdir" && \ + func_fatal_error "\`$deplib' is not a valid libtool archive" + func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" + ;; + -L*) + func_stripname -L '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -L$func_replace_sysroot_result" + ;; + -R*) + func_stripname -R '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -R$func_replace_sysroot_result" + ;; + *) func_append newdependency_libs " $deplib" ;; + esac + done + dependency_libs="$newdependency_libs" + newdlfiles= + + for lib in $dlfiles; do + case $lib in + *.la) + func_basename "$lib" + name="$func_basename_result" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + test -z "$libdir" && \ + func_fatal_error "\`$lib' is not a valid libtool archive" + func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" + ;; + *) func_append newdlfiles " $lib" ;; + esac + done + dlfiles="$newdlfiles" + newdlprefiles= + for lib in $dlprefiles; do + case $lib in + *.la) + # Only pass preopened files to the pseudo-archive (for + # eventual linking with the app. that links it) if we + # didn't already link the preopened objects directly into + # the library: + func_basename "$lib" + name="$func_basename_result" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + test -z "$libdir" && \ + func_fatal_error "\`$lib' is not a valid libtool archive" + func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" + ;; + esac + done + dlprefiles="$newdlprefiles" + else + newdlfiles= + for lib in $dlfiles; do + case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac + func_append newdlfiles " $abs" + done + dlfiles="$newdlfiles" + newdlprefiles= + for lib in $dlprefiles; do + case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac + func_append newdlprefiles " $abs" + done + dlprefiles="$newdlprefiles" + fi + $RM $output + # place dlname in correct position for cygwin + # In fact, it would be nice if we could use this code for all target + # systems that can't hard-code library paths into their executables + # and that have no shared library path variable independent of PATH, + # but it turns out we can't easily determine that from inspecting + # libtool variables, so we have to hard-code the OSs to which it + # applies here; at the moment, that means platforms that use the PE + # object format with DLL files. See the long comment at the top of + # tests/bindir.at for full details. + tdlname=$dlname + case $host,$output,$installed,$module,$dlname in + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) + # If a -bindir argument was supplied, place the dll there. + if test "x$bindir" != x ; + then + func_relative_path "$install_libdir" "$bindir" + tdlname=$func_relative_path_result$dlname + else + # Otherwise fall back on heuristic. + tdlname=../bin/$dlname + fi + ;; + esac + $ECHO > $output "\ +# $outputname - a libtool library file +# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# The name that we can dlopen(3). +dlname='$tdlname' + +# Names of this library. +library_names='$library_names' + +# The name of the static archive. +old_library='$old_library' + +# Linker flags that can not go in dependency_libs. +inherited_linker_flags='$new_inherited_linker_flags' + +# Libraries that this one depends upon. +dependency_libs='$dependency_libs' + +# Names of additional weak libraries provided by this library +weak_library_names='$weak_libs' + +# Version information for $libname. +current=$current +age=$age +revision=$revision + +# Is this an already installed library? +installed=$installed + +# Should we warn about portability when linking against -modules? +shouldnotlink=$module + +# Files to dlopen/dlpreopen +dlopen='$dlfiles' +dlpreopen='$dlprefiles' + +# Directory that this library needs to be installed in: +libdir='$install_libdir'" + if test "$installed" = no && test "$need_relink" = yes; then + $ECHO >> $output "\ +relink_command=\"$relink_command\"" + fi + done + } + + # Do a symbolic link so that the libtool archive can be found in + # LD_LIBRARY_PATH before the program is installed. + func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?' + ;; + esac + exit $EXIT_SUCCESS +} + +{ test "$opt_mode" = link || test "$opt_mode" = relink; } && + func_mode_link ${1+"$@"} + + +# func_mode_uninstall arg... +func_mode_uninstall () +{ + $opt_debug + RM="$nonopt" + files= + rmforce= + exit_status=0 + + # This variable tells wrapper scripts just to set variables rather + # than running their programs. + libtool_install_magic="$magic" + + for arg + do + case $arg in + -f) func_append RM " $arg"; rmforce=yes ;; + -*) func_append RM " $arg" ;; + *) func_append files " $arg" ;; + esac + done + + test -z "$RM" && \ + func_fatal_help "you must specify an RM program" + + rmdirs= + + for file in $files; do + func_dirname "$file" "" "." + dir="$func_dirname_result" + if test "X$dir" = X.; then + odir="$objdir" + else + odir="$dir/$objdir" + fi + func_basename "$file" + name="$func_basename_result" + test "$opt_mode" = uninstall && odir="$dir" + + # Remember odir for removal later, being careful to avoid duplicates + if test "$opt_mode" = clean; then + case " $rmdirs " in + *" $odir "*) ;; + *) func_append rmdirs " $odir" ;; + esac + fi + + # Don't error if the file doesn't exist and rm -f was used. + if { test -L "$file"; } >/dev/null 2>&1 || + { test -h "$file"; } >/dev/null 2>&1 || + test -f "$file"; then + : + elif test -d "$file"; then + exit_status=1 + continue + elif test "$rmforce" = yes; then + continue + fi + + rmfiles="$file" + + case $name in + *.la) + # Possibly a libtool archive, so verify it. + if func_lalib_p "$file"; then + func_source $dir/$name + + # Delete the libtool libraries and symlinks. + for n in $library_names; do + func_append rmfiles " $odir/$n" + done + test -n "$old_library" && func_append rmfiles " $odir/$old_library" + + case "$opt_mode" in + clean) + case " $library_names " in + *" $dlname "*) ;; + *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; + esac + test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" + ;; + uninstall) + if test -n "$library_names"; then + # Do each command in the postuninstall commands. + func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + fi + + if test -n "$old_library"; then + # Do each command in the old_postuninstall commands. + func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + fi + # FIXME: should reinstall the best remaining shared library. + ;; + esac + fi + ;; + + *.lo) + # Possibly a libtool object, so verify it. + if func_lalib_p "$file"; then + + # Read the .lo file + func_source $dir/$name + + # Add PIC object to the list of files to remove. + if test -n "$pic_object" && + test "$pic_object" != none; then + func_append rmfiles " $dir/$pic_object" + fi + + # Add non-PIC object to the list of files to remove. + if test -n "$non_pic_object" && + test "$non_pic_object" != none; then + func_append rmfiles " $dir/$non_pic_object" + fi + fi + ;; + + *) + if test "$opt_mode" = clean ; then + noexename=$name + case $file in + *.exe) + func_stripname '' '.exe' "$file" + file=$func_stripname_result + func_stripname '' '.exe' "$name" + noexename=$func_stripname_result + # $file with .exe has already been added to rmfiles, + # add $file without .exe + func_append rmfiles " $file" + ;; + esac + # Do a test to see if this is a libtool program. + if func_ltwrapper_p "$file"; then + if func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + relink_command= + func_source $func_ltwrapper_scriptname_result + func_append rmfiles " $func_ltwrapper_scriptname_result" + else + relink_command= + func_source $dir/$noexename + fi + + # note $name still contains .exe if it was in $file originally + # as does the version of $file that was added into $rmfiles + func_append rmfiles " $odir/$name $odir/${name}S.${objext}" + if test "$fast_install" = yes && test -n "$relink_command"; then + func_append rmfiles " $odir/lt-$name" + fi + if test "X$noexename" != "X$name" ; then + func_append rmfiles " $odir/lt-${noexename}.c" + fi + fi + fi + ;; + esac + func_show_eval "$RM $rmfiles" 'exit_status=1' + done + + # Try to remove the ${objdir}s in the directories where we deleted files + for dir in $rmdirs; do + if test -d "$dir"; then + func_show_eval "rmdir $dir >/dev/null 2>&1" + fi + done + + exit $exit_status +} + +{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && + func_mode_uninstall ${1+"$@"} + +test -z "$opt_mode" && { + help="$generic_help" + func_fatal_help "you must specify a MODE" +} + +test -z "$exec_cmd" && \ + func_fatal_help "invalid operation mode \`$opt_mode'" + +if test -n "$exec_cmd"; then + eval exec "$exec_cmd" + exit $EXIT_FAILURE +fi + +exit $exit_status + + +# The TAGs below are defined such that we never get into a situation +# in which we disable both kinds of libraries. Given conflicting +# choices, we go for a static library, that is the most portable, +# since we can't tell whether shared libraries were disabled because +# the user asked for that or because the platform doesn't support +# them. This is particularly important on AIX, because we don't +# support having both static and shared libraries enabled at the same +# time on that platform, so we default to a shared-only configuration. +# If a disable-shared tag is given, we'll fallback to a static-only +# configuration. But we'll never go from static-only to shared-only. + +# ### BEGIN LIBTOOL TAG CONFIG: disable-shared +build_libtool_libs=no +build_old_libs=yes +# ### END LIBTOOL TAG CONFIG: disable-shared + +# ### BEGIN LIBTOOL TAG CONFIG: disable-static +build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` +# ### END LIBTOOL TAG CONFIG: disable-static + +# Local Variables: +# mode:shell-script +# sh-indentation:2 +# End: +# vi:sw=2 + diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4 new file mode 100644 index 0000000..d90de34 --- /dev/null +++ b/m4/ax_pthread.m4 @@ -0,0 +1,309 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_pthread.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +# +# DESCRIPTION +# +# This macro figures out how to build C programs using POSIX threads. It +# sets the PTHREAD_LIBS output variable to the threads library and linker +# flags, and the PTHREAD_CFLAGS output variable to any special C compiler +# flags that are needed. (The user can also force certain compiler +# flags/libs to be tested by setting these environment variables.) +# +# Also sets PTHREAD_CC to any special C compiler that is needed for +# multi-threaded programs (defaults to the value of CC otherwise). (This +# is necessary on AIX to use the special cc_r compiler alias.) +# +# NOTE: You are assumed to not only compile your program with these flags, +# but also link it with them as well. e.g. you should link with +# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS +# +# If you are only building threads programs, you may wish to use these +# variables in your default LIBS, CFLAGS, and CC: +# +# LIBS="$PTHREAD_LIBS $LIBS" +# CFLAGS="$CFLAGS $PTHREAD_CFLAGS" +# CC="$PTHREAD_CC" +# +# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant +# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name +# (e.g. PTHREAD_CREATE_UNDETACHED on AIX). +# +# Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the +# PTHREAD_PRIO_INHERIT symbol is defined when compiling with +# PTHREAD_CFLAGS. +# +# ACTION-IF-FOUND is a list of shell commands to run if a threads library +# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it +# is not found. If ACTION-IF-FOUND is not specified, the default action +# will define HAVE_PTHREAD. +# +# Please let the authors know if this macro fails on any platform, or if +# you have any other suggestions or comments. This macro was based on work +# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help +# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by +# Alejandro Forero Cuervo to the autoconf macro repository. We are also +# grateful for the helpful feedback of numerous users. +# +# Updated for Autoconf 2.68 by Daniel Richard G. +# +# LICENSE +# +# Copyright (c) 2008 Steven G. Johnson +# Copyright (c) 2011 Daniel Richard G. +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 18 + +AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) +AC_DEFUN([AX_PTHREAD], [ +AC_REQUIRE([AC_CANONICAL_HOST]) +AC_LANG_PUSH([C]) +ax_pthread_ok=no + +# We used to check for pthread.h first, but this fails if pthread.h +# requires special compiler flags (e.g. on True64 or Sequent). +# It gets checked for in the link test anyway. + +# First of all, check if the user has set any of the PTHREAD_LIBS, +# etcetera environment variables, and if threads linking works using +# them: +if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) + AC_TRY_LINK_FUNC(pthread_join, ax_pthread_ok=yes) + AC_MSG_RESULT($ax_pthread_ok) + if test x"$ax_pthread_ok" = xno; then + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" + fi + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" +fi + +# We must check for the threads library under a number of different +# names; the ordering is very important because some systems +# (e.g. DEC) have both -lpthread and -lpthreads, where one of the +# libraries is broken (non-POSIX). + +# Create a list of thread flags to try. Items starting with a "-" are +# C compiler flags, and other items are library names, except for "none" +# which indicates that we try without any flags at all, and "pthread-config" +# which is a program returning the flags for the Pth emulation library. + +ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" + +# The ordering *is* (sometimes) important. Some notes on the +# individual items follow: + +# pthreads: AIX (must check this before -lpthread) +# none: in case threads are in libc; should be tried before -Kthread and +# other compiler flags to prevent continual compiler warnings +# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) +# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) +# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) +# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) +# -pthreads: Solaris/gcc +# -mthreads: Mingw32/gcc, Lynx/gcc +# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it +# doesn't hurt to check since this sometimes defines pthreads too; +# also defines -D_REENTRANT) +# ... -mt is also the pthreads flag for HP/aCC +# pthread: Linux, etcetera +# --thread-safe: KAI C++ +# pthread-config: use pthread-config program (for GNU Pth library) + +case ${host_os} in + solaris*) + + # On Solaris (at least, for some versions), libc contains stubbed + # (non-functional) versions of the pthreads routines, so link-based + # tests will erroneously succeed. (We need to link with -pthreads/-mt/ + # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather + # a function called by this macro, so we could check for that, but + # who knows whether they'll stub that too in a future libc.) So, + # we'll just look for -pthreads and -lpthread first: + + ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags" + ;; + + darwin*) + ax_pthread_flags="-pthread $ax_pthread_flags" + ;; +esac + +if test x"$ax_pthread_ok" = xno; then +for flag in $ax_pthread_flags; do + + case $flag in + none) + AC_MSG_CHECKING([whether pthreads work without any flags]) + ;; + + -*) + AC_MSG_CHECKING([whether pthreads work with $flag]) + PTHREAD_CFLAGS="$flag" + ;; + + pthread-config) + AC_CHECK_PROG(ax_pthread_config, pthread-config, yes, no) + if test x"$ax_pthread_config" = xno; then continue; fi + PTHREAD_CFLAGS="`pthread-config --cflags`" + PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" + ;; + + *) + AC_MSG_CHECKING([for the pthreads library -l$flag]) + PTHREAD_LIBS="-l$flag" + ;; + esac + + save_LIBS="$LIBS" + save_CFLAGS="$CFLAGS" + LIBS="$PTHREAD_LIBS $LIBS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + + # Check for various functions. We must include pthread.h, + # since some functions may be macros. (On the Sequent, we + # need a special flag -Kthread to make this header compile.) + # We check for pthread_join because it is in -lpthread on IRIX + # while pthread_create is in libc. We check for pthread_attr_init + # due to DEC craziness with -lpthreads. We check for + # pthread_cleanup_push because it is one of the few pthread + # functions on Solaris that doesn't have a non-functional libc stub. + # We try pthread_create on general principles. + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include + static void routine(void *a) { a = 0; } + static void *start_routine(void *a) { return a; }], + [pthread_t th; pthread_attr_t attr; + pthread_create(&th, 0, start_routine, 0); + pthread_join(th, 0); + pthread_attr_init(&attr); + pthread_cleanup_push(routine, 0); + pthread_cleanup_pop(0) /* ; */])], + [ax_pthread_ok=yes], + []) + + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" + + AC_MSG_RESULT($ax_pthread_ok) + if test "x$ax_pthread_ok" = xyes; then + break; + fi + + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" +done +fi + +# Various other checks: +if test "x$ax_pthread_ok" = xyes; then + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + + # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. + AC_MSG_CHECKING([for joinable pthread attribute]) + attr_name=unknown + for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], + [int attr = $attr; return attr /* ; */])], + [attr_name=$attr; break], + []) + done + AC_MSG_RESULT($attr_name) + if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then + AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name, + [Define to necessary symbol if this constant + uses a non-standard name on your system.]) + fi + + AC_MSG_CHECKING([if more special flags are required for pthreads]) + flag=no + case ${host_os} in + aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";; + osf* | hpux*) flag="-D_REENTRANT";; + solaris*) + if test "$GCC" = "yes"; then + flag="-D_REENTRANT" + else + flag="-mt -D_REENTRANT" + fi + ;; + esac + AC_MSG_RESULT(${flag}) + if test "x$flag" != xno; then + PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" + fi + + AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT], + ax_cv_PTHREAD_PRIO_INHERIT, [ + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([[#include ]], [[int i = PTHREAD_PRIO_INHERIT;]])], + [ax_cv_PTHREAD_PRIO_INHERIT=yes], + [ax_cv_PTHREAD_PRIO_INHERIT=no]) + ]) + AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"], + AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], 1, [Have PTHREAD_PRIO_INHERIT.])) + + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" + + # More AIX lossage: must compile with xlc_r or cc_r + if test x"$GCC" != xyes; then + AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC}) + else + PTHREAD_CC=$CC + fi +else + PTHREAD_CC="$CC" +fi + +AC_SUBST(PTHREAD_LIBS) +AC_SUBST(PTHREAD_CFLAGS) +AC_SUBST(PTHREAD_CC) + +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: +if test x"$ax_pthread_ok" = xyes; then + ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1]) + : +else + ax_pthread_ok=no + $2 +fi +AC_LANG_POP +])dnl AX_PTHREAD diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4 new file mode 100644 index 0000000..3675543 --- /dev/null +++ b/m4/gtk-doc.m4 @@ -0,0 +1,88 @@ +dnl -*- mode: autoconf -*- + +# serial 2 + +dnl Usage: +dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) +AC_DEFUN([GTK_DOC_CHECK], +[ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + + ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"]) + AC_MSG_CHECKING([for gtk-doc]) + PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no]) + AC_MSG_RESULT($have_gtk_doc) + + if test "$have_gtk_doc" = "no"; then + AC_MSG_WARN([ + You will not be able to create source packages with 'make dist' + because $gtk_doc_requires is not found.]) + fi + + dnl check for tools we added during development + dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that + dnl may not be writable by the user. Currently, automake requires that the + dnl test name must end in '.test'. + dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638 + AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test]) + AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check]) + AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) + AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) + + dnl for overriding the documentation installation directory + AC_ARG_WITH([html-dir], + AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, + [with_html_dir='${datadir}/gtk-doc/html']) + HTML_DIR="$with_html_dir" + AC_SUBST([HTML_DIR]) + + dnl enable/disable documentation building + AC_ARG_ENABLE([gtk-doc], + AS_HELP_STRING([--enable-gtk-doc], + [use gtk-doc to build documentation [[default=no]]]),, + [enable_gtk_doc=no]) + + AC_MSG_CHECKING([whether to build gtk-doc documentation]) + AC_MSG_RESULT($enable_gtk_doc) + + if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then + AC_MSG_ERROR([ + You must have $gtk_doc_requires installed to build documentation for + $PACKAGE_NAME. Please install gtk-doc or disable building the + documentation by adding '--disable-gtk-doc' to '[$]0'.]) + fi + + dnl don't check for glib if we build glib + if test "x$PACKAGE_NAME" != "xglib"; then + dnl don't fail if someone does not have glib + PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) + fi + + dnl enable/disable output formats + AC_ARG_ENABLE([gtk-doc-html], + AS_HELP_STRING([--enable-gtk-doc-html], + [build documentation in html format [[default=yes]]]),, + [enable_gtk_doc_html=yes]) + AC_ARG_ENABLE([gtk-doc-pdf], + AS_HELP_STRING([--enable-gtk-doc-pdf], + [build documentation in pdf format [[default=no]]]),, + [enable_gtk_doc_pdf=no]) + + if test -z "$GTKDOC_MKPDF"; then + enable_gtk_doc_pdf=no + fi + + if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 + fi + AC_SUBST([AM_DEFAULT_VERBOSITY]) + + AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes]) + AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) + AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) + AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) +]) diff --git a/m4/libtool.m4 b/m4/libtool.m4 new file mode 100644 index 0000000..d7c043f --- /dev/null +++ b/m4/libtool.m4 @@ -0,0 +1,7997 @@ +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +# +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +m4_define([_LT_COPYING], [dnl +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is part of GNU Libtool. +# +# GNU Libtool is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, or +# obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +]) + +# serial 57 LT_INIT + + +# LT_PREREQ(VERSION) +# ------------------ +# Complain and exit if this libtool version is less that VERSION. +m4_defun([LT_PREREQ], +[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, + [m4_default([$3], + [m4_fatal([Libtool version $1 or higher is required], + 63)])], + [$2])]) + + +# _LT_CHECK_BUILDDIR +# ------------------ +# Complain if the absolute build directory name contains unusual characters +m4_defun([_LT_CHECK_BUILDDIR], +[case `pwd` in + *\ * | *\ *) + AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; +esac +]) + + +# LT_INIT([OPTIONS]) +# ------------------ +AC_DEFUN([LT_INIT], +[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +AC_BEFORE([$0], [LT_LANG])dnl +AC_BEFORE([$0], [LT_OUTPUT])dnl +AC_BEFORE([$0], [LTDL_INIT])dnl +m4_require([_LT_CHECK_BUILDDIR])dnl + +dnl Autoconf doesn't catch unexpanded LT_ macros by default: +m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl +m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl +dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 +dnl unless we require an AC_DEFUNed macro: +AC_REQUIRE([LTOPTIONS_VERSION])dnl +AC_REQUIRE([LTSUGAR_VERSION])dnl +AC_REQUIRE([LTVERSION_VERSION])dnl +AC_REQUIRE([LTOBSOLETE_VERSION])dnl +m4_require([_LT_PROG_LTMAIN])dnl + +_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) + +dnl Parse OPTIONS +_LT_SET_OPTIONS([$0], [$1]) + +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ltmain" + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' +AC_SUBST(LIBTOOL)dnl + +_LT_SETUP + +# Only expand once: +m4_define([LT_INIT]) +])# LT_INIT + +# Old names: +AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) +AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PROG_LIBTOOL], []) +dnl AC_DEFUN([AM_PROG_LIBTOOL], []) + + +# _LT_CC_BASENAME(CC) +# ------------------- +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +m4_defun([_LT_CC_BASENAME], +[for cc_temp in $1""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +]) + + +# _LT_FILEUTILS_DEFAULTS +# ---------------------- +# It is okay to use these file commands and assume they have been set +# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. +m4_defun([_LT_FILEUTILS_DEFAULTS], +[: ${CP="cp -f"} +: ${MV="mv -f"} +: ${RM="rm -f"} +])# _LT_FILEUTILS_DEFAULTS + + +# _LT_SETUP +# --------- +m4_defun([_LT_SETUP], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl + +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl +_LT_DECL([], [host_alias], [0], [The host system])dnl +_LT_DECL([], [host], [0])dnl +_LT_DECL([], [host_os], [0])dnl +dnl +_LT_DECL([], [build_alias], [0], [The build system])dnl +_LT_DECL([], [build], [0])dnl +_LT_DECL([], [build_os], [0])dnl +dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([LT_PATH_LD])dnl +AC_REQUIRE([LT_PATH_NM])dnl +dnl +AC_REQUIRE([AC_PROG_LN_S])dnl +test -z "$LN_S" && LN_S="ln -s" +_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl +dnl +AC_REQUIRE([LT_CMD_MAX_LEN])dnl +_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl +_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl +dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl +m4_require([_LT_CMD_RELOAD])dnl +m4_require([_LT_CHECK_MAGIC_METHOD])dnl +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl +m4_require([_LT_CMD_OLD_ARCHIVE])dnl +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_WITH_SYSROOT])dnl + +_LT_CONFIG_LIBTOOL_INIT([ +# See if we are running on zsh, and set the options which allow our +# commands through without removal of \ escapes INIT. +if test -n "\${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi +]) +if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi + +_LT_CHECK_OBJDIR + +m4_require([_LT_TAG_COMPILER])dnl + +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac + +# Global variables: +ofile=libtool +can_build_shared=yes + +# All known linkers require a `.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a + +with_gnu_ld="$lt_cv_prog_gnu_ld" + +old_CC="$CC" +old_CFLAGS="$CFLAGS" + +# Set sane defaults for various variables +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$LD" && LD=ld +test -z "$ac_objext" && ac_objext=o + +_LT_CC_BASENAME([$compiler]) + +# Only perform the check for file, if the check method requires it +test -z "$MAGIC_CMD" && MAGIC_CMD=file +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + _LT_PATH_MAGIC + fi + ;; +esac + +# Use C for the default configuration in the libtool script +LT_SUPPORTED_TAG([CC]) +_LT_LANG_C_CONFIG +_LT_LANG_DEFAULT_CONFIG +_LT_CONFIG_COMMANDS +])# _LT_SETUP + + +# _LT_PREPARE_SED_QUOTE_VARS +# -------------------------- +# Define a few sed substitution that help us do robust quoting. +m4_defun([_LT_PREPARE_SED_QUOTE_VARS], +[# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\([["`\\]]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' +]) + +# _LT_PROG_LTMAIN +# --------------- +# Note that this code is called both from `configure', and `config.status' +# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, +# `config.status' has no value for ac_aux_dir unless we are using Automake, +# so we pass a copy along to make sure it has a sensible value anyway. +m4_defun([_LT_PROG_LTMAIN], +[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl +_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) +ltmain="$ac_aux_dir/ltmain.sh" +])# _LT_PROG_LTMAIN + + +## ------------------------------------- ## +## Accumulate code for creating libtool. ## +## ------------------------------------- ## + +# So that we can recreate a full libtool script including additional +# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS +# in macros and then make a single call at the end using the `libtool' +# label. + + +# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) +# ---------------------------------------- +# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. +m4_define([_LT_CONFIG_LIBTOOL_INIT], +[m4_ifval([$1], + [m4_append([_LT_OUTPUT_LIBTOOL_INIT], + [$1 +])])]) + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_INIT]) + + +# _LT_CONFIG_LIBTOOL([COMMANDS]) +# ------------------------------ +# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. +m4_define([_LT_CONFIG_LIBTOOL], +[m4_ifval([$1], + [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], + [$1 +])])]) + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) + + +# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) +# ----------------------------------------------------- +m4_defun([_LT_CONFIG_SAVE_COMMANDS], +[_LT_CONFIG_LIBTOOL([$1]) +_LT_CONFIG_LIBTOOL_INIT([$2]) +]) + + +# _LT_FORMAT_COMMENT([COMMENT]) +# ----------------------------- +# Add leading comment marks to the start of each line, and a trailing +# full-stop to the whole comment if one is not present already. +m4_define([_LT_FORMAT_COMMENT], +[m4_ifval([$1], [ +m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], + [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) +)]) + + + +## ------------------------ ## +## FIXME: Eliminate VARNAME ## +## ------------------------ ## + + +# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) +# ------------------------------------------------------------------- +# CONFIGNAME is the name given to the value in the libtool script. +# VARNAME is the (base) name used in the configure script. +# VALUE may be 0, 1 or 2 for a computed quote escaped value based on +# VARNAME. Any other value will be used directly. +m4_define([_LT_DECL], +[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], + [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], + [m4_ifval([$1], [$1], [$2])]) + lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) + m4_ifval([$4], + [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) + lt_dict_add_subkey([lt_decl_dict], [$2], + [tagged?], [m4_ifval([$5], [yes], [no])])]) +]) + + +# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) +# -------------------------------------------------------- +m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) + + +# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) +# ------------------------------------------------ +m4_define([lt_decl_tag_varnames], +[_lt_decl_filter([tagged?], [yes], $@)]) + + +# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) +# --------------------------------------------------------- +m4_define([_lt_decl_filter], +[m4_case([$#], + [0], [m4_fatal([$0: too few arguments: $#])], + [1], [m4_fatal([$0: too few arguments: $#: $1])], + [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], + [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], + [lt_dict_filter([lt_decl_dict], $@)])[]dnl +]) + + +# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) +# -------------------------------------------------- +m4_define([lt_decl_quote_varnames], +[_lt_decl_filter([value], [1], $@)]) + + +# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) +# --------------------------------------------------- +m4_define([lt_decl_dquote_varnames], +[_lt_decl_filter([value], [2], $@)]) + + +# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) +# --------------------------------------------------- +m4_define([lt_decl_varnames_tagged], +[m4_assert([$# <= 2])dnl +_$0(m4_quote(m4_default([$1], [[, ]])), + m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), + m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) +m4_define([_lt_decl_varnames_tagged], +[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) + + +# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) +# ------------------------------------------------ +m4_define([lt_decl_all_varnames], +[_$0(m4_quote(m4_default([$1], [[, ]])), + m4_if([$2], [], + m4_quote(lt_decl_varnames), + m4_quote(m4_shift($@))))[]dnl +]) +m4_define([_lt_decl_all_varnames], +[lt_join($@, lt_decl_varnames_tagged([$1], + lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl +]) + + +# _LT_CONFIG_STATUS_DECLARE([VARNAME]) +# ------------------------------------ +# Quote a variable value, and forward it to `config.status' so that its +# declaration there will have the same value as in `configure'. VARNAME +# must have a single quote delimited value for this to work. +m4_define([_LT_CONFIG_STATUS_DECLARE], +[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) + + +# _LT_CONFIG_STATUS_DECLARATIONS +# ------------------------------ +# We delimit libtool config variables with single quotes, so when +# we write them to config.status, we have to be sure to quote all +# embedded single quotes properly. In configure, this macro expands +# each variable declared with _LT_DECL (and _LT_TAGDECL) into: +# +# ='`$ECHO "$" | $SED "$delay_single_quote_subst"`' +m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], +[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), + [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) + + +# _LT_LIBTOOL_TAGS +# ---------------- +# Output comment and list of tags supported by the script +m4_defun([_LT_LIBTOOL_TAGS], +[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl +available_tags="_LT_TAGS"dnl +]) + + +# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) +# ----------------------------------- +# Extract the dictionary values for VARNAME (optionally with TAG) and +# expand to a commented shell variable setting: +# +# # Some comment about what VAR is for. +# visible_name=$lt_internal_name +m4_define([_LT_LIBTOOL_DECLARE], +[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], + [description])))[]dnl +m4_pushdef([_libtool_name], + m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl +m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), + [0], [_libtool_name=[$]$1], + [1], [_libtool_name=$lt_[]$1], + [2], [_libtool_name=$lt_[]$1], + [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl +m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl +]) + + +# _LT_LIBTOOL_CONFIG_VARS +# ----------------------- +# Produce commented declarations of non-tagged libtool config variables +# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' +# script. Tagged libtool config variables (even for the LIBTOOL CONFIG +# section) are produced by _LT_LIBTOOL_TAG_VARS. +m4_defun([_LT_LIBTOOL_CONFIG_VARS], +[m4_foreach([_lt_var], + m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) + + +# _LT_LIBTOOL_TAG_VARS(TAG) +# ------------------------- +m4_define([_LT_LIBTOOL_TAG_VARS], +[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) + + +# _LT_TAGVAR(VARNAME, [TAGNAME]) +# ------------------------------ +m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) + + +# _LT_CONFIG_COMMANDS +# ------------------- +# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of +# variables for single and double quote escaping we saved from calls +# to _LT_DECL, we can put quote escaped variables declarations +# into `config.status', and then the shell code to quote escape them in +# for loops in `config.status'. Finally, any additional code accumulated +# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. +m4_defun([_LT_CONFIG_COMMANDS], +[AC_PROVIDE_IFELSE([LT_OUTPUT], + dnl If the libtool generation code has been placed in $CONFIG_LT, + dnl instead of duplicating it all over again into config.status, + dnl then we will have config.status run $CONFIG_LT later, so it + dnl needs to know what name is stored there: + [AC_CONFIG_COMMANDS([libtool], + [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], + dnl If the libtool generation code is destined for config.status, + dnl expand the accumulated commands and init code now: + [AC_CONFIG_COMMANDS([libtool], + [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) +])#_LT_CONFIG_COMMANDS + + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], +[ + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +sed_quote_subst='$sed_quote_subst' +double_quote_subst='$double_quote_subst' +delay_variable_subst='$delay_variable_subst' +_LT_CONFIG_STATUS_DECLARATIONS +LTCC='$LTCC' +LTCFLAGS='$LTCFLAGS' +compiler='$compiler_DEFAULT' + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$[]1 +_LTECHO_EOF' +} + +# Quote evaled strings. +for var in lt_decl_all_varnames([[ \ +]], lt_decl_quote_varnames); do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[[\\\\\\\`\\"\\\$]]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +# Double-quote double-evaled strings. +for var in lt_decl_all_varnames([[ \ +]], lt_decl_dquote_varnames); do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[[\\\\\\\`\\"\\\$]]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +_LT_OUTPUT_LIBTOOL_INIT +]) + +# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) +# ------------------------------------ +# Generate a child script FILE with all initialization necessary to +# reuse the environment learned by the parent script, and make the +# file executable. If COMMENT is supplied, it is inserted after the +# `#!' sequence but before initialization text begins. After this +# macro, additional text can be appended to FILE to form the body of +# the child script. The macro ends with non-zero status if the +# file could not be fully written (such as if the disk is full). +m4_ifdef([AS_INIT_GENERATED], +[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], +[m4_defun([_LT_GENERATED_FILE_INIT], +[m4_require([AS_PREPARE])]dnl +[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl +[lt_write_fail=0 +cat >$1 <<_ASEOF || lt_write_fail=1 +#! $SHELL +# Generated by $as_me. +$2 +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$1 <<\_ASEOF || lt_write_fail=1 +AS_SHELL_SANITIZE +_AS_PREPARE +exec AS_MESSAGE_FD>&1 +_ASEOF +test $lt_write_fail = 0 && chmod +x $1[]dnl +m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT + +# LT_OUTPUT +# --------- +# This macro allows early generation of the libtool script (before +# AC_OUTPUT is called), incase it is used in configure for compilation +# tests. +AC_DEFUN([LT_OUTPUT], +[: ${CONFIG_LT=./config.lt} +AC_MSG_NOTICE([creating $CONFIG_LT]) +_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], +[# Run this file to recreate a libtool stub with the current configuration.]) + +cat >>"$CONFIG_LT" <<\_LTEOF +lt_cl_silent=false +exec AS_MESSAGE_LOG_FD>>config.log +{ + echo + AS_BOX([Running $as_me.]) +} >&AS_MESSAGE_LOG_FD + +lt_cl_help="\ +\`$as_me' creates a local libtool stub from the current configuration, +for use in further configure time tests before the real libtool is +generated. + +Usage: $[0] [[OPTIONS]] + + -h, --help print this help, then exit + -V, --version print version number, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + +Report bugs to ." + +lt_cl_version="\ +m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl +m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) +configured by $[0], generated by m4_PACKAGE_STRING. + +Copyright (C) 2011 Free Software Foundation, Inc. +This config.lt script is free software; the Free Software Foundation +gives unlimited permision to copy, distribute and modify it." + +while test $[#] != 0 +do + case $[1] in + --version | --v* | -V ) + echo "$lt_cl_version"; exit 0 ;; + --help | --h* | -h ) + echo "$lt_cl_help"; exit 0 ;; + --debug | --d* | -d ) + debug=: ;; + --quiet | --q* | --silent | --s* | -q ) + lt_cl_silent=: ;; + + -*) AC_MSG_ERROR([unrecognized option: $[1] +Try \`$[0] --help' for more information.]) ;; + + *) AC_MSG_ERROR([unrecognized argument: $[1] +Try \`$[0] --help' for more information.]) ;; + esac + shift +done + +if $lt_cl_silent; then + exec AS_MESSAGE_FD>/dev/null +fi +_LTEOF + +cat >>"$CONFIG_LT" <<_LTEOF +_LT_OUTPUT_LIBTOOL_COMMANDS_INIT +_LTEOF + +cat >>"$CONFIG_LT" <<\_LTEOF +AC_MSG_NOTICE([creating $ofile]) +_LT_OUTPUT_LIBTOOL_COMMANDS +AS_EXIT(0) +_LTEOF +chmod +x "$CONFIG_LT" + +# configure is writing to config.log, but config.lt does its own redirection, +# appending to config.log, which fails on DOS, as config.log is still kept +# open by configure. Here we exec the FD to /dev/null, effectively closing +# config.log, so it can be properly (re)opened and appended to by config.lt. +lt_cl_success=: +test "$silent" = yes && + lt_config_lt_args="$lt_config_lt_args --quiet" +exec AS_MESSAGE_LOG_FD>/dev/null +$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false +exec AS_MESSAGE_LOG_FD>>config.log +$lt_cl_success || AS_EXIT(1) +])# LT_OUTPUT + + +# _LT_CONFIG(TAG) +# --------------- +# If TAG is the built-in tag, create an initial libtool script with a +# default configuration from the untagged config vars. Otherwise add code +# to config.status for appending the configuration named by TAG from the +# matching tagged config vars. +m4_defun([_LT_CONFIG], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +_LT_CONFIG_SAVE_COMMANDS([ + m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl + m4_if(_LT_TAG, [C], [ + # See if we are running on zsh, and set the options which allow our + # commands through without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi + + cfgfile="${ofile}T" + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 + $RM "$cfgfile" + + cat <<_LT_EOF >> "$cfgfile" +#! $SHELL + +# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# NOTE: Changes made to this file will be lost: look at ltmain.sh. +# +_LT_COPYING +_LT_LIBTOOL_TAGS + +# ### BEGIN LIBTOOL CONFIG +_LT_LIBTOOL_CONFIG_VARS +_LT_LIBTOOL_TAG_VARS +# ### END LIBTOOL CONFIG + +_LT_EOF + + case $host_os in + aix3*) + cat <<\_LT_EOF >> "$cfgfile" +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. +if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES +fi +_LT_EOF + ;; + esac + + _LT_PROG_LTMAIN + + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + _LT_PROG_REPLACE_SHELLFNS + + mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" +], +[cat <<_LT_EOF >> "$ofile" + +dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded +dnl in a comment (ie after a #). +# ### BEGIN LIBTOOL TAG CONFIG: $1 +_LT_LIBTOOL_TAG_VARS(_LT_TAG) +# ### END LIBTOOL TAG CONFIG: $1 +_LT_EOF +])dnl /m4_if +], +[m4_if([$1], [], [ + PACKAGE='$PACKAGE' + VERSION='$VERSION' + TIMESTAMP='$TIMESTAMP' + RM='$RM' + ofile='$ofile'], []) +])dnl /_LT_CONFIG_SAVE_COMMANDS +])# _LT_CONFIG + + +# LT_SUPPORTED_TAG(TAG) +# --------------------- +# Trace this macro to discover what tags are supported by the libtool +# --tag option, using: +# autoconf --trace 'LT_SUPPORTED_TAG:$1' +AC_DEFUN([LT_SUPPORTED_TAG], []) + + +# C support is built-in for now +m4_define([_LT_LANG_C_enabled], []) +m4_define([_LT_TAGS], []) + + +# LT_LANG(LANG) +# ------------- +# Enable libtool support for the given language if not already enabled. +AC_DEFUN([LT_LANG], +[AC_BEFORE([$0], [LT_OUTPUT])dnl +m4_case([$1], + [C], [_LT_LANG(C)], + [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], + [Java], [_LT_LANG(GCJ)], + [Fortran 77], [_LT_LANG(F77)], + [Fortran], [_LT_LANG(FC)], + [Windows Resource], [_LT_LANG(RC)], + [m4_ifdef([_LT_LANG_]$1[_CONFIG], + [_LT_LANG($1)], + [m4_fatal([$0: unsupported language: "$1"])])])dnl +])# LT_LANG + + +# _LT_LANG(LANGNAME) +# ------------------ +m4_defun([_LT_LANG], +[m4_ifdef([_LT_LANG_]$1[_enabled], [], + [LT_SUPPORTED_TAG([$1])dnl + m4_append([_LT_TAGS], [$1 ])dnl + m4_define([_LT_LANG_]$1[_enabled], [])dnl + _LT_LANG_$1_CONFIG($1)])dnl +])# _LT_LANG + + +m4_ifndef([AC_PROG_GO], [ +############################################################ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +############################################################ +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + +# _LT_LANG_DEFAULT_CONFIG +# ----------------------- +m4_defun([_LT_LANG_DEFAULT_CONFIG], +[AC_PROVIDE_IFELSE([AC_PROG_CXX], + [LT_LANG(CXX)], + [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) + +AC_PROVIDE_IFELSE([AC_PROG_F77], + [LT_LANG(F77)], + [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) + +AC_PROVIDE_IFELSE([AC_PROG_FC], + [LT_LANG(FC)], + [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) + +dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal +dnl pulling things in needlessly. +AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [LT_LANG(GCJ)], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [LT_LANG(GCJ)], + [AC_PROVIDE_IFELSE([LT_PROG_GCJ], + [LT_LANG(GCJ)], + [m4_ifdef([AC_PROG_GCJ], + [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) + m4_ifdef([A][M_PROG_GCJ], + [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) + m4_ifdef([LT_PROG_GCJ], + [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) + +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + +AC_PROVIDE_IFELSE([LT_PROG_RC], + [LT_LANG(RC)], + [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) +])# _LT_LANG_DEFAULT_CONFIG + +# Obsolete macros: +AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) +AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) +AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) +AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) +AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_CXX], []) +dnl AC_DEFUN([AC_LIBTOOL_F77], []) +dnl AC_DEFUN([AC_LIBTOOL_FC], []) +dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) +dnl AC_DEFUN([AC_LIBTOOL_RC], []) + + +# _LT_TAG_COMPILER +# ---------------- +m4_defun([_LT_TAG_COMPILER], +[AC_REQUIRE([AC_PROG_CC])dnl + +_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl +_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl +_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl +_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC +])# _LT_TAG_COMPILER + + +# _LT_COMPILER_BOILERPLATE +# ------------------------ +# Check for compiler boilerplate output or warnings with +# the simple compiler test code. +m4_defun([_LT_COMPILER_BOILERPLATE], +[m4_require([_LT_DECL_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$RM conftest* +])# _LT_COMPILER_BOILERPLATE + + +# _LT_LINKER_BOILERPLATE +# ---------------------- +# Check for linker boilerplate output or warnings with +# the simple link test code. +m4_defun([_LT_LINKER_BOILERPLATE], +[m4_require([_LT_DECL_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$RM -r conftest* +])# _LT_LINKER_BOILERPLATE + +# _LT_REQUIRED_DARWIN_CHECKS +# ------------------------- +m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ + case $host_os in + rhapsody* | darwin*) + AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) + AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) + AC_CHECK_TOOL([LIPO], [lipo], [:]) + AC_CHECK_TOOL([OTOOL], [otool], [:]) + AC_CHECK_TOOL([OTOOL64], [otool64], [:]) + _LT_DECL([], [DSYMUTIL], [1], + [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) + _LT_DECL([], [NMEDIT], [1], + [Tool to change global to local symbols on Mac OS X]) + _LT_DECL([], [LIPO], [1], + [Tool to manipulate fat objects and archives on Mac OS X]) + _LT_DECL([], [OTOOL], [1], + [ldd/readelf like tool for Mach-O binaries on Mac OS X]) + _LT_DECL([], [OTOOL64], [1], + [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) + + AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], + [lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + rm -rf libconftest.dylib* + echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD + fi + rm -rf libconftest.dylib* + rm -f conftest.* + fi]) + + AC_CACHE_CHECK([for -exported_symbols_list linker flag], + [lt_cv_ld_exported_symbols_list], + [lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [lt_cv_ld_exported_symbols_list=yes], + [lt_cv_ld_exported_symbols_list=no]) + LDFLAGS="$save_LDFLAGS" + ]) + + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], + [lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM + ]) + case $host_os in + rhapsody* | darwin1.[[012]]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[[012]]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= + fi + ;; + esac +]) + + +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- +# Checks for linker and compiler features on darwin +m4_defun([_LT_DARWIN_LINKER_FEATURES], +[ + m4_require([_LT_REQUIRED_DARWIN_CHECKS]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_automatic, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + if test "$lt_cv_ld_force_load" = "yes"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='' + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=func_echo_all + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + m4_if([$1], [CXX], +[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" + fi +],[]) + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +]) + +# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) +# ---------------------------------- +# Links a minimal program and checks the executable +# for the system default hardcoded library path. In most cases, +# this is /usr/lib:/lib, but when the MPI compilers are used +# the location of the communication and MPI libs are included too. +# If we don't find anything, use the default library path according +# to the aix ld manual. +# Store the results from the different compilers for each TAGNAME. +# Allow to override them for all tags through lt_cv_aix_libpath. +m4_defun([_LT_SYS_MODULE_PATH_AIX], +[m4_require([_LT_DECL_SED])dnl +if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ + lt_aix_libpath_sed='[ + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }]' + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi],[]) + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" + fi + ]) + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) +fi +])# _LT_SYS_MODULE_PATH_AIX + + +# _LT_SHELL_INIT(ARG) +# ------------------- +m4_define([_LT_SHELL_INIT], +[m4_divert_text([M4SH-INIT], [$1 +])])# _LT_SHELL_INIT + + + +# _LT_PROG_ECHO_BACKSLASH +# ----------------------- +# Find how we can fake an echo command that does not interpret backslash. +# In particular, with Autoconf 2.60 or later we add some code to the start +# of the generated configure script which will find a shell with a builtin +# printf (which we can use as an echo command). +m4_defun([_LT_PROG_ECHO_BACKSLASH], +[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +AC_MSG_CHECKING([how to print strings]) +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' +else + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$[]1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' +fi + +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + +case "$ECHO" in + printf*) AC_MSG_RESULT([printf]) ;; + print*) AC_MSG_RESULT([print -r]) ;; + *) AC_MSG_RESULT([cat]) ;; +esac + +m4_ifdef([_AS_DETECT_SUGGESTED], +[_AS_DETECT_SUGGESTED([ + test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test "X`printf %s $ECHO`" = "X$ECHO" \ + || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) + +_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) +_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) +])# _LT_PROG_ECHO_BACKSLASH + + +# _LT_WITH_SYSROOT +# ---------------- +AC_DEFUN([_LT_WITH_SYSROOT], +[AC_MSG_CHECKING([for sysroot]) +AC_ARG_WITH([sysroot], +[ --with-sysroot[=DIR] Search for dependent libraries within DIR + (or the compiler's sysroot if not specified).], +[], [with_sysroot=no]) + +dnl lt_sysroot will always be passed unquoted. We quote it here +dnl in case the user passed a directory name. +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + AC_MSG_RESULT([${with_sysroot}]) + AC_MSG_ERROR([The sysroot must be an absolute path.]) + ;; +esac + + AC_MSG_RESULT([${lt_sysroot:-no}]) +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl +[dependent libraries, and in which our libraries should be installed.])]) + +# _LT_ENABLE_LOCK +# --------------- +m4_defun([_LT_ENABLE_LOCK], +[AC_ARG_ENABLE([libtool-lock], + [AS_HELP_STRING([--disable-libtool-lock], + [avoid locking (might break parallel builds)])]) +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; + esac + fi + rm -rf conftest* + ;; +*-*-irix6*) + # Find out which ABI we are using. + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi + fi + rm -rf conftest* + ;; + +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac + ;; + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" + AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, + [AC_LANG_PUSH(C) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) + AC_LANG_POP]) + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS="$SAVE_CFLAGS" + fi + ;; +*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; +esac + +need_locks="$enable_libtool_lock" +])# _LT_ENABLE_LOCK + + +# _LT_PROG_AR +# ----------- +m4_defun([_LT_PROG_AR], +[AC_CHECK_TOOLS(AR, [ar], false) +: ${AR=ar} +: ${AR_FLAGS=cru} +_LT_DECL([], [AR], [1], [The archiver]) +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) + +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], + [lt_cv_ar_at_file=no + AC_COMPILE_IFELSE([AC_LANG_PROGRAM], + [echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' + AC_TRY_EVAL([lt_ar_try]) + if test "$ac_status" -eq 0; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + AC_TRY_EVAL([lt_ar_try]) + if test "$ac_status" -ne 0; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + ]) + ]) + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi +_LT_DECL([], [archiver_list_spec], [1], + [How to feed a file listing to the archiver]) +])# _LT_PROG_AR + + +# _LT_CMD_OLD_ARCHIVE +# ------------------- +m4_defun([_LT_CMD_OLD_ARCHIVE], +[_LT_PROG_AR + +AC_CHECK_TOOL(STRIP, strip, :) +test -z "$STRIP" && STRIP=: +_LT_DECL([], [STRIP], [1], [A symbol stripping program]) + +AC_CHECK_TOOL(RANLIB, ranlib, :) +test -z "$RANLIB" && RANLIB=: +_LT_DECL([], [RANLIB], [1], + [Commands used to install an old-style archive]) + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" +fi + +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac +_LT_DECL([], [old_postinstall_cmds], [2]) +_LT_DECL([], [old_postuninstall_cmds], [2]) +_LT_TAGDECL([], [old_archive_cmds], [2], + [Commands used to build an old-style archive]) +_LT_DECL([], [lock_old_archive_extraction], [0], + [Whether to use a lock for old archive extraction]) +])# _LT_CMD_OLD_ARCHIVE + + +# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------------------- +# Check whether the given compiler option works +AC_DEFUN([_LT_COMPILER_OPTION], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_SED])dnl +AC_CACHE_CHECK([$1], [$2], + [$2=no + m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$3" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + fi + $RM conftest* +]) + +if test x"[$]$2" = xyes; then + m4_if([$5], , :, [$5]) +else + m4_if([$6], , :, [$6]) +fi +])# _LT_COMPILER_OPTION + +# Old name: +AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) + + +# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------- +# Check whether the given linker option works +AC_DEFUN([_LT_LINKER_OPTION], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_SED])dnl +AC_CACHE_CHECK([$1], [$2], + [$2=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $3" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&AS_MESSAGE_LOG_FD + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + else + $2=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" +]) + +if test x"[$]$2" = xyes; then + m4_if([$4], , :, [$4]) +else + m4_if([$5], , :, [$5]) +fi +])# _LT_LINKER_OPTION + +# Old name: +AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) + + +# LT_CMD_MAX_LEN +#--------------- +AC_DEFUN([LT_CMD_MAX_LEN], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +# find the maximum length of command line arguments +AC_MSG_CHECKING([the maximum length of command line arguments]) +AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl + i=0 + teststring="ABCD" + + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; + + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + + cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; + + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; + *) + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. + for i in 1 2 3 4 5 6 7 8 ; do + teststring=$teststring$teststring + done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + teststring= + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi + ;; + esac +]) +if test -n $lt_cv_sys_max_cmd_len ; then + AC_MSG_RESULT($lt_cv_sys_max_cmd_len) +else + AC_MSG_RESULT(none) +fi +max_cmd_len=$lt_cv_sys_max_cmd_len +_LT_DECL([], [max_cmd_len], [0], + [What is the maximum length of a command?]) +])# LT_CMD_MAX_LEN + +# Old name: +AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) + + +# _LT_HEADER_DLFCN +# ---------------- +m4_defun([_LT_HEADER_DLFCN], +[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl +])# _LT_HEADER_DLFCN + + +# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, +# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +# ---------------------------------------------------------------- +m4_defun([_LT_TRY_DLOPEN_SELF], +[m4_require([_LT_HEADER_DLFCN])dnl +if test "$cross_compiling" = yes; then : + [$4] +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +[#line $LINENO "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } + /* dlclose (self); */ + } + else + puts (dlerror ()); + + return status; +}] +_LT_EOF + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) $1 ;; + x$lt_dlneed_uscore) $2 ;; + x$lt_dlunknown|x*) $3 ;; + esac + else : + # compilation failed + $3 + fi +fi +rm -fr conftest* +])# _LT_TRY_DLOPEN_SELF + + +# LT_SYS_DLOPEN_SELF +# ------------------ +AC_DEFUN([LT_SYS_DLOPEN_SELF], +[m4_require([_LT_HEADER_DLFCN])dnl +if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32* | cegcc*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ]) + ;; + + *) + AC_CHECK_FUNC([shl_load], + [lt_cv_dlopen="shl_load"], + [AC_CHECK_LIB([dld], [shl_load], + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], + [AC_CHECK_FUNC([dlopen], + [lt_cv_dlopen="dlopen"], + [AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [AC_CHECK_LIB([svld], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [AC_CHECK_LIB([dld], [dld_link], + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) + ]) + ]) + ]) + ]) + ]) + ;; + esac + + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + + AC_CACHE_CHECK([whether a program can dlopen itself], + lt_cv_dlopen_self, [dnl + _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, + lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) + ]) + + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + AC_CACHE_CHECK([whether a statically linked program can dlopen itself], + lt_cv_dlopen_self_static, [dnl + _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, + lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) + ]) + fi + + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi +_LT_DECL([dlopen_support], [enable_dlopen], [0], + [Whether dlopen is supported]) +_LT_DECL([dlopen_self], [enable_dlopen_self], [0], + [Whether dlopen of programs is supported]) +_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], + [Whether dlopen of statically linked programs is supported]) +])# LT_SYS_DLOPEN_SELF + +# Old name: +AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) + + +# _LT_COMPILER_C_O([TAGNAME]) +# --------------------------- +# Check to see if options -c and -o are simultaneously supported by compiler. +# This macro does not hard code the compiler like AC_PROG_CC_C_O. +m4_defun([_LT_COMPILER_C_O], +[m4_require([_LT_DECL_SED])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_TAG_COMPILER])dnl +AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + fi + fi + chmod u+w . 2>&AS_MESSAGE_LOG_FD + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* +]) +_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], + [Does compiler simultaneously support -c and -o options?]) +])# _LT_COMPILER_C_O + + +# _LT_COMPILER_FILE_LOCKS([TAGNAME]) +# ---------------------------------- +# Check to see if we can do hard links to lock some files if needed +m4_defun([_LT_COMPILER_FILE_LOCKS], +[m4_require([_LT_ENABLE_LOCK])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +_LT_COMPILER_C_O([$1]) + +hard_links="nottested" +if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + AC_MSG_CHECKING([if we can lock with hard links]) + hard_links=yes + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + AC_MSG_RESULT([$hard_links]) + if test "$hard_links" = no; then + AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) + need_locks=warn + fi +else + need_locks=no +fi +_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) +])# _LT_COMPILER_FILE_LOCKS + + +# _LT_CHECK_OBJDIR +# ---------------- +m4_defun([_LT_CHECK_OBJDIR], +[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], +[rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs +else + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs +fi +rmdir .libs 2>/dev/null]) +objdir=$lt_cv_objdir +_LT_DECL([], [objdir], [0], + [The name of the directory that contains temporary libtool files])dnl +m4_pattern_allow([LT_OBJDIR])dnl +AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", + [Define to the sub-directory in which libtool stores uninstalled libraries.]) +])# _LT_CHECK_OBJDIR + + +# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) +# -------------------------------------- +# Check hardcoding attributes. +m4_defun([_LT_LINKER_HARDCODE_LIBPATH], +[AC_MSG_CHECKING([how to hardcode library paths into programs]) +_LT_TAGVAR(hardcode_action, $1)= +if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || + test -n "$_LT_TAGVAR(runpath_var, $1)" || + test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + + # We can hardcode non-existent directories. + if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && + test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then + # Linking always hardcodes the temporary library directory. + _LT_TAGVAR(hardcode_action, $1)=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + _LT_TAGVAR(hardcode_action, $1)=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + _LT_TAGVAR(hardcode_action, $1)=unsupported +fi +AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) + +if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || + test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi +_LT_TAGDECL([], [hardcode_action], [0], + [How to hardcode a shared library path into an executable]) +])# _LT_LINKER_HARDCODE_LIBPATH + + +# _LT_CMD_STRIPLIB +# ---------------- +m4_defun([_LT_CMD_STRIPLIB], +[m4_require([_LT_DECL_EGREP]) +striplib= +old_striplib= +AC_MSG_CHECKING([whether stripping libraries is possible]) +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + ;; + *) + AC_MSG_RESULT([no]) + ;; + esac +fi +_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) +_LT_DECL([], [striplib], [1]) +])# _LT_CMD_STRIPLIB + + +# _LT_SYS_DYNAMIC_LINKER([TAG]) +# ----------------------------- +# PORTME Fill in your ld.so characteristics +m4_defun([_LT_SYS_DYNAMIC_LINKER], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_OBJDUMP])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl +AC_MSG_CHECKING([dynamic linker characteristics]) +m4_if([$1], + [], [ +if test "$GCC" = yes; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; + *) lt_sed_strip_eq="s,=/,/,g" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[[lt_foo]]++; } + if (lt_freq[[lt_foo]] == 1) { print lt_foo; } +}'` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi]) +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown + +case $host_os in +aix3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +aix[[4-9]]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[[01]] | aix4.[[01]].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + esac + ;; + +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi[[45]]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$cc_basename in + yes,*) + # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + ;; + esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' + ;; + + *) + # Assume MSVC wrapper + library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' + ;; + esac + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[[23]].*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2.*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[[01]]* | freebsdelf3.[[01]]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ + freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; + +haiku*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... + postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 + ;; + +interix[[3-9]]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux # correct to gnu/linux during the next big refactor + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH + AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], + [lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], + [lt_cv_shlibpath_overrides_runpath=yes])]) + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + ]) + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +*nto* | *qnx*) + version_type=qnx + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' + ;; + +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[[89]] | openbsd2.[[89]].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; + +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +rdos*) + dynamic_linker=no + ;; + +solaris*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +uts4*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +*) + dynamic_linker=no + ;; +esac +AC_MSG_RESULT([$dynamic_linker]) +test "$dynamic_linker" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +fi +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +fi + +_LT_DECL([], [variables_saved_for_relink], [1], + [Variables whose values should be saved in libtool wrapper scripts and + restored at link time]) +_LT_DECL([], [need_lib_prefix], [0], + [Do we need the "lib" prefix for modules?]) +_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) +_LT_DECL([], [version_type], [0], [Library versioning type]) +_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) +_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) +_LT_DECL([], [shlibpath_overrides_runpath], [0], + [Is shlibpath searched before the hard-coded library search path?]) +_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) +_LT_DECL([], [library_names_spec], [1], + [[List of archive names. First name is the real one, the rest are links. + The last name is the one that the linker finds with -lNAME]]) +_LT_DECL([], [soname_spec], [1], + [[The coded name of the library, if different from the real name]]) +_LT_DECL([], [install_override_mode], [1], + [Permission mode override for installation of shared libraries]) +_LT_DECL([], [postinstall_cmds], [2], + [Command to use after installation of a shared archive]) +_LT_DECL([], [postuninstall_cmds], [2], + [Command to use after uninstallation of a shared archive]) +_LT_DECL([], [finish_cmds], [2], + [Commands used to finish a libtool library installation in a directory]) +_LT_DECL([], [finish_eval], [1], + [[As "finish_cmds", except a single script fragment to be evaled but + not shown]]) +_LT_DECL([], [hardcode_into_libs], [0], + [Whether we should hardcode library paths into libraries]) +_LT_DECL([], [sys_lib_search_path_spec], [2], + [Compile-time system search path for libraries]) +_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], + [Run-time system search path for libraries]) +])# _LT_SYS_DYNAMIC_LINKER + + +# _LT_PATH_TOOL_PREFIX(TOOL) +# -------------------------- +# find a file program which can recognize shared library +AC_DEFUN([_LT_PATH_TOOL_PREFIX], +[m4_require([_LT_DECL_EGREP])dnl +AC_MSG_CHECKING([for $1]) +AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, +[case $MAGIC_CMD in +[[\\/*] | ?:[\\/]*]) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +dnl $ac_dummy forces splitting on constant user-supplied paths. +dnl POSIX.2 word splitting is done only on the output of word expansions, +dnl not every word. This closes a longstanding sh security hole. + ac_dummy="m4_if([$2], , $PATH, [$2])" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$1; then + lt_cv_path_MAGIC_CMD="$ac_dir/$1" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +_LT_EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac]) +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + AC_MSG_RESULT($MAGIC_CMD) +else + AC_MSG_RESULT(no) +fi +_LT_DECL([], [MAGIC_CMD], [0], + [Used to examine libraries when file_magic_cmd begins with "file"])dnl +])# _LT_PATH_TOOL_PREFIX + +# Old name: +AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) + + +# _LT_PATH_MAGIC +# -------------- +# find a file program which can recognize a shared library +m4_defun([_LT_PATH_MAGIC], +[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) + else + MAGIC_CMD=: + fi +fi +])# _LT_PATH_MAGIC + + +# LT_PATH_LD +# ---------- +# find the pathname to the GNU or non-GNU linker +AC_DEFUN([LT_PATH_LD], +[AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PROG_ECHO_BACKSLASH])dnl + +AC_ARG_WITH([gnu-ld], + [AS_HELP_STRING([--with-gnu-ld], + [assume the C compiler uses GNU ld @<:@default=no@:>@])], + [test "$withval" = no || with_gnu_ld=yes], + [with_gnu_ld=no])dnl + +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + AC_MSG_CHECKING([for ld used by $CC]) + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [[\\/]]* | ?:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + AC_MSG_CHECKING([for GNU ld]) +else + AC_MSG_CHECKING([for non-GNU ld]) +fi +AC_CACHE_VAL(lt_cv_path_LD, +[if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; + +cegcc*) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; + +darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; + +freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; + +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; + +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; + +interix[[3-9]]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' + ;; + +irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + +netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' + fi + ;; + +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +*nto* | *qnx*) + lt_cv_deplibs_check_method=pass_all + ;; + +openbsd*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + fi + ;; + +osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; + +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + +solaris*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; + esac + ;; + +tpf*) + lt_cv_deplibs_check_method=pass_all + ;; +esac +]) + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` + fi + ;; + esac +fi + +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown + +_LT_DECL([], [deplibs_check_method], [1], + [Method to check whether dependent libraries are shared objects]) +_LT_DECL([], [file_magic_cmd], [1], + [Command to use when deplibs_check_method = "file_magic"]) +_LT_DECL([], [file_magic_glob], [1], + [How to find potential files when deplibs_check_method = "file_magic"]) +_LT_DECL([], [want_nocaseglob], [1], + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) +])# _LT_CHECK_MAGIC_METHOD + + +# LT_PATH_NM +# ---------- +# find the pathname to a BSD- or MS-compatible name lister +AC_DEFUN([LT_PATH_NM], +[AC_REQUIRE([AC_PROG_CC])dnl +AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, +[if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM="$NM" +else + lt_nm_to_check="${ac_tool_prefix}nm" + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac + ;; + esac + fi + done + IFS="$lt_save_ifs" + done + : ${lt_cv_path_NM=no} +fi]) +if test "$lt_cv_path_NM" != "no"; then + NM="$lt_cv_path_NM" +else + # Didn't find any BSD compatible name lister, look for dumpbin. + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols" + ;; + *) + DUMPBIN=: + ;; + esac + fi + AC_SUBST([DUMPBIN]) + if test "$DUMPBIN" != ":"; then + NM="$DUMPBIN" + fi +fi +test -z "$NM" && NM=nm +AC_SUBST([NM]) +_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl + +AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], + [lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&AS_MESSAGE_LOG_FD + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&AS_MESSAGE_LOG_FD + (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) + cat conftest.out >&AS_MESSAGE_LOG_FD + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest*]) +])# LT_PATH_NM + +# Old names: +AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) +AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_PROG_NM], []) +dnl AC_DEFUN([AC_PROG_NM], []) + +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB +# -------------------------------- +# how to determine the name of the shared library +# associated with a specific link library. +# -- PORTME fill in with the dynamic library characteristics +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], +[m4_require([_LT_DECL_EGREP]) +m4_require([_LT_DECL_OBJDUMP]) +m4_require([_LT_DECL_DLLTOOL]) +AC_CACHE_CHECK([how to associate runtime and link libraries], +lt_cv_sharedlib_from_linklib_cmd, +[lt_cv_sharedlib_from_linklib_cmd='unknown' + +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac +]) +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + +_LT_DECL([], [sharedlib_from_linklib_cmd], [1], + [Command to associate shared and link libraries]) +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB + + +# _LT_PATH_MANIFEST_TOOL +# ---------------------- +# locate the manifest tool +m4_defun([_LT_PATH_MANIFEST_TOOL], +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], + [lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&AS_MESSAGE_LOG_FD + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest*]) +if test "x$lt_cv_path_mainfest_tool" != xyes; then + MANIFEST_TOOL=: +fi +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl +])# _LT_PATH_MANIFEST_TOOL + + +# LT_LIB_M +# -------- +# check for math library +AC_DEFUN([LT_LIB_M], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +LIBM= +case $host in +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) + # These system don't have libm, or don't need it + ;; +*-ncr-sysv4.3*) + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") + AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") + ;; +*) + AC_CHECK_LIB(m, cos, LIBM="-lm") + ;; +esac +AC_SUBST([LIBM]) +])# LT_LIB_M + +# Old name: +AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_CHECK_LIBM], []) + + +# _LT_COMPILER_NO_RTTI([TAGNAME]) +# ------------------------------- +m4_defun([_LT_COMPILER_NO_RTTI], +[m4_require([_LT_TAG_COMPILER])dnl + +_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + +if test "$GCC" = yes; then + case $cc_basename in + nvcc*) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; + *) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; + esac + + _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], + lt_cv_prog_compiler_rtti_exceptions, + [-fno-rtti -fno-exceptions], [], + [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) +fi +_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], + [Compiler flag to turn off builtin functions]) +])# _LT_COMPILER_NO_RTTI + + +# _LT_CMD_GLOBAL_SYMBOLS +# ---------------------- +m4_defun([_LT_CMD_GLOBAL_SYMBOLS], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([LT_PATH_NM])dnl +AC_REQUIRE([LT_PATH_LD])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_TAG_COMPILER])dnl + +# Check for command to grab the raw symbol name followed by C symbol from nm. +AC_MSG_CHECKING([command to parse $NM output from $compiler object]) +AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], +[ +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] + +# Character class describing NM global symbol codes. +symcode='[[BCDEGRST]]' + +# Regexp to match symbols that can be accessed directly from C. +sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' + +# Define system-specific variables. +case $host_os in +aix*) + symcode='[[BCDT]]' + ;; +cygwin* | mingw* | pw32* | cegcc*) + symcode='[[ABCDGISTW]]' + ;; +hpux*) + if test "$host_cpu" = ia64; then + symcode='[[ABCDEGRST]]' + fi + ;; +irix* | nonstopux*) + symcode='[[BCDEGRST]]' + ;; +osf*) + symcode='[[BCDEGQRST]]' + ;; +solaris*) + symcode='[[BDRT]]' + ;; +sco3.2v5*) + symcode='[[DT]]' + ;; +sysv4.2uw2*) + symcode='[[DT]]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[[ABDT]]' + ;; +sysv4) + symcode='[[DFNSTU]]' + ;; +esac + +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[[ABCDGIRSTW]]' ;; +esac + +# Transform an extracted symbol line into a proper C declaration. +# Some systems (esp. on ia64) link data and code symbols differently, +# so use this general approach. +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" + +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in +mingw*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; +esac + +# Try without a prefix underscore, then with it. +for ac_symprfx in "" "_"; do + + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + + # Write the raw and C identifiers. + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function + # and D for any global variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK ['"\ +" {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ +" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" \$ 0!~/External *\|/{next};"\ +" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +" {if(hide[section]) next};"\ +" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ +" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ +" s[1]~/^[@?]/{print s[1], s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" ' prfx=^$ac_symprfx]" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + + # Check to see that the pipe works correctly. + pipe_works=no + + rm -f conftest* + cat > conftest.$ac_ext <<_LT_EOF +#ifdef __cplusplus +extern "C" { +#endif +char nm_test_var; +void nm_test_func(void); +void nm_test_func(void){} +#ifdef __cplusplus +} +#endif +int main(){nm_test_var='a';nm_test_func();return(0);} +_LT_EOF + + if AC_TRY_EVAL(ac_compile); then + # Now try to grab the symbols. + nlist=conftest.nm + if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + else + rm -f "$nlist"T + fi + + # Make sure that we snagged all the symbols we need. + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT@&t@_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT@&t@_DLSYM_CONST +#else +# define LT@&t@_DLSYM_CONST const +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +_LT_EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' + + cat <<_LT_EOF >> conftest.$ac_ext + +/* The mapping between symbol names and symbols. */ +LT@&t@_DLSYM_CONST struct { + const char *name; + void *address; +} +lt__PROGRAM__LTX_preloaded_symbols[[]] = +{ + { "@PROGRAM@", (void *) 0 }, +_LT_EOF + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} +}; + +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt__PROGRAM__LTX_preloaded_symbols; +} +#endif + +#ifdef __cplusplus +} +#endif +_LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + pipe_works=yes + fi + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS + else + echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD + fi + else + echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD + fi + else + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD + fi + else + echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD + cat conftest.$ac_ext >&5 + fi + rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then + break + else + lt_cv_sys_global_symbol_pipe= + fi +done +]) +if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= +fi +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + AC_MSG_RESULT(failed) +else + AC_MSG_RESULT(ok) +fi + +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + +_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], + [Take the output of nm and produce a listing of raw symbols and C names]) +_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], + [Transform the output of nm in a proper C declaration]) +_LT_DECL([global_symbol_to_c_name_address], + [lt_cv_sys_global_symbol_to_c_name_address], [1], + [Transform the output of nm in a C name address pair]) +_LT_DECL([global_symbol_to_c_name_address_lib_prefix], + [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], + [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([], [nm_file_list_spec], [1], + [Specify filename containing input files for $NM]) +]) # _LT_CMD_GLOBAL_SYMBOLS + + +# _LT_COMPILER_PIC([TAGNAME]) +# --------------------------- +m4_defun([_LT_COMPILER_PIC], +[m4_require([_LT_TAG_COMPILER])dnl +_LT_TAGVAR(lt_prog_compiler_wl, $1)= +_LT_TAGVAR(lt_prog_compiler_pic, $1)= +_LT_TAGVAR(lt_prog_compiler_static, $1)= + +m4_if([$1], [CXX], [ + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + else + case $host_os in + aix[[4-9]]*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; + chorus*) + case $cc_basename in + cxch68*) + # Green Hills C++ Compiler + # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" + ;; + esac + ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + dgux*) + case $cc_basename in + ec++*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + ghcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; + freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + if test "$host_cpu" != ia64; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + fi + ;; + aCC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + ;; + *) + ;; + esac + ;; + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? + ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + # CC pic flag -KPIC is the default. + ;; + *) + ;; + esac + ;; + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in + KCC*) + # KAI C++ Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + ecpc* ) + # old Intel C++ for x86_64 which still supported -KPIC. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + icpc* ) + # Intel C++, used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + cxx*) + # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) + # IBM XL 8.0, 9.0 on PPC and BlueGene + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + esac + ;; + esac + ;; + lynxos*) + ;; + m88k*) + ;; + mvs*) + case $cc_basename in + cxx*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' + ;; + *) + ;; + esac + ;; + netbsd* | netbsdelf*-gnu) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + ;; + RCC*) + # Rational C++ 2.4.1 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + cxx*) + # Digital/Compaq C++ + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + *) + ;; + esac + ;; + psos*) + ;; + solaris*) + case $cc_basename in + CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + ;; + *) + ;; + esac + ;; + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + lcc*) + # Lucid + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + *) + ;; + esac + ;; + vxworks*) + ;; + *) + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +], +[ + if test "$GCC" = yes; then + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; + + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; + + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + enable_shared=no + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + + hpux9* | hpux10* | hpux11*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + ;; + + irix5* | irix6* | nonstopux*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC (with -KPIC) is the default. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' + _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' + ;; + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + ccc*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All Alpha code is PIC. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='' + ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + *Sun\ C*) + # Sun C 5.9 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + esac + ;; + + newsos6) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + + osf3* | osf4* | osf5*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All OSF/1 code is PIC. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + rdos*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + solaris*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + case $cc_basename in + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; + *) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; + esac + ;; + + sunos4*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + sysv4 | sysv4.2uw2* | sysv4.3*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + sysv4*MP*) + if test -d /usr/nec ;then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + unicos*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + + uts4*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + *) + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +]) +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" + ;; +esac + +AC_CACHE_CHECK([for $compiler option to produce PIC], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], + [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], + [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], + [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in + "" | " "*) ;; + *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; + esac], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) +fi +_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], + [Additional compiler flags for building library objects]) + +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], + [How to pass a linker flag through the compiler]) +# +# Check to make sure the static flag actually works. +# +wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" +_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], + _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), + $lt_tmp_static_flag, + [], + [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) +_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], + [Compiler flag to prevent dynamic linking]) +])# _LT_COMPILER_PIC + + +# _LT_LINKER_SHLIBS([TAGNAME]) +# ---------------------------- +# See if the linker supports building shared libraries. +m4_defun([_LT_LINKER_SHLIBS], +[AC_REQUIRE([LT_PATH_LD])dnl +AC_REQUIRE([LT_PATH_NM])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_TAG_COMPILER])dnl +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +m4_if([$1], [CXX], [ + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + case $host_os in + aix[[4-9]]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global defined + # symbols, whereas GNU nm marks them as "W". + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + ;; + cygwin* | mingw* | cegcc*) + case $cc_basename in + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + ;; + esac + ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac +], [ + runpath_var= + _LT_TAGVAR(allow_undefined_flag, $1)= + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(archive_cmds, $1)= + _LT_TAGVAR(archive_expsym_cmds, $1)= + _LT_TAGVAR(compiler_needs_object, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(hardcode_automatic, $1)=no + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_separator, $1)= + _LT_TAGVAR(hardcode_minus_L, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_TAGVAR(inherit_rpath, $1)=no + _LT_TAGVAR(link_all_deplibs, $1)=unknown + _LT_TAGVAR(module_cmds, $1)= + _LT_TAGVAR(module_expsym_cmds, $1)= + _LT_TAGVAR(old_archive_from_new_cmds, $1)= + _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= + _LT_TAGVAR(thread_safe_flag_spec, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + _LT_TAGVAR(include_expsyms, $1)= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. +dnl Note also adjust exclude_expsyms for C++ above. + extract_expsyms_cmds= + + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd*) + with_gnu_ld=no + ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; + esac + + _LT_TAGVAR(ld_shlibs, $1)=yes + + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no + if test "$with_gnu_ld" = yes; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; + *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi + + if test "$lt_use_gnu_ld_interface" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' + + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + + # See if GNU ld supports shared libraries. + case $host_os in + aix[[3-9]]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: the GNU linker, at least up to release 2.19, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. + +_LT_EOF + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + ;; + + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) + esac + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test "$tmp_diet" = no + then + tmp_addflag=' $pic_flag' + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + _LT_TAGVAR(whole_archive_flag_spec, $1)= + tmp_sharedflag='--shared' ;; + xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + ;; + esac + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + + case $cc_basename in + xlf* | bgf* | bgxlf* | mpixlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + + solaris*) + if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + sunos4*) + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + + if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then + runpath_var= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + _LT_TAGVAR(hardcode_direct, $1)=unsupported + fi + ;; + + aix[[4-9]]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global + # defined symbols, whereas GNU nm marks them as "W". + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + + if test "$GCC" = yes; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + _LT_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + ;; + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + _LT_TAGVAR(link_all_deplibs, $1)=no + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + _LT_TAGVAR(always_export_symbols, $1)=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + # This is similar to how AIX traditionally builds its shared libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + ;; + + bsdi[[45]]*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + case $cc_basename in + cl*) + # Native MSVC + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + esac + ;; + + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; + + dgux*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2.*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + hpux9*) + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; + + hpux10*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + fi + ;; + + hpux11*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + m4_if($1, [], [ + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + _LT_LINKER_OPTION([if $CC understands -b], + _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) + ;; + esac + fi + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + fi + ;; + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. + # This should be the same for all languages, so no per-tag cache variable. + AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], + [lt_cv_irix_exported_symbol], + [save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + AC_LINK_IFELSE( + [AC_LANG_SOURCE( + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], + [C++], [[int foo (void) { return 0; }]], + [Fortran 77], [[ + subroutine foo + end]], + [Fortran], [[ + subroutine foo + end]])])], + [lt_cv_irix_exported_symbol=yes], + [lt_cv_irix_exported_symbol=no]) + LDFLAGS="$save_LDFLAGS"]) + if test "$lt_cv_irix_exported_symbol" = yes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + newsos6) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *nto* | *qnx*) + ;; + + openbsd*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + else + case $host_os in + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + ;; + esac + fi + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + + osf3*) + if test "$GCC" = yes; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + + # Both c and cxx compiler support -rpath directly + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + + solaris*) + _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) + wlarc='' + _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + ;; + *) + wlarc='${wl}' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + ;; + esac + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test "$GCC" = yes; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + fi + ;; + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + sysv4) + case $host_vendor in + sni) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' + _LT_TAGVAR(hardcode_direct, $1)=no + ;; + motorola) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + sysv4.3*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + _LT_TAGVAR(ld_shlibs, $1)=yes + fi + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + uts4*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *) + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + + if test x$host_vendor = xsni; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' + ;; + esac + fi + fi +]) +AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) +test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + +_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld + +_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl +_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl +_LT_DECL([], [extract_expsyms_cmds], [2], + [The commands to extract the exported symbol list from a shared archive]) + +# +# Do we need to explicitly link libc? +# +case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in +x|xyes) + # Assume -lc should be added + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $_LT_TAGVAR(archive_cmds, $1) in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + AC_CACHE_CHECK([whether -lc should be explicitly linked in], + [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), + [$RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) + pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) + _LT_TAGVAR(allow_undefined_flag, $1)= + if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) + then + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no + else + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes + fi + _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + ]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) + ;; + esac + fi + ;; +esac + +_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], + [Whether or not to add -lc for building shared libraries]) +_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], + [enable_shared_with_static_runtimes], [0], + [Whether or not to disallow shared libs when runtime libs are static]) +_LT_TAGDECL([], [export_dynamic_flag_spec], [1], + [Compiler flag to allow reflexive dlopens]) +_LT_TAGDECL([], [whole_archive_flag_spec], [1], + [Compiler flag to generate shared objects directly from archives]) +_LT_TAGDECL([], [compiler_needs_object], [1], + [Whether the compiler copes with passing no objects directly]) +_LT_TAGDECL([], [old_archive_from_new_cmds], [2], + [Create an old-style archive from a shared archive]) +_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], + [Create a temporary old-style archive to link instead of a shared archive]) +_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) +_LT_TAGDECL([], [archive_expsym_cmds], [2]) +_LT_TAGDECL([], [module_cmds], [2], + [Commands used to build a loadable module if different from building + a shared archive.]) +_LT_TAGDECL([], [module_expsym_cmds], [2]) +_LT_TAGDECL([], [with_gnu_ld], [1], + [Whether we are building with GNU ld or not]) +_LT_TAGDECL([], [allow_undefined_flag], [1], + [Flag that allows shared libraries with undefined symbols to be built]) +_LT_TAGDECL([], [no_undefined_flag], [1], + [Flag that enforces no undefined symbols]) +_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], + [Flag to hardcode $libdir into a binary during linking. + This must work even if $libdir does not exist]) +_LT_TAGDECL([], [hardcode_libdir_separator], [1], + [Whether we need a single "-rpath" flag with a separated argument]) +_LT_TAGDECL([], [hardcode_direct], [0], + [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + DIR into the resulting binary]) +_LT_TAGDECL([], [hardcode_direct_absolute], [0], + [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + DIR into the resulting binary and the resulting library dependency is + "absolute", i.e impossible to change by setting ${shlibpath_var} if the + library is relocated]) +_LT_TAGDECL([], [hardcode_minus_L], [0], + [Set to "yes" if using the -LDIR flag during linking hardcodes DIR + into the resulting binary]) +_LT_TAGDECL([], [hardcode_shlibpath_var], [0], + [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR + into the resulting binary]) +_LT_TAGDECL([], [hardcode_automatic], [0], + [Set to "yes" if building a shared library automatically hardcodes DIR + into the library and all subsequent libraries and executables linked + against it]) +_LT_TAGDECL([], [inherit_rpath], [0], + [Set to yes if linker adds runtime paths of dependent libraries + to runtime path list]) +_LT_TAGDECL([], [link_all_deplibs], [0], + [Whether libtool must link a program against all its dependency libraries]) +_LT_TAGDECL([], [always_export_symbols], [0], + [Set to "yes" if exported symbols are required]) +_LT_TAGDECL([], [export_symbols_cmds], [2], + [The commands to list exported symbols]) +_LT_TAGDECL([], [exclude_expsyms], [1], + [Symbols that should not be listed in the preloaded symbols]) +_LT_TAGDECL([], [include_expsyms], [1], + [Symbols that must always be exported]) +_LT_TAGDECL([], [prelink_cmds], [2], + [Commands necessary for linking programs (against libraries) with templates]) +_LT_TAGDECL([], [postlink_cmds], [2], + [Commands necessary for finishing linking programs]) +_LT_TAGDECL([], [file_list_spec], [1], + [Specify filename containing input files]) +dnl FIXME: Not yet implemented +dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], +dnl [Compiler flag to generate thread safe objects]) +])# _LT_LINKER_SHLIBS + + +# _LT_LANG_C_CONFIG([TAG]) +# ------------------------ +# Ensure that the configuration variables for a C compiler are suitably +# defined. These variables are subsequently used by _LT_CONFIG to write +# the compiler configuration to `libtool'. +m4_defun([_LT_LANG_C_CONFIG], +[m4_require([_LT_DECL_EGREP])dnl +lt_save_CC="$CC" +AC_LANG_PUSH(C) + +# Source file extension for C test sources. +ac_ext=c + +# Object file extension for compiled C test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}' + +_LT_TAG_COMPILER +# Save the default compiler, since it gets overwritten when the other +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. +compiler_DEFAULT=$CC + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + LT_SYS_DLOPEN_SELF + _LT_CMD_STRIPLIB + + # Report which library types will actually be built + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + + aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_CONFIG($1) +fi +AC_LANG_POP +CC="$lt_save_CC" +])# _LT_LANG_C_CONFIG + + +# _LT_LANG_CXX_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for a C++ compiler are suitably +# defined. These variables are subsequently used by _LT_CONFIG to write +# the compiler configuration to `libtool'. +m4_defun([_LT_LANG_CXX_CONFIG], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl +if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + AC_PROG_CXXCPP +else + _lt_caught_CXX_error=yes +fi + +AC_LANG_PUSH(C++) +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(compiler_needs_object, $1)=no +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for C++ test sources. +ac_ext=cpp + +# Object file extension for compiled C++ test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the CXX compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_caught_CXX_error" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="int some_variable = 0;" + + # Code to be used in simple link tests + lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_CFLAGS=$CFLAGS + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX + lt_save_with_gnu_ld=$with_gnu_ld + lt_save_path_LD=$lt_cv_path_LD + if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx + else + $as_unset lt_cv_prog_gnu_ld + fi + if test -n "${lt_cv_path_LDCXX+set}"; then + lt_cv_path_LD=$lt_cv_path_LDCXX + else + $as_unset lt_cv_path_LD + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} + CFLAGS=$CXXFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + + if test -n "$compiler"; then + # We don't want -fno-exception when compiling C++ code, so set the + # no_builtin_flag separately + if test "$GXX" = yes; then + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + else + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + fi + + if test "$GXX" = yes; then + # Set up default GNU C++ configuration + + LT_PATH_LD + + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + + # If archive_cmds runs LD, not CC, wlarc should be empty + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to + # investigate it a little bit more. (MM) + wlarc='${wl}' + + # ancient GNU ld didn't support --whole-archive et. al. + if eval "`$CC -print-prog-name=ld` --help 2>&1" | + $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + with_gnu_ld=no + wlarc= + + # A generic and very simple default shared library creation + # command for GNU C++ for the case where it uses the native + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + + else + GXX=no + with_gnu_ld=no + wlarc= + fi + + # PORTME: fill in a description of your system's C++ link characteristics + AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) + _LT_TAGVAR(ld_shlibs, $1)=yes + case $host_os in + aix3*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aix[[4-9]]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) + aix_use_runtimelinking=yes + break + ;; + esac + done + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + + if test "$GXX" = yes; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + _LT_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to + # export. + _LT_TAGVAR(always_export_symbols, $1)=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an empty + # executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + # This is similar to how AIX traditionally builds its shared + # libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + chorus*) + case $cc_basename in + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + cygwin* | mingw* | pw32* | cegcc*) + case $GXX,$cc_basename in + ,cl* | no,cl*) + # Native MSVC + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # g++ + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; + + dgux*) + case $cc_basename in + ec++*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + ghcx*) + # Green Hills C++ Compiler + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + freebsd2.*) + # C++ shared libraries reported to be fairly broken before + # switch to ELF + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + freebsd-elf*) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + ;; + + freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; + + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + hpux9*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test "$GXX" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + hpux10*|hpux11*) + if test $with_gnu_ld = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) + ;; + *) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; + esac + fi + case $host_cpu in + hppa*64*|ia64*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; + esac + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test "$GXX" = yes; then + if test $with_gnu_ld = no; then + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + irix5* | irix6*) + case $cc_basename in + CC*) + # SGI C++ + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' + ;; + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + fi + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + esac + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + ;; + + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + ;; + icpc* | ecpc* ) + # Intel C++ + with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + case `$CC -V` in + *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) + _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' + _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + *) # Version 6 and above use weak symbols + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + ;; + cxx*) + # Compaq C++ + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + ;; + xl* | mpixl* | bgxl*) + # IBM XL 8.0 on PPC, with GNU ld + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + + # Not sure whether something based on + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 + # would be better. + output_verbose_link_cmd='func_echo_all' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + esac + ;; + esac + ;; + + lynxos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + m88k*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + mvs*) + case $cc_basename in + cxx*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + fi + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; + + *nto* | *qnx*) + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; + + openbsd2*) + # C++ shared libraries are fairly broken + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + openbsd*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd=func_echo_all + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Archives containing C++ object files must be created using + # the KAI C++ compiler. + case $host in + osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; + *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; + esac + ;; + RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + cxx*) + case $host in + osf3*) + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + ;; + *) + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ + $RM $lib.exp' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + case $host in + osf3*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + psos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + lcc*) + # Lucid + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + solaris*) + case $cc_basename in + CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(archive_cmds_need_lc,$1)=yes + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. + # Supported since Solaris 2.6 (maybe 2.5.1?) + _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + ;; + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes + + output_verbose_link_cmd='func_echo_all' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + + # The C++ compiler must be used to create the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; + *) + # GNU C++ compiler with Solaris linker + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + else + # g++ 2.7 appears to require `-G' NOT `-shared' on this + # platform. + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + fi + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + ;; + esac + fi + ;; + esac + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ + '"$_LT_TAGVAR(old_archive_cmds, $1)" + _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ + '"$_LT_TAGVAR(reload_cmds, $1)" + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + vxworks*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + + AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) + test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + + _LT_TAGVAR(GCC, $1)="$GXX" + _LT_TAGVAR(LD, $1)="$LD" + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_SYS_HIDDEN_LIBDEPS($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC + with_gnu_ld=$lt_save_with_gnu_ld + lt_cv_path_LDCXX=$lt_cv_path_LD + lt_cv_path_LD=$lt_save_path_LD + lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld + lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +fi # test "$_lt_caught_CXX_error" != yes + +AC_LANG_POP +])# _LT_LANG_CXX_CONFIG + + +# _LT_FUNC_STRIPNAME_CNF +# ---------------------- +# func_stripname_cnf prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# +# This function is identical to the (non-XSI) version of func_stripname, +# except this one can be used by m4 code that may be executed by configure, +# rather than the libtool script. +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl +AC_REQUIRE([_LT_DECL_SED]) +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) +func_stripname_cnf () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname_cnf +])# _LT_FUNC_STRIPNAME_CNF + +# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) +# --------------------------------- +# Figure out "hidden" library dependencies from verbose +# compiler output when linking a shared library. +# Parse the compiler output and extract the necessary +# objects, libraries and library flags. +m4_defun([_LT_SYS_HIDDEN_LIBDEPS], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl +# Dependencies to place before and after the object being linked: +_LT_TAGVAR(predep_objects, $1)= +_LT_TAGVAR(postdep_objects, $1)= +_LT_TAGVAR(predeps, $1)= +_LT_TAGVAR(postdeps, $1)= +_LT_TAGVAR(compiler_lib_search_path, $1)= + +dnl we can't use the lt_simple_compile_test_code here, +dnl because it contains code intended for an executable, +dnl not a library. It's possible we should let each +dnl tag define a new lt_????_link_test_code variable, +dnl but it's only used here... +m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF +int a; +void foo (void) { a = 0; } +_LT_EOF +], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF +class Foo +{ +public: + Foo (void) { a = 0; } +private: + int a; +}; +_LT_EOF +], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF + subroutine foo + implicit none + integer*4 a + a=0 + return + end +_LT_EOF +], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF + subroutine foo + implicit none + integer a + a=0 + return + end +_LT_EOF +], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF +public class foo { + private int a; + public void bar (void) { + a = 0; + } +}; +_LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF +]) + +_lt_libdeps_save_CFLAGS=$CFLAGS +case "$CC $CFLAGS " in #( +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; +esac + +dnl Parse the compiler output and extract the necessary +dnl objects, libraries and library flags. +if AC_TRY_EVAL(ac_compile); then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. + + # Sentinel used to keep track of whether or not we are before + # the conftest object file. + pre_test_object_deps_done=no + + for p in `eval "$output_verbose_link_cmd"`; do + case ${prev}${p} in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. + # Remove the space. + if test $p = "-L" || + test $p = "-R"; then + prev=$p + continue + fi + + # Expand the sysroot to ease extracting the directories later. + if test -z "$prev"; then + case $p in + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; + esac + fi + case $p in + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; + esac + if test "$pre_test_object_deps_done" = no; then + case ${prev} in + -L | -R) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. + if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then + _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" + else + _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" + fi + ;; + # The "-l" case would never come before the object being + # linked, so don't bother handling this case. + esac + else + if test -z "$_LT_TAGVAR(postdeps, $1)"; then + _LT_TAGVAR(postdeps, $1)="${prev}${p}" + else + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + fi + fi + prev= + ;; + + *.lto.$objext) ;; # Ignore GCC LTO objects + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. + if test "$p" = "conftest.$objext"; then + pre_test_object_deps_done=yes + continue + fi + + if test "$pre_test_object_deps_done" = no; then + if test -z "$_LT_TAGVAR(predep_objects, $1)"; then + _LT_TAGVAR(predep_objects, $1)="$p" + else + _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" + fi + else + if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then + _LT_TAGVAR(postdep_objects, $1)="$p" + else + _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" + fi + fi + ;; + + *) ;; # Ignore the rest. + + esac + done + + # Clean up. + rm -f a.out a.exe +else + echo "libtool.m4: error: problem compiling $1 test program" +fi + +$RM -f confest.$objext +CFLAGS=$_lt_libdeps_save_CFLAGS + +# PORTME: override above test on systems where it is broken +m4_if([$1], [CXX], +[case $host_os in +interix[[3-9]]*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + _LT_TAGVAR(predep_objects,$1)= + _LT_TAGVAR(postdep_objects,$1)= + _LT_TAGVAR(postdeps,$1)= + ;; + +linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + + if test "$solaris_use_stlport4" != yes; then + _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi + ;; + esac + ;; + +solaris*) + case $cc_basename in + CC* | sunCC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + + # Adding this requires a known-good setup of shared libraries for + # Sun compiler versions before 5.6, else PIC objects from an old + # archive will be linked into the output, leading to subtle bugs. + if test "$solaris_use_stlport4" != yes; then + _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi + ;; + esac + ;; +esac +]) + +case " $_LT_TAGVAR(postdeps, $1) " in +*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; +esac + _LT_TAGVAR(compiler_lib_search_dirs, $1)= +if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then + _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` +fi +_LT_TAGDECL([], [compiler_lib_search_dirs], [1], + [The directories searched by this compiler when creating a shared library]) +_LT_TAGDECL([], [predep_objects], [1], + [Dependencies to place before and after the objects being linked to + create a shared library]) +_LT_TAGDECL([], [postdep_objects], [1]) +_LT_TAGDECL([], [predeps], [1]) +_LT_TAGDECL([], [postdeps], [1]) +_LT_TAGDECL([], [compiler_lib_search_path], [1], + [The library search path used internally by the compiler when linking + a shared library]) +])# _LT_SYS_HIDDEN_LIBDEPS + + +# _LT_LANG_F77_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for a Fortran 77 compiler are +# suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_F77_CONFIG], +[AC_LANG_PUSH(Fortran 77) +if test -z "$F77" || test "X$F77" = "Xno"; then + _lt_disable_F77=yes +fi + +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for f77 test sources. +ac_ext=f + +# Object file extension for compiled f77 test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the F77 compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_disable_F77" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t + return + end +" + + # Code to be used in simple link tests + lt_simple_link_test_code="\ + program t + end +" + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS + CC=${F77-"f77"} + CFLAGS=$FFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + GCC=$G77 + if test -n "$compiler"; then + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_TAGVAR(GCC, $1)="$G77" + _LT_TAGVAR(LD, $1)="$LD" + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + GCC=$lt_save_GCC + CC="$lt_save_CC" + CFLAGS="$lt_save_CFLAGS" +fi # test "$_lt_disable_F77" != yes + +AC_LANG_POP +])# _LT_LANG_F77_CONFIG + + +# _LT_LANG_FC_CONFIG([TAG]) +# ------------------------- +# Ensure that the configuration variables for a Fortran compiler are +# suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_FC_CONFIG], +[AC_LANG_PUSH(Fortran) + +if test -z "$FC" || test "X$FC" = "Xno"; then + _lt_disable_FC=yes +fi + +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for fc test sources. +ac_ext=${ac_fc_srcext-f} + +# Object file extension for compiled fc test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the FC compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_disable_FC" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t + return + end +" + + # Code to be used in simple link tests + lt_simple_link_test_code="\ + program t + end +" + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS + CC=${FC-"f95"} + CFLAGS=$FCFLAGS + compiler=$CC + GCC=$ac_cv_fc_compiler_gnu + + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + + if test -n "$compiler"; then + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" + _LT_TAGVAR(LD, $1)="$LD" + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_SYS_HIDDEN_LIBDEPS($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + GCC=$lt_save_GCC + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test "$_lt_disable_FC" != yes + +AC_LANG_POP +])# _LT_LANG_FC_CONFIG + + +# _LT_LANG_GCJ_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Java Compiler compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GCJ_CONFIG], +[AC_REQUIRE([LT_PROG_GCJ])dnl +AC_LANG_SAVE + +# Source file extension for Java test sources. +ac_ext=java + +# Object file extension for compiled Java test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="class foo {}" + +# Code to be used in simple link tests +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GCJ-"gcj"} +CFLAGS=$GCJFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# GCJ did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GCJ_CONFIG + + +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + +# _LT_LANG_RC_CONFIG([TAG]) +# ------------------------- +# Ensure that the configuration variables for the Windows resource compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_RC_CONFIG], +[AC_REQUIRE([LT_PROG_RC])dnl +AC_LANG_SAVE + +# Source file extension for RC test sources. +ac_ext=rc + +# Object file extension for compiled RC test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' + +# Code to be used in simple link tests +lt_simple_link_test_code="$lt_simple_compile_test_code" + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC="$CC" +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC= +CC=${RC-"windres"} +CFLAGS= +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_CC_BASENAME([$compiler]) +_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + +if test -n "$compiler"; then + : + _LT_CONFIG($1) +fi + +GCC=$lt_save_GCC +AC_LANG_RESTORE +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_RC_CONFIG + + +# LT_PROG_GCJ +# ----------- +AC_DEFUN([LT_PROG_GCJ], +[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], + [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], + [AC_CHECK_TOOL(GCJ, gcj,) + test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + AC_SUBST(GCJFLAGS)])])[]dnl +]) + +# Old name: +AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_GCJ], []) + + +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + +# LT_PROG_RC +# ---------- +AC_DEFUN([LT_PROG_RC], +[AC_CHECK_TOOL(RC, windres,) +]) + +# Old name: +AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_RC], []) + + +# _LT_DECL_EGREP +# -------------- +# If we don't have a new enough Autoconf to choose the best grep +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_EGREP], +[AC_REQUIRE([AC_PROG_EGREP])dnl +AC_REQUIRE([AC_PROG_FGREP])dnl +test -z "$GREP" && GREP=grep +_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) +_LT_DECL([], [EGREP], [1], [An ERE matcher]) +_LT_DECL([], [FGREP], [1], [A literal string matcher]) +dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too +AC_SUBST([GREP]) +]) + + +# _LT_DECL_OBJDUMP +# -------------- +# If we don't have a new enough Autoconf to choose the best objdump +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_OBJDUMP], +[AC_CHECK_TOOL(OBJDUMP, objdump, false) +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) +AC_SUBST([OBJDUMP]) +]) + +# _LT_DECL_DLLTOOL +# ---------------- +# Ensure DLLTOOL variable is set. +m4_defun([_LT_DECL_DLLTOOL], +[AC_CHECK_TOOL(DLLTOOL, dlltool, false) +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) +AC_SUBST([DLLTOOL]) +]) + +# _LT_DECL_SED +# ------------ +# Check for a fully-functional sed program, that truncates +# as few characters as possible. Prefer GNU sed if found. +m4_defun([_LT_DECL_SED], +[AC_PROG_SED +test -z "$SED" && SED=sed +Xsed="$SED -e 1s/^X//" +_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) +_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], + [Sed that helps us avoid accidentally triggering echo(1) options like -n]) +])# _LT_DECL_SED + +m4_ifndef([AC_PROG_SED], [ +############################################################ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_SED. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +############################################################ + +m4_defun([AC_PROG_SED], +[AC_MSG_CHECKING([for a sed that does not truncate output]) +AC_CACHE_VAL(lt_cv_path_SED, +[# Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi + done + done +done +IFS=$as_save_IFS +lt_ac_max=0 +lt_ac_count=0 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris +# along with /bin/sed that truncates output. +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do + test ! -f $lt_ac_sed && continue + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in + # Check for GNU sed and select it if it is found. + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then + lt_cv_path_SED=$lt_ac_sed + break + fi + while true; do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >>conftest.nl + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break + cmp -s conftest.out conftest.nl || break + # 10000 chars as input seems more than enough + test $lt_ac_count -gt 10 && break + lt_ac_count=`expr $lt_ac_count + 1` + if test $lt_ac_count -gt $lt_ac_max; then + lt_ac_max=$lt_ac_count + lt_cv_path_SED=$lt_ac_sed + fi + done +done +]) +SED=$lt_cv_path_SED +AC_SUBST([SED]) +AC_MSG_RESULT([$SED]) +])#AC_PROG_SED +])#m4_ifndef + +# Old name: +AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_SED], []) + + +# _LT_CHECK_SHELL_FEATURES +# ------------------------ +# Find out whether the shell is Bourne or XSI compatible, +# or has some other useful features. +m4_defun([_LT_CHECK_SHELL_FEATURES], +[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) +# Try some XSI features +xsi_shell=no +( _lt_dummy="a/b/c" + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +AC_MSG_RESULT([$xsi_shell]) +_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) + +AC_MSG_CHECKING([whether the shell understands "+="]) +lt_shell_append=no +( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ + >/dev/null 2>&1 \ + && lt_shell_append=yes +AC_MSG_RESULT([$lt_shell_append]) +_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) + +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset +else + lt_unset=false +fi +_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl + +# test EBCDIC or ASCII +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + lt_SP2NL='tr \040 \012' + lt_NL2SP='tr \015\012 \040\040' + ;; + *) # EBCDIC based system + lt_SP2NL='tr \100 \n' + lt_NL2SP='tr \r\n \100\100' + ;; +esac +_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl +_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl +])# _LT_CHECK_SHELL_FEATURES + + +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) +# ------------------------------------------------------ +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and +# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. +m4_defun([_LT_PROG_FUNCTION_REPLACE], +[dnl { +sed -e '/^$1 ()$/,/^} # $1 /c\ +$1 ()\ +{\ +m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) +} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: +]) + + +# _LT_PROG_REPLACE_SHELLFNS +# ------------------------- +# Replace existing portable implementations of several shell functions with +# equivalent extended shell implementations where those features are available.. +m4_defun([_LT_PROG_REPLACE_SHELLFNS], +[if test x"$xsi_shell" = xyes; then + _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac]) + + _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl + func_basename_result="${1##*/}"]) + + _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac + func_basename_result="${1##*/}"]) + + _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary parameter first. + func_stripname_result=${3} + func_stripname_result=${func_stripname_result#"${1}"} + func_stripname_result=${func_stripname_result%"${2}"}]) + + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl + func_split_long_opt_name=${1%%=*} + func_split_long_opt_arg=${1#*=}]) + + _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) + + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; + *) func_lo2o_result=${1} ;; + esac]) + + _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) + + _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) + + _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) +fi + +if test x"$lt_shell_append" = xyes; then + _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) + + _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl + func_quote_for_eval "${2}" +dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ + eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) + + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +else + # Save a `func_append' function call even when '+=' is not available + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +fi + +if test x"$_lt_function_replace_fail" = x":"; then + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) +fi +]) + +# _LT_PATH_CONVERSION_FUNCTIONS +# ----------------------------- +# Determine which file name conversion functions should be used by +# func_to_host_file (and, implicitly, by func_to_host_path). These are needed +# for certain cross-compile configurations and native mingw. +m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_MSG_CHECKING([how to convert $build file names to $host format]) +AC_CACHE_VAL(lt_cv_to_host_file_cmd, +[case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac +]) +to_host_file_cmd=$lt_cv_to_host_file_cmd +AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) +_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], + [0], [convert $build file names to $host format])dnl + +AC_MSG_CHECKING([how to convert $build file names to toolchain format]) +AC_CACHE_VAL(lt_cv_to_tool_file_cmd, +[#assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac +]) +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], + [0], [convert $build files to toolchain format])dnl +])# _LT_PATH_CONVERSION_FUNCTIONS diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4 new file mode 100644 index 0000000..5d9acd8 --- /dev/null +++ b/m4/ltoptions.m4 @@ -0,0 +1,384 @@ +# Helper functions for option handling. -*- Autoconf -*- +# +# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# Written by Gary V. Vaughan, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 7 ltoptions.m4 + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) + + +# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) +# ------------------------------------------ +m4_define([_LT_MANGLE_OPTION], +[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) + + +# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) +# --------------------------------------- +# Set option OPTION-NAME for macro MACRO-NAME, and if there is a +# matching handler defined, dispatch to it. Other OPTION-NAMEs are +# saved as a flag. +m4_define([_LT_SET_OPTION], +[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl +m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), + _LT_MANGLE_DEFUN([$1], [$2]), + [m4_warning([Unknown $1 option `$2'])])[]dnl +]) + + +# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) +# ------------------------------------------------------------ +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +m4_define([_LT_IF_OPTION], +[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) + + +# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) +# ------------------------------------------------------- +# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME +# are set. +m4_define([_LT_UNLESS_OPTIONS], +[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), + [m4_define([$0_found])])])[]dnl +m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 +])[]dnl +]) + + +# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) +# ---------------------------------------- +# OPTION-LIST is a space-separated list of Libtool options associated +# with MACRO-NAME. If any OPTION has a matching handler declared with +# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about +# the unknown option and exit. +m4_defun([_LT_SET_OPTIONS], +[# Set options +m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [_LT_SET_OPTION([$1], _LT_Option)]) + +m4_if([$1],[LT_INIT],[ + dnl + dnl Simply set some default values (i.e off) if boolean options were not + dnl specified: + _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no + ]) + _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no + ]) + dnl + dnl If no reference was made to various pairs of opposing options, then + dnl we run the default mode handler for the pair. For example, if neither + dnl `shared' nor `disable-shared' was passed, we enable building of shared + dnl archives by default: + _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) + _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], + [_LT_ENABLE_FAST_INSTALL]) + ]) +])# _LT_SET_OPTIONS + + +## --------------------------------- ## +## Macros to handle LT_INIT options. ## +## --------------------------------- ## + +# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) +# ----------------------------------------- +m4_define([_LT_MANGLE_DEFUN], +[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) + + +# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) +# ----------------------------------------------- +m4_define([LT_OPTION_DEFINE], +[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl +])# LT_OPTION_DEFINE + + +# dlopen +# ------ +LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes +]) + +AU_DEFUN([AC_LIBTOOL_DLOPEN], +[_LT_SET_OPTION([LT_INIT], [dlopen]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the `dlopen' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) + + +# win32-dll +# --------- +# Declare package support for building win32 dll's. +LT_OPTION_DEFINE([LT_INIT], [win32-dll], +[enable_win32_dll=yes + +case $host in +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) + AC_CHECK_TOOL(AS, as, false) + AC_CHECK_TOOL(DLLTOOL, dlltool, false) + AC_CHECK_TOOL(OBJDUMP, objdump, false) + ;; +esac + +test -z "$AS" && AS=as +_LT_DECL([], [AS], [1], [Assembler program])dnl + +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl + +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl +])# win32-dll + +AU_DEFUN([AC_LIBTOOL_WIN32_DLL], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +_LT_SET_OPTION([LT_INIT], [win32-dll]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the `win32-dll' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) + + +# _LT_ENABLE_SHARED([DEFAULT]) +# ---------------------------- +# implement the --enable-shared flag, and supports the `shared' and +# `disable-shared' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +m4_define([_LT_ENABLE_SHARED], +[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([shared], + [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], + [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) + + _LT_DECL([build_libtool_libs], [enable_shared], [0], + [Whether or not to build shared libraries]) +])# _LT_ENABLE_SHARED + +LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) + +# Old names: +AC_DEFUN([AC_ENABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) +]) + +AC_DEFUN([AC_DISABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], [disable-shared]) +]) + +AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_SHARED], []) +dnl AC_DEFUN([AM_DISABLE_SHARED], []) + + + +# _LT_ENABLE_STATIC([DEFAULT]) +# ---------------------------- +# implement the --enable-static flag, and support the `static' and +# `disable-static' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +m4_define([_LT_ENABLE_STATIC], +[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([static], + [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], + [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [enable_static=]_LT_ENABLE_STATIC_DEFAULT) + + _LT_DECL([build_old_libs], [enable_static], [0], + [Whether or not to build static libraries]) +])# _LT_ENABLE_STATIC + +LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) + +# Old names: +AC_DEFUN([AC_ENABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) +]) + +AC_DEFUN([AC_DISABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], [disable-static]) +]) + +AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_STATIC], []) +dnl AC_DEFUN([AM_DISABLE_STATIC], []) + + + +# _LT_ENABLE_FAST_INSTALL([DEFAULT]) +# ---------------------------------- +# implement the --enable-fast-install flag, and support the `fast-install' +# and `disable-fast-install' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +m4_define([_LT_ENABLE_FAST_INSTALL], +[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([fast-install], + [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], + [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) + +_LT_DECL([fast_install], [enable_fast_install], [0], + [Whether or not to optimize for fast installation])dnl +])# _LT_ENABLE_FAST_INSTALL + +LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) + +# Old names: +AU_DEFUN([AC_ENABLE_FAST_INSTALL], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you put +the `fast-install' option into LT_INIT's first parameter.]) +]) + +AU_DEFUN([AC_DISABLE_FAST_INSTALL], +[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you put +the `disable-fast-install' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) +dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) + + +# _LT_WITH_PIC([MODE]) +# -------------------- +# implement the --with-pic flag, and support the `pic-only' and `no-pic' +# LT_INIT options. +# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +m4_define([_LT_WITH_PIC], +[AC_ARG_WITH([pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [pic_mode=default]) + +test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) + +_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl +])# _LT_WITH_PIC + +LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) + +# Old name: +AU_DEFUN([AC_LIBTOOL_PICMODE], +[_LT_SET_OPTION([LT_INIT], [pic-only]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the `pic-only' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) + +## ----------------- ## +## LTDL_INIT Options ## +## ----------------- ## + +m4_define([_LTDL_MODE], []) +LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], + [m4_define([_LTDL_MODE], [nonrecursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [recursive], + [m4_define([_LTDL_MODE], [recursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [subproject], + [m4_define([_LTDL_MODE], [subproject])]) + +m4_define([_LTDL_TYPE], []) +LT_OPTION_DEFINE([LTDL_INIT], [installable], + [m4_define([_LTDL_TYPE], [installable])]) +LT_OPTION_DEFINE([LTDL_INIT], [convenience], + [m4_define([_LTDL_TYPE], [convenience])]) diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4 new file mode 100644 index 0000000..9000a05 --- /dev/null +++ b/m4/ltsugar.m4 @@ -0,0 +1,123 @@ +# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- +# +# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Written by Gary V. Vaughan, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 6 ltsugar.m4 + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) + + +# lt_join(SEP, ARG1, [ARG2...]) +# ----------------------------- +# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their +# associated separator. +# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier +# versions in m4sugar had bugs. +m4_define([lt_join], +[m4_if([$#], [1], [], + [$#], [2], [[$2]], + [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) +m4_define([_lt_join], +[m4_if([$#$2], [2], [], + [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) + + +# lt_car(LIST) +# lt_cdr(LIST) +# ------------ +# Manipulate m4 lists. +# These macros are necessary as long as will still need to support +# Autoconf-2.59 which quotes differently. +m4_define([lt_car], [[$1]]) +m4_define([lt_cdr], +[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], + [$#], 1, [], + [m4_dquote(m4_shift($@))])]) +m4_define([lt_unquote], $1) + + +# lt_append(MACRO-NAME, STRING, [SEPARATOR]) +# ------------------------------------------ +# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +# Note that neither SEPARATOR nor STRING are expanded; they are appended +# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). +# No SEPARATOR is output if MACRO-NAME was previously undefined (different +# than defined and empty). +# +# This macro is needed until we can rely on Autoconf 2.62, since earlier +# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. +m4_define([lt_append], +[m4_define([$1], + m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) + + + +# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) +# ---------------------------------------------------------- +# Produce a SEP delimited list of all paired combinations of elements of +# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list +# has the form PREFIXmINFIXSUFFIXn. +# Needed until we can rely on m4_combine added in Autoconf 2.62. +m4_define([lt_combine], +[m4_if(m4_eval([$# > 3]), [1], + [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl +[[m4_foreach([_Lt_prefix], [$2], + [m4_foreach([_Lt_suffix], + ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, + [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) + + +# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) +# ----------------------------------------------------------------------- +# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited +# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. +m4_define([lt_if_append_uniq], +[m4_ifdef([$1], + [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], + [lt_append([$1], [$2], [$3])$4], + [$5])], + [lt_append([$1], [$2], [$3])$4])]) + + +# lt_dict_add(DICT, KEY, VALUE) +# ----------------------------- +m4_define([lt_dict_add], +[m4_define([$1($2)], [$3])]) + + +# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) +# -------------------------------------------- +m4_define([lt_dict_add_subkey], +[m4_define([$1($2:$3)], [$4])]) + + +# lt_dict_fetch(DICT, KEY, [SUBKEY]) +# ---------------------------------- +m4_define([lt_dict_fetch], +[m4_ifval([$3], + m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), + m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) + + +# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) +# ----------------------------------------------------------------- +m4_define([lt_if_dict_fetch], +[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], + [$5], + [$6])]) + + +# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) +# -------------------------------------------------------------- +m4_define([lt_dict_filter], +[m4_if([$5], [], [], + [lt_join(m4_quote(m4_default([$4], [[, ]])), + lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), + [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl +]) diff --git a/m4/ltversion.m4 b/m4/ltversion.m4 new file mode 100644 index 0000000..07a8602 --- /dev/null +++ b/m4/ltversion.m4 @@ -0,0 +1,23 @@ +# ltversion.m4 -- version numbers -*- Autoconf -*- +# +# Copyright (C) 2004 Free Software Foundation, Inc. +# Written by Scott James Remnant, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# @configure_input@ + +# serial 3337 ltversion.m4 +# This file is part of GNU Libtool + +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) + +AC_DEFUN([LTVERSION_VERSION], +[macro_version='2.4.2' +macro_revision='1.3337' +_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) +_LT_DECL(, macro_revision, 0) +]) diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4 new file mode 100644 index 0000000..c573da9 --- /dev/null +++ b/m4/lt~obsolete.m4 @@ -0,0 +1,98 @@ +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- +# +# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +# Written by Scott James Remnant, 2004. +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 5 lt~obsolete.m4 + +# These exist entirely to fool aclocal when bootstrapping libtool. +# +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# which have later been changed to m4_define as they aren't part of the +# exported API, or moved to Autoconf or Automake where they belong. +# +# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN +# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us +# using a macro with the same name in our local m4/libtool.m4 it'll +# pull the old libtool.m4 in (it doesn't see our shiny new m4_define +# and doesn't know about Autoconf macros at all.) +# +# So we provide this file, which has a silly filename so it's always +# included after everything else. This provides aclocal with the +# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything +# because those macros already exist, or will be overwritten later. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# +# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. +# Yes, that means every name once taken will need to remain here until +# we give up compatibility with versions before 1.7, at which point +# we need to keep only those names which we still refer to. + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) + +m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) +m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) +m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) +m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) +m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) +m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) +m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) +m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) +m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) +m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) +m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) +m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) +m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) +m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) +m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) +m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) +m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) +m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) +m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) +m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) +m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) +m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) +m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) +m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) +m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) +m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) +m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) +m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) +m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) +m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) +m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) +m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) +m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) +m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) +m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) +m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) +m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) +m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) +m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) +m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) +m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) +m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) +m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) +m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) +m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) +m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) +m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) +m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) +m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) +m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) +m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) diff --git a/m4/pkg.m4 b/m4/pkg.m4 new file mode 100644 index 0000000..0048a3f --- /dev/null +++ b/m4/pkg.m4 @@ -0,0 +1,157 @@ +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# +# Copyright © 2004 Scott James Remnant . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi + +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# +# Similar to PKG_CHECK_MODULES, make sure that the first instance of +# this or PKG_CHECK_MODULES is called, or make sure to call +# PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_ifval([$2], [$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$PKG_CONFIG"; then + if test -n "$$1"; then + pkg_cv_[]$1="$$1" + else + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + fi +else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + ifelse([$4], , [AC_MSG_ERROR(dnl +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT +])], + [AC_MSG_RESULT([no]) + $4]) +elif test $pkg_failed = untried; then + ifelse([$4], , [AC_MSG_FAILURE(dnl +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see .])], + [$4]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + ifelse([$3], , :, [$3]) +fi[]dnl +])# PKG_CHECK_MODULES diff --git a/missing b/missing new file mode 100755 index 0000000..db98974 --- /dev/null +++ b/missing @@ -0,0 +1,215 @@ +#! /bin/sh +# Common wrapper for a few potentially missing GNU programs. + +scriptversion=2013-10-28.13; # UTC + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +if test $# -eq 0; then + echo 1>&2 "Try '$0 --help' for more information" + exit 1 +fi + +case $1 in + + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; + + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; + + -h|--h|--he|--hel|--help) + echo "\ +$0 [OPTION]... PROGRAM [ARGUMENT]... + +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. + +Options: + -h, --help display this help and exit + -v, --version output version information and exit + +Supported PROGRAM values: + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man + +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. + +Send bug reports to ." + exit $? + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) + echo "missing $scriptversion (GNU Automake)" + exit $? + ;; + + -*) + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" + exit 1 + ;; + +esac + +# Run the given program, remember its exit status. +"$@"; st=$? + +# If it succeeded, we are done. +test $st -eq 0 && exit 0 + +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi + +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..d7420a0 --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,374 @@ +# Process this file with automake to produce Makefile.in + +SUBDIRS = +DIST_SUBDIRS = +BUILT_SOURCES = +EXTRA_DIST = +CLEANFILES = +DISTCLEANFILES = +MAINTAINERCLEANFILES = +DISTCHECK_CONFIGURE_FLAGS = --enable-introspection + +# The following warning options are useful for debugging: -Wpadded +#AM_CXXFLAGS = + +# Convenience targets: +lib: $(BUILT_SOURCES) libharfbuzz.la +fuzzing: $(BUILT_SOURCES) libharfbuzz-fuzzing.la + +lib_LTLIBRARIES = libharfbuzz.la + +include Makefile.sources + +HBCFLAGS = +HBLIBS = +HBNONPCLIBS = +HBDEPS = +HBSOURCES = $(HB_BASE_sources) +HBHEADERS = $(HB_BASE_headers) +HBNODISTHEADERS = $(HB_NODIST_headers) + +if HAVE_OT +HBSOURCES += $(HB_OT_sources) +HBHEADERS += $(HB_OT_headers) +endif + +if HAVE_FALLBACK +HBSOURCES += $(HB_FALLBACK_sources) +endif + +if HAVE_PTHREAD +HBCFLAGS += $(PTHREAD_CFLAGS) +HBNONPCLIBS += $(PTHREAD_LIBS) +endif + +if HAVE_GLIB +HBCFLAGS += $(GLIB_CFLAGS) +HBLIBS += $(GLIB_LIBS) +HBDEPS += $(GLIB_DEPS) +HBSOURCES += $(HB_GLIB_sources) +HBHEADERS += $(HB_GLIB_headers) +endif + +if HAVE_FREETYPE +HBCFLAGS += $(FREETYPE_CFLAGS) +HBLIBS += $(FREETYPE_LIBS) +# XXX +# The following creates a recursive dependency on FreeType if FreeType is +# built with HarfBuzz support enabled. Newer pkg-config handles that just +# fine but pkg-config 0.26 as shipped in Ubuntu 14.04 crashes. Remove +# in a year or two, or otherwise work around it... +#HBDEPS += $(FREETYPE_DEPS) +HBSOURCES += $(HB_FT_sources) +HBHEADERS += $(HB_FT_headers) +endif + +if HAVE_GRAPHITE2 +HBCFLAGS += $(GRAPHITE2_CFLAGS) +HBLIBS += $(GRAPHITE2_LIBS) +HBDEPS += $(GRAPHITE2_DEPS) +HBSOURCES += $(HB_GRAPHITE2_sources) +HBHEADERS += $(HB_GRAPHITE2_headers) +endif + +if HAVE_UNISCRIBE +HBCFLAGS += $(UNISCRIBE_CFLAGS) +HBNONPCLIBS += $(UNISCRIBE_LIBS) +HBSOURCES += $(HB_UNISCRIBE_sources) +HBHEADERS += $(HB_UNISCRIBE_headers) +endif + +if HAVE_DIRECTWRITE +HBCFLAGS += $(DIRECTWRITE_CXXFLAGS) +HBNONPCLIBS += $(DIRECTWRITE_LIBS) +HBSOURCES += $(HB_DIRECTWRITE_sources) +HBHEADERS += $(HB_DIRECTWRITE_headers) +endif + +if HAVE_CORETEXT +HBCFLAGS += $(CORETEXT_CFLAGS) +HBNONPCLIBS += $(CORETEXT_LIBS) +HBSOURCES += $(HB_CORETEXT_sources) +HBHEADERS += $(HB_CORETEXT_headers) +endif + +if HAVE_UCDN +SUBDIRS += hb-ucdn +HBCFLAGS += -I$(srcdir)/hb-ucdn +HBLIBS += hb-ucdn/libhb-ucdn.la +HBSOURCES += $(HB_UCDN_sources) +endif +DIST_SUBDIRS += hb-ucdn + + +# Put the library together + +HBLIBS += $(HBNONPCLIBS) + +if OS_WIN32 +export_symbols = -export-symbols harfbuzz.def +harfbuzz_def_dependency = harfbuzz.def +libharfbuzz_la_LINK = $(CXXLINK) $(libharfbuzz_la_LDFLAGS) +else +# Use a C linker for GCC, not C++; Don't link to libstdc++ +if HAVE_GCC +libharfbuzz_la_LINK = $(LINK) $(libharfbuzz_la_LDFLAGS) +else +libharfbuzz_la_LINK = $(CXXLINK) $(libharfbuzz_la_LDFLAGS) +endif +endif + +libharfbuzz_la_SOURCES = $(HBSOURCES) $(HBHEADERS) $(HBNODISTHEADERS) +libharfbuzz_la_CPPFLAGS = $(HBCFLAGS) +libharfbuzz_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HB_LIBTOOL_VERSION_INFO) $(export_symbols) -no-undefined +libharfbuzz_la_LIBADD = $(HBLIBS) +EXTRA_libharfbuzz_la_DEPENDENCIES = $(harfbuzz_def_dependency) +pkginclude_HEADERS = $(HBHEADERS) +nodist_pkginclude_HEADERS = $(HBNODISTHEADERS) +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = harfbuzz.pc +EXTRA_DIST += harfbuzz.pc.in + +FUZZING_CPPFLAGS= \ + -DHB_NDEBUG \ + -DHB_MAX_NESTING_LEVEL=3 \ + -DHB_SANITIZE_MAX_EDITS=3 \ + -DHB_BUFFER_MAX_EXPANSION_FACTOR=3 \ + -DHB_BUFFER_MAX_LEN_MIN=8 \ + -DHB_BUFFER_MAX_LEN_DEFAULT=128 \ + $(NULL) +EXTRA_LTLIBRARIES = libharfbuzz-fuzzing.la +libharfbuzz_fuzzing_la_LINK = $(libharfbuzz_la_LINK) +libharfbuzz_fuzzing_la_SOURCES = $(libharfbuzz_la_SOURCES) +libharfbuzz_fuzzing_la_CPPFLAGS = $(libharfbuzz_la_CPPFLAGS) $(FUZZING_CPPFLAGS) +libharfbuzz_fuzzing_la_LDFLAGS = $(libharfbuzz_la_LDFLAGS) +libharfbuzz_fuzzing_la_LIBADD = $(libharfbuzz_la_LIBADD) +EXTRA_libharfbuzz_fuzzing_la_DEPENDENCIES = $(EXTRA_libharfbuzz_la_DEPENDENCIES) +CLEANFILES += libharfbuzz-fuzzing.la + +if HAVE_ICU +if HAVE_ICU_BUILTIN +HBCFLAGS += $(ICU_CFLAGS) +HBLIBS += $(ICU_LIBS) +HBSOURCES += $(HB_ICU_sources) +HBHEADERS += $(HB_ICU_headers) +else +lib_LTLIBRARIES += libharfbuzz-icu.la +libharfbuzz_icu_la_SOURCES = $(HB_ICU_sources) +libharfbuzz_icu_la_CPPFLAGS = $(ICU_CFLAGS) +libharfbuzz_icu_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HB_LIBTOOL_VERSION_INFO) -no-undefined +libharfbuzz_icu_la_LIBADD = $(ICU_LIBS) libharfbuzz.la +pkginclude_HEADERS += $(HB_ICU_headers) +pkgconfig_DATA += harfbuzz-icu.pc +endif +endif +EXTRA_DIST += harfbuzz-icu.pc.in + +if HAVE_GOBJECT +lib_LTLIBRARIES += libharfbuzz-gobject.la +libharfbuzz_gobject_la_SOURCES = $(HB_GOBJECT_sources) +nodist_libharfbuzz_gobject_la_SOURCES = $(HB_GOBJECT_ENUM_sources) +libharfbuzz_gobject_la_CPPFLAGS = $(GOBJECT_CFLAGS) +libharfbuzz_gobject_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HB_LIBTOOL_VERSION_INFO) -no-undefined +libharfbuzz_gobject_la_LIBADD = $(GOBJECT_LIBS) libharfbuzz.la +pkginclude_HEADERS += $(HB_GOBJECT_headers) +nodist_pkginclude_HEADERS += $(HB_GOBJECT_ENUM_headers) +pkgconfig_DATA += harfbuzz-gobject.pc + +BUILT_SOURCES += \ + $(HB_GOBJECT_ENUM_sources) \ + $(HB_GOBJECT_ENUM_headers) \ + $(NULL) +DISTCLEANFILES += \ + $(HB_GOBJECT_ENUM_sources) \ + $(HB_GOBJECT_ENUM_headers) \ + $(NULL) +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' > "$@" \ + || ($(RM) "$@"; false) +endif +EXTRA_DIST += \ + harfbuzz-gobject.pc.in \ + hb-gobject-enums.cc.tmpl \ + hb-gobject-enums.h.tmpl \ + $(NULL) + + +%.pc: %.pc.in $(top_builddir)/config.status + $(AM_V_GEN) \ + $(SED) -e 's@%prefix%@$(prefix)@g' \ + -e 's@%exec_prefix%@$(exec_prefix)@g' \ + -e 's@%libdir%@$(libdir)@g' \ + -e 's@%includedir%@$(includedir)@g' \ + -e 's@%libs_private%@$(HBNONPCLIBS)@g' \ + -e 's@%requires_private%@$(HBDEPS)@g' \ + -e 's@%VERSION%@$(VERSION)@g' \ + "$<" > "$@" \ + || ($(RM) "$@"; false) + +CLEANFILES += $(pkgconfig_DATA) + + +CLEANFILES += harfbuzz.def +harfbuzz.def: $(HBHEADERS) $(HBNODISTHEADERS) + $(AM_V_GEN) (echo EXPORTS; \ + (cat $^ || echo 'hb_ERROR ()' ) | \ + $(EGREP) '^hb_.* \(' | \ + sed -e 's/ (.*//' | \ + LANG=C sort; \ + echo LIBRARY libharfbuzz-0.dll; \ + ) >"$@" + @ ! grep -q hb_ERROR "$@" \ + || ($(RM) "$@"; false) + + +GENERATORS = \ + gen-arabic-table.py \ + gen-indic-table.py \ + gen-use-table.py \ + $(NULL) +EXTRA_DIST += $(GENERATORS) + +unicode-tables: arabic-table indic-table use-table + +arabic-table: gen-arabic-table.py ArabicShaping.txt UnicodeData.txt Blocks.txt + $(AM_V_GEN) $(builddir)/$^ > hb-ot-shape-complex-arabic-table.hh \ + || ($(RM) hb-ot-shape-complex-arabic-table.hh; false) + +indic-table: gen-indic-table.py IndicSyllabicCategory-7.0.0.txt IndicMatraCategory-7.0.0.txt Blocks.txt + $(AM_V_GEN) $(builddir)/$^ > hb-ot-shape-complex-indic-table.cc \ + || ($(RM) hb-ot-shape-complex-indic-table.cc; false) + +use-table: gen-use-table.py IndicSyllabicCategory.txt IndicPositionalCategory.txt UnicodeData.txt Blocks.txt + $(AM_V_GEN) $(builddir)/$^ > hb-ot-shape-complex-use-table.cc \ + || ($(RM) hb-ot-shape-complex-use-table.cc; false) + +built-sources: $(BUILT_SOURCES) + +.PHONY: unicode-tables arabic-table indic-table use-table built-sources + +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-use-machine.hh \ + $(NULL) +BUILT_SOURCES += $(RAGEL_GENERATED) +EXTRA_DIST += \ + hb-buffer-deserialize-json.rl \ + hb-buffer-deserialize-text.rl \ + hb-ot-shape-complex-indic-machine.rl \ + hb-ot-shape-complex-myanmar-machine.rl \ + hb-ot-shape-complex-use-machine.rl \ + $(NULL) +MAINTAINERCLEANFILES += $(RAGEL_GENERATED) +$(srcdir)/%.hh: $(srcdir)/%.rl + $(AM_V_GEN)(cd $(srcdir) && $(RAGEL) -e -F1 -o "$*.hh" "$*.rl") \ + || ($(RM) "$@"; false) + +noinst_PROGRAMS = \ + main \ + test \ + test-buffer-serialize \ + test-size-params \ + test-would-substitute \ + $(NULL) +bin_PROGRAMS = + +main_SOURCES = main.cc +main_CPPFLAGS = $(HBCFLAGS) +main_LDADD = libharfbuzz.la $(HBLIBS) + +test_SOURCES = test.cc +test_CPPFLAGS = $(HBCFLAGS) $(FREETYPE_CFLAGS) +test_LDADD = libharfbuzz.la $(HBLIBS) $(FREETYPE_LIBS) + +test_would_substitute_SOURCES = test-would-substitute.cc +test_would_substitute_CPPFLAGS = $(HBCFLAGS) $(FREETYPE_CFLAGS) +test_would_substitute_LDADD = libharfbuzz.la $(HBLIBS) $(FREETYPE_LIBS) + +test_size_params_SOURCES = test-size-params.cc +test_size_params_CPPFLAGS = $(HBCFLAGS) +test_size_params_LDADD = libharfbuzz.la $(HBLIBS) + +test_buffer_serialize_SOURCES = test-buffer-serialize.cc +test_buffer_serialize_CPPFLAGS = $(HBCFLAGS) +test_buffer_serialize_LDADD = libharfbuzz.la $(HBLIBS) + +check: harfbuzz.def # For check-defs.sh + +dist_check_SCRIPTS = \ + check-c-linkage-decls.sh \ + check-defs.sh \ + check-header-guards.sh \ + check-includes.sh \ + check-libstdc++.sh \ + check-static-inits.sh \ + check-symbols.sh \ + $(NULL) + +check_PROGRAMS = \ + test-ot-tag \ + $(NULL) +test_ot_tag_SOURCES = hb-ot-tag.cc +test_ot_tag_CPPFLAGS = $(HBCFLAGS) -DMAIN +test_ot_tag_LDADD = libharfbuzz.la $(HBLIBS) + +TESTS = $(dist_check_SCRIPTS) $(check_PROGRAMS) +TESTS_ENVIRONMENT = \ + srcdir="$(srcdir)" \ + MAKE="$(MAKE) $(AM_MAKEFLAGS)" \ + HBSOURCES="$(HBSOURCES)" \ + HBHEADERS="$(HBHEADERS) $(HBNODISTHEADERS)" \ + $(NULL) + +if HAVE_INTROSPECTION + +-include $(INTROSPECTION_MAKEFILE) +INTROSPECTION_GIRS = HarfBuzz-0.0.gir # What does the 0 mean anyway?! +INTROSPECTION_SCANNER_ARGS = -I$(srcdir) -n hb --identifier-prefix=hb_ --warn-all +INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) +INTROSPECTION_SCANNER_ENV = CC="$(CC)" + +HarfBuzz-0.0.gir: libharfbuzz.la libharfbuzz-gobject.la +HarfBuzz_0_0_gir_INCLUDES = GObject-2.0 +HarfBuzz_0_0_gir_CFLAGS = \ + $(INCLUDES) \ + $(HBCFLAGS) \ + -DHB_H \ + -DHB_H_IN \ + -DHB_OT_H \ + -DHB_OT_H_IN \ + -DHB_GOBJECT_H \ + -DHB_GOBJECT_H_IN \ + -DHB_EXTERN= \ + $(NULL) +HarfBuzz_0_0_gir_LIBS = \ + libharfbuzz.la \ + libharfbuzz-gobject.la \ + $(NULL) +HarfBuzz_0_0_gir_FILES = \ + $(HBHEADERS) \ + $(HBNODISTHEADERS) \ + $(HBSOURCES) \ + $(HB_GOBJECT_ENUM_sources) \ + $(HB_GOBJECT_ENUM_headers) \ + $(HB_GOBJECT_sources) \ + $(HB_GOBJECT_STRUCTS_headers) \ + $(NULL) + +girdir = $(datadir)/gir-1.0 +gir_DATA = $(INTROSPECTION_GIRS) + +typelibdir = $(libdir)/girepository-1.0 +typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) + +CLEANFILES += $(gir_DATA) $(typelib_DATA) + +endif + +-include $(top_srcdir)/git.mk diff --git a/src/Makefile.in b/src/Makefile.in new file mode 100644 index 0000000..155456c --- /dev/null +++ b/src/Makefile.in @@ -0,0 +1,3002 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# Process this file with automake to produce Makefile.in + + + + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(srcdir)/Makefile.sources $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(srcdir)/hb-version.h.in \ + $(dist_check_SCRIPTS) $(top_srcdir)/depcomp \ + $(am__pkginclude_HEADERS_DIST) $(top_srcdir)/test-driver +@HAVE_OT_TRUE@am__append_1 = $(HB_OT_sources) +@HAVE_OT_TRUE@am__append_2 = $(HB_OT_headers) +@HAVE_FALLBACK_TRUE@am__append_3 = $(HB_FALLBACK_sources) +@HAVE_PTHREAD_TRUE@am__append_4 = $(PTHREAD_CFLAGS) +@HAVE_PTHREAD_TRUE@am__append_5 = $(PTHREAD_LIBS) +@HAVE_GLIB_TRUE@am__append_6 = $(GLIB_CFLAGS) +@HAVE_GLIB_TRUE@am__append_7 = $(GLIB_LIBS) +@HAVE_GLIB_TRUE@am__append_8 = $(GLIB_DEPS) +@HAVE_GLIB_TRUE@am__append_9 = $(HB_GLIB_sources) +@HAVE_GLIB_TRUE@am__append_10 = $(HB_GLIB_headers) +@HAVE_FREETYPE_TRUE@am__append_11 = $(FREETYPE_CFLAGS) +@HAVE_FREETYPE_TRUE@am__append_12 = $(FREETYPE_LIBS) +# XXX +# The following creates a recursive dependency on FreeType if FreeType is +# built with HarfBuzz support enabled. Newer pkg-config handles that just +# fine but pkg-config 0.26 as shipped in Ubuntu 14.04 crashes. Remove +# in a year or two, or otherwise work around it... +#HBDEPS += $(FREETYPE_DEPS) +@HAVE_FREETYPE_TRUE@am__append_13 = $(HB_FT_sources) +@HAVE_FREETYPE_TRUE@am__append_14 = $(HB_FT_headers) +@HAVE_GRAPHITE2_TRUE@am__append_15 = $(GRAPHITE2_CFLAGS) +@HAVE_GRAPHITE2_TRUE@am__append_16 = $(GRAPHITE2_LIBS) +@HAVE_GRAPHITE2_TRUE@am__append_17 = $(GRAPHITE2_DEPS) +@HAVE_GRAPHITE2_TRUE@am__append_18 = $(HB_GRAPHITE2_sources) +@HAVE_GRAPHITE2_TRUE@am__append_19 = $(HB_GRAPHITE2_headers) +@HAVE_UNISCRIBE_TRUE@am__append_20 = $(UNISCRIBE_CFLAGS) +@HAVE_UNISCRIBE_TRUE@am__append_21 = $(UNISCRIBE_LIBS) +@HAVE_UNISCRIBE_TRUE@am__append_22 = $(HB_UNISCRIBE_sources) +@HAVE_UNISCRIBE_TRUE@am__append_23 = $(HB_UNISCRIBE_headers) +@HAVE_DIRECTWRITE_TRUE@am__append_24 = $(DIRECTWRITE_CXXFLAGS) +@HAVE_DIRECTWRITE_TRUE@am__append_25 = $(DIRECTWRITE_LIBS) +@HAVE_DIRECTWRITE_TRUE@am__append_26 = $(HB_DIRECTWRITE_sources) +@HAVE_DIRECTWRITE_TRUE@am__append_27 = $(HB_DIRECTWRITE_headers) +@HAVE_CORETEXT_TRUE@am__append_28 = $(CORETEXT_CFLAGS) +@HAVE_CORETEXT_TRUE@am__append_29 = $(CORETEXT_LIBS) +@HAVE_CORETEXT_TRUE@am__append_30 = $(HB_CORETEXT_sources) +@HAVE_CORETEXT_TRUE@am__append_31 = $(HB_CORETEXT_headers) +@HAVE_UCDN_TRUE@am__append_32 = hb-ucdn +@HAVE_UCDN_TRUE@am__append_33 = -I$(srcdir)/hb-ucdn +@HAVE_UCDN_TRUE@am__append_34 = hb-ucdn/libhb-ucdn.la +@HAVE_UCDN_TRUE@am__append_35 = $(HB_UCDN_sources) +@HAVE_ICU_BUILTIN_TRUE@@HAVE_ICU_TRUE@am__append_36 = $(ICU_CFLAGS) +@HAVE_ICU_BUILTIN_TRUE@@HAVE_ICU_TRUE@am__append_37 = $(ICU_LIBS) +@HAVE_ICU_BUILTIN_TRUE@@HAVE_ICU_TRUE@am__append_38 = $(HB_ICU_sources) +@HAVE_ICU_BUILTIN_TRUE@@HAVE_ICU_TRUE@am__append_39 = $(HB_ICU_headers) +@HAVE_ICU_BUILTIN_FALSE@@HAVE_ICU_TRUE@am__append_40 = libharfbuzz-icu.la +@HAVE_ICU_BUILTIN_FALSE@@HAVE_ICU_TRUE@am__append_41 = $(HB_ICU_headers) +@HAVE_ICU_BUILTIN_FALSE@@HAVE_ICU_TRUE@am__append_42 = harfbuzz-icu.pc +@HAVE_GOBJECT_TRUE@am__append_43 = libharfbuzz-gobject.la +@HAVE_GOBJECT_TRUE@am__append_44 = $(HB_GOBJECT_headers) +@HAVE_GOBJECT_TRUE@am__append_45 = $(HB_GOBJECT_ENUM_headers) +@HAVE_GOBJECT_TRUE@am__append_46 = harfbuzz-gobject.pc +@HAVE_GOBJECT_TRUE@am__append_47 = \ +@HAVE_GOBJECT_TRUE@ $(HB_GOBJECT_ENUM_sources) \ +@HAVE_GOBJECT_TRUE@ $(HB_GOBJECT_ENUM_headers) \ +@HAVE_GOBJECT_TRUE@ $(NULL) + +@HAVE_GOBJECT_TRUE@am__append_48 = \ +@HAVE_GOBJECT_TRUE@ $(HB_GOBJECT_ENUM_sources) \ +@HAVE_GOBJECT_TRUE@ $(HB_GOBJECT_ENUM_headers) \ +@HAVE_GOBJECT_TRUE@ $(NULL) + +noinst_PROGRAMS = main$(EXEEXT) test$(EXEEXT) \ + test-buffer-serialize$(EXEEXT) test-size-params$(EXEEXT) \ + test-would-substitute$(EXEEXT) $(am__EXEEXT_1) +bin_PROGRAMS = +check_PROGRAMS = test-ot-tag$(EXEEXT) $(am__EXEEXT_1) +TESTS = $(am__EXEEXT_2) $(check_PROGRAMS) +@HAVE_INTROSPECTION_TRUE@am__append_49 = $(gir_DATA) $(typelib_DATA) +subdir = src +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = hb-version.h +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ + "$(DESTDIR)$(girdir)" "$(DESTDIR)$(pkgconfigdir)" \ + "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(pkgincludedir)" \ + "$(DESTDIR)$(pkgincludedir)" +LTLIBRARIES = $(lib_LTLIBRARIES) +am__DEPENDENCIES_1 = +@HAVE_GLIB_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) +@HAVE_FREETYPE_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) +@HAVE_GRAPHITE2_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) +@HAVE_PTHREAD_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) +@HAVE_UNISCRIBE_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1) +@HAVE_DIRECTWRITE_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1) +@HAVE_CORETEXT_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1) +am__DEPENDENCIES_9 = $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \ + $(am__DEPENDENCIES_7) $(am__DEPENDENCIES_8) +@HAVE_ICU_BUILTIN_TRUE@@HAVE_ICU_TRUE@am__DEPENDENCIES_10 = \ +@HAVE_ICU_BUILTIN_TRUE@@HAVE_ICU_TRUE@ $(am__DEPENDENCIES_1) +am__DEPENDENCIES_11 = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \ + $(am__DEPENDENCIES_4) $(am__append_34) $(am__DEPENDENCIES_9) \ + $(am__DEPENDENCIES_10) +am__DEPENDENCIES_12 = $(am__DEPENDENCIES_11) +libharfbuzz_fuzzing_la_DEPENDENCIES = $(am__DEPENDENCIES_12) +am__libharfbuzz_fuzzing_la_SOURCES_DIST = hb-atomic-private.hh \ + hb-blob.cc hb-buffer-deserialize-json.hh \ + hb-buffer-deserialize-text.hh hb-buffer-private.hh \ + hb-buffer-serialize.cc hb-buffer.cc hb-cache-private.hh \ + hb-common.cc hb-face-private.hh hb-face.cc hb-font-private.hh \ + hb-font.cc hb-mutex-private.hh hb-object-private.hh \ + hb-open-file-private.hh hb-open-type-private.hh \ + hb-ot-cbdt-table.hh hb-ot-cmap-table.hh hb-ot-glyf-table.hh \ + hb-ot-head-table.hh hb-ot-hhea-table.hh hb-ot-hmtx-table.hh \ + hb-ot-maxp-table.hh hb-ot-name-table.hh hb-ot-os2-table.hh \ + hb-ot-post-table.hh hb-ot-tag.cc hb-private.hh \ + hb-set-private.hh hb-set.cc hb-shape.cc \ + hb-shape-plan-private.hh hb-shape-plan.cc hb-shaper-list.hh \ + hb-shaper-impl-private.hh hb-shaper-private.hh hb-shaper.cc \ + hb-unicode-private.hh hb-unicode.cc hb-utf-private.hh \ + hb-warning.cc hb-ot-font.cc hb-ot-layout.cc \ + hb-ot-layout-common-private.hh hb-ot-layout-gdef-table.hh \ + hb-ot-layout-gpos-table.hh hb-ot-layout-gsubgpos-private.hh \ + hb-ot-layout-gsub-table.hh hb-ot-layout-jstf-table.hh \ + hb-ot-layout-private.hh hb-ot-map.cc hb-ot-map-private.hh \ + hb-ot-math.cc hb-ot-math-table.hh hb-ot-shape.cc \ + hb-ot-shape-complex-arabic.cc \ + hb-ot-shape-complex-arabic-fallback.hh \ + hb-ot-shape-complex-arabic-private.hh \ + hb-ot-shape-complex-arabic-table.hh \ + hb-ot-shape-complex-arabic-win1256.hh \ + hb-ot-shape-complex-default.cc hb-ot-shape-complex-hangul.cc \ + hb-ot-shape-complex-hebrew.cc hb-ot-shape-complex-indic.cc \ + hb-ot-shape-complex-indic-machine.hh \ + hb-ot-shape-complex-indic-private.hh \ + hb-ot-shape-complex-indic-table.cc \ + hb-ot-shape-complex-myanmar.cc \ + hb-ot-shape-complex-myanmar-machine.hh \ + hb-ot-shape-complex-thai.cc hb-ot-shape-complex-tibetan.cc \ + hb-ot-shape-complex-use.cc hb-ot-shape-complex-use-machine.hh \ + hb-ot-shape-complex-use-private.hh \ + hb-ot-shape-complex-use-table.cc \ + hb-ot-shape-complex-private.hh \ + hb-ot-shape-normalize-private.hh hb-ot-shape-normalize.cc \ + hb-ot-shape-fallback-private.hh hb-ot-shape-fallback.cc \ + hb-ot-shape-private.hh hb-ot-var.cc hb-ot-var-avar-table.hh \ + hb-ot-var-fvar-table.hh hb-ot-var-hvar-table.hh \ + hb-fallback-shape.cc hb-glib.cc hb-ft.cc hb-graphite2.cc \ + hb-uniscribe.cc hb-directwrite.cc hb-coretext.cc hb-ucdn.cc \ + hb-icu.cc hb.h hb-blob.h hb-buffer.h hb-common.h \ + hb-deprecated.h hb-face.h hb-font.h hb-set.h hb-shape.h \ + hb-shape-plan.h hb-unicode.h hb-ot.h hb-ot-font.h \ + hb-ot-layout.h hb-ot-math.h hb-ot-shape.h hb-ot-tag.h \ + hb-ot-var.h hb-glib.h hb-ft.h hb-graphite2.h hb-uniscribe.h \ + hb-directwrite.h hb-coretext.h hb-icu.h hb-version.h +am__objects_1 = +am__objects_2 = libharfbuzz_fuzzing_la-hb-blob.lo \ + libharfbuzz_fuzzing_la-hb-buffer-serialize.lo \ + libharfbuzz_fuzzing_la-hb-buffer.lo \ + libharfbuzz_fuzzing_la-hb-common.lo \ + libharfbuzz_fuzzing_la-hb-face.lo \ + libharfbuzz_fuzzing_la-hb-font.lo \ + libharfbuzz_fuzzing_la-hb-ot-tag.lo \ + libharfbuzz_fuzzing_la-hb-set.lo \ + libharfbuzz_fuzzing_la-hb-shape.lo \ + libharfbuzz_fuzzing_la-hb-shape-plan.lo \ + libharfbuzz_fuzzing_la-hb-shaper.lo \ + libharfbuzz_fuzzing_la-hb-unicode.lo \ + libharfbuzz_fuzzing_la-hb-warning.lo $(am__objects_1) +am__objects_3 = libharfbuzz_fuzzing_la-hb-ot-font.lo \ + libharfbuzz_fuzzing_la-hb-ot-layout.lo \ + libharfbuzz_fuzzing_la-hb-ot-map.lo \ + libharfbuzz_fuzzing_la-hb-ot-math.lo \ + libharfbuzz_fuzzing_la-hb-ot-shape.lo \ + libharfbuzz_fuzzing_la-hb-ot-shape-complex-arabic.lo \ + libharfbuzz_fuzzing_la-hb-ot-shape-complex-default.lo \ + libharfbuzz_fuzzing_la-hb-ot-shape-complex-hangul.lo \ + libharfbuzz_fuzzing_la-hb-ot-shape-complex-hebrew.lo \ + libharfbuzz_fuzzing_la-hb-ot-shape-complex-indic.lo \ + libharfbuzz_fuzzing_la-hb-ot-shape-complex-indic-table.lo \ + libharfbuzz_fuzzing_la-hb-ot-shape-complex-myanmar.lo \ + libharfbuzz_fuzzing_la-hb-ot-shape-complex-thai.lo \ + libharfbuzz_fuzzing_la-hb-ot-shape-complex-tibetan.lo \ + libharfbuzz_fuzzing_la-hb-ot-shape-complex-use.lo \ + libharfbuzz_fuzzing_la-hb-ot-shape-complex-use-table.lo \ + libharfbuzz_fuzzing_la-hb-ot-shape-normalize.lo \ + libharfbuzz_fuzzing_la-hb-ot-shape-fallback.lo \ + libharfbuzz_fuzzing_la-hb-ot-var.lo $(am__objects_1) +@HAVE_OT_TRUE@am__objects_4 = $(am__objects_3) +am__objects_5 = libharfbuzz_fuzzing_la-hb-fallback-shape.lo +@HAVE_FALLBACK_TRUE@am__objects_6 = $(am__objects_5) +am__objects_7 = libharfbuzz_fuzzing_la-hb-glib.lo +@HAVE_GLIB_TRUE@am__objects_8 = $(am__objects_7) +am__objects_9 = libharfbuzz_fuzzing_la-hb-ft.lo +@HAVE_FREETYPE_TRUE@am__objects_10 = $(am__objects_9) +am__objects_11 = libharfbuzz_fuzzing_la-hb-graphite2.lo +@HAVE_GRAPHITE2_TRUE@am__objects_12 = $(am__objects_11) +am__objects_13 = libharfbuzz_fuzzing_la-hb-uniscribe.lo +@HAVE_UNISCRIBE_TRUE@am__objects_14 = $(am__objects_13) +am__objects_15 = libharfbuzz_fuzzing_la-hb-directwrite.lo +@HAVE_DIRECTWRITE_TRUE@am__objects_16 = $(am__objects_15) +am__objects_17 = libharfbuzz_fuzzing_la-hb-coretext.lo +@HAVE_CORETEXT_TRUE@am__objects_18 = $(am__objects_17) +am__objects_19 = libharfbuzz_fuzzing_la-hb-ucdn.lo +@HAVE_UCDN_TRUE@am__objects_20 = $(am__objects_19) +am__objects_21 = libharfbuzz_fuzzing_la-hb-icu.lo +@HAVE_ICU_BUILTIN_TRUE@@HAVE_ICU_TRUE@am__objects_22 = \ +@HAVE_ICU_BUILTIN_TRUE@@HAVE_ICU_TRUE@ $(am__objects_21) +am__objects_23 = $(am__objects_2) $(am__objects_4) $(am__objects_6) \ + $(am__objects_8) $(am__objects_10) $(am__objects_12) \ + $(am__objects_14) $(am__objects_16) $(am__objects_18) \ + $(am__objects_20) $(am__objects_22) +am__objects_24 = $(am__objects_1) +@HAVE_OT_TRUE@am__objects_25 = $(am__objects_24) +@HAVE_GLIB_TRUE@am__objects_26 = $(am__objects_1) +@HAVE_FREETYPE_TRUE@am__objects_27 = $(am__objects_1) +@HAVE_GRAPHITE2_TRUE@am__objects_28 = $(am__objects_1) +@HAVE_UNISCRIBE_TRUE@am__objects_29 = $(am__objects_1) +@HAVE_DIRECTWRITE_TRUE@am__objects_30 = $(am__objects_1) +@HAVE_CORETEXT_TRUE@am__objects_31 = $(am__objects_1) +@HAVE_ICU_BUILTIN_TRUE@@HAVE_ICU_TRUE@am__objects_32 = \ +@HAVE_ICU_BUILTIN_TRUE@@HAVE_ICU_TRUE@ $(am__objects_1) +am__objects_33 = $(am__objects_24) $(am__objects_25) $(am__objects_26) \ + $(am__objects_27) $(am__objects_28) $(am__objects_29) \ + $(am__objects_30) $(am__objects_31) $(am__objects_32) +am__objects_34 = $(am__objects_24) +am__objects_35 = $(am__objects_23) $(am__objects_33) $(am__objects_34) +am_libharfbuzz_fuzzing_la_OBJECTS = $(am__objects_35) +libharfbuzz_fuzzing_la_OBJECTS = $(am_libharfbuzz_fuzzing_la_OBJECTS) +@HAVE_GOBJECT_TRUE@libharfbuzz_gobject_la_DEPENDENCIES = \ +@HAVE_GOBJECT_TRUE@ $(am__DEPENDENCIES_1) libharfbuzz.la +am__libharfbuzz_gobject_la_SOURCES_DIST = hb-gobject-structs.cc +am__objects_36 = libharfbuzz_gobject_la-hb-gobject-structs.lo +@HAVE_GOBJECT_TRUE@am_libharfbuzz_gobject_la_OBJECTS = \ +@HAVE_GOBJECT_TRUE@ $(am__objects_36) +am__objects_37 = libharfbuzz_gobject_la-hb-gobject-enums.lo +@HAVE_GOBJECT_TRUE@nodist_libharfbuzz_gobject_la_OBJECTS = \ +@HAVE_GOBJECT_TRUE@ $(am__objects_37) +libharfbuzz_gobject_la_OBJECTS = $(am_libharfbuzz_gobject_la_OBJECTS) \ + $(nodist_libharfbuzz_gobject_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +libharfbuzz_gobject_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(libharfbuzz_gobject_la_LDFLAGS) \ + $(LDFLAGS) -o $@ +@HAVE_GOBJECT_TRUE@am_libharfbuzz_gobject_la_rpath = -rpath $(libdir) +@HAVE_ICU_BUILTIN_FALSE@@HAVE_ICU_TRUE@libharfbuzz_icu_la_DEPENDENCIES = \ +@HAVE_ICU_BUILTIN_FALSE@@HAVE_ICU_TRUE@ $(am__DEPENDENCIES_1) \ +@HAVE_ICU_BUILTIN_FALSE@@HAVE_ICU_TRUE@ libharfbuzz.la +am__libharfbuzz_icu_la_SOURCES_DIST = hb-icu.cc +am__objects_38 = libharfbuzz_icu_la-hb-icu.lo +@HAVE_ICU_BUILTIN_FALSE@@HAVE_ICU_TRUE@am_libharfbuzz_icu_la_OBJECTS = \ +@HAVE_ICU_BUILTIN_FALSE@@HAVE_ICU_TRUE@ $(am__objects_38) +libharfbuzz_icu_la_OBJECTS = $(am_libharfbuzz_icu_la_OBJECTS) +libharfbuzz_icu_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(libharfbuzz_icu_la_LDFLAGS) \ + $(LDFLAGS) -o $@ +@HAVE_ICU_BUILTIN_FALSE@@HAVE_ICU_TRUE@am_libharfbuzz_icu_la_rpath = \ +@HAVE_ICU_BUILTIN_FALSE@@HAVE_ICU_TRUE@ -rpath $(libdir) +libharfbuzz_la_DEPENDENCIES = $(am__DEPENDENCIES_11) +am__libharfbuzz_la_SOURCES_DIST = hb-atomic-private.hh hb-blob.cc \ + hb-buffer-deserialize-json.hh hb-buffer-deserialize-text.hh \ + hb-buffer-private.hh hb-buffer-serialize.cc hb-buffer.cc \ + hb-cache-private.hh hb-common.cc hb-face-private.hh hb-face.cc \ + hb-font-private.hh hb-font.cc hb-mutex-private.hh \ + hb-object-private.hh hb-open-file-private.hh \ + hb-open-type-private.hh hb-ot-cbdt-table.hh \ + hb-ot-cmap-table.hh hb-ot-glyf-table.hh hb-ot-head-table.hh \ + hb-ot-hhea-table.hh hb-ot-hmtx-table.hh hb-ot-maxp-table.hh \ + hb-ot-name-table.hh hb-ot-os2-table.hh hb-ot-post-table.hh \ + hb-ot-tag.cc hb-private.hh hb-set-private.hh hb-set.cc \ + hb-shape.cc hb-shape-plan-private.hh hb-shape-plan.cc \ + hb-shaper-list.hh hb-shaper-impl-private.hh \ + hb-shaper-private.hh hb-shaper.cc hb-unicode-private.hh \ + hb-unicode.cc hb-utf-private.hh hb-warning.cc hb-ot-font.cc \ + hb-ot-layout.cc hb-ot-layout-common-private.hh \ + hb-ot-layout-gdef-table.hh hb-ot-layout-gpos-table.hh \ + hb-ot-layout-gsubgpos-private.hh hb-ot-layout-gsub-table.hh \ + hb-ot-layout-jstf-table.hh hb-ot-layout-private.hh \ + hb-ot-map.cc hb-ot-map-private.hh hb-ot-math.cc \ + hb-ot-math-table.hh hb-ot-shape.cc \ + hb-ot-shape-complex-arabic.cc \ + hb-ot-shape-complex-arabic-fallback.hh \ + hb-ot-shape-complex-arabic-private.hh \ + hb-ot-shape-complex-arabic-table.hh \ + hb-ot-shape-complex-arabic-win1256.hh \ + hb-ot-shape-complex-default.cc hb-ot-shape-complex-hangul.cc \ + hb-ot-shape-complex-hebrew.cc hb-ot-shape-complex-indic.cc \ + hb-ot-shape-complex-indic-machine.hh \ + hb-ot-shape-complex-indic-private.hh \ + hb-ot-shape-complex-indic-table.cc \ + hb-ot-shape-complex-myanmar.cc \ + hb-ot-shape-complex-myanmar-machine.hh \ + hb-ot-shape-complex-thai.cc hb-ot-shape-complex-tibetan.cc \ + hb-ot-shape-complex-use.cc hb-ot-shape-complex-use-machine.hh \ + hb-ot-shape-complex-use-private.hh \ + hb-ot-shape-complex-use-table.cc \ + hb-ot-shape-complex-private.hh \ + hb-ot-shape-normalize-private.hh hb-ot-shape-normalize.cc \ + hb-ot-shape-fallback-private.hh hb-ot-shape-fallback.cc \ + hb-ot-shape-private.hh hb-ot-var.cc hb-ot-var-avar-table.hh \ + hb-ot-var-fvar-table.hh hb-ot-var-hvar-table.hh \ + hb-fallback-shape.cc hb-glib.cc hb-ft.cc hb-graphite2.cc \ + hb-uniscribe.cc hb-directwrite.cc hb-coretext.cc hb-ucdn.cc \ + hb-icu.cc hb.h hb-blob.h hb-buffer.h hb-common.h \ + hb-deprecated.h hb-face.h hb-font.h hb-set.h hb-shape.h \ + hb-shape-plan.h hb-unicode.h hb-ot.h hb-ot-font.h \ + hb-ot-layout.h hb-ot-math.h hb-ot-shape.h hb-ot-tag.h \ + hb-ot-var.h hb-glib.h hb-ft.h hb-graphite2.h hb-uniscribe.h \ + hb-directwrite.h hb-coretext.h hb-icu.h hb-version.h +am__objects_39 = libharfbuzz_la-hb-blob.lo \ + libharfbuzz_la-hb-buffer-serialize.lo \ + libharfbuzz_la-hb-buffer.lo libharfbuzz_la-hb-common.lo \ + libharfbuzz_la-hb-face.lo libharfbuzz_la-hb-font.lo \ + libharfbuzz_la-hb-ot-tag.lo libharfbuzz_la-hb-set.lo \ + libharfbuzz_la-hb-shape.lo libharfbuzz_la-hb-shape-plan.lo \ + libharfbuzz_la-hb-shaper.lo libharfbuzz_la-hb-unicode.lo \ + libharfbuzz_la-hb-warning.lo $(am__objects_1) +am__objects_40 = libharfbuzz_la-hb-ot-font.lo \ + libharfbuzz_la-hb-ot-layout.lo libharfbuzz_la-hb-ot-map.lo \ + libharfbuzz_la-hb-ot-math.lo libharfbuzz_la-hb-ot-shape.lo \ + libharfbuzz_la-hb-ot-shape-complex-arabic.lo \ + libharfbuzz_la-hb-ot-shape-complex-default.lo \ + libharfbuzz_la-hb-ot-shape-complex-hangul.lo \ + libharfbuzz_la-hb-ot-shape-complex-hebrew.lo \ + libharfbuzz_la-hb-ot-shape-complex-indic.lo \ + libharfbuzz_la-hb-ot-shape-complex-indic-table.lo \ + libharfbuzz_la-hb-ot-shape-complex-myanmar.lo \ + libharfbuzz_la-hb-ot-shape-complex-thai.lo \ + libharfbuzz_la-hb-ot-shape-complex-tibetan.lo \ + libharfbuzz_la-hb-ot-shape-complex-use.lo \ + libharfbuzz_la-hb-ot-shape-complex-use-table.lo \ + libharfbuzz_la-hb-ot-shape-normalize.lo \ + libharfbuzz_la-hb-ot-shape-fallback.lo \ + libharfbuzz_la-hb-ot-var.lo $(am__objects_1) +@HAVE_OT_TRUE@am__objects_41 = $(am__objects_40) +am__objects_42 = libharfbuzz_la-hb-fallback-shape.lo +@HAVE_FALLBACK_TRUE@am__objects_43 = $(am__objects_42) +am__objects_44 = libharfbuzz_la-hb-glib.lo +@HAVE_GLIB_TRUE@am__objects_45 = $(am__objects_44) +am__objects_46 = libharfbuzz_la-hb-ft.lo +@HAVE_FREETYPE_TRUE@am__objects_47 = $(am__objects_46) +am__objects_48 = libharfbuzz_la-hb-graphite2.lo +@HAVE_GRAPHITE2_TRUE@am__objects_49 = $(am__objects_48) +am__objects_50 = libharfbuzz_la-hb-uniscribe.lo +@HAVE_UNISCRIBE_TRUE@am__objects_51 = $(am__objects_50) +am__objects_52 = libharfbuzz_la-hb-directwrite.lo +@HAVE_DIRECTWRITE_TRUE@am__objects_53 = $(am__objects_52) +am__objects_54 = libharfbuzz_la-hb-coretext.lo +@HAVE_CORETEXT_TRUE@am__objects_55 = $(am__objects_54) +am__objects_56 = libharfbuzz_la-hb-ucdn.lo +@HAVE_UCDN_TRUE@am__objects_57 = $(am__objects_56) +am__objects_58 = libharfbuzz_la-hb-icu.lo +@HAVE_ICU_BUILTIN_TRUE@@HAVE_ICU_TRUE@am__objects_59 = \ +@HAVE_ICU_BUILTIN_TRUE@@HAVE_ICU_TRUE@ $(am__objects_58) +am__objects_60 = $(am__objects_39) $(am__objects_41) $(am__objects_43) \ + $(am__objects_45) $(am__objects_47) $(am__objects_49) \ + $(am__objects_51) $(am__objects_53) $(am__objects_55) \ + $(am__objects_57) $(am__objects_59) +am_libharfbuzz_la_OBJECTS = $(am__objects_60) $(am__objects_33) \ + $(am__objects_34) +libharfbuzz_la_OBJECTS = $(am_libharfbuzz_la_OBJECTS) +am__EXEEXT_1 = +PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) +am_main_OBJECTS = main-main.$(OBJEXT) +main_OBJECTS = $(am_main_OBJECTS) +main_DEPENDENCIES = libharfbuzz.la $(am__DEPENDENCIES_11) +am_test_OBJECTS = test-test.$(OBJEXT) +test_OBJECTS = $(am_test_OBJECTS) +test_DEPENDENCIES = libharfbuzz.la $(am__DEPENDENCIES_11) \ + $(am__DEPENDENCIES_1) +am_test_buffer_serialize_OBJECTS = \ + test_buffer_serialize-test-buffer-serialize.$(OBJEXT) +test_buffer_serialize_OBJECTS = $(am_test_buffer_serialize_OBJECTS) +test_buffer_serialize_DEPENDENCIES = libharfbuzz.la \ + $(am__DEPENDENCIES_11) +am_test_ot_tag_OBJECTS = test_ot_tag-hb-ot-tag.$(OBJEXT) +test_ot_tag_OBJECTS = $(am_test_ot_tag_OBJECTS) +test_ot_tag_DEPENDENCIES = libharfbuzz.la $(am__DEPENDENCIES_11) +am_test_size_params_OBJECTS = \ + test_size_params-test-size-params.$(OBJEXT) +test_size_params_OBJECTS = $(am_test_size_params_OBJECTS) +test_size_params_DEPENDENCIES = libharfbuzz.la $(am__DEPENDENCIES_11) +am_test_would_substitute_OBJECTS = \ + test_would_substitute-test-would-substitute.$(OBJEXT) +test_would_substitute_OBJECTS = $(am_test_would_substitute_OBJECTS) +test_would_substitute_DEPENDENCIES = libharfbuzz.la \ + $(am__DEPENDENCIES_11) $(am__DEPENDENCIES_1) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libharfbuzz_fuzzing_la_SOURCES) \ + $(libharfbuzz_gobject_la_SOURCES) \ + $(nodist_libharfbuzz_gobject_la_SOURCES) \ + $(libharfbuzz_icu_la_SOURCES) $(libharfbuzz_la_SOURCES) \ + $(main_SOURCES) $(test_SOURCES) \ + $(test_buffer_serialize_SOURCES) $(test_ot_tag_SOURCES) \ + $(test_size_params_SOURCES) $(test_would_substitute_SOURCES) +DIST_SOURCES = $(am__libharfbuzz_fuzzing_la_SOURCES_DIST) \ + $(am__libharfbuzz_gobject_la_SOURCES_DIST) \ + $(am__libharfbuzz_icu_la_SOURCES_DIST) \ + $(am__libharfbuzz_la_SOURCES_DIST) $(main_SOURCES) \ + $(test_SOURCES) $(test_buffer_serialize_SOURCES) \ + $(test_ot_tag_SOURCES) $(test_size_params_SOURCES) \ + $(test_would_substitute_SOURCES) +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +DATA = $(gir_DATA) $(pkgconfig_DATA) $(typelib_DATA) +am__pkginclude_HEADERS_DIST = hb.h hb-blob.h hb-buffer.h hb-common.h \ + hb-deprecated.h hb-face.h hb-font.h hb-set.h hb-shape.h \ + hb-shape-plan.h hb-unicode.h hb-ot.h hb-ot-font.h \ + hb-ot-layout.h hb-ot-math.h hb-ot-shape.h hb-ot-tag.h \ + hb-ot-var.h hb-glib.h hb-ft.h hb-graphite2.h hb-uniscribe.h \ + hb-directwrite.h hb-coretext.h hb-icu.h hb-gobject.h \ + hb-gobject-structs.h +HEADERS = $(nodist_pkginclude_HEADERS) $(pkginclude_HEADERS) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + check recheck distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +am__EXEEXT_2 = check-c-linkage-decls.sh check-defs.sh \ + check-header-guards.sh check-includes.sh check-libstdc++.sh \ + check-static-inits.sh check-symbols.sh $(am__EXEEXT_1) +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CAIRO_CFLAGS = @CAIRO_CFLAGS@ +CAIRO_FT_CFLAGS = @CAIRO_FT_CFLAGS@ +CAIRO_FT_LIBS = @CAIRO_FT_LIBS@ +CAIRO_LIBS = @CAIRO_LIBS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CORETEXT_CFLAGS = @CORETEXT_CFLAGS@ +CORETEXT_LIBS = @CORETEXT_LIBS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DIRECTWRITE_CXXFLAGS = @DIRECTWRITE_CXXFLAGS@ +DIRECTWRITE_LIBS = @DIRECTWRITE_LIBS@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ +FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ +FREETYPE_DEPS = @FREETYPE_DEPS@ +FREETYPE_LIBS = @FREETYPE_LIBS@ +GIT = @GIT@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_DEPS = @GLIB_DEPS@ +GLIB_LIBS = @GLIB_LIBS@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ +GOBJECT_LIBS = @GOBJECT_LIBS@ +GRAPHITE2_CFLAGS = @GRAPHITE2_CFLAGS@ +GRAPHITE2_DEPS = @GRAPHITE2_DEPS@ +GRAPHITE2_LIBS = @GRAPHITE2_LIBS@ +GREP = @GREP@ +GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ +HB_LIBTOOL_VERSION_INFO = @HB_LIBTOOL_VERSION_INFO@ +HB_VERSION = @HB_VERSION@ +HB_VERSION_MAJOR = @HB_VERSION_MAJOR@ +HB_VERSION_MICRO = @HB_VERSION_MICRO@ +HB_VERSION_MINOR = @HB_VERSION_MINOR@ +HTML_DIR = @HTML_DIR@ +ICU_CFLAGS = @ICU_CFLAGS@ +ICU_CONFIG = @ICU_CONFIG@ +ICU_LIBS = @ICU_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PTHREAD_CC = @PTHREAD_CC@ +PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ +PTHREAD_LIBS = @PTHREAD_LIBS@ +RAGEL = @RAGEL@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +UNISCRIBE_CFLAGS = @UNISCRIBE_CFLAGS@ +UNISCRIBE_LIBS = @UNISCRIBE_LIBS@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +ax_pthread_config = @ax_pthread_config@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +SUBDIRS = $(am__append_32) +DIST_SUBDIRS = hb-ucdn +BUILT_SOURCES = $(am__append_47) $(RAGEL_GENERATED) +EXTRA_DIST = harfbuzz.pc.in harfbuzz-icu.pc.in harfbuzz-gobject.pc.in \ + hb-gobject-enums.cc.tmpl hb-gobject-enums.h.tmpl $(NULL) \ + $(GENERATORS) hb-buffer-deserialize-json.rl \ + hb-buffer-deserialize-text.rl \ + hb-ot-shape-complex-indic-machine.rl \ + hb-ot-shape-complex-myanmar-machine.rl \ + hb-ot-shape-complex-use-machine.rl $(NULL) +CLEANFILES = libharfbuzz-fuzzing.la $(pkgconfig_DATA) harfbuzz.def \ + $(am__append_49) +DISTCLEANFILES = $(am__append_48) +MAINTAINERCLEANFILES = $(RAGEL_GENERATED) +DISTCHECK_CONFIGURE_FLAGS = --enable-introspection +lib_LTLIBRARIES = libharfbuzz.la $(am__append_40) $(am__append_43) +NULL = + +# Base and default-included sources and headers +HB_BASE_sources = \ + hb-atomic-private.hh \ + hb-blob.cc \ + hb-buffer-deserialize-json.hh \ + hb-buffer-deserialize-text.hh \ + hb-buffer-private.hh \ + hb-buffer-serialize.cc \ + hb-buffer.cc \ + hb-cache-private.hh \ + hb-common.cc \ + hb-face-private.hh \ + hb-face.cc \ + hb-font-private.hh \ + hb-font.cc \ + hb-mutex-private.hh \ + hb-object-private.hh \ + hb-open-file-private.hh \ + hb-open-type-private.hh \ + hb-ot-cbdt-table.hh \ + hb-ot-cmap-table.hh \ + hb-ot-glyf-table.hh \ + hb-ot-head-table.hh \ + hb-ot-hhea-table.hh \ + hb-ot-hmtx-table.hh \ + hb-ot-maxp-table.hh \ + hb-ot-name-table.hh \ + hb-ot-os2-table.hh \ + hb-ot-post-table.hh \ + hb-ot-tag.cc \ + hb-private.hh \ + hb-set-private.hh \ + hb-set.cc \ + hb-shape.cc \ + hb-shape-plan-private.hh \ + hb-shape-plan.cc \ + hb-shaper-list.hh \ + hb-shaper-impl-private.hh \ + hb-shaper-private.hh \ + hb-shaper.cc \ + hb-unicode-private.hh \ + hb-unicode.cc \ + hb-utf-private.hh \ + hb-warning.cc \ + $(NULL) + +HB_BASE_headers = \ + hb.h \ + hb-blob.h \ + hb-buffer.h \ + hb-common.h \ + hb-deprecated.h \ + hb-face.h \ + hb-font.h \ + hb-set.h \ + hb-shape.h \ + hb-shape-plan.h \ + hb-unicode.h \ + $(NULL) + +HB_NODIST_headers = \ + hb-version.h \ + $(NULL) + +HB_FALLBACK_sources = hb-fallback-shape.cc +HB_OT_sources = \ + hb-ot-font.cc \ + hb-ot-layout.cc \ + hb-ot-layout-common-private.hh \ + hb-ot-layout-gdef-table.hh \ + hb-ot-layout-gpos-table.hh \ + hb-ot-layout-gsubgpos-private.hh \ + hb-ot-layout-gsub-table.hh \ + hb-ot-layout-jstf-table.hh \ + hb-ot-layout-private.hh \ + hb-ot-map.cc \ + hb-ot-map-private.hh \ + hb-ot-math.cc \ + hb-ot-math-table.hh \ + hb-ot-shape.cc \ + hb-ot-shape-complex-arabic.cc \ + hb-ot-shape-complex-arabic-fallback.hh \ + hb-ot-shape-complex-arabic-private.hh \ + hb-ot-shape-complex-arabic-table.hh \ + hb-ot-shape-complex-arabic-win1256.hh \ + hb-ot-shape-complex-default.cc \ + hb-ot-shape-complex-hangul.cc \ + hb-ot-shape-complex-hebrew.cc \ + hb-ot-shape-complex-indic.cc \ + hb-ot-shape-complex-indic-machine.hh \ + hb-ot-shape-complex-indic-private.hh \ + hb-ot-shape-complex-indic-table.cc \ + hb-ot-shape-complex-myanmar.cc \ + hb-ot-shape-complex-myanmar-machine.hh \ + hb-ot-shape-complex-thai.cc \ + hb-ot-shape-complex-tibetan.cc \ + hb-ot-shape-complex-use.cc \ + hb-ot-shape-complex-use-machine.hh \ + hb-ot-shape-complex-use-private.hh \ + hb-ot-shape-complex-use-table.cc \ + hb-ot-shape-complex-private.hh \ + hb-ot-shape-normalize-private.hh \ + hb-ot-shape-normalize.cc \ + hb-ot-shape-fallback-private.hh \ + hb-ot-shape-fallback.cc \ + hb-ot-shape-private.hh \ + hb-ot-var.cc \ + hb-ot-var-avar-table.hh \ + hb-ot-var-fvar-table.hh \ + hb-ot-var-hvar-table.hh \ + $(NULL) + +HB_OT_headers = \ + hb-ot.h \ + hb-ot-font.h \ + hb-ot-layout.h \ + hb-ot-math.h \ + hb-ot-shape.h \ + hb-ot-tag.h \ + hb-ot-var.h \ + $(NULL) + + +# Optional Sources and Headers with external deps +HB_FT_sources = hb-ft.cc +HB_FT_headers = hb-ft.h +HB_GLIB_sources = hb-glib.cc +HB_GLIB_headers = hb-glib.h +HB_GRAPHITE2_sources = hb-graphite2.cc +HB_GRAPHITE2_headers = hb-graphite2.h + +# System-dependent sources and headers +HB_CORETEXT_sources = hb-coretext.cc +HB_CORETEXT_headers = hb-coretext.h +HB_DIRECTWRITE_sources = hb-directwrite.cc +HB_DIRECTWRITE_headers = hb-directwrite.h +HB_UNISCRIBE_sources = hb-uniscribe.cc +HB_UNISCRIBE_headers = hb-uniscribe.h + +# Additional supplemental sources +HB_UCDN_sources = hb-ucdn.cc + +# Sources for libharfbuzz-gobject and libharfbuzz-icu +HB_ICU_sources = hb-icu.cc +HB_ICU_headers = hb-icu.h +HB_GOBJECT_sources = hb-gobject-structs.cc +HB_GOBJECT_STRUCTS_headers = hb-gobject-structs.h +HB_GOBJECT_headers = hb-gobject.h $(HB_GOBJECT_STRUCTS_headers) +HB_GOBJECT_ENUM_sources = hb-gobject-enums.cc +HB_GOBJECT_ENUM_headers = hb-gobject-enums.h +HBCFLAGS = $(am__append_4) $(am__append_6) $(am__append_11) \ + $(am__append_15) $(am__append_20) $(am__append_24) \ + $(am__append_28) $(am__append_33) $(am__append_36) + +# Put the library together +HBLIBS = $(am__append_7) $(am__append_12) $(am__append_16) \ + $(am__append_34) $(HBNONPCLIBS) $(am__append_37) +HBNONPCLIBS = $(am__append_5) $(am__append_21) $(am__append_25) \ + $(am__append_29) +HBDEPS = $(am__append_8) $(am__append_17) +HBSOURCES = $(HB_BASE_sources) $(am__append_1) $(am__append_3) \ + $(am__append_9) $(am__append_13) $(am__append_18) \ + $(am__append_22) $(am__append_26) $(am__append_30) \ + $(am__append_35) $(am__append_38) +HBHEADERS = $(HB_BASE_headers) $(am__append_2) $(am__append_10) \ + $(am__append_14) $(am__append_19) $(am__append_23) \ + $(am__append_27) $(am__append_31) $(am__append_39) +HBNODISTHEADERS = $(HB_NODIST_headers) +@OS_WIN32_TRUE@export_symbols = -export-symbols harfbuzz.def +@OS_WIN32_TRUE@harfbuzz_def_dependency = harfbuzz.def +@HAVE_GCC_FALSE@@OS_WIN32_FALSE@libharfbuzz_la_LINK = $(CXXLINK) $(libharfbuzz_la_LDFLAGS) +# Use a C linker for GCC, not C++; Don't link to libstdc++ +@HAVE_GCC_TRUE@@OS_WIN32_FALSE@libharfbuzz_la_LINK = $(LINK) $(libharfbuzz_la_LDFLAGS) +@OS_WIN32_TRUE@libharfbuzz_la_LINK = $(CXXLINK) $(libharfbuzz_la_LDFLAGS) +libharfbuzz_la_SOURCES = $(HBSOURCES) $(HBHEADERS) $(HBNODISTHEADERS) +libharfbuzz_la_CPPFLAGS = $(HBCFLAGS) +libharfbuzz_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HB_LIBTOOL_VERSION_INFO) $(export_symbols) -no-undefined +libharfbuzz_la_LIBADD = $(HBLIBS) +EXTRA_libharfbuzz_la_DEPENDENCIES = $(harfbuzz_def_dependency) +pkginclude_HEADERS = $(HBHEADERS) $(am__append_41) $(am__append_44) +nodist_pkginclude_HEADERS = $(HBNODISTHEADERS) $(am__append_45) +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = harfbuzz.pc $(am__append_42) $(am__append_46) +FUZZING_CPPFLAGS = \ + -DHB_NDEBUG \ + -DHB_MAX_NESTING_LEVEL=3 \ + -DHB_SANITIZE_MAX_EDITS=3 \ + -DHB_BUFFER_MAX_EXPANSION_FACTOR=3 \ + -DHB_BUFFER_MAX_LEN_MIN=8 \ + -DHB_BUFFER_MAX_LEN_DEFAULT=128 \ + $(NULL) + +EXTRA_LTLIBRARIES = libharfbuzz-fuzzing.la +libharfbuzz_fuzzing_la_LINK = $(libharfbuzz_la_LINK) +libharfbuzz_fuzzing_la_SOURCES = $(libharfbuzz_la_SOURCES) +libharfbuzz_fuzzing_la_CPPFLAGS = $(libharfbuzz_la_CPPFLAGS) $(FUZZING_CPPFLAGS) +libharfbuzz_fuzzing_la_LDFLAGS = $(libharfbuzz_la_LDFLAGS) +libharfbuzz_fuzzing_la_LIBADD = $(libharfbuzz_la_LIBADD) +EXTRA_libharfbuzz_fuzzing_la_DEPENDENCIES = $(EXTRA_libharfbuzz_la_DEPENDENCIES) +@HAVE_ICU_BUILTIN_FALSE@@HAVE_ICU_TRUE@libharfbuzz_icu_la_SOURCES = $(HB_ICU_sources) +@HAVE_ICU_BUILTIN_FALSE@@HAVE_ICU_TRUE@libharfbuzz_icu_la_CPPFLAGS = $(ICU_CFLAGS) +@HAVE_ICU_BUILTIN_FALSE@@HAVE_ICU_TRUE@libharfbuzz_icu_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HB_LIBTOOL_VERSION_INFO) -no-undefined +@HAVE_ICU_BUILTIN_FALSE@@HAVE_ICU_TRUE@libharfbuzz_icu_la_LIBADD = $(ICU_LIBS) libharfbuzz.la +@HAVE_GOBJECT_TRUE@libharfbuzz_gobject_la_SOURCES = $(HB_GOBJECT_sources) +@HAVE_GOBJECT_TRUE@nodist_libharfbuzz_gobject_la_SOURCES = $(HB_GOBJECT_ENUM_sources) +@HAVE_GOBJECT_TRUE@libharfbuzz_gobject_la_CPPFLAGS = $(GOBJECT_CFLAGS) +@HAVE_GOBJECT_TRUE@libharfbuzz_gobject_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HB_LIBTOOL_VERSION_INFO) -no-undefined +@HAVE_GOBJECT_TRUE@libharfbuzz_gobject_la_LIBADD = $(GOBJECT_LIBS) libharfbuzz.la +GENERATORS = \ + gen-arabic-table.py \ + gen-indic-table.py \ + gen-use-table.py \ + $(NULL) + +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-use-machine.hh \ + $(NULL) + +main_SOURCES = main.cc +main_CPPFLAGS = $(HBCFLAGS) +main_LDADD = libharfbuzz.la $(HBLIBS) +test_SOURCES = test.cc +test_CPPFLAGS = $(HBCFLAGS) $(FREETYPE_CFLAGS) +test_LDADD = libharfbuzz.la $(HBLIBS) $(FREETYPE_LIBS) +test_would_substitute_SOURCES = test-would-substitute.cc +test_would_substitute_CPPFLAGS = $(HBCFLAGS) $(FREETYPE_CFLAGS) +test_would_substitute_LDADD = libharfbuzz.la $(HBLIBS) $(FREETYPE_LIBS) +test_size_params_SOURCES = test-size-params.cc +test_size_params_CPPFLAGS = $(HBCFLAGS) +test_size_params_LDADD = libharfbuzz.la $(HBLIBS) +test_buffer_serialize_SOURCES = test-buffer-serialize.cc +test_buffer_serialize_CPPFLAGS = $(HBCFLAGS) +test_buffer_serialize_LDADD = libharfbuzz.la $(HBLIBS) +dist_check_SCRIPTS = \ + check-c-linkage-decls.sh \ + check-defs.sh \ + check-header-guards.sh \ + check-includes.sh \ + check-libstdc++.sh \ + check-static-inits.sh \ + check-symbols.sh \ + $(NULL) + +test_ot_tag_SOURCES = hb-ot-tag.cc +test_ot_tag_CPPFLAGS = $(HBCFLAGS) -DMAIN +test_ot_tag_LDADD = libharfbuzz.la $(HBLIBS) +TESTS_ENVIRONMENT = \ + srcdir="$(srcdir)" \ + MAKE="$(MAKE) $(AM_MAKEFLAGS)" \ + HBSOURCES="$(HBSOURCES)" \ + HBHEADERS="$(HBHEADERS) $(HBNODISTHEADERS)" \ + $(NULL) + +@HAVE_INTROSPECTION_TRUE@INTROSPECTION_GIRS = HarfBuzz-0.0.gir # What does the 0 mean anyway?! +@HAVE_INTROSPECTION_TRUE@INTROSPECTION_SCANNER_ARGS = -I$(srcdir) -n hb --identifier-prefix=hb_ --warn-all +@HAVE_INTROSPECTION_TRUE@INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) +@HAVE_INTROSPECTION_TRUE@INTROSPECTION_SCANNER_ENV = CC="$(CC)" +@HAVE_INTROSPECTION_TRUE@HarfBuzz_0_0_gir_INCLUDES = GObject-2.0 +@HAVE_INTROSPECTION_TRUE@HarfBuzz_0_0_gir_CFLAGS = \ +@HAVE_INTROSPECTION_TRUE@ $(INCLUDES) \ +@HAVE_INTROSPECTION_TRUE@ $(HBCFLAGS) \ +@HAVE_INTROSPECTION_TRUE@ -DHB_H \ +@HAVE_INTROSPECTION_TRUE@ -DHB_H_IN \ +@HAVE_INTROSPECTION_TRUE@ -DHB_OT_H \ +@HAVE_INTROSPECTION_TRUE@ -DHB_OT_H_IN \ +@HAVE_INTROSPECTION_TRUE@ -DHB_GOBJECT_H \ +@HAVE_INTROSPECTION_TRUE@ -DHB_GOBJECT_H_IN \ +@HAVE_INTROSPECTION_TRUE@ -DHB_EXTERN= \ +@HAVE_INTROSPECTION_TRUE@ $(NULL) + +@HAVE_INTROSPECTION_TRUE@HarfBuzz_0_0_gir_LIBS = \ +@HAVE_INTROSPECTION_TRUE@ libharfbuzz.la \ +@HAVE_INTROSPECTION_TRUE@ libharfbuzz-gobject.la \ +@HAVE_INTROSPECTION_TRUE@ $(NULL) + +@HAVE_INTROSPECTION_TRUE@HarfBuzz_0_0_gir_FILES = \ +@HAVE_INTROSPECTION_TRUE@ $(HBHEADERS) \ +@HAVE_INTROSPECTION_TRUE@ $(HBNODISTHEADERS) \ +@HAVE_INTROSPECTION_TRUE@ $(HBSOURCES) \ +@HAVE_INTROSPECTION_TRUE@ $(HB_GOBJECT_ENUM_sources) \ +@HAVE_INTROSPECTION_TRUE@ $(HB_GOBJECT_ENUM_headers) \ +@HAVE_INTROSPECTION_TRUE@ $(HB_GOBJECT_sources) \ +@HAVE_INTROSPECTION_TRUE@ $(HB_GOBJECT_STRUCTS_headers) \ +@HAVE_INTROSPECTION_TRUE@ $(NULL) + +@HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0 +@HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS) +@HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepository-1.0 +@HAVE_INTROSPECTION_TRUE@typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +.SUFFIXES: +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/Makefile.sources $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits src/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnits src/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; +$(srcdir)/Makefile.sources: + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +hb-version.h: $(top_builddir)/config.status $(srcdir)/hb-version.h.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + } + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libharfbuzz-fuzzing.la: $(libharfbuzz_fuzzing_la_OBJECTS) $(libharfbuzz_fuzzing_la_DEPENDENCIES) $(EXTRA_libharfbuzz_fuzzing_la_DEPENDENCIES) + $(AM_V_GEN)$(libharfbuzz_fuzzing_la_LINK) $(libharfbuzz_fuzzing_la_OBJECTS) $(libharfbuzz_fuzzing_la_LIBADD) $(LIBS) + +libharfbuzz-gobject.la: $(libharfbuzz_gobject_la_OBJECTS) $(libharfbuzz_gobject_la_DEPENDENCIES) $(EXTRA_libharfbuzz_gobject_la_DEPENDENCIES) + $(AM_V_CXXLD)$(libharfbuzz_gobject_la_LINK) $(am_libharfbuzz_gobject_la_rpath) $(libharfbuzz_gobject_la_OBJECTS) $(libharfbuzz_gobject_la_LIBADD) $(LIBS) + +libharfbuzz-icu.la: $(libharfbuzz_icu_la_OBJECTS) $(libharfbuzz_icu_la_DEPENDENCIES) $(EXTRA_libharfbuzz_icu_la_DEPENDENCIES) + $(AM_V_CXXLD)$(libharfbuzz_icu_la_LINK) $(am_libharfbuzz_icu_la_rpath) $(libharfbuzz_icu_la_OBJECTS) $(libharfbuzz_icu_la_LIBADD) $(LIBS) + +libharfbuzz.la: $(libharfbuzz_la_OBJECTS) $(libharfbuzz_la_DEPENDENCIES) $(EXTRA_libharfbuzz_la_DEPENDENCIES) + $(AM_V_GEN)$(libharfbuzz_la_LINK) -rpath $(libdir) $(libharfbuzz_la_OBJECTS) $(libharfbuzz_la_LIBADD) $(LIBS) +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files + +clean-binPROGRAMS: + @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + +installcheck-binPROGRAMS: $(bin_PROGRAMS) + bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \ + case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ + *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ + esac; \ + f=`echo "$$p" | \ + sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + for opt in --help --version; do \ + if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \ + 2>c$${pid}_.err &2; bad=1; fi; \ + done; \ + done; rm -f c$${pid}_.???; exit $$bad + +clean-checkPROGRAMS: + @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + +clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + +main$(EXEEXT): $(main_OBJECTS) $(main_DEPENDENCIES) $(EXTRA_main_DEPENDENCIES) + @rm -f main$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(main_OBJECTS) $(main_LDADD) $(LIBS) + +test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) $(EXTRA_test_DEPENDENCIES) + @rm -f test$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(test_OBJECTS) $(test_LDADD) $(LIBS) + +test-buffer-serialize$(EXEEXT): $(test_buffer_serialize_OBJECTS) $(test_buffer_serialize_DEPENDENCIES) $(EXTRA_test_buffer_serialize_DEPENDENCIES) + @rm -f test-buffer-serialize$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(test_buffer_serialize_OBJECTS) $(test_buffer_serialize_LDADD) $(LIBS) + +test-ot-tag$(EXEEXT): $(test_ot_tag_OBJECTS) $(test_ot_tag_DEPENDENCIES) $(EXTRA_test_ot_tag_DEPENDENCIES) + @rm -f test-ot-tag$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(test_ot_tag_OBJECTS) $(test_ot_tag_LDADD) $(LIBS) + +test-size-params$(EXEEXT): $(test_size_params_OBJECTS) $(test_size_params_DEPENDENCIES) $(EXTRA_test_size_params_DEPENDENCIES) + @rm -f test-size-params$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(test_size_params_OBJECTS) $(test_size_params_LDADD) $(LIBS) + +test-would-substitute$(EXEEXT): $(test_would_substitute_OBJECTS) $(test_would_substitute_DEPENDENCIES) $(EXTRA_test_would_substitute_DEPENDENCIES) + @rm -f test-would-substitute$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(test_would_substitute_OBJECTS) $(test_would_substitute_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-blob.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-buffer-serialize.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-buffer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-common.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-coretext.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-directwrite.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-face.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-fallback-shape.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-font.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-ft.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-glib.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-graphite2.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-icu.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-font.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-layout.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-map.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-math.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-arabic.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-default.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-hangul.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-hebrew.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-indic-table.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-indic.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-myanmar.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-thai.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-tibetan.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-use-table.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-use.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-fallback.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-normalize.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-tag.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-var.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-set.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-shape-plan.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-shape.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-shaper.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-ucdn.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-unicode.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-uniscribe.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_fuzzing_la-hb-warning.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_gobject_la-hb-gobject-enums.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_gobject_la-hb-gobject-structs.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_icu_la-hb-icu.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-blob.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-buffer-serialize.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-buffer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-common.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-coretext.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-directwrite.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-face.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-fallback-shape.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-font.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ft.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-glib.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-graphite2.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-icu.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-font.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-layout.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-map.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-math.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-arabic.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-default.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-hangul.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-hebrew.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-indic-table.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-indic.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-myanmar.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-thai.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-tibetan.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-use-table.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-use.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-fallback.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-shape-normalize.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-shape.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-tag.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ot-var.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-set.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-shape-plan.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-shape.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-shaper.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-ucdn.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-unicode.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-uniscribe.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libharfbuzz_la-hb-warning.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main-main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_buffer_serialize-test-buffer-serialize.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ot_tag-hb-ot-tag.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_size_params-test-size-params.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_would_substitute-test-would-substitute.Po@am__quote@ + +.cc.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cc.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cc.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + +libharfbuzz_fuzzing_la-hb-blob.lo: hb-blob.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-blob.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-blob.Tpo -c -o libharfbuzz_fuzzing_la-hb-blob.lo `test -f 'hb-blob.cc' || echo '$(srcdir)/'`hb-blob.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-blob.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-blob.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-blob.cc' object='libharfbuzz_fuzzing_la-hb-blob.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-blob.lo `test -f 'hb-blob.cc' || echo '$(srcdir)/'`hb-blob.cc + +libharfbuzz_fuzzing_la-hb-buffer-serialize.lo: hb-buffer-serialize.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-buffer-serialize.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-buffer-serialize.Tpo -c -o libharfbuzz_fuzzing_la-hb-buffer-serialize.lo `test -f 'hb-buffer-serialize.cc' || echo '$(srcdir)/'`hb-buffer-serialize.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-buffer-serialize.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-buffer-serialize.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-buffer-serialize.cc' object='libharfbuzz_fuzzing_la-hb-buffer-serialize.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-buffer-serialize.lo `test -f 'hb-buffer-serialize.cc' || echo '$(srcdir)/'`hb-buffer-serialize.cc + +libharfbuzz_fuzzing_la-hb-buffer.lo: hb-buffer.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-buffer.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-buffer.Tpo -c -o libharfbuzz_fuzzing_la-hb-buffer.lo `test -f 'hb-buffer.cc' || echo '$(srcdir)/'`hb-buffer.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-buffer.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-buffer.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-buffer.cc' object='libharfbuzz_fuzzing_la-hb-buffer.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-buffer.lo `test -f 'hb-buffer.cc' || echo '$(srcdir)/'`hb-buffer.cc + +libharfbuzz_fuzzing_la-hb-common.lo: hb-common.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-common.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-common.Tpo -c -o libharfbuzz_fuzzing_la-hb-common.lo `test -f 'hb-common.cc' || echo '$(srcdir)/'`hb-common.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-common.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-common.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-common.cc' object='libharfbuzz_fuzzing_la-hb-common.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-common.lo `test -f 'hb-common.cc' || echo '$(srcdir)/'`hb-common.cc + +libharfbuzz_fuzzing_la-hb-face.lo: hb-face.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-face.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-face.Tpo -c -o libharfbuzz_fuzzing_la-hb-face.lo `test -f 'hb-face.cc' || echo '$(srcdir)/'`hb-face.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-face.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-face.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-face.cc' object='libharfbuzz_fuzzing_la-hb-face.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-face.lo `test -f 'hb-face.cc' || echo '$(srcdir)/'`hb-face.cc + +libharfbuzz_fuzzing_la-hb-font.lo: hb-font.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-font.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-font.Tpo -c -o libharfbuzz_fuzzing_la-hb-font.lo `test -f 'hb-font.cc' || echo '$(srcdir)/'`hb-font.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-font.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-font.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-font.cc' object='libharfbuzz_fuzzing_la-hb-font.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-font.lo `test -f 'hb-font.cc' || echo '$(srcdir)/'`hb-font.cc + +libharfbuzz_fuzzing_la-hb-ot-tag.lo: hb-ot-tag.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-ot-tag.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-tag.Tpo -c -o libharfbuzz_fuzzing_la-hb-ot-tag.lo `test -f 'hb-ot-tag.cc' || echo '$(srcdir)/'`hb-ot-tag.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-tag.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-tag.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-tag.cc' object='libharfbuzz_fuzzing_la-hb-ot-tag.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-ot-tag.lo `test -f 'hb-ot-tag.cc' || echo '$(srcdir)/'`hb-ot-tag.cc + +libharfbuzz_fuzzing_la-hb-set.lo: hb-set.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-set.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-set.Tpo -c -o libharfbuzz_fuzzing_la-hb-set.lo `test -f 'hb-set.cc' || echo '$(srcdir)/'`hb-set.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-set.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-set.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-set.cc' object='libharfbuzz_fuzzing_la-hb-set.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-set.lo `test -f 'hb-set.cc' || echo '$(srcdir)/'`hb-set.cc + +libharfbuzz_fuzzing_la-hb-shape.lo: hb-shape.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-shape.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-shape.Tpo -c -o libharfbuzz_fuzzing_la-hb-shape.lo `test -f 'hb-shape.cc' || echo '$(srcdir)/'`hb-shape.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-shape.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-shape.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-shape.cc' object='libharfbuzz_fuzzing_la-hb-shape.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-shape.lo `test -f 'hb-shape.cc' || echo '$(srcdir)/'`hb-shape.cc + +libharfbuzz_fuzzing_la-hb-shape-plan.lo: hb-shape-plan.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-shape-plan.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-shape-plan.Tpo -c -o libharfbuzz_fuzzing_la-hb-shape-plan.lo `test -f 'hb-shape-plan.cc' || echo '$(srcdir)/'`hb-shape-plan.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-shape-plan.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-shape-plan.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-shape-plan.cc' object='libharfbuzz_fuzzing_la-hb-shape-plan.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-shape-plan.lo `test -f 'hb-shape-plan.cc' || echo '$(srcdir)/'`hb-shape-plan.cc + +libharfbuzz_fuzzing_la-hb-shaper.lo: hb-shaper.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-shaper.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-shaper.Tpo -c -o libharfbuzz_fuzzing_la-hb-shaper.lo `test -f 'hb-shaper.cc' || echo '$(srcdir)/'`hb-shaper.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-shaper.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-shaper.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-shaper.cc' object='libharfbuzz_fuzzing_la-hb-shaper.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-shaper.lo `test -f 'hb-shaper.cc' || echo '$(srcdir)/'`hb-shaper.cc + +libharfbuzz_fuzzing_la-hb-unicode.lo: hb-unicode.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-unicode.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-unicode.Tpo -c -o libharfbuzz_fuzzing_la-hb-unicode.lo `test -f 'hb-unicode.cc' || echo '$(srcdir)/'`hb-unicode.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-unicode.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-unicode.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-unicode.cc' object='libharfbuzz_fuzzing_la-hb-unicode.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-unicode.lo `test -f 'hb-unicode.cc' || echo '$(srcdir)/'`hb-unicode.cc + +libharfbuzz_fuzzing_la-hb-warning.lo: hb-warning.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-warning.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-warning.Tpo -c -o libharfbuzz_fuzzing_la-hb-warning.lo `test -f 'hb-warning.cc' || echo '$(srcdir)/'`hb-warning.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-warning.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-warning.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-warning.cc' object='libharfbuzz_fuzzing_la-hb-warning.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-warning.lo `test -f 'hb-warning.cc' || echo '$(srcdir)/'`hb-warning.cc + +libharfbuzz_fuzzing_la-hb-ot-font.lo: hb-ot-font.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-ot-font.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-font.Tpo -c -o libharfbuzz_fuzzing_la-hb-ot-font.lo `test -f 'hb-ot-font.cc' || echo '$(srcdir)/'`hb-ot-font.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-font.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-font.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-font.cc' object='libharfbuzz_fuzzing_la-hb-ot-font.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-ot-font.lo `test -f 'hb-ot-font.cc' || echo '$(srcdir)/'`hb-ot-font.cc + +libharfbuzz_fuzzing_la-hb-ot-layout.lo: hb-ot-layout.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-ot-layout.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-layout.Tpo -c -o libharfbuzz_fuzzing_la-hb-ot-layout.lo `test -f 'hb-ot-layout.cc' || echo '$(srcdir)/'`hb-ot-layout.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-layout.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-layout.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-layout.cc' object='libharfbuzz_fuzzing_la-hb-ot-layout.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-ot-layout.lo `test -f 'hb-ot-layout.cc' || echo '$(srcdir)/'`hb-ot-layout.cc + +libharfbuzz_fuzzing_la-hb-ot-map.lo: hb-ot-map.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-ot-map.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-map.Tpo -c -o libharfbuzz_fuzzing_la-hb-ot-map.lo `test -f 'hb-ot-map.cc' || echo '$(srcdir)/'`hb-ot-map.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-map.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-map.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-map.cc' object='libharfbuzz_fuzzing_la-hb-ot-map.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-ot-map.lo `test -f 'hb-ot-map.cc' || echo '$(srcdir)/'`hb-ot-map.cc + +libharfbuzz_fuzzing_la-hb-ot-math.lo: hb-ot-math.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-ot-math.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-math.Tpo -c -o libharfbuzz_fuzzing_la-hb-ot-math.lo `test -f 'hb-ot-math.cc' || echo '$(srcdir)/'`hb-ot-math.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-math.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-math.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-math.cc' object='libharfbuzz_fuzzing_la-hb-ot-math.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-ot-math.lo `test -f 'hb-ot-math.cc' || echo '$(srcdir)/'`hb-ot-math.cc + +libharfbuzz_fuzzing_la-hb-ot-shape.lo: hb-ot-shape.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-ot-shape.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape.Tpo -c -o libharfbuzz_fuzzing_la-hb-ot-shape.lo `test -f 'hb-ot-shape.cc' || echo '$(srcdir)/'`hb-ot-shape.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape.cc' object='libharfbuzz_fuzzing_la-hb-ot-shape.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-ot-shape.lo `test -f 'hb-ot-shape.cc' || echo '$(srcdir)/'`hb-ot-shape.cc + +libharfbuzz_fuzzing_la-hb-ot-shape-complex-arabic.lo: hb-ot-shape-complex-arabic.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-ot-shape-complex-arabic.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-arabic.Tpo -c -o libharfbuzz_fuzzing_la-hb-ot-shape-complex-arabic.lo `test -f 'hb-ot-shape-complex-arabic.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-arabic.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-arabic.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-arabic.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape-complex-arabic.cc' object='libharfbuzz_fuzzing_la-hb-ot-shape-complex-arabic.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-ot-shape-complex-arabic.lo `test -f 'hb-ot-shape-complex-arabic.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-arabic.cc + +libharfbuzz_fuzzing_la-hb-ot-shape-complex-default.lo: hb-ot-shape-complex-default.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-ot-shape-complex-default.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-default.Tpo -c -o libharfbuzz_fuzzing_la-hb-ot-shape-complex-default.lo `test -f 'hb-ot-shape-complex-default.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-default.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-default.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-default.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape-complex-default.cc' object='libharfbuzz_fuzzing_la-hb-ot-shape-complex-default.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-ot-shape-complex-default.lo `test -f 'hb-ot-shape-complex-default.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-default.cc + +libharfbuzz_fuzzing_la-hb-ot-shape-complex-hangul.lo: hb-ot-shape-complex-hangul.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-ot-shape-complex-hangul.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-hangul.Tpo -c -o libharfbuzz_fuzzing_la-hb-ot-shape-complex-hangul.lo `test -f 'hb-ot-shape-complex-hangul.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-hangul.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-hangul.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-hangul.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape-complex-hangul.cc' object='libharfbuzz_fuzzing_la-hb-ot-shape-complex-hangul.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-ot-shape-complex-hangul.lo `test -f 'hb-ot-shape-complex-hangul.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-hangul.cc + +libharfbuzz_fuzzing_la-hb-ot-shape-complex-hebrew.lo: hb-ot-shape-complex-hebrew.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-ot-shape-complex-hebrew.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-hebrew.Tpo -c -o libharfbuzz_fuzzing_la-hb-ot-shape-complex-hebrew.lo `test -f 'hb-ot-shape-complex-hebrew.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-hebrew.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-hebrew.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-hebrew.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape-complex-hebrew.cc' object='libharfbuzz_fuzzing_la-hb-ot-shape-complex-hebrew.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-ot-shape-complex-hebrew.lo `test -f 'hb-ot-shape-complex-hebrew.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-hebrew.cc + +libharfbuzz_fuzzing_la-hb-ot-shape-complex-indic.lo: hb-ot-shape-complex-indic.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-ot-shape-complex-indic.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-indic.Tpo -c -o libharfbuzz_fuzzing_la-hb-ot-shape-complex-indic.lo `test -f 'hb-ot-shape-complex-indic.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-indic.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-indic.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-indic.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape-complex-indic.cc' object='libharfbuzz_fuzzing_la-hb-ot-shape-complex-indic.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-ot-shape-complex-indic.lo `test -f 'hb-ot-shape-complex-indic.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-indic.cc + +libharfbuzz_fuzzing_la-hb-ot-shape-complex-indic-table.lo: hb-ot-shape-complex-indic-table.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-ot-shape-complex-indic-table.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-indic-table.Tpo -c -o libharfbuzz_fuzzing_la-hb-ot-shape-complex-indic-table.lo `test -f 'hb-ot-shape-complex-indic-table.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-indic-table.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-indic-table.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-indic-table.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape-complex-indic-table.cc' object='libharfbuzz_fuzzing_la-hb-ot-shape-complex-indic-table.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-ot-shape-complex-indic-table.lo `test -f 'hb-ot-shape-complex-indic-table.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-indic-table.cc + +libharfbuzz_fuzzing_la-hb-ot-shape-complex-myanmar.lo: hb-ot-shape-complex-myanmar.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-ot-shape-complex-myanmar.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-myanmar.Tpo -c -o libharfbuzz_fuzzing_la-hb-ot-shape-complex-myanmar.lo `test -f 'hb-ot-shape-complex-myanmar.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-myanmar.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-myanmar.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-myanmar.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape-complex-myanmar.cc' object='libharfbuzz_fuzzing_la-hb-ot-shape-complex-myanmar.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-ot-shape-complex-myanmar.lo `test -f 'hb-ot-shape-complex-myanmar.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-myanmar.cc + +libharfbuzz_fuzzing_la-hb-ot-shape-complex-thai.lo: hb-ot-shape-complex-thai.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-ot-shape-complex-thai.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-thai.Tpo -c -o libharfbuzz_fuzzing_la-hb-ot-shape-complex-thai.lo `test -f 'hb-ot-shape-complex-thai.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-thai.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-thai.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-thai.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape-complex-thai.cc' object='libharfbuzz_fuzzing_la-hb-ot-shape-complex-thai.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-ot-shape-complex-thai.lo `test -f 'hb-ot-shape-complex-thai.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-thai.cc + +libharfbuzz_fuzzing_la-hb-ot-shape-complex-tibetan.lo: hb-ot-shape-complex-tibetan.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-ot-shape-complex-tibetan.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-tibetan.Tpo -c -o libharfbuzz_fuzzing_la-hb-ot-shape-complex-tibetan.lo `test -f 'hb-ot-shape-complex-tibetan.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-tibetan.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-tibetan.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-tibetan.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape-complex-tibetan.cc' object='libharfbuzz_fuzzing_la-hb-ot-shape-complex-tibetan.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-ot-shape-complex-tibetan.lo `test -f 'hb-ot-shape-complex-tibetan.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-tibetan.cc + +libharfbuzz_fuzzing_la-hb-ot-shape-complex-use.lo: hb-ot-shape-complex-use.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-ot-shape-complex-use.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-use.Tpo -c -o libharfbuzz_fuzzing_la-hb-ot-shape-complex-use.lo `test -f 'hb-ot-shape-complex-use.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-use.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-use.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-use.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape-complex-use.cc' object='libharfbuzz_fuzzing_la-hb-ot-shape-complex-use.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-ot-shape-complex-use.lo `test -f 'hb-ot-shape-complex-use.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-use.cc + +libharfbuzz_fuzzing_la-hb-ot-shape-complex-use-table.lo: hb-ot-shape-complex-use-table.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-ot-shape-complex-use-table.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-use-table.Tpo -c -o libharfbuzz_fuzzing_la-hb-ot-shape-complex-use-table.lo `test -f 'hb-ot-shape-complex-use-table.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-use-table.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-use-table.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-complex-use-table.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape-complex-use-table.cc' object='libharfbuzz_fuzzing_la-hb-ot-shape-complex-use-table.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-ot-shape-complex-use-table.lo `test -f 'hb-ot-shape-complex-use-table.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-use-table.cc + +libharfbuzz_fuzzing_la-hb-ot-shape-normalize.lo: hb-ot-shape-normalize.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-ot-shape-normalize.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-normalize.Tpo -c -o libharfbuzz_fuzzing_la-hb-ot-shape-normalize.lo `test -f 'hb-ot-shape-normalize.cc' || echo '$(srcdir)/'`hb-ot-shape-normalize.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-normalize.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-normalize.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape-normalize.cc' object='libharfbuzz_fuzzing_la-hb-ot-shape-normalize.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-ot-shape-normalize.lo `test -f 'hb-ot-shape-normalize.cc' || echo '$(srcdir)/'`hb-ot-shape-normalize.cc + +libharfbuzz_fuzzing_la-hb-ot-shape-fallback.lo: hb-ot-shape-fallback.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-ot-shape-fallback.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-fallback.Tpo -c -o libharfbuzz_fuzzing_la-hb-ot-shape-fallback.lo `test -f 'hb-ot-shape-fallback.cc' || echo '$(srcdir)/'`hb-ot-shape-fallback.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-fallback.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-shape-fallback.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape-fallback.cc' object='libharfbuzz_fuzzing_la-hb-ot-shape-fallback.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-ot-shape-fallback.lo `test -f 'hb-ot-shape-fallback.cc' || echo '$(srcdir)/'`hb-ot-shape-fallback.cc + +libharfbuzz_fuzzing_la-hb-ot-var.lo: hb-ot-var.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-ot-var.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-var.Tpo -c -o libharfbuzz_fuzzing_la-hb-ot-var.lo `test -f 'hb-ot-var.cc' || echo '$(srcdir)/'`hb-ot-var.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-var.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ot-var.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-var.cc' object='libharfbuzz_fuzzing_la-hb-ot-var.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-ot-var.lo `test -f 'hb-ot-var.cc' || echo '$(srcdir)/'`hb-ot-var.cc + +libharfbuzz_fuzzing_la-hb-fallback-shape.lo: hb-fallback-shape.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-fallback-shape.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-fallback-shape.Tpo -c -o libharfbuzz_fuzzing_la-hb-fallback-shape.lo `test -f 'hb-fallback-shape.cc' || echo '$(srcdir)/'`hb-fallback-shape.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-fallback-shape.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-fallback-shape.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-fallback-shape.cc' object='libharfbuzz_fuzzing_la-hb-fallback-shape.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-fallback-shape.lo `test -f 'hb-fallback-shape.cc' || echo '$(srcdir)/'`hb-fallback-shape.cc + +libharfbuzz_fuzzing_la-hb-glib.lo: hb-glib.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-glib.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-glib.Tpo -c -o libharfbuzz_fuzzing_la-hb-glib.lo `test -f 'hb-glib.cc' || echo '$(srcdir)/'`hb-glib.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-glib.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-glib.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-glib.cc' object='libharfbuzz_fuzzing_la-hb-glib.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-glib.lo `test -f 'hb-glib.cc' || echo '$(srcdir)/'`hb-glib.cc + +libharfbuzz_fuzzing_la-hb-ft.lo: hb-ft.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-ft.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ft.Tpo -c -o libharfbuzz_fuzzing_la-hb-ft.lo `test -f 'hb-ft.cc' || echo '$(srcdir)/'`hb-ft.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ft.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ft.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ft.cc' object='libharfbuzz_fuzzing_la-hb-ft.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-ft.lo `test -f 'hb-ft.cc' || echo '$(srcdir)/'`hb-ft.cc + +libharfbuzz_fuzzing_la-hb-graphite2.lo: hb-graphite2.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-graphite2.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-graphite2.Tpo -c -o libharfbuzz_fuzzing_la-hb-graphite2.lo `test -f 'hb-graphite2.cc' || echo '$(srcdir)/'`hb-graphite2.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-graphite2.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-graphite2.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-graphite2.cc' object='libharfbuzz_fuzzing_la-hb-graphite2.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-graphite2.lo `test -f 'hb-graphite2.cc' || echo '$(srcdir)/'`hb-graphite2.cc + +libharfbuzz_fuzzing_la-hb-uniscribe.lo: hb-uniscribe.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-uniscribe.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-uniscribe.Tpo -c -o libharfbuzz_fuzzing_la-hb-uniscribe.lo `test -f 'hb-uniscribe.cc' || echo '$(srcdir)/'`hb-uniscribe.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-uniscribe.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-uniscribe.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-uniscribe.cc' object='libharfbuzz_fuzzing_la-hb-uniscribe.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-uniscribe.lo `test -f 'hb-uniscribe.cc' || echo '$(srcdir)/'`hb-uniscribe.cc + +libharfbuzz_fuzzing_la-hb-directwrite.lo: hb-directwrite.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-directwrite.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-directwrite.Tpo -c -o libharfbuzz_fuzzing_la-hb-directwrite.lo `test -f 'hb-directwrite.cc' || echo '$(srcdir)/'`hb-directwrite.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-directwrite.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-directwrite.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-directwrite.cc' object='libharfbuzz_fuzzing_la-hb-directwrite.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-directwrite.lo `test -f 'hb-directwrite.cc' || echo '$(srcdir)/'`hb-directwrite.cc + +libharfbuzz_fuzzing_la-hb-coretext.lo: hb-coretext.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-coretext.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-coretext.Tpo -c -o libharfbuzz_fuzzing_la-hb-coretext.lo `test -f 'hb-coretext.cc' || echo '$(srcdir)/'`hb-coretext.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-coretext.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-coretext.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-coretext.cc' object='libharfbuzz_fuzzing_la-hb-coretext.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-coretext.lo `test -f 'hb-coretext.cc' || echo '$(srcdir)/'`hb-coretext.cc + +libharfbuzz_fuzzing_la-hb-ucdn.lo: hb-ucdn.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-ucdn.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ucdn.Tpo -c -o libharfbuzz_fuzzing_la-hb-ucdn.lo `test -f 'hb-ucdn.cc' || echo '$(srcdir)/'`hb-ucdn.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ucdn.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-ucdn.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ucdn.cc' object='libharfbuzz_fuzzing_la-hb-ucdn.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-ucdn.lo `test -f 'hb-ucdn.cc' || echo '$(srcdir)/'`hb-ucdn.cc + +libharfbuzz_fuzzing_la-hb-icu.lo: hb-icu.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_fuzzing_la-hb-icu.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_fuzzing_la-hb-icu.Tpo -c -o libharfbuzz_fuzzing_la-hb-icu.lo `test -f 'hb-icu.cc' || echo '$(srcdir)/'`hb-icu.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_fuzzing_la-hb-icu.Tpo $(DEPDIR)/libharfbuzz_fuzzing_la-hb-icu.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-icu.cc' object='libharfbuzz_fuzzing_la-hb-icu.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_fuzzing_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_fuzzing_la-hb-icu.lo `test -f 'hb-icu.cc' || echo '$(srcdir)/'`hb-icu.cc + +libharfbuzz_gobject_la-hb-gobject-structs.lo: hb-gobject-structs.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_gobject_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_gobject_la-hb-gobject-structs.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_gobject_la-hb-gobject-structs.Tpo -c -o libharfbuzz_gobject_la-hb-gobject-structs.lo `test -f 'hb-gobject-structs.cc' || echo '$(srcdir)/'`hb-gobject-structs.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_gobject_la-hb-gobject-structs.Tpo $(DEPDIR)/libharfbuzz_gobject_la-hb-gobject-structs.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-gobject-structs.cc' object='libharfbuzz_gobject_la-hb-gobject-structs.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_gobject_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_gobject_la-hb-gobject-structs.lo `test -f 'hb-gobject-structs.cc' || echo '$(srcdir)/'`hb-gobject-structs.cc + +libharfbuzz_gobject_la-hb-gobject-enums.lo: hb-gobject-enums.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_gobject_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_gobject_la-hb-gobject-enums.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_gobject_la-hb-gobject-enums.Tpo -c -o libharfbuzz_gobject_la-hb-gobject-enums.lo `test -f 'hb-gobject-enums.cc' || echo '$(srcdir)/'`hb-gobject-enums.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_gobject_la-hb-gobject-enums.Tpo $(DEPDIR)/libharfbuzz_gobject_la-hb-gobject-enums.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-gobject-enums.cc' object='libharfbuzz_gobject_la-hb-gobject-enums.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_gobject_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_gobject_la-hb-gobject-enums.lo `test -f 'hb-gobject-enums.cc' || echo '$(srcdir)/'`hb-gobject-enums.cc + +libharfbuzz_icu_la-hb-icu.lo: hb-icu.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_icu_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_icu_la-hb-icu.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_icu_la-hb-icu.Tpo -c -o libharfbuzz_icu_la-hb-icu.lo `test -f 'hb-icu.cc' || echo '$(srcdir)/'`hb-icu.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_icu_la-hb-icu.Tpo $(DEPDIR)/libharfbuzz_icu_la-hb-icu.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-icu.cc' object='libharfbuzz_icu_la-hb-icu.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_icu_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_icu_la-hb-icu.lo `test -f 'hb-icu.cc' || echo '$(srcdir)/'`hb-icu.cc + +libharfbuzz_la-hb-blob.lo: hb-blob.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-blob.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-blob.Tpo -c -o libharfbuzz_la-hb-blob.lo `test -f 'hb-blob.cc' || echo '$(srcdir)/'`hb-blob.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-blob.Tpo $(DEPDIR)/libharfbuzz_la-hb-blob.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-blob.cc' object='libharfbuzz_la-hb-blob.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-blob.lo `test -f 'hb-blob.cc' || echo '$(srcdir)/'`hb-blob.cc + +libharfbuzz_la-hb-buffer-serialize.lo: hb-buffer-serialize.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-buffer-serialize.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-buffer-serialize.Tpo -c -o libharfbuzz_la-hb-buffer-serialize.lo `test -f 'hb-buffer-serialize.cc' || echo '$(srcdir)/'`hb-buffer-serialize.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-buffer-serialize.Tpo $(DEPDIR)/libharfbuzz_la-hb-buffer-serialize.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-buffer-serialize.cc' object='libharfbuzz_la-hb-buffer-serialize.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-buffer-serialize.lo `test -f 'hb-buffer-serialize.cc' || echo '$(srcdir)/'`hb-buffer-serialize.cc + +libharfbuzz_la-hb-buffer.lo: hb-buffer.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-buffer.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-buffer.Tpo -c -o libharfbuzz_la-hb-buffer.lo `test -f 'hb-buffer.cc' || echo '$(srcdir)/'`hb-buffer.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-buffer.Tpo $(DEPDIR)/libharfbuzz_la-hb-buffer.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-buffer.cc' object='libharfbuzz_la-hb-buffer.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-buffer.lo `test -f 'hb-buffer.cc' || echo '$(srcdir)/'`hb-buffer.cc + +libharfbuzz_la-hb-common.lo: hb-common.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-common.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-common.Tpo -c -o libharfbuzz_la-hb-common.lo `test -f 'hb-common.cc' || echo '$(srcdir)/'`hb-common.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-common.Tpo $(DEPDIR)/libharfbuzz_la-hb-common.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-common.cc' object='libharfbuzz_la-hb-common.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-common.lo `test -f 'hb-common.cc' || echo '$(srcdir)/'`hb-common.cc + +libharfbuzz_la-hb-face.lo: hb-face.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-face.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-face.Tpo -c -o libharfbuzz_la-hb-face.lo `test -f 'hb-face.cc' || echo '$(srcdir)/'`hb-face.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-face.Tpo $(DEPDIR)/libharfbuzz_la-hb-face.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-face.cc' object='libharfbuzz_la-hb-face.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-face.lo `test -f 'hb-face.cc' || echo '$(srcdir)/'`hb-face.cc + +libharfbuzz_la-hb-font.lo: hb-font.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-font.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-font.Tpo -c -o libharfbuzz_la-hb-font.lo `test -f 'hb-font.cc' || echo '$(srcdir)/'`hb-font.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-font.Tpo $(DEPDIR)/libharfbuzz_la-hb-font.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-font.cc' object='libharfbuzz_la-hb-font.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-font.lo `test -f 'hb-font.cc' || echo '$(srcdir)/'`hb-font.cc + +libharfbuzz_la-hb-ot-tag.lo: hb-ot-tag.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ot-tag.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ot-tag.Tpo -c -o libharfbuzz_la-hb-ot-tag.lo `test -f 'hb-ot-tag.cc' || echo '$(srcdir)/'`hb-ot-tag.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ot-tag.Tpo $(DEPDIR)/libharfbuzz_la-hb-ot-tag.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-tag.cc' object='libharfbuzz_la-hb-ot-tag.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ot-tag.lo `test -f 'hb-ot-tag.cc' || echo '$(srcdir)/'`hb-ot-tag.cc + +libharfbuzz_la-hb-set.lo: hb-set.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-set.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-set.Tpo -c -o libharfbuzz_la-hb-set.lo `test -f 'hb-set.cc' || echo '$(srcdir)/'`hb-set.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-set.Tpo $(DEPDIR)/libharfbuzz_la-hb-set.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-set.cc' object='libharfbuzz_la-hb-set.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-set.lo `test -f 'hb-set.cc' || echo '$(srcdir)/'`hb-set.cc + +libharfbuzz_la-hb-shape.lo: hb-shape.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-shape.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-shape.Tpo -c -o libharfbuzz_la-hb-shape.lo `test -f 'hb-shape.cc' || echo '$(srcdir)/'`hb-shape.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-shape.Tpo $(DEPDIR)/libharfbuzz_la-hb-shape.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-shape.cc' object='libharfbuzz_la-hb-shape.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-shape.lo `test -f 'hb-shape.cc' || echo '$(srcdir)/'`hb-shape.cc + +libharfbuzz_la-hb-shape-plan.lo: hb-shape-plan.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-shape-plan.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-shape-plan.Tpo -c -o libharfbuzz_la-hb-shape-plan.lo `test -f 'hb-shape-plan.cc' || echo '$(srcdir)/'`hb-shape-plan.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-shape-plan.Tpo $(DEPDIR)/libharfbuzz_la-hb-shape-plan.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-shape-plan.cc' object='libharfbuzz_la-hb-shape-plan.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-shape-plan.lo `test -f 'hb-shape-plan.cc' || echo '$(srcdir)/'`hb-shape-plan.cc + +libharfbuzz_la-hb-shaper.lo: hb-shaper.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-shaper.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-shaper.Tpo -c -o libharfbuzz_la-hb-shaper.lo `test -f 'hb-shaper.cc' || echo '$(srcdir)/'`hb-shaper.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-shaper.Tpo $(DEPDIR)/libharfbuzz_la-hb-shaper.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-shaper.cc' object='libharfbuzz_la-hb-shaper.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-shaper.lo `test -f 'hb-shaper.cc' || echo '$(srcdir)/'`hb-shaper.cc + +libharfbuzz_la-hb-unicode.lo: hb-unicode.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-unicode.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-unicode.Tpo -c -o libharfbuzz_la-hb-unicode.lo `test -f 'hb-unicode.cc' || echo '$(srcdir)/'`hb-unicode.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-unicode.Tpo $(DEPDIR)/libharfbuzz_la-hb-unicode.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-unicode.cc' object='libharfbuzz_la-hb-unicode.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-unicode.lo `test -f 'hb-unicode.cc' || echo '$(srcdir)/'`hb-unicode.cc + +libharfbuzz_la-hb-warning.lo: hb-warning.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-warning.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-warning.Tpo -c -o libharfbuzz_la-hb-warning.lo `test -f 'hb-warning.cc' || echo '$(srcdir)/'`hb-warning.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-warning.Tpo $(DEPDIR)/libharfbuzz_la-hb-warning.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-warning.cc' object='libharfbuzz_la-hb-warning.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-warning.lo `test -f 'hb-warning.cc' || echo '$(srcdir)/'`hb-warning.cc + +libharfbuzz_la-hb-ot-font.lo: hb-ot-font.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ot-font.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ot-font.Tpo -c -o libharfbuzz_la-hb-ot-font.lo `test -f 'hb-ot-font.cc' || echo '$(srcdir)/'`hb-ot-font.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ot-font.Tpo $(DEPDIR)/libharfbuzz_la-hb-ot-font.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-font.cc' object='libharfbuzz_la-hb-ot-font.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ot-font.lo `test -f 'hb-ot-font.cc' || echo '$(srcdir)/'`hb-ot-font.cc + +libharfbuzz_la-hb-ot-layout.lo: hb-ot-layout.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ot-layout.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ot-layout.Tpo -c -o libharfbuzz_la-hb-ot-layout.lo `test -f 'hb-ot-layout.cc' || echo '$(srcdir)/'`hb-ot-layout.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ot-layout.Tpo $(DEPDIR)/libharfbuzz_la-hb-ot-layout.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-layout.cc' object='libharfbuzz_la-hb-ot-layout.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ot-layout.lo `test -f 'hb-ot-layout.cc' || echo '$(srcdir)/'`hb-ot-layout.cc + +libharfbuzz_la-hb-ot-map.lo: hb-ot-map.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ot-map.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ot-map.Tpo -c -o libharfbuzz_la-hb-ot-map.lo `test -f 'hb-ot-map.cc' || echo '$(srcdir)/'`hb-ot-map.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ot-map.Tpo $(DEPDIR)/libharfbuzz_la-hb-ot-map.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-map.cc' object='libharfbuzz_la-hb-ot-map.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ot-map.lo `test -f 'hb-ot-map.cc' || echo '$(srcdir)/'`hb-ot-map.cc + +libharfbuzz_la-hb-ot-math.lo: hb-ot-math.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ot-math.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ot-math.Tpo -c -o libharfbuzz_la-hb-ot-math.lo `test -f 'hb-ot-math.cc' || echo '$(srcdir)/'`hb-ot-math.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ot-math.Tpo $(DEPDIR)/libharfbuzz_la-hb-ot-math.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-math.cc' object='libharfbuzz_la-hb-ot-math.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ot-math.lo `test -f 'hb-ot-math.cc' || echo '$(srcdir)/'`hb-ot-math.cc + +libharfbuzz_la-hb-ot-shape.lo: hb-ot-shape.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ot-shape.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ot-shape.Tpo -c -o libharfbuzz_la-hb-ot-shape.lo `test -f 'hb-ot-shape.cc' || echo '$(srcdir)/'`hb-ot-shape.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ot-shape.Tpo $(DEPDIR)/libharfbuzz_la-hb-ot-shape.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape.cc' object='libharfbuzz_la-hb-ot-shape.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ot-shape.lo `test -f 'hb-ot-shape.cc' || echo '$(srcdir)/'`hb-ot-shape.cc + +libharfbuzz_la-hb-ot-shape-complex-arabic.lo: hb-ot-shape-complex-arabic.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ot-shape-complex-arabic.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-arabic.Tpo -c -o libharfbuzz_la-hb-ot-shape-complex-arabic.lo `test -f 'hb-ot-shape-complex-arabic.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-arabic.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-arabic.Tpo $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-arabic.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape-complex-arabic.cc' object='libharfbuzz_la-hb-ot-shape-complex-arabic.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ot-shape-complex-arabic.lo `test -f 'hb-ot-shape-complex-arabic.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-arabic.cc + +libharfbuzz_la-hb-ot-shape-complex-default.lo: hb-ot-shape-complex-default.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ot-shape-complex-default.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-default.Tpo -c -o libharfbuzz_la-hb-ot-shape-complex-default.lo `test -f 'hb-ot-shape-complex-default.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-default.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-default.Tpo $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-default.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape-complex-default.cc' object='libharfbuzz_la-hb-ot-shape-complex-default.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ot-shape-complex-default.lo `test -f 'hb-ot-shape-complex-default.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-default.cc + +libharfbuzz_la-hb-ot-shape-complex-hangul.lo: hb-ot-shape-complex-hangul.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ot-shape-complex-hangul.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-hangul.Tpo -c -o libharfbuzz_la-hb-ot-shape-complex-hangul.lo `test -f 'hb-ot-shape-complex-hangul.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-hangul.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-hangul.Tpo $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-hangul.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape-complex-hangul.cc' object='libharfbuzz_la-hb-ot-shape-complex-hangul.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ot-shape-complex-hangul.lo `test -f 'hb-ot-shape-complex-hangul.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-hangul.cc + +libharfbuzz_la-hb-ot-shape-complex-hebrew.lo: hb-ot-shape-complex-hebrew.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ot-shape-complex-hebrew.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-hebrew.Tpo -c -o libharfbuzz_la-hb-ot-shape-complex-hebrew.lo `test -f 'hb-ot-shape-complex-hebrew.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-hebrew.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-hebrew.Tpo $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-hebrew.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape-complex-hebrew.cc' object='libharfbuzz_la-hb-ot-shape-complex-hebrew.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ot-shape-complex-hebrew.lo `test -f 'hb-ot-shape-complex-hebrew.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-hebrew.cc + +libharfbuzz_la-hb-ot-shape-complex-indic.lo: hb-ot-shape-complex-indic.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ot-shape-complex-indic.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-indic.Tpo -c -o libharfbuzz_la-hb-ot-shape-complex-indic.lo `test -f 'hb-ot-shape-complex-indic.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-indic.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-indic.Tpo $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-indic.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape-complex-indic.cc' object='libharfbuzz_la-hb-ot-shape-complex-indic.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ot-shape-complex-indic.lo `test -f 'hb-ot-shape-complex-indic.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-indic.cc + +libharfbuzz_la-hb-ot-shape-complex-indic-table.lo: hb-ot-shape-complex-indic-table.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ot-shape-complex-indic-table.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-indic-table.Tpo -c -o libharfbuzz_la-hb-ot-shape-complex-indic-table.lo `test -f 'hb-ot-shape-complex-indic-table.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-indic-table.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-indic-table.Tpo $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-indic-table.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape-complex-indic-table.cc' object='libharfbuzz_la-hb-ot-shape-complex-indic-table.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ot-shape-complex-indic-table.lo `test -f 'hb-ot-shape-complex-indic-table.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-indic-table.cc + +libharfbuzz_la-hb-ot-shape-complex-myanmar.lo: hb-ot-shape-complex-myanmar.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ot-shape-complex-myanmar.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-myanmar.Tpo -c -o libharfbuzz_la-hb-ot-shape-complex-myanmar.lo `test -f 'hb-ot-shape-complex-myanmar.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-myanmar.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-myanmar.Tpo $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-myanmar.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape-complex-myanmar.cc' object='libharfbuzz_la-hb-ot-shape-complex-myanmar.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ot-shape-complex-myanmar.lo `test -f 'hb-ot-shape-complex-myanmar.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-myanmar.cc + +libharfbuzz_la-hb-ot-shape-complex-thai.lo: hb-ot-shape-complex-thai.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ot-shape-complex-thai.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-thai.Tpo -c -o libharfbuzz_la-hb-ot-shape-complex-thai.lo `test -f 'hb-ot-shape-complex-thai.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-thai.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-thai.Tpo $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-thai.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape-complex-thai.cc' object='libharfbuzz_la-hb-ot-shape-complex-thai.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ot-shape-complex-thai.lo `test -f 'hb-ot-shape-complex-thai.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-thai.cc + +libharfbuzz_la-hb-ot-shape-complex-tibetan.lo: hb-ot-shape-complex-tibetan.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ot-shape-complex-tibetan.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-tibetan.Tpo -c -o libharfbuzz_la-hb-ot-shape-complex-tibetan.lo `test -f 'hb-ot-shape-complex-tibetan.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-tibetan.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-tibetan.Tpo $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-tibetan.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape-complex-tibetan.cc' object='libharfbuzz_la-hb-ot-shape-complex-tibetan.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ot-shape-complex-tibetan.lo `test -f 'hb-ot-shape-complex-tibetan.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-tibetan.cc + +libharfbuzz_la-hb-ot-shape-complex-use.lo: hb-ot-shape-complex-use.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ot-shape-complex-use.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-use.Tpo -c -o libharfbuzz_la-hb-ot-shape-complex-use.lo `test -f 'hb-ot-shape-complex-use.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-use.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-use.Tpo $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-use.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape-complex-use.cc' object='libharfbuzz_la-hb-ot-shape-complex-use.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ot-shape-complex-use.lo `test -f 'hb-ot-shape-complex-use.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-use.cc + +libharfbuzz_la-hb-ot-shape-complex-use-table.lo: hb-ot-shape-complex-use-table.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ot-shape-complex-use-table.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-use-table.Tpo -c -o libharfbuzz_la-hb-ot-shape-complex-use-table.lo `test -f 'hb-ot-shape-complex-use-table.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-use-table.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-use-table.Tpo $(DEPDIR)/libharfbuzz_la-hb-ot-shape-complex-use-table.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape-complex-use-table.cc' object='libharfbuzz_la-hb-ot-shape-complex-use-table.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ot-shape-complex-use-table.lo `test -f 'hb-ot-shape-complex-use-table.cc' || echo '$(srcdir)/'`hb-ot-shape-complex-use-table.cc + +libharfbuzz_la-hb-ot-shape-normalize.lo: hb-ot-shape-normalize.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ot-shape-normalize.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ot-shape-normalize.Tpo -c -o libharfbuzz_la-hb-ot-shape-normalize.lo `test -f 'hb-ot-shape-normalize.cc' || echo '$(srcdir)/'`hb-ot-shape-normalize.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ot-shape-normalize.Tpo $(DEPDIR)/libharfbuzz_la-hb-ot-shape-normalize.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape-normalize.cc' object='libharfbuzz_la-hb-ot-shape-normalize.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ot-shape-normalize.lo `test -f 'hb-ot-shape-normalize.cc' || echo '$(srcdir)/'`hb-ot-shape-normalize.cc + +libharfbuzz_la-hb-ot-shape-fallback.lo: hb-ot-shape-fallback.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ot-shape-fallback.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ot-shape-fallback.Tpo -c -o libharfbuzz_la-hb-ot-shape-fallback.lo `test -f 'hb-ot-shape-fallback.cc' || echo '$(srcdir)/'`hb-ot-shape-fallback.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ot-shape-fallback.Tpo $(DEPDIR)/libharfbuzz_la-hb-ot-shape-fallback.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-shape-fallback.cc' object='libharfbuzz_la-hb-ot-shape-fallback.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ot-shape-fallback.lo `test -f 'hb-ot-shape-fallback.cc' || echo '$(srcdir)/'`hb-ot-shape-fallback.cc + +libharfbuzz_la-hb-ot-var.lo: hb-ot-var.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ot-var.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ot-var.Tpo -c -o libharfbuzz_la-hb-ot-var.lo `test -f 'hb-ot-var.cc' || echo '$(srcdir)/'`hb-ot-var.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ot-var.Tpo $(DEPDIR)/libharfbuzz_la-hb-ot-var.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-var.cc' object='libharfbuzz_la-hb-ot-var.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ot-var.lo `test -f 'hb-ot-var.cc' || echo '$(srcdir)/'`hb-ot-var.cc + +libharfbuzz_la-hb-fallback-shape.lo: hb-fallback-shape.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-fallback-shape.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-fallback-shape.Tpo -c -o libharfbuzz_la-hb-fallback-shape.lo `test -f 'hb-fallback-shape.cc' || echo '$(srcdir)/'`hb-fallback-shape.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-fallback-shape.Tpo $(DEPDIR)/libharfbuzz_la-hb-fallback-shape.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-fallback-shape.cc' object='libharfbuzz_la-hb-fallback-shape.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-fallback-shape.lo `test -f 'hb-fallback-shape.cc' || echo '$(srcdir)/'`hb-fallback-shape.cc + +libharfbuzz_la-hb-glib.lo: hb-glib.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-glib.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-glib.Tpo -c -o libharfbuzz_la-hb-glib.lo `test -f 'hb-glib.cc' || echo '$(srcdir)/'`hb-glib.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-glib.Tpo $(DEPDIR)/libharfbuzz_la-hb-glib.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-glib.cc' object='libharfbuzz_la-hb-glib.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-glib.lo `test -f 'hb-glib.cc' || echo '$(srcdir)/'`hb-glib.cc + +libharfbuzz_la-hb-ft.lo: hb-ft.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ft.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ft.Tpo -c -o libharfbuzz_la-hb-ft.lo `test -f 'hb-ft.cc' || echo '$(srcdir)/'`hb-ft.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ft.Tpo $(DEPDIR)/libharfbuzz_la-hb-ft.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ft.cc' object='libharfbuzz_la-hb-ft.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ft.lo `test -f 'hb-ft.cc' || echo '$(srcdir)/'`hb-ft.cc + +libharfbuzz_la-hb-graphite2.lo: hb-graphite2.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-graphite2.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-graphite2.Tpo -c -o libharfbuzz_la-hb-graphite2.lo `test -f 'hb-graphite2.cc' || echo '$(srcdir)/'`hb-graphite2.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-graphite2.Tpo $(DEPDIR)/libharfbuzz_la-hb-graphite2.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-graphite2.cc' object='libharfbuzz_la-hb-graphite2.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-graphite2.lo `test -f 'hb-graphite2.cc' || echo '$(srcdir)/'`hb-graphite2.cc + +libharfbuzz_la-hb-uniscribe.lo: hb-uniscribe.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-uniscribe.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-uniscribe.Tpo -c -o libharfbuzz_la-hb-uniscribe.lo `test -f 'hb-uniscribe.cc' || echo '$(srcdir)/'`hb-uniscribe.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-uniscribe.Tpo $(DEPDIR)/libharfbuzz_la-hb-uniscribe.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-uniscribe.cc' object='libharfbuzz_la-hb-uniscribe.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-uniscribe.lo `test -f 'hb-uniscribe.cc' || echo '$(srcdir)/'`hb-uniscribe.cc + +libharfbuzz_la-hb-directwrite.lo: hb-directwrite.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-directwrite.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-directwrite.Tpo -c -o libharfbuzz_la-hb-directwrite.lo `test -f 'hb-directwrite.cc' || echo '$(srcdir)/'`hb-directwrite.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-directwrite.Tpo $(DEPDIR)/libharfbuzz_la-hb-directwrite.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-directwrite.cc' object='libharfbuzz_la-hb-directwrite.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-directwrite.lo `test -f 'hb-directwrite.cc' || echo '$(srcdir)/'`hb-directwrite.cc + +libharfbuzz_la-hb-coretext.lo: hb-coretext.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-coretext.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-coretext.Tpo -c -o libharfbuzz_la-hb-coretext.lo `test -f 'hb-coretext.cc' || echo '$(srcdir)/'`hb-coretext.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-coretext.Tpo $(DEPDIR)/libharfbuzz_la-hb-coretext.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-coretext.cc' object='libharfbuzz_la-hb-coretext.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-coretext.lo `test -f 'hb-coretext.cc' || echo '$(srcdir)/'`hb-coretext.cc + +libharfbuzz_la-hb-ucdn.lo: hb-ucdn.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-ucdn.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-ucdn.Tpo -c -o libharfbuzz_la-hb-ucdn.lo `test -f 'hb-ucdn.cc' || echo '$(srcdir)/'`hb-ucdn.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-ucdn.Tpo $(DEPDIR)/libharfbuzz_la-hb-ucdn.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ucdn.cc' object='libharfbuzz_la-hb-ucdn.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-ucdn.lo `test -f 'hb-ucdn.cc' || echo '$(srcdir)/'`hb-ucdn.cc + +libharfbuzz_la-hb-icu.lo: hb-icu.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libharfbuzz_la-hb-icu.lo -MD -MP -MF $(DEPDIR)/libharfbuzz_la-hb-icu.Tpo -c -o libharfbuzz_la-hb-icu.lo `test -f 'hb-icu.cc' || echo '$(srcdir)/'`hb-icu.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libharfbuzz_la-hb-icu.Tpo $(DEPDIR)/libharfbuzz_la-hb-icu.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-icu.cc' object='libharfbuzz_la-hb-icu.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libharfbuzz_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libharfbuzz_la-hb-icu.lo `test -f 'hb-icu.cc' || echo '$(srcdir)/'`hb-icu.cc + +main-main.o: main.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(main_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT main-main.o -MD -MP -MF $(DEPDIR)/main-main.Tpo -c -o main-main.o `test -f 'main.cc' || echo '$(srcdir)/'`main.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/main-main.Tpo $(DEPDIR)/main-main.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cc' object='main-main.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(main_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o main-main.o `test -f 'main.cc' || echo '$(srcdir)/'`main.cc + +main-main.obj: main.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(main_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT main-main.obj -MD -MP -MF $(DEPDIR)/main-main.Tpo -c -o main-main.obj `if test -f 'main.cc'; then $(CYGPATH_W) 'main.cc'; else $(CYGPATH_W) '$(srcdir)/main.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/main-main.Tpo $(DEPDIR)/main-main.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cc' object='main-main.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(main_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o main-main.obj `if test -f 'main.cc'; then $(CYGPATH_W) 'main.cc'; else $(CYGPATH_W) '$(srcdir)/main.cc'; fi` + +test-test.o: test.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test-test.o -MD -MP -MF $(DEPDIR)/test-test.Tpo -c -o test-test.o `test -f 'test.cc' || echo '$(srcdir)/'`test.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test-test.Tpo $(DEPDIR)/test-test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='test.cc' object='test-test.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test-test.o `test -f 'test.cc' || echo '$(srcdir)/'`test.cc + +test-test.obj: test.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test-test.obj -MD -MP -MF $(DEPDIR)/test-test.Tpo -c -o test-test.obj `if test -f 'test.cc'; then $(CYGPATH_W) 'test.cc'; else $(CYGPATH_W) '$(srcdir)/test.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test-test.Tpo $(DEPDIR)/test-test.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='test.cc' object='test-test.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test-test.obj `if test -f 'test.cc'; then $(CYGPATH_W) 'test.cc'; else $(CYGPATH_W) '$(srcdir)/test.cc'; fi` + +test_buffer_serialize-test-buffer-serialize.o: test-buffer-serialize.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_buffer_serialize_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_buffer_serialize-test-buffer-serialize.o -MD -MP -MF $(DEPDIR)/test_buffer_serialize-test-buffer-serialize.Tpo -c -o test_buffer_serialize-test-buffer-serialize.o `test -f 'test-buffer-serialize.cc' || echo '$(srcdir)/'`test-buffer-serialize.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_buffer_serialize-test-buffer-serialize.Tpo $(DEPDIR)/test_buffer_serialize-test-buffer-serialize.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='test-buffer-serialize.cc' object='test_buffer_serialize-test-buffer-serialize.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_buffer_serialize_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_buffer_serialize-test-buffer-serialize.o `test -f 'test-buffer-serialize.cc' || echo '$(srcdir)/'`test-buffer-serialize.cc + +test_buffer_serialize-test-buffer-serialize.obj: test-buffer-serialize.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_buffer_serialize_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_buffer_serialize-test-buffer-serialize.obj -MD -MP -MF $(DEPDIR)/test_buffer_serialize-test-buffer-serialize.Tpo -c -o test_buffer_serialize-test-buffer-serialize.obj `if test -f 'test-buffer-serialize.cc'; then $(CYGPATH_W) 'test-buffer-serialize.cc'; else $(CYGPATH_W) '$(srcdir)/test-buffer-serialize.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_buffer_serialize-test-buffer-serialize.Tpo $(DEPDIR)/test_buffer_serialize-test-buffer-serialize.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='test-buffer-serialize.cc' object='test_buffer_serialize-test-buffer-serialize.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_buffer_serialize_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_buffer_serialize-test-buffer-serialize.obj `if test -f 'test-buffer-serialize.cc'; then $(CYGPATH_W) 'test-buffer-serialize.cc'; else $(CYGPATH_W) '$(srcdir)/test-buffer-serialize.cc'; fi` + +test_ot_tag-hb-ot-tag.o: hb-ot-tag.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_ot_tag_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_ot_tag-hb-ot-tag.o -MD -MP -MF $(DEPDIR)/test_ot_tag-hb-ot-tag.Tpo -c -o test_ot_tag-hb-ot-tag.o `test -f 'hb-ot-tag.cc' || echo '$(srcdir)/'`hb-ot-tag.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_ot_tag-hb-ot-tag.Tpo $(DEPDIR)/test_ot_tag-hb-ot-tag.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-tag.cc' object='test_ot_tag-hb-ot-tag.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_ot_tag_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_ot_tag-hb-ot-tag.o `test -f 'hb-ot-tag.cc' || echo '$(srcdir)/'`hb-ot-tag.cc + +test_ot_tag-hb-ot-tag.obj: hb-ot-tag.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_ot_tag_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_ot_tag-hb-ot-tag.obj -MD -MP -MF $(DEPDIR)/test_ot_tag-hb-ot-tag.Tpo -c -o test_ot_tag-hb-ot-tag.obj `if test -f 'hb-ot-tag.cc'; then $(CYGPATH_W) 'hb-ot-tag.cc'; else $(CYGPATH_W) '$(srcdir)/hb-ot-tag.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_ot_tag-hb-ot-tag.Tpo $(DEPDIR)/test_ot_tag-hb-ot-tag.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hb-ot-tag.cc' object='test_ot_tag-hb-ot-tag.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_ot_tag_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_ot_tag-hb-ot-tag.obj `if test -f 'hb-ot-tag.cc'; then $(CYGPATH_W) 'hb-ot-tag.cc'; else $(CYGPATH_W) '$(srcdir)/hb-ot-tag.cc'; fi` + +test_size_params-test-size-params.o: test-size-params.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_size_params_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_size_params-test-size-params.o -MD -MP -MF $(DEPDIR)/test_size_params-test-size-params.Tpo -c -o test_size_params-test-size-params.o `test -f 'test-size-params.cc' || echo '$(srcdir)/'`test-size-params.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_size_params-test-size-params.Tpo $(DEPDIR)/test_size_params-test-size-params.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='test-size-params.cc' object='test_size_params-test-size-params.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_size_params_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_size_params-test-size-params.o `test -f 'test-size-params.cc' || echo '$(srcdir)/'`test-size-params.cc + +test_size_params-test-size-params.obj: test-size-params.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_size_params_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_size_params-test-size-params.obj -MD -MP -MF $(DEPDIR)/test_size_params-test-size-params.Tpo -c -o test_size_params-test-size-params.obj `if test -f 'test-size-params.cc'; then $(CYGPATH_W) 'test-size-params.cc'; else $(CYGPATH_W) '$(srcdir)/test-size-params.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_size_params-test-size-params.Tpo $(DEPDIR)/test_size_params-test-size-params.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='test-size-params.cc' object='test_size_params-test-size-params.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_size_params_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_size_params-test-size-params.obj `if test -f 'test-size-params.cc'; then $(CYGPATH_W) 'test-size-params.cc'; else $(CYGPATH_W) '$(srcdir)/test-size-params.cc'; fi` + +test_would_substitute-test-would-substitute.o: test-would-substitute.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_would_substitute_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_would_substitute-test-would-substitute.o -MD -MP -MF $(DEPDIR)/test_would_substitute-test-would-substitute.Tpo -c -o test_would_substitute-test-would-substitute.o `test -f 'test-would-substitute.cc' || echo '$(srcdir)/'`test-would-substitute.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_would_substitute-test-would-substitute.Tpo $(DEPDIR)/test_would_substitute-test-would-substitute.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='test-would-substitute.cc' object='test_would_substitute-test-would-substitute.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_would_substitute_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_would_substitute-test-would-substitute.o `test -f 'test-would-substitute.cc' || echo '$(srcdir)/'`test-would-substitute.cc + +test_would_substitute-test-would-substitute.obj: test-would-substitute.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_would_substitute_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_would_substitute-test-would-substitute.obj -MD -MP -MF $(DEPDIR)/test_would_substitute-test-would-substitute.Tpo -c -o test_would_substitute-test-would-substitute.obj `if test -f 'test-would-substitute.cc'; then $(CYGPATH_W) 'test-would-substitute.cc'; else $(CYGPATH_W) '$(srcdir)/test-would-substitute.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_would_substitute-test-would-substitute.Tpo $(DEPDIR)/test_would_substitute-test-would-substitute.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='test-would-substitute.cc' object='test_would_substitute-test-would-substitute.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_would_substitute_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_would_substitute-test-would-substitute.obj `if test -f 'test-would-substitute.cc'; then $(CYGPATH_W) 'test-would-substitute.cc'; else $(CYGPATH_W) '$(srcdir)/test-would-substitute.cc'; fi` + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-girDATA: $(gir_DATA) + @$(NORMAL_INSTALL) + @list='$(gir_DATA)'; test -n "$(girdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(girdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(girdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(girdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(girdir)" || exit $$?; \ + done + +uninstall-girDATA: + @$(NORMAL_UNINSTALL) + @list='$(gir_DATA)'; test -n "$(girdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(girdir)'; $(am__uninstall_files_from_dir) +install-pkgconfigDATA: $(pkgconfig_DATA) + @$(NORMAL_INSTALL) + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ + done + +uninstall-pkgconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) +install-typelibDATA: $(typelib_DATA) + @$(NORMAL_INSTALL) + @list='$(typelib_DATA)'; test -n "$(typelibdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(typelibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(typelibdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(typelibdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(typelibdir)" || exit $$?; \ + done + +uninstall-typelibDATA: + @$(NORMAL_UNINSTALL) + @list='$(typelib_DATA)'; test -n "$(typelibdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(typelibdir)'; $(am__uninstall_files_from_dir) +install-nodist_pkgincludeHEADERS: $(nodist_pkginclude_HEADERS) + @$(NORMAL_INSTALL) + @list='$(nodist_pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \ + done + +uninstall-nodist_pkgincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(nodist_pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir) +install-pkgincludeHEADERS: $(pkginclude_HEADERS) + @$(NORMAL_INSTALL) + @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \ + done + +uninstall-pkgincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir) + +# This directory's subdirectories are mostly independent; you can cd +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ + fi; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ + else \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ + fi; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ + else \ + color_start= color_end=; \ + fi; \ + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) $(dist_check_SCRIPTS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +check-c-linkage-decls.sh.log: check-c-linkage-decls.sh + @p='check-c-linkage-decls.sh'; \ + b='check-c-linkage-decls.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +check-defs.sh.log: check-defs.sh + @p='check-defs.sh'; \ + b='check-defs.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +check-header-guards.sh.log: check-header-guards.sh + @p='check-header-guards.sh'; \ + b='check-header-guards.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +check-includes.sh.log: check-includes.sh + @p='check-includes.sh'; \ + b='check-includes.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +check-libstdc++.sh.log: check-libstdc++.sh + @p='check-libstdc++.sh'; \ + b='check-libstdc++.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +check-static-inits.sh.log: check-static-inits.sh + @p='check-static-inits.sh'; \ + b='check-static-inits.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +check-symbols.sh.log: check-symbols.sh + @p='check-symbols.sh'; \ + b='check-symbols.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test-ot-tag.log: test-ot-tag$(EXEEXT) + @p='test-ot-tag$(EXEEXT)'; \ + b='test-ot-tag'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) \ + $(dist_check_SCRIPTS) + $(MAKE) $(AM_MAKEFLAGS) check-TESTS +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-recursive +all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) +install-binPROGRAMS: install-libLTLIBRARIES + +installdirs: installdirs-recursive +installdirs-am: + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(pkgincludedir)" "$(DESTDIR)$(pkgincludedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +clean: clean-recursive + +clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ + clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS \ + mostlyclean-am + +distclean: distclean-recursive + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +html-am: + +info: info-recursive + +info-am: + +install-data-am: install-girDATA install-nodist_pkgincludeHEADERS \ + install-pkgconfigDATA install-pkgincludeHEADERS \ + install-typelibDATA + +install-dvi: install-dvi-recursive + +install-dvi-am: + +install-exec-am: install-binPROGRAMS install-libLTLIBRARIES + +install-html: install-html-recursive + +install-html-am: + +install-info: install-info-recursive + +install-info-am: + +install-man: + +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + +installcheck-am: installcheck-binPROGRAMS + +maintainer-clean: maintainer-clean-recursive + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-binPROGRAMS uninstall-girDATA \ + uninstall-libLTLIBRARIES uninstall-nodist_pkgincludeHEADERS \ + uninstall-pkgconfigDATA uninstall-pkgincludeHEADERS \ + uninstall-typelibDATA + +.MAKE: $(am__recursive_targets) all check check-am install install-am \ + install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-TESTS check-am clean clean-binPROGRAMS \ + clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ + clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-girDATA install-html \ + install-html-am install-info install-info-am \ + install-libLTLIBRARIES install-man \ + install-nodist_pkgincludeHEADERS install-pdf install-pdf-am \ + install-pkgconfigDATA install-pkgincludeHEADERS install-ps \ + install-ps-am install-strip install-typelibDATA installcheck \ + installcheck-am installcheck-binPROGRAMS installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \ + uninstall uninstall-am uninstall-binPROGRAMS uninstall-girDATA \ + uninstall-libLTLIBRARIES uninstall-nodist_pkgincludeHEADERS \ + uninstall-pkgconfigDATA uninstall-pkgincludeHEADERS \ + uninstall-typelibDATA + + +# The following warning options are useful for debugging: -Wpadded +#AM_CXXFLAGS = + +# Convenience targets: +lib: $(BUILT_SOURCES) libharfbuzz.la +fuzzing: $(BUILT_SOURCES) libharfbuzz-fuzzing.la +@HAVE_GOBJECT_TRUE@hb-gobject-enums.%: hb-gobject-enums.%.tmpl $(HBHEADERS) +@HAVE_GOBJECT_TRUE@ $(AM_V_GEN) $(GLIB_MKENUMS) \ +@HAVE_GOBJECT_TRUE@ --identifier-prefix hb_ --symbol-prefix hb_gobject \ +@HAVE_GOBJECT_TRUE@ --template $^ | \ +@HAVE_GOBJECT_TRUE@ sed 's/_t_get_type/_get_type/g; s/_T (/ (/g' > "$@" \ +@HAVE_GOBJECT_TRUE@ || ($(RM) "$@"; false) + +%.pc: %.pc.in $(top_builddir)/config.status + $(AM_V_GEN) \ + $(SED) -e 's@%prefix%@$(prefix)@g' \ + -e 's@%exec_prefix%@$(exec_prefix)@g' \ + -e 's@%libdir%@$(libdir)@g' \ + -e 's@%includedir%@$(includedir)@g' \ + -e 's@%libs_private%@$(HBNONPCLIBS)@g' \ + -e 's@%requires_private%@$(HBDEPS)@g' \ + -e 's@%VERSION%@$(VERSION)@g' \ + "$<" > "$@" \ + || ($(RM) "$@"; false) +harfbuzz.def: $(HBHEADERS) $(HBNODISTHEADERS) + $(AM_V_GEN) (echo EXPORTS; \ + (cat $^ || echo 'hb_ERROR ()' ) | \ + $(EGREP) '^hb_.* \(' | \ + sed -e 's/ (.*//' | \ + LANG=C sort; \ + echo LIBRARY libharfbuzz-0.dll; \ + ) >"$@" + @ ! grep -q hb_ERROR "$@" \ + || ($(RM) "$@"; false) + +unicode-tables: arabic-table indic-table use-table + +arabic-table: gen-arabic-table.py ArabicShaping.txt UnicodeData.txt Blocks.txt + $(AM_V_GEN) $(builddir)/$^ > hb-ot-shape-complex-arabic-table.hh \ + || ($(RM) hb-ot-shape-complex-arabic-table.hh; false) + +indic-table: gen-indic-table.py IndicSyllabicCategory-7.0.0.txt IndicMatraCategory-7.0.0.txt Blocks.txt + $(AM_V_GEN) $(builddir)/$^ > hb-ot-shape-complex-indic-table.cc \ + || ($(RM) hb-ot-shape-complex-indic-table.cc; false) + +use-table: gen-use-table.py IndicSyllabicCategory.txt IndicPositionalCategory.txt UnicodeData.txt Blocks.txt + $(AM_V_GEN) $(builddir)/$^ > hb-ot-shape-complex-use-table.cc \ + || ($(RM) hb-ot-shape-complex-use-table.cc; false) + +built-sources: $(BUILT_SOURCES) + +.PHONY: unicode-tables arabic-table indic-table use-table built-sources +$(srcdir)/%.hh: $(srcdir)/%.rl + $(AM_V_GEN)(cd $(srcdir) && $(RAGEL) -e -F1 -o "$*.hh" "$*.rl") \ + || ($(RM) "$@"; false) + +check: harfbuzz.def # For check-defs.sh + +@HAVE_INTROSPECTION_TRUE@-include $(INTROSPECTION_MAKEFILE) + +@HAVE_INTROSPECTION_TRUE@HarfBuzz-0.0.gir: libharfbuzz.la libharfbuzz-gobject.la + +-include $(top_srcdir)/git.mk + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/src/Makefile.sources b/src/Makefile.sources new file mode 100644 index 0000000..8d7f1a0 --- /dev/null +++ b/src/Makefile.sources @@ -0,0 +1,160 @@ +NULL = + +# Base and default-included sources and headers + +HB_BASE_sources = \ + hb-atomic-private.hh \ + hb-blob.cc \ + hb-buffer-deserialize-json.hh \ + hb-buffer-deserialize-text.hh \ + hb-buffer-private.hh \ + hb-buffer-serialize.cc \ + hb-buffer.cc \ + hb-cache-private.hh \ + hb-common.cc \ + hb-face-private.hh \ + hb-face.cc \ + hb-font-private.hh \ + hb-font.cc \ + hb-mutex-private.hh \ + hb-object-private.hh \ + hb-open-file-private.hh \ + hb-open-type-private.hh \ + hb-ot-cbdt-table.hh \ + hb-ot-cmap-table.hh \ + hb-ot-glyf-table.hh \ + hb-ot-head-table.hh \ + hb-ot-hhea-table.hh \ + hb-ot-hmtx-table.hh \ + hb-ot-maxp-table.hh \ + hb-ot-name-table.hh \ + hb-ot-os2-table.hh \ + hb-ot-post-table.hh \ + hb-ot-tag.cc \ + hb-private.hh \ + hb-set-private.hh \ + hb-set.cc \ + hb-shape.cc \ + hb-shape-plan-private.hh \ + hb-shape-plan.cc \ + hb-shaper-list.hh \ + hb-shaper-impl-private.hh \ + hb-shaper-private.hh \ + hb-shaper.cc \ + hb-unicode-private.hh \ + hb-unicode.cc \ + hb-utf-private.hh \ + hb-warning.cc \ + $(NULL) + +HB_BASE_headers = \ + hb.h \ + hb-blob.h \ + hb-buffer.h \ + hb-common.h \ + hb-deprecated.h \ + hb-face.h \ + hb-font.h \ + hb-set.h \ + hb-shape.h \ + hb-shape-plan.h \ + hb-unicode.h \ + $(NULL) + +HB_NODIST_headers = \ + hb-version.h \ + $(NULL) + +HB_FALLBACK_sources = hb-fallback-shape.cc + +HB_OT_sources = \ + hb-ot-font.cc \ + hb-ot-layout.cc \ + hb-ot-layout-common-private.hh \ + hb-ot-layout-gdef-table.hh \ + hb-ot-layout-gpos-table.hh \ + hb-ot-layout-gsubgpos-private.hh \ + hb-ot-layout-gsub-table.hh \ + hb-ot-layout-jstf-table.hh \ + hb-ot-layout-private.hh \ + hb-ot-map.cc \ + hb-ot-map-private.hh \ + hb-ot-math.cc \ + hb-ot-math-table.hh \ + hb-ot-shape.cc \ + hb-ot-shape-complex-arabic.cc \ + hb-ot-shape-complex-arabic-fallback.hh \ + hb-ot-shape-complex-arabic-private.hh \ + hb-ot-shape-complex-arabic-table.hh \ + hb-ot-shape-complex-arabic-win1256.hh \ + hb-ot-shape-complex-default.cc \ + hb-ot-shape-complex-hangul.cc \ + hb-ot-shape-complex-hebrew.cc \ + hb-ot-shape-complex-indic.cc \ + hb-ot-shape-complex-indic-machine.hh \ + hb-ot-shape-complex-indic-private.hh \ + hb-ot-shape-complex-indic-table.cc \ + hb-ot-shape-complex-myanmar.cc \ + hb-ot-shape-complex-myanmar-machine.hh \ + hb-ot-shape-complex-thai.cc \ + hb-ot-shape-complex-tibetan.cc \ + hb-ot-shape-complex-use.cc \ + hb-ot-shape-complex-use-machine.hh \ + hb-ot-shape-complex-use-private.hh \ + hb-ot-shape-complex-use-table.cc \ + hb-ot-shape-complex-private.hh \ + hb-ot-shape-normalize-private.hh \ + hb-ot-shape-normalize.cc \ + hb-ot-shape-fallback-private.hh \ + hb-ot-shape-fallback.cc \ + hb-ot-shape-private.hh \ + hb-ot-var.cc \ + hb-ot-var-avar-table.hh \ + hb-ot-var-fvar-table.hh \ + hb-ot-var-hvar-table.hh \ + $(NULL) + +HB_OT_headers = \ + hb-ot.h \ + hb-ot-font.h \ + hb-ot-layout.h \ + hb-ot-math.h \ + hb-ot-shape.h \ + hb-ot-tag.h \ + hb-ot-var.h \ + $(NULL) + +# Optional Sources and Headers with external deps + +HB_FT_sources = hb-ft.cc +HB_FT_headers = hb-ft.h + +HB_GLIB_sources = hb-glib.cc +HB_GLIB_headers = hb-glib.h + +HB_GRAPHITE2_sources = hb-graphite2.cc +HB_GRAPHITE2_headers = hb-graphite2.h + +# System-dependent sources and headers + +HB_CORETEXT_sources = hb-coretext.cc +HB_CORETEXT_headers = hb-coretext.h + +HB_DIRECTWRITE_sources = hb-directwrite.cc +HB_DIRECTWRITE_headers = hb-directwrite.h + +HB_UNISCRIBE_sources = hb-uniscribe.cc +HB_UNISCRIBE_headers = hb-uniscribe.h + +# Additional supplemental sources +HB_UCDN_sources = hb-ucdn.cc + +# Sources for libharfbuzz-gobject and libharfbuzz-icu +HB_ICU_sources = hb-icu.cc +HB_ICU_headers = hb-icu.h + +HB_GOBJECT_sources = hb-gobject-structs.cc +HB_GOBJECT_STRUCTS_headers = hb-gobject-structs.h +HB_GOBJECT_headers = hb-gobject.h $(HB_GOBJECT_STRUCTS_headers) +HB_GOBJECT_ENUM_sources = hb-gobject-enums.cc +HB_GOBJECT_ENUM_headers = hb-gobject-enums.h diff --git a/src/check-c-linkage-decls.sh b/src/check-c-linkage-decls.sh new file mode 100755 index 0000000..b10310f --- /dev/null +++ b/src/check-c-linkage-decls.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +LC_ALL=C +export LC_ALL + +test -z "$srcdir" && srcdir=. +stat=0 + +test "x$HBHEADERS" = x && HBHEADERS=`cd "$srcdir"; find . -maxdepth 1 -name 'hb*.h'` +test "x$HBSOURCES" = x && HBSOURCES=`cd "$srcdir"; find . -maxdepth 1 -name 'hb*.h'` + + +for x in $HBHEADERS; do + test -f $srcdir/$x && x=$srcdir/$x + if ! grep -q HB_BEGIN_DECLS "$x" || ! grep -q HB_END_DECLS "$x"; then + echo "Ouch, file $x does not have HB_BEGIN_DECLS / HB_END_DECLS, but it should" + stat=1 + fi +done +for x in $HBSOURCES; do + test -f $srcdir/$x && x=$srcdir/$x + if grep -q HB_BEGIN_DECLS "$x" || grep -q HB_END_DECLS "$x"; then + echo "Ouch, file $x has HB_BEGIN_DECLS / HB_END_DECLS, but it shouldn't" + stat=1 + fi +done + +exit $stat diff --git a/src/check-defs.sh b/src/check-defs.sh new file mode 100755 index 0000000..65a2467 --- /dev/null +++ b/src/check-defs.sh @@ -0,0 +1,44 @@ +#!/bin/sh + +LC_ALL=C +export LC_ALL + +test -z "$srcdir" && srcdir=. +test -z "$MAKE" && MAKE=make +stat=0 + +if which nm 2>/dev/null >/dev/null; then + : +else + echo "check-defs.sh: 'nm' not found; skipping test" + exit 77 +fi + +defs="harfbuzz.def" +$MAKE $defs > /dev/null +tested=false +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__\>\| __gcov_flush\>\| llvm_' | cut -d' ' -f3`" + + if test -f "$so"; then + + echo "Checking that $so has the same symbol list as $def" + { + echo EXPORTS + echo "$EXPORTED_SYMBOLS" + # cheat: copy the last line from the def file! + tail -n1 "$def" + } | diff "$def" - >&2 || stat=1 + + tested=true + fi +done +if ! $tested; then + echo "check-defs.sh: libharfbuzz shared library not found; skipping test" + exit 77 +fi + +exit $stat diff --git a/src/check-header-guards.sh b/src/check-header-guards.sh new file mode 100755 index 0000000..09c5ea8 --- /dev/null +++ b/src/check-header-guards.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +LC_ALL=C +export LC_ALL + +test -z "$srcdir" && srcdir=. +stat=0 + +test "x$HBHEADERS" = x && HBHEADERS=`cd "$srcdir"; find . -maxdepth 1 -name 'hb*.h'` +test "x$HBSOURCES" = x && HBSOURCES=`cd "$srcdir"; find . -maxdepth 1 -name 'hb-*.cc' -or -name 'hb-*.hh'` + +for x in $HBHEADERS $HBSOURCES; do + test -f "$srcdir/$x" && x="$srcdir/$x" + echo "$x" | grep -q '[^h]$' && continue; + xx=`echo "$x" | sed 's@.*/@@'` + tag=`echo "$xx" | tr 'a-z.-' 'A-Z_'` + lines=`grep -w "$tag" "$x" | wc -l | sed 's/[ ]*//g'` + if test "x$lines" != x3; then + echo "Ouch, header file $x does not have correct preprocessor guards" + stat=1 + fi +done + +exit $stat diff --git a/src/check-includes.sh b/src/check-includes.sh new file mode 100755 index 0000000..902f235 --- /dev/null +++ b/src/check-includes.sh @@ -0,0 +1,44 @@ +#!/bin/sh + +LC_ALL=C +export LC_ALL + +test -z "$srcdir" && srcdir=. +stat=0 + +test "x$HBHEADERS" = x && HBHEADERS=`cd "$srcdir"; find . -maxdepth 1 -name 'hb*.h'` +test "x$HBSOURCES" = x && HBSOURCES=`cd "$srcdir"; find . -maxdepth 1 -name 'hb-*.cc' -or -name 'hb-*.hh'` + + +echo 'Checking that public header files #include "hb-common.h" or "hb.h" first (or none)' + +for x in $HBHEADERS; do + test -f "$srcdir/$x" && x="$srcdir/$x" + grep '#.*\' "$x" /dev/null | head -n 1 +done | +grep -v '"hb-common[.]h"' | +grep -v '"hb[.]h"' | +grep -v 'hb-common[.]h:' | +grep -v 'hb[.]h:' | +grep . >&2 && stat=1 + + +echo 'Checking that source files #include "hb-*private.hh" first (or none)' + +for x in $HBSOURCES; do + test -f "$srcdir/$x" && x="$srcdir/$x" + grep '#.*\' "$x" /dev/null | grep -v 'include _' | head -n 1 +done | +grep -v '"hb-.*private[.]hh"' | +grep -v 'hb-private[.]hh:' | +grep . >&2 && stat=1 + + +echo 'Checking that there is no #include ' +for x in $HBHEADERS $HBSOURCES; do + test -f "$srcdir/$x" && x="$srcdir/$x" + grep '#.*\.*<.*hb' "$x" /dev/null >&2 && stat=1 +done + + +exit $stat diff --git a/src/check-libstdc++.sh b/src/check-libstdc++.sh new file mode 100755 index 0000000..b541828 --- /dev/null +++ b/src/check-libstdc++.sh @@ -0,0 +1,34 @@ +#!/bin/sh + +LC_ALL=C +export LC_ALL + +test -z "$srcdir" && srcdir=. +stat=0 + + +if which ldd 2>/dev/null >/dev/null; then + : +else + echo "check-libstdc++.sh: 'ldd' not found; skipping test" + exit 77 +fi + +tested=false +for suffix in so dylib; do + so=.libs/libharfbuzz.$suffix + if ! test -f "$so"; then continue; fi + + echo "Checking that we are not linking to libstdc++ or libc++" + if ldd $so | grep 'libstdc[+][+]\|libc[+][+]'; then + echo "Ouch, linked to libstdc++ or libc++" + stat=1 + fi + tested=true +done +if ! $tested; then + echo "check-libstdc++.sh: libharfbuzz shared library not found; skipping test" + exit 77 +fi + +exit $stat diff --git a/src/check-static-inits.sh b/src/check-static-inits.sh new file mode 100755 index 0000000..1446fa7 --- /dev/null +++ b/src/check-static-inits.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +LC_ALL=C +export LC_ALL + +test -z "$srcdir" && srcdir=. +stat=0 + + +if which objdump 2>/dev/null >/dev/null; then + : +else + echo "check-static-inits.sh: 'objdump' not found; skipping test" + exit 77 +fi + +OBJS=.libs/*.o +if test "x`echo $OBJS`" = "x$OBJS" 2>/dev/null >/dev/null; then + echo "check-static-inits.sh: object files not found; skipping test" + exit 77 +fi + +echo "Checking that no object file has static initializers" +for obj in $OBJS; do + if objdump -t "$obj" | grep '[.][cd]tors' | grep -v '\<00*\>'; then + echo "Ouch, $obj has static initializers/finalizers" + stat=1 + fi +done + +echo "Checking that no object file has lazy static C++ constructors/destructors or other such stuff" +for obj in $OBJS; do + if objdump -t "$obj" | grep '__cxa_'; then + echo "Ouch, $obj has lazy static C++ constructors/destructors or other such stuff" + stat=1 + fi +done + +exit $stat diff --git a/src/check-symbols.sh b/src/check-symbols.sh new file mode 100755 index 0000000..ba09ba1 --- /dev/null +++ b/src/check-symbols.sh @@ -0,0 +1,43 @@ +#!/bin/sh + +LC_ALL=C +export LC_ALL + +test -z "$srcdir" && srcdir=. +stat=0 + + +if which nm 2>/dev/null >/dev/null; then + : +else + echo "check-symbols.sh: 'nm' not found; skipping test" + exit 77 +fi + +echo "Checking that we are not exposing internal symbols" +tested=false +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__\>\| __gcov_flush\>\| ___gcov_flush\>\| llvm_\| _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" + stat=1 + fi + + tested=true +done +if ! $tested; then + echo "check-symbols.sh: no shared library found; skipping test" + exit 77 +fi + +exit $stat diff --git a/src/gen-arabic-table.py b/src/gen-arabic-table.py new file mode 100755 index 0000000..308435f --- /dev/null +++ b/src/gen-arabic-table.py @@ -0,0 +1,269 @@ +#!/usr/bin/python + +import sys +import os.path + +if len (sys.argv) != 4: + print >>sys.stderr, "usage: ./gen-arabic-table.py ArabicShaping.txt UnicodeData.txt Blocks.txt" + sys.exit (1) + +files = [file (x) for x in sys.argv[1:]] + +headers = [[files[0].readline (), files[0].readline ()], [files[2].readline (), files[2].readline ()]] +headers.append (["UnicodeData.txt does not have a header."]) +while files[0].readline ().find ('##################') < 0: + pass + +blocks = {} +def read_blocks(f): + global blocks + for line in f: + + j = line.find ('#') + if j >= 0: + line = line[:j] + + fields = [x.strip () for x in line.split (';')] + if len (fields) == 1: + continue + + uu = fields[0].split ('..') + start = int (uu[0], 16) + if len (uu) == 1: + end = start + else: + end = int (uu[1], 16) + + t = fields[1] + + for u in range (start, end + 1): + blocks[u] = t + +def print_joining_table(f): + + values = {} + for line in f: + + if line[0] == '#': + continue + + fields = [x.strip () for x in line.split (';')] + if len (fields) == 1: + continue + + u = int (fields[0], 16) + + if fields[3] in ["ALAPH", "DALATH RISH"]: + value = "JOINING_GROUP_" + fields[3].replace(' ', '_') + else: + value = "JOINING_TYPE_" + fields[2] + values[u] = value + + short_value = {} + for value in set([v for v in values.values()] + ['JOINING_TYPE_X']): + short = ''.join(x[0] for x in value.split('_')[2:]) + assert short not in short_value.values() + short_value[value] = short + + print + for value,short in short_value.items(): + print "#define %s %s" % (short, value) + + uu = sorted(values.keys()) + num = len(values) + all_blocks = set([blocks[u] for u in uu]) + + last = -100000 + ranges = [] + for u in uu: + if u - last <= 1+16*5: + ranges[-1][-1] = u + else: + ranges.append([u,u]) + last = u + + print + print "static const uint8_t joining_table[] =" + print "{" + last_block = None + offset = 0 + for start,end in ranges: + + print + print "#define joining_offset_0x%04xu %d" % (start, offset) + + for u in range(start, end+1): + + block = blocks.get(u, last_block) + value = values.get(u, "JOINING_TYPE_X") + + if block != last_block or u == start: + if u != start: + print + if block in all_blocks: + print "\n /* %s */" % block + else: + print "\n /* FILLER */" + last_block = block + if u % 32 != 0: + print + print " /* %04X */" % (u//32*32), " " * (u % 32), + + if u % 32 == 0: + print + print " /* %04X */ " % u, + sys.stdout.write("%s," % short_value[value]) + print + + offset += end - start + 1 + print + occupancy = num * 100. / offset + print "}; /* Table items: %d; occupancy: %d%% */" % (offset, occupancy) + print + + page_bits = 12; + print + print "static unsigned int" + print "joining_type (hb_codepoint_t u)" + print "{" + print " switch (u >> %d)" % page_bits + print " {" + pages = set([u>>page_bits for u in [s for s,e in ranges]+[e for s,e in ranges]]) + for p in sorted(pages): + print " case 0x%0Xu:" % p + for (start,end) in ranges: + if p not in [start>>page_bits, end>>page_bits]: continue + offset = "joining_offset_0x%04xu" % start + print " if (hb_in_range (u, 0x%04Xu, 0x%04Xu)) return joining_table[u - 0x%04Xu + %s];" % (start, end, start, offset) + print " break;" + print "" + print " default:" + print " break;" + print " }" + print " return X;" + print "}" + print + for value,short in short_value.items(): + print "#undef %s" % (short) + print + +def print_shaping_table(f): + + shapes = {} + ligatures = {} + names = {} + for line in f: + + fields = [x.strip () for x in line.split (';')] + if fields[5][0:1] != '<': + continue + + items = fields[5].split (' ') + shape, items = items[0][1:-1], tuple (int (x, 16) for x in items[1:]) + + if not shape in ['initial', 'medial', 'isolated', 'final']: + continue + + c = int (fields[0], 16) + if len (items) != 1: + # We only care about lam-alef ligatures + if len (items) != 2 or items[0] != 0x0644 or items[1] not in [0x0622, 0x0623, 0x0625, 0x0627]: + continue + + # Save ligature + names[c] = fields[1] + if items not in ligatures: + ligatures[items] = {} + ligatures[items][shape] = c + pass + else: + # Save shape + if items[0] not in names: + names[items[0]] = fields[1] + else: + names[items[0]] = os.path.commonprefix ([names[items[0]], fields[1]]).strip () + if items[0] not in shapes: + shapes[items[0]] = {} + shapes[items[0]][shape] = c + + print + print "static const uint16_t shaping_table[][4] =" + print "{" + + keys = shapes.keys () + min_u, max_u = min (keys), max (keys) + for u in range (min_u, max_u + 1): + s = [shapes[u][shape] if u in shapes and shape in shapes[u] else 0 + for shape in ['initial', 'medial', 'final', 'isolated']] + value = ', '.join ("0x%04Xu" % c for c in s) + print " {%s}, /* U+%04X %s */" % (value, u, names[u] if u in names else "") + + print "};" + print + print "#define SHAPING_TABLE_FIRST 0x%04Xu" % min_u + print "#define SHAPING_TABLE_LAST 0x%04Xu" % max_u + print + + ligas = {} + for pair in ligatures.keys (): + for shape in ligatures[pair]: + c = ligatures[pair][shape] + if shape == 'isolated': + liga = (shapes[pair[0]]['initial'], shapes[pair[1]]['final']) + elif shape == 'final': + liga = (shapes[pair[0]]['medial'], shapes[pair[1]]['final']) + else: + raise Exception ("Unexpected shape", shape) + if liga[0] not in ligas: + ligas[liga[0]] = [] + ligas[liga[0]].append ((liga[1], c)) + max_i = max (len (ligas[l]) for l in ligas) + print + print "static const struct ligature_set_t {" + print " uint16_t first;" + print " struct ligature_pairs_t {" + print " uint16_t second;" + print " uint16_t ligature;" + print " } ligatures[%d];" % max_i + print "} ligature_table[] =" + print "{" + keys = ligas.keys () + keys.sort () + for first in keys: + + print " { 0x%04Xu, {" % (first) + for liga in ligas[first]: + print " { 0x%04Xu, 0x%04Xu }, /* %s */" % (liga[0], liga[1], names[liga[1]]) + print " }}," + + print "};" + print + + + +print "/* == Start of generated table == */" +print "/*" +print " * The following table is generated by running:" +print " *" +print " * ./gen-arabic-table.py ArabicShaping.txt UnicodeData.txt Blocks.txt" +print " *" +print " * on files with these headers:" +print " *" +for h in headers: + for l in h: + print " * %s" % (l.strip()) +print " */" +print +print "#ifndef HB_OT_SHAPE_COMPLEX_ARABIC_TABLE_HH" +print "#define HB_OT_SHAPE_COMPLEX_ARABIC_TABLE_HH" +print + +read_blocks (files[2]) +print_joining_table (files[0]) +print_shaping_table (files[1]) + +print +print "#endif /* HB_OT_SHAPE_COMPLEX_ARABIC_TABLE_HH */" +print +print "/* == End of generated table == */" + diff --git a/src/gen-indic-table.py b/src/gen-indic-table.py new file mode 100755 index 0000000..3016cd0 --- /dev/null +++ b/src/gen-indic-table.py @@ -0,0 +1,260 @@ +#!/usr/bin/python + +import sys + +if len (sys.argv) != 4: + print >>sys.stderr, "usage: ./gen-indic-table.py IndicSyllabicCategory.txt IndicPositionalCategory.txt Blocks.txt" + sys.exit (1) + +ALLOWED_SINGLES = [0x00A0, 0x25CC] +ALLOWED_BLOCKS = [ + 'Basic Latin', + 'Latin-1 Supplement', + 'Devanagari', + 'Bengali', + 'Gurmukhi', + 'Gujarati', + 'Oriya', + 'Tamil', + 'Telugu', + 'Kannada', + 'Malayalam', + 'Sinhala', + 'Myanmar', + 'Khmer', + 'Vedic Extensions', + 'General Punctuation', + 'Superscripts and Subscripts', + 'Devanagari Extended', + 'Myanmar Extended-B', + 'Myanmar Extended-A', +] + +files = [file (x) for x in sys.argv[1:]] + +headers = [[f.readline () for i in range (2)] for f in files] + +data = [{} for f in files] +values = [{} for f in files] +for i, f in enumerate (files): + for line in f: + + j = line.find ('#') + if j >= 0: + line = line[:j] + + fields = [x.strip () for x in line.split (';')] + if len (fields) == 1: + continue + + uu = fields[0].split ('..') + start = int (uu[0], 16) + if len (uu) == 1: + end = start + else: + end = int (uu[1], 16) + + t = fields[1] + + for u in range (start, end + 1): + data[i][u] = t + values[i][t] = values[i].get (t, 0) + end - start + 1 + +# Merge data into one dict: +defaults = ('Other', 'Not_Applicable', 'No_Block') +for i,v in enumerate (defaults): + values[i][v] = values[i].get (v, 0) + 1 +combined = {} +for i,d in enumerate (data): + for u,v in d.items (): + if i == 2 and not u in combined: + continue + if not u in combined: + combined[u] = list (defaults) + combined[u][i] = v +combined = {k:v for k,v in combined.items() if k in ALLOWED_SINGLES or v[2] in ALLOWED_BLOCKS} +data = combined +del combined +num = len (data) + +for u in [0x17CD, 0x17CE, 0x17CF, 0x17D0, 0x17D3]: + if data[u][0] == 'Other': + data[u][0] = "Vowel_Dependent" + +# Move the outliers NO-BREAK SPACE and DOTTED CIRCLE out +singles = {} +for u in ALLOWED_SINGLES: + singles[u] = data[u] + del data[u] + +print "/* == Start of generated table == */" +print "/*" +print " * The following table is generated by running:" +print " *" +print " * ./gen-indic-table.py IndicSyllabicCategory.txt IndicPositionalCategory.txt Blocks.txt" +print " *" +print " * on files with these headers:" +print " *" +for h in headers: + for l in h: + print " * %s" % (l.strip()) +print " */" +print +print '#include "hb-ot-shape-complex-indic-private.hh"' +print + +# Shorten values +short = [{ + "Bindu": 'Bi', + "Cantillation_Mark": 'Ca', + "Joiner": 'ZWJ', + "Non_Joiner": 'ZWNJ', + "Number": 'Nd', + "Visarga": 'Vs', + "Vowel": 'Vo', + "Vowel_Dependent": 'M', + "Consonant_Prefixed": 'CPrf', + "Other": 'x', +},{ + "Not_Applicable": 'x', +}] +all_shorts = [{},{}] + +# Add some of the values, to make them more readable, and to avoid duplicates + + +for i in range (2): + for v,s in short[i].items (): + all_shorts[i][s] = v + +what = ["INDIC_SYLLABIC_CATEGORY", "INDIC_MATRA_CATEGORY"] +what_short = ["ISC", "IMC"] +for i in range (2): + print + vv = values[i].keys () + vv.sort () + for v in vv: + v_no_and = v.replace ('_And_', '_') + if v in short[i]: + s = short[i][v] + else: + s = ''.join ([c for c in v_no_and if ord ('A') <= ord (c) <= ord ('Z')]) + if s in all_shorts[i]: + raise Exception ("Duplicate short value alias", v, all_shorts[i][s]) + all_shorts[i][s] = v + short[i][v] = s + print "#define %s_%s %s_%s %s/* %3d chars; %s */" % \ + (what_short[i], s, what[i], v.upper (), \ + ' '* ((48-1 - len (what[i]) - 1 - len (v)) / 8), \ + values[i][v], v) +print +print "#define _(S,M) INDIC_COMBINE_CATEGORIES (ISC_##S, IMC_##M)" +print +print + +total = 0 +used = 0 +last_block = None +def print_block (block, start, end, data): + global total, used, last_block + if block and block != last_block: + print + print + print " /* %s */" % block + num = 0 + assert start % 8 == 0 + assert (end+1) % 8 == 0 + for u in range (start, end+1): + if u % 8 == 0: + print + print " /* %04X */" % u, + if u in data: + num += 1 + d = data.get (u, defaults) + sys.stdout.write ("%9s" % ("_(%s,%s)," % (short[0][d[0]], short[1][d[1]]))) + + total += end - start + 1 + used += num + if block: + last_block = block + +uu = data.keys () +uu.sort () + +last = -100000 +num = 0 +offset = 0 +starts = [] +ends = [] +print "static const INDIC_TABLE_ELEMENT_TYPE indic_table[] = {" +for u in uu: + if u <= last: + continue + block = data[u][2] + + start = u//8*8 + end = start+1 + while end in uu and block == data[end][2]: + end += 1 + end = (end-1)//8*8 + 7 + + if start != last + 1: + if start - last <= 1+16*3: + print_block (None, last+1, start-1, data) + last = start-1 + else: + if last >= 0: + ends.append (last + 1) + offset += ends[-1] - starts[-1] + print + print + print "#define indic_offset_0x%04xu %d" % (start, offset) + starts.append (start) + + print_block (block, start, end, data) + last = end +ends.append (last + 1) +offset += ends[-1] - starts[-1] +print +print +occupancy = used * 100. / total +page_bits = 12 +print "}; /* Table items: %d; occupancy: %d%% */" % (offset, occupancy) +print +print "INDIC_TABLE_ELEMENT_TYPE" +print "hb_indic_get_categories (hb_codepoint_t u)" +print "{" +print " switch (u >> %d)" % page_bits +print " {" +pages = set([u>>page_bits for u in starts+ends+singles.keys()]) +for p in sorted(pages): + print " case 0x%0Xu:" % p + for (start,end) in zip (starts, ends): + if p not in [start>>page_bits, end>>page_bits]: continue + offset = "indic_offset_0x%04xu" % start + print " if (hb_in_range (u, 0x%04Xu, 0x%04Xu)) return indic_table[u - 0x%04Xu + %s];" % (start, end-1, start, offset) + for u,d in singles.items (): + if p != u>>page_bits: continue + print " if (unlikely (u == 0x%04Xu)) return _(%s,%s);" % (u, short[0][d[0]], short[1][d[1]]) + print " break;" + print "" +print " default:" +print " break;" +print " }" +print " return _(x,x);" +print "}" +print +print "#undef _" +for i in range (2): + print + vv = values[i].keys () + vv.sort () + for v in vv: + print "#undef %s_%s" % \ + (what_short[i], short[i][v]) +print +print "/* == End of generated table == */" + +# Maintain at least 30% occupancy in the table */ +if occupancy < 30: + raise Exception ("Table too sparse, please investigate: ", occupancy) diff --git a/src/gen-use-table.py b/src/gen-use-table.py new file mode 100755 index 0000000..a922c92 --- /dev/null +++ b/src/gen-use-table.py @@ -0,0 +1,477 @@ +#!/usr/bin/python + +import sys + +if len (sys.argv) != 5: + print >>sys.stderr, "usage: ./gen-use-table.py IndicSyllabicCategory.txt IndicPositionalCategory.txt UnicodeData.txt Blocks.txt" + sys.exit (1) + +BLACKLISTED_BLOCKS = ["Thai", "Lao", "Tibetan"] + +files = [file (x) for x in sys.argv[1:]] + +headers = [[f.readline () for i in range (2)] for j,f in enumerate(files) if j != 2] +headers.append (["UnicodeData.txt does not have a header."]) + +data = [{} for f in files] +values = [{} for f in files] +for i, f in enumerate (files): + for line in f: + + j = line.find ('#') + if j >= 0: + line = line[:j] + + fields = [x.strip () for x in line.split (';')] + if len (fields) == 1: + continue + + uu = fields[0].split ('..') + start = int (uu[0], 16) + if len (uu) == 1: + end = start + else: + end = int (uu[1], 16) + + t = fields[1 if i != 2 else 2] + + for u in range (start, end + 1): + data[i][u] = t + values[i][t] = values[i].get (t, 0) + end - start + 1 + +defaults = ('Other', 'Not_Applicable', 'Cn', 'No_Block') + +# TODO Characters that are not in Unicode Indic files, but used in USE +data[0][0x034F] = defaults[0] +data[0][0x2060] = defaults[0] +for u in range (0xFE00, 0xFE0F + 1): + data[0][u] = defaults[0] + +# Merge data into one dict: +for i,v in enumerate (defaults): + values[i][v] = values[i].get (v, 0) + 1 +combined = {} +for i,d in enumerate (data): + for u,v in d.items (): + if i >= 2 and not u in combined: + continue + if not u in combined: + combined[u] = list (defaults) + combined[u][i] = v +combined = {k:v for k,v in combined.items() if v[3] not in BLACKLISTED_BLOCKS} +data = combined +del combined +num = len (data) + + +property_names = [ + # General_Category + 'Cc', 'Cf', 'Cn', 'Co', 'Cs', 'Ll', 'Lm', 'Lo', 'Lt', 'Lu', 'Mc', + 'Me', 'Mn', 'Nd', 'Nl', 'No', 'Pc', 'Pd', 'Pe', 'Pf', 'Pi', 'Po', + 'Ps', 'Sc', 'Sk', 'Sm', 'So', 'Zl', 'Zp', 'Zs', + # Indic_Syllabic_Category + 'Other', + 'Bindu', + 'Visarga', + 'Avagraha', + 'Nukta', + 'Virama', + 'Pure_Killer', + 'Invisible_Stacker', + 'Vowel_Independent', + 'Vowel_Dependent', + 'Vowel', + 'Consonant_Placeholder', + 'Consonant', + 'Consonant_Dead', + 'Consonant_With_Stacker', + 'Consonant_Prefixed', + 'Consonant_Preceding_Repha', + 'Consonant_Succeeding_Repha', + 'Consonant_Subjoined', + 'Consonant_Medial', + 'Consonant_Final', + 'Consonant_Head_Letter', + 'Modifying_Letter', + 'Tone_Letter', + 'Tone_Mark', + 'Gemination_Mark', + 'Cantillation_Mark', + 'Register_Shifter', + 'Syllable_Modifier', + 'Consonant_Killer', + 'Non_Joiner', + 'Joiner', + 'Number_Joiner', + 'Number', + 'Brahmi_Joining_Number', + # Indic_Positional_Category + 'Not_Applicable', + 'Right', + 'Left', + 'Visual_Order_Left', + 'Left_And_Right', + 'Top', + 'Bottom', + 'Top_And_Bottom', + 'Top_And_Right', + 'Top_And_Left', + 'Top_And_Left_And_Right', + 'Bottom_And_Right', + 'Top_And_Bottom_And_Right', + 'Overstruck', +] + +class PropertyValue(object): + def __init__(self, name_): + self.name = name_ + def __str__(self): + return self.name + def __eq__(self, other): + return self.name == (other if isinstance(other, basestring) else other.name) + def __ne__(self, other): + return not (self == other) + +property_values = {} + +for name in property_names: + value = PropertyValue(name) + assert value not in property_values + assert value not in globals() + property_values[name] = value +globals().update(property_values) + + +def is_BASE(U, UISC, UGC): + return (UISC in [Number, Consonant, Consonant_Head_Letter, + #SPEC-DRAFT Consonant_Placeholder, + Tone_Letter, + Vowel_Independent #SPEC-DRAFT + ] or + (UGC == Lo and UISC in [Avagraha, Bindu, Consonant_Final, Consonant_Medial, + Consonant_Subjoined, Vowel, Vowel_Dependent])) +def is_BASE_IND(U, UISC, UGC): + #SPEC-DRAFT return (UISC in [Consonant_Dead, Modifying_Letter] or UGC == Po) + return (UISC in [Consonant_Dead, Modifying_Letter] or + (UGC == Po and not U in [0x104E, 0x2022]) or + False # SPEC-DRAFT-OUTDATED! U == 0x002D + ) +def is_BASE_NUM(U, UISC, UGC): + return UISC == Brahmi_Joining_Number +def is_BASE_OTHER(U, UISC, UGC): + if UISC == Consonant_Placeholder: return True #SPEC-DRAFT + #SPEC-DRAFT return U in [0x00A0, 0x00D7, 0x2015, 0x2022, 0x25CC, 0x25FB, 0x25FC, 0x25FD, 0x25FE] + return U in [0x2015, 0x2022, 0x25FB, 0x25FC, 0x25FD, 0x25FE] +def is_CGJ(U, UISC, UGC): + return U == 0x034F +def is_CONS_FINAL(U, UISC, UGC): + return ((UISC == Consonant_Final and UGC != Lo) or + UISC == Consonant_Succeeding_Repha) +def is_CONS_FINAL_MOD(U, UISC, UGC): + #SPEC-DRAFT return UISC in [Consonant_Final_Modifier, Syllable_Modifier] + return UISC == Syllable_Modifier +def is_CONS_MED(U, UISC, UGC): + return UISC == Consonant_Medial and UGC != Lo +def is_CONS_MOD(U, UISC, UGC): + return UISC in [Nukta, Gemination_Mark, Consonant_Killer] +def is_CONS_SUB(U, UISC, UGC): + #SPEC-DRAFT return UISC == Consonant_Subjoined + return UISC == Consonant_Subjoined and UGC != Lo +def is_HALANT(U, UISC, UGC): + return UISC in [Virama, Invisible_Stacker] +def is_HALANT_NUM(U, UISC, UGC): + return UISC == Number_Joiner +def is_ZWNJ(U, UISC, UGC): + return UISC == Non_Joiner +def is_ZWJ(U, UISC, UGC): + return UISC == Joiner +def is_Word_Joiner(U, UISC, UGC): + return U == 0x2060 +def is_OTHER(U, UISC, UGC): + #SPEC-OUTDATED return UGC == Zs # or any other SCRIPT_COMMON characters + return (UISC == Other + and not is_SYM_MOD(U, UISC, UGC) + and not is_CGJ(U, UISC, UGC) + and not is_Word_Joiner(U, UISC, UGC) + and not is_VARIATION_SELECTOR(U, UISC, UGC) + ) +def is_Reserved(U, UISC, UGC): + return UGC == 'Cn' +def is_REPHA(U, UISC, UGC): + #return UISC == Consonant_Preceding_Repha + #SPEC-OUTDATED hack to categorize Consonant_With_Stacker and Consonant_Prefixed + return UISC in [Consonant_Preceding_Repha, Consonant_With_Stacker, Consonant_Prefixed] +def is_SYM(U, UISC, UGC): + if U == 0x25CC: return False #SPEC-DRAFT + #SPEC-DRAFT return UGC in [So, Sc] or UISC == Symbol_Letter + return UGC in [So, Sc] +def is_SYM_MOD(U, UISC, UGC): + return U in [0x1B6B, 0x1B6C, 0x1B6D, 0x1B6E, 0x1B6F, 0x1B70, 0x1B71, 0x1B72, 0x1B73] +def is_VARIATION_SELECTOR(U, UISC, UGC): + return 0xFE00 <= U <= 0xFE0F +def is_VOWEL(U, UISC, UGC): + return (UISC == Pure_Killer or + (UGC != Lo and UISC in [Vowel, Vowel_Dependent])) +def is_VOWEL_MOD(U, UISC, UGC): + return (UISC in [Tone_Mark, Cantillation_Mark, Register_Shifter, Visarga] or + (UGC != Lo and UISC == Bindu)) + +use_mapping = { + 'B': is_BASE, + 'IND': is_BASE_IND, + 'N': is_BASE_NUM, + 'GB': is_BASE_OTHER, + 'CGJ': is_CGJ, + 'F': is_CONS_FINAL, + 'FM': is_CONS_FINAL_MOD, + 'M': is_CONS_MED, + 'CM': is_CONS_MOD, + 'SUB': is_CONS_SUB, + 'H': is_HALANT, + 'HN': is_HALANT_NUM, + 'ZWNJ': is_ZWNJ, + 'ZWJ': is_ZWJ, + 'WJ': is_Word_Joiner, + 'O': is_OTHER, + 'Rsv': is_Reserved, + 'R': is_REPHA, + 'S': is_SYM, + 'SM': is_SYM_MOD, + 'VS': is_VARIATION_SELECTOR, + 'V': is_VOWEL, + 'VM': is_VOWEL_MOD, +} + +use_positions = { + 'F': { + 'Abv': [Top], + 'Blw': [Bottom], + 'Pst': [Right], + }, + 'M': { + 'Abv': [Top], + 'Blw': [Bottom], + 'Pst': [Right], + 'Pre': [Left], + }, + 'CM': { + 'Abv': [Top], + 'Blw': [Bottom], + }, + 'V': { + 'Abv': [Top, Top_And_Bottom, Top_And_Bottom_And_Right, Top_And_Right], + 'Blw': [Bottom, Overstruck, Bottom_And_Right], + 'Pst': [Right], + 'Pre': [Left, Top_And_Left, Top_And_Left_And_Right, Left_And_Right], + }, + 'VM': { + 'Abv': [Top], + 'Blw': [Bottom, Overstruck], + 'Pst': [Right], + 'Pre': [Left], + }, + 'SM': { + 'Abv': [Top], + 'Blw': [Bottom], + }, + 'H': None, + 'B': None, + 'FM': None, + 'SUB': None, +} + +def map_to_use(data): + out = {} + items = use_mapping.items() + for U,(UISC,UIPC,UGC,UBlock) in data.items(): + + # Resolve Indic_Syllabic_Category + + # TODO: These don't have UISC assigned in Unicode 8.0, but + # have UIPC + if U == 0x17DD: UISC = Vowel_Dependent + if 0x1CE2 <= U <= 0x1CE8: UISC = Cantillation_Mark + + # TODO: U+1CED should only be allowed after some of + # the nasalization marks, maybe only for U+1CE9..U+1CF1. + if U == 0x1CED: UISC = Tone_Mark + + evals = [(k, v(U,UISC,UGC)) for k,v in items] + values = [k for k,v in evals if v] + assert len(values) == 1, "%s %s %s %s" % (hex(U), UISC, UGC, values) + USE = values[0] + + # Resolve Indic_Positional_Category + + # TODO: Not in Unicode 8.0 yet, but in spec. + if U == 0x1B6C: UIPC = Bottom + + # TODO: These should die, but have UIPC in Unicode 8.0 + if U in [0x953, 0x954]: UIPC = Not_Applicable + + # TODO: In USE's override list but not in Unicode 8.0 + if U == 0x103C: UIPC = Left + + # TODO: These are not in USE's override list that we have, nor are they in Unicode 8.0 + if 0xA926 <= U <= 0xA92A: UIPC = Top + if U == 0x111CA: UIPC = Bottom + if U == 0x11300: UIPC = Top + if U == 0x1133C: UIPC = Bottom + if U == 0x1171E: UIPC = Left # Correct?! + if 0x1CF2 <= U <= 0x1CF3: UIPC = Right + if 0x1CF8 <= U <= 0x1CF9: UIPC = Top + + assert (UIPC in [Not_Applicable, Visual_Order_Left] or + USE in use_positions), "%s %s %s %s %s" % (hex(U), UIPC, USE, UISC, UGC) + + pos_mapping = use_positions.get(USE, None) + if pos_mapping: + values = [k for k,v in pos_mapping.items() if v and UIPC in v] + assert len(values) == 1, "%s %s %s %s %s %s" % (hex(U), UIPC, USE, UISC, UGC, values) + USE = USE + values[0] + + out[U] = (USE, UBlock) + return out + +defaults = ('O', 'No_Block') +data = map_to_use(data) + +# Remove the outliers +singles = {} +for u in [0x034F, 0x25CC, 0x1107F]: + singles[u] = data[u] + del data[u] + +print "/* == Start of generated table == */" +print "/*" +print " * The following table is generated by running:" +print " *" +print " * ./gen-use-table.py IndicSyllabicCategory.txt IndicPositionalCategory.txt UnicodeData.txt Blocks.txt" +print " *" +print " * on files with these headers:" +print " *" +for h in headers: + for l in h: + print " * %s" % (l.strip()) +print " */" +print +print '#include "hb-ot-shape-complex-use-private.hh"' +print + +total = 0 +used = 0 +last_block = None +def print_block (block, start, end, data): + global total, used, last_block + if block and block != last_block: + print + print + print " /* %s */" % block + if start % 16: + print ' ' * (20 + (start % 16 * 6)), + num = 0 + assert start % 8 == 0 + assert (end+1) % 8 == 0 + for u in range (start, end+1): + if u % 16 == 0: + print + print " /* %04X */" % u, + if u in data: + num += 1 + d = data.get (u, defaults) + sys.stdout.write ("%6s," % d[0]) + + total += end - start + 1 + used += num + if block: + last_block = block + +uu = data.keys () +uu.sort () + +last = -100000 +num = 0 +offset = 0 +starts = [] +ends = [] +for k,v in sorted(use_mapping.items()): + if k in use_positions and use_positions[k]: continue + print "#define %s USE_%s /* %s */" % (k, k, v.__name__[3:]) +for k,v in sorted(use_positions.items()): + if not v: continue + for suf in v.keys(): + tag = k + suf + print "#define %s USE_%s" % (tag, tag) +print "" +print "static const USE_TABLE_ELEMENT_TYPE use_table[] = {" +for u in uu: + if u <= last: + continue + block = data[u][1] + + start = u//8*8 + end = start+1 + while end in uu and block == data[end][1]: + end += 1 + end = (end-1)//8*8 + 7 + + if start != last + 1: + if start - last <= 1+16*3: + print_block (None, last+1, start-1, data) + last = start-1 + else: + if last >= 0: + ends.append (last + 1) + offset += ends[-1] - starts[-1] + print + print + print "#define use_offset_0x%04xu %d" % (start, offset) + starts.append (start) + + print_block (block, start, end, data) + last = end +ends.append (last + 1) +offset += ends[-1] - starts[-1] +print +print +occupancy = used * 100. / total +page_bits = 12 +print "}; /* Table items: %d; occupancy: %d%% */" % (offset, occupancy) +print +print "USE_TABLE_ELEMENT_TYPE" +print "hb_use_get_categories (hb_codepoint_t u)" +print "{" +print " switch (u >> %d)" % page_bits +print " {" +pages = set([u>>page_bits for u in starts+ends+singles.keys()]) +for p in sorted(pages): + print " case 0x%0Xu:" % p + for (start,end) in zip (starts, ends): + if p not in [start>>page_bits, end>>page_bits]: continue + offset = "use_offset_0x%04xu" % start + print " if (hb_in_range (u, 0x%04Xu, 0x%04Xu)) return use_table[u - 0x%04Xu + %s];" % (start, end-1, start, offset) + for u,d in singles.items (): + if p != u>>page_bits: continue + print " if (unlikely (u == 0x%04Xu)) return %s;" % (u, d[0]) + print " break;" + print "" +print " default:" +print " break;" +print " }" +print " return USE_O;" +print "}" +print +for k in sorted(use_mapping.keys()): + if k in use_positions and use_positions[k]: continue + print "#undef %s" % k +for k,v in sorted(use_positions.items()): + if not v: continue + for suf in v.keys(): + tag = k + suf + print "#undef %s" % tag +print +print "/* == End of generated table == */" + +# Maintain at least 50% occupancy in the table */ +if occupancy < 50: + raise Exception ("Table too sparse, please investigate: ", occupancy) diff --git a/src/harfbuzz-gobject.pc.in b/src/harfbuzz-gobject.pc.in new file mode 100644 index 0000000..7008360 --- /dev/null +++ b/src/harfbuzz-gobject.pc.in @@ -0,0 +1,12 @@ +prefix=%prefix% +exec_prefix=%exec_prefix% +libdir=%libdir% +includedir=%includedir% + +Name: harfbuzz +Description: HarfBuzz text shaping library GObject integration +Version: %VERSION% + +Requires: harfbuzz gobject-2.0 glib-2.0 +Libs: -L${libdir} -lharfbuzz-gobject +Cflags: -I${includedir}/harfbuzz diff --git a/src/harfbuzz-icu.pc.in b/src/harfbuzz-icu.pc.in new file mode 100644 index 0000000..949869a --- /dev/null +++ b/src/harfbuzz-icu.pc.in @@ -0,0 +1,13 @@ +prefix=%prefix% +exec_prefix=%exec_prefix% +libdir=%libdir% +includedir=%includedir% + +Name: harfbuzz +Description: HarfBuzz text shaping library ICU integration +Version: %VERSION% + +Requires: harfbuzz +Requires.private: icu-uc +Libs: -L${libdir} -lharfbuzz-icu +Cflags: -I${includedir}/harfbuzz diff --git a/src/harfbuzz.pc.in b/src/harfbuzz.pc.in new file mode 100644 index 0000000..b3e124a --- /dev/null +++ b/src/harfbuzz.pc.in @@ -0,0 +1,13 @@ +prefix=%prefix% +exec_prefix=%exec_prefix% +libdir=%libdir% +includedir=%includedir% + +Name: harfbuzz +Description: HarfBuzz text shaping library +Version: %VERSION% + +Libs: -L${libdir} -lharfbuzz +Libs.private: %libs_private% +Requires.private: %requires_private% +Cflags: -I${includedir}/harfbuzz diff --git a/src/hb-atomic-private.hh b/src/hb-atomic-private.hh new file mode 100644 index 0000000..100ba53 --- /dev/null +++ b/src/hb-atomic-private.hh @@ -0,0 +1,189 @@ +/* + * Copyright © 2007 Chris Wilson + * Copyright © 2009,2010 Red Hat, Inc. + * Copyright © 2011,2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Contributor(s): + * Chris Wilson + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_ATOMIC_PRIVATE_HH +#define HB_ATOMIC_PRIVATE_HH + +#include "hb-private.hh" + + +/* atomic_int */ + +/* We need external help for these */ + +#if defined(hb_atomic_int_impl_add) \ + && defined(hb_atomic_ptr_impl_get) \ + && defined(hb_atomic_ptr_impl_cmpexch) + +/* Defined externally, i.e. in config.h; must have typedef'ed hb_atomic_int_impl_t as well. */ + + +#elif !defined(HB_NO_MT) && (defined(_WIN32) || defined(__CYGWIN__)) + +#include + +/* MinGW has a convoluted history of supporting MemoryBarrier + * properly. As such, define a function to wrap the whole + * thing. */ +static inline void _HBMemoryBarrier (void) { +#if !defined(MemoryBarrier) + long dummy = 0; + InterlockedExchange (&dummy, 1); +#else + MemoryBarrier (); +#endif +} + +typedef LONG hb_atomic_int_impl_t; +#define HB_ATOMIC_INT_IMPL_INIT(V) (V) +#define hb_atomic_int_impl_add(AI, V) InterlockedExchangeAdd (&(AI), (V)) + +#define hb_atomic_ptr_impl_get(P) (_HBMemoryBarrier (), (void *) *(P)) +#define hb_atomic_ptr_impl_cmpexch(P,O,N) (InterlockedCompareExchangePointer ((void **) (P), (void *) (N), (void *) (O)) == (void *) (O)) + + +#elif !defined(HB_NO_MT) && defined(__APPLE__) + +#include +#ifdef __MAC_OS_X_MIN_REQUIRED +#include +#elif defined(__IPHONE_OS_MIN_REQUIRED) +#include +#endif + + +typedef int32_t hb_atomic_int_impl_t; +#define HB_ATOMIC_INT_IMPL_INIT(V) (V) +#define hb_atomic_int_impl_add(AI, V) (OSAtomicAdd32Barrier ((V), &(AI)) - (V)) + +#define hb_atomic_ptr_impl_get(P) (OSMemoryBarrier (), (void *) *(P)) +#if (MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4 || __IPHONE_VERSION_MIN_REQUIRED >= 20100) +#define hb_atomic_ptr_impl_cmpexch(P,O,N) OSAtomicCompareAndSwapPtrBarrier ((void *) (O), (void *) (N), (void **) (P)) +#else +#if __ppc64__ || __x86_64__ || __aarch64__ +#define hb_atomic_ptr_impl_cmpexch(P,O,N) OSAtomicCompareAndSwap64Barrier ((int64_t) (O), (int64_t) (N), (int64_t*) (P)) +#else +#define hb_atomic_ptr_impl_cmpexch(P,O,N) OSAtomicCompareAndSwap32Barrier ((int32_t) (O), (int32_t) (N), (int32_t*) (P)) +#endif +#endif + + +#elif !defined(HB_NO_MT) && defined(HAVE_INTEL_ATOMIC_PRIMITIVES) + +typedef int hb_atomic_int_impl_t; +#define HB_ATOMIC_INT_IMPL_INIT(V) (V) +#define hb_atomic_int_impl_add(AI, V) __sync_fetch_and_add (&(AI), (V)) + +#define hb_atomic_ptr_impl_get(P) (void *) (__sync_synchronize (), *(P)) +#define hb_atomic_ptr_impl_cmpexch(P,O,N) __sync_bool_compare_and_swap ((P), (O), (N)) + + +#elif !defined(HB_NO_MT) && defined(HAVE_SOLARIS_ATOMIC_OPS) + +#include +#include + +typedef unsigned int hb_atomic_int_impl_t; +#define HB_ATOMIC_INT_IMPL_INIT(V) (V) +#define hb_atomic_int_impl_add(AI, V) ( ({__machine_rw_barrier ();}), atomic_add_int_nv (&(AI), (V)) - (V)) + +#define hb_atomic_ptr_impl_get(P) ( ({__machine_rw_barrier ();}), (void *) *(P)) +#define hb_atomic_ptr_impl_cmpexch(P,O,N) ( ({__machine_rw_barrier ();}), atomic_cas_ptr ((void **) (P), (void *) (O), (void *) (N)) == (void *) (O) ? true : false) + + +#elif !defined(HB_NO_MT) && defined(_AIX) && defined(__IBMCPP__) + +#include + + +static inline int hb_fetch_and_add(volatile int* AI, unsigned int V) { + __lwsync(); + int result = __fetch_and_add(AI, V); + __isync(); + return result; +} +static inline int hb_compare_and_swaplp(volatile long* P, long O, long N) { + __sync(); + int result = __compare_and_swaplp (P, &O, N); + __sync(); + return result; +} + +typedef int hb_atomic_int_impl_t; +#define HB_ATOMIC_INT_IMPL_INIT(V) (V) +#define hb_atomic_int_impl_add(AI, V) hb_fetch_and_add (&(AI), (V)) + +#define hb_atomic_ptr_impl_get(P) (__sync(), (void *) *(P)) +#define hb_atomic_ptr_impl_cmpexch(P,O,N) hb_compare_and_swaplp ((long*)(P), (long)(O), (long)(N)) + +#elif !defined(HB_NO_MT) + +#define HB_ATOMIC_INT_NIL 1 /* Warn that fallback implementation is in use. */ + +typedef volatile int hb_atomic_int_impl_t; +#define HB_ATOMIC_INT_IMPL_INIT(V) (V) +#define hb_atomic_int_impl_add(AI, V) (((AI) += (V)) - (V)) + +#define hb_atomic_ptr_impl_get(P) ((void *) *(P)) +#define hb_atomic_ptr_impl_cmpexch(P,O,N) (* (void * volatile *) (P) == (void *) (O) ? (* (void * volatile *) (P) = (void *) (N), true) : false) + + +#else /* HB_NO_MT */ + +typedef int hb_atomic_int_impl_t; +#define HB_ATOMIC_INT_IMPL_INIT(V) (V) +#define hb_atomic_int_impl_add(AI, V) (((AI) += (V)) - (V)) + +#define hb_atomic_ptr_impl_get(P) ((void *) *(P)) +#define hb_atomic_ptr_impl_cmpexch(P,O,N) (* (void **) (P) == (void *) (O) ? (* (void **) (P) = (void *) (N), true) : false) + + +#endif + + +#define HB_ATOMIC_INT_INIT(V) {HB_ATOMIC_INT_IMPL_INIT(V)} + +struct hb_atomic_int_t +{ + hb_atomic_int_impl_t v; + + inline void set_unsafe (int v_) { v = v_; } + inline int get_unsafe (void) const { return v; } + inline int inc (void) { return hb_atomic_int_impl_add (const_cast (v), 1); } + inline int dec (void) { return hb_atomic_int_impl_add (const_cast (v), -1); } +}; + + +#define hb_atomic_ptr_get(P) hb_atomic_ptr_impl_get(P) +#define hb_atomic_ptr_cmpexch(P,O,N) hb_atomic_ptr_impl_cmpexch((P),(O),(N)) + + +#endif /* HB_ATOMIC_PRIVATE_HH */ diff --git a/src/hb-blob.cc b/src/hb-blob.cc new file mode 100644 index 0000000..fb48f03 --- /dev/null +++ b/src/hb-blob.cc @@ -0,0 +1,478 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + */ + +/* http://www.oracle.com/technetwork/articles/servers-storage-dev/standardheaderfiles-453865.html */ +#ifndef _POSIX_C_SOURCE +#define _POSIX_C_SOURCE 199309L +#endif + +#include "hb-private.hh" + +#include "hb-object-private.hh" + +#ifdef HAVE_SYS_MMAN_H +#ifdef HAVE_UNISTD_H +#include +#endif /* HAVE_UNISTD_H */ +#include +#endif /* HAVE_SYS_MMAN_H */ + +#include +#include + + + +#ifndef HB_DEBUG_BLOB +#define HB_DEBUG_BLOB (HB_DEBUG+0) +#endif + + +struct hb_blob_t { + hb_object_header_t header; + ASSERT_POD (); + + bool immutable; + + const char *data; + unsigned int length; + hb_memory_mode_t mode; + + void *user_data; + hb_destroy_func_t destroy; +}; + + +static bool _try_writable (hb_blob_t *blob); + +static void +_hb_blob_destroy_user_data (hb_blob_t *blob) +{ + if (blob->destroy) { + blob->destroy (blob->user_data); + blob->user_data = NULL; + blob->destroy = NULL; + } +} + +/** + * hb_blob_create: (skip) + * @data: Pointer to blob data. + * @length: Length of @data in bytes. + * @mode: Memory mode for @data. + * @user_data: Data parameter to pass to @destroy. + * @destroy: Callback to call when @data is not needed anymore. + * + * Creates a new "blob" object wrapping @data. The @mode parameter is used + * to negotiate ownership and lifecycle of @data. + * + * Return value: New blob, or the empty blob if something failed or if @length is + * zero. Destroy with hb_blob_destroy(). + * + * Since: 0.9.2 + **/ +hb_blob_t * +hb_blob_create (const char *data, + unsigned int length, + hb_memory_mode_t mode, + void *user_data, + hb_destroy_func_t destroy) +{ + hb_blob_t *blob; + + if (!length || + length >= 1u << 31 || + !(blob = hb_object_create ())) { + if (destroy) + destroy (user_data); + return hb_blob_get_empty (); + } + + blob->data = data; + blob->length = length; + blob->mode = mode; + + blob->user_data = user_data; + blob->destroy = destroy; + + if (blob->mode == HB_MEMORY_MODE_DUPLICATE) { + blob->mode = HB_MEMORY_MODE_READONLY; + if (!_try_writable (blob)) { + hb_blob_destroy (blob); + return hb_blob_get_empty (); + } + } + + return blob; +} + +/** + * hb_blob_create_sub_blob: + * @parent: Parent blob. + * @offset: Start offset of sub-blob within @parent, in bytes. + * @length: Length of sub-blob. + * + * Returns a blob that represents a range of bytes in @parent. The new + * blob is always created with %HB_MEMORY_MODE_READONLY, meaning that it + * will never modify data in the parent blob. The parent data is not + * expected to be modified, and will result in undefined behavior if it + * is. + * + * Makes @parent immutable. + * + * Return value: New blob, or the empty blob if something failed or if + * @length is zero or @offset is beyond the end of @parent's data. Destroy + * with hb_blob_destroy(). + * + * Since: 0.9.2 + **/ +hb_blob_t * +hb_blob_create_sub_blob (hb_blob_t *parent, + unsigned int offset, + unsigned int length) +{ + hb_blob_t *blob; + + if (!length || offset >= parent->length) + return hb_blob_get_empty (); + + hb_blob_make_immutable (parent); + + blob = hb_blob_create (parent->data + offset, + MIN (length, parent->length - offset), + HB_MEMORY_MODE_READONLY, + hb_blob_reference (parent), + (hb_destroy_func_t) hb_blob_destroy); + + return blob; +} + +/** + * hb_blob_get_empty: + * + * Returns the singleton empty blob. + * + * See TODO:link object types for more information. + * + * Return value: (transfer full): the empty blob. + * + * Since: 0.9.2 + **/ +hb_blob_t * +hb_blob_get_empty (void) +{ + static const hb_blob_t _hb_blob_nil = { + HB_OBJECT_HEADER_STATIC, + + true, /* immutable */ + + NULL, /* data */ + 0, /* length */ + HB_MEMORY_MODE_READONLY, /* mode */ + + NULL, /* user_data */ + NULL /* destroy */ + }; + + return const_cast (&_hb_blob_nil); +} + +/** + * hb_blob_reference: (skip) + * @blob: a blob. + * + * Increases the reference count on @blob. + * + * See TODO:link object types for more information. + * + * Return value: @blob. + * + * Since: 0.9.2 + **/ +hb_blob_t * +hb_blob_reference (hb_blob_t *blob) +{ + return hb_object_reference (blob); +} + +/** + * hb_blob_destroy: (skip) + * @blob: a blob. + * + * Descreases the reference count on @blob, and if it reaches zero, destroys + * @blob, freeing all memory, possibly calling the destroy-callback the blob + * was created for if it has not been called already. + * + * See TODO:link object types for more information. + * + * Since: 0.9.2 + **/ +void +hb_blob_destroy (hb_blob_t *blob) +{ + if (!hb_object_destroy (blob)) return; + + _hb_blob_destroy_user_data (blob); + + free (blob); +} + +/** + * hb_blob_set_user_data: (skip) + * @blob: a blob. + * @key: key for data to set. + * @data: data to set. + * @destroy: callback to call when @data is not needed anymore. + * @replace: whether to replace an existing data with the same key. + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_blob_set_user_data (hb_blob_t *blob, + hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace) +{ + return hb_object_set_user_data (blob, key, data, destroy, replace); +} + +/** + * hb_blob_get_user_data: (skip) + * @blob: a blob. + * @key: key for data to get. + * + * + * + * Return value: (transfer none): + * + * Since: 0.9.2 + **/ +void * +hb_blob_get_user_data (hb_blob_t *blob, + hb_user_data_key_t *key) +{ + return hb_object_get_user_data (blob, key); +} + + +/** + * hb_blob_make_immutable: + * @blob: a blob. + * + * + * + * Since: 0.9.2 + **/ +void +hb_blob_make_immutable (hb_blob_t *blob) +{ + if (hb_object_is_inert (blob)) + return; + + blob->immutable = true; +} + +/** + * hb_blob_is_immutable: + * @blob: a blob. + * + * + * + * Return value: TODO + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_blob_is_immutable (hb_blob_t *blob) +{ + return blob->immutable; +} + + +/** + * hb_blob_get_length: + * @blob: a blob. + * + * + * + * Return value: the length of blob data in bytes. + * + * Since: 0.9.2 + **/ +unsigned int +hb_blob_get_length (hb_blob_t *blob) +{ + return blob->length; +} + +/** + * hb_blob_get_data: + * @blob: a blob. + * @length: (out): + * + * + * + * Returns: (transfer none) (array length=length): + * + * Since: 0.9.2 + **/ +const char * +hb_blob_get_data (hb_blob_t *blob, unsigned int *length) +{ + if (length) + *length = blob->length; + + return blob->data; +} + +/** + * hb_blob_get_data_writable: + * @blob: a blob. + * @length: (out): output length of the writable data. + * + * Tries to make blob data writable (possibly copying it) and + * return pointer to data. + * + * Fails if blob has been made immutable, or if memory allocation + * fails. + * + * Returns: (transfer none) (array length=length): Writable blob data, + * or %NULL if failed. + * + * Since: 0.9.2 + **/ +char * +hb_blob_get_data_writable (hb_blob_t *blob, unsigned int *length) +{ + if (!_try_writable (blob)) { + if (length) + *length = 0; + + return NULL; + } + + if (length) + *length = blob->length; + + return const_cast (blob->data); +} + + +static hb_bool_t +_try_make_writable_inplace_unix (hb_blob_t *blob) +{ +#if defined(HAVE_SYS_MMAN_H) && defined(HAVE_MPROTECT) + uintptr_t pagesize = -1, mask, length; + const char *addr; + +#if defined(HAVE_SYSCONF) && defined(_SC_PAGE_SIZE) + pagesize = (uintptr_t) sysconf (_SC_PAGE_SIZE); +#elif defined(HAVE_SYSCONF) && defined(_SC_PAGESIZE) + pagesize = (uintptr_t) sysconf (_SC_PAGESIZE); +#elif defined(HAVE_GETPAGESIZE) + pagesize = (uintptr_t) getpagesize (); +#endif + + if ((uintptr_t) -1L == pagesize) { + DEBUG_MSG_FUNC (BLOB, blob, "failed to get pagesize: %s", strerror (errno)); + return false; + } + DEBUG_MSG_FUNC (BLOB, blob, "pagesize is %lu", (unsigned long) pagesize); + + mask = ~(pagesize-1); + addr = (const char *) (((uintptr_t) blob->data) & mask); + length = (const char *) (((uintptr_t) blob->data + blob->length + pagesize-1) & mask) - addr; + DEBUG_MSG_FUNC (BLOB, blob, + "calling mprotect on [%p..%p] (%lu bytes)", + addr, addr+length, (unsigned long) length); + if (-1 == mprotect ((void *) addr, length, PROT_READ | PROT_WRITE)) { + DEBUG_MSG_FUNC (BLOB, blob, "mprotect failed: %s", strerror (errno)); + return false; + } + + blob->mode = HB_MEMORY_MODE_WRITABLE; + + DEBUG_MSG_FUNC (BLOB, blob, + "successfully made [%p..%p] (%lu bytes) writable\n", + addr, addr+length, (unsigned long) length); + return true; +#else + return false; +#endif +} + +static bool +_try_writable_inplace (hb_blob_t *blob) +{ + DEBUG_MSG_FUNC (BLOB, blob, "making writable inplace\n"); + + if (_try_make_writable_inplace_unix (blob)) + return true; + + DEBUG_MSG_FUNC (BLOB, blob, "making writable -> FAILED\n"); + + /* Failed to make writable inplace, mark that */ + blob->mode = HB_MEMORY_MODE_READONLY; + return false; +} + +static bool +_try_writable (hb_blob_t *blob) +{ + if (blob->immutable) + return false; + + if (blob->mode == HB_MEMORY_MODE_WRITABLE) + return true; + + if (blob->mode == HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE && _try_writable_inplace (blob)) + return true; + + if (blob->mode == HB_MEMORY_MODE_WRITABLE) + return true; + + + DEBUG_MSG_FUNC (BLOB, blob, "current data is -> %p\n", blob->data); + + char *new_data; + + new_data = (char *) malloc (blob->length); + if (unlikely (!new_data)) + return false; + + DEBUG_MSG_FUNC (BLOB, blob, "dupped successfully -> %p\n", blob->data); + + memcpy (new_data, blob->data, blob->length); + _hb_blob_destroy_user_data (blob); + blob->mode = HB_MEMORY_MODE_WRITABLE; + blob->data = new_data; + blob->user_data = new_data; + blob->destroy = free; + + return true; +} diff --git a/src/hb-blob.h b/src/hb-blob.h new file mode 100644 index 0000000..ef3fc98 --- /dev/null +++ b/src/hb-blob.h @@ -0,0 +1,126 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + */ + +#ifndef HB_H_IN +#error "Include instead." +#endif + +#ifndef HB_BLOB_H +#define HB_BLOB_H + +#include "hb-common.h" + +HB_BEGIN_DECLS + + +/* + * Note re various memory-modes: + * + * - In no case shall the HarfBuzz client modify memory + * that is passed to HarfBuzz in a blob. If there is + * any such possibility, MODE_DUPLICATE should be used + * such that HarfBuzz makes a copy immediately, + * + * - Use MODE_READONLY otherse, unless you really really + * really know what you are doing, + * + * - MODE_WRITABLE is appropriate if you really made a + * copy of data solely for the purpose of passing to + * HarfBuzz and doing that just once (no reuse!), + * + * - If the font is mmap()ed, it's ok to use + * READONLY_MAY_MAKE_WRITABLE, however, using that mode + * correctly is very tricky. Use MODE_READONLY instead. + */ +typedef enum { + HB_MEMORY_MODE_DUPLICATE, + HB_MEMORY_MODE_READONLY, + HB_MEMORY_MODE_WRITABLE, + HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE +} hb_memory_mode_t; + +typedef struct hb_blob_t hb_blob_t; + +HB_EXTERN hb_blob_t * +hb_blob_create (const char *data, + unsigned int length, + hb_memory_mode_t mode, + void *user_data, + hb_destroy_func_t destroy); + +/* Always creates with MEMORY_MODE_READONLY. + * Even if the parent blob is writable, we don't + * want the user of the sub-blob to be able to + * modify the parent data as that data may be + * shared among multiple sub-blobs. + */ +HB_EXTERN hb_blob_t * +hb_blob_create_sub_blob (hb_blob_t *parent, + unsigned int offset, + unsigned int length); + +HB_EXTERN hb_blob_t * +hb_blob_get_empty (void); + +HB_EXTERN hb_blob_t * +hb_blob_reference (hb_blob_t *blob); + +HB_EXTERN void +hb_blob_destroy (hb_blob_t *blob); + +HB_EXTERN hb_bool_t +hb_blob_set_user_data (hb_blob_t *blob, + hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace); + + +HB_EXTERN void * +hb_blob_get_user_data (hb_blob_t *blob, + hb_user_data_key_t *key); + + +HB_EXTERN void +hb_blob_make_immutable (hb_blob_t *blob); + +HB_EXTERN hb_bool_t +hb_blob_is_immutable (hb_blob_t *blob); + + +HB_EXTERN unsigned int +hb_blob_get_length (hb_blob_t *blob); + +HB_EXTERN const char * +hb_blob_get_data (hb_blob_t *blob, unsigned int *length); + +HB_EXTERN char * +hb_blob_get_data_writable (hb_blob_t *blob, unsigned int *length); + + +HB_END_DECLS + +#endif /* HB_BLOB_H */ diff --git a/src/hb-buffer-deserialize-json.hh b/src/hb-buffer-deserialize-json.hh new file mode 100644 index 0000000..3f626bd --- /dev/null +++ b/src/hb-buffer-deserialize-json.hh @@ -0,0 +1,643 @@ + +#line 1 "hb-buffer-deserialize-json.rl" +/* + * Copyright © 2013 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_BUFFER_DESERIALIZE_JSON_HH +#define HB_BUFFER_DESERIALIZE_JSON_HH + +#include "hb-private.hh" + + +#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, + 9u, 125u, 9u, 125u, 108u, 108u, 34u, 34u, 9u, 58u, 9u, 57u, 9u, 125u, 9u, 125u, + 120u, 121u, 34u, 34u, 9u, 58u, 9u, 57u, 48u, 57u, 9u, 125u, 9u, 125u, 34u, 34u, + 9u, 58u, 9u, 57u, 48u, 57u, 9u, 125u, 9u, 125u, 34u, 34u, 9u, 58u, 9u, 57u, + 65u, 122u, 34u, 122u, 9u, 125u, 9u, 125u, 9u, 93u, 9u, 123u, 0u, 0u, 0 +}; + +static const char _deserialize_json_key_spans[] = { + 0, 115, 26, 7, 2, 1, 50, 49, + 10, 117, 117, 117, 1, 50, 49, 10, + 117, 117, 1, 1, 50, 49, 117, 117, + 2, 1, 50, 49, 10, 117, 117, 1, + 50, 49, 10, 117, 117, 1, 50, 49, + 58, 89, 117, 117, 85, 115, 0 +}; + +static const short _deserialize_json_index_offsets[] = { + 0, 0, 116, 143, 151, 154, 156, 207, + 257, 268, 386, 504, 622, 624, 675, 725, + 736, 854, 972, 974, 976, 1027, 1077, 1195, + 1313, 1316, 1318, 1369, 1419, 1430, 1548, 1666, + 1668, 1719, 1769, 1780, 1898, 2016, 2018, 2069, + 2119, 2178, 2268, 2386, 2504, 2590, 2706 +}; + +static const char _deserialize_json_indicies[] = { + 0, 0, 0, 0, 0, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 0, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 2, 1, 3, 3, 3, + 3, 3, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 3, 1, 4, 1, + 5, 1, 6, 7, 1, 1, 8, 1, + 9, 10, 1, 11, 1, 11, 11, 11, + 11, 11, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 11, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 12, 1, + 12, 12, 12, 12, 12, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 12, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 13, 1, 1, 14, + 15, 15, 15, 15, 15, 15, 15, 15, + 15, 1, 16, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 1, 18, 18, 18, + 18, 18, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 18, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 19, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 20, 1, 21, 21, 21, 21, 21, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 21, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 3, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 22, + 1, 18, 18, 18, 18, 18, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 18, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 19, 1, 1, 1, + 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 20, 1, 23, + 1, 23, 23, 23, 23, 23, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 23, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 24, 1, 24, 24, 24, 24, + 24, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 24, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 25, 1, 1, 26, 27, 27, 27, 27, + 27, 27, 27, 27, 27, 1, 28, 29, + 29, 29, 29, 29, 29, 29, 29, 29, + 1, 30, 30, 30, 30, 30, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 30, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 31, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 32, 1, 30, + 30, 30, 30, 30, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 30, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 31, 1, 1, 1, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 32, 1, 33, 1, 34, + 1, 34, 34, 34, 34, 34, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 34, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 35, 1, 35, 35, 35, 35, + 35, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 35, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 36, 37, 37, 37, 37, + 37, 37, 37, 37, 37, 1, 38, 38, + 38, 38, 38, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 38, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 39, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 40, 1, 38, 38, 38, 38, + 38, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 38, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 39, + 1, 1, 1, 41, 41, 41, 41, 41, + 41, 41, 41, 41, 41, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 40, 1, 42, 43, 1, 44, 1, 44, + 44, 44, 44, 44, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 44, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 45, 1, 45, 45, 45, 45, 45, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 45, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 46, 1, + 1, 47, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 1, 49, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 1, 51, + 51, 51, 51, 51, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 51, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 52, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 53, 1, 51, 51, 51, + 51, 51, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 51, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 52, 1, 1, 1, 50, 50, 50, 50, + 50, 50, 50, 50, 50, 50, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 53, 1, 54, 1, 54, 54, 54, + 54, 54, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 54, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 55, 1, + 55, 55, 55, 55, 55, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 55, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 56, 1, 1, 57, + 58, 58, 58, 58, 58, 58, 58, 58, + 58, 1, 59, 60, 60, 60, 60, 60, + 60, 60, 60, 60, 1, 61, 61, 61, + 61, 61, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 61, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 62, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 63, 1, 61, 61, 61, 61, 61, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 61, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 62, 1, + 1, 1, 60, 60, 60, 60, 60, 60, + 60, 60, 60, 60, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 63, + 1, 64, 1, 64, 64, 64, 64, 64, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 64, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 65, 1, 65, 65, + 65, 65, 65, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 65, 1, 66, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 67, 68, 68, + 68, 68, 68, 68, 68, 68, 68, 1, + 69, 69, 69, 69, 69, 69, 69, 69, + 69, 69, 69, 69, 69, 69, 69, 69, + 69, 69, 69, 69, 69, 69, 69, 69, + 69, 69, 1, 1, 1, 1, 1, 1, + 69, 69, 69, 69, 69, 69, 69, 69, + 69, 69, 69, 69, 69, 69, 69, 69, + 69, 69, 69, 69, 69, 69, 69, 69, + 69, 69, 1, 70, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 71, 71, + 1, 71, 71, 71, 71, 71, 71, 71, + 71, 71, 71, 1, 1, 1, 1, 1, + 1, 1, 71, 71, 71, 71, 71, 71, + 71, 71, 71, 71, 71, 71, 71, 71, + 71, 71, 71, 71, 71, 71, 71, 71, + 71, 71, 71, 71, 1, 1, 1, 1, + 71, 1, 71, 71, 71, 71, 71, 71, + 71, 71, 71, 71, 71, 71, 71, 71, + 71, 71, 71, 71, 71, 71, 71, 71, + 71, 71, 71, 71, 1, 72, 72, 72, + 72, 72, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 72, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 73, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 74, 1, 72, 72, 72, 72, 72, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 72, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 73, 1, + 1, 1, 75, 75, 75, 75, 75, 75, + 75, 75, 75, 75, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 74, + 1, 76, 76, 76, 76, 76, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 76, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 77, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 78, 1, 0, + 0, 0, 0, 0, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 0, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 1, 1, 0 +}; + +static const char _deserialize_json_trans_targs[] = { + 1, 0, 2, 2, 3, 4, 18, 24, + 37, 5, 12, 6, 7, 8, 9, 11, + 9, 11, 10, 2, 44, 10, 44, 13, + 14, 15, 16, 17, 16, 17, 10, 2, + 44, 19, 20, 21, 22, 23, 10, 2, + 44, 23, 25, 31, 26, 27, 28, 29, + 30, 29, 30, 10, 2, 44, 32, 33, + 34, 35, 36, 35, 36, 10, 2, 44, + 38, 39, 40, 42, 43, 41, 10, 41, + 10, 2, 44, 43, 44, 45, 46 +}; + +static const char _deserialize_json_trans_actions[] = { + 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 2, 2, 2, + 0, 0, 3, 3, 4, 0, 5, 0, + 0, 2, 2, 2, 0, 0, 6, 6, + 7, 0, 0, 0, 2, 2, 8, 8, + 9, 0, 0, 0, 0, 0, 2, 2, + 2, 0, 0, 10, 10, 11, 0, 0, + 2, 2, 2, 0, 0, 12, 12, 13, + 0, 0, 0, 2, 2, 2, 14, 0, + 15, 15, 16, 0, 0, 0, 0 +}; + +static const int deserialize_json_start = 1; +static const int deserialize_json_first_final = 44; +static const int deserialize_json_error = 0; + +static const int deserialize_json_en_main = 1; + + +#line 97 "hb-buffer-deserialize-json.rl" + + +static hb_bool_t +_hb_buffer_deserialize_glyphs_json (hb_buffer_t *buffer, + const char *buf, + unsigned int buf_len, + const char **end_ptr, + hb_font_t *font) +{ + const char *p = buf, *pe = buf + buf_len; + + /* Ensure we have positions. */ + (void) hb_buffer_get_glyph_positions (buffer, NULL); + + while (p < pe && ISSPACE (*p)) + p++; + if (p < pe && *p == (buffer->len ? ',' : '[')) + { + *end_ptr = ++p; + } + + const char *tok = NULL; + int cs; + hb_glyph_info_t info = {0}; + hb_glyph_position_t pos = {0}; + +#line 466 "hb-buffer-deserialize-json.hh" + { + cs = deserialize_json_start; + } + +#line 471 "hb-buffer-deserialize-json.hh" + { + int _slen; + int _trans; + const unsigned char *_keys; + const char *_inds; + if ( p == pe ) + goto _test_eof; + if ( cs == 0 ) + goto _out; +_resume: + _keys = _deserialize_json_trans_keys + (cs<<1); + _inds = _deserialize_json_indicies + _deserialize_json_index_offsets[cs]; + + _slen = _deserialize_json_key_spans[cs]; + _trans = _inds[ _slen > 0 && _keys[0] <=(*p) && + (*p) <= _keys[1] ? + (*p) - _keys[0] : _slen ]; + + cs = _deserialize_json_trans_targs[_trans]; + + if ( _deserialize_json_trans_actions[_trans] == 0 ) + goto _again; + + switch ( _deserialize_json_trans_actions[_trans] ) { + case 1: +#line 38 "hb-buffer-deserialize-json.rl" + { + memset (&info, 0, sizeof (info)); + memset (&pos , 0, sizeof (pos )); +} + break; + case 5: +#line 43 "hb-buffer-deserialize-json.rl" + { + buffer->add_info (info); + if (buffer->in_error) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 2: +#line 51 "hb-buffer-deserialize-json.rl" + { + tok = p; +} + break; + case 14: +#line 55 "hb-buffer-deserialize-json.rl" + { + if (!hb_font_glyph_from_string (font, + tok, p - tok, + &info.codepoint)) + return false; +} + break; + case 15: +#line 62 "hb-buffer-deserialize-json.rl" + { if (!parse_uint (tok, p, &info.codepoint)) return false; } + break; + case 8: +#line 63 "hb-buffer-deserialize-json.rl" + { if (!parse_uint (tok, p, &info.cluster )) return false; } + break; + case 10: +#line 64 "hb-buffer-deserialize-json.rl" + { if (!parse_int (tok, p, &pos.x_offset )) return false; } + break; + case 12: +#line 65 "hb-buffer-deserialize-json.rl" + { if (!parse_int (tok, p, &pos.y_offset )) return false; } + break; + case 3: +#line 66 "hb-buffer-deserialize-json.rl" + { if (!parse_int (tok, p, &pos.x_advance)) return false; } + break; + case 6: +#line 67 "hb-buffer-deserialize-json.rl" + { if (!parse_int (tok, p, &pos.y_advance)) return false; } + break; + case 16: +#line 62 "hb-buffer-deserialize-json.rl" + { if (!parse_uint (tok, p, &info.codepoint)) return false; } +#line 43 "hb-buffer-deserialize-json.rl" + { + buffer->add_info (info); + if (buffer->in_error) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 9: +#line 63 "hb-buffer-deserialize-json.rl" + { if (!parse_uint (tok, p, &info.cluster )) return false; } +#line 43 "hb-buffer-deserialize-json.rl" + { + buffer->add_info (info); + if (buffer->in_error) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 11: +#line 64 "hb-buffer-deserialize-json.rl" + { if (!parse_int (tok, p, &pos.x_offset )) return false; } +#line 43 "hb-buffer-deserialize-json.rl" + { + buffer->add_info (info); + if (buffer->in_error) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 13: +#line 65 "hb-buffer-deserialize-json.rl" + { if (!parse_int (tok, p, &pos.y_offset )) return false; } +#line 43 "hb-buffer-deserialize-json.rl" + { + buffer->add_info (info); + if (buffer->in_error) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 4: +#line 66 "hb-buffer-deserialize-json.rl" + { if (!parse_int (tok, p, &pos.x_advance)) return false; } +#line 43 "hb-buffer-deserialize-json.rl" + { + buffer->add_info (info); + if (buffer->in_error) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 7: +#line 67 "hb-buffer-deserialize-json.rl" + { if (!parse_int (tok, p, &pos.y_advance)) return false; } +#line 43 "hb-buffer-deserialize-json.rl" + { + buffer->add_info (info); + if (buffer->in_error) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; +#line 624 "hb-buffer-deserialize-json.hh" + } + +_again: + if ( cs == 0 ) + goto _out; + if ( ++p != pe ) + goto _resume; + _test_eof: {} + _out: {} + } + +#line 125 "hb-buffer-deserialize-json.rl" + + + *end_ptr = p; + + return p == pe && *(p-1) != ']'; +} + +#endif /* HB_BUFFER_DESERIALIZE_JSON_HH */ diff --git a/src/hb-buffer-deserialize-json.rl b/src/hb-buffer-deserialize-json.rl new file mode 100644 index 0000000..91b350f --- /dev/null +++ b/src/hb-buffer-deserialize-json.rl @@ -0,0 +1,132 @@ +/* + * Copyright © 2013 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_BUFFER_DESERIALIZE_JSON_HH +#define HB_BUFFER_DESERIALIZE_JSON_HH + +#include "hb-private.hh" + +%%{ + +machine deserialize_json; +alphtype unsigned char; +write data; + +action clear_item { + memset (&info, 0, sizeof (info)); + memset (&pos , 0, sizeof (pos )); +} + +action add_item { + buffer->add_info (info); + if (buffer->in_error) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + +action tok { + tok = p; +} + +action parse_glyph { + if (!hb_font_glyph_from_string (font, + tok, p - tok, + &info.codepoint)) + return false; +} + +action parse_gid { if (!parse_uint (tok, p, &info.codepoint)) return false; } +action parse_cluster { if (!parse_uint (tok, p, &info.cluster )) return false; } +action parse_x_offset { if (!parse_int (tok, p, &pos.x_offset )) return false; } +action parse_y_offset { if (!parse_int (tok, p, &pos.y_offset )) return false; } +action parse_x_advance { if (!parse_int (tok, p, &pos.x_advance)) return false; } +action parse_y_advance { if (!parse_int (tok, p, &pos.y_advance)) return false; } + +unum = '0' | [1-9] digit*; +num = '-'? unum; + +comma = space* ',' space*; +colon = space* ':' space*; + +glyph_id = unum; +glyph_name = alpha (alnum|'_'|'.'|'-')*; + +glyph_string = '"' (glyph_name >tok %parse_glyph) '"'; +glyph_number = (glyph_id >tok %parse_gid); + +glyph = "\"g\"" colon (glyph_string | glyph_number); +cluster = "\"cl\"" colon (unum >tok %parse_cluster); +xoffset = "\"dx\"" colon (num >tok %parse_x_offset); +yoffset = "\"dy\"" colon (num >tok %parse_y_offset); +xadvance= "\"ax\"" colon (num >tok %parse_x_advance); +yadvance= "\"ay\"" colon (num >tok %parse_y_advance); + +element = glyph | cluster | xoffset | yoffset | xadvance | yadvance; +item = + ( '{' space* element (comma element)* space* '}') + >clear_item + @add_item + ; + +main := space* item (comma item)* space* (','|']')?; + +}%% + +static hb_bool_t +_hb_buffer_deserialize_glyphs_json (hb_buffer_t *buffer, + const char *buf, + unsigned int buf_len, + const char **end_ptr, + hb_font_t *font) +{ + const char *p = buf, *pe = buf + buf_len; + + /* Ensure we have positions. */ + (void) hb_buffer_get_glyph_positions (buffer, NULL); + + while (p < pe && ISSPACE (*p)) + p++; + if (p < pe && *p == (buffer->len ? ',' : '[')) + { + *end_ptr = ++p; + } + + const char *tok = NULL; + int cs; + hb_glyph_info_t info = {0}; + hb_glyph_position_t pos = {0}; + %%{ + write init; + write exec; + }%% + + *end_ptr = p; + + return p == pe && *(p-1) != ']'; +} + +#endif /* HB_BUFFER_DESERIALIZE_JSON_HH */ diff --git a/src/hb-buffer-deserialize-text.hh b/src/hb-buffer-deserialize-text.hh new file mode 100644 index 0000000..d2d8daa --- /dev/null +++ b/src/hb-buffer-deserialize-text.hh @@ -0,0 +1,571 @@ + +#line 1 "hb-buffer-deserialize-text.rl" +/* + * Copyright © 2013 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_BUFFER_DESERIALIZE_TEXT_HH +#define HB_BUFFER_DESERIALIZE_TEXT_HH + +#include "hb-private.hh" + + +#line 36 "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, + 9u, 122u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, + 9u, 124u, 9u, 124u, 9u, 124u, 0 +}; + +static const char _deserialize_text_key_spans[] = { + 0, 114, 13, 10, 13, 10, 10, 13, + 10, 1, 13, 10, 14, 116, 116, 0, + 114, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 116 +}; + +static const short _deserialize_text_index_offsets[] = { + 0, 0, 115, 129, 140, 154, 165, 176, + 190, 201, 203, 217, 228, 243, 360, 477, + 478, 593, 710, 827, 944, 1061, 1178, 1295, + 1412, 1529, 1646 +}; + +static const char _deserialize_text_indicies[] = { + 0, 0, 0, 0, 0, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 0, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 2, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 1, 1, 1, 1, 1, 1, + 1, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 1, 1, 1, 1, 1, + 1, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 1, 5, 1, 1, 6, + 7, 7, 7, 7, 7, 7, 7, 7, + 7, 1, 8, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 1, 10, 1, 1, + 11, 12, 12, 12, 12, 12, 12, 12, + 12, 12, 1, 13, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 1, 15, 16, + 16, 16, 16, 16, 16, 16, 16, 16, + 1, 17, 1, 1, 18, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 1, 20, + 21, 21, 21, 21, 21, 21, 21, 21, + 21, 1, 22, 1, 23, 1, 1, 24, + 25, 25, 25, 25, 25, 25, 25, 25, + 25, 1, 26, 27, 27, 27, 27, 27, + 27, 27, 27, 27, 1, 22, 1, 1, + 1, 21, 21, 21, 21, 21, 21, 21, + 21, 21, 21, 1, 28, 28, 28, 28, + 28, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 28, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 29, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 30, 1, 1, 31, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 32, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 33, + 1, 34, 34, 34, 34, 34, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 34, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 35, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 36, 1, 1, 0, + 0, 0, 0, 0, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 0, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 2, 3, + 3, 3, 3, 3, 3, 3, 3, 3, + 1, 1, 1, 1, 1, 1, 1, 4, + 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, + 4, 1, 1, 1, 1, 1, 1, 4, + 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, + 4, 1, 28, 28, 28, 28, 28, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 28, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 29, 1, 1, 1, + 1, 37, 37, 37, 37, 37, 37, 37, + 37, 37, 37, 1, 1, 1, 30, 1, + 1, 31, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 32, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 33, 1, 38, + 38, 38, 38, 38, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 38, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 39, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 40, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 41, 1, 42, 42, 42, 42, + 42, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 42, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 43, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 44, + 1, 42, 42, 42, 42, 42, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 42, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 14, 14, 14, 14, 14, 14, 14, 14, + 14, 14, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 43, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 44, 1, 38, 38, + 38, 38, 38, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 38, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 39, 1, 1, 1, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 40, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 41, 1, 45, 45, 45, 45, 45, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 45, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 46, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 47, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 48, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 49, 1, + 50, 50, 50, 50, 50, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 50, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 51, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 52, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 53, 1, 50, 50, 50, + 50, 50, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 50, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 51, + 1, 1, 1, 1, 27, 27, 27, 27, + 27, 27, 27, 27, 27, 27, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 52, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 53, 1, 45, 45, 45, 45, 45, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 45, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 46, 1, 1, 1, + 1, 54, 54, 54, 54, 54, 54, 54, + 54, 54, 54, 1, 1, 1, 1, 1, + 1, 47, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 48, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 49, 1, 28, + 28, 28, 28, 28, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 28, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 29, 1, 55, 55, 1, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, + 1, 1, 1, 30, 1, 1, 31, 55, + 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, + 55, 1, 1, 32, 1, 55, 1, 55, + 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, + 55, 1, 33, 1, 0 +}; + +static const char _deserialize_text_trans_targs[] = { + 1, 0, 13, 17, 26, 3, 18, 21, + 18, 21, 5, 19, 20, 19, 20, 22, + 25, 8, 9, 12, 9, 12, 10, 11, + 23, 24, 23, 24, 14, 2, 6, 7, + 15, 16, 14, 15, 16, 17, 14, 4, + 15, 16, 14, 15, 16, 14, 2, 7, + 15, 16, 14, 2, 15, 16, 25, 26 +}; + +static const char _deserialize_text_trans_actions[] = { + 0, 0, 1, 1, 1, 2, 2, 2, + 0, 0, 2, 2, 2, 0, 0, 2, + 2, 2, 2, 2, 0, 0, 3, 2, + 2, 2, 0, 0, 4, 5, 5, 5, + 4, 4, 0, 0, 0, 0, 6, 7, + 6, 6, 8, 8, 8, 9, 10, 10, + 9, 9, 11, 12, 11, 11, 0, 0 +}; + +static const char _deserialize_text_eof_actions[] = { + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 4, 0, 0, + 0, 4, 6, 8, 8, 6, 9, 11, + 11, 9, 4 +}; + +static const int deserialize_text_start = 1; +static const int deserialize_text_first_final = 13; +static const int deserialize_text_error = 0; + +static const int deserialize_text_en_main = 1; + + +#line 91 "hb-buffer-deserialize-text.rl" + + +static hb_bool_t +_hb_buffer_deserialize_glyphs_text (hb_buffer_t *buffer, + const char *buf, + unsigned int buf_len, + const char **end_ptr, + hb_font_t *font) +{ + const char *p = buf, *pe = buf + buf_len; + + /* Ensure we have positions. */ + (void) hb_buffer_get_glyph_positions (buffer, NULL); + + while (p < pe && ISSPACE (*p)) + p++; + if (p < pe && *p == (buffer->len ? '|' : '[')) + { + *end_ptr = ++p; + } + + const char *eof = pe, *tok = NULL; + int cs; + hb_glyph_info_t info = {0}; + hb_glyph_position_t pos = {0}; + +#line 343 "hb-buffer-deserialize-text.hh" + { + cs = deserialize_text_start; + } + +#line 348 "hb-buffer-deserialize-text.hh" + { + int _slen; + int _trans; + const unsigned char *_keys; + const char *_inds; + if ( p == pe ) + goto _test_eof; + if ( cs == 0 ) + goto _out; +_resume: + _keys = _deserialize_text_trans_keys + (cs<<1); + _inds = _deserialize_text_indicies + _deserialize_text_index_offsets[cs]; + + _slen = _deserialize_text_key_spans[cs]; + _trans = _inds[ _slen > 0 && _keys[0] <=(*p) && + (*p) <= _keys[1] ? + (*p) - _keys[0] : _slen ]; + + cs = _deserialize_text_trans_targs[_trans]; + + if ( _deserialize_text_trans_actions[_trans] == 0 ) + goto _again; + + switch ( _deserialize_text_trans_actions[_trans] ) { + case 2: +#line 51 "hb-buffer-deserialize-text.rl" + { + tok = p; +} + break; + case 5: +#line 55 "hb-buffer-deserialize-text.rl" + { + if (!hb_font_glyph_from_string (font, + tok, p - tok, + &info.codepoint)) + return false; +} + break; + case 10: +#line 62 "hb-buffer-deserialize-text.rl" + { if (!parse_uint (tok, p, &info.cluster )) return false; } + break; + case 3: +#line 63 "hb-buffer-deserialize-text.rl" + { if (!parse_int (tok, p, &pos.x_offset )) return false; } + break; + case 12: +#line 64 "hb-buffer-deserialize-text.rl" + { if (!parse_int (tok, p, &pos.y_offset )) return false; } + break; + case 7: +#line 65 "hb-buffer-deserialize-text.rl" + { if (!parse_int (tok, p, &pos.x_advance)) return false; } + break; + case 1: +#line 38 "hb-buffer-deserialize-text.rl" + { + memset (&info, 0, sizeof (info)); + memset (&pos , 0, sizeof (pos )); +} +#line 51 "hb-buffer-deserialize-text.rl" + { + tok = p; +} + break; + case 4: +#line 55 "hb-buffer-deserialize-text.rl" + { + if (!hb_font_glyph_from_string (font, + tok, p - tok, + &info.codepoint)) + return false; +} +#line 43 "hb-buffer-deserialize-text.rl" + { + buffer->add_info (info); + if (buffer->in_error) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 9: +#line 62 "hb-buffer-deserialize-text.rl" + { if (!parse_uint (tok, p, &info.cluster )) return false; } +#line 43 "hb-buffer-deserialize-text.rl" + { + buffer->add_info (info); + if (buffer->in_error) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 11: +#line 64 "hb-buffer-deserialize-text.rl" + { if (!parse_int (tok, p, &pos.y_offset )) return false; } +#line 43 "hb-buffer-deserialize-text.rl" + { + buffer->add_info (info); + if (buffer->in_error) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 6: +#line 65 "hb-buffer-deserialize-text.rl" + { if (!parse_int (tok, p, &pos.x_advance)) return false; } +#line 43 "hb-buffer-deserialize-text.rl" + { + buffer->add_info (info); + if (buffer->in_error) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 8: +#line 66 "hb-buffer-deserialize-text.rl" + { if (!parse_int (tok, p, &pos.y_advance)) return false; } +#line 43 "hb-buffer-deserialize-text.rl" + { + buffer->add_info (info); + if (buffer->in_error) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; +#line 480 "hb-buffer-deserialize-text.hh" + } + +_again: + if ( cs == 0 ) + goto _out; + if ( ++p != pe ) + goto _resume; + _test_eof: {} + if ( p == eof ) + { + switch ( _deserialize_text_eof_actions[cs] ) { + case 4: +#line 55 "hb-buffer-deserialize-text.rl" + { + if (!hb_font_glyph_from_string (font, + tok, p - tok, + &info.codepoint)) + return false; +} +#line 43 "hb-buffer-deserialize-text.rl" + { + buffer->add_info (info); + if (buffer->in_error) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 9: +#line 62 "hb-buffer-deserialize-text.rl" + { if (!parse_uint (tok, p, &info.cluster )) return false; } +#line 43 "hb-buffer-deserialize-text.rl" + { + buffer->add_info (info); + if (buffer->in_error) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 11: +#line 64 "hb-buffer-deserialize-text.rl" + { if (!parse_int (tok, p, &pos.y_offset )) return false; } +#line 43 "hb-buffer-deserialize-text.rl" + { + buffer->add_info (info); + if (buffer->in_error) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 6: +#line 65 "hb-buffer-deserialize-text.rl" + { if (!parse_int (tok, p, &pos.x_advance)) return false; } +#line 43 "hb-buffer-deserialize-text.rl" + { + buffer->add_info (info); + if (buffer->in_error) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; + case 8: +#line 66 "hb-buffer-deserialize-text.rl" + { if (!parse_int (tok, p, &pos.y_advance)) return false; } +#line 43 "hb-buffer-deserialize-text.rl" + { + buffer->add_info (info); + if (buffer->in_error) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + break; +#line 557 "hb-buffer-deserialize-text.hh" + } + } + + _out: {} + } + +#line 119 "hb-buffer-deserialize-text.rl" + + + *end_ptr = p; + + return p == pe && *(p-1) != ']'; +} + +#endif /* HB_BUFFER_DESERIALIZE_TEXT_HH */ diff --git a/src/hb-buffer-deserialize-text.rl b/src/hb-buffer-deserialize-text.rl new file mode 100644 index 0000000..8a682f7 --- /dev/null +++ b/src/hb-buffer-deserialize-text.rl @@ -0,0 +1,126 @@ +/* + * Copyright © 2013 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_BUFFER_DESERIALIZE_TEXT_HH +#define HB_BUFFER_DESERIALIZE_TEXT_HH + +#include "hb-private.hh" + +%%{ + +machine deserialize_text; +alphtype unsigned char; +write data; + +action clear_item { + memset (&info, 0, sizeof (info)); + memset (&pos , 0, sizeof (pos )); +} + +action add_item { + buffer->add_info (info); + if (buffer->in_error) + return false; + buffer->pos[buffer->len - 1] = pos; + *end_ptr = p; +} + +action tok { + tok = p; +} + +action parse_glyph { + if (!hb_font_glyph_from_string (font, + tok, p - tok, + &info.codepoint)) + return false; +} + +action parse_cluster { if (!parse_uint (tok, p, &info.cluster )) return false; } +action parse_x_offset { if (!parse_int (tok, p, &pos.x_offset )) return false; } +action parse_y_offset { if (!parse_int (tok, p, &pos.y_offset )) return false; } +action parse_x_advance { if (!parse_int (tok, p, &pos.x_advance)) return false; } +action parse_y_advance { if (!parse_int (tok, p, &pos.y_advance)) return false; } + +unum = '0' | [1-9] digit*; +num = '-'? unum; + +glyph_id = unum; +glyph_name = alpha (alnum|'_'|'.'|'-')*; + +glyph = (glyph_id | glyph_name) >tok %parse_glyph; +cluster = '=' (unum >tok %parse_cluster); +offsets = '@' (num >tok %parse_x_offset) ',' (num >tok %parse_y_offset ); +advances= '+' (num >tok %parse_x_advance) (',' (num >tok %parse_y_advance))?; +item = + ( + glyph + cluster? + offsets? + advances? + ) + >clear_item + %add_item + ; + +main := space* item (space* '|' space* item)* space* ('|'|']')?; + +}%% + +static hb_bool_t +_hb_buffer_deserialize_glyphs_text (hb_buffer_t *buffer, + const char *buf, + unsigned int buf_len, + const char **end_ptr, + hb_font_t *font) +{ + const char *p = buf, *pe = buf + buf_len; + + /* Ensure we have positions. */ + (void) hb_buffer_get_glyph_positions (buffer, NULL); + + while (p < pe && ISSPACE (*p)) + p++; + if (p < pe && *p == (buffer->len ? '|' : '[')) + { + *end_ptr = ++p; + } + + const char *eof = pe, *tok = NULL; + int cs; + hb_glyph_info_t info = {0}; + hb_glyph_position_t pos = {0}; + %%{ + write init; + write exec; + }%% + + *end_ptr = p; + + return p == pe && *(p-1) != ']'; +} + +#endif /* HB_BUFFER_DESERIALIZE_TEXT_HH */ diff --git a/src/hb-buffer-private.hh b/src/hb-buffer-private.hh new file mode 100644 index 0000000..bca308d --- /dev/null +++ b/src/hb-buffer-private.hh @@ -0,0 +1,296 @@ +/* + * Copyright © 1998-2004 David Turner and Werner Lemberg + * Copyright © 2004,2007,2009,2010 Red Hat, Inc. + * Copyright © 2011,2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Owen Taylor, Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_BUFFER_PRIVATE_HH +#define HB_BUFFER_PRIVATE_HH + +#include "hb-private.hh" +#include "hb-object-private.hh" +#include "hb-unicode-private.hh" + + +#ifndef HB_BUFFER_MAX_EXPANSION_FACTOR +#define HB_BUFFER_MAX_EXPANSION_FACTOR 32 +#endif +#ifndef HB_BUFFER_MAX_LEN_MIN +#define HB_BUFFER_MAX_LEN_MIN 8192 +#endif +#ifndef HB_BUFFER_MAX_LEN_DEFAULT +#define HB_BUFFER_MAX_LEN_DEFAULT 0x3FFFFFFF /* Shaping more than a billion chars? Let us know! */ +#endif + +ASSERT_STATIC (sizeof (hb_glyph_info_t) == 20); +ASSERT_STATIC (sizeof (hb_glyph_info_t) == sizeof (hb_glyph_position_t)); + +HB_MARK_AS_FLAG_T (hb_buffer_flags_t); +HB_MARK_AS_FLAG_T (hb_buffer_serialize_flags_t); + +enum hb_buffer_scratch_flags_t { + HB_BUFFER_SCRATCH_FLAG_DEFAULT = 0x00000000u, + HB_BUFFER_SCRATCH_FLAG_HAS_NON_ASCII = 0x00000001u, + HB_BUFFER_SCRATCH_FLAG_HAS_DEFAULT_IGNORABLES = 0x00000002u, + HB_BUFFER_SCRATCH_FLAG_HAS_SPACE_FALLBACK = 0x00000004u, + HB_BUFFER_SCRATCH_FLAG_HAS_GPOS_ATTACHMENT = 0x00000008u, + /* Reserved for complex shapers' internal use. */ + HB_BUFFER_SCRATCH_FLAG_COMPLEX0 = 0x01000000u, + HB_BUFFER_SCRATCH_FLAG_COMPLEX1 = 0x02000000u, + HB_BUFFER_SCRATCH_FLAG_COMPLEX2 = 0x04000000u, + HB_BUFFER_SCRATCH_FLAG_COMPLEX3 = 0x08000000u, +}; +HB_MARK_AS_FLAG_T (hb_buffer_scratch_flags_t); + + +/* + * hb_buffer_t + */ + +struct hb_buffer_t { + hb_object_header_t header; + ASSERT_POD (); + + /* Information about how the text in the buffer should be treated */ + hb_unicode_funcs_t *unicode; /* Unicode functions */ + hb_buffer_flags_t flags; /* BOT / EOT / etc. */ + hb_buffer_cluster_level_t cluster_level; + hb_codepoint_t replacement; /* U+FFFD or something else. */ + hb_buffer_scratch_flags_t scratch_flags; /* Have space-flallback, etc. */ + unsigned int max_len; /* Maximum allowed len. */ + + /* Buffer contents */ + hb_buffer_content_type_t content_type; + hb_segment_properties_t props; /* Script, language, direction */ + + bool in_error; /* Allocation failed */ + bool have_output; /* Whether we have an output buffer going on */ + bool have_positions; /* Whether we have positions */ + + unsigned int idx; /* Cursor into ->info and ->pos arrays */ + unsigned int len; /* Length of ->info and ->pos arrays */ + unsigned int out_len; /* Length of ->out array if have_output */ + + unsigned int allocated; /* Length of allocated arrays */ + hb_glyph_info_t *info; + hb_glyph_info_t *out_info; + hb_glyph_position_t *pos; + + inline hb_glyph_info_t &cur (unsigned int i = 0) { return info[idx + i]; } + inline hb_glyph_info_t cur (unsigned int i = 0) const { return info[idx + i]; } + + inline hb_glyph_position_t &cur_pos (unsigned int i = 0) { return pos[idx + i]; } + inline hb_glyph_position_t cur_pos (unsigned int i = 0) const { return pos[idx + i]; } + + inline hb_glyph_info_t &prev (void) { return out_info[out_len ? out_len - 1 : 0]; } + inline hb_glyph_info_t prev (void) const { return out_info[out_len ? out_len - 1 : 0]; } + + inline bool has_separate_output (void) const { return info != out_info; } + + unsigned int serial; + + /* Text before / after the main buffer contents. + * Always in Unicode, and ordered outward. + * Index 0 is for "pre-context", 1 for "post-context". */ + static const unsigned int CONTEXT_LENGTH = 5; + hb_codepoint_t context[2][CONTEXT_LENGTH]; + unsigned int context_len[2]; + + /* Debugging API */ + hb_buffer_message_func_t message_func; + void *message_data; + hb_destroy_func_t message_destroy; + + /* Internal debugging. */ + /* The bits here reflect current allocations of the bytes in glyph_info_t's var1 and var2. */ +#ifndef HB_NDEBUG + uint8_t allocated_var_bits; +#endif + inline void allocate_var (unsigned int start, unsigned int count) + { +#ifndef HB_NDEBUG + unsigned int end = start + count; + assert (end <= 8); + unsigned int bits = (1u<func (offsetof (hb_glyph_info_t, var) - offsetof(hb_glyph_info_t, var1), \ + sizeof (b->info[0].var)) +#define HB_BUFFER_ALLOCATE_VAR(b, var) HB_BUFFER_XALLOCATE_VAR (b, allocate_var, var ()) +#define HB_BUFFER_DEALLOCATE_VAR(b, var) HB_BUFFER_XALLOCATE_VAR (b, deallocate_var, var ()) +#define HB_BUFFER_ASSERT_VAR(b, var) HB_BUFFER_XALLOCATE_VAR (b, assert_var, var ()) + + +#endif /* HB_BUFFER_PRIVATE_HH */ diff --git a/src/hb-buffer-serialize.cc b/src/hb-buffer-serialize.cc new file mode 100644 index 0000000..63a0f34 --- /dev/null +++ b/src/hb-buffer-serialize.cc @@ -0,0 +1,454 @@ +/* + * Copyright © 2012,2013 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#include "hb-buffer-private.hh" + + +static const char *serialize_formats[] = { + "text", + "json", + NULL +}; + +/** + * hb_buffer_serialize_list_formats: + * + * Returns a list of supported buffer serialization formats. + * + * Return value: (transfer none): + * A string array of buffer serialization formats. Should not be freed. + * + * Since: 0.9.7 + **/ +const char ** +hb_buffer_serialize_list_formats (void) +{ + return serialize_formats; +} + +/** + * hb_buffer_serialize_format_from_string: + * @str: (array length=len) (element-type uint8_t): a string to parse + * @len: length of @str, or -1 if string is %NULL terminated + * + * Parses a string into an #hb_buffer_serialize_format_t. Does not check if + * @str is a valid buffer serialization format, use + * hb_buffer_serialize_list_formats() to get the list of supported formats. + * + * Return value: + * The parsed #hb_buffer_serialize_format_t. + * + * Since: 0.9.7 + **/ +hb_buffer_serialize_format_t +hb_buffer_serialize_format_from_string (const char *str, int len) +{ + /* Upper-case it. */ + return (hb_buffer_serialize_format_t) (hb_tag_from_string (str, len) & ~0x20202020u); +} + +/** + * hb_buffer_serialize_format_to_string: + * @format: an #hb_buffer_serialize_format_t to convert. + * + * Converts @format to the string corresponding it, or %NULL if it is not a valid + * #hb_buffer_serialize_format_t. + * + * Return value: (transfer none): + * A %NULL terminated string corresponding to @format. Should not be freed. + * + * Since: 0.9.7 + **/ +const char * +hb_buffer_serialize_format_to_string (hb_buffer_serialize_format_t format) +{ + switch (format) + { + case HB_BUFFER_SERIALIZE_FORMAT_TEXT: return serialize_formats[0]; + case HB_BUFFER_SERIALIZE_FORMAT_JSON: return serialize_formats[1]; + default: + case HB_BUFFER_SERIALIZE_FORMAT_INVALID: return NULL; + } +} + +static unsigned int +_hb_buffer_serialize_glyphs_json (hb_buffer_t *buffer, + unsigned int start, + unsigned int end, + char *buf, + unsigned int buf_size, + unsigned int *buf_consumed, + hb_font_t *font, + hb_buffer_serialize_flags_t flags) +{ + hb_glyph_info_t *info = hb_buffer_get_glyph_infos (buffer, NULL); + hb_glyph_position_t *pos = (flags & HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS) ? + NULL : hb_buffer_get_glyph_positions (buffer, NULL); + + *buf_consumed = 0; + for (unsigned int i = start; i < end; i++) + { + char b[1024]; + char *p = b; + + /* In the following code, we know b is large enough that no overflow can happen. */ + +#define APPEND(s) HB_STMT_START { strcpy (p, s); p += strlen (s); } HB_STMT_END + + if (i) + *p++ = ','; + + *p++ = '{'; + + APPEND ("\"g\":"); + if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_GLYPH_NAMES)) + { + char g[128]; + hb_font_glyph_to_string (font, info[i].codepoint, g, sizeof (g)); + *p++ = '"'; + for (char *q = g; *q; q++) { + if (*q == '"') + *p++ = '\\'; + *p++ = *q; + } + *p++ = '"'; + } + else + p += MAX (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), "%u", info[i].codepoint)); + + if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS)) { + p += MAX (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), ",\"cl\":%u", info[i].cluster)); + } + + if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS)) + { + p += snprintf (p, ARRAY_LENGTH (b) - (p - b), ",\"dx\":%d,\"dy\":%d", + pos[i].x_offset, pos[i].y_offset); + p += snprintf (p, ARRAY_LENGTH (b) - (p - b), ",\"ax\":%d,\"ay\":%d", + pos[i].x_advance, pos[i].y_advance); + } + + if (flags & HB_BUFFER_SERIALIZE_FLAG_GLYPH_EXTENTS) + { + hb_glyph_extents_t extents; + hb_font_get_glyph_extents(font, info[i].codepoint, &extents); + p += MAX (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), ",\"xb\":%d,\"yb\":%d", + extents.x_bearing, extents.y_bearing)); + p += MAX (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), ",\"w\":%d,\"h\":%d", + extents.width, extents.height)); + } + + *p++ = '}'; + + unsigned int l = p - b; + if (buf_size > l) + { + memcpy (buf, b, l); + buf += l; + buf_size -= l; + *buf_consumed += l; + *buf = '\0'; + } else + return i - start; + } + + return end - start; +} + +static unsigned int +_hb_buffer_serialize_glyphs_text (hb_buffer_t *buffer, + unsigned int start, + unsigned int end, + char *buf, + unsigned int buf_size, + unsigned int *buf_consumed, + hb_font_t *font, + hb_buffer_serialize_flags_t flags) +{ + hb_glyph_info_t *info = hb_buffer_get_glyph_infos (buffer, NULL); + hb_glyph_position_t *pos = (flags & HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS) ? + NULL : hb_buffer_get_glyph_positions (buffer, NULL); + + *buf_consumed = 0; + for (unsigned int i = start; i < end; i++) + { + char b[1024]; + char *p = b; + + /* In the following code, we know b is large enough that no overflow can happen. */ + + if (i) + *p++ = '|'; + + if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_GLYPH_NAMES)) + { + hb_font_glyph_to_string (font, info[i].codepoint, p, 128); + p += strlen (p); + } + else + p += MAX (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), "%u", info[i].codepoint)); + + if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS)) { + p += MAX (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), "=%u", info[i].cluster)); + } + + if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS)) + { + if (pos[i].x_offset || pos[i].y_offset) + p += MAX (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), "@%d,%d", pos[i].x_offset, pos[i].y_offset)); + + *p++ = '+'; + p += MAX (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), "%d", pos[i].x_advance)); + if (pos[i].y_advance) + p += MAX (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), ",%d", pos[i].y_advance)); + } + + if (flags & HB_BUFFER_SERIALIZE_FLAG_GLYPH_EXTENTS) + { + hb_glyph_extents_t extents; + hb_font_get_glyph_extents(font, info[i].codepoint, &extents); + p += MAX (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), "<%d,%d,%d,%d>", extents.x_bearing, extents.y_bearing, extents.width, extents.height)); + } + + unsigned int l = p - b; + if (buf_size > l) + { + memcpy (buf, b, l); + buf += l; + buf_size -= l; + *buf_consumed += l; + *buf = '\0'; + } else + return i - start; + } + + return end - start; +} + +/** + * hb_buffer_serialize_glyphs: + * @buffer: an #hb_buffer_t buffer. + * @start: the first item in @buffer to serialize. + * @end: the last item in @buffer to serialize. + * @buf: (out) (array length=buf_size) (element-type uint8_t): output string to + * write serialized buffer into. + * @buf_size: the size of @buf. + * @buf_consumed: (out) (allow-none): if not %NULL, will be set to the number of byes written into @buf. + * @font: (allow-none): the #hb_font_t used to shape this buffer, needed to + * read glyph names and extents. If %NULL, and empty font will be used. + * @format: the #hb_buffer_serialize_format_t to use for formatting the output. + * @flags: the #hb_buffer_serialize_flags_t that control what glyph properties + * to serialize. + * + * Serializes @buffer into a textual representation of its glyph content, + * useful for showing the contents of the buffer, for example during debugging. + * There are currently two supported serialization formats: + * + * ## text + * A human-readable, plain text format. + * The serialized glyphs will look something like: + * + * ``` + * [uni0651=0@518,0+0|uni0628=0+1897] + * ``` + * - The serialized glyphs are delimited with `[` and `]`. + * - Glyphs are separated with `|` + * - Each glyph starts with glyph name, or glyph index if + * #HB_BUFFER_SERIALIZE_FLAG_NO_GLYPH_NAMES flag is set. Then, + * - If #HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS is not set, `=` then #hb_glyph_info_t.cluster. + * - If #HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS is not set, the #hb_glyph_position_t in the format: + * - If both #hb_glyph_position_t.x_offset and #hb_glyph_position_t.y_offset are not 0, `@x_offset,y_offset`. Then, + * - `+x_advance`, then `,y_advance` if #hb_glyph_position_t.y_advance is not 0. Then, + * - If #HB_BUFFER_SERIALIZE_FLAG_GLYPH_EXTENTS is set, the + * #hb_glyph_extents_t in the format + * `<x_bearing,y_bearing,width,height>` + * + * ## json + * TODO. + * + * Return value: + * The number of serialized items. + * + * Since: 0.9.7 + **/ +unsigned int +hb_buffer_serialize_glyphs (hb_buffer_t *buffer, + unsigned int start, + unsigned int end, + char *buf, + unsigned int buf_size, + unsigned int *buf_consumed, + hb_font_t *font, + hb_buffer_serialize_format_t format, + hb_buffer_serialize_flags_t flags) +{ + assert (start <= end && end <= buffer->len); + + unsigned int sconsumed; + if (!buf_consumed) + buf_consumed = &sconsumed; + *buf_consumed = 0; + + assert ((!buffer->len && buffer->content_type == HB_BUFFER_CONTENT_TYPE_INVALID) || + buffer->content_type == HB_BUFFER_CONTENT_TYPE_GLYPHS); + + if (!buffer->have_positions) + flags |= HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS; + + if (unlikely (start == end)) + return 0; + + if (!font) + font = hb_font_get_empty (); + + switch (format) + { + case HB_BUFFER_SERIALIZE_FORMAT_TEXT: + return _hb_buffer_serialize_glyphs_text (buffer, start, end, + buf, buf_size, buf_consumed, + font, flags); + + case HB_BUFFER_SERIALIZE_FORMAT_JSON: + return _hb_buffer_serialize_glyphs_json (buffer, start, end, + buf, buf_size, buf_consumed, + font, flags); + + default: + case HB_BUFFER_SERIALIZE_FORMAT_INVALID: + return 0; + + } +} + + +static hb_bool_t +parse_uint (const char *pp, const char *end, uint32_t *pv) +{ + char buf[32]; + unsigned int len = MIN (ARRAY_LENGTH (buf) - 1, (unsigned int) (end - pp)); + strncpy (buf, pp, len); + buf[len] = '\0'; + + char *p = buf; + char *pend = p; + uint32_t v; + + errno = 0; + v = strtol (p, &pend, 10); + if (errno || p == pend || pend - p != end - pp) + return false; + + *pv = v; + return true; +} + +static hb_bool_t +parse_int (const char *pp, const char *end, int32_t *pv) +{ + char buf[32]; + unsigned int len = MIN (ARRAY_LENGTH (buf) - 1, (unsigned int) (end - pp)); + strncpy (buf, pp, len); + buf[len] = '\0'; + + char *p = buf; + char *pend = p; + int32_t v; + + errno = 0; + v = strtol (p, &pend, 10); + if (errno || p == pend || pend - p != end - pp) + return false; + + *pv = v; + return true; +} + +#include "hb-buffer-deserialize-json.hh" +#include "hb-buffer-deserialize-text.hh" + +/** + * hb_buffer_deserialize_glyphs: + * @buffer: an #hb_buffer_t buffer. + * @buf: (array length=buf_len): + * @buf_len: + * @end_ptr: (out): + * @font: + * @format: + * + * + * + * Return value: + * + * Since: 0.9.7 + **/ +hb_bool_t +hb_buffer_deserialize_glyphs (hb_buffer_t *buffer, + const char *buf, + int buf_len, /* -1 means nul-terminated */ + const char **end_ptr, /* May be NULL */ + hb_font_t *font, /* May be NULL */ + hb_buffer_serialize_format_t format) +{ + const char *end; + if (!end_ptr) + end_ptr = &end; + *end_ptr = buf; + + assert ((!buffer->len && buffer->content_type == HB_BUFFER_CONTENT_TYPE_INVALID) || + buffer->content_type == HB_BUFFER_CONTENT_TYPE_GLYPHS); + + if (buf_len == -1) + buf_len = strlen (buf); + + if (!buf_len) + { + *end_ptr = buf; + return false; + } + + hb_buffer_set_content_type (buffer, HB_BUFFER_CONTENT_TYPE_GLYPHS); + + if (!font) + font = hb_font_get_empty (); + + switch (format) + { + case HB_BUFFER_SERIALIZE_FORMAT_TEXT: + return _hb_buffer_deserialize_glyphs_text (buffer, + buf, buf_len, end_ptr, + font); + + case HB_BUFFER_SERIALIZE_FORMAT_JSON: + return _hb_buffer_deserialize_glyphs_json (buffer, + buf, buf_len, end_ptr, + font); + + default: + case HB_BUFFER_SERIALIZE_FORMAT_INVALID: + return false; + + } +} diff --git a/src/hb-buffer.cc b/src/hb-buffer.cc new file mode 100644 index 0000000..3940a3d --- /dev/null +++ b/src/hb-buffer.cc @@ -0,0 +1,1818 @@ +/* + * Copyright © 1998-2004 David Turner and Werner Lemberg + * Copyright © 2004,2007,2009,2010 Red Hat, Inc. + * Copyright © 2011,2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Owen Taylor, Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#include "hb-buffer-private.hh" +#include "hb-utf-private.hh" + + +#ifndef HB_DEBUG_BUFFER +#define HB_DEBUG_BUFFER (HB_DEBUG+0) +#endif + +/** + * SECTION: hb-buffer + * @title: Buffers + * @short_description: Input and output buffers + * @include: hb.h + * + * Buffers serve dual role in HarfBuzz; they hold the input characters that are + * passed hb_shape(), and after shaping they hold the output glyphs. + **/ + +/** + * hb_segment_properties_equal: + * @a: first #hb_segment_properties_t to compare. + * @b: second #hb_segment_properties_t to compare. + * + * Checks the equality of two #hb_segment_properties_t's. + * + * Return value: + * %true if all properties of @a equal those of @b, false otherwise. + * + * Since: 0.9.7 + **/ +hb_bool_t +hb_segment_properties_equal (const hb_segment_properties_t *a, + const hb_segment_properties_t *b) +{ + return a->direction == b->direction && + a->script == b->script && + a->language == b->language && + a->reserved1 == b->reserved1 && + a->reserved2 == b->reserved2; + +} + +/** + * hb_segment_properties_hash: + * @p: #hb_segment_properties_t to hash. + * + * Creates a hash representing @p. + * + * Return value: + * A hash of @p. + * + * Since: 0.9.7 + **/ +unsigned int +hb_segment_properties_hash (const hb_segment_properties_t *p) +{ + return (unsigned int) p->direction ^ + (unsigned int) p->script ^ + (intptr_t) (p->language); +} + + + +/* Here is how the buffer works internally: + * + * There are two info pointers: info and out_info. They always have + * the same allocated size, but different lengths. + * + * As an optimization, both info and out_info may point to the + * same piece of memory, which is owned by info. This remains the + * case as long as out_len doesn't exceed i at any time. + * In that case, swap_buffers() is no-op and the glyph operations operate + * mostly in-place. + * + * As soon as out_info gets longer than info, out_info is moved over + * to an alternate buffer (which we reuse the pos buffer for!), and its + * current contents (out_len entries) are copied to the new place. + * This should all remain transparent to the user. swap_buffers() then + * switches info and out_info. + */ + + + +/* Internal API */ + +bool +hb_buffer_t::enlarge (unsigned int size) +{ + if (unlikely (in_error)) + return false; + if (unlikely (size > max_len)) + { + in_error = true; + return false; + } + + unsigned int new_allocated = allocated; + hb_glyph_position_t *new_pos = NULL; + hb_glyph_info_t *new_info = NULL; + bool separate_out = out_info != info; + + if (unlikely (_hb_unsigned_int_mul_overflows (size, sizeof (info[0])))) + goto done; + + while (size >= new_allocated) + new_allocated += (new_allocated >> 1) + 32; + + ASSERT_STATIC (sizeof (info[0]) == sizeof (pos[0])); + if (unlikely (_hb_unsigned_int_mul_overflows (new_allocated, sizeof (info[0])))) + goto done; + + new_pos = (hb_glyph_position_t *) realloc (pos, new_allocated * sizeof (pos[0])); + new_info = (hb_glyph_info_t *) realloc (info, new_allocated * sizeof (info[0])); + +done: + if (unlikely (!new_pos || !new_info)) + in_error = true; + + if (likely (new_pos)) + pos = new_pos; + + if (likely (new_info)) + info = new_info; + + out_info = separate_out ? (hb_glyph_info_t *) pos : info; + if (likely (!in_error)) + allocated = new_allocated; + + return likely (!in_error); +} + +bool +hb_buffer_t::make_room_for (unsigned int num_in, + unsigned int num_out) +{ + if (unlikely (!ensure (out_len + num_out))) return false; + + if (out_info == info && + out_len + num_out > idx + num_in) + { + assert (have_output); + + out_info = (hb_glyph_info_t *) pos; + memcpy (out_info, info, out_len * sizeof (out_info[0])); + } + + return true; +} + +bool +hb_buffer_t::shift_forward (unsigned int count) +{ + assert (have_output); + if (unlikely (!ensure (len + count))) return false; + + memmove (info + idx + count, info + idx, (len - idx) * sizeof (info[0])); + if (idx + count > len) + { + /* Under memory failure we might expose this area. At least + * clean it up. Oh well... */ + memset (info + len, 0, (idx + count - len) * sizeof (info[0])); + } + len += count; + idx += count; + + return true; +} + +hb_buffer_t::scratch_buffer_t * +hb_buffer_t::get_scratch_buffer (unsigned int *size) +{ + have_output = false; + have_positions = false; + + out_len = 0; + out_info = info; + + assert ((uintptr_t) pos % sizeof (scratch_buffer_t) == 0); + *size = allocated * sizeof (pos[0]) / sizeof (scratch_buffer_t); + return (scratch_buffer_t *) (void *) pos; +} + + + +/* HarfBuzz-Internal API */ + +void +hb_buffer_t::reset (void) +{ + if (unlikely (hb_object_is_inert (this))) + return; + + hb_unicode_funcs_destroy (unicode); + unicode = hb_unicode_funcs_get_default (); + flags = HB_BUFFER_FLAG_DEFAULT; + replacement = HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT; + + clear (); +} + +void +hb_buffer_t::clear (void) +{ + if (unlikely (hb_object_is_inert (this))) + return; + + hb_segment_properties_t default_props = HB_SEGMENT_PROPERTIES_DEFAULT; + props = default_props; + scratch_flags = HB_BUFFER_SCRATCH_FLAG_DEFAULT; + + content_type = HB_BUFFER_CONTENT_TYPE_INVALID; + in_error = false; + have_output = false; + have_positions = false; + + idx = 0; + len = 0; + out_len = 0; + out_info = info; + + serial = 0; + + memset (context, 0, sizeof context); + memset (context_len, 0, sizeof context_len); + + deallocate_var_all (); +} + +void +hb_buffer_t::add (hb_codepoint_t codepoint, + unsigned int cluster) +{ + hb_glyph_info_t *glyph; + + if (unlikely (!ensure (len + 1))) return; + + glyph = &info[len]; + + memset (glyph, 0, sizeof (*glyph)); + glyph->codepoint = codepoint; + glyph->mask = 1; + glyph->cluster = cluster; + + len++; +} + +void +hb_buffer_t::add_info (const hb_glyph_info_t &glyph_info) +{ + if (unlikely (!ensure (len + 1))) return; + + info[len] = glyph_info; + + len++; +} + + +void +hb_buffer_t::remove_output (void) +{ + if (unlikely (hb_object_is_inert (this))) + return; + + have_output = false; + have_positions = false; + + out_len = 0; + out_info = info; +} + +void +hb_buffer_t::clear_output (void) +{ + if (unlikely (hb_object_is_inert (this))) + return; + + have_output = true; + have_positions = false; + + out_len = 0; + out_info = info; +} + +void +hb_buffer_t::clear_positions (void) +{ + if (unlikely (hb_object_is_inert (this))) + return; + + have_output = false; + have_positions = true; + + out_len = 0; + out_info = info; + + memset (pos, 0, sizeof (pos[0]) * len); +} + +void +hb_buffer_t::swap_buffers (void) +{ + if (unlikely (in_error)) return; + + assert (have_output); + have_output = false; + + if (out_info != info) + { + hb_glyph_info_t *tmp_string; + tmp_string = info; + info = out_info; + out_info = tmp_string; + pos = (hb_glyph_position_t *) out_info; + } + + unsigned int tmp; + tmp = len; + len = out_len; + out_len = tmp; + + idx = 0; +} + + +void +hb_buffer_t::replace_glyphs (unsigned int num_in, + unsigned int num_out, + const uint32_t *glyph_data) +{ + if (unlikely (!make_room_for (num_in, num_out))) return; + + merge_clusters (idx, idx + num_in); + + hb_glyph_info_t orig_info = info[idx]; + hb_glyph_info_t *pinfo = &out_info[out_len]; + for (unsigned int i = 0; i < num_out; i++) + { + *pinfo = orig_info; + pinfo->codepoint = glyph_data[i]; + pinfo++; + } + + idx += num_in; + out_len += num_out; +} + +void +hb_buffer_t::output_glyph (hb_codepoint_t glyph_index) +{ + if (unlikely (!make_room_for (0, 1))) return; + + out_info[out_len] = info[idx]; + out_info[out_len].codepoint = glyph_index; + + out_len++; +} + +void +hb_buffer_t::output_info (const hb_glyph_info_t &glyph_info) +{ + if (unlikely (!make_room_for (0, 1))) return; + + out_info[out_len] = glyph_info; + + out_len++; +} + +void +hb_buffer_t::copy_glyph (void) +{ + if (unlikely (!make_room_for (0, 1))) return; + + out_info[out_len] = info[idx]; + + out_len++; +} + +bool +hb_buffer_t::move_to (unsigned int i) +{ + if (!have_output) + { + assert (i <= len); + idx = i; + return true; + } + if (unlikely (in_error)) + return false; + + assert (i <= out_len + (len - idx)); + + if (out_len < i) + { + unsigned int count = i - out_len; + if (unlikely (!make_room_for (count, count))) return false; + + memmove (out_info + out_len, info + idx, count * sizeof (out_info[0])); + idx += count; + out_len += count; + } + else if (out_len > i) + { + /* Tricky part: rewinding... */ + unsigned int count = out_len - i; + + /* This will blow in our face if memory allocation fails later + * in this same lookup... */ + if (unlikely (idx < count && !shift_forward (count + 32))) return false; + + assert (idx >= count); + + idx -= count; + out_len -= count; + memmove (info + idx, out_info + out_len, count * sizeof (out_info[0])); + } + + return true; +} + +void +hb_buffer_t::replace_glyph (hb_codepoint_t glyph_index) +{ + if (unlikely (out_info != info || out_len != idx)) { + if (unlikely (!make_room_for (1, 1))) return; + out_info[out_len] = info[idx]; + } + out_info[out_len].codepoint = glyph_index; + + idx++; + out_len++; +} + + +void +hb_buffer_t::set_masks (hb_mask_t value, + hb_mask_t mask, + unsigned int cluster_start, + unsigned int cluster_end) +{ + hb_mask_t not_mask = ~mask; + value &= mask; + + if (!mask) + return; + + if (cluster_start == 0 && cluster_end == (unsigned int)-1) { + unsigned int count = len; + for (unsigned int i = 0; i < count; i++) + info[i].mask = (info[i].mask & not_mask) | value; + return; + } + + unsigned int count = len; + for (unsigned int i = 0; i < count; i++) + if (cluster_start <= info[i].cluster && info[i].cluster < cluster_end) + info[i].mask = (info[i].mask & not_mask) | value; +} + +void +hb_buffer_t::reverse_range (unsigned int start, + unsigned int end) +{ + unsigned int i, j; + + if (end - start < 2) + return; + + for (i = start, j = end - 1; i < j; i++, j--) { + hb_glyph_info_t t; + + t = info[i]; + info[i] = info[j]; + info[j] = t; + } + + if (have_positions) { + for (i = start, j = end - 1; i < j; i++, j--) { + hb_glyph_position_t t; + + t = pos[i]; + pos[i] = pos[j]; + pos[j] = t; + } + } +} + +void +hb_buffer_t::reverse (void) +{ + if (unlikely (!len)) + return; + + reverse_range (0, len); +} + +void +hb_buffer_t::reverse_clusters (void) +{ + unsigned int i, start, count, last_cluster; + + if (unlikely (!len)) + return; + + reverse (); + + count = len; + start = 0; + last_cluster = info[0].cluster; + for (i = 1; i < count; i++) { + if (last_cluster != info[i].cluster) { + reverse_range (start, i); + start = i; + last_cluster = info[i].cluster; + } + } + reverse_range (start, i); +} + +void +hb_buffer_t::merge_clusters_impl (unsigned int start, + unsigned int end) +{ + if (cluster_level == HB_BUFFER_CLUSTER_LEVEL_CHARACTERS) + return; + + unsigned int cluster = info[start].cluster; + + for (unsigned int i = start + 1; i < end; i++) + cluster = MIN (cluster, info[i].cluster); + + /* Extend end */ + while (end < len && info[end - 1].cluster == info[end].cluster) + end++; + + /* Extend start */ + while (idx < start && info[start - 1].cluster == info[start].cluster) + start--; + + /* If we hit the start of buffer, continue in out-buffer. */ + if (idx == start) + for (unsigned int i = out_len; i && out_info[i - 1].cluster == info[start].cluster; i--) + out_info[i - 1].cluster = cluster; + + for (unsigned int i = start; i < end; i++) + info[i].cluster = cluster; +} +void +hb_buffer_t::merge_out_clusters (unsigned int start, + unsigned int end) +{ + if (cluster_level == HB_BUFFER_CLUSTER_LEVEL_CHARACTERS) + return; + + if (unlikely (end - start < 2)) + return; + + unsigned int cluster = out_info[start].cluster; + + for (unsigned int i = start + 1; i < end; i++) + cluster = MIN (cluster, out_info[i].cluster); + + /* Extend start */ + while (start && out_info[start - 1].cluster == out_info[start].cluster) + start--; + + /* Extend end */ + while (end < out_len && out_info[end - 1].cluster == out_info[end].cluster) + end++; + + /* If we hit the end of out-buffer, continue in buffer. */ + if (end == out_len) + for (unsigned int i = idx; i < len && info[i].cluster == out_info[end - 1].cluster; i++) + info[i].cluster = cluster; + + for (unsigned int i = start; i < end; i++) + out_info[i].cluster = cluster; +} +void +hb_buffer_t::delete_glyph () +{ + unsigned int cluster = info[idx].cluster; + if (idx + 1 < len && cluster == info[idx + 1].cluster) + { + /* Cluster survives; do nothing. */ + goto done; + } + + if (out_len) + { + /* Merge cluster backward. */ + if (cluster < out_info[out_len - 1].cluster) + { + unsigned int old_cluster = out_info[out_len - 1].cluster; + for (unsigned i = out_len; i && out_info[i - 1].cluster == old_cluster; i--) + out_info[i - 1].cluster = cluster; + } + goto done; + } + + if (idx + 1 < len) + { + /* Merge cluster forward. */ + merge_clusters (idx, idx + 2); + goto done; + } + +done: + skip_glyph (); +} + +void +hb_buffer_t::guess_segment_properties (void) +{ + assert (content_type == HB_BUFFER_CONTENT_TYPE_UNICODE || + (!len && content_type == HB_BUFFER_CONTENT_TYPE_INVALID)); + + /* If script is set to INVALID, guess from buffer contents */ + if (props.script == HB_SCRIPT_INVALID) { + for (unsigned int i = 0; i < len; i++) { + hb_script_t script = unicode->script (info[i].codepoint); + if (likely (script != HB_SCRIPT_COMMON && + script != HB_SCRIPT_INHERITED && + script != HB_SCRIPT_UNKNOWN)) { + props.script = script; + break; + } + } + } + + /* If direction is set to INVALID, guess from script */ + if (props.direction == HB_DIRECTION_INVALID) { + props.direction = hb_script_get_horizontal_direction (props.script); + } + + /* If language is not set, use default language from locale */ + if (props.language == HB_LANGUAGE_INVALID) { + /* TODO get_default_for_script? using $LANGUAGE */ + props.language = hb_language_get_default (); + } +} + + +/* Public API */ + +/** + * hb_buffer_create: (Xconstructor) + * + * Creates a new #hb_buffer_t with all properties to defaults. + * + * Return value: (transfer full): + * A newly allocated #hb_buffer_t with a reference count of 1. The initial + * reference count should be released with hb_buffer_destroy() when you are done + * using the #hb_buffer_t. This function never returns %NULL. If memory cannot + * be allocated, a special #hb_buffer_t object will be returned on which + * hb_buffer_allocation_successful() returns %false. + * + * Since: 0.9.2 + **/ +hb_buffer_t * +hb_buffer_create (void) +{ + hb_buffer_t *buffer; + + if (!(buffer = hb_object_create ())) + return hb_buffer_get_empty (); + + buffer->max_len = HB_BUFFER_MAX_LEN_DEFAULT; + + buffer->reset (); + + return buffer; +} + +/** + * hb_buffer_get_empty: + * + * + * + * Return value: (transfer full): + * + * Since: 0.9.2 + **/ +hb_buffer_t * +hb_buffer_get_empty (void) +{ + static const hb_buffer_t _hb_buffer_nil = { + HB_OBJECT_HEADER_STATIC, + + const_cast (&_hb_unicode_funcs_nil), + HB_BUFFER_FLAG_DEFAULT, + HB_BUFFER_CLUSTER_LEVEL_DEFAULT, + HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT, + HB_BUFFER_SCRATCH_FLAG_DEFAULT, + HB_BUFFER_MAX_LEN_DEFAULT, + + HB_BUFFER_CONTENT_TYPE_INVALID, + HB_SEGMENT_PROPERTIES_DEFAULT, + true, /* in_error */ + true, /* have_output */ + true /* have_positions */ + + /* Zero is good enough for everything else. */ + }; + + return const_cast (&_hb_buffer_nil); +} + +/** + * hb_buffer_reference: (skip) + * @buffer: an #hb_buffer_t. + * + * Increases the reference count on @buffer by one. This prevents @buffer from + * being destroyed until a matching call to hb_buffer_destroy() is made. + * + * Return value: (transfer full): + * The referenced #hb_buffer_t. + * + * Since: 0.9.2 + **/ +hb_buffer_t * +hb_buffer_reference (hb_buffer_t *buffer) +{ + return hb_object_reference (buffer); +} + +/** + * hb_buffer_destroy: (skip) + * @buffer: an #hb_buffer_t. + * + * Deallocate the @buffer. + * Decreases the reference count on @buffer by one. If the result is zero, then + * @buffer and all associated resources are freed. See hb_buffer_reference(). + * + * Since: 0.9.2 + **/ +void +hb_buffer_destroy (hb_buffer_t *buffer) +{ + if (!hb_object_destroy (buffer)) return; + + hb_unicode_funcs_destroy (buffer->unicode); + + free (buffer->info); + free (buffer->pos); + if (buffer->message_destroy) + buffer->message_destroy (buffer->message_data); + + free (buffer); +} + +/** + * hb_buffer_set_user_data: (skip) + * @buffer: an #hb_buffer_t. + * @key: + * @data: + * @destroy: + * @replace: + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_buffer_set_user_data (hb_buffer_t *buffer, + hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace) +{ + return hb_object_set_user_data (buffer, key, data, destroy, replace); +} + +/** + * hb_buffer_get_user_data: (skip) + * @buffer: an #hb_buffer_t. + * @key: + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +void * +hb_buffer_get_user_data (hb_buffer_t *buffer, + hb_user_data_key_t *key) +{ + return hb_object_get_user_data (buffer, key); +} + + +/** + * hb_buffer_set_content_type: + * @buffer: an #hb_buffer_t. + * @content_type: the type of buffer contents to set + * + * Sets the type of @buffer contents, buffers are either empty, contain + * characters (before shaping) or glyphs (the result of shaping). + * + * Since: 0.9.5 + **/ +void +hb_buffer_set_content_type (hb_buffer_t *buffer, + hb_buffer_content_type_t content_type) +{ + buffer->content_type = content_type; +} + +/** + * hb_buffer_get_content_type: + * @buffer: an #hb_buffer_t. + * + * see hb_buffer_set_content_type(). + * + * Return value: + * The type of @buffer contents. + * + * Since: 0.9.5 + **/ +hb_buffer_content_type_t +hb_buffer_get_content_type (hb_buffer_t *buffer) +{ + return buffer->content_type; +} + + +/** + * hb_buffer_set_unicode_funcs: + * @buffer: an #hb_buffer_t. + * @unicode_funcs: + * + * + * + * Since: 0.9.2 + **/ +void +hb_buffer_set_unicode_funcs (hb_buffer_t *buffer, + hb_unicode_funcs_t *unicode_funcs) +{ + if (unlikely (hb_object_is_inert (buffer))) + return; + + if (!unicode_funcs) + unicode_funcs = hb_unicode_funcs_get_default (); + + + hb_unicode_funcs_reference (unicode_funcs); + hb_unicode_funcs_destroy (buffer->unicode); + buffer->unicode = unicode_funcs; +} + +/** + * hb_buffer_get_unicode_funcs: + * @buffer: an #hb_buffer_t. + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_unicode_funcs_t * +hb_buffer_get_unicode_funcs (hb_buffer_t *buffer) +{ + return buffer->unicode; +} + +/** + * hb_buffer_set_direction: + * @buffer: an #hb_buffer_t. + * @direction: the #hb_direction_t of the @buffer + * + * Set the text flow direction of the buffer. No shaping can happen without + * setting @buffer direction, and it controls the visual direction for the + * output glyphs; for RTL direction the glyphs will be reversed. Many layout + * features depend on the proper setting of the direction, for example, + * reversing RTL text before shaping, then shaping with LTR direction is not + * the same as keeping the text in logical order and shaping with RTL + * direction. + * + * Since: 0.9.2 + **/ +void +hb_buffer_set_direction (hb_buffer_t *buffer, + hb_direction_t direction) + +{ + if (unlikely (hb_object_is_inert (buffer))) + return; + + buffer->props.direction = direction; +} + +/** + * hb_buffer_get_direction: + * @buffer: an #hb_buffer_t. + * + * See hb_buffer_set_direction() + * + * Return value: + * The direction of the @buffer. + * + * Since: 0.9.2 + **/ +hb_direction_t +hb_buffer_get_direction (hb_buffer_t *buffer) +{ + return buffer->props.direction; +} + +/** + * hb_buffer_set_script: + * @buffer: an #hb_buffer_t. + * @script: an #hb_script_t to set. + * + * Sets the script of @buffer to @script. + * + * Script is crucial for choosing the proper shaping behaviour for scripts that + * require it (e.g. Arabic) and the which OpenType features defined in the font + * to be applied. + * + * You can pass one of the predefined #hb_script_t values, or use + * hb_script_from_string() or hb_script_from_iso15924_tag() to get the + * corresponding script from an ISO 15924 script tag. + * + * Since: 0.9.2 + **/ +void +hb_buffer_set_script (hb_buffer_t *buffer, + hb_script_t script) +{ + if (unlikely (hb_object_is_inert (buffer))) + return; + + buffer->props.script = script; +} + +/** + * hb_buffer_get_script: + * @buffer: an #hb_buffer_t. + * + * See hb_buffer_set_script(). + * + * Return value: + * The #hb_script_t of the @buffer. + * + * Since: 0.9.2 + **/ +hb_script_t +hb_buffer_get_script (hb_buffer_t *buffer) +{ + return buffer->props.script; +} + +/** + * hb_buffer_set_language: + * @buffer: an #hb_buffer_t. + * @language: an hb_language_t to set. + * + * Sets the language of @buffer to @language. + * + * Languages are crucial for selecting which OpenType feature to apply to the + * buffer which can result in applying language-specific behaviour. Languages + * are orthogonal to the scripts, and though they are related, they are + * different concepts and should not be confused with each other. + * + * Use hb_language_from_string() to convert from ISO 639 language codes to + * #hb_language_t. + * + * Since: 0.9.2 + **/ +void +hb_buffer_set_language (hb_buffer_t *buffer, + hb_language_t language) +{ + if (unlikely (hb_object_is_inert (buffer))) + return; + + buffer->props.language = language; +} + +/** + * hb_buffer_get_language: + * @buffer: an #hb_buffer_t. + * + * See hb_buffer_set_language(). + * + * Return value: (transfer none): + * The #hb_language_t of the buffer. Must not be freed by the caller. + * + * Since: 0.9.2 + **/ +hb_language_t +hb_buffer_get_language (hb_buffer_t *buffer) +{ + return buffer->props.language; +} + +/** + * hb_buffer_set_segment_properties: + * @buffer: an #hb_buffer_t. + * @props: an #hb_segment_properties_t to use. + * + * Sets the segment properties of the buffer, a shortcut for calling + * hb_buffer_set_direction(), hb_buffer_set_script() and + * hb_buffer_set_language() individually. + * + * Since: 0.9.7 + **/ +void +hb_buffer_set_segment_properties (hb_buffer_t *buffer, + const hb_segment_properties_t *props) +{ + if (unlikely (hb_object_is_inert (buffer))) + return; + + buffer->props = *props; +} + +/** + * hb_buffer_get_segment_properties: + * @buffer: an #hb_buffer_t. + * @props: (out): the output #hb_segment_properties_t. + * + * Sets @props to the #hb_segment_properties_t of @buffer. + * + * Since: 0.9.7 + **/ +void +hb_buffer_get_segment_properties (hb_buffer_t *buffer, + hb_segment_properties_t *props) +{ + *props = buffer->props; +} + + +/** + * hb_buffer_set_flags: + * @buffer: an #hb_buffer_t. + * @flags: the buffer flags to set. + * + * Sets @buffer flags to @flags. See #hb_buffer_flags_t. + * + * Since: 0.9.7 + **/ +void +hb_buffer_set_flags (hb_buffer_t *buffer, + hb_buffer_flags_t flags) +{ + if (unlikely (hb_object_is_inert (buffer))) + return; + + buffer->flags = flags; +} + +/** + * hb_buffer_get_flags: + * @buffer: an #hb_buffer_t. + * + * See hb_buffer_set_flags(). + * + * Return value: + * The @buffer flags. + * + * Since: 0.9.7 + **/ +hb_buffer_flags_t +hb_buffer_get_flags (hb_buffer_t *buffer) +{ + return buffer->flags; +} + +/** + * hb_buffer_set_cluster_level: + * @buffer: an #hb_buffer_t. + * @cluster_level: + * + * + * + * Since: 0.9.42 + **/ +void +hb_buffer_set_cluster_level (hb_buffer_t *buffer, + hb_buffer_cluster_level_t cluster_level) +{ + if (unlikely (hb_object_is_inert (buffer))) + return; + + buffer->cluster_level = cluster_level; +} + +/** + * hb_buffer_get_cluster_level: + * @buffer: an #hb_buffer_t. + * + * + * + * Return value: + * + * Since: 0.9.42 + **/ +hb_buffer_cluster_level_t +hb_buffer_get_cluster_level (hb_buffer_t *buffer) +{ + return buffer->cluster_level; +} + + +/** + * hb_buffer_set_replacement_codepoint: + * @buffer: an #hb_buffer_t. + * @replacement: the replacement #hb_codepoint_t + * + * Sets the #hb_codepoint_t that replaces invalid entries for a given encoding + * when adding text to @buffer. + * + * Default is %HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT. + * + * Since: 0.9.31 + **/ +void +hb_buffer_set_replacement_codepoint (hb_buffer_t *buffer, + hb_codepoint_t replacement) +{ + if (unlikely (hb_object_is_inert (buffer))) + return; + + buffer->replacement = replacement; +} + +/** + * hb_buffer_get_replacement_codepoint: + * @buffer: an #hb_buffer_t. + * + * See hb_buffer_set_replacement_codepoint(). + * + * Return value: + * The @buffer replacement #hb_codepoint_t. + * + * Since: 0.9.31 + **/ +hb_codepoint_t +hb_buffer_get_replacement_codepoint (hb_buffer_t *buffer) +{ + return buffer->replacement; +} + + +/** + * hb_buffer_reset: + * @buffer: an #hb_buffer_t. + * + * Resets the buffer to its initial status, as if it was just newly created + * with hb_buffer_create(). + * + * Since: 0.9.2 + **/ +void +hb_buffer_reset (hb_buffer_t *buffer) +{ + buffer->reset (); +} + +/** + * hb_buffer_clear_contents: + * @buffer: an #hb_buffer_t. + * + * Similar to hb_buffer_reset(), but does not clear the Unicode functions and + * the replacement code point. + * + * Since: 0.9.11 + **/ +void +hb_buffer_clear_contents (hb_buffer_t *buffer) +{ + buffer->clear (); +} + +/** + * hb_buffer_pre_allocate: + * @buffer: an #hb_buffer_t. + * @size: number of items to pre allocate. + * + * Pre allocates memory for @buffer to fit at least @size number of items. + * + * Return value: + * %true if @buffer memory allocation succeeded, %false otherwise. + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_buffer_pre_allocate (hb_buffer_t *buffer, unsigned int size) +{ + return buffer->ensure (size); +} + +/** + * hb_buffer_allocation_successful: + * @buffer: an #hb_buffer_t. + * + * Check if allocating memory for the buffer succeeded. + * + * Return value: + * %true if @buffer memory allocation succeeded, %false otherwise. + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_buffer_allocation_successful (hb_buffer_t *buffer) +{ + return !buffer->in_error; +} + +/** + * hb_buffer_add: + * @buffer: an #hb_buffer_t. + * @codepoint: a Unicode code point. + * @cluster: the cluster value of @codepoint. + * + * Appends a character with the Unicode value of @codepoint to @buffer, and + * gives it the initial cluster value of @cluster. Clusters can be any thing + * the client wants, they are usually used to refer to the index of the + * character in the input text stream and are output in + * #hb_glyph_info_t.cluster field. + * + * This function does not check the validity of @codepoint, it is up to the + * caller to ensure it is a valid Unicode code point. + * + * Since: 0.9.7 + **/ +void +hb_buffer_add (hb_buffer_t *buffer, + hb_codepoint_t codepoint, + unsigned int cluster) +{ + buffer->add (codepoint, cluster); + buffer->clear_context (1); +} + +/** + * hb_buffer_set_length: + * @buffer: an #hb_buffer_t. + * @length: the new length of @buffer. + * + * Similar to hb_buffer_pre_allocate(), but clears any new items added at the + * end. + * + * Return value: + * %true if @buffer memory allocation succeeded, %false otherwise. + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_buffer_set_length (hb_buffer_t *buffer, + unsigned int length) +{ + if (unlikely (hb_object_is_inert (buffer))) + return length == 0; + + if (!buffer->ensure (length)) + return false; + + /* Wipe the new space */ + if (length > buffer->len) { + memset (buffer->info + buffer->len, 0, sizeof (buffer->info[0]) * (length - buffer->len)); + if (buffer->have_positions) + memset (buffer->pos + buffer->len, 0, sizeof (buffer->pos[0]) * (length - buffer->len)); + } + + buffer->len = length; + + if (!length) + { + buffer->content_type = HB_BUFFER_CONTENT_TYPE_INVALID; + buffer->clear_context (0); + } + buffer->clear_context (1); + + return true; +} + +/** + * hb_buffer_get_length: + * @buffer: an #hb_buffer_t. + * + * Returns the number of items in the buffer. + * + * Return value: + * The @buffer length. + * The value valid as long as buffer has not been modified. + * + * Since: 0.9.2 + **/ +unsigned int +hb_buffer_get_length (hb_buffer_t *buffer) +{ + return buffer->len; +} + +/** + * hb_buffer_get_glyph_infos: + * @buffer: an #hb_buffer_t. + * @length: (out): output array length. + * + * Returns @buffer glyph information array. Returned pointer + * is valid as long as @buffer contents are not modified. + * + * Return value: (transfer none) (array length=length): + * The @buffer glyph information array. + * The value valid as long as buffer has not been modified. + * + * Since: 0.9.2 + **/ +hb_glyph_info_t * +hb_buffer_get_glyph_infos (hb_buffer_t *buffer, + unsigned int *length) +{ + if (length) + *length = buffer->len; + + return (hb_glyph_info_t *) buffer->info; +} + +/** + * hb_buffer_get_glyph_positions: + * @buffer: an #hb_buffer_t. + * @length: (out): output length. + * + * Returns @buffer glyph position array. Returned pointer + * is valid as long as @buffer contents are not modified. + * + * Return value: (transfer none) (array length=length): + * The @buffer glyph position array. + * The value valid as long as buffer has not been modified. + * + * Since: 0.9.2 + **/ +hb_glyph_position_t * +hb_buffer_get_glyph_positions (hb_buffer_t *buffer, + unsigned int *length) +{ + if (!buffer->have_positions) + buffer->clear_positions (); + + if (length) + *length = buffer->len; + + return (hb_glyph_position_t *) buffer->pos; +} + +/** + * hb_buffer_reverse: + * @buffer: an #hb_buffer_t. + * + * Reverses buffer contents. + * + * Since: 0.9.2 + **/ +void +hb_buffer_reverse (hb_buffer_t *buffer) +{ + buffer->reverse (); +} + +/** + * hb_buffer_reverse_range: + * @buffer: an #hb_buffer_t. + * @start: start index. + * @end: end index. + * + * Reverses buffer contents between start to end. + * + * Since: 0.9.41 + **/ +void +hb_buffer_reverse_range (hb_buffer_t *buffer, + unsigned int start, unsigned int end) +{ + buffer->reverse_range (start, end); +} + +/** + * hb_buffer_reverse_clusters: + * @buffer: an #hb_buffer_t. + * + * Reverses buffer clusters. That is, the buffer contents are + * reversed, then each cluster (consecutive items having the + * same cluster number) are reversed again. + * + * Since: 0.9.2 + **/ +void +hb_buffer_reverse_clusters (hb_buffer_t *buffer) +{ + buffer->reverse_clusters (); +} + +/** + * hb_buffer_guess_segment_properties: + * @buffer: an #hb_buffer_t. + * + * Sets unset buffer segment properties based on buffer Unicode + * contents. If buffer is not empty, it must have content type + * %HB_BUFFER_CONTENT_TYPE_UNICODE. + * + * If buffer script is not set (ie. is %HB_SCRIPT_INVALID), it + * will be set to the Unicode script of the first character in + * the buffer that has a script other than %HB_SCRIPT_COMMON, + * %HB_SCRIPT_INHERITED, and %HB_SCRIPT_UNKNOWN. + * + * Next, if buffer direction is not set (ie. is %HB_DIRECTION_INVALID), + * it will be set to the natural horizontal direction of the + * buffer script as returned by hb_script_get_horizontal_direction(). + * + * Finally, if buffer language is not set (ie. is %HB_LANGUAGE_INVALID), + * it will be set to the process's default language as returned by + * hb_language_get_default(). This may change in the future by + * taking buffer script into consideration when choosing a language. + * + * Since: 0.9.7 + **/ +void +hb_buffer_guess_segment_properties (hb_buffer_t *buffer) +{ + buffer->guess_segment_properties (); +} + +template +static inline void +hb_buffer_add_utf (hb_buffer_t *buffer, + const typename utf_t::codepoint_t *text, + int text_length, + unsigned int item_offset, + int item_length) +{ + typedef typename utf_t::codepoint_t T; + const hb_codepoint_t replacement = buffer->replacement; + + assert (buffer->content_type == HB_BUFFER_CONTENT_TYPE_UNICODE || + (!buffer->len && buffer->content_type == HB_BUFFER_CONTENT_TYPE_INVALID)); + + if (unlikely (hb_object_is_inert (buffer))) + return; + + if (text_length == -1) + text_length = utf_t::strlen (text); + + if (item_length == -1) + item_length = text_length - item_offset; + + buffer->ensure (buffer->len + item_length * sizeof (T) / 4); + + /* If buffer is empty and pre-context provided, install it. + * This check is written this way, to make sure people can + * provide pre-context in one add_utf() call, then provide + * text in a follow-up call. See: + * + * https://bugzilla.mozilla.org/show_bug.cgi?id=801410#c13 + */ + if (!buffer->len && item_offset > 0) + { + /* Add pre-context */ + buffer->clear_context (0); + const T *prev = text + item_offset; + const T *start = text; + while (start < prev && buffer->context_len[0] < buffer->CONTEXT_LENGTH) + { + hb_codepoint_t u; + prev = utf_t::prev (prev, start, &u, replacement); + buffer->context[0][buffer->context_len[0]++] = u; + } + } + + const T *next = text + item_offset; + const T *end = next + item_length; + while (next < end) + { + hb_codepoint_t u; + const T *old_next = next; + next = utf_t::next (next, end, &u, replacement); + buffer->add (u, old_next - (const T *) text); + } + + /* Add post-context */ + buffer->clear_context (1); + end = text + text_length; + while (next < end && buffer->context_len[1] < buffer->CONTEXT_LENGTH) + { + hb_codepoint_t u; + next = utf_t::next (next, end, &u, replacement); + buffer->context[1][buffer->context_len[1]++] = u; + } + + buffer->content_type = HB_BUFFER_CONTENT_TYPE_UNICODE; +} + +/** + * hb_buffer_add_utf8: + * @buffer: an #hb_buffer_t. + * @text: (array length=text_length) (element-type uint8_t): an array of UTF-8 + * characters to append. + * @text_length: the length of the @text, or -1 if it is %NULL terminated. + * @item_offset: the offset of the first character to add to the @buffer. + * @item_length: the number of characters to add to the @buffer, or -1 for the + * end of @text (assuming it is %NULL terminated). + * + * See hb_buffer_add_codepoints(). + * + * Replaces invalid UTF-8 characters with the @buffer replacement code point, + * see hb_buffer_set_replacement_codepoint(). + * + * Since: 0.9.2 + **/ +void +hb_buffer_add_utf8 (hb_buffer_t *buffer, + const char *text, + int text_length, + unsigned int item_offset, + int item_length) +{ + hb_buffer_add_utf (buffer, (const uint8_t *) text, text_length, item_offset, item_length); +} + +/** + * hb_buffer_add_utf16: + * @buffer: an #hb_buffer_t. + * @text: (array length=text_length): an array of UTF-16 characters to append. + * @text_length: the length of the @text, or -1 if it is %NULL terminated. + * @item_offset: the offset of the first character to add to the @buffer. + * @item_length: the number of characters to add to the @buffer, or -1 for the + * end of @text (assuming it is %NULL terminated). + * + * See hb_buffer_add_codepoints(). + * + * Replaces invalid UTF-16 characters with the @buffer replacement code point, + * see hb_buffer_set_replacement_codepoint(). + * + * Since: 0.9.2 + **/ +void +hb_buffer_add_utf16 (hb_buffer_t *buffer, + const uint16_t *text, + int text_length, + unsigned int item_offset, + int item_length) +{ + hb_buffer_add_utf (buffer, text, text_length, item_offset, item_length); +} + +/** + * hb_buffer_add_utf32: + * @buffer: an #hb_buffer_t. + * @text: (array length=text_length): an array of UTF-32 characters to append. + * @text_length: the length of the @text, or -1 if it is %NULL terminated. + * @item_offset: the offset of the first character to add to the @buffer. + * @item_length: the number of characters to add to the @buffer, or -1 for the + * end of @text (assuming it is %NULL terminated). + * + * See hb_buffer_add_codepoints(). + * + * Replaces invalid UTF-32 characters with the @buffer replacement code point, + * see hb_buffer_set_replacement_codepoint(). + * + * Since: 0.9.2 + **/ +void +hb_buffer_add_utf32 (hb_buffer_t *buffer, + const uint32_t *text, + int text_length, + unsigned int item_offset, + int item_length) +{ + hb_buffer_add_utf > (buffer, text, text_length, item_offset, item_length); +} + +/** + * hb_buffer_add_latin1: + * @buffer: an #hb_buffer_t. + * @text: (array length=text_length) (element-type uint8_t): an array of UTF-8 + * characters to append. + * @text_length: the length of the @text, or -1 if it is %NULL terminated. + * @item_offset: the offset of the first character to add to the @buffer. + * @item_length: the number of characters to add to the @buffer, or -1 for the + * end of @text (assuming it is %NULL terminated). + * + * Similar to hb_buffer_add_codepoints(), but allows only access to first 256 + * Unicode code points that can fit in 8-bit strings. + * + * Has nothing to do with non-Unicode Latin-1 encoding. + * + * Since: 0.9.39 + **/ +void +hb_buffer_add_latin1 (hb_buffer_t *buffer, + const uint8_t *text, + int text_length, + unsigned int item_offset, + int item_length) +{ + hb_buffer_add_utf (buffer, text, text_length, item_offset, item_length); +} + +/** + * hb_buffer_add_codepoints: + * @buffer: a #hb_buffer_t to append characters to. + * @text: (array length=text_length): an array of Unicode code points to append. + * @text_length: the length of the @text, or -1 if it is %NULL terminated. + * @item_offset: the offset of the first code point to add to the @buffer. + * @item_length: the number of code points to add to the @buffer, or -1 for the + * end of @text (assuming it is %NULL terminated). + * + * Appends characters from @text array to @buffer. The @item_offset is the + * position of the first character from @text that will be appended, and + * @item_length is the number of character. When shaping part of a larger text + * (e.g. a run of text from a paragraph), instead of passing just the substring + * corresponding to the run, it is preferable to pass the whole + * paragraph and specify the run start and length as @item_offset and + * @item_length, respectively, to give HarfBuzz the full context to be able, + * for example, to do cross-run Arabic shaping or properly handle combining + * marks at stat of run. + * + * This function does not check the validity of @text, it is up to the caller + * to ensure it contains a valid Unicode code points. + * + * Since: 0.9.31 + **/ +void +hb_buffer_add_codepoints (hb_buffer_t *buffer, + const hb_codepoint_t *text, + int text_length, + unsigned int item_offset, + int item_length) +{ + hb_buffer_add_utf > (buffer, text, text_length, item_offset, item_length); +} + + +static int +compare_info_codepoint (const hb_glyph_info_t *pa, + const hb_glyph_info_t *pb) +{ + return (int) pb->codepoint - (int) pa->codepoint; +} + +static inline void +normalize_glyphs_cluster (hb_buffer_t *buffer, + unsigned int start, + unsigned int end, + bool backward) +{ + hb_glyph_position_t *pos = buffer->pos; + + /* Total cluster advance */ + hb_position_t total_x_advance = 0, total_y_advance = 0; + for (unsigned int i = start; i < end; i++) + { + total_x_advance += pos[i].x_advance; + total_y_advance += pos[i].y_advance; + } + + hb_position_t x_advance = 0, y_advance = 0; + for (unsigned int i = start; i < end; i++) + { + pos[i].x_offset += x_advance; + pos[i].y_offset += y_advance; + + x_advance += pos[i].x_advance; + y_advance += pos[i].y_advance; + + pos[i].x_advance = 0; + pos[i].y_advance = 0; + } + + if (backward) + { + /* Transfer all cluster advance to the last glyph. */ + pos[end - 1].x_advance = total_x_advance; + pos[end - 1].y_advance = total_y_advance; + + hb_stable_sort (buffer->info + start, end - start - 1, compare_info_codepoint, buffer->pos + start); + } else { + /* Transfer all cluster advance to the first glyph. */ + pos[start].x_advance += total_x_advance; + pos[start].y_advance += total_y_advance; + for (unsigned int i = start + 1; i < end; i++) { + pos[i].x_offset -= total_x_advance; + pos[i].y_offset -= total_y_advance; + } + hb_stable_sort (buffer->info + start + 1, end - start - 1, compare_info_codepoint, buffer->pos + start + 1); + } +} + +/** + * hb_buffer_normalize_glyphs: + * @buffer: an #hb_buffer_t. + * + * Reorders a glyph buffer to have canonical in-cluster glyph order / position. + * The resulting clusters should behave identical to pre-reordering clusters. + * + * This has nothing to do with Unicode normalization. + * + * Since: 0.9.2 + **/ +void +hb_buffer_normalize_glyphs (hb_buffer_t *buffer) +{ + assert (buffer->have_positions); + assert (buffer->content_type == HB_BUFFER_CONTENT_TYPE_GLYPHS); + + bool backward = HB_DIRECTION_IS_BACKWARD (buffer->props.direction); + + unsigned int count = buffer->len; + if (unlikely (!count)) return; + hb_glyph_info_t *info = buffer->info; + + unsigned int start = 0; + unsigned int end; + for (end = start + 1; end < count; end++) + if (info[start].cluster != info[end].cluster) { + normalize_glyphs_cluster (buffer, start, end, backward); + start = end; + } + normalize_glyphs_cluster (buffer, start, end, backward); +} + +void +hb_buffer_t::sort (unsigned int start, unsigned int end, int(*compar)(const hb_glyph_info_t *, const hb_glyph_info_t *)) +{ + assert (!have_positions); + for (unsigned int i = start + 1; i < end; i++) + { + unsigned int j = i; + while (j > start && compar (&info[j - 1], &info[i]) > 0) + j--; + if (i == j) + continue; + /* Move item i to occupy place for item j, shift what's in between. */ + merge_clusters (j, i + 1); + { + hb_glyph_info_t t = info[i]; + memmove (&info[j + 1], &info[j], (i - j) * sizeof (hb_glyph_info_t)); + info[j] = t; + } + } +} + +/* + * Debugging. + */ + +/** + * hb_buffer_set_message_func: + * @buffer: an #hb_buffer_t. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 1.1.3 + **/ +void +hb_buffer_set_message_func (hb_buffer_t *buffer, + hb_buffer_message_func_t func, + void *user_data, hb_destroy_func_t destroy) +{ + if (buffer->message_destroy) + buffer->message_destroy (buffer->message_data); + + if (func) { + buffer->message_func = func; + buffer->message_data = user_data; + buffer->message_destroy = destroy; + } else { + buffer->message_func = NULL; + buffer->message_data = NULL; + buffer->message_destroy = NULL; + } +} + +bool +hb_buffer_t::message_impl (hb_font_t *font, const char *fmt, va_list ap) +{ + char buf[100]; + vsnprintf (buf, sizeof (buf), fmt, ap); + return (bool) this->message_func (this, font, buf, this->message_data); +} diff --git a/src/hb-buffer.h b/src/hb-buffer.h new file mode 100644 index 0000000..bf289c1 --- /dev/null +++ b/src/hb-buffer.h @@ -0,0 +1,472 @@ +/* + * Copyright © 1998-2004 David Turner and Werner Lemberg + * Copyright © 2004,2007,2009 Red Hat, Inc. + * Copyright © 2011,2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Owen Taylor, Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_H_IN +#error "Include instead." +#endif + +#ifndef HB_BUFFER_H +#define HB_BUFFER_H + +#include "hb-common.h" +#include "hb-unicode.h" +#include "hb-font.h" + +HB_BEGIN_DECLS + +/** + * hb_glyph_info_t: + * @codepoint: either a Unicode code point (before shaping) or a glyph index + * (after shaping). + * @mask: + * @cluster: the index of the character in the original text that corresponds + * to this #hb_glyph_info_t, or whatever the client passes to + * hb_buffer_add(). More than one #hb_glyph_info_t can have the same + * @cluster value, if they resulted from the same character (e.g. one + * to many glyph substitution), and when more than one character gets + * merged in the same glyph (e.g. many to one glyph substitution) the + * #hb_glyph_info_t will have the smallest cluster value of them. + * By default some characters are merged into the same cluster + * (e.g. combining marks have the same cluster as their bases) + * even if they are separate glyphs, hb_buffer_set_cluster_level() + * allow selecting more fine-grained cluster handling. + * + * The #hb_glyph_info_t is the structure that holds information about the + * glyphs and their relation to input text. + * + */ +typedef struct hb_glyph_info_t { + hb_codepoint_t codepoint; + hb_mask_t mask; + uint32_t cluster; + + /*< private >*/ + hb_var_int_t var1; + hb_var_int_t var2; +} hb_glyph_info_t; + +/** + * hb_glyph_position_t: + * @x_advance: how much the line advances after drawing this glyph when setting + * text in horizontal direction. + * @y_advance: how much the line advances after drawing this glyph when setting + * text in vertical direction. + * @x_offset: how much the glyph moves on the X-axis before drawing it, this + * should not affect how much the line advances. + * @y_offset: how much the glyph moves on the Y-axis before drawing it, this + * should not affect how much the line advances. + * + * The #hb_glyph_position_t is the structure that holds the positions of the + * glyph in both horizontal and vertical directions. All positions in + * #hb_glyph_position_t are relative to the current point. + * + */ +typedef struct hb_glyph_position_t { + hb_position_t x_advance; + hb_position_t y_advance; + hb_position_t x_offset; + hb_position_t y_offset; + + /*< private >*/ + hb_var_int_t var; +} hb_glyph_position_t; + +/** + * hb_segment_properties_t: + * @direction: the #hb_direction_t of the buffer, see hb_buffer_set_direction(). + * @script: the #hb_script_t of the buffer, see hb_buffer_set_script(). + * @language: the #hb_language_t of the buffer, see hb_buffer_set_language(). + * + * The structure that holds various text properties of an #hb_buffer_t. Can be + * set and retrieved using hb_buffer_set_segment_properties() and + * hb_buffer_get_segment_properties(), respectively. + */ +typedef struct hb_segment_properties_t { + hb_direction_t direction; + hb_script_t script; + hb_language_t language; + /*< private >*/ + void *reserved1; + void *reserved2; +} hb_segment_properties_t; + +#define HB_SEGMENT_PROPERTIES_DEFAULT {HB_DIRECTION_INVALID, \ + HB_SCRIPT_INVALID, \ + HB_LANGUAGE_INVALID, \ + NULL, \ + NULL} + +HB_EXTERN hb_bool_t +hb_segment_properties_equal (const hb_segment_properties_t *a, + const hb_segment_properties_t *b); + +HB_EXTERN unsigned int +hb_segment_properties_hash (const hb_segment_properties_t *p); + + + +/** + * hb_buffer_t: + * + * The main structure holding the input text and its properties before shaping, + * and output glyphs and their information after shaping. + */ + +typedef struct hb_buffer_t hb_buffer_t; + +HB_EXTERN hb_buffer_t * +hb_buffer_create (void); + +HB_EXTERN hb_buffer_t * +hb_buffer_get_empty (void); + +HB_EXTERN hb_buffer_t * +hb_buffer_reference (hb_buffer_t *buffer); + +HB_EXTERN void +hb_buffer_destroy (hb_buffer_t *buffer); + +HB_EXTERN hb_bool_t +hb_buffer_set_user_data (hb_buffer_t *buffer, + hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace); + +HB_EXTERN void * +hb_buffer_get_user_data (hb_buffer_t *buffer, + hb_user_data_key_t *key); + +/** + * hb_buffer_content_type_t: + * @HB_BUFFER_CONTENT_TYPE_INVALID: Initial value for new buffer. + * @HB_BUFFER_CONTENT_TYPE_UNICODE: The buffer contains input characters (before shaping). + * @HB_BUFFER_CONTENT_TYPE_GLYPHS: The buffer contains output glyphs (after shaping). + */ +typedef enum { + HB_BUFFER_CONTENT_TYPE_INVALID = 0, + HB_BUFFER_CONTENT_TYPE_UNICODE, + HB_BUFFER_CONTENT_TYPE_GLYPHS +} hb_buffer_content_type_t; + +HB_EXTERN void +hb_buffer_set_content_type (hb_buffer_t *buffer, + hb_buffer_content_type_t content_type); + +HB_EXTERN hb_buffer_content_type_t +hb_buffer_get_content_type (hb_buffer_t *buffer); + + +HB_EXTERN void +hb_buffer_set_unicode_funcs (hb_buffer_t *buffer, + hb_unicode_funcs_t *unicode_funcs); + +HB_EXTERN hb_unicode_funcs_t * +hb_buffer_get_unicode_funcs (hb_buffer_t *buffer); + +HB_EXTERN void +hb_buffer_set_direction (hb_buffer_t *buffer, + hb_direction_t direction); + +HB_EXTERN hb_direction_t +hb_buffer_get_direction (hb_buffer_t *buffer); + +HB_EXTERN void +hb_buffer_set_script (hb_buffer_t *buffer, + hb_script_t script); + +HB_EXTERN hb_script_t +hb_buffer_get_script (hb_buffer_t *buffer); + +HB_EXTERN void +hb_buffer_set_language (hb_buffer_t *buffer, + hb_language_t language); + + +HB_EXTERN hb_language_t +hb_buffer_get_language (hb_buffer_t *buffer); + +HB_EXTERN void +hb_buffer_set_segment_properties (hb_buffer_t *buffer, + const hb_segment_properties_t *props); + +HB_EXTERN void +hb_buffer_get_segment_properties (hb_buffer_t *buffer, + hb_segment_properties_t *props); + +HB_EXTERN void +hb_buffer_guess_segment_properties (hb_buffer_t *buffer); + + +/** + * hb_buffer_flags_t: + * @HB_BUFFER_FLAG_DEFAULT: the default buffer flag. + * @HB_BUFFER_FLAG_BOT: flag indicating that special handling of the beginning + * of text paragraph can be applied to this buffer. Should usually + * be set, unless you are passing to the buffer only part + * of the text without the full context. + * @HB_BUFFER_FLAG_EOT: flag indicating that special handling of the end of text + * paragraph can be applied to this buffer, similar to + * @HB_BUFFER_FLAG_EOT. + * @HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES: + * flag indication that character with Default_Ignorable + * Unicode property should use the corresponding glyph + * from the font, instead of hiding them (currently done + * by replacing them with the space glyph and zeroing the + * advance width.) + * + * Since: 0.9.20 + */ +typedef enum { /*< flags >*/ + HB_BUFFER_FLAG_DEFAULT = 0x00000000u, + HB_BUFFER_FLAG_BOT = 0x00000001u, /* Beginning-of-text */ + HB_BUFFER_FLAG_EOT = 0x00000002u, /* End-of-text */ + HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES = 0x00000004u +} hb_buffer_flags_t; + +HB_EXTERN void +hb_buffer_set_flags (hb_buffer_t *buffer, + hb_buffer_flags_t flags); + +HB_EXTERN hb_buffer_flags_t +hb_buffer_get_flags (hb_buffer_t *buffer); + +/* + * Since: 0.9.42 + */ +typedef enum { + HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES = 0, + HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS = 1, + HB_BUFFER_CLUSTER_LEVEL_CHARACTERS = 2, + HB_BUFFER_CLUSTER_LEVEL_DEFAULT = HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES +} hb_buffer_cluster_level_t; + +HB_EXTERN void +hb_buffer_set_cluster_level (hb_buffer_t *buffer, + hb_buffer_cluster_level_t cluster_level); + +HB_EXTERN hb_buffer_cluster_level_t +hb_buffer_get_cluster_level (hb_buffer_t *buffer); + +/** + * HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT: + * + * The default code point for replacing invalid characters in a given encoding. + * Set to U+FFFD REPLACEMENT CHARACTER. + * + * Since: 0.9.31 + */ +#define HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT 0xFFFDu + +HB_EXTERN void +hb_buffer_set_replacement_codepoint (hb_buffer_t *buffer, + hb_codepoint_t replacement); + +HB_EXTERN hb_codepoint_t +hb_buffer_get_replacement_codepoint (hb_buffer_t *buffer); + + +HB_EXTERN void +hb_buffer_reset (hb_buffer_t *buffer); + +HB_EXTERN void +hb_buffer_clear_contents (hb_buffer_t *buffer); + +HB_EXTERN hb_bool_t +hb_buffer_pre_allocate (hb_buffer_t *buffer, + unsigned int size); + + +HB_EXTERN hb_bool_t +hb_buffer_allocation_successful (hb_buffer_t *buffer); + +HB_EXTERN void +hb_buffer_reverse (hb_buffer_t *buffer); + +HB_EXTERN void +hb_buffer_reverse_range (hb_buffer_t *buffer, + unsigned int start, unsigned int end); + +HB_EXTERN void +hb_buffer_reverse_clusters (hb_buffer_t *buffer); + + +/* Filling the buffer in */ + +HB_EXTERN void +hb_buffer_add (hb_buffer_t *buffer, + hb_codepoint_t codepoint, + unsigned int cluster); + +HB_EXTERN void +hb_buffer_add_utf8 (hb_buffer_t *buffer, + const char *text, + int text_length, + unsigned int item_offset, + int item_length); + +HB_EXTERN void +hb_buffer_add_utf16 (hb_buffer_t *buffer, + const uint16_t *text, + int text_length, + unsigned int item_offset, + int item_length); + +HB_EXTERN void +hb_buffer_add_utf32 (hb_buffer_t *buffer, + const uint32_t *text, + int text_length, + unsigned int item_offset, + int item_length); + +HB_EXTERN void +hb_buffer_add_latin1 (hb_buffer_t *buffer, + const uint8_t *text, + int text_length, + unsigned int item_offset, + int item_length); + +HB_EXTERN void +hb_buffer_add_codepoints (hb_buffer_t *buffer, + const hb_codepoint_t *text, + int text_length, + unsigned int item_offset, + int item_length); + + +HB_EXTERN hb_bool_t +hb_buffer_set_length (hb_buffer_t *buffer, + unsigned int length); + +HB_EXTERN unsigned int +hb_buffer_get_length (hb_buffer_t *buffer); + +/* Getting glyphs out of the buffer */ + +HB_EXTERN hb_glyph_info_t * +hb_buffer_get_glyph_infos (hb_buffer_t *buffer, + unsigned int *length); + +HB_EXTERN hb_glyph_position_t * +hb_buffer_get_glyph_positions (hb_buffer_t *buffer, + unsigned int *length); + + +HB_EXTERN void +hb_buffer_normalize_glyphs (hb_buffer_t *buffer); + + +/* + * Serialize + */ + +/** + * hb_buffer_serialize_flags_t: + * @HB_BUFFER_SERIALIZE_FLAG_DEFAULT: serialize glyph names, clusters and positions. + * @HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS: do not serialize glyph cluster. + * @HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS: do not serialize glyph position information. + * @HB_BUFFER_SERIALIZE_FLAG_NO_GLYPH_NAMES: do no serialize glyph name. + * @HB_BUFFER_SERIALIZE_FLAG_GLYPH_EXTENTS: serialize glyph extents. + * + * Flags that control what glyph information are serialized in hb_buffer_serialize_glyphs(). + * + * Since: 0.9.20 + */ +typedef enum { /*< flags >*/ + HB_BUFFER_SERIALIZE_FLAG_DEFAULT = 0x00000000u, + HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS = 0x00000001u, + HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS = 0x00000002u, + HB_BUFFER_SERIALIZE_FLAG_NO_GLYPH_NAMES = 0x00000004u, + HB_BUFFER_SERIALIZE_FLAG_GLYPH_EXTENTS = 0x00000008u +} hb_buffer_serialize_flags_t; + +/** + * hb_buffer_serialize_format_t: + * @HB_BUFFER_SERIALIZE_FORMAT_TEXT: a human-readable, plain text format. + * @HB_BUFFER_SERIALIZE_FORMAT_JSON: a machine-readable JSON format. + * @HB_BUFFER_SERIALIZE_FORMAT_INVALID: invalid format. + * + * The buffer serialization and de-serialization format used in + * hb_buffer_serialize_glyphs() and hb_buffer_deserialize_glyphs(). + * + * Since: 0.9.2 + */ +typedef enum { + HB_BUFFER_SERIALIZE_FORMAT_TEXT = HB_TAG('T','E','X','T'), + HB_BUFFER_SERIALIZE_FORMAT_JSON = HB_TAG('J','S','O','N'), + HB_BUFFER_SERIALIZE_FORMAT_INVALID = HB_TAG_NONE +} hb_buffer_serialize_format_t; + +HB_EXTERN hb_buffer_serialize_format_t +hb_buffer_serialize_format_from_string (const char *str, int len); + +HB_EXTERN const char * +hb_buffer_serialize_format_to_string (hb_buffer_serialize_format_t format); + +HB_EXTERN const char ** +hb_buffer_serialize_list_formats (void); + +HB_EXTERN unsigned int +hb_buffer_serialize_glyphs (hb_buffer_t *buffer, + unsigned int start, + unsigned int end, + char *buf, + unsigned int buf_size, + unsigned int *buf_consumed, + hb_font_t *font, + hb_buffer_serialize_format_t format, + hb_buffer_serialize_flags_t flags); + +HB_EXTERN hb_bool_t +hb_buffer_deserialize_glyphs (hb_buffer_t *buffer, + const char *buf, + int buf_len, + const char **end_ptr, + hb_font_t *font, + hb_buffer_serialize_format_t format); + + +/* + * Debugging. + */ + +typedef hb_bool_t (*hb_buffer_message_func_t) (hb_buffer_t *buffer, + hb_font_t *font, + const char *message, + void *user_data); + +HB_EXTERN void +hb_buffer_set_message_func (hb_buffer_t *buffer, + hb_buffer_message_func_t func, + void *user_data, hb_destroy_func_t destroy); + + +HB_END_DECLS + +#endif /* HB_BUFFER_H */ diff --git a/src/hb-cache-private.hh b/src/hb-cache-private.hh new file mode 100644 index 0000000..24957e1 --- /dev/null +++ b/src/hb-cache-private.hh @@ -0,0 +1,74 @@ +/* + * Copyright © 2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_CACHE_PRIVATE_HH +#define HB_CACHE_PRIVATE_HH + +#include "hb-private.hh" + + +/* Implements a lock-free cache for int->int functions. */ + +template +struct hb_cache_t +{ + ASSERT_STATIC (key_bits >= cache_bits); + ASSERT_STATIC (key_bits + value_bits - cache_bits < 8 * sizeof (unsigned int)); + + inline void clear (void) + { + memset (values, 255, sizeof (values)); + } + + inline bool get (unsigned int key, unsigned int *value) + { + unsigned int k = key & ((1u<> value_bits) != (key >> cache_bits)) + return false; + *value = v & ((1u<> key_bits) || (value >> value_bits))) + return false; /* Overflows */ + unsigned int k = key & ((1u<>cache_bits)< hb_cmap_cache_t; +typedef hb_cache_t<16, 24, 8> hb_advance_cache_t; + + +#endif /* HB_CACHE_PRIVATE_HH */ diff --git a/src/hb-common.cc b/src/hb-common.cc new file mode 100644 index 0000000..64e77d4 --- /dev/null +++ b/src/hb-common.cc @@ -0,0 +1,951 @@ +/* + * Copyright © 2009,2010 Red Hat, Inc. + * Copyright © 2011,2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#include "hb-private.hh" + +#include "hb-mutex-private.hh" +#include "hb-object-private.hh" + +#include + + +/* hb_options_t */ + +hb_options_union_t _hb_options; + +void +_hb_options_init (void) +{ + hb_options_union_t u; + u.i = 0; + u.opts.initialized = 1; + + char *c = getenv ("HB_OPTIONS"); + u.opts.uniscribe_bug_compatible = c && strstr (c, "uniscribe-bug-compatible"); + + /* This is idempotent and threadsafe. */ + _hb_options = u; +} + + +/* hb_tag_t */ + +/** + * hb_tag_from_string: + * @str: (array length=len) (element-type uint8_t): + * @len: + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_tag_t +hb_tag_from_string (const char *str, int len) +{ + char tag[4]; + unsigned int i; + + if (!str || !len || !*str) + return HB_TAG_NONE; + + if (len < 0 || len > 4) + len = 4; + for (i = 0; i < (unsigned) len && str[i]; i++) + tag[i] = str[i]; + for (; i < 4; i++) + tag[i] = ' '; + + return HB_TAG_CHAR4 (tag); +} + +/** + * hb_tag_to_string: + * @tag: + * @buf: (out caller-allocates) (array fixed-size=4) (element-type uint8_t): + * + * + * + * Since: 0.9.5 + **/ +void +hb_tag_to_string (hb_tag_t tag, char *buf) +{ + buf[0] = (char) (uint8_t) (tag >> 24); + buf[1] = (char) (uint8_t) (tag >> 16); + buf[2] = (char) (uint8_t) (tag >> 8); + buf[3] = (char) (uint8_t) (tag >> 0); +} + + +/* hb_direction_t */ + +const char direction_strings[][4] = { + "ltr", + "rtl", + "ttb", + "btt" +}; + +/** + * hb_direction_from_string: + * @str: (array length=len) (element-type uint8_t): + * @len: + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_direction_t +hb_direction_from_string (const char *str, int len) +{ + if (unlikely (!str || !len || !*str)) + return HB_DIRECTION_INVALID; + + /* Lets match loosely: just match the first letter, such that + * all of "ltr", "left-to-right", etc work! + */ + char c = TOLOWER (str[0]); + for (unsigned int i = 0; i < ARRAY_LENGTH (direction_strings); i++) + if (c == direction_strings[i][0]) + return (hb_direction_t) (HB_DIRECTION_LTR + i); + + return HB_DIRECTION_INVALID; +} + +/** + * hb_direction_to_string: + * @direction: + * + * + * + * Return value: (transfer none): + * + * Since: 0.9.2 + **/ +const char * +hb_direction_to_string (hb_direction_t direction) +{ + if (likely ((unsigned int) (direction - HB_DIRECTION_LTR) + < ARRAY_LENGTH (direction_strings))) + return direction_strings[direction - HB_DIRECTION_LTR]; + + return "invalid"; +} + + +/* hb_language_t */ + +struct hb_language_impl_t { + const char s[1]; +}; + +static const char canon_map[256] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '-', 0, 0, + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 0, 0, 0, 0, 0, 0, + '-', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', + 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 0, 0, 0, 0, '-', + 0, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', + 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 0, 0, 0, 0, 0 +}; + +static bool +lang_equal (hb_language_t v1, + const void *v2) +{ + const unsigned char *p1 = (const unsigned char *) v1; + const unsigned char *p2 = (const unsigned char *) v2; + + while (*p1 && *p1 == canon_map[*p2]) + p1++, p2++; + + return *p1 == canon_map[*p2]; +} + +#if 0 +static unsigned int +lang_hash (const void *key) +{ + const unsigned char *p = key; + unsigned int h = 0; + while (canon_map[*p]) + { + h = (h << 5) - h + canon_map[*p]; + p++; + } + + return h; +} +#endif + + +struct hb_language_item_t { + + struct hb_language_item_t *next; + hb_language_t lang; + + inline bool operator == (const char *s) const { + return lang_equal (lang, s); + } + + inline hb_language_item_t & operator = (const char *s) { + lang = (hb_language_t) strdup (s); + for (unsigned char *p = (unsigned char *) lang; *p; p++) + *p = canon_map[*p]; + + return *this; + } + + void finish (void) { free ((void *) lang); } +}; + + +/* Thread-safe lock-free language list */ + +static hb_language_item_t *langs; + +#ifdef HB_USE_ATEXIT +static +void free_langs (void) +{ + while (langs) { + hb_language_item_t *next = langs->next; + langs->finish (); + free (langs); + langs = next; + } +} +#endif + +static hb_language_item_t * +lang_find_or_insert (const char *key) +{ +retry: + hb_language_item_t *first_lang = (hb_language_item_t *) hb_atomic_ptr_get (&langs); + + for (hb_language_item_t *lang = first_lang; lang; lang = lang->next) + if (*lang == key) + return lang; + + /* Not found; allocate one. */ + hb_language_item_t *lang = (hb_language_item_t *) calloc (1, sizeof (hb_language_item_t)); + if (unlikely (!lang)) + return NULL; + lang->next = first_lang; + *lang = key; + + if (!hb_atomic_ptr_cmpexch (&langs, first_lang, lang)) { + lang->finish (); + free (lang); + goto retry; + } + +#ifdef HB_USE_ATEXIT + if (!first_lang) + atexit (free_langs); /* First person registers atexit() callback. */ +#endif + + return lang; +} + + +/** + * hb_language_from_string: + * @str: (array length=len) (element-type uint8_t): a string representing + * ISO 639 language code + * @len: length of the @str, or -1 if it is %NULL-terminated. + * + * Converts @str representing an ISO 639 language code to the corresponding + * #hb_language_t. + * + * Return value: (transfer none): + * The #hb_language_t corresponding to the ISO 639 language code. + * + * Since: 0.9.2 + **/ +hb_language_t +hb_language_from_string (const char *str, int len) +{ + if (!str || !len || !*str) + return HB_LANGUAGE_INVALID; + + hb_language_item_t *item = NULL; + if (len >= 0) + { + /* NUL-terminate it. */ + char strbuf[64]; + len = MIN (len, (int) sizeof (strbuf) - 1); + memcpy (strbuf, str, len); + strbuf[len] = '\0'; + item = lang_find_or_insert (strbuf); + } + else + item = lang_find_or_insert (str); + + return likely (item) ? item->lang : HB_LANGUAGE_INVALID; +} + +/** + * hb_language_to_string: + * @language: an #hb_language_t to convert. + * + * See hb_language_from_string(). + * + * Return value: (transfer none): + * A %NULL-terminated string representing the @language. Must not be freed by + * the caller. + * + * Since: 0.9.2 + **/ +const char * +hb_language_to_string (hb_language_t language) +{ + /* This is actually NULL-safe! */ + return language->s; +} + +/** + * hb_language_get_default: + * + * + * + * Return value: (transfer none): + * + * Since: 0.9.2 + **/ +hb_language_t +hb_language_get_default (void) +{ + static hb_language_t default_language = HB_LANGUAGE_INVALID; + + hb_language_t language = (hb_language_t) hb_atomic_ptr_get (&default_language); + if (unlikely (language == HB_LANGUAGE_INVALID)) { + language = hb_language_from_string (setlocale (LC_CTYPE, NULL), -1); + (void) hb_atomic_ptr_cmpexch (&default_language, HB_LANGUAGE_INVALID, language); + } + + return default_language; +} + + +/* hb_script_t */ + +/** + * hb_script_from_iso15924_tag: + * @tag: an #hb_tag_t representing an ISO 15924 tag. + * + * Converts an ISO 15924 script tag to a corresponding #hb_script_t. + * + * Return value: + * An #hb_script_t corresponding to the ISO 15924 tag. + * + * Since: 0.9.2 + **/ +hb_script_t +hb_script_from_iso15924_tag (hb_tag_t tag) +{ + if (unlikely (tag == HB_TAG_NONE)) + return HB_SCRIPT_INVALID; + + /* Be lenient, adjust case (one capital letter followed by three small letters) */ + tag = (tag & 0xDFDFDFDFu) | 0x00202020u; + + switch (tag) { + + /* These graduated from the 'Q' private-area codes, but + * the old code is still aliased by Unicode, and the Qaai + * one in use by ICU. */ + case HB_TAG('Q','a','a','i'): return HB_SCRIPT_INHERITED; + case HB_TAG('Q','a','a','c'): return HB_SCRIPT_COPTIC; + + /* Script variants from http://unicode.org/iso15924/ */ + case HB_TAG('C','y','r','s'): return HB_SCRIPT_CYRILLIC; + case HB_TAG('L','a','t','f'): return HB_SCRIPT_LATIN; + case HB_TAG('L','a','t','g'): return HB_SCRIPT_LATIN; + case HB_TAG('S','y','r','e'): return HB_SCRIPT_SYRIAC; + case HB_TAG('S','y','r','j'): return HB_SCRIPT_SYRIAC; + case HB_TAG('S','y','r','n'): return HB_SCRIPT_SYRIAC; + } + + /* If it looks right, just use the tag as a script */ + if (((uint32_t) tag & 0xE0E0E0E0u) == 0x40606060u) + return (hb_script_t) tag; + + /* Otherwise, return unknown */ + return HB_SCRIPT_UNKNOWN; +} + +/** + * hb_script_from_string: + * @str: (array length=len) (element-type uint8_t): a string representing an + * ISO 15924 tag. + * @len: length of the @str, or -1 if it is %NULL-terminated. + * + * Converts a string @str representing an ISO 15924 script tag to a + * corresponding #hb_script_t. Shorthand for hb_tag_from_string() then + * hb_script_from_iso15924_tag(). + * + * Return value: + * An #hb_script_t corresponding to the ISO 15924 tag. + * + * Since: 0.9.2 + **/ +hb_script_t +hb_script_from_string (const char *str, int len) +{ + return hb_script_from_iso15924_tag (hb_tag_from_string (str, len)); +} + +/** + * hb_script_to_iso15924_tag: + * @script: an #hb_script_ to convert. + * + * See hb_script_from_iso15924_tag(). + * + * Return value: + * An #hb_tag_t representing an ISO 15924 script tag. + * + * Since: 0.9.2 + **/ +hb_tag_t +hb_script_to_iso15924_tag (hb_script_t script) +{ + return (hb_tag_t) script; +} + +/** + * hb_script_get_horizontal_direction: + * @script: + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_direction_t +hb_script_get_horizontal_direction (hb_script_t script) +{ + /* http://goo.gl/x9ilM */ + switch ((hb_tag_t) script) + { + /* Unicode-1.1 additions */ + case HB_SCRIPT_ARABIC: + case HB_SCRIPT_HEBREW: + + /* Unicode-3.0 additions */ + case HB_SCRIPT_SYRIAC: + case HB_SCRIPT_THAANA: + + /* Unicode-4.0 additions */ + case HB_SCRIPT_CYPRIOT: + + /* Unicode-4.1 additions */ + case HB_SCRIPT_KHAROSHTHI: + + /* Unicode-5.0 additions */ + case HB_SCRIPT_PHOENICIAN: + case HB_SCRIPT_NKO: + + /* Unicode-5.1 additions */ + case HB_SCRIPT_LYDIAN: + + /* Unicode-5.2 additions */ + case HB_SCRIPT_AVESTAN: + case HB_SCRIPT_IMPERIAL_ARAMAIC: + case HB_SCRIPT_INSCRIPTIONAL_PAHLAVI: + case HB_SCRIPT_INSCRIPTIONAL_PARTHIAN: + case HB_SCRIPT_OLD_SOUTH_ARABIAN: + case HB_SCRIPT_OLD_TURKIC: + case HB_SCRIPT_SAMARITAN: + + /* Unicode-6.0 additions */ + case HB_SCRIPT_MANDAIC: + + /* Unicode-6.1 additions */ + case HB_SCRIPT_MEROITIC_CURSIVE: + case HB_SCRIPT_MEROITIC_HIEROGLYPHS: + + /* Unicode-7.0 additions */ + case HB_SCRIPT_MANICHAEAN: + case HB_SCRIPT_MENDE_KIKAKUI: + case HB_SCRIPT_NABATAEAN: + case HB_SCRIPT_OLD_NORTH_ARABIAN: + case HB_SCRIPT_PALMYRENE: + case HB_SCRIPT_PSALTER_PAHLAVI: + + /* Unicode-8.0 additions */ + case HB_SCRIPT_OLD_HUNGARIAN: + + /* Unicode-9.0 additions */ + case HB_SCRIPT_ADLAM: + + return HB_DIRECTION_RTL; + } + + return HB_DIRECTION_LTR; +} + + +/* hb_user_data_array_t */ + +bool +hb_user_data_array_t::set (hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace) +{ + if (!key) + return false; + + if (replace) { + if (!data && !destroy) { + items.remove (key, lock); + return true; + } + } + hb_user_data_item_t item = {key, data, destroy}; + bool ret = !!items.replace_or_insert (item, lock, (bool) replace); + + return ret; +} + +void * +hb_user_data_array_t::get (hb_user_data_key_t *key) +{ + hb_user_data_item_t item = {NULL, NULL, NULL}; + + return items.find (key, &item, lock) ? item.data : NULL; +} + + +/* hb_version */ + +/** + * hb_version: + * @major: (out): Library major version component. + * @minor: (out): Library minor version component. + * @micro: (out): Library micro version component. + * + * Returns library version as three integer components. + * + * Since: 0.9.2 + **/ +void +hb_version (unsigned int *major, + unsigned int *minor, + unsigned int *micro) +{ + *major = HB_VERSION_MAJOR; + *minor = HB_VERSION_MINOR; + *micro = HB_VERSION_MICRO; +} + +/** + * hb_version_string: + * + * Returns library version as a string with three components. + * + * Return value: library version string. + * + * Since: 0.9.2 + **/ +const char * +hb_version_string (void) +{ + return HB_VERSION_STRING; +} + +/** + * hb_version_atleast: + * @major: + * @minor: + * @micro: + * + * + * + * Return value: + * + * Since: 0.9.30 + **/ +hb_bool_t +hb_version_atleast (unsigned int major, + unsigned int minor, + unsigned int micro) +{ + return HB_VERSION_ATLEAST (major, minor, micro); +} + + + +/* hb_feature_t and hb_variation_t */ + +static bool +parse_space (const char **pp, const char *end) +{ + while (*pp < end && ISSPACE (**pp)) + (*pp)++; + return true; +} + +static bool +parse_char (const char **pp, const char *end, char c) +{ + parse_space (pp, end); + + if (*pp == end || **pp != c) + return false; + + (*pp)++; + return true; +} + +static bool +parse_uint (const char **pp, const char *end, unsigned int *pv) +{ + char buf[32]; + unsigned int len = MIN (ARRAY_LENGTH (buf) - 1, (unsigned int) (end - *pp)); + strncpy (buf, *pp, len); + buf[len] = '\0'; + + char *p = buf; + char *pend = p; + unsigned int v; + + /* Intentionally use strtol instead of strtoul, such that + * -1 turns into "big number"... */ + errno = 0; + v = strtol (p, &pend, 0); + if (errno || p == pend) + return false; + + *pv = v; + *pp += pend - p; + return true; +} + +static bool +parse_float (const char **pp, const char *end, float *pv) +{ + char buf[32]; + unsigned int len = MIN (ARRAY_LENGTH (buf) - 1, (unsigned int) (end - *pp)); + strncpy (buf, *pp, len); + buf[len] = '\0'; + + char *p = buf; + char *pend = p; + float v; + + errno = 0; + v = strtof (p, &pend); + if (errno || p == pend) + return false; + + *pv = v; + *pp += pend - p; + return true; +} + +static bool +parse_bool (const char **pp, const char *end, unsigned int *pv) +{ + parse_space (pp, end); + + const char *p = *pp; + while (*pp < end && ISALPHA(**pp)) + (*pp)++; + + /* CSS allows on/off as aliases 1/0. */ + if (*pp - p == 2 || 0 == strncmp (p, "on", 2)) + *pv = 1; + else if (*pp - p == 3 || 0 == strncmp (p, "off", 2)) + *pv = 0; + else + return false; + + return true; +} + +/* hb_feature_t */ + +static bool +parse_feature_value_prefix (const char **pp, const char *end, hb_feature_t *feature) +{ + if (parse_char (pp, end, '-')) + feature->value = 0; + else { + parse_char (pp, end, '+'); + feature->value = 1; + } + + return true; +} + +static bool +parse_tag (const char **pp, const char *end, hb_tag_t *tag) +{ + parse_space (pp, end); + + char quote = 0; + + if (*pp < end && (**pp == '\'' || **pp == '"')) + { + quote = **pp; + (*pp)++; + } + + const char *p = *pp; + while (*pp < end && ISALNUM(**pp)) + (*pp)++; + + if (p == *pp || *pp - p > 4) + return false; + + *tag = hb_tag_from_string (p, *pp - p); + + if (quote) + { + /* CSS expects exactly four bytes. And we only allow quotations for + * CSS compatibility. So, enforce the length. */ + if (*pp - p != 4) + return false; + if (*pp == end || **pp != quote) + return false; + (*pp)++; + } + + return true; +} + +static bool +parse_feature_indices (const char **pp, const char *end, hb_feature_t *feature) +{ + parse_space (pp, end); + + bool has_start; + + feature->start = 0; + feature->end = (unsigned int) -1; + + if (!parse_char (pp, end, '[')) + return true; + + has_start = parse_uint (pp, end, &feature->start); + + if (parse_char (pp, end, ':')) { + parse_uint (pp, end, &feature->end); + } else { + if (has_start) + feature->end = feature->start + 1; + } + + return parse_char (pp, end, ']'); +} + +static bool +parse_feature_value_postfix (const char **pp, const char *end, hb_feature_t *feature) +{ + bool had_equal = parse_char (pp, end, '='); + bool had_value = parse_uint (pp, end, &feature->value) || + parse_bool (pp, end, &feature->value); + /* CSS doesn't use equal-sign between tag and value. + * If there was an equal-sign, then there *must* be a value. + * A value without an eqaul-sign is ok, but not required. */ + return !had_equal || had_value; +} + +static bool +parse_one_feature (const char **pp, const char *end, hb_feature_t *feature) +{ + return parse_feature_value_prefix (pp, end, feature) && + parse_tag (pp, end, &feature->tag) && + parse_feature_indices (pp, end, feature) && + parse_feature_value_postfix (pp, end, feature) && + parse_space (pp, end) && + *pp == end; +} + +/** + * hb_feature_from_string: + * @str: (array length=len) (element-type uint8_t): a string to parse + * @len: length of @str, or -1 if string is %NULL terminated + * @feature: (out): the #hb_feature_t to initialize with the parsed values + * + * Parses a string into a #hb_feature_t. + * + * TODO: document the syntax here. + * + * Return value: + * %true if @str is successfully parsed, %false otherwise. + * + * Since: 0.9.5 + **/ +hb_bool_t +hb_feature_from_string (const char *str, int len, + hb_feature_t *feature) +{ + hb_feature_t feat; + + if (len < 0) + len = strlen (str); + + if (likely (parse_one_feature (&str, str + len, &feat))) + { + if (feature) + *feature = feat; + return true; + } + + if (feature) + memset (feature, 0, sizeof (*feature)); + return false; +} + +/** + * hb_feature_to_string: + * @feature: an #hb_feature_t to convert + * @buf: (array length=size) (out): output string + * @size: the allocated size of @buf + * + * Converts a #hb_feature_t into a %NULL-terminated string in the format + * understood by hb_feature_from_string(). The client in responsible for + * allocating big enough size for @buf, 128 bytes is more than enough. + * + * Since: 0.9.5 + **/ +void +hb_feature_to_string (hb_feature_t *feature, + char *buf, unsigned int size) +{ + if (unlikely (!size)) return; + + char s[128]; + unsigned int len = 0; + if (feature->value == 0) + s[len++] = '-'; + hb_tag_to_string (feature->tag, s + len); + len += 4; + while (len && s[len - 1] == ' ') + len--; + if (feature->start != 0 || feature->end != (unsigned int) -1) + { + s[len++] = '['; + if (feature->start) + len += MAX (0, snprintf (s + len, ARRAY_LENGTH (s) - len, "%u", feature->start)); + if (feature->end != feature->start + 1) { + s[len++] = ':'; + if (feature->end != (unsigned int) -1) + len += MAX (0, snprintf (s + len, ARRAY_LENGTH (s) - len, "%u", feature->end)); + } + s[len++] = ']'; + } + if (feature->value > 1) + { + s[len++] = '='; + len += MAX (0, snprintf (s + len, ARRAY_LENGTH (s) - len, "%u", feature->value)); + } + assert (len < ARRAY_LENGTH (s)); + len = MIN (len, size - 1); + memcpy (buf, s, len); + buf[len] = '\0'; +} + +/* hb_variation_t */ + +static bool +parse_variation_value (const char **pp, const char *end, hb_variation_t *variation) +{ + parse_char (pp, end, '='); /* Optional. */ + return parse_float (pp, end, &variation->value); +} + +static bool +parse_one_variation (const char **pp, const char *end, hb_variation_t *variation) +{ + return parse_tag (pp, end, &variation->tag) && + parse_variation_value (pp, end, variation) && + parse_space (pp, end) && + *pp == end; +} + +/** + * hb_variation_from_string: + * + * Since: 1.4.2 + */ +hb_bool_t +hb_variation_from_string (const char *str, int len, + hb_variation_t *variation) +{ + hb_variation_t var; + + if (len < 0) + len = strlen (str); + + if (likely (parse_one_variation (&str, str + len, &var))) + { + if (variation) + *variation = var; + return true; + } + + if (variation) + memset (variation, 0, sizeof (*variation)); + return false; +} + +/** + * hb_variation_to_string: + * + * Since: 1.4.2 + */ +void +hb_variation_to_string (hb_variation_t *variation, + char *buf, unsigned int size) +{ + if (unlikely (!size)) return; + + char s[128]; + unsigned int len = 0; + hb_tag_to_string (variation->tag, s + len); + len += 4; + while (len && s[len - 1] == ' ') + len--; + s[len++] = '='; + len += MAX (0, snprintf (s + len, ARRAY_LENGTH (s) - len, "%g", variation->value)); + + assert (len < ARRAY_LENGTH (s)); + len = MIN (len, size - 1); + memcpy (buf, s, len); + buf[len] = '\0'; +} diff --git a/src/hb-common.h b/src/hb-common.h new file mode 100644 index 0000000..634cb96 --- /dev/null +++ b/src/hb-common.h @@ -0,0 +1,403 @@ +/* + * Copyright © 2007,2008,2009 Red Hat, Inc. + * Copyright © 2011,2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_H_IN +#error "Include instead." +#endif + +#ifndef HB_COMMON_H +#define HB_COMMON_H + +#ifndef HB_BEGIN_DECLS +# ifdef __cplusplus +# define HB_BEGIN_DECLS extern "C" { +# define HB_END_DECLS } +# else /* !__cplusplus */ +# define HB_BEGIN_DECLS +# define HB_END_DECLS +# endif /* !__cplusplus */ +#endif + +#if !defined (HB_DONT_DEFINE_STDINT) + +#if defined (_SVR4) || defined (SVR4) || defined (__OpenBSD__) || \ + defined (_sgi) || defined (__sun) || defined (sun) || \ + defined (__digital__) || defined (__HP_cc) +# include +#elif defined (_AIX) +# include +/* VS 2010 (_MSC_VER 1600) has stdint.h */ +#elif defined (_MSC_VER) && _MSC_VER < 1600 +typedef __int8 int8_t; +typedef unsigned __int8 uint8_t; +typedef __int16 int16_t; +typedef unsigned __int16 uint16_t; +typedef __int32 int32_t; +typedef unsigned __int32 uint32_t; +typedef __int64 int64_t; +typedef unsigned __int64 uint64_t; +#else +# include +#endif + +#endif + +HB_BEGIN_DECLS + + +typedef int hb_bool_t; + +typedef uint32_t hb_codepoint_t; +typedef int32_t hb_position_t; +typedef uint32_t hb_mask_t; + +typedef union _hb_var_int_t { + uint32_t u32; + int32_t i32; + uint16_t u16[2]; + int16_t i16[2]; + uint8_t u8[4]; + int8_t i8[4]; +} hb_var_int_t; + + +/* hb_tag_t */ + +typedef uint32_t hb_tag_t; + +#define HB_TAG(c1,c2,c3,c4) ((hb_tag_t)((((uint8_t)(c1))<<24)|(((uint8_t)(c2))<<16)|(((uint8_t)(c3))<<8)|((uint8_t)(c4)))) +#define HB_UNTAG(tag) ((uint8_t)((tag)>>24)), ((uint8_t)((tag)>>16)), ((uint8_t)((tag)>>8)), ((uint8_t)(tag)) + +#define HB_TAG_NONE HB_TAG(0,0,0,0) +#define HB_TAG_MAX HB_TAG(0xff,0xff,0xff,0xff) +#define HB_TAG_MAX_SIGNED HB_TAG(0x7f,0xff,0xff,0xff) + +/* len=-1 means str is NUL-terminated. */ +HB_EXTERN hb_tag_t +hb_tag_from_string (const char *str, int len); + +/* buf should have 4 bytes. */ +HB_EXTERN void +hb_tag_to_string (hb_tag_t tag, char *buf); + + +/** + * hb_direction_t: + * @HB_DIRECTION_INVALID: Initial, unset direction. + * @HB_DIRECTION_LTR: Text is set horizontally from left to right. + * @HB_DIRECTION_RTL: Text is set horizontally from right to left. + * @HB_DIRECTION_TTB: Text is set vertically from top to bottom. + * @HB_DIRECTION_BTT: Text is set vertically from bottom to top. + */ +typedef enum { + HB_DIRECTION_INVALID = 0, + HB_DIRECTION_LTR = 4, + HB_DIRECTION_RTL, + HB_DIRECTION_TTB, + HB_DIRECTION_BTT +} hb_direction_t; + +/* len=-1 means str is NUL-terminated */ +HB_EXTERN hb_direction_t +hb_direction_from_string (const char *str, int len); + +HB_EXTERN const char * +hb_direction_to_string (hb_direction_t direction); + +#define HB_DIRECTION_IS_VALID(dir) ((((unsigned int) (dir)) & ~3U) == 4) +/* Direction must be valid for the following */ +#define HB_DIRECTION_IS_HORIZONTAL(dir) ((((unsigned int) (dir)) & ~1U) == 4) +#define HB_DIRECTION_IS_VERTICAL(dir) ((((unsigned int) (dir)) & ~1U) == 6) +#define HB_DIRECTION_IS_FORWARD(dir) ((((unsigned int) (dir)) & ~2U) == 4) +#define HB_DIRECTION_IS_BACKWARD(dir) ((((unsigned int) (dir)) & ~2U) == 5) +#define HB_DIRECTION_REVERSE(dir) ((hb_direction_t) (((unsigned int) (dir)) ^ 1)) + + +/* hb_language_t */ + +typedef const struct hb_language_impl_t *hb_language_t; + +HB_EXTERN hb_language_t +hb_language_from_string (const char *str, int len); + +HB_EXTERN const char * +hb_language_to_string (hb_language_t language); + +#define HB_LANGUAGE_INVALID ((hb_language_t) NULL) + +HB_EXTERN hb_language_t +hb_language_get_default (void); + + +/* hb_script_t */ + +/* http://unicode.org/iso15924/ */ +/* http://goo.gl/x9ilM */ +/* Unicode Character Database property: Script (sc) */ +typedef enum +{ + /*1.1*/ HB_SCRIPT_COMMON = HB_TAG ('Z','y','y','y'), + /*1.1*/ HB_SCRIPT_INHERITED = HB_TAG ('Z','i','n','h'), + /*5.0*/ HB_SCRIPT_UNKNOWN = HB_TAG ('Z','z','z','z'), + + /*1.1*/ HB_SCRIPT_ARABIC = HB_TAG ('A','r','a','b'), + /*1.1*/ HB_SCRIPT_ARMENIAN = HB_TAG ('A','r','m','n'), + /*1.1*/ HB_SCRIPT_BENGALI = HB_TAG ('B','e','n','g'), + /*1.1*/ HB_SCRIPT_CYRILLIC = HB_TAG ('C','y','r','l'), + /*1.1*/ HB_SCRIPT_DEVANAGARI = HB_TAG ('D','e','v','a'), + /*1.1*/ HB_SCRIPT_GEORGIAN = HB_TAG ('G','e','o','r'), + /*1.1*/ HB_SCRIPT_GREEK = HB_TAG ('G','r','e','k'), + /*1.1*/ HB_SCRIPT_GUJARATI = HB_TAG ('G','u','j','r'), + /*1.1*/ HB_SCRIPT_GURMUKHI = HB_TAG ('G','u','r','u'), + /*1.1*/ HB_SCRIPT_HANGUL = HB_TAG ('H','a','n','g'), + /*1.1*/ HB_SCRIPT_HAN = HB_TAG ('H','a','n','i'), + /*1.1*/ HB_SCRIPT_HEBREW = HB_TAG ('H','e','b','r'), + /*1.1*/ HB_SCRIPT_HIRAGANA = HB_TAG ('H','i','r','a'), + /*1.1*/ HB_SCRIPT_KANNADA = HB_TAG ('K','n','d','a'), + /*1.1*/ HB_SCRIPT_KATAKANA = HB_TAG ('K','a','n','a'), + /*1.1*/ HB_SCRIPT_LAO = HB_TAG ('L','a','o','o'), + /*1.1*/ HB_SCRIPT_LATIN = HB_TAG ('L','a','t','n'), + /*1.1*/ HB_SCRIPT_MALAYALAM = HB_TAG ('M','l','y','m'), + /*1.1*/ HB_SCRIPT_ORIYA = HB_TAG ('O','r','y','a'), + /*1.1*/ HB_SCRIPT_TAMIL = HB_TAG ('T','a','m','l'), + /*1.1*/ HB_SCRIPT_TELUGU = HB_TAG ('T','e','l','u'), + /*1.1*/ HB_SCRIPT_THAI = HB_TAG ('T','h','a','i'), + + /*2.0*/ HB_SCRIPT_TIBETAN = HB_TAG ('T','i','b','t'), + + /*3.0*/ HB_SCRIPT_BOPOMOFO = HB_TAG ('B','o','p','o'), + /*3.0*/ HB_SCRIPT_BRAILLE = HB_TAG ('B','r','a','i'), + /*3.0*/ HB_SCRIPT_CANADIAN_SYLLABICS = HB_TAG ('C','a','n','s'), + /*3.0*/ HB_SCRIPT_CHEROKEE = HB_TAG ('C','h','e','r'), + /*3.0*/ HB_SCRIPT_ETHIOPIC = HB_TAG ('E','t','h','i'), + /*3.0*/ HB_SCRIPT_KHMER = HB_TAG ('K','h','m','r'), + /*3.0*/ HB_SCRIPT_MONGOLIAN = HB_TAG ('M','o','n','g'), + /*3.0*/ HB_SCRIPT_MYANMAR = HB_TAG ('M','y','m','r'), + /*3.0*/ HB_SCRIPT_OGHAM = HB_TAG ('O','g','a','m'), + /*3.0*/ HB_SCRIPT_RUNIC = HB_TAG ('R','u','n','r'), + /*3.0*/ HB_SCRIPT_SINHALA = HB_TAG ('S','i','n','h'), + /*3.0*/ HB_SCRIPT_SYRIAC = HB_TAG ('S','y','r','c'), + /*3.0*/ HB_SCRIPT_THAANA = HB_TAG ('T','h','a','a'), + /*3.0*/ HB_SCRIPT_YI = HB_TAG ('Y','i','i','i'), + + /*3.1*/ HB_SCRIPT_DESERET = HB_TAG ('D','s','r','t'), + /*3.1*/ HB_SCRIPT_GOTHIC = HB_TAG ('G','o','t','h'), + /*3.1*/ HB_SCRIPT_OLD_ITALIC = HB_TAG ('I','t','a','l'), + + /*3.2*/ HB_SCRIPT_BUHID = HB_TAG ('B','u','h','d'), + /*3.2*/ HB_SCRIPT_HANUNOO = HB_TAG ('H','a','n','o'), + /*3.2*/ HB_SCRIPT_TAGALOG = HB_TAG ('T','g','l','g'), + /*3.2*/ HB_SCRIPT_TAGBANWA = HB_TAG ('T','a','g','b'), + + /*4.0*/ HB_SCRIPT_CYPRIOT = HB_TAG ('C','p','r','t'), + /*4.0*/ HB_SCRIPT_LIMBU = HB_TAG ('L','i','m','b'), + /*4.0*/ HB_SCRIPT_LINEAR_B = HB_TAG ('L','i','n','b'), + /*4.0*/ HB_SCRIPT_OSMANYA = HB_TAG ('O','s','m','a'), + /*4.0*/ HB_SCRIPT_SHAVIAN = HB_TAG ('S','h','a','w'), + /*4.0*/ HB_SCRIPT_TAI_LE = HB_TAG ('T','a','l','e'), + /*4.0*/ HB_SCRIPT_UGARITIC = HB_TAG ('U','g','a','r'), + + /*4.1*/ HB_SCRIPT_BUGINESE = HB_TAG ('B','u','g','i'), + /*4.1*/ HB_SCRIPT_COPTIC = HB_TAG ('C','o','p','t'), + /*4.1*/ HB_SCRIPT_GLAGOLITIC = HB_TAG ('G','l','a','g'), + /*4.1*/ HB_SCRIPT_KHAROSHTHI = HB_TAG ('K','h','a','r'), + /*4.1*/ HB_SCRIPT_NEW_TAI_LUE = HB_TAG ('T','a','l','u'), + /*4.1*/ HB_SCRIPT_OLD_PERSIAN = HB_TAG ('X','p','e','o'), + /*4.1*/ HB_SCRIPT_SYLOTI_NAGRI = HB_TAG ('S','y','l','o'), + /*4.1*/ HB_SCRIPT_TIFINAGH = HB_TAG ('T','f','n','g'), + + /*5.0*/ HB_SCRIPT_BALINESE = HB_TAG ('B','a','l','i'), + /*5.0*/ HB_SCRIPT_CUNEIFORM = HB_TAG ('X','s','u','x'), + /*5.0*/ HB_SCRIPT_NKO = HB_TAG ('N','k','o','o'), + /*5.0*/ HB_SCRIPT_PHAGS_PA = HB_TAG ('P','h','a','g'), + /*5.0*/ HB_SCRIPT_PHOENICIAN = HB_TAG ('P','h','n','x'), + + /*5.1*/ HB_SCRIPT_CARIAN = HB_TAG ('C','a','r','i'), + /*5.1*/ HB_SCRIPT_CHAM = HB_TAG ('C','h','a','m'), + /*5.1*/ HB_SCRIPT_KAYAH_LI = HB_TAG ('K','a','l','i'), + /*5.1*/ HB_SCRIPT_LEPCHA = HB_TAG ('L','e','p','c'), + /*5.1*/ HB_SCRIPT_LYCIAN = HB_TAG ('L','y','c','i'), + /*5.1*/ HB_SCRIPT_LYDIAN = HB_TAG ('L','y','d','i'), + /*5.1*/ HB_SCRIPT_OL_CHIKI = HB_TAG ('O','l','c','k'), + /*5.1*/ HB_SCRIPT_REJANG = HB_TAG ('R','j','n','g'), + /*5.1*/ HB_SCRIPT_SAURASHTRA = HB_TAG ('S','a','u','r'), + /*5.1*/ HB_SCRIPT_SUNDANESE = HB_TAG ('S','u','n','d'), + /*5.1*/ HB_SCRIPT_VAI = HB_TAG ('V','a','i','i'), + + /*5.2*/ HB_SCRIPT_AVESTAN = HB_TAG ('A','v','s','t'), + /*5.2*/ HB_SCRIPT_BAMUM = HB_TAG ('B','a','m','u'), + /*5.2*/ HB_SCRIPT_EGYPTIAN_HIEROGLYPHS = HB_TAG ('E','g','y','p'), + /*5.2*/ HB_SCRIPT_IMPERIAL_ARAMAIC = HB_TAG ('A','r','m','i'), + /*5.2*/ HB_SCRIPT_INSCRIPTIONAL_PAHLAVI = HB_TAG ('P','h','l','i'), + /*5.2*/ HB_SCRIPT_INSCRIPTIONAL_PARTHIAN = HB_TAG ('P','r','t','i'), + /*5.2*/ HB_SCRIPT_JAVANESE = HB_TAG ('J','a','v','a'), + /*5.2*/ HB_SCRIPT_KAITHI = HB_TAG ('K','t','h','i'), + /*5.2*/ HB_SCRIPT_LISU = HB_TAG ('L','i','s','u'), + /*5.2*/ HB_SCRIPT_MEETEI_MAYEK = HB_TAG ('M','t','e','i'), + /*5.2*/ HB_SCRIPT_OLD_SOUTH_ARABIAN = HB_TAG ('S','a','r','b'), + /*5.2*/ HB_SCRIPT_OLD_TURKIC = HB_TAG ('O','r','k','h'), + /*5.2*/ HB_SCRIPT_SAMARITAN = HB_TAG ('S','a','m','r'), + /*5.2*/ HB_SCRIPT_TAI_THAM = HB_TAG ('L','a','n','a'), + /*5.2*/ HB_SCRIPT_TAI_VIET = HB_TAG ('T','a','v','t'), + + /*6.0*/ HB_SCRIPT_BATAK = HB_TAG ('B','a','t','k'), + /*6.0*/ HB_SCRIPT_BRAHMI = HB_TAG ('B','r','a','h'), + /*6.0*/ HB_SCRIPT_MANDAIC = HB_TAG ('M','a','n','d'), + + /*6.1*/ HB_SCRIPT_CHAKMA = HB_TAG ('C','a','k','m'), + /*6.1*/ HB_SCRIPT_MEROITIC_CURSIVE = HB_TAG ('M','e','r','c'), + /*6.1*/ HB_SCRIPT_MEROITIC_HIEROGLYPHS = HB_TAG ('M','e','r','o'), + /*6.1*/ HB_SCRIPT_MIAO = HB_TAG ('P','l','r','d'), + /*6.1*/ HB_SCRIPT_SHARADA = HB_TAG ('S','h','r','d'), + /*6.1*/ HB_SCRIPT_SORA_SOMPENG = HB_TAG ('S','o','r','a'), + /*6.1*/ HB_SCRIPT_TAKRI = HB_TAG ('T','a','k','r'), + + /* + * Since: 0.9.30 + */ + /*7.0*/ HB_SCRIPT_BASSA_VAH = HB_TAG ('B','a','s','s'), + /*7.0*/ HB_SCRIPT_CAUCASIAN_ALBANIAN = HB_TAG ('A','g','h','b'), + /*7.0*/ HB_SCRIPT_DUPLOYAN = HB_TAG ('D','u','p','l'), + /*7.0*/ HB_SCRIPT_ELBASAN = HB_TAG ('E','l','b','a'), + /*7.0*/ HB_SCRIPT_GRANTHA = HB_TAG ('G','r','a','n'), + /*7.0*/ HB_SCRIPT_KHOJKI = HB_TAG ('K','h','o','j'), + /*7.0*/ HB_SCRIPT_KHUDAWADI = HB_TAG ('S','i','n','d'), + /*7.0*/ HB_SCRIPT_LINEAR_A = HB_TAG ('L','i','n','a'), + /*7.0*/ HB_SCRIPT_MAHAJANI = HB_TAG ('M','a','h','j'), + /*7.0*/ HB_SCRIPT_MANICHAEAN = HB_TAG ('M','a','n','i'), + /*7.0*/ HB_SCRIPT_MENDE_KIKAKUI = HB_TAG ('M','e','n','d'), + /*7.0*/ HB_SCRIPT_MODI = HB_TAG ('M','o','d','i'), + /*7.0*/ HB_SCRIPT_MRO = HB_TAG ('M','r','o','o'), + /*7.0*/ HB_SCRIPT_NABATAEAN = HB_TAG ('N','b','a','t'), + /*7.0*/ HB_SCRIPT_OLD_NORTH_ARABIAN = HB_TAG ('N','a','r','b'), + /*7.0*/ HB_SCRIPT_OLD_PERMIC = HB_TAG ('P','e','r','m'), + /*7.0*/ HB_SCRIPT_PAHAWH_HMONG = HB_TAG ('H','m','n','g'), + /*7.0*/ HB_SCRIPT_PALMYRENE = HB_TAG ('P','a','l','m'), + /*7.0*/ HB_SCRIPT_PAU_CIN_HAU = HB_TAG ('P','a','u','c'), + /*7.0*/ HB_SCRIPT_PSALTER_PAHLAVI = HB_TAG ('P','h','l','p'), + /*7.0*/ HB_SCRIPT_SIDDHAM = HB_TAG ('S','i','d','d'), + /*7.0*/ HB_SCRIPT_TIRHUTA = HB_TAG ('T','i','r','h'), + /*7.0*/ HB_SCRIPT_WARANG_CITI = HB_TAG ('W','a','r','a'), + + /*8.0*/ HB_SCRIPT_AHOM = HB_TAG ('A','h','o','m'), + /*8.0*/ HB_SCRIPT_ANATOLIAN_HIEROGLYPHS = HB_TAG ('H','l','u','w'), + /*8.0*/ HB_SCRIPT_HATRAN = HB_TAG ('H','a','t','r'), + /*8.0*/ HB_SCRIPT_MULTANI = HB_TAG ('M','u','l','t'), + /*8.0*/ HB_SCRIPT_OLD_HUNGARIAN = HB_TAG ('H','u','n','g'), + /*8.0*/ HB_SCRIPT_SIGNWRITING = HB_TAG ('S','g','n','w'), + + /* + * Since 1.3.0 + */ + /*9.0*/ HB_SCRIPT_ADLAM = HB_TAG ('A','d','l','m'), + /*9.0*/ HB_SCRIPT_BHAIKSUKI = HB_TAG ('B','h','k','s'), + /*9.0*/ HB_SCRIPT_MARCHEN = HB_TAG ('M','a','r','c'), + /*9.0*/ HB_SCRIPT_OSAGE = HB_TAG ('O','s','g','e'), + /*9.0*/ HB_SCRIPT_TANGUT = HB_TAG ('T','a','n','g'), + /*9.0*/ HB_SCRIPT_NEWA = HB_TAG ('N','e','w','a'), + + /* No script set. */ + HB_SCRIPT_INVALID = HB_TAG_NONE, + + /* Dummy values to ensure any hb_tag_t value can be passed/stored as hb_script_t + * without risking undefined behavior. Include both a signed and unsigned max, + * since technically enums are int, and indeed, hb_script_t ends up being signed. + * See this thread for technicalities: + * + * http://lists.freedesktop.org/archives/harfbuzz/2014-March/004150.html + */ + _HB_SCRIPT_MAX_VALUE = HB_TAG_MAX, /*< skip >*/ + _HB_SCRIPT_MAX_VALUE_SIGNED = HB_TAG_MAX_SIGNED /*< skip >*/ + +} hb_script_t; + + +/* Script functions */ + +HB_EXTERN hb_script_t +hb_script_from_iso15924_tag (hb_tag_t tag); + +HB_EXTERN hb_script_t +hb_script_from_string (const char *str, int len); + +HB_EXTERN hb_tag_t +hb_script_to_iso15924_tag (hb_script_t script); + +HB_EXTERN hb_direction_t +hb_script_get_horizontal_direction (hb_script_t script); + + +/* User data */ + +typedef struct hb_user_data_key_t { + /*< private >*/ + char unused; +} hb_user_data_key_t; + +typedef void (*hb_destroy_func_t) (void *user_data); + + +/* Font features and variations. */ + +typedef struct hb_feature_t { + hb_tag_t tag; + uint32_t value; + unsigned int start; + unsigned int end; +} hb_feature_t; + +HB_EXTERN hb_bool_t +hb_feature_from_string (const char *str, int len, + hb_feature_t *feature); + +HB_EXTERN void +hb_feature_to_string (hb_feature_t *feature, + char *buf, unsigned int size); + +/** + * hb_variation_t: + * + * Since: 1.4.2 + */ +typedef struct hb_variation_t { + hb_tag_t tag; + float value; +} hb_variation_t; + +HB_EXTERN hb_bool_t +hb_variation_from_string (const char *str, int len, + hb_variation_t *variation); + +HB_EXTERN void +hb_variation_to_string (hb_variation_t *variation, + char *buf, unsigned int size); + + +HB_END_DECLS + +#endif /* HB_COMMON_H */ diff --git a/src/hb-coretext.cc b/src/hb-coretext.cc new file mode 100644 index 0000000..e857dfa --- /dev/null +++ b/src/hb-coretext.cc @@ -0,0 +1,1310 @@ +/* + * Copyright © 2012,2013 Mozilla Foundation. + * Copyright © 2012,2013 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Mozilla Author(s): Jonathan Kew + * Google Author(s): Behdad Esfahbod + */ + +#define HB_SHAPER coretext +#include "hb-shaper-impl-private.hh" + +#include "hb-coretext.h" + + +#ifndef HB_DEBUG_CORETEXT +#define HB_DEBUG_CORETEXT (HB_DEBUG+0) +#endif + + +static void +release_table_data (void *user_data) +{ + CFDataRef cf_data = reinterpret_cast (user_data); + CFRelease(cf_data); +} + +static hb_blob_t * +reference_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data) +{ + CGFontRef cg_font = reinterpret_cast (user_data); + CFDataRef cf_data = CGFontCopyTableForTag (cg_font, tag); + if (unlikely (!cf_data)) + return NULL; + + const char *data = reinterpret_cast (CFDataGetBytePtr (cf_data)); + const size_t length = CFDataGetLength (cf_data); + if (!data || !length) + return NULL; + + return hb_blob_create (data, length, HB_MEMORY_MODE_READONLY, + reinterpret_cast (const_cast<__CFData *> (cf_data)), + release_table_data); +} + +hb_face_t * +hb_coretext_face_create (CGFontRef cg_font) +{ + return hb_face_create_for_tables (reference_table, CGFontRetain (cg_font), (hb_destroy_func_t) CGFontRelease); +} + + +HB_SHAPER_DATA_ENSURE_DECLARE(coretext, face) +HB_SHAPER_DATA_ENSURE_DECLARE(coretext, font) + + +/* + * shaper face data + */ + +static CTFontDescriptorRef +get_last_resort_font_desc (void) +{ + // TODO Handle allocation failures? + CTFontDescriptorRef last_resort = CTFontDescriptorCreateWithNameAndSize (CFSTR("LastResort"), 0); + CFArrayRef cascade_list = CFArrayCreate (kCFAllocatorDefault, + (const void **) &last_resort, + 1, + &kCFTypeArrayCallBacks); + CFRelease (last_resort); + CFDictionaryRef attributes = CFDictionaryCreate (kCFAllocatorDefault, + (const void **) &kCTFontCascadeListAttribute, + (const void **) &cascade_list, + 1, + &kCFTypeDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); + CFRelease (cascade_list); + + CTFontDescriptorRef font_desc = CTFontDescriptorCreateWithAttributes (attributes); + CFRelease (attributes); + return font_desc; +} + +static void +release_data (void *info, const void *data, size_t size) +{ + assert (hb_blob_get_length ((hb_blob_t *) info) == size && + hb_blob_get_data ((hb_blob_t *) info, NULL) == data); + + hb_blob_destroy ((hb_blob_t *) info); +} + +static CGFontRef +create_cg_font (hb_face_t *face) +{ + CGFontRef cg_font = NULL; + if (face->destroy == (hb_destroy_func_t) CGFontRelease) + { + cg_font = CGFontRetain ((CGFontRef) face->user_data); + } + else + { + hb_blob_t *blob = hb_face_reference_blob (face); + unsigned int blob_length; + const char *blob_data = hb_blob_get_data (blob, &blob_length); + if (unlikely (!blob_length)) + DEBUG_MSG (CORETEXT, face, "Face has empty blob"); + + CGDataProviderRef provider = CGDataProviderCreateWithData (blob, blob_data, blob_length, &release_data); + if (likely (provider)) + { + cg_font = CGFontCreateWithDataProvider (provider); + if (unlikely (!cg_font)) + DEBUG_MSG (CORETEXT, face, "Face CGFontCreateWithDataProvider() failed"); + CGDataProviderRelease (provider); + } + } + return cg_font; +} + +static CTFontRef +create_ct_font (CGFontRef cg_font, CGFloat font_size) +{ + CTFontRef ct_font = CTFontCreateWithGraphicsFont (cg_font, font_size, NULL, NULL); + if (unlikely (!ct_font)) { + DEBUG_MSG (CORETEXT, cg_font, "Font CTFontCreateWithGraphicsFont() failed"); + return NULL; + } + + /* crbug.com/576941 and crbug.com/625902 and the investigation in the latter + * bug indicate that the cascade list reconfiguration occasionally causes + * crashes in CoreText on OS X 10.9, thus let's skip this step on older + * operating system versions. Except for the emoji font, where _not_ + * reconfiguring the cascade list causes CoreText crashes. For details, see + * crbug.com/549610 */ + // 0x00070000 stands for "kCTVersionNumber10_10", see CoreText.h + if (&CTGetCoreTextVersion != NULL && CTGetCoreTextVersion() < 0x00070000) { + CFStringRef fontName = CTFontCopyPostScriptName (ct_font); + bool isEmojiFont = CFStringCompare (fontName, CFSTR("AppleColorEmoji"), 0) == kCFCompareEqualTo; + CFRelease (fontName); + if (!isEmojiFont) + return ct_font; + } + + CFURLRef original_url = (CFURLRef)CTFontCopyAttribute(ct_font, kCTFontURLAttribute); + + /* Create font copy with cascade list that has LastResort first; this speeds up CoreText + * font fallback which we don't need anyway. */ + { + CTFontDescriptorRef last_resort_font_desc = get_last_resort_font_desc (); + CTFontRef new_ct_font = CTFontCreateCopyWithAttributes (ct_font, 0.0, NULL, last_resort_font_desc); + CFRelease (last_resort_font_desc); + if (new_ct_font) + { + /* The CTFontCreateCopyWithAttributes call fails to stay on the same font + * when reconfiguring the cascade list and may switch to a different font + * when there are fonts that go by the same name, since the descriptor is + * just name and size. + * + * Avoid reconfiguring the cascade lists if the new font is outside the + * system locations that we cannot access from the sandboxed renderer + * process in Blink. This can be detected by the new file URL location + * that the newly found font points to. */ + CFURLRef new_url = (CFURLRef) CTFontCopyAttribute (new_ct_font, kCTFontURLAttribute); + // Keep reconfigured font if URL cannot be retrieved (seems to be the case + // on Mac OS 10.12 Sierra), speculative fix for crbug.com/625606 + if (!original_url || !new_url || CFEqual (original_url, new_url)) { + CFRelease (ct_font); + ct_font = new_ct_font; + } else { + CFRelease (new_ct_font); + DEBUG_MSG (CORETEXT, ct_font, "Discarding reconfigured CTFont, location changed."); + } + if (new_url) + CFRelease (new_url); + } + else + DEBUG_MSG (CORETEXT, ct_font, "Font copy with empty cascade list failed"); + } + + if (original_url) + CFRelease (original_url); + return ct_font; +} + +struct hb_coretext_shaper_face_data_t { + CGFontRef cg_font; + CTFontRef ct_font; +}; + +hb_coretext_shaper_face_data_t * +_hb_coretext_shaper_face_data_create (hb_face_t *face) +{ + hb_coretext_shaper_face_data_t *data = (hb_coretext_shaper_face_data_t *) calloc (1, sizeof (hb_coretext_shaper_face_data_t)); + if (unlikely (!data)) + return NULL; + + data->cg_font = create_cg_font (face); + if (unlikely (!data->cg_font)) + { + DEBUG_MSG (CORETEXT, face, "CGFont creation failed.."); + free (data); + return NULL; + } + + /* We use 36pt size instead of UPEM, because CoreText implements the 'trak' table, + * which can make the font too tight at large sizes. 36pt should be a good semi-neutral + * size. + * + * Since we always create CTFont at a fixed size, our CTFont lives in face_data + * instead of font_data. Which is good, because when people change scale on + * hb_font_t, we won't need to update our CTFont. */ + data->ct_font = create_ct_font (data->cg_font, 36.); + if (unlikely (!data->ct_font)) + { + DEBUG_MSG (CORETEXT, face, "CTFont creation failed."); + CFRelease (data->cg_font); + free (data); + return NULL; + } + + return data; +} + +void +_hb_coretext_shaper_face_data_destroy (hb_coretext_shaper_face_data_t *data) +{ + CFRelease (data->ct_font); + CFRelease (data->cg_font); + free (data); +} + +/* + * Since: 0.9.10 + */ +CGFontRef +hb_coretext_face_get_cg_font (hb_face_t *face) +{ + if (unlikely (!hb_coretext_shaper_face_data_ensure (face))) return NULL; + hb_coretext_shaper_face_data_t *face_data = HB_SHAPER_DATA_GET (face); + return face_data->cg_font; +} + + +/* + * shaper font data + */ + +struct hb_coretext_shaper_font_data_t {}; + +hb_coretext_shaper_font_data_t * +_hb_coretext_shaper_font_data_create (hb_font_t *font HB_UNUSED) +{ + return (hb_coretext_shaper_font_data_t *) HB_SHAPER_DATA_SUCCEEDED; +} + +void +_hb_coretext_shaper_font_data_destroy (hb_coretext_shaper_font_data_t *data) +{ +} + + +/* + * shaper shape_plan data + */ + +struct hb_coretext_shaper_shape_plan_data_t {}; + +hb_coretext_shaper_shape_plan_data_t * +_hb_coretext_shaper_shape_plan_data_create (hb_shape_plan_t *shape_plan HB_UNUSED, + const hb_feature_t *user_features HB_UNUSED, + unsigned int num_user_features HB_UNUSED, + const int *coords HB_UNUSED, + unsigned int num_coords HB_UNUSED) +{ + return (hb_coretext_shaper_shape_plan_data_t *) HB_SHAPER_DATA_SUCCEEDED; +} + +void +_hb_coretext_shaper_shape_plan_data_destroy (hb_coretext_shaper_shape_plan_data_t *data HB_UNUSED) +{ +} + +CTFontRef +hb_coretext_font_get_ct_font (hb_font_t *font) +{ + hb_face_t *face = font->face; + if (unlikely (!hb_coretext_shaper_face_data_ensure (face))) return NULL; + hb_coretext_shaper_face_data_t *face_data = HB_SHAPER_DATA_GET (face); + return face_data->ct_font; +} + + +/* + * shaper + */ + +struct feature_record_t { + unsigned int feature; + unsigned int setting; +}; + +struct active_feature_t { + feature_record_t rec; + unsigned int order; + + static int cmp (const active_feature_t *a, const active_feature_t *b) { + return a->rec.feature < b->rec.feature ? -1 : a->rec.feature > b->rec.feature ? 1 : + a->order < b->order ? -1 : a->order > b->order ? 1 : + a->rec.setting < b->rec.setting ? -1 : a->rec.setting > b->rec.setting ? 1 : + 0; + } + bool operator== (const active_feature_t *f) { + return cmp (this, f) == 0; + } +}; + +struct feature_event_t { + unsigned int index; + bool start; + active_feature_t feature; + + static int cmp (const feature_event_t *a, const feature_event_t *b) { + return a->index < b->index ? -1 : a->index > b->index ? 1 : + a->start < b->start ? -1 : a->start > b->start ? 1 : + active_feature_t::cmp (&a->feature, &b->feature); + } +}; + +struct range_record_t { + CTFontRef font; + unsigned int index_first; /* == start */ + unsigned int index_last; /* == end - 1 */ +}; + + +/* The following enum members are added in OS X 10.8. */ +#define kAltHalfWidthTextSelector 6 +#define kAltProportionalTextSelector 5 +#define kAlternateHorizKanaOffSelector 1 +#define kAlternateHorizKanaOnSelector 0 +#define kAlternateKanaType 34 +#define kAlternateVertKanaOffSelector 3 +#define kAlternateVertKanaOnSelector 2 +#define kCaseSensitiveLayoutOffSelector 1 +#define kCaseSensitiveLayoutOnSelector 0 +#define kCaseSensitiveLayoutType 33 +#define kCaseSensitiveSpacingOffSelector 3 +#define kCaseSensitiveSpacingOnSelector 2 +#define kContextualAlternatesOffSelector 1 +#define kContextualAlternatesOnSelector 0 +#define kContextualAlternatesType 36 +#define kContextualLigaturesOffSelector 19 +#define kContextualLigaturesOnSelector 18 +#define kContextualSwashAlternatesOffSelector 5 +#define kContextualSwashAlternatesOnSelector 4 +#define kDefaultLowerCaseSelector 0 +#define kDefaultUpperCaseSelector 0 +#define kHistoricalLigaturesOffSelector 21 +#define kHistoricalLigaturesOnSelector 20 +#define kHojoCharactersSelector 12 +#define kJIS2004CharactersSelector 11 +#define kLowerCasePetiteCapsSelector 2 +#define kLowerCaseSmallCapsSelector 1 +#define kLowerCaseType 37 +#define kMathematicalGreekOffSelector 11 +#define kMathematicalGreekOnSelector 10 +#define kNLCCharactersSelector 13 +#define kQuarterWidthTextSelector 4 +#define kScientificInferiorsSelector 4 +#define kStylisticAltEightOffSelector 17 +#define kStylisticAltEightOnSelector 16 +#define kStylisticAltEighteenOffSelector 37 +#define kStylisticAltEighteenOnSelector 36 +#define kStylisticAltElevenOffSelector 23 +#define kStylisticAltElevenOnSelector 22 +#define kStylisticAltFifteenOffSelector 31 +#define kStylisticAltFifteenOnSelector 30 +#define kStylisticAltFiveOffSelector 11 +#define kStylisticAltFiveOnSelector 10 +#define kStylisticAltFourOffSelector 9 +#define kStylisticAltFourOnSelector 8 +#define kStylisticAltFourteenOffSelector 29 +#define kStylisticAltFourteenOnSelector 28 +#define kStylisticAltNineOffSelector 19 +#define kStylisticAltNineOnSelector 18 +#define kStylisticAltNineteenOffSelector 39 +#define kStylisticAltNineteenOnSelector 38 +#define kStylisticAltOneOffSelector 3 +#define kStylisticAltOneOnSelector 2 +#define kStylisticAltSevenOffSelector 15 +#define kStylisticAltSevenOnSelector 14 +#define kStylisticAltSeventeenOffSelector 35 +#define kStylisticAltSeventeenOnSelector 34 +#define kStylisticAltSixOffSelector 13 +#define kStylisticAltSixOnSelector 12 +#define kStylisticAltSixteenOffSelector 33 +#define kStylisticAltSixteenOnSelector 32 +#define kStylisticAltTenOffSelector 21 +#define kStylisticAltTenOnSelector 20 +#define kStylisticAltThirteenOffSelector 27 +#define kStylisticAltThirteenOnSelector 26 +#define kStylisticAltThreeOffSelector 7 +#define kStylisticAltThreeOnSelector 6 +#define kStylisticAltTwelveOffSelector 25 +#define kStylisticAltTwelveOnSelector 24 +#define kStylisticAltTwentyOffSelector 41 +#define kStylisticAltTwentyOnSelector 40 +#define kStylisticAltTwoOffSelector 5 +#define kStylisticAltTwoOnSelector 4 +#define kStylisticAlternativesType 35 +#define kSwashAlternatesOffSelector 3 +#define kSwashAlternatesOnSelector 2 +#define kThirdWidthTextSelector 3 +#define kTraditionalNamesCharactersSelector 14 +#define kUpperCasePetiteCapsSelector 2 +#define kUpperCaseSmallCapsSelector 1 +#define kUpperCaseType 38 + +/* Table data courtesy of Apple. */ +static const struct feature_mapping_t { + FourCharCode otFeatureTag; + uint16_t aatFeatureType; + uint16_t selectorToEnable; + uint16_t selectorToDisable; +} feature_mappings[] = { + { 'c2pc', kUpperCaseType, kUpperCasePetiteCapsSelector, kDefaultUpperCaseSelector }, + { 'c2sc', kUpperCaseType, kUpperCaseSmallCapsSelector, kDefaultUpperCaseSelector }, + { 'calt', kContextualAlternatesType, kContextualAlternatesOnSelector, kContextualAlternatesOffSelector }, + { 'case', kCaseSensitiveLayoutType, kCaseSensitiveLayoutOnSelector, kCaseSensitiveLayoutOffSelector }, + { 'clig', kLigaturesType, kContextualLigaturesOnSelector, kContextualLigaturesOffSelector }, + { 'cpsp', kCaseSensitiveLayoutType, kCaseSensitiveSpacingOnSelector, kCaseSensitiveSpacingOffSelector }, + { 'cswh', kContextualAlternatesType, kContextualSwashAlternatesOnSelector, kContextualSwashAlternatesOffSelector }, + { 'dlig', kLigaturesType, kRareLigaturesOnSelector, kRareLigaturesOffSelector }, + { 'expt', kCharacterShapeType, kExpertCharactersSelector, 16 }, + { 'frac', kFractionsType, kDiagonalFractionsSelector, kNoFractionsSelector }, + { 'fwid', kTextSpacingType, kMonospacedTextSelector, 7 }, + { 'halt', kTextSpacingType, kAltHalfWidthTextSelector, 7 }, + { 'hist', kLigaturesType, kHistoricalLigaturesOnSelector, kHistoricalLigaturesOffSelector }, + { 'hkna', kAlternateKanaType, kAlternateHorizKanaOnSelector, kAlternateHorizKanaOffSelector, }, + { 'hlig', kLigaturesType, kHistoricalLigaturesOnSelector, kHistoricalLigaturesOffSelector }, + { 'hngl', kTransliterationType, kHanjaToHangulSelector, kNoTransliterationSelector }, + { 'hojo', kCharacterShapeType, kHojoCharactersSelector, 16 }, + { 'hwid', kTextSpacingType, kHalfWidthTextSelector, 7 }, + { 'ital', kItalicCJKRomanType, kCJKItalicRomanOnSelector, kCJKItalicRomanOffSelector }, + { 'jp04', kCharacterShapeType, kJIS2004CharactersSelector, 16 }, + { 'jp78', kCharacterShapeType, kJIS1978CharactersSelector, 16 }, + { 'jp83', kCharacterShapeType, kJIS1983CharactersSelector, 16 }, + { 'jp90', kCharacterShapeType, kJIS1990CharactersSelector, 16 }, + { 'liga', kLigaturesType, kCommonLigaturesOnSelector, kCommonLigaturesOffSelector }, + { 'lnum', kNumberCaseType, kUpperCaseNumbersSelector, 2 }, + { 'mgrk', kMathematicalExtrasType, kMathematicalGreekOnSelector, kMathematicalGreekOffSelector }, + { 'nlck', kCharacterShapeType, kNLCCharactersSelector, 16 }, + { 'onum', kNumberCaseType, kLowerCaseNumbersSelector, 2 }, + { 'ordn', kVerticalPositionType, kOrdinalsSelector, kNormalPositionSelector }, + { 'palt', kTextSpacingType, kAltProportionalTextSelector, 7 }, + { 'pcap', kLowerCaseType, kLowerCasePetiteCapsSelector, kDefaultLowerCaseSelector }, + { 'pkna', kTextSpacingType, kProportionalTextSelector, 7 }, + { 'pnum', kNumberSpacingType, kProportionalNumbersSelector, 4 }, + { 'pwid', kTextSpacingType, kProportionalTextSelector, 7 }, + { 'qwid', kTextSpacingType, kQuarterWidthTextSelector, 7 }, + { 'ruby', kRubyKanaType, kRubyKanaOnSelector, kRubyKanaOffSelector }, + { 'sinf', kVerticalPositionType, kScientificInferiorsSelector, kNormalPositionSelector }, + { 'smcp', kLowerCaseType, kLowerCaseSmallCapsSelector, kDefaultLowerCaseSelector }, + { 'smpl', kCharacterShapeType, kSimplifiedCharactersSelector, 16 }, + { 'ss01', kStylisticAlternativesType, kStylisticAltOneOnSelector, kStylisticAltOneOffSelector }, + { 'ss02', kStylisticAlternativesType, kStylisticAltTwoOnSelector, kStylisticAltTwoOffSelector }, + { 'ss03', kStylisticAlternativesType, kStylisticAltThreeOnSelector, kStylisticAltThreeOffSelector }, + { 'ss04', kStylisticAlternativesType, kStylisticAltFourOnSelector, kStylisticAltFourOffSelector }, + { 'ss05', kStylisticAlternativesType, kStylisticAltFiveOnSelector, kStylisticAltFiveOffSelector }, + { 'ss06', kStylisticAlternativesType, kStylisticAltSixOnSelector, kStylisticAltSixOffSelector }, + { 'ss07', kStylisticAlternativesType, kStylisticAltSevenOnSelector, kStylisticAltSevenOffSelector }, + { 'ss08', kStylisticAlternativesType, kStylisticAltEightOnSelector, kStylisticAltEightOffSelector }, + { 'ss09', kStylisticAlternativesType, kStylisticAltNineOnSelector, kStylisticAltNineOffSelector }, + { 'ss10', kStylisticAlternativesType, kStylisticAltTenOnSelector, kStylisticAltTenOffSelector }, + { 'ss11', kStylisticAlternativesType, kStylisticAltElevenOnSelector, kStylisticAltElevenOffSelector }, + { 'ss12', kStylisticAlternativesType, kStylisticAltTwelveOnSelector, kStylisticAltTwelveOffSelector }, + { 'ss13', kStylisticAlternativesType, kStylisticAltThirteenOnSelector, kStylisticAltThirteenOffSelector }, + { 'ss14', kStylisticAlternativesType, kStylisticAltFourteenOnSelector, kStylisticAltFourteenOffSelector }, + { 'ss15', kStylisticAlternativesType, kStylisticAltFifteenOnSelector, kStylisticAltFifteenOffSelector }, + { 'ss16', kStylisticAlternativesType, kStylisticAltSixteenOnSelector, kStylisticAltSixteenOffSelector }, + { 'ss17', kStylisticAlternativesType, kStylisticAltSeventeenOnSelector, kStylisticAltSeventeenOffSelector }, + { 'ss18', kStylisticAlternativesType, kStylisticAltEighteenOnSelector, kStylisticAltEighteenOffSelector }, + { 'ss19', kStylisticAlternativesType, kStylisticAltNineteenOnSelector, kStylisticAltNineteenOffSelector }, + { 'ss20', kStylisticAlternativesType, kStylisticAltTwentyOnSelector, kStylisticAltTwentyOffSelector }, + { 'subs', kVerticalPositionType, kInferiorsSelector, kNormalPositionSelector }, + { 'sups', kVerticalPositionType, kSuperiorsSelector, kNormalPositionSelector }, + { 'swsh', kContextualAlternatesType, kSwashAlternatesOnSelector, kSwashAlternatesOffSelector }, + { 'titl', kStyleOptionsType, kTitlingCapsSelector, kNoStyleOptionsSelector }, + { 'tnam', kCharacterShapeType, kTraditionalNamesCharactersSelector, 16 }, + { 'tnum', kNumberSpacingType, kMonospacedNumbersSelector, 4 }, + { 'trad', kCharacterShapeType, kTraditionalCharactersSelector, 16 }, + { 'twid', kTextSpacingType, kThirdWidthTextSelector, 7 }, + { 'unic', kLetterCaseType, 14, 15 }, + { 'valt', kTextSpacingType, kAltProportionalTextSelector, 7 }, + { 'vert', kVerticalSubstitutionType, kSubstituteVerticalFormsOnSelector, kSubstituteVerticalFormsOffSelector }, + { 'vhal', kTextSpacingType, kAltHalfWidthTextSelector, 7 }, + { 'vkna', kAlternateKanaType, kAlternateVertKanaOnSelector, kAlternateVertKanaOffSelector }, + { 'vpal', kTextSpacingType, kAltProportionalTextSelector, 7 }, + { 'vrt2', kVerticalSubstitutionType, kSubstituteVerticalFormsOnSelector, kSubstituteVerticalFormsOffSelector }, + { 'zero', kTypographicExtrasType, kSlashedZeroOnSelector, kSlashedZeroOffSelector }, +}; + +static int +_hb_feature_mapping_cmp (const void *key_, const void *entry_) +{ + unsigned int key = * (unsigned int *) key_; + const feature_mapping_t * entry = (const feature_mapping_t *) entry_; + return key < entry->otFeatureTag ? -1 : + key > entry->otFeatureTag ? 1 : + 0; +} + +hb_bool_t +_hb_coretext_shape (hb_shape_plan_t *shape_plan, + hb_font_t *font, + hb_buffer_t *buffer, + const hb_feature_t *features, + unsigned int num_features) +{ + hb_face_t *face = font->face; + hb_coretext_shaper_face_data_t *face_data = HB_SHAPER_DATA_GET (face); + + CGFloat ct_font_size = CTFontGetSize (face_data->ct_font); + CGFloat x_mult = (CGFloat) font->x_scale / ct_font_size; + CGFloat y_mult = (CGFloat) font->y_scale / ct_font_size; + + /* Attach marks to their bases, to match the 'ot' shaper. + * Adapted from hb-ot-shape:hb_form_clusters(). + * Note that this only makes us be closer to the 'ot' shaper, + * but by no means the same. For example, if there's + * B1 M1 B2 M2, and B1-B2 form a ligature, M2's cluster will + * continue pointing to B2 even though B2 was merged into B1's + * cluster... */ + if (buffer->cluster_level == HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES) + { + hb_unicode_funcs_t *unicode = buffer->unicode; + unsigned int count = buffer->len; + hb_glyph_info_t *info = buffer->info; + for (unsigned int i = 1; i < count; i++) + if (HB_UNICODE_GENERAL_CATEGORY_IS_MARK (unicode->general_category (info[i].codepoint))) + buffer->merge_clusters (i - 1, i + 1); + } + + hb_auto_array_t feature_records; + hb_auto_array_t range_records; + + /* + * Set up features. + * (copied + modified from code from hb-uniscribe.cc) + */ + if (num_features) + { + /* Sort features by start/end events. */ + hb_auto_array_t feature_events; + for (unsigned int i = 0; i < num_features; i++) + { + const feature_mapping_t * mapping = (const feature_mapping_t *) bsearch (&features[i].tag, + feature_mappings, + ARRAY_LENGTH (feature_mappings), + sizeof (feature_mappings[0]), + _hb_feature_mapping_cmp); + if (!mapping) + continue; + + active_feature_t feature; + feature.rec.feature = mapping->aatFeatureType; + feature.rec.setting = features[i].value ? mapping->selectorToEnable : mapping->selectorToDisable; + feature.order = i; + + feature_event_t *event; + + event = feature_events.push (); + if (unlikely (!event)) + goto fail_features; + event->index = features[i].start; + event->start = true; + event->feature = feature; + + event = feature_events.push (); + if (unlikely (!event)) + goto fail_features; + event->index = features[i].end; + event->start = false; + event->feature = feature; + } + feature_events.qsort (); + /* Add a strategic final event. */ + { + active_feature_t feature; + feature.rec.feature = HB_TAG_NONE; + feature.rec.setting = 0; + feature.order = num_features + 1; + + feature_event_t *event = feature_events.push (); + if (unlikely (!event)) + goto fail_features; + event->index = 0; /* This value does magic. */ + event->start = false; + event->feature = feature; + } + + /* Scan events and save features for each range. */ + hb_auto_array_t active_features; + unsigned int last_index = 0; + for (unsigned int i = 0; i < feature_events.len; i++) + { + feature_event_t *event = &feature_events[i]; + + if (event->index != last_index) + { + /* Save a snapshot of active features and the range. */ + range_record_t *range = range_records.push (); + if (unlikely (!range)) + goto fail_features; + + if (active_features.len) + { + CFMutableArrayRef features_array = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); + + /* TODO sort and resolve conflicting features? */ + /* active_features.qsort (); */ + for (unsigned int j = 0; j < active_features.len; j++) + { + CFStringRef keys[2] = { + kCTFontFeatureTypeIdentifierKey, + kCTFontFeatureSelectorIdentifierKey + }; + CFNumberRef values[2] = { + CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &active_features[j].rec.feature), + CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &active_features[j].rec.setting) + }; + CFDictionaryRef dict = CFDictionaryCreate (kCFAllocatorDefault, + (const void **) keys, + (const void **) values, + 2, + &kCFTypeDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); + CFRelease (values[0]); + CFRelease (values[1]); + + CFArrayAppendValue (features_array, dict); + CFRelease (dict); + + } + + CFDictionaryRef attributes = CFDictionaryCreate (kCFAllocatorDefault, + (const void **) &kCTFontFeatureSettingsAttribute, + (const void **) &features_array, + 1, + &kCFTypeDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); + CFRelease (features_array); + + CTFontDescriptorRef font_desc = CTFontDescriptorCreateWithAttributes (attributes); + CFRelease (attributes); + + range->font = CTFontCreateCopyWithAttributes (face_data->ct_font, 0.0, NULL, font_desc); + CFRelease (font_desc); + } + else + { + range->font = NULL; + } + + range->index_first = last_index; + range->index_last = event->index - 1; + + last_index = event->index; + } + + if (event->start) { + active_feature_t *feature = active_features.push (); + if (unlikely (!feature)) + goto fail_features; + *feature = event->feature; + } else { + active_feature_t *feature = active_features.find (&event->feature); + if (feature) + active_features.remove (feature - active_features.array); + } + } + + if (!range_records.len) /* No active feature found. */ + goto fail_features; + } + else + { + fail_features: + num_features = 0; + } + + unsigned int scratch_size; + hb_buffer_t::scratch_buffer_t *scratch = buffer->get_scratch_buffer (&scratch_size); + +#define ALLOCATE_ARRAY(Type, name, len, on_no_room) \ + Type *name = (Type *) scratch; \ + { \ + unsigned int _consumed = DIV_CEIL ((len) * sizeof (Type), sizeof (*scratch)); \ + if (unlikely (_consumed > scratch_size)) \ + { \ + on_no_room; \ + assert (0); \ + } \ + scratch += _consumed; \ + scratch_size -= _consumed; \ + } + + ALLOCATE_ARRAY (UniChar, pchars, buffer->len * 2, /*nothing*/); + unsigned int chars_len = 0; + for (unsigned int i = 0; i < buffer->len; i++) { + hb_codepoint_t c = buffer->info[i].codepoint; + if (likely (c <= 0xFFFFu)) + pchars[chars_len++] = c; + else if (unlikely (c > 0x10FFFFu)) + pchars[chars_len++] = 0xFFFDu; + else { + pchars[chars_len++] = 0xD800u + ((c - 0x10000u) >> 10); + pchars[chars_len++] = 0xDC00u + ((c - 0x10000u) & ((1u << 10) - 1)); + } + } + + ALLOCATE_ARRAY (unsigned int, log_clusters, chars_len, /*nothing*/); + chars_len = 0; + for (unsigned int i = 0; i < buffer->len; i++) + { + hb_codepoint_t c = buffer->info[i].codepoint; + unsigned int cluster = buffer->info[i].cluster; + log_clusters[chars_len++] = cluster; + if (hb_in_range (c, 0x10000u, 0x10FFFFu)) + log_clusters[chars_len++] = cluster; /* Surrogates. */ + } + +#define FAIL(...) \ + HB_STMT_START { \ + DEBUG_MSG (CORETEXT, NULL, __VA_ARGS__); \ + ret = false; \ + goto fail; \ + } HB_STMT_END; + + bool ret = true; + CFStringRef string_ref = NULL; + CTLineRef line = NULL; + + if (0) + { +resize_and_retry: + DEBUG_MSG (CORETEXT, buffer, "Buffer resize"); + /* string_ref uses the scratch-buffer for backing store, and line references + * string_ref (via attr_string). We must release those before resizing buffer. */ + assert (string_ref); + assert (line); + CFRelease (string_ref); + CFRelease (line); + string_ref = NULL; + line = NULL; + + /* Get previous start-of-scratch-area, that we use later for readjusting + * our existing scratch arrays. */ + unsigned int old_scratch_used; + hb_buffer_t::scratch_buffer_t *old_scratch; + old_scratch = buffer->get_scratch_buffer (&old_scratch_used); + old_scratch_used = scratch - old_scratch; + + if (unlikely (!buffer->ensure (buffer->allocated * 2))) + FAIL ("Buffer resize failed"); + + /* Adjust scratch, pchars, and log_cluster arrays. This is ugly, but really the + * cleanest way to do without completely restructuring the rest of this shaper. */ + scratch = buffer->get_scratch_buffer (&scratch_size); + pchars = reinterpret_cast (((char *) scratch + ((char *) pchars - (char *) old_scratch))); + log_clusters = reinterpret_cast (((char *) scratch + ((char *) log_clusters - (char *) old_scratch))); + scratch += old_scratch_used; + scratch_size -= old_scratch_used; + } + { + string_ref = CFStringCreateWithCharactersNoCopy (NULL, + pchars, chars_len, + kCFAllocatorNull); + if (unlikely (!string_ref)) + FAIL ("CFStringCreateWithCharactersNoCopy failed"); + + /* Create an attributed string, populate it, and create a line from it, then release attributed string. */ + { + CFMutableAttributedStringRef attr_string = CFAttributedStringCreateMutable (kCFAllocatorDefault, + chars_len); + if (unlikely (!attr_string)) + FAIL ("CFAttributedStringCreateMutable failed"); + CFAttributedStringReplaceString (attr_string, CFRangeMake (0, 0), string_ref); + if (HB_DIRECTION_IS_VERTICAL (buffer->props.direction)) + { + CFAttributedStringSetAttribute (attr_string, CFRangeMake (0, chars_len), + kCTVerticalFormsAttributeName, kCFBooleanTrue); + } + + if (buffer->props.language) + { +/* What's the iOS equivalent of this check? + * The symbols was introduced in iOS 7.0. + * At any rate, our fallback is safe and works fine. */ +#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090 +# define kCTLanguageAttributeName CFSTR ("NSLanguage") +#endif + CFStringRef lang = CFStringCreateWithCStringNoCopy (kCFAllocatorDefault, + hb_language_to_string (buffer->props.language), + kCFStringEncodingUTF8, + kCFAllocatorNull); + if (unlikely (!lang)) + FAIL ("CFStringCreateWithCStringNoCopy failed"); + CFAttributedStringSetAttribute (attr_string, CFRangeMake (0, chars_len), + kCTLanguageAttributeName, lang); + CFRelease (lang); + } + CFAttributedStringSetAttribute (attr_string, CFRangeMake (0, chars_len), + kCTFontAttributeName, face_data->ct_font); + + if (num_features) + { + unsigned int start = 0; + range_record_t *last_range = &range_records[0]; + for (unsigned int k = 0; k < chars_len; k++) + { + range_record_t *range = last_range; + while (log_clusters[k] < range->index_first) + range--; + while (log_clusters[k] > range->index_last) + range++; + if (range != last_range) + { + if (last_range->font) + CFAttributedStringSetAttribute (attr_string, CFRangeMake (start, k - start), + kCTFontAttributeName, last_range->font); + + start = k; + } + + last_range = range; + } + if (start != chars_len && last_range->font) + CFAttributedStringSetAttribute (attr_string, CFRangeMake (start, chars_len - start), + kCTFontAttributeName, last_range->font); + } + + int level = HB_DIRECTION_IS_FORWARD (buffer->props.direction) ? 0 : 1; + CFNumberRef level_number = CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &level); + CFDictionaryRef options = CFDictionaryCreate (kCFAllocatorDefault, + (const void **) &kCTTypesetterOptionForcedEmbeddingLevel, + (const void **) &level_number, + 1, + &kCFTypeDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); + if (unlikely (!options)) + FAIL ("CFDictionaryCreate failed"); + + CTTypesetterRef typesetter = CTTypesetterCreateWithAttributedStringAndOptions (attr_string, options); + CFRelease (options); + CFRelease (attr_string); + if (unlikely (!typesetter)) + FAIL ("CTTypesetterCreateWithAttributedStringAndOptions failed"); + + line = CTTypesetterCreateLine (typesetter, CFRangeMake(0, 0)); + CFRelease (typesetter); + if (unlikely (!line)) + FAIL ("CTTypesetterCreateLine failed"); + } + + CFArrayRef glyph_runs = CTLineGetGlyphRuns (line); + unsigned int num_runs = CFArrayGetCount (glyph_runs); + DEBUG_MSG (CORETEXT, NULL, "Num runs: %d", num_runs); + + buffer->len = 0; + uint32_t status_and = ~0, status_or = 0; + double advances_so_far = 0; + /* For right-to-left runs, CoreText returns the glyphs positioned such that + * any trailing whitespace is to the left of (0,0). Adjust coordinate system + * to fix for that. Test with any RTL string with trailing spaces. + * https://code.google.com/p/chromium/issues/detail?id=469028 + */ + if (HB_DIRECTION_IS_BACKWARD (buffer->props.direction)) + { + advances_so_far -= CTLineGetTrailingWhitespaceWidth (line); + if (HB_DIRECTION_IS_VERTICAL (buffer->props.direction)) + advances_so_far = -advances_so_far; + } + + const CFRange range_all = CFRangeMake (0, 0); + + for (unsigned int i = 0; i < num_runs; i++) + { + CTRunRef run = static_cast(CFArrayGetValueAtIndex (glyph_runs, i)); + CTRunStatus run_status = CTRunGetStatus (run); + status_or |= run_status; + status_and &= run_status; + DEBUG_MSG (CORETEXT, run, "CTRunStatus: %x", run_status); + double run_advance = CTRunGetTypographicBounds (run, range_all, NULL, NULL, NULL); + if (HB_DIRECTION_IS_VERTICAL (buffer->props.direction)) + run_advance = -run_advance; + DEBUG_MSG (CORETEXT, run, "Run advance: %g", run_advance); + + /* CoreText does automatic font fallback (AKA "cascading") for characters + * not supported by the requested font, and provides no way to turn it off, + * so we must detect if the returned run uses a font other than the requested + * one and fill in the buffer with .notdef glyphs instead of random glyph + * indices from a different font. + */ + CFDictionaryRef attributes = CTRunGetAttributes (run); + CTFontRef run_ct_font = static_cast(CFDictionaryGetValue (attributes, kCTFontAttributeName)); + if (!CFEqual (run_ct_font, face_data->ct_font)) + { + /* The run doesn't use our main font instance. We have to figure out + * whether font fallback happened, or this is just CoreText giving us + * another CTFont using the same underlying CGFont. CoreText seems + * to do that in a variety of situations, one of which being vertical + * text, but also perhaps for caching reasons. + * + * First, see if it uses any of our subfonts created to set font features... + * + * Next, compare the CGFont to the one we used to create our fonts. + * Even this doesn't work all the time. + * + * Finally, we compare PS names, which I don't think are unique... + * + * Looks like if we really want to be sure here we have to modify the + * font to change the name table, similar to what we do in the uniscribe + * backend. + * + * However, even that wouldn't work if we were passed in the CGFont to + * construct a hb_face to begin with. + * + * See: http://github.com/behdad/harfbuzz/pull/36 + * + * Also see: https://bugs.chromium.org/p/chromium/issues/detail?id=597098 + */ + bool matched = false; + for (unsigned int i = 0; i < range_records.len; i++) + if (range_records[i].font && CFEqual (run_ct_font, range_records[i].font)) + { + matched = true; + break; + } + if (!matched) + { + CGFontRef run_cg_font = CTFontCopyGraphicsFont (run_ct_font, 0); + if (run_cg_font) + { + matched = CFEqual (run_cg_font, face_data->cg_font); + CFRelease (run_cg_font); + } + } + if (!matched) + { + CFStringRef font_ps_name = CTFontCopyName (face_data->ct_font, kCTFontPostScriptNameKey); + CFStringRef run_ps_name = CTFontCopyName (run_ct_font, kCTFontPostScriptNameKey); + CFComparisonResult result = CFStringCompare (run_ps_name, font_ps_name, 0); + CFRelease (run_ps_name); + CFRelease (font_ps_name); + if (result == kCFCompareEqualTo) + matched = true; + } + if (!matched) + { + CFRange range = CTRunGetStringRange (run); + DEBUG_MSG (CORETEXT, run, "Run used fallback font: %ld..%ld", + range.location, range.location + range.length); + if (!buffer->ensure_inplace (buffer->len + range.length)) + goto resize_and_retry; + hb_glyph_info_t *info = buffer->info + buffer->len; + + hb_codepoint_t notdef = 0; + hb_direction_t dir = buffer->props.direction; + hb_position_t x_advance, y_advance, x_offset, y_offset; + hb_font_get_glyph_advance_for_direction (font, notdef, dir, &x_advance, &y_advance); + hb_font_get_glyph_origin_for_direction (font, notdef, dir, &x_offset, &y_offset); + hb_position_t advance = x_advance + y_advance; + x_offset = -x_offset; + y_offset = -y_offset; + + unsigned int old_len = buffer->len; + for (CFIndex j = range.location; j < range.location + range.length; j++) + { + UniChar ch = CFStringGetCharacterAtIndex (string_ref, j); + if (hb_in_range (ch, 0xDC00u, 0xDFFFu) && range.location < j) + { + ch = CFStringGetCharacterAtIndex (string_ref, j - 1); + if (hb_in_range (ch, 0xD800u, 0xDBFFu)) + /* This is the second of a surrogate pair. Don't need .notdef + * for this one. */ + continue; + } + if (buffer->unicode->is_default_ignorable (ch)) + continue; + + info->codepoint = notdef; + info->cluster = log_clusters[j]; + + info->mask = advance; + info->var1.i32 = x_offset; + info->var2.i32 = y_offset; + + info++; + buffer->len++; + } + if (HB_DIRECTION_IS_BACKWARD (buffer->props.direction)) + buffer->reverse_range (old_len, buffer->len); + advances_so_far += run_advance; + continue; + } + } + + unsigned int num_glyphs = CTRunGetGlyphCount (run); + if (num_glyphs == 0) + continue; + + if (!buffer->ensure_inplace (buffer->len + num_glyphs)) + goto resize_and_retry; + + hb_glyph_info_t *run_info = buffer->info + buffer->len; + + /* Testing used to indicate that CTRunGetGlyphsPtr, etc (almost?) always + * succeed, and so copying data to our own buffer will be rare. Reports + * have it that this changed in OS X 10.10 Yosemite, and NULL is returned + * frequently. At any rate, we can test that codepath by setting USE_PTR + * to false. */ + +#define USE_PTR true + +#define SCRATCH_SAVE() \ + unsigned int scratch_size_saved = scratch_size; \ + hb_buffer_t::scratch_buffer_t *scratch_saved = scratch + +#define SCRATCH_RESTORE() \ + scratch_size = scratch_size_saved; \ + scratch = scratch_saved; + + { /* Setup glyphs */ + SCRATCH_SAVE(); + const CGGlyph* glyphs = USE_PTR ? CTRunGetGlyphsPtr (run) : NULL; + if (!glyphs) { + ALLOCATE_ARRAY (CGGlyph, glyph_buf, num_glyphs, goto resize_and_retry); + CTRunGetGlyphs (run, range_all, glyph_buf); + glyphs = glyph_buf; + } + const CFIndex* string_indices = USE_PTR ? CTRunGetStringIndicesPtr (run) : NULL; + if (!string_indices) { + ALLOCATE_ARRAY (CFIndex, index_buf, num_glyphs, goto resize_and_retry); + CTRunGetStringIndices (run, range_all, index_buf); + string_indices = index_buf; + } + hb_glyph_info_t *info = run_info; + for (unsigned int j = 0; j < num_glyphs; j++) + { + info->codepoint = glyphs[j]; + info->cluster = log_clusters[string_indices[j]]; + info++; + } + SCRATCH_RESTORE(); + } + { + /* Setup positions. + * Note that CoreText does not return advances for glyphs. As such, + * for all but last glyph, we use the delta position to next glyph as + * advance (in the advance direction only), and for last glyph we set + * whatever is needed to make the whole run's advance add up. */ + SCRATCH_SAVE(); + const CGPoint* positions = USE_PTR ? CTRunGetPositionsPtr (run) : NULL; + if (!positions) { + ALLOCATE_ARRAY (CGPoint, position_buf, num_glyphs, goto resize_and_retry); + CTRunGetPositions (run, range_all, position_buf); + positions = position_buf; + } + hb_glyph_info_t *info = run_info; + if (HB_DIRECTION_IS_HORIZONTAL (buffer->props.direction)) + { + hb_position_t x_offset = (positions[0].x - advances_so_far) * x_mult; + for (unsigned int j = 0; j < num_glyphs; j++) + { + double advance; + if (likely (j + 1 < num_glyphs)) + advance = positions[j + 1].x - positions[j].x; + else /* last glyph */ + advance = run_advance - (positions[j].x - positions[0].x); + info->mask = advance * x_mult; + info->var1.i32 = x_offset; + info->var2.i32 = positions[j].y * y_mult; + info++; + } + } + else + { + hb_position_t y_offset = (positions[0].y - advances_so_far) * y_mult; + for (unsigned int j = 0; j < num_glyphs; j++) + { + double advance; + if (likely (j + 1 < num_glyphs)) + advance = positions[j + 1].y - positions[j].y; + else /* last glyph */ + advance = run_advance - (positions[j].y - positions[0].y); + info->mask = advance * y_mult; + info->var1.i32 = positions[j].x * x_mult; + info->var2.i32 = y_offset; + info++; + } + } + SCRATCH_RESTORE(); + advances_so_far += run_advance; + } +#undef SCRATCH_RESTORE +#undef SCRATCH_SAVE +#undef USE_PTR +#undef ALLOCATE_ARRAY + + buffer->len += num_glyphs; + } + + /* Mac OS 10.6 doesn't have kCTTypesetterOptionForcedEmbeddingLevel, + * or if it does, it doesn't resepct it. So we get runs with wrong + * directions. As such, disable the assert... It wouldn't crash, but + * cursoring will be off... + * + * http://crbug.com/419769 + */ + if (0) + { + /* Make sure all runs had the expected direction. */ + bool backward = HB_DIRECTION_IS_BACKWARD (buffer->props.direction); + assert (bool (status_and & kCTRunStatusRightToLeft) == backward); + assert (bool (status_or & kCTRunStatusRightToLeft) == backward); + } + + buffer->clear_positions (); + + unsigned int count = buffer->len; + hb_glyph_info_t *info = buffer->info; + hb_glyph_position_t *pos = buffer->pos; + if (HB_DIRECTION_IS_HORIZONTAL (buffer->props.direction)) + for (unsigned int i = 0; i < count; i++) + { + pos->x_advance = info->mask; + pos->x_offset = info->var1.i32; + pos->y_offset = info->var2.i32; + info++, pos++; + } + else + for (unsigned int i = 0; i < count; i++) + { + pos->y_advance = info->mask; + pos->x_offset = info->var1.i32; + pos->y_offset = info->var2.i32; + info++, pos++; + } + + /* Fix up clusters so that we never return out-of-order indices; + * if core text has reordered glyphs, we'll merge them to the + * beginning of the reordered cluster. CoreText is nice enough + * to tell us whenever it has produced nonmonotonic results... + * Note that we assume the input clusters were nonmonotonic to + * begin with. + * + * This does *not* mean we'll form the same clusters as Uniscribe + * or the native OT backend, only that the cluster indices will be + * monotonic in the output buffer. */ + if (count > 1 && (status_or & kCTRunStatusNonMonotonic)) + { + hb_glyph_info_t *info = buffer->info; + if (HB_DIRECTION_IS_FORWARD (buffer->props.direction)) + { + unsigned int cluster = info[count - 1].cluster; + for (unsigned int i = count - 1; i > 0; i--) + { + cluster = MIN (cluster, info[i - 1].cluster); + info[i - 1].cluster = cluster; + } + } + else + { + unsigned int cluster = info[0].cluster; + for (unsigned int i = 1; i < count; i++) + { + cluster = MIN (cluster, info[i].cluster); + info[i].cluster = cluster; + } + } + } + } + +#undef FAIL + +fail: + if (string_ref) + CFRelease (string_ref); + if (line) + CFRelease (line); + + for (unsigned int i = 0; i < range_records.len; i++) + if (range_records[i].font) + CFRelease (range_records[i].font); + + return ret; +} + + +/* + * AAT shaper + */ + +/* + * shaper face data + */ + +struct hb_coretext_aat_shaper_face_data_t {}; + +hb_coretext_aat_shaper_face_data_t * +_hb_coretext_aat_shaper_face_data_create (hb_face_t *face) +{ + hb_blob_t *mort_blob = face->reference_table (HB_CORETEXT_TAG_MORT); + /* Umm, we just reference the table to check whether it exists. + * Maybe add better API for this? */ + if (!hb_blob_get_length (mort_blob)) + { + hb_blob_destroy (mort_blob); + mort_blob = face->reference_table (HB_CORETEXT_TAG_MORX); + if (!hb_blob_get_length (mort_blob)) + { + hb_blob_destroy (mort_blob); + return NULL; + } + } + hb_blob_destroy (mort_blob); + + return hb_coretext_shaper_face_data_ensure (face) ? (hb_coretext_aat_shaper_face_data_t *) HB_SHAPER_DATA_SUCCEEDED : NULL; +} + +void +_hb_coretext_aat_shaper_face_data_destroy (hb_coretext_aat_shaper_face_data_t *data HB_UNUSED) +{ +} + + +/* + * shaper font data + */ + +struct hb_coretext_aat_shaper_font_data_t {}; + +hb_coretext_aat_shaper_font_data_t * +_hb_coretext_aat_shaper_font_data_create (hb_font_t *font) +{ + return hb_coretext_shaper_font_data_ensure (font) ? (hb_coretext_aat_shaper_font_data_t *) HB_SHAPER_DATA_SUCCEEDED : NULL; +} + +void +_hb_coretext_aat_shaper_font_data_destroy (hb_coretext_aat_shaper_font_data_t *data HB_UNUSED) +{ +} + + +/* + * shaper shape_plan data + */ + +struct hb_coretext_aat_shaper_shape_plan_data_t {}; + +hb_coretext_aat_shaper_shape_plan_data_t * +_hb_coretext_aat_shaper_shape_plan_data_create (hb_shape_plan_t *shape_plan HB_UNUSED, + const hb_feature_t *user_features HB_UNUSED, + unsigned int num_user_features HB_UNUSED, + const int *coords HB_UNUSED, + unsigned int num_coords HB_UNUSED) +{ + return (hb_coretext_aat_shaper_shape_plan_data_t *) HB_SHAPER_DATA_SUCCEEDED; +} + +void +_hb_coretext_aat_shaper_shape_plan_data_destroy (hb_coretext_aat_shaper_shape_plan_data_t *data HB_UNUSED) +{ +} + + +/* + * shaper + */ + +hb_bool_t +_hb_coretext_aat_shape (hb_shape_plan_t *shape_plan, + hb_font_t *font, + hb_buffer_t *buffer, + const hb_feature_t *features, + unsigned int num_features) +{ + return _hb_coretext_shape (shape_plan, font, buffer, features, num_features); +} diff --git a/src/hb-coretext.h b/src/hb-coretext.h new file mode 100644 index 0000000..82066e4 --- /dev/null +++ b/src/hb-coretext.h @@ -0,0 +1,60 @@ +/* + * Copyright © 2012 Mozilla Foundation. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Mozilla Author(s): Jonathan Kew + */ + +#ifndef HB_CORETEXT_H +#define HB_CORETEXT_H + +#include "hb.h" + +#include +#if TARGET_OS_IPHONE +# include +# include +#else +# include +#endif + +HB_BEGIN_DECLS + + +#define HB_CORETEXT_TAG_MORT HB_TAG('m','o','r','t') +#define HB_CORETEXT_TAG_MORX HB_TAG('m','o','r','x') + + +HB_EXTERN hb_face_t * +hb_coretext_face_create (CGFontRef cg_font); + + +HB_EXTERN CGFontRef +hb_coretext_face_get_cg_font (hb_face_t *face); + +HB_EXTERN CTFontRef +hb_coretext_font_get_ct_font (hb_font_t *font); + + +HB_END_DECLS + +#endif /* HB_CORETEXT_H */ diff --git a/src/hb-deprecated.h b/src/hb-deprecated.h new file mode 100644 index 0000000..0398dfa --- /dev/null +++ b/src/hb-deprecated.h @@ -0,0 +1,61 @@ +/* + * Copyright © 2013 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_H_IN +#error "Include instead." +#endif + +#ifndef HB_DEPRECATED_H +#define HB_DEPRECATED_H + +#include "hb-common.h" +#include "hb-unicode.h" +#include "hb-font.h" + +HB_BEGIN_DECLS + +#ifndef HB_DISABLE_DEPRECATED + +#define HB_SCRIPT_CANADIAN_ABORIGINAL HB_SCRIPT_CANADIAN_SYLLABICS + +#define HB_BUFFER_FLAGS_DEFAULT HB_BUFFER_FLAG_DEFAULT +#define HB_BUFFER_SERIALIZE_FLAGS_DEFAULT HB_BUFFER_SERIALIZE_FLAG_DEFAULT + +typedef hb_bool_t (*hb_font_get_glyph_func_t) (hb_font_t *font, void *font_data, + hb_codepoint_t unicode, hb_codepoint_t variation_selector, + hb_codepoint_t *glyph, + void *user_data); + +HB_EXTERN void +hb_font_funcs_set_glyph_func (hb_font_funcs_t *ffuncs, + hb_font_get_glyph_func_t func, + void *user_data, hb_destroy_func_t destroy); + +#endif + +HB_END_DECLS + +#endif /* HB_DEPRECATED_H */ diff --git a/src/hb-directwrite.cc b/src/hb-directwrite.cc new file mode 100644 index 0000000..d63bc04 --- /dev/null +++ b/src/hb-directwrite.cc @@ -0,0 +1,934 @@ +/* + * Copyright © 2015-2016 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + */ + +#define HB_SHAPER directwrite +#include "hb-shaper-impl-private.hh" + +#include + +#include "hb-directwrite.h" + + +#ifndef HB_DEBUG_DIRECTWRITE +#define HB_DEBUG_DIRECTWRITE (HB_DEBUG+0) +#endif + +HB_SHAPER_DATA_ENSURE_DECLARE(directwrite, face) +HB_SHAPER_DATA_ENSURE_DECLARE(directwrite, font) + + +/* + * DirectWrite font stream helpers + */ + +// This is a font loader which provides only one font (unlike its original design). +// For a better implementation which was also source of this +// and DWriteFontFileStream, have a look at to NativeFontResourceDWrite.cpp in Mozilla +class DWriteFontFileLoader : public IDWriteFontFileLoader +{ +private: + IDWriteFontFileStream *mFontFileStream; +public: + DWriteFontFileLoader (IDWriteFontFileStream *fontFileStream) { + mFontFileStream = fontFileStream; + } + + // IUnknown interface + IFACEMETHOD(QueryInterface)(IID const& iid, OUT void** ppObject) { return S_OK; } + IFACEMETHOD_(ULONG, AddRef)() { return 1; } + IFACEMETHOD_(ULONG, Release)() { return 1; } + + // IDWriteFontFileLoader methods + virtual HRESULT STDMETHODCALLTYPE CreateStreamFromKey(void const* fontFileReferenceKey, + UINT32 fontFileReferenceKeySize, + OUT IDWriteFontFileStream** fontFileStream) + { + *fontFileStream = mFontFileStream; + return S_OK; + } +}; + +class DWriteFontFileStream : public IDWriteFontFileStream +{ +private: + uint8_t *mData; + uint32_t mSize; +public: + DWriteFontFileStream(uint8_t *aData, uint32_t aSize) + { + mData = aData; + mSize = aSize; + } + + // IUnknown interface + IFACEMETHOD(QueryInterface)(IID const& iid, OUT void** ppObject) { return S_OK; } + IFACEMETHOD_(ULONG, AddRef)() { return 1; } + IFACEMETHOD_(ULONG, Release)() { return 1; } + + // IDWriteFontFileStream methods + virtual HRESULT STDMETHODCALLTYPE ReadFileFragment(void const** fragmentStart, + UINT64 fileOffset, + UINT64 fragmentSize, + OUT void** fragmentContext) + { + // We are required to do bounds checking. + if (fileOffset + fragmentSize > mSize) { + return E_FAIL; + } + + // truncate the 64 bit fileOffset to size_t sized index into mData + size_t index = static_cast (fileOffset); + + // We should be alive for the duration of this. + *fragmentStart = &mData[index]; + *fragmentContext = nullptr; + return S_OK; + } + + virtual void STDMETHODCALLTYPE ReleaseFileFragment(void* fragmentContext) { } + + virtual HRESULT STDMETHODCALLTYPE GetFileSize(OUT UINT64* fileSize) + { + *fileSize = mSize; + return S_OK; + } + + virtual HRESULT STDMETHODCALLTYPE GetLastWriteTime(OUT UINT64* lastWriteTime) + { + return E_NOTIMPL; + } +}; + + +/* +* shaper face data +*/ + +struct hb_directwrite_shaper_face_data_t { + IDWriteFactory *dwriteFactory; + IDWriteFontFile *fontFile; + IDWriteFontFileStream *fontFileStream; + IDWriteFontFileLoader *fontFileLoader; + IDWriteFontFace *fontFace; + hb_blob_t *faceBlob; +}; + +hb_directwrite_shaper_face_data_t * +_hb_directwrite_shaper_face_data_create(hb_face_t *face) +{ + hb_directwrite_shaper_face_data_t *data = + (hb_directwrite_shaper_face_data_t *) malloc (sizeof (hb_directwrite_shaper_face_data_t)); + if (unlikely (!data)) + return NULL; + + // TODO: factory and fontFileLoader should be cached separately + IDWriteFactory* dwriteFactory; + DWriteCreateFactory ( + DWRITE_FACTORY_TYPE_SHARED, + __uuidof (IDWriteFactory), + (IUnknown**) &dwriteFactory + ); + + HRESULT hr; + hb_blob_t *blob = hb_face_reference_blob (face); + IDWriteFontFileStream *fontFileStream = new DWriteFontFileStream ( + (uint8_t*) hb_blob_get_data (blob, NULL), hb_blob_get_length (blob)); + + IDWriteFontFileLoader *fontFileLoader = new DWriteFontFileLoader (fontFileStream); + dwriteFactory->RegisterFontFileLoader (fontFileLoader); + + IDWriteFontFile *fontFile; + uint64_t fontFileKey = 0; + hr = dwriteFactory->CreateCustomFontFileReference (&fontFileKey, sizeof (fontFileKey), + fontFileLoader, &fontFile); + +#define FAIL(...) \ + HB_STMT_START { \ + DEBUG_MSG (DIRECTWRITE, NULL, __VA_ARGS__); \ + return false; \ + } HB_STMT_END; + + if (FAILED (hr)) { + FAIL ("Failed to load font file from data!"); + return false; + } + + BOOL isSupported; + DWRITE_FONT_FILE_TYPE fileType; + DWRITE_FONT_FACE_TYPE faceType; + UINT32 numberOfFaces; + hr = fontFile->Analyze (&isSupported, &fileType, &faceType, &numberOfFaces); + if (FAILED (hr) || !isSupported) { + FAIL ("Font file is not supported."); + return false; + } + +#undef FAIL + + IDWriteFontFace *fontFace; + dwriteFactory->CreateFontFace (faceType, 1, &fontFile, 0, + DWRITE_FONT_SIMULATIONS_NONE, &fontFace); + + data->dwriteFactory = dwriteFactory; + data->fontFile = fontFile; + data->fontFileStream = fontFileStream; + data->fontFileLoader = fontFileLoader; + data->fontFace = fontFace; + data->faceBlob = blob; + + return data; +} + +void +_hb_directwrite_shaper_face_data_destroy(hb_directwrite_shaper_face_data_t *data) +{ + if (data->fontFace) + data->fontFace->Release (); + if (data->fontFile) + data->fontFile->Release (); + if (data->dwriteFactory) { + if (data->fontFileLoader) + data->dwriteFactory->UnregisterFontFileLoader (data->fontFileLoader); + data->dwriteFactory->Release (); + } + if (data->fontFileLoader) + delete data->fontFileLoader; + if (data->fontFileStream) + delete data->fontFileStream; + if (data->faceBlob) + hb_blob_destroy (data->faceBlob); + if (data) + free (data); +} + + +/* + * shaper font data + */ + +struct hb_directwrite_shaper_font_data_t { +}; + +hb_directwrite_shaper_font_data_t * +_hb_directwrite_shaper_font_data_create (hb_font_t *font) +{ + if (unlikely (!hb_directwrite_shaper_face_data_ensure (font->face))) return NULL; + + hb_directwrite_shaper_font_data_t *data = + (hb_directwrite_shaper_font_data_t *) malloc (sizeof (hb_directwrite_shaper_font_data_t)); + if (unlikely (!data)) + return NULL; + + return data; +} + +void +_hb_directwrite_shaper_font_data_destroy (hb_directwrite_shaper_font_data_t *data) +{ + free (data); +} + + +/* + * shaper shape_plan data + */ + +struct hb_directwrite_shaper_shape_plan_data_t {}; + +hb_directwrite_shaper_shape_plan_data_t * +_hb_directwrite_shaper_shape_plan_data_create (hb_shape_plan_t *shape_plan HB_UNUSED, + const hb_feature_t *user_features HB_UNUSED, + unsigned int num_user_features HB_UNUSED, + const int *coords HB_UNUSED, + unsigned int num_coords HB_UNUSED) +{ + return (hb_directwrite_shaper_shape_plan_data_t *) HB_SHAPER_DATA_SUCCEEDED; +} + +void +_hb_directwrite_shaper_shape_plan_data_destroy (hb_directwrite_shaper_shape_plan_data_t *data HB_UNUSED) +{ +} + +// Most of TextAnalysis is originally written by Bas Schouten for Mozilla project +// but now is relicensed to MIT for HarfBuzz use +class TextAnalysis + : public IDWriteTextAnalysisSource, public IDWriteTextAnalysisSink +{ +public: + + IFACEMETHOD(QueryInterface)(IID const& iid, OUT void** ppObject) { return S_OK; } + IFACEMETHOD_(ULONG, AddRef)() { return 1; } + IFACEMETHOD_(ULONG, Release)() { return 1; } + + // A single contiguous run of characters containing the same analysis + // results. + struct Run + { + uint32_t mTextStart; // starting text position of this run + uint32_t mTextLength; // number of contiguous code units covered + uint32_t mGlyphStart; // starting glyph in the glyphs array + uint32_t mGlyphCount; // number of glyphs associated with this run of + // text + DWRITE_SCRIPT_ANALYSIS mScript; + uint8_t mBidiLevel; + bool mIsSideways; + + inline bool ContainsTextPosition(uint32_t aTextPosition) const + { + return aTextPosition >= mTextStart + && aTextPosition < mTextStart + mTextLength; + } + + Run *nextRun; + }; + +public: + TextAnalysis(const wchar_t* text, + uint32_t textLength, + const wchar_t* localeName, + DWRITE_READING_DIRECTION readingDirection) + : mText(text) + , mTextLength(textLength) + , mLocaleName(localeName) + , mReadingDirection(readingDirection) + , mCurrentRun(NULL) { }; + + ~TextAnalysis() { + // delete runs, except mRunHead which is part of the TextAnalysis object + for (Run *run = mRunHead.nextRun; run;) { + Run *origRun = run; + run = run->nextRun; + free (origRun); + } + } + + STDMETHODIMP GenerateResults(IDWriteTextAnalyzer* textAnalyzer, + Run **runHead) { + // Analyzes the text using the script analyzer and returns + // the result as a series of runs. + + HRESULT hr = S_OK; + + // Initially start out with one result that covers the entire range. + // This result will be subdivided by the analysis processes. + mRunHead.mTextStart = 0; + mRunHead.mTextLength = mTextLength; + mRunHead.mBidiLevel = + (mReadingDirection == DWRITE_READING_DIRECTION_RIGHT_TO_LEFT); + mRunHead.nextRun = NULL; + mCurrentRun = &mRunHead; + + // Call each of the analyzers in sequence, recording their results. + if (SUCCEEDED (hr = textAnalyzer->AnalyzeScript (this, 0, mTextLength, this))) { + *runHead = &mRunHead; + } + + return hr; + } + + // IDWriteTextAnalysisSource implementation + + IFACEMETHODIMP GetTextAtPosition(uint32_t textPosition, + OUT wchar_t const** textString, + OUT uint32_t* textLength) + { + if (textPosition >= mTextLength) { + // No text at this position, valid query though. + *textString = NULL; + *textLength = 0; + } + else { + *textString = mText + textPosition; + *textLength = mTextLength - textPosition; + } + return S_OK; + } + + IFACEMETHODIMP GetTextBeforePosition(uint32_t textPosition, + OUT wchar_t const** textString, + OUT uint32_t* textLength) + { + if (textPosition == 0 || textPosition > mTextLength) { + // Either there is no text before here (== 0), or this + // is an invalid position. The query is considered valid thouh. + *textString = NULL; + *textLength = 0; + } + else { + *textString = mText; + *textLength = textPosition; + } + return S_OK; + } + + IFACEMETHODIMP_(DWRITE_READING_DIRECTION) + GetParagraphReadingDirection() { return mReadingDirection; } + + IFACEMETHODIMP GetLocaleName(uint32_t textPosition, + uint32_t* textLength, + wchar_t const** localeName) + { + return S_OK; + } + + IFACEMETHODIMP + GetNumberSubstitution(uint32_t textPosition, + OUT uint32_t* textLength, + OUT IDWriteNumberSubstitution** numberSubstitution) + { + // We do not support number substitution. + *numberSubstitution = NULL; + *textLength = mTextLength - textPosition; + + return S_OK; + } + + // IDWriteTextAnalysisSink implementation + + IFACEMETHODIMP + SetScriptAnalysis(uint32_t textPosition, + uint32_t textLength, + DWRITE_SCRIPT_ANALYSIS const* scriptAnalysis) + { + SetCurrentRun(textPosition); + SplitCurrentRun(textPosition); + while (textLength > 0) + { + Run *run = FetchNextRun(&textLength); + run->mScript = *scriptAnalysis; + } + + return S_OK; + } + + IFACEMETHODIMP + SetLineBreakpoints(uint32_t textPosition, + uint32_t textLength, + const DWRITE_LINE_BREAKPOINT* lineBreakpoints) { return S_OK; } + + IFACEMETHODIMP SetBidiLevel(uint32_t textPosition, + uint32_t textLength, + uint8_t explicitLevel, + uint8_t resolvedLevel) { return S_OK; } + + IFACEMETHODIMP + SetNumberSubstitution(uint32_t textPosition, + uint32_t textLength, + IDWriteNumberSubstitution* numberSubstitution) { return S_OK; } + +protected: + Run *FetchNextRun(IN OUT uint32_t* textLength) + { + // Used by the sink setters, this returns a reference to the next run. + // Position and length are adjusted to now point after the current run + // being returned. + + Run *origRun = mCurrentRun; + // Split the tail if needed (the length remaining is less than the + // current run's size). + if (*textLength < mCurrentRun->mTextLength) + { + SplitCurrentRun (mCurrentRun->mTextStart + *textLength); + } + else + { + // Just advance the current run. + mCurrentRun = mCurrentRun->nextRun; + } + *textLength -= origRun->mTextLength; + + // Return a reference to the run that was just current. + return origRun; + } + + void SetCurrentRun(uint32_t textPosition) + { + // Move the current run to the given position. + // Since the analyzers generally return results in a forward manner, + // this will usually just return early. If not, find the + // corresponding run for the text position. + + if (mCurrentRun && mCurrentRun->ContainsTextPosition (textPosition)) + { + return; + } + + for (Run *run = &mRunHead; run; run = run->nextRun) { + if (run->ContainsTextPosition (textPosition)) + { + mCurrentRun = run; + return; + } + } + //NS_NOTREACHED("We should always be able to find the text position in one \ + // of our runs"); + } + + void SplitCurrentRun(uint32_t splitPosition) + { + if (!mCurrentRun) + { + //NS_ASSERTION(false, "SplitCurrentRun called without current run."); + // Shouldn't be calling this when no current run is set! + return; + } + // Split the current run. + if (splitPosition <= mCurrentRun->mTextStart) + { + // No need to split, already the start of a run + // or before it. Usually the first. + return; + } + Run *newRun = (Run*) malloc (sizeof (Run)); + + *newRun = *mCurrentRun; + + // Insert the new run in our linked list. + newRun->nextRun = mCurrentRun->nextRun; + mCurrentRun->nextRun = newRun; + + // Adjust runs' text positions and lengths. + uint32_t splitPoint = splitPosition - mCurrentRun->mTextStart; + newRun->mTextStart += splitPoint; + newRun->mTextLength -= splitPoint; + mCurrentRun->mTextLength = splitPoint; + mCurrentRun = newRun; + } + +protected: + // Input + // (weak references are fine here, since this class is a transient + // stack-based helper that doesn't need to copy data) + uint32_t mTextLength; + const wchar_t* mText; + const wchar_t* mLocaleName; + DWRITE_READING_DIRECTION mReadingDirection; + + // Current processing state. + Run *mCurrentRun; + + // Output is a list of runs starting here + Run mRunHead; +}; + +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); } + +/* + * shaper + */ + +static hb_bool_t +_hb_directwrite_shape_full(hb_shape_plan_t *shape_plan, + hb_font_t *font, + hb_buffer_t *buffer, + const hb_feature_t *features, + unsigned int num_features, + float lineWidth) +{ + hb_face_t *face = font->face; + hb_directwrite_shaper_face_data_t *face_data = HB_SHAPER_DATA_GET (face); + hb_directwrite_shaper_font_data_t *font_data = HB_SHAPER_DATA_GET (font); + IDWriteFactory *dwriteFactory = face_data->dwriteFactory; + IDWriteFontFace *fontFace = face_data->fontFace; + + IDWriteTextAnalyzer* analyzer; + dwriteFactory->CreateTextAnalyzer(&analyzer); + + unsigned int scratch_size; + hb_buffer_t::scratch_buffer_t *scratch = buffer->get_scratch_buffer (&scratch_size); +#define ALLOCATE_ARRAY(Type, name, len) \ + Type *name = (Type *) scratch; \ + { \ + unsigned int _consumed = DIV_CEIL ((len) * sizeof (Type), sizeof (*scratch)); \ + assert (_consumed <= scratch_size); \ + scratch += _consumed; \ + scratch_size -= _consumed; \ + } + +#define utf16_index() var1.u32 + + ALLOCATE_ARRAY(wchar_t, textString, buffer->len * 2); + + unsigned int chars_len = 0; + for (unsigned int i = 0; i < buffer->len; i++) + { + hb_codepoint_t c = buffer->info[i].codepoint; + buffer->info[i].utf16_index() = chars_len; + if (likely(c <= 0xFFFFu)) + textString[chars_len++] = c; + else if (unlikely(c > 0x10FFFFu)) + textString[chars_len++] = 0xFFFDu; + else { + textString[chars_len++] = 0xD800u + ((c - 0x10000u) >> 10); + textString[chars_len++] = 0xDC00u + ((c - 0x10000u) & ((1u << 10) - 1)); + } + } + + ALLOCATE_ARRAY(WORD, log_clusters, chars_len); + // if (num_features) + { + /* Need log_clusters to assign features. */ + chars_len = 0; + for (unsigned int i = 0; i < buffer->len; i++) + { + hb_codepoint_t c = buffer->info[i].codepoint; + unsigned int cluster = buffer->info[i].cluster; + log_clusters[chars_len++] = cluster; + if (hb_in_range(c, 0x10000u, 0x10FFFFu)) + log_clusters[chars_len++] = cluster; /* Surrogates. */ + } + } + + // TODO: Handle TEST_DISABLE_OPTIONAL_LIGATURES + + DWRITE_READING_DIRECTION readingDirection = buffer->props.direction ? + DWRITE_READING_DIRECTION_RIGHT_TO_LEFT : + DWRITE_READING_DIRECTION_LEFT_TO_RIGHT; + + /* + * There's an internal 16-bit limit on some things inside the analyzer, + * but we never attempt to shape a word longer than 64K characters + * in a single gfxShapedWord, so we cannot exceed that limit. + */ + uint32_t textLength = buffer->len; + + TextAnalysis analysis(textString, textLength, NULL, readingDirection); + TextAnalysis::Run *runHead; + HRESULT hr; + hr = analysis.GenerateResults(analyzer, &runHead); + +#define FAIL(...) \ + HB_STMT_START { \ + DEBUG_MSG (DIRECTWRITE, NULL, __VA_ARGS__); \ + return false; \ + } HB_STMT_END; + + if (FAILED (hr)) + { + FAIL ("Analyzer failed to generate results."); + return false; + } + + uint32_t maxGlyphCount = 3 * textLength / 2 + 16; + uint32_t glyphCount; + bool isRightToLeft = HB_DIRECTION_IS_BACKWARD (buffer->props.direction); + + const wchar_t localeName[20] = {0}; + if (buffer->props.language != NULL) + { + mbstowcs ((wchar_t*) localeName, + hb_language_to_string (buffer->props.language), 20); + } + + DWRITE_TYPOGRAPHIC_FEATURES singleFeatures; + singleFeatures.featureCount = num_features; + if (num_features) + { + DWRITE_FONT_FEATURE* dwfeatureArray = (DWRITE_FONT_FEATURE*) + malloc (sizeof (DWRITE_FONT_FEATURE) * num_features); + for (unsigned int i = 0; i < num_features; ++i) + { + dwfeatureArray[i].nameTag = (DWRITE_FONT_FEATURE_TAG) + hb_uint32_swap (features[i].tag); + dwfeatureArray[i].parameter = features[i].value; + } + singleFeatures.features = dwfeatureArray; + } + const DWRITE_TYPOGRAPHIC_FEATURES* dwFeatures = + (const DWRITE_TYPOGRAPHIC_FEATURES*) &singleFeatures; + const uint32_t featureRangeLengths[] = { textLength }; + + uint16_t* clusterMap = (uint16_t*) malloc (textLength * sizeof (uint16_t)); + DWRITE_SHAPING_TEXT_PROPERTIES* textProperties = (DWRITE_SHAPING_TEXT_PROPERTIES*) + malloc (textLength * sizeof (DWRITE_SHAPING_TEXT_PROPERTIES)); +retry_getglyphs: + uint16_t* glyphIndices = (uint16_t*) malloc (maxGlyphCount * sizeof (uint16_t)); + DWRITE_SHAPING_GLYPH_PROPERTIES* glyphProperties = (DWRITE_SHAPING_GLYPH_PROPERTIES*) + malloc (maxGlyphCount * sizeof (DWRITE_SHAPING_GLYPH_PROPERTIES)); + + hr = analyzer->GetGlyphs (textString, textLength, fontFace, false, + isRightToLeft, &runHead->mScript, localeName, NULL, &dwFeatures, + featureRangeLengths, 1, maxGlyphCount, clusterMap, textProperties, glyphIndices, + glyphProperties, &glyphCount); + + if (unlikely (hr == HRESULT_FROM_WIN32 (ERROR_INSUFFICIENT_BUFFER))) + { + free (glyphIndices); + free (glyphProperties); + + maxGlyphCount *= 2; + + goto retry_getglyphs; + } + if (FAILED (hr)) + { + FAIL ("Analyzer failed to get glyphs."); + return false; + } + + float* glyphAdvances = (float*) malloc (maxGlyphCount * sizeof (float)); + DWRITE_GLYPH_OFFSET* glyphOffsets = (DWRITE_GLYPH_OFFSET*) + malloc(maxGlyphCount * sizeof (DWRITE_GLYPH_OFFSET)); + + /* The -2 in the following is to compensate for possible + * alignment needed after the WORD array. sizeof(WORD) == 2. */ + unsigned int glyphs_size = (scratch_size * sizeof(int) - 2) + / (sizeof(WORD) + + sizeof(DWRITE_SHAPING_GLYPH_PROPERTIES) + + sizeof(int) + + sizeof(DWRITE_GLYPH_OFFSET) + + sizeof(uint32_t)); + ALLOCATE_ARRAY (uint32_t, vis_clusters, glyphs_size); + +#undef ALLOCATE_ARRAY + + int fontEmSize = font->face->get_upem(); + if (fontEmSize < 0) + fontEmSize = -fontEmSize; + + if (fontEmSize < 0) + fontEmSize = -fontEmSize; + double x_mult = (double) font->x_scale / fontEmSize; + double y_mult = (double) font->y_scale / fontEmSize; + + hr = analyzer->GetGlyphPlacements (textString, + clusterMap, textProperties, textLength, glyphIndices, + glyphProperties, glyphCount, fontFace, fontEmSize, + false, isRightToLeft, &runHead->mScript, localeName, + &dwFeatures, featureRangeLengths, 1, + glyphAdvances, glyphOffsets); + + if (FAILED (hr)) + { + FAIL ("Analyzer failed to get glyph placements."); + return false; + } + + IDWriteTextAnalyzer1* analyzer1; + analyzer->QueryInterface (&analyzer1); + + if (analyzer1 && lineWidth) + { + + DWRITE_JUSTIFICATION_OPPORTUNITY* justificationOpportunities = + (DWRITE_JUSTIFICATION_OPPORTUNITY*) + malloc (maxGlyphCount * sizeof (DWRITE_JUSTIFICATION_OPPORTUNITY)); + hr = analyzer1->GetJustificationOpportunities (fontFace, fontEmSize, + runHead->mScript, textLength, glyphCount, textString, clusterMap, + glyphProperties, justificationOpportunities); + + if (FAILED (hr)) + { + FAIL ("Analyzer failed to get justification opportunities."); + return false; + } + + float* justifiedGlyphAdvances = + (float*) malloc (maxGlyphCount * sizeof (float)); + DWRITE_GLYPH_OFFSET* justifiedGlyphOffsets = (DWRITE_GLYPH_OFFSET*) + malloc (glyphCount * sizeof (DWRITE_GLYPH_OFFSET)); + hr = analyzer1->JustifyGlyphAdvances (lineWidth, glyphCount, justificationOpportunities, + glyphAdvances, glyphOffsets, justifiedGlyphAdvances, justifiedGlyphOffsets); + + if (FAILED (hr)) + { + FAIL("Analyzer failed to get justified glyph advances."); + return false; + } + + DWRITE_SCRIPT_PROPERTIES scriptProperties; + hr = analyzer1->GetScriptProperties (runHead->mScript, &scriptProperties); + if (FAILED (hr)) + { + FAIL("Analyzer failed to get script properties."); + return false; + } + uint32_t justificationCharacter = scriptProperties.justificationCharacter; + + // if a script justificationCharacter is not space, it can have GetJustifiedGlyphs + if (justificationCharacter != 32) + { + uint16_t* modifiedClusterMap = (uint16_t*) malloc (textLength * sizeof (uint16_t)); + retry_getjustifiedglyphs: + uint16_t* modifiedGlyphIndices = (uint16_t*) malloc (maxGlyphCount * sizeof (uint16_t)); + float* modifiedGlyphAdvances = (float*) malloc (maxGlyphCount * sizeof (float)); + DWRITE_GLYPH_OFFSET* modifiedGlyphOffsets = (DWRITE_GLYPH_OFFSET*) + malloc (maxGlyphCount * sizeof (DWRITE_GLYPH_OFFSET)); + uint32_t actualGlyphsCount; + hr = analyzer1->GetJustifiedGlyphs (fontFace, fontEmSize, runHead->mScript, + textLength, glyphCount, maxGlyphCount, clusterMap, glyphIndices, + glyphAdvances, justifiedGlyphAdvances, justifiedGlyphOffsets, + glyphProperties, &actualGlyphsCount, modifiedClusterMap, modifiedGlyphIndices, + modifiedGlyphAdvances, modifiedGlyphOffsets); + + if (hr == HRESULT_FROM_WIN32 (ERROR_INSUFFICIENT_BUFFER)) + { + maxGlyphCount = actualGlyphsCount; + free (modifiedGlyphIndices); + free (modifiedGlyphAdvances); + free (modifiedGlyphOffsets); + + maxGlyphCount = actualGlyphsCount; + + goto retry_getjustifiedglyphs; + } + if (FAILED (hr)) + { + FAIL ("Analyzer failed to get justified glyphs."); + return false; + } + + free (clusterMap); + free (glyphIndices); + free (glyphAdvances); + free (glyphOffsets); + + glyphCount = actualGlyphsCount; + clusterMap = modifiedClusterMap; + glyphIndices = modifiedGlyphIndices; + glyphAdvances = modifiedGlyphAdvances; + glyphOffsets = modifiedGlyphOffsets; + + free (justifiedGlyphAdvances); + free (justifiedGlyphOffsets); + } + else + { + free (glyphAdvances); + free (glyphOffsets); + + glyphAdvances = justifiedGlyphAdvances; + glyphOffsets = justifiedGlyphOffsets; + } + + free (justificationOpportunities); + + } + + /* Ok, we've got everything we need, now compose output buffer, + * very, *very*, carefully! */ + + /* Calculate visual-clusters. That's what we ship. */ + for (unsigned int i = 0; i < glyphCount; i++) + vis_clusters[i] = -1; + for (unsigned int i = 0; i < buffer->len; i++) + { + uint32_t *p = + &vis_clusters[log_clusters[buffer->info[i].utf16_index()]]; + *p = MIN (*p, buffer->info[i].cluster); + } + for (unsigned int i = 1; i < glyphCount; i++) + if (vis_clusters[i] == -1) + vis_clusters[i] = vis_clusters[i - 1]; + +#undef utf16_index + + if (unlikely (!buffer->ensure (glyphCount))) + FAIL ("Buffer in error"); + +#undef FAIL + + /* Set glyph infos */ + buffer->len = 0; + for (unsigned int i = 0; i < glyphCount; i++) + { + hb_glyph_info_t *info = &buffer->info[buffer->len++]; + + info->codepoint = glyphIndices[i]; + info->cluster = vis_clusters[i]; + + /* The rest is crap. Let's store position info there for now. */ + info->mask = glyphAdvances[i]; + info->var1.i32 = glyphOffsets[i].advanceOffset; + info->var2.i32 = glyphOffsets[i].ascenderOffset; + } + + /* Set glyph positions */ + buffer->clear_positions (); + for (unsigned int i = 0; i < glyphCount; i++) + { + hb_glyph_info_t *info = &buffer->info[i]; + hb_glyph_position_t *pos = &buffer->pos[i]; + + /* TODO vertical */ + pos->x_advance = x_mult * (int32_t) info->mask; + pos->x_offset = + x_mult * (isRightToLeft ? -info->var1.i32 : info->var1.i32); + pos->y_offset = y_mult * info->var2.i32; + } + + if (isRightToLeft) + hb_buffer_reverse (buffer); + + free (clusterMap); + free (glyphIndices); + free (textProperties); + free (glyphProperties); + free (glyphAdvances); + free (glyphOffsets); + + if (num_features) + free (singleFeatures.features); + + /* Wow, done! */ + return true; +} + +hb_bool_t +_hb_directwrite_shape(hb_shape_plan_t *shape_plan, + hb_font_t *font, + hb_buffer_t *buffer, + const hb_feature_t *features, + unsigned int num_features) +{ + return _hb_directwrite_shape_full(shape_plan, font, buffer, + features, num_features, 0); +} + +/* + * Public [experimental] API + */ + +hb_bool_t +hb_directwrite_shape_experimental_width(hb_font_t *font, + hb_buffer_t *buffer, + const hb_feature_t *features, + unsigned int num_features, + float width) +{ + static char *shapers = "directwrite"; + hb_shape_plan_t *shape_plan = hb_shape_plan_create_cached (font->face, + &buffer->props, features, num_features, &shapers); + hb_bool_t res = _hb_directwrite_shape_full (shape_plan, font, buffer, + features, num_features, width); + + if (res) + buffer->content_type = HB_BUFFER_CONTENT_TYPE_GLYPHS; + + return res; +} diff --git a/src/hb-directwrite.h b/src/hb-directwrite.h new file mode 100644 index 0000000..e743af2 --- /dev/null +++ b/src/hb-directwrite.h @@ -0,0 +1,38 @@ +/* + * Copyright © 2015 Ebrahim Byagowi + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + */ + +#ifndef HB_DIRECTWRITE_H +#define HB_DIRECTWRITE_H + +#include "hb.h" + +HB_BEGIN_DECLS + +HB_EXTERN hb_bool_t +hb_directwrite_shape_experimental_width(hb_font_t *font, hb_buffer_t *buffer, + const hb_feature_t *features, unsigned int num_features, float width); + +HB_END_DECLS + +#endif /* HB_DIRECTWRITE_H */ diff --git a/src/hb-face-private.hh b/src/hb-face-private.hh new file mode 100644 index 0000000..43e7b1c --- /dev/null +++ b/src/hb-face-private.hh @@ -0,0 +1,111 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * Copyright © 2011 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_FACE_PRIVATE_HH +#define HB_FACE_PRIVATE_HH + +#include "hb-private.hh" + +#include "hb-object-private.hh" +#include "hb-shaper-private.hh" +#include "hb-shape-plan-private.hh" + + +/* + * hb_face_t + */ + +struct hb_face_t { + hb_object_header_t header; + ASSERT_POD (); + + hb_bool_t immutable; + + hb_reference_table_func_t reference_table_func; + void *user_data; + hb_destroy_func_t destroy; + + unsigned int index; /* Face index in a collection, zero-based. */ + mutable unsigned int upem; /* Units-per-EM. */ + mutable unsigned int num_glyphs; /* Number of glyphs. */ + + struct hb_shaper_data_t shaper_data; /* Various shaper data. */ + + /* Various non-shaping data. */ + /* ... */ + + /* Cache */ + struct plan_node_t { + hb_shape_plan_t *shape_plan; + plan_node_t *next; + } *shape_plans; + + + inline hb_blob_t *reference_table (hb_tag_t tag) const + { + hb_blob_t *blob; + + if (unlikely (!reference_table_func)) + return hb_blob_get_empty (); + + blob = reference_table_func (/*XXX*/const_cast (this), tag, user_data); + if (unlikely (!blob)) + return hb_blob_get_empty (); + + return blob; + } + + inline HB_PURE_FUNC unsigned int get_upem (void) const + { + if (unlikely (!upem)) + load_upem (); + return upem; + } + + inline unsigned int get_num_glyphs (void) const + { + if (unlikely (num_glyphs == (unsigned int) -1)) + load_num_glyphs (); + return num_glyphs; + } + + private: + HB_INTERNAL void load_upem (void) const; + HB_INTERNAL void load_num_glyphs (void) const; +}; + +extern HB_INTERNAL const hb_face_t _hb_face_nil; + +#define HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS +#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_PROTOTYPE(shaper, face); +#include "hb-shaper-list.hh" +#undef HB_SHAPER_IMPLEMENT +#undef HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS + + +#endif /* HB_FACE_PRIVATE_HH */ diff --git a/src/hb-face.cc b/src/hb-face.cc new file mode 100644 index 0000000..1ba9707 --- /dev/null +++ b/src/hb-face.cc @@ -0,0 +1,475 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * Copyright © 2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#include "hb-private.hh" + +#include "hb-face-private.hh" +#include "hb-open-file-private.hh" +#include "hb-ot-head-table.hh" +#include "hb-ot-maxp-table.hh" + + +/* + * hb_face_t + */ + +const hb_face_t _hb_face_nil = { + HB_OBJECT_HEADER_STATIC, + + true, /* immutable */ + + NULL, /* reference_table_func */ + NULL, /* user_data */ + NULL, /* destroy */ + + 0, /* index */ + 1000, /* upem */ + 0, /* num_glyphs */ + + { +#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_INVALID, +#include "hb-shaper-list.hh" +#undef HB_SHAPER_IMPLEMENT + }, + + NULL, /* shape_plans */ +}; + + +/** + * hb_face_create_for_tables: + * @reference_table_func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Return value: (transfer full) + * + * Since: 0.9.2 + **/ +hb_face_t * +hb_face_create_for_tables (hb_reference_table_func_t reference_table_func, + void *user_data, + hb_destroy_func_t destroy) +{ + hb_face_t *face; + + if (!reference_table_func || !(face = hb_object_create ())) { + if (destroy) + destroy (user_data); + return hb_face_get_empty (); + } + + face->reference_table_func = reference_table_func; + face->user_data = user_data; + face->destroy = destroy; + + face->upem = 0; + face->num_glyphs = (unsigned int) -1; + + return face; +} + + +typedef struct hb_face_for_data_closure_t { + hb_blob_t *blob; + unsigned int index; +} hb_face_for_data_closure_t; + +static hb_face_for_data_closure_t * +_hb_face_for_data_closure_create (hb_blob_t *blob, unsigned int index) +{ + hb_face_for_data_closure_t *closure; + + closure = (hb_face_for_data_closure_t *) calloc (1, sizeof (hb_face_for_data_closure_t)); + if (unlikely (!closure)) + return NULL; + + closure->blob = blob; + closure->index = index; + + return closure; +} + +static void +_hb_face_for_data_closure_destroy (hb_face_for_data_closure_t *closure) +{ + hb_blob_destroy (closure->blob); + free (closure); +} + +static hb_blob_t * +_hb_face_for_data_reference_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data) +{ + hb_face_for_data_closure_t *data = (hb_face_for_data_closure_t *) user_data; + + if (tag == HB_TAG_NONE) + return hb_blob_reference (data->blob); + + const OT::OpenTypeFontFile &ot_file = *OT::Sanitizer::lock_instance (data->blob); + const OT::OpenTypeFontFace &ot_face = ot_file.get_face (data->index); + + const OT::OpenTypeTable &table = ot_face.get_table_by_tag (tag); + + hb_blob_t *blob = hb_blob_create_sub_blob (data->blob, table.offset, table.length); + + return blob; +} + +/** + * hb_face_create: (Xconstructor) + * @blob: + * @index: + * + * + * + * Return value: (transfer full): + * + * Since: 0.9.2 + **/ +hb_face_t * +hb_face_create (hb_blob_t *blob, + unsigned int index) +{ + hb_face_t *face; + + if (unlikely (!blob)) + blob = hb_blob_get_empty (); + + hb_face_for_data_closure_t *closure = _hb_face_for_data_closure_create (OT::Sanitizer::sanitize (hb_blob_reference (blob)), index); + + if (unlikely (!closure)) + return hb_face_get_empty (); + + face = hb_face_create_for_tables (_hb_face_for_data_reference_table, + closure, + (hb_destroy_func_t) _hb_face_for_data_closure_destroy); + + hb_face_set_index (face, index); + + return face; +} + +/** + * hb_face_get_empty: + * + * + * + * Return value: (transfer full) + * + * Since: 0.9.2 + **/ +hb_face_t * +hb_face_get_empty (void) +{ + return const_cast (&_hb_face_nil); +} + + +/** + * hb_face_reference: (skip) + * @face: a face. + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_face_t * +hb_face_reference (hb_face_t *face) +{ + return hb_object_reference (face); +} + +/** + * hb_face_destroy: (skip) + * @face: a face. + * + * + * + * Since: 0.9.2 + **/ +void +hb_face_destroy (hb_face_t *face) +{ + if (!hb_object_destroy (face)) return; + + for (hb_face_t::plan_node_t *node = face->shape_plans; node; ) + { + hb_face_t::plan_node_t *next = node->next; + hb_shape_plan_destroy (node->shape_plan); + free (node); + node = next; + } + +#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_DESTROY(shaper, face); +#include "hb-shaper-list.hh" +#undef HB_SHAPER_IMPLEMENT + + if (face->destroy) + face->destroy (face->user_data); + + free (face); +} + +/** + * hb_face_set_user_data: (skip) + * @face: a face. + * @key: + * @data: + * @destroy: + * @replace: + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_face_set_user_data (hb_face_t *face, + hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace) +{ + return hb_object_set_user_data (face, key, data, destroy, replace); +} + +/** + * hb_face_get_user_data: (skip) + * @face: a face. + * @key: + * + * + * + * Return value: (transfer none): + * + * Since: 0.9.2 + **/ +void * +hb_face_get_user_data (hb_face_t *face, + hb_user_data_key_t *key) +{ + return hb_object_get_user_data (face, key); +} + +/** + * hb_face_make_immutable: + * @face: a face. + * + * + * + * Since: 0.9.2 + **/ +void +hb_face_make_immutable (hb_face_t *face) +{ + if (unlikely (hb_object_is_inert (face))) + return; + + face->immutable = true; +} + +/** + * hb_face_is_immutable: + * @face: a face. + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_face_is_immutable (hb_face_t *face) +{ + return face->immutable; +} + + +/** + * hb_face_reference_table: + * @face: a face. + * @tag: + * + * + * + * Return value: (transfer full): + * + * Since: 0.9.2 + **/ +hb_blob_t * +hb_face_reference_table (hb_face_t *face, + hb_tag_t tag) +{ + return face->reference_table (tag); +} + +/** + * hb_face_reference_blob: + * @face: a face. + * + * + * + * Return value: (transfer full): + * + * Since: 0.9.2 + **/ +hb_blob_t * +hb_face_reference_blob (hb_face_t *face) +{ + return face->reference_table (HB_TAG_NONE); +} + +/** + * hb_face_set_index: + * @face: a face. + * @index: + * + * + * + * Since: 0.9.2 + **/ +void +hb_face_set_index (hb_face_t *face, + unsigned int index) +{ + if (face->immutable) + return; + + face->index = index; +} + +/** + * hb_face_get_index: + * @face: a face. + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +unsigned int +hb_face_get_index (hb_face_t *face) +{ + return face->index; +} + +/** + * hb_face_set_upem: + * @face: a face. + * @upem: + * + * + * + * Since: 0.9.2 + **/ +void +hb_face_set_upem (hb_face_t *face, + unsigned int upem) +{ + if (face->immutable) + return; + + face->upem = upem; +} + +/** + * hb_face_get_upem: + * @face: a face. + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +unsigned int +hb_face_get_upem (hb_face_t *face) +{ + return face->get_upem (); +} + +void +hb_face_t::load_upem (void) const +{ + hb_blob_t *head_blob = OT::Sanitizer::sanitize (reference_table (HB_OT_TAG_head)); + const OT::head *head_table = OT::Sanitizer::lock_instance (head_blob); + upem = head_table->get_upem (); + hb_blob_destroy (head_blob); +} + +/** + * hb_face_set_glyph_count: + * @face: a face. + * @glyph_count: + * + * + * + * Since: 0.9.7 + **/ +void +hb_face_set_glyph_count (hb_face_t *face, + unsigned int glyph_count) +{ + if (face->immutable) + return; + + face->num_glyphs = glyph_count; +} + +/** + * hb_face_get_glyph_count: + * @face: a face. + * + * + * + * Return value: + * + * Since: 0.9.7 + **/ +unsigned int +hb_face_get_glyph_count (hb_face_t *face) +{ + return face->get_num_glyphs (); +} + +void +hb_face_t::load_num_glyphs (void) const +{ + hb_blob_t *maxp_blob = OT::Sanitizer::sanitize (reference_table (HB_OT_TAG_maxp)); + const OT::maxp *maxp_table = OT::Sanitizer::lock_instance (maxp_blob); + num_glyphs = maxp_table->get_num_glyphs (); + hb_blob_destroy (maxp_blob); +} + + diff --git a/src/hb-face.h b/src/hb-face.h new file mode 100644 index 0000000..91237b7 --- /dev/null +++ b/src/hb-face.h @@ -0,0 +1,117 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + */ + +#ifndef HB_H_IN +#error "Include instead." +#endif + +#ifndef HB_FACE_H +#define HB_FACE_H + +#include "hb-common.h" +#include "hb-blob.h" + +HB_BEGIN_DECLS + + +/* + * hb_face_t + */ + +typedef struct hb_face_t hb_face_t; + +HB_EXTERN hb_face_t * +hb_face_create (hb_blob_t *blob, + unsigned int index); + +typedef hb_blob_t * (*hb_reference_table_func_t) (hb_face_t *face, hb_tag_t tag, void *user_data); + +/* calls destroy() when not needing user_data anymore */ +HB_EXTERN hb_face_t * +hb_face_create_for_tables (hb_reference_table_func_t reference_table_func, + void *user_data, + hb_destroy_func_t destroy); + +HB_EXTERN hb_face_t * +hb_face_get_empty (void); + +HB_EXTERN hb_face_t * +hb_face_reference (hb_face_t *face); + +HB_EXTERN void +hb_face_destroy (hb_face_t *face); + +HB_EXTERN hb_bool_t +hb_face_set_user_data (hb_face_t *face, + hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace); + + +HB_EXTERN void * +hb_face_get_user_data (hb_face_t *face, + hb_user_data_key_t *key); + +HB_EXTERN void +hb_face_make_immutable (hb_face_t *face); + +HB_EXTERN hb_bool_t +hb_face_is_immutable (hb_face_t *face); + + +HB_EXTERN hb_blob_t * +hb_face_reference_table (hb_face_t *face, + hb_tag_t tag); + +HB_EXTERN hb_blob_t * +hb_face_reference_blob (hb_face_t *face); + +HB_EXTERN void +hb_face_set_index (hb_face_t *face, + unsigned int index); + +HB_EXTERN unsigned int +hb_face_get_index (hb_face_t *face); + +HB_EXTERN void +hb_face_set_upem (hb_face_t *face, + unsigned int upem); + +HB_EXTERN unsigned int +hb_face_get_upem (hb_face_t *face); + +HB_EXTERN void +hb_face_set_glyph_count (hb_face_t *face, + unsigned int glyph_count); + +HB_EXTERN unsigned int +hb_face_get_glyph_count (hb_face_t *face); + + +HB_END_DECLS + +#endif /* HB_FACE_H */ diff --git a/src/hb-fallback-shape.cc b/src/hb-fallback-shape.cc new file mode 100644 index 0000000..ac6d4b0 --- /dev/null +++ b/src/hb-fallback-shape.cc @@ -0,0 +1,143 @@ +/* + * Copyright © 2011 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#define HB_SHAPER fallback +#include "hb-shaper-impl-private.hh" + + +/* + * shaper face data + */ + +struct hb_fallback_shaper_face_data_t {}; + +hb_fallback_shaper_face_data_t * +_hb_fallback_shaper_face_data_create (hb_face_t *face HB_UNUSED) +{ + return (hb_fallback_shaper_face_data_t *) HB_SHAPER_DATA_SUCCEEDED; +} + +void +_hb_fallback_shaper_face_data_destroy (hb_fallback_shaper_face_data_t *data HB_UNUSED) +{ +} + + +/* + * shaper font data + */ + +struct hb_fallback_shaper_font_data_t {}; + +hb_fallback_shaper_font_data_t * +_hb_fallback_shaper_font_data_create (hb_font_t *font HB_UNUSED) +{ + return (hb_fallback_shaper_font_data_t *) HB_SHAPER_DATA_SUCCEEDED; +} + +void +_hb_fallback_shaper_font_data_destroy (hb_fallback_shaper_font_data_t *data HB_UNUSED) +{ +} + + +/* + * shaper shape_plan data + */ + +struct hb_fallback_shaper_shape_plan_data_t {}; + +hb_fallback_shaper_shape_plan_data_t * +_hb_fallback_shaper_shape_plan_data_create (hb_shape_plan_t *shape_plan HB_UNUSED, + const hb_feature_t *user_features HB_UNUSED, + unsigned int num_user_features HB_UNUSED, + const int *coords HB_UNUSED, + unsigned int num_coords HB_UNUSED) +{ + return (hb_fallback_shaper_shape_plan_data_t *) HB_SHAPER_DATA_SUCCEEDED; +} + +void +_hb_fallback_shaper_shape_plan_data_destroy (hb_fallback_shaper_shape_plan_data_t *data HB_UNUSED) +{ +} + + +/* + * shaper + */ + +hb_bool_t +_hb_fallback_shape (hb_shape_plan_t *shape_plan HB_UNUSED, + hb_font_t *font, + hb_buffer_t *buffer, + const hb_feature_t *features HB_UNUSED, + unsigned int num_features HB_UNUSED) +{ + /* TODO + * + * - Apply fallback kern. + * - Handle Variation Selectors? + * - Apply normalization? + * + * This will make the fallback shaper into a dumb "TrueType" + * shaper which many people unfortunately still request. + */ + + hb_codepoint_t space; + bool has_space = (bool) font->get_nominal_glyph (' ', &space); + + buffer->clear_positions (); + + hb_direction_t direction = buffer->props.direction; + hb_unicode_funcs_t *unicode = buffer->unicode; + unsigned int count = buffer->len; + hb_glyph_info_t *info = buffer->info; + hb_glyph_position_t *pos = buffer->pos; + for (unsigned int i = 0; i < count; i++) + { + if (has_space && unicode->is_default_ignorable (info[i].codepoint)) { + info[i].codepoint = space; + pos[i].x_advance = 0; + pos[i].y_advance = 0; + continue; + } + font->get_nominal_glyph (info[i].codepoint, &info[i].codepoint); + font->get_glyph_advance_for_direction (info[i].codepoint, + direction, + &pos[i].x_advance, + &pos[i].y_advance); + font->subtract_glyph_origin_for_direction (info[i].codepoint, + direction, + &pos[i].x_offset, + &pos[i].y_offset); + } + + if (HB_DIRECTION_IS_BACKWARD (direction)) + hb_buffer_reverse (buffer); + + return true; +} diff --git a/src/hb-font-private.hh b/src/hb-font-private.hh new file mode 100644 index 0000000..53671d7 --- /dev/null +++ b/src/hb-font-private.hh @@ -0,0 +1,553 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * Copyright © 2011 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_FONT_PRIVATE_HH +#define HB_FONT_PRIVATE_HH + +#include "hb-private.hh" + +#include "hb-object-private.hh" +#include "hb-face-private.hh" +#include "hb-shaper-private.hh" + + + +/* + * hb_font_funcs_t + */ + +#define HB_FONT_FUNCS_IMPLEMENT_CALLBACKS \ + HB_FONT_FUNC_IMPLEMENT (font_h_extents) \ + HB_FONT_FUNC_IMPLEMENT (font_v_extents) \ + HB_FONT_FUNC_IMPLEMENT (nominal_glyph) \ + HB_FONT_FUNC_IMPLEMENT (variation_glyph) \ + HB_FONT_FUNC_IMPLEMENT (glyph_h_advance) \ + HB_FONT_FUNC_IMPLEMENT (glyph_v_advance) \ + HB_FONT_FUNC_IMPLEMENT (glyph_h_origin) \ + HB_FONT_FUNC_IMPLEMENT (glyph_v_origin) \ + HB_FONT_FUNC_IMPLEMENT (glyph_h_kerning) \ + HB_FONT_FUNC_IMPLEMENT (glyph_v_kerning) \ + HB_FONT_FUNC_IMPLEMENT (glyph_extents) \ + HB_FONT_FUNC_IMPLEMENT (glyph_contour_point) \ + HB_FONT_FUNC_IMPLEMENT (glyph_name) \ + HB_FONT_FUNC_IMPLEMENT (glyph_from_name) \ + /* ^--- Add new callbacks here */ + +struct hb_font_funcs_t { + hb_object_header_t header; + ASSERT_POD (); + + hb_bool_t immutable; + + struct { +#define HB_FONT_FUNC_IMPLEMENT(name) void *name; + HB_FONT_FUNCS_IMPLEMENT_CALLBACKS +#undef HB_FONT_FUNC_IMPLEMENT + } user_data; + + struct { +#define HB_FONT_FUNC_IMPLEMENT(name) hb_destroy_func_t name; + HB_FONT_FUNCS_IMPLEMENT_CALLBACKS +#undef HB_FONT_FUNC_IMPLEMENT + } destroy; + + /* Don't access these directly. Call font->get_*() instead. */ + union get_t { + struct get_funcs_t { +#define HB_FONT_FUNC_IMPLEMENT(name) hb_font_get_##name##_func_t name; + HB_FONT_FUNCS_IMPLEMENT_CALLBACKS +#undef HB_FONT_FUNC_IMPLEMENT + } f; + void (*array[VAR]) (void); + } get; +}; + + + +/* + * hb_font_t + */ + +struct hb_font_t { + hb_object_header_t header; + ASSERT_POD (); + + hb_bool_t immutable; + + hb_font_t *parent; + hb_face_t *face; + + int x_scale; + int y_scale; + + unsigned int x_ppem; + unsigned int y_ppem; + + /* Font variation coordinates. */ + unsigned int num_coords; + int *coords; + + hb_font_funcs_t *klass; + void *user_data; + hb_destroy_func_t destroy; + + struct hb_shaper_data_t shaper_data; + + + /* Convert from font-space to user-space */ + inline int dir_scale (hb_direction_t direction) + { return HB_DIRECTION_IS_VERTICAL(direction) ? y_scale : x_scale; } + inline hb_position_t em_scale_x (int16_t v) { return em_scale (v, x_scale); } + inline hb_position_t em_scale_y (int16_t v) { return em_scale (v, y_scale); } + inline hb_position_t em_scalef_x (float v) { return em_scalef (v, this->x_scale); } + inline hb_position_t em_scalef_y (float v) { return em_scalef (v, this->y_scale); } + inline hb_position_t em_scale_dir (int16_t v, hb_direction_t direction) + { return em_scale (v, dir_scale (direction)); } + + /* Convert from parent-font user-space to our user-space */ + inline hb_position_t parent_scale_x_distance (hb_position_t v) { + if (unlikely (parent && parent->x_scale != x_scale)) + return (hb_position_t) (v * (int64_t) this->x_scale / this->parent->x_scale); + return v; + } + inline hb_position_t parent_scale_y_distance (hb_position_t v) { + if (unlikely (parent && parent->y_scale != y_scale)) + return (hb_position_t) (v * (int64_t) this->y_scale / this->parent->y_scale); + return v; + } + inline hb_position_t parent_scale_x_position (hb_position_t v) { + return parent_scale_x_distance (v); + } + inline hb_position_t parent_scale_y_position (hb_position_t v) { + return parent_scale_y_distance (v); + } + + inline void parent_scale_distance (hb_position_t *x, hb_position_t *y) { + *x = parent_scale_x_distance (*x); + *y = parent_scale_y_distance (*y); + } + inline void parent_scale_position (hb_position_t *x, hb_position_t *y) { + *x = parent_scale_x_position (*x); + *y = parent_scale_y_position (*y); + } + + + /* Public getters */ + + HB_INTERNAL bool has_func (unsigned int i); + + /* has_* ... */ +#define HB_FONT_FUNC_IMPLEMENT(name) \ + bool \ + has_##name##_func (void) \ + { \ + hb_font_funcs_t *funcs = this->klass; \ + unsigned int i = offsetof (hb_font_funcs_t::get_t::get_funcs_t, name) / sizeof (funcs->get.array[0]); \ + return has_func (i); \ + } + HB_FONT_FUNCS_IMPLEMENT_CALLBACKS +#undef HB_FONT_FUNC_IMPLEMENT + + inline hb_bool_t get_font_h_extents (hb_font_extents_t *extents) + { + memset (extents, 0, sizeof (*extents)); + return klass->get.f.font_h_extents (this, user_data, + extents, + klass->user_data.font_h_extents); + } + inline hb_bool_t get_font_v_extents (hb_font_extents_t *extents) + { + memset (extents, 0, sizeof (*extents)); + return klass->get.f.font_v_extents (this, user_data, + extents, + klass->user_data.font_v_extents); + } + + inline bool has_glyph (hb_codepoint_t unicode) + { + hb_codepoint_t glyph; + return get_nominal_glyph (unicode, &glyph); + } + + inline hb_bool_t get_nominal_glyph (hb_codepoint_t unicode, + hb_codepoint_t *glyph) + { + *glyph = 0; + return klass->get.f.nominal_glyph (this, user_data, + unicode, glyph, + klass->user_data.nominal_glyph); + } + + inline hb_bool_t get_variation_glyph (hb_codepoint_t unicode, hb_codepoint_t variation_selector, + hb_codepoint_t *glyph) + { + *glyph = 0; + return klass->get.f.variation_glyph (this, user_data, + unicode, variation_selector, glyph, + klass->user_data.variation_glyph); + } + + inline hb_position_t get_glyph_h_advance (hb_codepoint_t glyph) + { + return klass->get.f.glyph_h_advance (this, user_data, + glyph, + klass->user_data.glyph_h_advance); + } + + inline hb_position_t get_glyph_v_advance (hb_codepoint_t glyph) + { + return klass->get.f.glyph_v_advance (this, user_data, + glyph, + klass->user_data.glyph_v_advance); + } + + inline hb_bool_t get_glyph_h_origin (hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y) + { + *x = *y = 0; + return klass->get.f.glyph_h_origin (this, user_data, + glyph, x, y, + klass->user_data.glyph_h_origin); + } + + inline hb_bool_t get_glyph_v_origin (hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y) + { + *x = *y = 0; + return klass->get.f.glyph_v_origin (this, user_data, + glyph, x, y, + klass->user_data.glyph_v_origin); + } + + inline hb_position_t get_glyph_h_kerning (hb_codepoint_t left_glyph, hb_codepoint_t right_glyph) + { + return klass->get.f.glyph_h_kerning (this, user_data, + left_glyph, right_glyph, + klass->user_data.glyph_h_kerning); + } + + inline hb_position_t get_glyph_v_kerning (hb_codepoint_t top_glyph, hb_codepoint_t bottom_glyph) + { + return klass->get.f.glyph_v_kerning (this, user_data, + top_glyph, bottom_glyph, + klass->user_data.glyph_v_kerning); + } + + inline hb_bool_t get_glyph_extents (hb_codepoint_t glyph, + hb_glyph_extents_t *extents) + { + memset (extents, 0, sizeof (*extents)); + return klass->get.f.glyph_extents (this, user_data, + glyph, + extents, + klass->user_data.glyph_extents); + } + + inline hb_bool_t get_glyph_contour_point (hb_codepoint_t glyph, unsigned int point_index, + hb_position_t *x, hb_position_t *y) + { + *x = *y = 0; + return klass->get.f.glyph_contour_point (this, user_data, + glyph, point_index, + x, y, + klass->user_data.glyph_contour_point); + } + + inline hb_bool_t get_glyph_name (hb_codepoint_t glyph, + char *name, unsigned int size) + { + if (size) *name = '\0'; + return klass->get.f.glyph_name (this, user_data, + glyph, + name, size, + klass->user_data.glyph_name); + } + + inline hb_bool_t get_glyph_from_name (const char *name, int len, /* -1 means nul-terminated */ + hb_codepoint_t *glyph) + { + *glyph = 0; + if (len == -1) len = strlen (name); + return klass->get.f.glyph_from_name (this, user_data, + name, len, + glyph, + klass->user_data.glyph_from_name); + } + + + /* A bit higher-level, and with fallback */ + + inline void get_h_extents_with_fallback (hb_font_extents_t *extents) + { + if (!get_font_h_extents (extents)) + { + extents->ascender = y_scale * .8; + extents->descender = extents->ascender - y_scale; + extents->line_gap = 0; + } + } + inline void get_v_extents_with_fallback (hb_font_extents_t *extents) + { + if (!get_font_v_extents (extents)) + { + extents->ascender = x_scale / 2; + extents->descender = extents->ascender - x_scale; + extents->line_gap = 0; + } + } + + inline void get_extents_for_direction (hb_direction_t direction, + hb_font_extents_t *extents) + { + if (likely (HB_DIRECTION_IS_HORIZONTAL (direction))) + get_h_extents_with_fallback (extents); + else + get_v_extents_with_fallback (extents); + } + + inline void get_glyph_advance_for_direction (hb_codepoint_t glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y) + { + if (likely (HB_DIRECTION_IS_HORIZONTAL (direction))) { + *x = get_glyph_h_advance (glyph); + *y = 0; + } else { + *x = 0; + *y = get_glyph_v_advance (glyph); + } + } + + inline void guess_v_origin_minus_h_origin (hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y) + { + *x = get_glyph_h_advance (glyph) / 2; + + /* TODO cache this somehow?! */ + hb_font_extents_t extents; + get_h_extents_with_fallback (&extents); + *y = extents.ascender; + } + + inline void get_glyph_h_origin_with_fallback (hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y) + { + if (!get_glyph_h_origin (glyph, x, y) && + get_glyph_v_origin (glyph, x, y)) + { + hb_position_t dx, dy; + guess_v_origin_minus_h_origin (glyph, &dx, &dy); + *x -= dx; *y -= dy; + } + } + inline void get_glyph_v_origin_with_fallback (hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y) + { + if (!get_glyph_v_origin (glyph, x, y) && + get_glyph_h_origin (glyph, x, y)) + { + hb_position_t dx, dy; + guess_v_origin_minus_h_origin (glyph, &dx, &dy); + *x += dx; *y += dy; + } + } + + inline void get_glyph_origin_for_direction (hb_codepoint_t glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y) + { + if (likely (HB_DIRECTION_IS_HORIZONTAL (direction))) + get_glyph_h_origin_with_fallback (glyph, x, y); + else + get_glyph_v_origin_with_fallback (glyph, x, y); + } + + inline void add_glyph_h_origin (hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y) + { + hb_position_t origin_x, origin_y; + + get_glyph_h_origin_with_fallback (glyph, &origin_x, &origin_y); + + *x += origin_x; + *y += origin_y; + } + inline void add_glyph_v_origin (hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y) + { + hb_position_t origin_x, origin_y; + + get_glyph_v_origin_with_fallback (glyph, &origin_x, &origin_y); + + *x += origin_x; + *y += origin_y; + } + inline void add_glyph_origin_for_direction (hb_codepoint_t glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y) + { + hb_position_t origin_x, origin_y; + + get_glyph_origin_for_direction (glyph, direction, &origin_x, &origin_y); + + *x += origin_x; + *y += origin_y; + } + + inline void subtract_glyph_h_origin (hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y) + { + hb_position_t origin_x, origin_y; + + get_glyph_h_origin_with_fallback (glyph, &origin_x, &origin_y); + + *x -= origin_x; + *y -= origin_y; + } + inline void subtract_glyph_v_origin (hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y) + { + hb_position_t origin_x, origin_y; + + get_glyph_v_origin_with_fallback (glyph, &origin_x, &origin_y); + + *x -= origin_x; + *y -= origin_y; + } + inline void subtract_glyph_origin_for_direction (hb_codepoint_t glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y) + { + hb_position_t origin_x, origin_y; + + get_glyph_origin_for_direction (glyph, direction, &origin_x, &origin_y); + + *x -= origin_x; + *y -= origin_y; + } + + inline void get_glyph_kerning_for_direction (hb_codepoint_t first_glyph, hb_codepoint_t second_glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y) + { + if (likely (HB_DIRECTION_IS_HORIZONTAL (direction))) { + *x = get_glyph_h_kerning (first_glyph, second_glyph); + *y = 0; + } else { + *x = 0; + *y = get_glyph_v_kerning (first_glyph, second_glyph); + } + } + + inline hb_bool_t get_glyph_extents_for_origin (hb_codepoint_t glyph, + hb_direction_t direction, + hb_glyph_extents_t *extents) + { + hb_bool_t ret = get_glyph_extents (glyph, extents); + + if (ret) + subtract_glyph_origin_for_direction (glyph, direction, &extents->x_bearing, &extents->y_bearing); + + return ret; + } + + inline hb_bool_t get_glyph_contour_point_for_origin (hb_codepoint_t glyph, unsigned int point_index, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y) + { + hb_bool_t ret = get_glyph_contour_point (glyph, point_index, x, y); + + if (ret) + subtract_glyph_origin_for_direction (glyph, direction, x, y); + + return ret; + } + + /* Generates gidDDD if glyph has no name. */ + inline void + glyph_to_string (hb_codepoint_t glyph, + char *s, unsigned int size) + { + if (get_glyph_name (glyph, s, size)) return; + + if (size && snprintf (s, size, "gid%u", glyph) < 0) + *s = '\0'; + } + + /* Parses gidDDD and uniUUUU strings automatically. */ + inline hb_bool_t + glyph_from_string (const char *s, int len, /* -1 means nul-terminated */ + hb_codepoint_t *glyph) + { + if (get_glyph_from_name (s, len, glyph)) return true; + + if (len == -1) len = strlen (s); + + /* Straight glyph index. */ + if (hb_codepoint_parse (s, len, 10, glyph)) + return true; + + if (len > 3) + { + /* gidDDD syntax for glyph indices. */ + if (0 == strncmp (s, "gid", 3) && + hb_codepoint_parse (s + 3, len - 3, 10, glyph)) + return true; + + /* uniUUUU and other Unicode character indices. */ + hb_codepoint_t unichar; + if (0 == strncmp (s, "uni", 3) && + hb_codepoint_parse (s + 3, len - 3, 16, &unichar) && + get_nominal_glyph (unichar, glyph)) + return true; + } + + return false; + } + + inline hb_position_t em_scale (int16_t v, int scale) + { + int upem = face->get_upem (); + int64_t scaled = v * (int64_t) scale; + scaled += scaled >= 0 ? upem/2 : -upem/2; /* Round. */ + return (hb_position_t) (scaled / upem); + } + inline hb_position_t em_scalef (float v, int scale) + { + return (hb_position_t) (v * scale / face->get_upem ()); + } +}; + +#define HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS +#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_PROTOTYPE(shaper, font); +#include "hb-shaper-list.hh" +#undef HB_SHAPER_IMPLEMENT +#undef HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS + + +#endif /* HB_FONT_PRIVATE_HH */ diff --git a/src/hb-font.cc b/src/hb-font.cc new file mode 100644 index 0000000..ea45501 --- /dev/null +++ b/src/hb-font.cc @@ -0,0 +1,1773 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * Copyright © 2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#include "hb-private.hh" + +#include "hb-font-private.hh" + + +/* + * hb_font_funcs_t + */ + +static hb_bool_t +hb_font_get_font_h_extents_nil (hb_font_t *font, + void *font_data HB_UNUSED, + hb_font_extents_t *metrics, + void *user_data HB_UNUSED) +{ + memset (metrics, 0, sizeof (*metrics)); + return false; +} +static hb_bool_t +hb_font_get_font_h_extents_parent (hb_font_t *font, + void *font_data HB_UNUSED, + hb_font_extents_t *metrics, + void *user_data HB_UNUSED) +{ + hb_bool_t ret = font->parent->get_font_h_extents (metrics); + if (ret) { + metrics->ascender = font->parent_scale_y_distance (metrics->ascender); + metrics->descender = font->parent_scale_y_distance (metrics->descender); + metrics->line_gap = font->parent_scale_y_distance (metrics->line_gap); + } + return ret; +} + +static hb_bool_t +hb_font_get_font_v_extents_nil (hb_font_t *font, + void *font_data HB_UNUSED, + hb_font_extents_t *metrics, + void *user_data HB_UNUSED) +{ + memset (metrics, 0, sizeof (*metrics)); + return false; +} +static hb_bool_t +hb_font_get_font_v_extents_parent (hb_font_t *font, + void *font_data HB_UNUSED, + hb_font_extents_t *metrics, + void *user_data HB_UNUSED) +{ + hb_bool_t ret = font->parent->get_font_v_extents (metrics); + if (ret) { + metrics->ascender = font->parent_scale_x_distance (metrics->ascender); + metrics->descender = font->parent_scale_x_distance (metrics->descender); + metrics->line_gap = font->parent_scale_x_distance (metrics->line_gap); + } + return ret; +} + +static hb_bool_t +hb_font_get_nominal_glyph_nil (hb_font_t *font HB_UNUSED, + void *font_data HB_UNUSED, + hb_codepoint_t unicode, + hb_codepoint_t *glyph, + void *user_data HB_UNUSED) +{ + *glyph = 0; + return false; +} +static hb_bool_t +hb_font_get_nominal_glyph_parent (hb_font_t *font, + void *font_data HB_UNUSED, + hb_codepoint_t unicode, + hb_codepoint_t *glyph, + void *user_data HB_UNUSED) +{ + return font->parent->get_nominal_glyph (unicode, glyph); +} + +static hb_bool_t +hb_font_get_variation_glyph_nil (hb_font_t *font HB_UNUSED, + void *font_data HB_UNUSED, + hb_codepoint_t unicode, + hb_codepoint_t variation_selector, + hb_codepoint_t *glyph, + void *user_data HB_UNUSED) +{ + *glyph = 0; + return false; +} +static hb_bool_t +hb_font_get_variation_glyph_parent (hb_font_t *font, + void *font_data HB_UNUSED, + hb_codepoint_t unicode, + hb_codepoint_t variation_selector, + hb_codepoint_t *glyph, + void *user_data HB_UNUSED) +{ + return font->parent->get_variation_glyph (unicode, variation_selector, glyph); +} + + +static hb_position_t +hb_font_get_glyph_h_advance_nil (hb_font_t *font HB_UNUSED, + void *font_data HB_UNUSED, + hb_codepoint_t glyph, + void *user_data HB_UNUSED) +{ + return font->x_scale; +} +static hb_position_t +hb_font_get_glyph_h_advance_parent (hb_font_t *font, + void *font_data HB_UNUSED, + hb_codepoint_t glyph, + void *user_data HB_UNUSED) +{ + return font->parent_scale_x_distance (font->parent->get_glyph_h_advance (glyph)); +} + +static hb_position_t +hb_font_get_glyph_v_advance_nil (hb_font_t *font HB_UNUSED, + void *font_data HB_UNUSED, + hb_codepoint_t glyph, + void *user_data HB_UNUSED) +{ + /* TODO use font_extents.ascender+descender */ + return font->y_scale; +} +static hb_position_t +hb_font_get_glyph_v_advance_parent (hb_font_t *font, + void *font_data HB_UNUSED, + hb_codepoint_t glyph, + void *user_data HB_UNUSED) +{ + return font->parent_scale_y_distance (font->parent->get_glyph_v_advance (glyph)); +} + +static hb_bool_t +hb_font_get_glyph_h_origin_nil (hb_font_t *font HB_UNUSED, + void *font_data HB_UNUSED, + hb_codepoint_t glyph, + hb_position_t *x, + hb_position_t *y, + void *user_data HB_UNUSED) +{ + *x = *y = 0; + return true; +} +static hb_bool_t +hb_font_get_glyph_h_origin_parent (hb_font_t *font, + void *font_data HB_UNUSED, + hb_codepoint_t glyph, + hb_position_t *x, + hb_position_t *y, + void *user_data HB_UNUSED) +{ + hb_bool_t ret = font->parent->get_glyph_h_origin (glyph, x, y); + if (ret) + font->parent_scale_position (x, y); + return ret; +} + +static hb_bool_t +hb_font_get_glyph_v_origin_nil (hb_font_t *font HB_UNUSED, + void *font_data HB_UNUSED, + hb_codepoint_t glyph, + hb_position_t *x, + hb_position_t *y, + void *user_data HB_UNUSED) +{ + *x = *y = 0; + return false; +} +static hb_bool_t +hb_font_get_glyph_v_origin_parent (hb_font_t *font, + void *font_data HB_UNUSED, + hb_codepoint_t glyph, + hb_position_t *x, + hb_position_t *y, + void *user_data HB_UNUSED) +{ + hb_bool_t ret = font->parent->get_glyph_v_origin (glyph, x, y); + if (ret) + font->parent_scale_position (x, y); + return ret; +} + +static hb_position_t +hb_font_get_glyph_h_kerning_nil (hb_font_t *font HB_UNUSED, + void *font_data HB_UNUSED, + hb_codepoint_t left_glyph, + hb_codepoint_t right_glyph, + void *user_data HB_UNUSED) +{ + return 0; +} +static hb_position_t +hb_font_get_glyph_h_kerning_parent (hb_font_t *font, + void *font_data HB_UNUSED, + hb_codepoint_t left_glyph, + hb_codepoint_t right_glyph, + void *user_data HB_UNUSED) +{ + return font->parent_scale_x_distance (font->parent->get_glyph_h_kerning (left_glyph, right_glyph)); +} + +static hb_position_t +hb_font_get_glyph_v_kerning_nil (hb_font_t *font HB_UNUSED, + void *font_data HB_UNUSED, + hb_codepoint_t top_glyph, + hb_codepoint_t bottom_glyph, + void *user_data HB_UNUSED) +{ + return 0; +} +static hb_position_t +hb_font_get_glyph_v_kerning_parent (hb_font_t *font, + void *font_data HB_UNUSED, + hb_codepoint_t top_glyph, + hb_codepoint_t bottom_glyph, + void *user_data HB_UNUSED) +{ + return font->parent_scale_y_distance (font->parent->get_glyph_v_kerning (top_glyph, bottom_glyph)); +} + +static hb_bool_t +hb_font_get_glyph_extents_nil (hb_font_t *font HB_UNUSED, + void *font_data HB_UNUSED, + hb_codepoint_t glyph, + hb_glyph_extents_t *extents, + void *user_data HB_UNUSED) +{ + memset (extents, 0, sizeof (*extents)); + return false; +} +static hb_bool_t +hb_font_get_glyph_extents_parent (hb_font_t *font, + void *font_data HB_UNUSED, + hb_codepoint_t glyph, + hb_glyph_extents_t *extents, + void *user_data HB_UNUSED) +{ + hb_bool_t ret = font->parent->get_glyph_extents (glyph, extents); + if (ret) { + font->parent_scale_position (&extents->x_bearing, &extents->y_bearing); + font->parent_scale_distance (&extents->width, &extents->height); + } + return ret; +} + +static hb_bool_t +hb_font_get_glyph_contour_point_nil (hb_font_t *font HB_UNUSED, + void *font_data HB_UNUSED, + hb_codepoint_t glyph, + unsigned int point_index, + hb_position_t *x, + hb_position_t *y, + void *user_data HB_UNUSED) +{ + *x = *y = 0; + return false; +} +static hb_bool_t +hb_font_get_glyph_contour_point_parent (hb_font_t *font, + void *font_data HB_UNUSED, + hb_codepoint_t glyph, + unsigned int point_index, + hb_position_t *x, + hb_position_t *y, + void *user_data HB_UNUSED) +{ + hb_bool_t ret = font->parent->get_glyph_contour_point (glyph, point_index, x, y); + if (ret) + font->parent_scale_position (x, y); + return ret; +} + +static hb_bool_t +hb_font_get_glyph_name_nil (hb_font_t *font HB_UNUSED, + void *font_data HB_UNUSED, + hb_codepoint_t glyph, + char *name, unsigned int size, + void *user_data HB_UNUSED) +{ + if (size) *name = '\0'; + return false; +} +static hb_bool_t +hb_font_get_glyph_name_parent (hb_font_t *font, + void *font_data HB_UNUSED, + hb_codepoint_t glyph, + char *name, unsigned int size, + void *user_data HB_UNUSED) +{ + return font->parent->get_glyph_name (glyph, name, size); +} + +static hb_bool_t +hb_font_get_glyph_from_name_nil (hb_font_t *font HB_UNUSED, + void *font_data HB_UNUSED, + const char *name, int len, /* -1 means nul-terminated */ + hb_codepoint_t *glyph, + void *user_data HB_UNUSED) +{ + *glyph = 0; + return false; +} +static hb_bool_t +hb_font_get_glyph_from_name_parent (hb_font_t *font, + void *font_data HB_UNUSED, + const char *name, int len, /* -1 means nul-terminated */ + hb_codepoint_t *glyph, + void *user_data HB_UNUSED) +{ + return font->parent->get_glyph_from_name (name, len, glyph); +} + +static const hb_font_funcs_t _hb_font_funcs_nil = { + HB_OBJECT_HEADER_STATIC, + + true, /* immutable */ + + { +#define HB_FONT_FUNC_IMPLEMENT(name) NULL, + HB_FONT_FUNCS_IMPLEMENT_CALLBACKS +#undef HB_FONT_FUNC_IMPLEMENT + }, + { +#define HB_FONT_FUNC_IMPLEMENT(name) NULL, + HB_FONT_FUNCS_IMPLEMENT_CALLBACKS +#undef HB_FONT_FUNC_IMPLEMENT + }, + { + { +#define HB_FONT_FUNC_IMPLEMENT(name) hb_font_get_##name##_nil, + HB_FONT_FUNCS_IMPLEMENT_CALLBACKS +#undef HB_FONT_FUNC_IMPLEMENT + } + } +}; +static const hb_font_funcs_t _hb_font_funcs_parent = { + HB_OBJECT_HEADER_STATIC, + + true, /* immutable */ + + { +#define HB_FONT_FUNC_IMPLEMENT(name) NULL, + HB_FONT_FUNCS_IMPLEMENT_CALLBACKS +#undef HB_FONT_FUNC_IMPLEMENT + }, + { +#define HB_FONT_FUNC_IMPLEMENT(name) NULL, + HB_FONT_FUNCS_IMPLEMENT_CALLBACKS +#undef HB_FONT_FUNC_IMPLEMENT + }, + { + { +#define HB_FONT_FUNC_IMPLEMENT(name) hb_font_get_##name##_parent, + HB_FONT_FUNCS_IMPLEMENT_CALLBACKS +#undef HB_FONT_FUNC_IMPLEMENT + } + } +}; + + +/** + * hb_font_funcs_create: (Xconstructor) + * + * + * + * Return value: (transfer full): + * + * Since: 0.9.2 + **/ +hb_font_funcs_t * +hb_font_funcs_create (void) +{ + hb_font_funcs_t *ffuncs; + + if (!(ffuncs = hb_object_create ())) + return hb_font_funcs_get_empty (); + + ffuncs->get = _hb_font_funcs_parent.get; + + return ffuncs; +} + +/** + * hb_font_funcs_get_empty: + * + * + * + * Return value: (transfer full): + * + * Since: 0.9.2 + **/ +hb_font_funcs_t * +hb_font_funcs_get_empty (void) +{ + return const_cast (&_hb_font_funcs_parent); +} + +/** + * hb_font_funcs_reference: (skip) + * @ffuncs: font functions. + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_font_funcs_t * +hb_font_funcs_reference (hb_font_funcs_t *ffuncs) +{ + return hb_object_reference (ffuncs); +} + +/** + * hb_font_funcs_destroy: (skip) + * @ffuncs: font functions. + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_funcs_destroy (hb_font_funcs_t *ffuncs) +{ + if (!hb_object_destroy (ffuncs)) return; + +#define HB_FONT_FUNC_IMPLEMENT(name) if (ffuncs->destroy.name) \ + ffuncs->destroy.name (ffuncs->user_data.name); + HB_FONT_FUNCS_IMPLEMENT_CALLBACKS +#undef HB_FONT_FUNC_IMPLEMENT + + free (ffuncs); +} + +/** + * hb_font_funcs_set_user_data: (skip) + * @ffuncs: font functions. + * @key: + * @data: + * @destroy: + * @replace: + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_funcs_set_user_data (hb_font_funcs_t *ffuncs, + hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace) +{ + return hb_object_set_user_data (ffuncs, key, data, destroy, replace); +} + +/** + * hb_font_funcs_get_user_data: (skip) + * @ffuncs: font functions. + * @key: + * + * + * + * Return value: (transfer none): + * + * Since: 0.9.2 + **/ +void * +hb_font_funcs_get_user_data (hb_font_funcs_t *ffuncs, + hb_user_data_key_t *key) +{ + return hb_object_get_user_data (ffuncs, key); +} + + +/** + * hb_font_funcs_make_immutable: + * @ffuncs: font functions. + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_funcs_make_immutable (hb_font_funcs_t *ffuncs) +{ + if (unlikely (hb_object_is_inert (ffuncs))) + return; + + ffuncs->immutable = true; +} + +/** + * hb_font_funcs_is_immutable: + * @ffuncs: font functions. + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_funcs_is_immutable (hb_font_funcs_t *ffuncs) +{ + return ffuncs->immutable; +} + + +#define HB_FONT_FUNC_IMPLEMENT(name) \ + \ +void \ +hb_font_funcs_set_##name##_func (hb_font_funcs_t *ffuncs, \ + hb_font_get_##name##_func_t func, \ + void *user_data, \ + hb_destroy_func_t destroy) \ +{ \ + if (ffuncs->immutable) { \ + if (destroy) \ + destroy (user_data); \ + return; \ + } \ + \ + if (ffuncs->destroy.name) \ + ffuncs->destroy.name (ffuncs->user_data.name); \ + \ + if (func) { \ + ffuncs->get.f.name = func; \ + ffuncs->user_data.name = user_data; \ + ffuncs->destroy.name = destroy; \ + } else { \ + ffuncs->get.f.name = hb_font_get_##name##_parent; \ + ffuncs->user_data.name = NULL; \ + ffuncs->destroy.name = NULL; \ + } \ +} + +HB_FONT_FUNCS_IMPLEMENT_CALLBACKS +#undef HB_FONT_FUNC_IMPLEMENT + +bool +hb_font_t::has_func (unsigned int i) +{ + if (parent && parent != hb_font_get_empty () && parent->has_func (i)) + return true; + return this->klass->get.array[i] != _hb_font_funcs_parent.get.array[i]; +} + +/* Public getters */ + +/** + * hb_font_get_h_extents: + * @font: a font. + * @extents: (out): + * + * + * + * Return value: + * + * Since: 1.1.3 + **/ +hb_bool_t +hb_font_get_h_extents (hb_font_t *font, + hb_font_extents_t *extents) +{ + return font->get_font_h_extents (extents); +} + +/** + * hb_font_get_v_extents: + * @font: a font. + * @extents: (out): + * + * + * + * Return value: + * + * Since: 1.1.3 + **/ +hb_bool_t +hb_font_get_v_extents (hb_font_t *font, + hb_font_extents_t *extents) +{ + return font->get_font_v_extents (extents); +} + +/** + * hb_font_get_glyph: + * @font: a font. + * @unicode: + * @variation_selector: + * @glyph: (out): + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_get_glyph (hb_font_t *font, + hb_codepoint_t unicode, hb_codepoint_t variation_selector, + hb_codepoint_t *glyph) +{ + if (unlikely (variation_selector)) + return font->get_variation_glyph (unicode, variation_selector, glyph); + return font->get_nominal_glyph (unicode, glyph); +} + +/** + * hb_font_get_nominal_glyph: + * @font: a font. + * @unicode: + * @glyph: (out): + * + * + * + * Return value: + * + * Since: 1.2.3 + **/ +hb_bool_t +hb_font_get_nominal_glyph (hb_font_t *font, + hb_codepoint_t unicode, + hb_codepoint_t *glyph) +{ + return font->get_nominal_glyph (unicode, glyph); +} + +/** + * hb_font_get_variation_glyph: + * @font: a font. + * @unicode: + * @variation_selector: + * @glyph: (out): + * + * + * + * Return value: + * + * Since: 1.2.3 + **/ +hb_bool_t +hb_font_get_variation_glyph (hb_font_t *font, + hb_codepoint_t unicode, hb_codepoint_t variation_selector, + hb_codepoint_t *glyph) +{ + return font->get_variation_glyph (unicode, variation_selector, glyph); +} + +/** + * hb_font_get_glyph_h_advance: + * @font: a font. + * @glyph: + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_position_t +hb_font_get_glyph_h_advance (hb_font_t *font, + hb_codepoint_t glyph) +{ + return font->get_glyph_h_advance (glyph); +} + +/** + * hb_font_get_glyph_v_advance: + * @font: a font. + * @glyph: + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_position_t +hb_font_get_glyph_v_advance (hb_font_t *font, + hb_codepoint_t glyph) +{ + return font->get_glyph_v_advance (glyph); +} + +/** + * hb_font_get_glyph_h_origin: + * @font: a font. + * @glyph: + * @x: (out): + * @y: (out): + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_get_glyph_h_origin (hb_font_t *font, + hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y) +{ + return font->get_glyph_h_origin (glyph, x, y); +} + +/** + * hb_font_get_glyph_v_origin: + * @font: a font. + * @glyph: + * @x: (out): + * @y: (out): + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_get_glyph_v_origin (hb_font_t *font, + hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y) +{ + return font->get_glyph_v_origin (glyph, x, y); +} + +/** + * hb_font_get_glyph_h_kerning: + * @font: a font. + * @left_glyph: + * @right_glyph: + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_position_t +hb_font_get_glyph_h_kerning (hb_font_t *font, + hb_codepoint_t left_glyph, hb_codepoint_t right_glyph) +{ + return font->get_glyph_h_kerning (left_glyph, right_glyph); +} + +/** + * hb_font_get_glyph_v_kerning: + * @font: a font. + * @top_glyph: + * @bottom_glyph: + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_position_t +hb_font_get_glyph_v_kerning (hb_font_t *font, + hb_codepoint_t top_glyph, hb_codepoint_t bottom_glyph) +{ + return font->get_glyph_v_kerning (top_glyph, bottom_glyph); +} + +/** + * hb_font_get_glyph_extents: + * @font: a font. + * @glyph: + * @extents: (out): + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_get_glyph_extents (hb_font_t *font, + hb_codepoint_t glyph, + hb_glyph_extents_t *extents) +{ + return font->get_glyph_extents (glyph, extents); +} + +/** + * hb_font_get_glyph_contour_point: + * @font: a font. + * @glyph: + * @point_index: + * @x: (out): + * @y: (out): + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_get_glyph_contour_point (hb_font_t *font, + hb_codepoint_t glyph, unsigned int point_index, + hb_position_t *x, hb_position_t *y) +{ + return font->get_glyph_contour_point (glyph, point_index, x, y); +} + +/** + * hb_font_get_glyph_name: + * @font: a font. + * @glyph: + * @name: (array length=size): + * @size: + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_get_glyph_name (hb_font_t *font, + hb_codepoint_t glyph, + char *name, unsigned int size) +{ + return font->get_glyph_name (glyph, name, size); +} + +/** + * hb_font_get_glyph_from_name: + * @font: a font. + * @name: (array length=len): + * @len: + * @glyph: (out): + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_get_glyph_from_name (hb_font_t *font, + const char *name, int len, /* -1 means nul-terminated */ + hb_codepoint_t *glyph) +{ + return font->get_glyph_from_name (name, len, glyph); +} + + +/* A bit higher-level, and with fallback */ + +/** + * hb_font_get_extents_for_direction: + * @font: a font. + * @direction: + * @extents: + * + * + * + * Since: 1.1.3 + **/ +void +hb_font_get_extents_for_direction (hb_font_t *font, + hb_direction_t direction, + hb_font_extents_t *extents) +{ + return font->get_extents_for_direction (direction, extents); +} +/** + * hb_font_get_glyph_advance_for_direction: + * @font: a font. + * @glyph: + * @direction: + * @x: (out): + * @y: (out): + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_get_glyph_advance_for_direction (hb_font_t *font, + hb_codepoint_t glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y) +{ + return font->get_glyph_advance_for_direction (glyph, direction, x, y); +} + +/** + * hb_font_get_glyph_origin_for_direction: + * @font: a font. + * @glyph: + * @direction: + * @x: (out): + * @y: (out): + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_get_glyph_origin_for_direction (hb_font_t *font, + hb_codepoint_t glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y) +{ + return font->get_glyph_origin_for_direction (glyph, direction, x, y); +} + +/** + * hb_font_add_glyph_origin_for_direction: + * @font: a font. + * @glyph: + * @direction: + * @x: (out): + * @y: (out): + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_add_glyph_origin_for_direction (hb_font_t *font, + hb_codepoint_t glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y) +{ + return font->add_glyph_origin_for_direction (glyph, direction, x, y); +} + +/** + * hb_font_subtract_glyph_origin_for_direction: + * @font: a font. + * @glyph: + * @direction: + * @x: (out): + * @y: (out): + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_subtract_glyph_origin_for_direction (hb_font_t *font, + hb_codepoint_t glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y) +{ + return font->subtract_glyph_origin_for_direction (glyph, direction, x, y); +} + +/** + * hb_font_get_glyph_kerning_for_direction: + * @font: a font. + * @first_glyph: + * @second_glyph: + * @direction: + * @x: (out): + * @y: (out): + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_get_glyph_kerning_for_direction (hb_font_t *font, + hb_codepoint_t first_glyph, hb_codepoint_t second_glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y) +{ + return font->get_glyph_kerning_for_direction (first_glyph, second_glyph, direction, x, y); +} + +/** + * hb_font_get_glyph_extents_for_origin: + * @font: a font. + * @glyph: + * @direction: + * @extents: (out): + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_get_glyph_extents_for_origin (hb_font_t *font, + hb_codepoint_t glyph, + hb_direction_t direction, + hb_glyph_extents_t *extents) +{ + return font->get_glyph_extents_for_origin (glyph, direction, extents); +} + +/** + * hb_font_get_glyph_contour_point_for_origin: + * @font: a font. + * @glyph: + * @point_index: + * @direction: + * @x: (out): + * @y: (out): + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_get_glyph_contour_point_for_origin (hb_font_t *font, + hb_codepoint_t glyph, unsigned int point_index, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y) +{ + return font->get_glyph_contour_point_for_origin (glyph, point_index, direction, x, y); +} + +/* Generates gidDDD if glyph has no name. */ +/** + * hb_font_glyph_to_string: + * @font: a font. + * @glyph: + * @s: (array length=size): + * @size: + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_glyph_to_string (hb_font_t *font, + hb_codepoint_t glyph, + char *s, unsigned int size) +{ + font->glyph_to_string (glyph, s, size); +} + +/* Parses gidDDD and uniUUUU strings automatically. */ +/** + * hb_font_glyph_from_string: + * @font: a font. + * @s: (array length=len) (element-type uint8_t): + * @len: + * @glyph: (out): + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_glyph_from_string (hb_font_t *font, + const char *s, int len, /* -1 means nul-terminated */ + hb_codepoint_t *glyph) +{ + return font->glyph_from_string (s, len, glyph); +} + + +/* + * hb_font_t + */ + +/** + * hb_font_create: (Xconstructor) + * @face: a face. + * + * + * + * Return value: (transfer full): + * + * Since: 0.9.2 + **/ +hb_font_t * +hb_font_create (hb_face_t *face) +{ + hb_font_t *font; + + if (unlikely (!face)) + face = hb_face_get_empty (); + if (!(font = hb_object_create ())) + return hb_font_get_empty (); + + hb_face_make_immutable (face); + font->parent = hb_font_get_empty (); + font->face = hb_face_reference (face); + font->klass = hb_font_funcs_get_empty (); + + font->x_scale = font->y_scale = hb_face_get_upem (face); + + return font; +} + +/** + * hb_font_create_sub_font: + * @parent: parent font. + * + * + * + * Return value: (transfer full): + * + * Since: 0.9.2 + **/ +hb_font_t * +hb_font_create_sub_font (hb_font_t *parent) +{ + if (unlikely (!parent)) + parent = hb_font_get_empty (); + + hb_font_t *font = hb_font_create (parent->face); + + if (unlikely (hb_object_is_inert (font))) + return font; + + font->parent = hb_font_reference (parent); + + font->x_scale = parent->x_scale; + font->y_scale = parent->y_scale; + font->x_ppem = parent->x_ppem; + font->y_ppem = parent->y_ppem; + + /* TODO: copy variation coordinates. */ + + return font; +} + +/** + * hb_font_get_empty: + * + * + * + * Return value: (transfer full) + * + * Since: 0.9.2 + **/ +hb_font_t * +hb_font_get_empty (void) +{ + static const hb_font_t _hb_font_nil = { + HB_OBJECT_HEADER_STATIC, + + true, /* immutable */ + + NULL, /* parent */ + const_cast (&_hb_face_nil), + + 1000, /* x_scale */ + 1000, /* y_scale */ + + 0, /* x_ppem */ + 0, /* y_ppem */ + + 0, /* num_coords */ + NULL, /* coords */ + + const_cast (&_hb_font_funcs_nil), /* klass */ + NULL, /* user_data */ + NULL, /* destroy */ + + { +#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_INVALID, +#include "hb-shaper-list.hh" +#undef HB_SHAPER_IMPLEMENT + } + }; + + return const_cast (&_hb_font_nil); +} + +/** + * hb_font_reference: (skip) + * @font: a font. + * + * + * + * Return value: (transfer full): + * + * Since: 0.9.2 + **/ +hb_font_t * +hb_font_reference (hb_font_t *font) +{ + return hb_object_reference (font); +} + +/** + * hb_font_destroy: (skip) + * @font: a font. + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_destroy (hb_font_t *font) +{ + if (!hb_object_destroy (font)) return; + +#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_DESTROY(shaper, font); +#include "hb-shaper-list.hh" +#undef HB_SHAPER_IMPLEMENT + + if (font->destroy) + font->destroy (font->user_data); + + hb_font_destroy (font->parent); + hb_face_destroy (font->face); + hb_font_funcs_destroy (font->klass); + + free (font->coords); + + free (font); +} + +/** + * hb_font_set_user_data: (skip) + * @font: a font. + * @key: + * @data: + * @destroy: + * @replace: + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_set_user_data (hb_font_t *font, + hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace) +{ + return hb_object_set_user_data (font, key, data, destroy, replace); +} + +/** + * hb_font_get_user_data: (skip) + * @font: a font. + * @key: + * + * + * + * Return value: (transfer none): + * + * Since: 0.9.2 + **/ +void * +hb_font_get_user_data (hb_font_t *font, + hb_user_data_key_t *key) +{ + return hb_object_get_user_data (font, key); +} + +/** + * hb_font_make_immutable: + * @font: a font. + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_make_immutable (hb_font_t *font) +{ + if (unlikely (hb_object_is_inert (font))) + return; + + if (font->parent) + hb_font_make_immutable (font->parent); + + font->immutable = true; +} + +/** + * hb_font_is_immutable: + * @font: a font. + * + * + * + * Return value: + * + * Since: 0.9.2 + **/ +hb_bool_t +hb_font_is_immutable (hb_font_t *font) +{ + return font->immutable; +} + +/** + * hb_font_set_parent: + * @font: a font. + * @parent: new parent. + * + * Sets parent font of @font. + * + * Since: 1.0.5 + **/ +void +hb_font_set_parent (hb_font_t *font, + hb_font_t *parent) +{ + if (font->immutable) + return; + + if (!parent) + parent = hb_font_get_empty (); + + hb_font_t *old = font->parent; + + font->parent = hb_font_reference (parent); + + hb_font_destroy (old); +} + +/** + * hb_font_get_parent: + * @font: a font. + * + * + * + * Return value: (transfer none): + * + * Since: 0.9.2 + **/ +hb_font_t * +hb_font_get_parent (hb_font_t *font) +{ + return font->parent; +} + +/** + * hb_font_get_face: + * @font: a font. + * + * + * + * Return value: (transfer none): + * + * Since: 0.9.2 + **/ +hb_face_t * +hb_font_get_face (hb_font_t *font) +{ + return font->face; +} + + +/** + * hb_font_set_funcs: + * @font: a font. + * @klass: (closure font_data) (destroy destroy) (scope notified): + * @font_data: + * @destroy: + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_set_funcs (hb_font_t *font, + hb_font_funcs_t *klass, + void *font_data, + hb_destroy_func_t destroy) +{ + if (font->immutable) { + if (destroy) + destroy (font_data); + return; + } + + if (font->destroy) + font->destroy (font->user_data); + + if (!klass) + klass = hb_font_funcs_get_empty (); + + hb_font_funcs_reference (klass); + hb_font_funcs_destroy (font->klass); + font->klass = klass; + font->user_data = font_data; + font->destroy = destroy; +} + +/** + * hb_font_set_funcs_data: + * @font: a font. + * @font_data: (destroy destroy) (scope notified): + * @destroy: + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_set_funcs_data (hb_font_t *font, + void *font_data, + hb_destroy_func_t destroy) +{ + /* Destroy user_data? */ + if (font->immutable) { + if (destroy) + destroy (font_data); + return; + } + + if (font->destroy) + font->destroy (font->user_data); + + font->user_data = font_data; + font->destroy = destroy; +} + + +/** + * hb_font_set_scale: + * @font: a font. + * @x_scale: + * @y_scale: + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_set_scale (hb_font_t *font, + int x_scale, + int y_scale) +{ + if (font->immutable) + return; + + font->x_scale = x_scale; + font->y_scale = y_scale; +} + +/** + * hb_font_get_scale: + * @font: a font. + * @x_scale: (out): + * @y_scale: (out): + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_get_scale (hb_font_t *font, + int *x_scale, + int *y_scale) +{ + if (x_scale) *x_scale = font->x_scale; + if (y_scale) *y_scale = font->y_scale; +} + +/** + * hb_font_set_ppem: + * @font: a font. + * @x_ppem: + * @y_ppem: + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_set_ppem (hb_font_t *font, + unsigned int x_ppem, + unsigned int y_ppem) +{ + if (font->immutable) + return; + + font->x_ppem = x_ppem; + font->y_ppem = y_ppem; +} + +/** + * hb_font_get_ppem: + * @font: a font. + * @x_ppem: (out): + * @y_ppem: (out): + * + * + * + * Since: 0.9.2 + **/ +void +hb_font_get_ppem (hb_font_t *font, + unsigned int *x_ppem, + unsigned int *y_ppem) +{ + if (x_ppem) *x_ppem = font->x_ppem; + if (y_ppem) *y_ppem = font->y_ppem; +} + +/* + * Variations + */ + +static void +_hb_font_adopt_var_coords_normalized (hb_font_t *font, + int *coords, /* 2.14 normalized */ + unsigned int coords_length) +{ + free (font->coords); + + font->coords = coords; + font->num_coords = coords_length; +} + +/** + * hb_font_set_variations: + * + * Since: 1.4.2 + */ +void +hb_font_set_variations (hb_font_t *font, + const hb_variation_t *variations, + unsigned int variations_length) +{ + if (font->immutable) + return; + + if (!variations_length) + { + hb_font_set_var_coords_normalized (font, NULL, 0); + return; + } + + unsigned int coords_length = hb_ot_var_get_axis_count (font->face); + + int *normalized = coords_length ? (int *) calloc (coords_length, sizeof (int)) : NULL; + if (unlikely (coords_length && !normalized)) + return; + + hb_ot_var_normalize_variations (font->face, + variations, variations_length, + normalized, coords_length); + _hb_font_adopt_var_coords_normalized (font, normalized, coords_length); +} + +/** + * hb_font_set_var_coords_design: + * + * Since: 1.4.2 + */ +void +hb_font_set_var_coords_design (hb_font_t *font, + const float *coords, + unsigned int coords_length) +{ + if (font->immutable) + return; + + int *normalized = coords_length ? (int *) calloc (coords_length, sizeof (int)) : NULL; + if (unlikely (coords_length && !normalized)) + return; + + hb_ot_var_normalize_coords (font->face, coords_length, coords, normalized); + _hb_font_adopt_var_coords_normalized (font, normalized, coords_length); +} + +/** + * hb_font_set_var_coords_normalized: + * + * Since: 1.4.2 + */ +void +hb_font_set_var_coords_normalized (hb_font_t *font, + const int *coords, /* 2.14 normalized */ + unsigned int coords_length) +{ + if (font->immutable) + return; + + int *copy = coords_length ? (int *) calloc (coords_length, sizeof (coords[0])) : NULL; + if (unlikely (coords_length && !copy)) + return; + + if (coords_length) + memcpy (copy, coords, coords_length * sizeof (coords[0])); + + _hb_font_adopt_var_coords_normalized (font, copy, coords_length); +} + +/** + * hb_font_set_var_coords_normalized: + * + * Return value is valid as long as variation coordinates of the font + * are not modified. + * + * Since: 1.4.2 + */ +const int * +hb_font_get_var_coords_normalized (hb_font_t *font, + unsigned int *length) +{ + if (length) + *length = font->num_coords; + + return font->coords; +} + + +#ifndef HB_DISABLE_DEPRECATED + +/* + * Deprecated get_glyph_func(): + */ + +struct hb_trampoline_closure_t +{ + void *user_data; + hb_destroy_func_t destroy; + unsigned int ref_count; +}; + +template +struct hb_trampoline_t +{ + hb_trampoline_closure_t closure; /* Must be first. */ + FuncType func; +}; + +template +static hb_trampoline_t * +trampoline_create (FuncType func, + void *user_data, + hb_destroy_func_t destroy) +{ + typedef hb_trampoline_t trampoline_t; + + trampoline_t *trampoline = (trampoline_t *) calloc (1, sizeof (trampoline_t)); + + if (unlikely (!trampoline)) + return NULL; + + trampoline->closure.user_data = user_data; + trampoline->closure.destroy = destroy; + trampoline->closure.ref_count = 1; + trampoline->func = func; + + return trampoline; +} + +static void +trampoline_reference (hb_trampoline_closure_t *closure) +{ + closure->ref_count++; +} + +static void +trampoline_destroy (void *user_data) +{ + hb_trampoline_closure_t *closure = (hb_trampoline_closure_t *) user_data; + + if (--closure->ref_count) + return; + + if (closure->destroy) + closure->destroy (closure->user_data); + free (closure); +} + +typedef hb_trampoline_t hb_font_get_glyph_trampoline_t; + +static hb_bool_t +hb_font_get_nominal_glyph_trampoline (hb_font_t *font, + void *font_data, + hb_codepoint_t unicode, + hb_codepoint_t *glyph, + void *user_data) +{ + hb_font_get_glyph_trampoline_t *trampoline = (hb_font_get_glyph_trampoline_t *) user_data; + return trampoline->func (font, font_data, unicode, 0, glyph, trampoline->closure.user_data); +} + +static hb_bool_t +hb_font_get_variation_glyph_trampoline (hb_font_t *font, + void *font_data, + hb_codepoint_t unicode, + hb_codepoint_t variation_selector, + hb_codepoint_t *glyph, + void *user_data) +{ + hb_font_get_glyph_trampoline_t *trampoline = (hb_font_get_glyph_trampoline_t *) user_data; + return trampoline->func (font, font_data, unicode, variation_selector, glyph, trampoline->closure.user_data); +} + +/** + * hb_font_funcs_set_glyph_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * Deprecated. Use hb_font_funcs_set_nominal_glyph_func() and + * hb_font_funcs_set_variation_glyph_func() instead. + * + * Since: 0.9.2 + * Deprecated: 1.2.3 + **/ +void +hb_font_funcs_set_glyph_func (hb_font_funcs_t *ffuncs, + hb_font_get_glyph_func_t func, + void *user_data, hb_destroy_func_t destroy) +{ + hb_font_get_glyph_trampoline_t *trampoline; + + trampoline = trampoline_create (func, user_data, destroy); + if (unlikely (!trampoline)) + { + if (destroy) + destroy (user_data); + return; + } + + hb_font_funcs_set_nominal_glyph_func (ffuncs, + hb_font_get_nominal_glyph_trampoline, + trampoline, + trampoline_destroy); + + trampoline_reference (&trampoline->closure); + hb_font_funcs_set_variation_glyph_func (ffuncs, + hb_font_get_variation_glyph_trampoline, + trampoline, + trampoline_destroy); +} + +#endif /* HB_DISABLE_DEPRECATED */ diff --git a/src/hb-font.h b/src/hb-font.h new file mode 100644 index 0000000..e2e5979 --- /dev/null +++ b/src/hb-font.h @@ -0,0 +1,627 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + */ + +#ifndef HB_H_IN +#error "Include instead." +#endif + +#ifndef HB_FONT_H +#define HB_FONT_H + +#include "hb-common.h" +#include "hb-face.h" + +HB_BEGIN_DECLS + + +typedef struct hb_font_t hb_font_t; + + +/* + * hb_font_funcs_t + */ + +typedef struct hb_font_funcs_t hb_font_funcs_t; + +HB_EXTERN hb_font_funcs_t * +hb_font_funcs_create (void); + +HB_EXTERN hb_font_funcs_t * +hb_font_funcs_get_empty (void); + +HB_EXTERN hb_font_funcs_t * +hb_font_funcs_reference (hb_font_funcs_t *ffuncs); + +HB_EXTERN void +hb_font_funcs_destroy (hb_font_funcs_t *ffuncs); + +HB_EXTERN hb_bool_t +hb_font_funcs_set_user_data (hb_font_funcs_t *ffuncs, + hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace); + + +HB_EXTERN void * +hb_font_funcs_get_user_data (hb_font_funcs_t *ffuncs, + hb_user_data_key_t *key); + + +HB_EXTERN void +hb_font_funcs_make_immutable (hb_font_funcs_t *ffuncs); + +HB_EXTERN hb_bool_t +hb_font_funcs_is_immutable (hb_font_funcs_t *ffuncs); + + +/* font and glyph extents */ + +/* Note that typically ascender is positive and descender negative in coordinate systems that grow up. */ +typedef struct hb_font_extents_t +{ + hb_position_t ascender; /* typographic ascender. */ + hb_position_t descender; /* typographic descender. */ + hb_position_t line_gap; /* suggested line spacing gap. */ + /*< private >*/ + hb_position_t reserved9; + hb_position_t reserved8; + hb_position_t reserved7; + hb_position_t reserved6; + hb_position_t reserved5; + hb_position_t reserved4; + hb_position_t reserved3; + hb_position_t reserved2; + hb_position_t reserved1; +} hb_font_extents_t; + +/* Note that height is negative in coordinate systems that grow up. */ +typedef struct hb_glyph_extents_t +{ + hb_position_t x_bearing; /* left side of glyph from origin. */ + hb_position_t y_bearing; /* top side of glyph from origin. */ + hb_position_t width; /* distance from left to right side. */ + hb_position_t height; /* distance from top to bottom side. */ +} hb_glyph_extents_t; + +/* func types */ + +typedef hb_bool_t (*hb_font_get_font_extents_func_t) (hb_font_t *font, void *font_data, + hb_font_extents_t *metrics, + void *user_data); +typedef hb_font_get_font_extents_func_t hb_font_get_font_h_extents_func_t; +typedef hb_font_get_font_extents_func_t hb_font_get_font_v_extents_func_t; + + +typedef hb_bool_t (*hb_font_get_nominal_glyph_func_t) (hb_font_t *font, void *font_data, + hb_codepoint_t unicode, + hb_codepoint_t *glyph, + void *user_data); +typedef hb_bool_t (*hb_font_get_variation_glyph_func_t) (hb_font_t *font, void *font_data, + hb_codepoint_t unicode, hb_codepoint_t variation_selector, + hb_codepoint_t *glyph, + void *user_data); + + +typedef hb_position_t (*hb_font_get_glyph_advance_func_t) (hb_font_t *font, void *font_data, + hb_codepoint_t glyph, + void *user_data); +typedef hb_font_get_glyph_advance_func_t hb_font_get_glyph_h_advance_func_t; +typedef hb_font_get_glyph_advance_func_t hb_font_get_glyph_v_advance_func_t; + +typedef hb_bool_t (*hb_font_get_glyph_origin_func_t) (hb_font_t *font, void *font_data, + hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y, + void *user_data); +typedef hb_font_get_glyph_origin_func_t hb_font_get_glyph_h_origin_func_t; +typedef hb_font_get_glyph_origin_func_t hb_font_get_glyph_v_origin_func_t; + +typedef hb_position_t (*hb_font_get_glyph_kerning_func_t) (hb_font_t *font, void *font_data, + hb_codepoint_t first_glyph, hb_codepoint_t second_glyph, + void *user_data); +typedef hb_font_get_glyph_kerning_func_t hb_font_get_glyph_h_kerning_func_t; +typedef hb_font_get_glyph_kerning_func_t hb_font_get_glyph_v_kerning_func_t; + + +typedef hb_bool_t (*hb_font_get_glyph_extents_func_t) (hb_font_t *font, void *font_data, + hb_codepoint_t glyph, + hb_glyph_extents_t *extents, + void *user_data); +typedef hb_bool_t (*hb_font_get_glyph_contour_point_func_t) (hb_font_t *font, void *font_data, + hb_codepoint_t glyph, unsigned int point_index, + hb_position_t *x, hb_position_t *y, + void *user_data); + + +typedef hb_bool_t (*hb_font_get_glyph_name_func_t) (hb_font_t *font, void *font_data, + hb_codepoint_t glyph, + char *name, unsigned int size, + void *user_data); +typedef hb_bool_t (*hb_font_get_glyph_from_name_func_t) (hb_font_t *font, void *font_data, + const char *name, int len, /* -1 means nul-terminated */ + hb_codepoint_t *glyph, + void *user_data); + + +/* func setters */ + +/** + * hb_font_funcs_set_font_h_extents_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 1.1.2 + **/ +HB_EXTERN void +hb_font_funcs_set_font_h_extents_func (hb_font_funcs_t *ffuncs, + hb_font_get_font_h_extents_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_font_v_extents_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 1.1.2 + **/ +HB_EXTERN void +hb_font_funcs_set_font_v_extents_func (hb_font_funcs_t *ffuncs, + hb_font_get_font_v_extents_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_nominal_glyph_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 1.2.3 + **/ +HB_EXTERN void +hb_font_funcs_set_nominal_glyph_func (hb_font_funcs_t *ffuncs, + hb_font_get_nominal_glyph_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_variation_glyph_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 1.2.3 + **/ +HB_EXTERN void +hb_font_funcs_set_variation_glyph_func (hb_font_funcs_t *ffuncs, + hb_font_get_variation_glyph_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_glyph_h_advance_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 0.9.2 + **/ +HB_EXTERN void +hb_font_funcs_set_glyph_h_advance_func (hb_font_funcs_t *ffuncs, + hb_font_get_glyph_h_advance_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_glyph_v_advance_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 0.9.2 + **/ +HB_EXTERN void +hb_font_funcs_set_glyph_v_advance_func (hb_font_funcs_t *ffuncs, + hb_font_get_glyph_v_advance_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_glyph_h_origin_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 0.9.2 + **/ +HB_EXTERN void +hb_font_funcs_set_glyph_h_origin_func (hb_font_funcs_t *ffuncs, + hb_font_get_glyph_h_origin_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_glyph_v_origin_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 0.9.2 + **/ +HB_EXTERN void +hb_font_funcs_set_glyph_v_origin_func (hb_font_funcs_t *ffuncs, + hb_font_get_glyph_v_origin_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_glyph_h_kerning_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 0.9.2 + **/ +HB_EXTERN void +hb_font_funcs_set_glyph_h_kerning_func (hb_font_funcs_t *ffuncs, + hb_font_get_glyph_h_kerning_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_glyph_v_kerning_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 0.9.2 + **/ +HB_EXTERN void +hb_font_funcs_set_glyph_v_kerning_func (hb_font_funcs_t *ffuncs, + hb_font_get_glyph_v_kerning_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_glyph_extents_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 0.9.2 + **/ +HB_EXTERN void +hb_font_funcs_set_glyph_extents_func (hb_font_funcs_t *ffuncs, + hb_font_get_glyph_extents_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_glyph_contour_point_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 0.9.2 + **/ +HB_EXTERN void +hb_font_funcs_set_glyph_contour_point_func (hb_font_funcs_t *ffuncs, + hb_font_get_glyph_contour_point_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_glyph_name_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 0.9.2 + **/ +HB_EXTERN void +hb_font_funcs_set_glyph_name_func (hb_font_funcs_t *ffuncs, + hb_font_get_glyph_name_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_font_funcs_set_glyph_from_name_func: + * @ffuncs: font functions. + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 0.9.2 + **/ +HB_EXTERN void +hb_font_funcs_set_glyph_from_name_func (hb_font_funcs_t *ffuncs, + hb_font_get_glyph_from_name_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/* func dispatch */ + +HB_EXTERN hb_bool_t +hb_font_get_h_extents (hb_font_t *font, + hb_font_extents_t *extents); +HB_EXTERN hb_bool_t +hb_font_get_v_extents (hb_font_t *font, + hb_font_extents_t *extents); + +HB_EXTERN hb_bool_t +hb_font_get_nominal_glyph (hb_font_t *font, + hb_codepoint_t unicode, + hb_codepoint_t *glyph); +HB_EXTERN hb_bool_t +hb_font_get_variation_glyph (hb_font_t *font, + hb_codepoint_t unicode, hb_codepoint_t variation_selector, + hb_codepoint_t *glyph); + +HB_EXTERN hb_position_t +hb_font_get_glyph_h_advance (hb_font_t *font, + hb_codepoint_t glyph); +HB_EXTERN hb_position_t +hb_font_get_glyph_v_advance (hb_font_t *font, + hb_codepoint_t glyph); + +HB_EXTERN hb_bool_t +hb_font_get_glyph_h_origin (hb_font_t *font, + hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y); +HB_EXTERN hb_bool_t +hb_font_get_glyph_v_origin (hb_font_t *font, + hb_codepoint_t glyph, + hb_position_t *x, hb_position_t *y); + +HB_EXTERN hb_position_t +hb_font_get_glyph_h_kerning (hb_font_t *font, + hb_codepoint_t left_glyph, hb_codepoint_t right_glyph); +HB_EXTERN hb_position_t +hb_font_get_glyph_v_kerning (hb_font_t *font, + hb_codepoint_t top_glyph, hb_codepoint_t bottom_glyph); + +HB_EXTERN hb_bool_t +hb_font_get_glyph_extents (hb_font_t *font, + hb_codepoint_t glyph, + hb_glyph_extents_t *extents); + +HB_EXTERN hb_bool_t +hb_font_get_glyph_contour_point (hb_font_t *font, + hb_codepoint_t glyph, unsigned int point_index, + hb_position_t *x, hb_position_t *y); + +HB_EXTERN hb_bool_t +hb_font_get_glyph_name (hb_font_t *font, + hb_codepoint_t glyph, + char *name, unsigned int size); +HB_EXTERN hb_bool_t +hb_font_get_glyph_from_name (hb_font_t *font, + const char *name, int len, /* -1 means nul-terminated */ + hb_codepoint_t *glyph); + + +/* high-level funcs, with fallback */ + +/* Calls either hb_font_get_nominal_glyph() if variation_selector is 0, + * otherwise callse hb_font_get_variation_glyph(). */ +HB_EXTERN hb_bool_t +hb_font_get_glyph (hb_font_t *font, + hb_codepoint_t unicode, hb_codepoint_t variation_selector, + hb_codepoint_t *glyph); + +HB_EXTERN void +hb_font_get_extents_for_direction (hb_font_t *font, + hb_direction_t direction, + hb_font_extents_t *extents); +HB_EXTERN void +hb_font_get_glyph_advance_for_direction (hb_font_t *font, + hb_codepoint_t glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y); +HB_EXTERN void +hb_font_get_glyph_origin_for_direction (hb_font_t *font, + hb_codepoint_t glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y); +HB_EXTERN void +hb_font_add_glyph_origin_for_direction (hb_font_t *font, + hb_codepoint_t glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y); +HB_EXTERN void +hb_font_subtract_glyph_origin_for_direction (hb_font_t *font, + hb_codepoint_t glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y); + +HB_EXTERN void +hb_font_get_glyph_kerning_for_direction (hb_font_t *font, + hb_codepoint_t first_glyph, hb_codepoint_t second_glyph, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y); + +HB_EXTERN hb_bool_t +hb_font_get_glyph_extents_for_origin (hb_font_t *font, + hb_codepoint_t glyph, + hb_direction_t direction, + hb_glyph_extents_t *extents); + +HB_EXTERN hb_bool_t +hb_font_get_glyph_contour_point_for_origin (hb_font_t *font, + hb_codepoint_t glyph, unsigned int point_index, + hb_direction_t direction, + hb_position_t *x, hb_position_t *y); + +/* Generates gidDDD if glyph has no name. */ +HB_EXTERN void +hb_font_glyph_to_string (hb_font_t *font, + hb_codepoint_t glyph, + char *s, unsigned int size); +/* Parses gidDDD and uniUUUU strings automatically. */ +HB_EXTERN hb_bool_t +hb_font_glyph_from_string (hb_font_t *font, + const char *s, int len, /* -1 means nul-terminated */ + hb_codepoint_t *glyph); + + +/* + * hb_font_t + */ + +/* Fonts are very light-weight objects */ + +HB_EXTERN hb_font_t * +hb_font_create (hb_face_t *face); + +HB_EXTERN hb_font_t * +hb_font_create_sub_font (hb_font_t *parent); + +HB_EXTERN hb_font_t * +hb_font_get_empty (void); + +HB_EXTERN hb_font_t * +hb_font_reference (hb_font_t *font); + +HB_EXTERN void +hb_font_destroy (hb_font_t *font); + +HB_EXTERN hb_bool_t +hb_font_set_user_data (hb_font_t *font, + hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace); + + +HB_EXTERN void * +hb_font_get_user_data (hb_font_t *font, + hb_user_data_key_t *key); + +HB_EXTERN void +hb_font_make_immutable (hb_font_t *font); + +HB_EXTERN hb_bool_t +hb_font_is_immutable (hb_font_t *font); + +HB_EXTERN void +hb_font_set_parent (hb_font_t *font, + hb_font_t *parent); + +HB_EXTERN hb_font_t * +hb_font_get_parent (hb_font_t *font); + +HB_EXTERN hb_face_t * +hb_font_get_face (hb_font_t *font); + + +HB_EXTERN void +hb_font_set_funcs (hb_font_t *font, + hb_font_funcs_t *klass, + void *font_data, + hb_destroy_func_t destroy); + +/* Be *very* careful with this function! */ +HB_EXTERN void +hb_font_set_funcs_data (hb_font_t *font, + void *font_data, + hb_destroy_func_t destroy); + + +HB_EXTERN void +hb_font_set_scale (hb_font_t *font, + int x_scale, + int y_scale); + +HB_EXTERN void +hb_font_get_scale (hb_font_t *font, + int *x_scale, + int *y_scale); + +/* + * A zero value means "no hinting in that direction" + */ +HB_EXTERN void +hb_font_set_ppem (hb_font_t *font, + unsigned int x_ppem, + unsigned int y_ppem); + +HB_EXTERN void +hb_font_get_ppem (hb_font_t *font, + unsigned int *x_ppem, + unsigned int *y_ppem); + +HB_EXTERN void +hb_font_set_variations (hb_font_t *font, + const hb_variation_t *variations, + unsigned int variations_length); + +HB_EXTERN void +hb_font_set_var_coords_design (hb_font_t *font, + const float *coords, + unsigned int coords_length); + +HB_EXTERN void +hb_font_set_var_coords_normalized (hb_font_t *font, + const int *coords, /* 2.14 normalized */ + unsigned int coords_length); + +HB_EXTERN const int * +hb_font_get_var_coords_normalized (hb_font_t *font, + unsigned int *length); + +HB_END_DECLS + +#endif /* HB_FONT_H */ diff --git a/src/hb-ft.cc b/src/hb-ft.cc new file mode 100644 index 0000000..48d6a0e --- /dev/null +++ b/src/hb-ft.cc @@ -0,0 +1,763 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * Copyright © 2009 Keith Stribley + * Copyright © 2015 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#include "hb-private.hh" + +#include "hb-ft.h" + +#include "hb-font-private.hh" + +#include "hb-cache-private.hh" // Maybe use in the future? + +#include FT_ADVANCES_H +#include FT_MULTIPLE_MASTERS_H +#include FT_TRUETYPE_TABLES_H + + + +#ifndef HB_DEBUG_FT +#define HB_DEBUG_FT (HB_DEBUG+0) +#endif + + +/* TODO: + * + * In general, this file does a fine job of what it's supposed to do. + * There are, however, things that need more work: + * + * - I remember seeing FT_Get_Advance() without the NO_HINTING flag to be buggy. + * Have not investigated. + * + * - FreeType works in 26.6 mode. Clients can decide to use that mode, and everything + * would work fine. However, we also abuse this API for performing in font-space, + * but don't pass the correct flags to FreeType. We just abuse the no-hinting mode + * for that, such that no rounding etc happens. As such, we don't set ppem, and + * pass NO_HINTING as load_flags. Would be much better to use NO_SCALE, and scale + * ourselves, like we do in uniscribe, etc. + * + * - We don't handle / allow for emboldening / obliqueing. + * + * - In the future, we should add constructors to create fonts in font space? + * + * - FT_Load_Glyph() is exteremely costly. Do something about it? + */ + + +struct hb_ft_font_t +{ + FT_Face ft_face; + int load_flags; + bool symbol; /* Whether selected cmap is symbol cmap. */ + bool unref; /* Whether to destroy ft_face when done. */ +}; + +static hb_ft_font_t * +_hb_ft_font_create (FT_Face ft_face, bool symbol, bool unref) +{ + hb_ft_font_t *ft_font = (hb_ft_font_t *) calloc (1, sizeof (hb_ft_font_t)); + + if (unlikely (!ft_font)) + return NULL; + + ft_font->ft_face = ft_face; + ft_font->symbol = symbol; + ft_font->unref = unref; + + ft_font->load_flags = FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING; + + return ft_font; +} + +static void +_hb_ft_face_destroy (FT_Face ft_face) +{ + FT_Done_Face (ft_face); +} + +static void +_hb_ft_font_destroy (hb_ft_font_t *ft_font) +{ + if (ft_font->unref) + _hb_ft_face_destroy (ft_font->ft_face); + + free (ft_font); +} + +/** + * hb_ft_font_set_load_flags: + * @font: + * @load_flags: + * + * + * + * Since: 1.0.5 + **/ +void +hb_ft_font_set_load_flags (hb_font_t *font, int load_flags) +{ + if (font->immutable) + return; + + if (font->destroy != (hb_destroy_func_t) _hb_ft_font_destroy) + return; + + hb_ft_font_t *ft_font = (hb_ft_font_t *) font->user_data; + + ft_font->load_flags = load_flags; +} + +/** + * hb_ft_font_get_load_flags: + * @font: + * + * + * + * Return value: + * Since: 1.0.5 + **/ +int +hb_ft_font_get_load_flags (hb_font_t *font) +{ + if (font->destroy != (hb_destroy_func_t) _hb_ft_font_destroy) + return 0; + + const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font->user_data; + + return ft_font->load_flags; +} + +FT_Face +hb_ft_font_get_face (hb_font_t *font) +{ + if (font->destroy != (hb_destroy_func_t) _hb_ft_font_destroy) + return NULL; + + const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font->user_data; + + return ft_font->ft_face; +} + + + +static hb_bool_t +hb_ft_get_nominal_glyph (hb_font_t *font HB_UNUSED, + void *font_data, + hb_codepoint_t unicode, + hb_codepoint_t *glyph, + void *user_data HB_UNUSED) +{ + const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data; + unsigned int g = FT_Get_Char_Index (ft_font->ft_face, unicode); + + if (unlikely (!g)) + { + if (unlikely (ft_font->symbol) && unicode <= 0x00FFu) + { + /* For symbol-encoded OpenType fonts, we duplicate the + * U+F000..F0FF range at U+0000..U+00FF. That's what + * Windows seems to do, and that's hinted about at: + * http://www.microsoft.com/typography/otspec/recom.htm + * under "Non-Standard (Symbol) Fonts". */ + g = FT_Get_Char_Index (ft_font->ft_face, 0xF000u + unicode); + if (!g) + return false; + } + else + return false; + } + + *glyph = g; + return true; +} + +static hb_bool_t +hb_ft_get_variation_glyph (hb_font_t *font HB_UNUSED, + void *font_data, + hb_codepoint_t unicode, + hb_codepoint_t variation_selector, + hb_codepoint_t *glyph, + void *user_data HB_UNUSED) +{ + const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data; + unsigned int g = FT_Face_GetCharVariantIndex (ft_font->ft_face, unicode, variation_selector); + + if (unlikely (!g)) + return false; + + *glyph = g; + return true; +} + +static hb_position_t +hb_ft_get_glyph_h_advance (hb_font_t *font HB_UNUSED, + void *font_data, + hb_codepoint_t glyph, + void *user_data HB_UNUSED) +{ + const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data; + FT_Fixed v; + + if (unlikely (FT_Get_Advance (ft_font->ft_face, glyph, ft_font->load_flags, &v))) + return 0; + + if (font->x_scale < 0) + v = -v; + + return (v + (1<<9)) >> 10; +} + +static hb_position_t +hb_ft_get_glyph_v_advance (hb_font_t *font HB_UNUSED, + void *font_data, + hb_codepoint_t glyph, + void *user_data HB_UNUSED) +{ + const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data; + FT_Fixed v; + + if (unlikely (FT_Get_Advance (ft_font->ft_face, glyph, ft_font->load_flags | FT_LOAD_VERTICAL_LAYOUT, &v))) + return 0; + + if (font->y_scale < 0) + v = -v; + + /* Note: FreeType's vertical metrics grows downward while other FreeType coordinates + * have a Y growing upward. Hence the extra negation. */ + return (-v + (1<<9)) >> 10; +} + +static hb_bool_t +hb_ft_get_glyph_v_origin (hb_font_t *font HB_UNUSED, + void *font_data, + hb_codepoint_t glyph, + hb_position_t *x, + hb_position_t *y, + void *user_data HB_UNUSED) +{ + const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data; + FT_Face ft_face = ft_font->ft_face; + + if (unlikely (FT_Load_Glyph (ft_face, glyph, ft_font->load_flags))) + return false; + + /* Note: FreeType's vertical metrics grows downward while other FreeType coordinates + * have a Y growing upward. Hence the extra negation. */ + *x = ft_face->glyph->metrics.horiBearingX - ft_face->glyph->metrics.vertBearingX; + *y = ft_face->glyph->metrics.horiBearingY - (-ft_face->glyph->metrics.vertBearingY); + + if (font->x_scale < 0) + *x = -*x; + if (font->y_scale < 0) + *y = -*y; + + return true; +} + +static hb_position_t +hb_ft_get_glyph_h_kerning (hb_font_t *font, + void *font_data, + hb_codepoint_t left_glyph, + hb_codepoint_t right_glyph, + void *user_data HB_UNUSED) +{ + const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data; + FT_Vector kerningv; + + FT_Kerning_Mode mode = font->x_ppem ? FT_KERNING_DEFAULT : FT_KERNING_UNFITTED; + if (FT_Get_Kerning (ft_font->ft_face, left_glyph, right_glyph, mode, &kerningv)) + return 0; + + return kerningv.x; +} + +static hb_bool_t +hb_ft_get_glyph_extents (hb_font_t *font HB_UNUSED, + void *font_data, + hb_codepoint_t glyph, + hb_glyph_extents_t *extents, + void *user_data HB_UNUSED) +{ + const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data; + FT_Face ft_face = ft_font->ft_face; + + if (unlikely (FT_Load_Glyph (ft_face, glyph, ft_font->load_flags))) + return false; + + extents->x_bearing = ft_face->glyph->metrics.horiBearingX; + extents->y_bearing = ft_face->glyph->metrics.horiBearingY; + extents->width = ft_face->glyph->metrics.width; + extents->height = -ft_face->glyph->metrics.height; + if (font->x_scale < 0) + { + extents->x_bearing = -extents->x_bearing; + extents->width = -extents->width; + } + if (font->y_scale < 0) + { + extents->y_bearing = -extents->y_bearing; + extents->height = -extents->height; + } + return true; +} + +static hb_bool_t +hb_ft_get_glyph_contour_point (hb_font_t *font HB_UNUSED, + void *font_data, + hb_codepoint_t glyph, + unsigned int point_index, + hb_position_t *x, + hb_position_t *y, + void *user_data HB_UNUSED) +{ + const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data; + FT_Face ft_face = ft_font->ft_face; + + if (unlikely (FT_Load_Glyph (ft_face, glyph, ft_font->load_flags))) + return false; + + if (unlikely (ft_face->glyph->format != FT_GLYPH_FORMAT_OUTLINE)) + return false; + + if (unlikely (point_index >= (unsigned int) ft_face->glyph->outline.n_points)) + return false; + + *x = ft_face->glyph->outline.points[point_index].x; + *y = ft_face->glyph->outline.points[point_index].y; + + return true; +} + +static hb_bool_t +hb_ft_get_glyph_name (hb_font_t *font HB_UNUSED, + void *font_data, + hb_codepoint_t glyph, + char *name, unsigned int size, + void *user_data HB_UNUSED) +{ + const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data; + + hb_bool_t ret = !FT_Get_Glyph_Name (ft_font->ft_face, glyph, name, size); + if (ret && (size && !*name)) + ret = false; + + return ret; +} + +static hb_bool_t +hb_ft_get_glyph_from_name (hb_font_t *font HB_UNUSED, + void *font_data, + const char *name, int len, /* -1 means nul-terminated */ + hb_codepoint_t *glyph, + void *user_data HB_UNUSED) +{ + const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data; + FT_Face ft_face = ft_font->ft_face; + + if (len < 0) + *glyph = FT_Get_Name_Index (ft_face, (FT_String *) name); + else { + /* Make a nul-terminated version. */ + char buf[128]; + len = MIN (len, (int) sizeof (buf) - 1); + strncpy (buf, name, len); + buf[len] = '\0'; + *glyph = FT_Get_Name_Index (ft_face, buf); + } + + if (*glyph == 0) + { + /* Check whether the given name was actually the name of glyph 0. */ + char buf[128]; + if (!FT_Get_Glyph_Name(ft_face, 0, buf, sizeof (buf)) && + len < 0 ? !strcmp (buf, name) : !strncmp (buf, name, len)) + return true; + } + + return *glyph != 0; +} + +static hb_bool_t +hb_ft_get_font_h_extents (hb_font_t *font HB_UNUSED, + void *font_data, + hb_font_extents_t *metrics, + void *user_data HB_UNUSED) +{ + const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data; + FT_Face ft_face = ft_font->ft_face; + metrics->ascender = ft_face->size->metrics.ascender; + metrics->descender = ft_face->size->metrics.descender; + metrics->line_gap = ft_face->size->metrics.height - (ft_face->size->metrics.ascender - ft_face->size->metrics.descender); + if (font->y_scale < 0) + { + metrics->ascender = -metrics->ascender; + metrics->descender = -metrics->descender; + metrics->line_gap = -metrics->line_gap; + } + return true; +} + +static hb_font_funcs_t *static_ft_funcs = NULL; + +#ifdef HB_USE_ATEXIT +static +void free_static_ft_funcs (void) +{ + hb_font_funcs_destroy (static_ft_funcs); +} +#endif + +static void +_hb_ft_font_set_funcs (hb_font_t *font, FT_Face ft_face, bool unref) +{ +retry: + hb_font_funcs_t *funcs = (hb_font_funcs_t *) hb_atomic_ptr_get (&static_ft_funcs); + + if (unlikely (!funcs)) + { + funcs = hb_font_funcs_create (); + + hb_font_funcs_set_font_h_extents_func (funcs, hb_ft_get_font_h_extents, NULL, NULL); + //hb_font_funcs_set_font_v_extents_func (funcs, hb_ft_get_font_v_extents, NULL, NULL); + hb_font_funcs_set_nominal_glyph_func (funcs, hb_ft_get_nominal_glyph, NULL, NULL); + hb_font_funcs_set_variation_glyph_func (funcs, hb_ft_get_variation_glyph, NULL, NULL); + hb_font_funcs_set_glyph_h_advance_func (funcs, hb_ft_get_glyph_h_advance, NULL, NULL); + hb_font_funcs_set_glyph_v_advance_func (funcs, hb_ft_get_glyph_v_advance, NULL, NULL); + //hb_font_funcs_set_glyph_h_origin_func (funcs, hb_ft_get_glyph_h_origin, NULL, NULL); + hb_font_funcs_set_glyph_v_origin_func (funcs, hb_ft_get_glyph_v_origin, NULL, NULL); + hb_font_funcs_set_glyph_h_kerning_func (funcs, hb_ft_get_glyph_h_kerning, NULL, NULL); + //hb_font_funcs_set_glyph_v_kerning_func (funcs, hb_ft_get_glyph_v_kerning, NULL, NULL); + hb_font_funcs_set_glyph_extents_func (funcs, hb_ft_get_glyph_extents, NULL, NULL); + hb_font_funcs_set_glyph_contour_point_func (funcs, hb_ft_get_glyph_contour_point, NULL, NULL); + hb_font_funcs_set_glyph_name_func (funcs, hb_ft_get_glyph_name, NULL, NULL); + hb_font_funcs_set_glyph_from_name_func (funcs, hb_ft_get_glyph_from_name, NULL, NULL); + + hb_font_funcs_make_immutable (funcs); + + if (!hb_atomic_ptr_cmpexch (&static_ft_funcs, NULL, funcs)) { + hb_font_funcs_destroy (funcs); + goto retry; + } + +#ifdef HB_USE_ATEXIT + atexit (free_static_ft_funcs); /* First person registers atexit() callback. */ +#endif + }; + + bool symbol = ft_face->charmap && ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL; + + hb_font_set_funcs (font, + funcs, + _hb_ft_font_create (ft_face, symbol, unref), + (hb_destroy_func_t) _hb_ft_font_destroy); +} + + +static hb_blob_t * +reference_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data) +{ + FT_Face ft_face = (FT_Face) user_data; + FT_Byte *buffer; + FT_ULong length = 0; + FT_Error error; + + /* Note: FreeType like HarfBuzz uses the NONE tag for fetching the entire blob */ + + error = FT_Load_Sfnt_Table (ft_face, tag, 0, NULL, &length); + if (error) + return NULL; + + buffer = (FT_Byte *) malloc (length); + if (buffer == NULL) + return NULL; + + error = FT_Load_Sfnt_Table (ft_face, tag, 0, buffer, &length); + if (error) + return NULL; + + return hb_blob_create ((const char *) buffer, length, + HB_MEMORY_MODE_WRITABLE, + buffer, free); +} + +/** + * hb_ft_face_create: + * @ft_face: (destroy destroy) (scope notified): + * @destroy: + * + * + * + * Return value: (transfer full): + * Since: 0.9.2 + **/ +hb_face_t * +hb_ft_face_create (FT_Face ft_face, + hb_destroy_func_t destroy) +{ + hb_face_t *face; + + if (ft_face->stream->read == NULL) { + hb_blob_t *blob; + + blob = hb_blob_create ((const char *) ft_face->stream->base, + (unsigned int) ft_face->stream->size, + HB_MEMORY_MODE_READONLY, + ft_face, destroy); + face = hb_face_create (blob, ft_face->face_index); + hb_blob_destroy (blob); + } else { + face = hb_face_create_for_tables (reference_table, ft_face, destroy); + } + + hb_face_set_index (face, ft_face->face_index); + hb_face_set_upem (face, ft_face->units_per_EM); + + return face; +} + +/** + * hb_ft_face_create_referenced: + * @ft_face: + * + * + * + * Return value: (transfer full): + * Since: 0.9.38 + **/ +hb_face_t * +hb_ft_face_create_referenced (FT_Face ft_face) +{ + FT_Reference_Face (ft_face); + return hb_ft_face_create (ft_face, (hb_destroy_func_t) _hb_ft_face_destroy); +} + +static void +hb_ft_face_finalize (FT_Face ft_face) +{ + hb_face_destroy ((hb_face_t *) ft_face->generic.data); +} + +/** + * hb_ft_face_create_cached: + * @ft_face: + * + * + * + * Return value: (transfer full): + * Since: 0.9.2 + **/ +hb_face_t * +hb_ft_face_create_cached (FT_Face ft_face) +{ + if (unlikely (!ft_face->generic.data || ft_face->generic.finalizer != (FT_Generic_Finalizer) hb_ft_face_finalize)) + { + if (ft_face->generic.finalizer) + ft_face->generic.finalizer (ft_face); + + ft_face->generic.data = hb_ft_face_create (ft_face, NULL); + ft_face->generic.finalizer = (FT_Generic_Finalizer) hb_ft_face_finalize; + } + + return hb_face_reference ((hb_face_t *) ft_face->generic.data); +} + + +/** + * hb_ft_font_create: + * @ft_face: (destroy destroy) (scope notified): + * @destroy: + * + * + * + * Return value: (transfer full): + * Since: 0.9.2 + **/ +hb_font_t * +hb_ft_font_create (FT_Face ft_face, + hb_destroy_func_t destroy) +{ + hb_font_t *font; + hb_face_t *face; + + face = hb_ft_face_create (ft_face, destroy); + font = hb_font_create (face); + hb_face_destroy (face); + _hb_ft_font_set_funcs (font, ft_face, false); + hb_font_set_scale (font, + (int) (((uint64_t) ft_face->size->metrics.x_scale * (uint64_t) ft_face->units_per_EM + (1u<<15)) >> 16), + (int) (((uint64_t) ft_face->size->metrics.y_scale * (uint64_t) ft_face->units_per_EM + (1u<<15)) >> 16)); +#if 0 /* hb-ft works in no-hinting model */ + hb_font_set_ppem (font, + ft_face->size->metrics.x_ppem, + ft_face->size->metrics.y_ppem); +#endif + +#ifdef HAVE_FT_GET_VAR_BLEND_COORDINATES + FT_MM_Var *mm_var = NULL; + if (!FT_Get_MM_Var (ft_face, &mm_var)) + { + FT_Fixed *ft_coords = (FT_Fixed *) calloc (mm_var->num_axis, sizeof (FT_Fixed)); + int *coords = (int *) calloc (mm_var->num_axis, sizeof (int)); + if (coords && ft_coords) + { + if (!FT_Get_Var_Blend_Coordinates (ft_face, mm_var->num_axis, ft_coords)) + { + for (unsigned int i = 0; i < mm_var->num_axis; ++i) + coords[i] = ft_coords[i] >>= 2; + + hb_font_set_var_coords_normalized (font, coords, mm_var->num_axis); + } + free (coords); + free (ft_coords); + } + free (mm_var); + } +#endif + + return font; +} + +/** + * hb_ft_font_create_referenced: + * @ft_face: + * + * + * + * Return value: (transfer full): + * Since: 0.9.38 + **/ +hb_font_t * +hb_ft_font_create_referenced (FT_Face ft_face) +{ + FT_Reference_Face (ft_face); + return hb_ft_font_create (ft_face, (hb_destroy_func_t) _hb_ft_face_destroy); +} + + +/* Thread-safe, lock-free, FT_Library */ + +static FT_Library ft_library; + +#ifdef HB_USE_ATEXIT +static +void free_ft_library (void) +{ + FT_Done_FreeType (ft_library); +} +#endif + +static FT_Library +get_ft_library (void) +{ +retry: + FT_Library library = (FT_Library) hb_atomic_ptr_get (&ft_library); + + if (unlikely (!library)) + { + /* Not found; allocate one. */ + if (FT_Init_FreeType (&library)) + return NULL; + + if (!hb_atomic_ptr_cmpexch (&ft_library, NULL, library)) { + FT_Done_FreeType (library); + goto retry; + } + +#ifdef HB_USE_ATEXIT + atexit (free_ft_library); /* First person registers atexit() callback. */ +#endif + } + + return library; +} + +static void +_release_blob (FT_Face ft_face) +{ + hb_blob_destroy ((hb_blob_t *) ft_face->generic.data); +} + +void +hb_ft_font_set_funcs (hb_font_t *font) +{ + hb_blob_t *blob = hb_face_reference_blob (font->face); + unsigned int blob_length; + const char *blob_data = hb_blob_get_data (blob, &blob_length); + if (unlikely (!blob_length)) + DEBUG_MSG (FT, font, "Font face has empty blob"); + + FT_Face ft_face = NULL; + FT_Error err = FT_New_Memory_Face (get_ft_library (), + (const FT_Byte *) blob_data, + blob_length, + hb_face_get_index (font->face), + &ft_face); + + if (unlikely (err)) { + hb_blob_destroy (blob); + DEBUG_MSG (FT, font, "Font face FT_New_Memory_Face() failed"); + return; + } + + if (FT_Select_Charmap (ft_face, FT_ENCODING_UNICODE)) + FT_Select_Charmap (ft_face, FT_ENCODING_MS_SYMBOL); + + FT_Set_Char_Size (ft_face, + abs (font->x_scale), abs (font->y_scale), + 0, 0); +#if 0 + font->x_ppem * 72 * 64 / font->x_scale, + font->y_ppem * 72 * 64 / font->y_scale); +#endif + if (font->x_scale < 0 || font->y_scale < 0) + { + FT_Matrix matrix = { font->x_scale < 0 ? -1 : +1, 0, + 0, font->y_scale < 0 ? -1 : +1}; + FT_Set_Transform (ft_face, &matrix, NULL); + } + + unsigned int num_coords; + const int *coords = hb_font_get_var_coords_normalized (font, &num_coords); + if (num_coords) + { + FT_Fixed *ft_coords = (FT_Fixed *) calloc (num_coords, sizeof (FT_Fixed)); + if (ft_coords) + { + for (unsigned int i = 0; i < num_coords; i++) + ft_coords[i] = coords[i] << 2; + FT_Set_Var_Blend_Coordinates (ft_face, num_coords, ft_coords); + free (ft_coords); + } + } + + ft_face->generic.data = blob; + ft_face->generic.finalizer = (FT_Generic_Finalizer) _release_blob; + + _hb_ft_font_set_funcs (font, ft_face, true); + hb_ft_font_set_load_flags (font, FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING); +} diff --git a/src/hb-ft.h b/src/hb-ft.h new file mode 100644 index 0000000..dc8ef85 --- /dev/null +++ b/src/hb-ft.h @@ -0,0 +1,126 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * Copyright © 2015 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_FT_H +#define HB_FT_H + +#include "hb.h" + +#include +#include FT_FREETYPE_H + +HB_BEGIN_DECLS + +/* + * Note: FreeType is not thread-safe. + * Hence, these functions are not either. + */ + +/* + * hb-face from ft-face. + */ + +/* This one creates a new hb-face for given ft-face. + * When the returned hb-face is destroyed, the destroy + * callback is called (if not NULL), with the ft-face passed + * to it. + * + * The client is responsible to make sure that ft-face is + * destroyed after hb-face is destroyed. + * + * Most often you don't want this function. You should use either + * hb_ft_face_create_cached(), or hb_ft_face_create_referenced(). + * In particular, if you are going to pass NULL as destroy, you + * probably should use (the more recent) hb_ft_face_create_referenced() + * instead. + */ +HB_EXTERN hb_face_t * +hb_ft_face_create (FT_Face ft_face, + hb_destroy_func_t destroy); + +/* This version is like hb_ft_face_create(), except that it caches + * the hb-face using the generic pointer of the ft-face. This means + * that subsequent calls to this function with the same ft-face will + * return the same hb-face (correctly referenced). + * + * Client is still responsible for making sure that ft-face is destroyed + * after hb-face is. + */ +HB_EXTERN hb_face_t * +hb_ft_face_create_cached (FT_Face ft_face); + +/* This version is like hb_ft_face_create(), except that it calls + * FT_Reference_Face() on ft-face, as such keeping ft-face alive + * as long as the hb-face is. + * + * This is the most convenient version to use. Use it unless you have + * very good reasons not to. + */ +HB_EXTERN hb_face_t * +hb_ft_face_create_referenced (FT_Face ft_face); + + +/* + * hb-font from ft-face. + */ + +/* + * Note: + * + * Set face size on ft-face before creating hb-font from it. + * Otherwise hb-ft would NOT pick up the font size correctly. + */ + +/* See notes on hb_ft_face_create(). Same issues re lifecycle-management + * apply here. Use hb_ft_font_create_referenced() if you can. */ +HB_EXTERN hb_font_t * +hb_ft_font_create (FT_Face ft_face, + hb_destroy_func_t destroy); + +/* See notes on hb_ft_face_create_referenced() re lifecycle-management + * issues. */ +HB_EXTERN hb_font_t * +hb_ft_font_create_referenced (FT_Face ft_face); + +HB_EXTERN FT_Face +hb_ft_font_get_face (hb_font_t *font); + +HB_EXTERN void +hb_ft_font_set_load_flags (hb_font_t *font, int load_flags); + +HB_EXTERN int +hb_ft_font_get_load_flags (hb_font_t *font); + +/* Makes an hb_font_t use FreeType internally to implement font functions. */ +HB_EXTERN void +hb_ft_font_set_funcs (hb_font_t *font); + + +HB_END_DECLS + +#endif /* HB_FT_H */ diff --git a/src/hb-glib.cc b/src/hb-glib.cc new file mode 100644 index 0000000..2b91b5b --- /dev/null +++ b/src/hb-glib.cc @@ -0,0 +1,402 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * Copyright © 2011 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#include "hb-private.hh" + +#include "hb-glib.h" + +#include "hb-unicode-private.hh" + + +#if !GLIB_CHECK_VERSION(2,29,14) +static const hb_script_t +glib_script_to_script[] = +{ + HB_SCRIPT_COMMON, + HB_SCRIPT_INHERITED, + HB_SCRIPT_ARABIC, + HB_SCRIPT_ARMENIAN, + HB_SCRIPT_BENGALI, + HB_SCRIPT_BOPOMOFO, + HB_SCRIPT_CHEROKEE, + HB_SCRIPT_COPTIC, + HB_SCRIPT_CYRILLIC, + HB_SCRIPT_DESERET, + HB_SCRIPT_DEVANAGARI, + HB_SCRIPT_ETHIOPIC, + HB_SCRIPT_GEORGIAN, + HB_SCRIPT_GOTHIC, + HB_SCRIPT_GREEK, + HB_SCRIPT_GUJARATI, + HB_SCRIPT_GURMUKHI, + HB_SCRIPT_HAN, + HB_SCRIPT_HANGUL, + HB_SCRIPT_HEBREW, + HB_SCRIPT_HIRAGANA, + HB_SCRIPT_KANNADA, + HB_SCRIPT_KATAKANA, + HB_SCRIPT_KHMER, + HB_SCRIPT_LAO, + HB_SCRIPT_LATIN, + HB_SCRIPT_MALAYALAM, + HB_SCRIPT_MONGOLIAN, + HB_SCRIPT_MYANMAR, + HB_SCRIPT_OGHAM, + HB_SCRIPT_OLD_ITALIC, + HB_SCRIPT_ORIYA, + HB_SCRIPT_RUNIC, + HB_SCRIPT_SINHALA, + HB_SCRIPT_SYRIAC, + HB_SCRIPT_TAMIL, + HB_SCRIPT_TELUGU, + HB_SCRIPT_THAANA, + HB_SCRIPT_THAI, + HB_SCRIPT_TIBETAN, + HB_SCRIPT_CANADIAN_SYLLABICS, + HB_SCRIPT_YI, + HB_SCRIPT_TAGALOG, + HB_SCRIPT_HANUNOO, + HB_SCRIPT_BUHID, + HB_SCRIPT_TAGBANWA, + + /* Unicode-4.0 additions */ + HB_SCRIPT_BRAILLE, + HB_SCRIPT_CYPRIOT, + HB_SCRIPT_LIMBU, + HB_SCRIPT_OSMANYA, + HB_SCRIPT_SHAVIAN, + HB_SCRIPT_LINEAR_B, + HB_SCRIPT_TAI_LE, + HB_SCRIPT_UGARITIC, + + /* Unicode-4.1 additions */ + HB_SCRIPT_NEW_TAI_LUE, + HB_SCRIPT_BUGINESE, + HB_SCRIPT_GLAGOLITIC, + HB_SCRIPT_TIFINAGH, + HB_SCRIPT_SYLOTI_NAGRI, + HB_SCRIPT_OLD_PERSIAN, + HB_SCRIPT_KHAROSHTHI, + + /* Unicode-5.0 additions */ + HB_SCRIPT_UNKNOWN, + HB_SCRIPT_BALINESE, + HB_SCRIPT_CUNEIFORM, + HB_SCRIPT_PHOENICIAN, + HB_SCRIPT_PHAGS_PA, + HB_SCRIPT_NKO, + + /* Unicode-5.1 additions */ + HB_SCRIPT_KAYAH_LI, + HB_SCRIPT_LEPCHA, + HB_SCRIPT_REJANG, + HB_SCRIPT_SUNDANESE, + HB_SCRIPT_SAURASHTRA, + HB_SCRIPT_CHAM, + HB_SCRIPT_OL_CHIKI, + HB_SCRIPT_VAI, + HB_SCRIPT_CARIAN, + HB_SCRIPT_LYCIAN, + HB_SCRIPT_LYDIAN, + + /* Unicode-5.2 additions */ + HB_SCRIPT_AVESTAN, + HB_SCRIPT_BAMUM, + HB_SCRIPT_EGYPTIAN_HIEROGLYPHS, + HB_SCRIPT_IMPERIAL_ARAMAIC, + HB_SCRIPT_INSCRIPTIONAL_PAHLAVI, + HB_SCRIPT_INSCRIPTIONAL_PARTHIAN, + HB_SCRIPT_JAVANESE, + HB_SCRIPT_KAITHI, + HB_SCRIPT_TAI_THAM, + HB_SCRIPT_LISU, + HB_SCRIPT_MEETEI_MAYEK, + HB_SCRIPT_OLD_SOUTH_ARABIAN, + HB_SCRIPT_OLD_TURKIC, + HB_SCRIPT_SAMARITAN, + HB_SCRIPT_TAI_VIET, + + /* Unicode-6.0 additions */ + HB_SCRIPT_BATAK, + HB_SCRIPT_BRAHMI, + HB_SCRIPT_MANDAIC, + + /* Unicode-6.1 additions */ + HB_SCRIPT_CHAKMA, + HB_SCRIPT_MEROITIC_CURSIVE, + HB_SCRIPT_MEROITIC_HIEROGLYPHS, + HB_SCRIPT_MIAO, + HB_SCRIPT_SHARADA, + HB_SCRIPT_SORA_SOMPENG, + HB_SCRIPT_TAKRI +}; +#endif + +hb_script_t +hb_glib_script_to_script (GUnicodeScript script) +{ +#if GLIB_CHECK_VERSION(2,29,14) + return (hb_script_t) g_unicode_script_to_iso15924 (script); +#else + if (likely ((unsigned int) script < ARRAY_LENGTH (glib_script_to_script))) + return glib_script_to_script[script]; + + if (unlikely (script == G_UNICODE_SCRIPT_INVALID_CODE)) + return HB_SCRIPT_INVALID; + + return HB_SCRIPT_UNKNOWN; +#endif +} + +GUnicodeScript +hb_glib_script_from_script (hb_script_t script) +{ +#if GLIB_CHECK_VERSION(2,29,14) + return g_unicode_script_from_iso15924 (script); +#else + unsigned int count = ARRAY_LENGTH (glib_script_to_script); + for (unsigned int i = 0; i < count; i++) + if (glib_script_to_script[i] == script) + return (GUnicodeScript) i; + + if (unlikely (script == HB_SCRIPT_INVALID)) + return G_UNICODE_SCRIPT_INVALID_CODE; + + return G_UNICODE_SCRIPT_UNKNOWN; +#endif +} + + +static hb_unicode_combining_class_t +hb_glib_unicode_combining_class (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t unicode, + void *user_data HB_UNUSED) + +{ + return (hb_unicode_combining_class_t) g_unichar_combining_class (unicode); +} + +static unsigned int +hb_glib_unicode_eastasian_width (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t unicode, + void *user_data HB_UNUSED) +{ + return g_unichar_iswide (unicode) ? 2 : 1; +} + +static hb_unicode_general_category_t +hb_glib_unicode_general_category (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t unicode, + void *user_data HB_UNUSED) + +{ + /* hb_unicode_general_category_t and GUnicodeType are identical */ + return (hb_unicode_general_category_t) g_unichar_type (unicode); +} + +static hb_codepoint_t +hb_glib_unicode_mirroring (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t unicode, + void *user_data HB_UNUSED) +{ + g_unichar_get_mirror_char (unicode, &unicode); + return unicode; +} + +static hb_script_t +hb_glib_unicode_script (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t unicode, + void *user_data HB_UNUSED) +{ + return hb_glib_script_to_script (g_unichar_get_script (unicode)); +} + +static hb_bool_t +hb_glib_unicode_compose (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t a, + hb_codepoint_t b, + hb_codepoint_t *ab, + void *user_data HB_UNUSED) +{ +#if GLIB_CHECK_VERSION(2,29,12) + return g_unichar_compose (a, b, ab); +#endif + + /* We don't ifdef-out the fallback code such that compiler always + * sees it and makes sure it's compilable. */ + + gchar utf8[12]; + gchar *normalized; + int len; + hb_bool_t ret; + + len = g_unichar_to_utf8 (a, utf8); + len += g_unichar_to_utf8 (b, utf8 + len); + normalized = g_utf8_normalize (utf8, len, G_NORMALIZE_NFC); + len = g_utf8_strlen (normalized, -1); + if (unlikely (!len)) + return false; + + if (len == 1) { + *ab = g_utf8_get_char (normalized); + ret = true; + } else { + ret = false; + } + + g_free (normalized); + return ret; +} + +static hb_bool_t +hb_glib_unicode_decompose (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t ab, + hb_codepoint_t *a, + hb_codepoint_t *b, + void *user_data HB_UNUSED) +{ +#if GLIB_CHECK_VERSION(2,29,12) + return g_unichar_decompose (ab, a, b); +#endif + + /* We don't ifdef-out the fallback code such that compiler always + * sees it and makes sure it's compilable. */ + + gchar utf8[6]; + gchar *normalized; + int len; + hb_bool_t ret; + + len = g_unichar_to_utf8 (ab, utf8); + normalized = g_utf8_normalize (utf8, len, G_NORMALIZE_NFD); + len = g_utf8_strlen (normalized, -1); + if (unlikely (!len)) + return false; + + if (len == 1) { + *a = g_utf8_get_char (normalized); + *b = 0; + ret = *a != ab; + } else if (len == 2) { + *a = g_utf8_get_char (normalized); + *b = g_utf8_get_char (g_utf8_next_char (normalized)); + /* Here's the ugly part: if ab decomposes to a single character and + * that character decomposes again, we have to detect that and undo + * the second part :-(. */ + gchar *recomposed = g_utf8_normalize (normalized, -1, G_NORMALIZE_NFC); + hb_codepoint_t c = g_utf8_get_char (recomposed); + if (c != ab && c != *a) { + *a = c; + *b = 0; + } + g_free (recomposed); + ret = true; + } else { + /* If decomposed to more than two characters, take the last one, + * and recompose the rest to get the first component. */ + gchar *end = g_utf8_offset_to_pointer (normalized, len - 1); + gchar *recomposed; + *b = g_utf8_get_char (end); + recomposed = g_utf8_normalize (normalized, end - normalized, G_NORMALIZE_NFC); + /* We expect that recomposed has exactly one character now. */ + *a = g_utf8_get_char (recomposed); + g_free (recomposed); + ret = true; + } + + g_free (normalized); + return ret; +} + +static unsigned int +hb_glib_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t u, + hb_codepoint_t *decomposed, + void *user_data HB_UNUSED) +{ +#if GLIB_CHECK_VERSION(2,29,12) + return g_unichar_fully_decompose (u, true, decomposed, HB_UNICODE_MAX_DECOMPOSITION_LEN); +#endif + + /* If the user doesn't have GLib >= 2.29.12 we have to perform + * a round trip to UTF-8 and the associated memory management dance. */ + gchar utf8[6]; + gchar *utf8_decomposed, *c; + gsize utf8_len, utf8_decomposed_len, i; + + /* Convert @u to UTF-8 and normalise it in NFKD mode. This performs the compatibility decomposition. */ + utf8_len = g_unichar_to_utf8 (u, utf8); + utf8_decomposed = g_utf8_normalize (utf8, utf8_len, G_NORMALIZE_NFKD); + utf8_decomposed_len = g_utf8_strlen (utf8_decomposed, -1); + + assert (utf8_decomposed_len <= HB_UNICODE_MAX_DECOMPOSITION_LEN); + + for (i = 0, c = utf8_decomposed; i < utf8_decomposed_len; i++, c = g_utf8_next_char (c)) + *decomposed++ = g_utf8_get_char (c); + + g_free (utf8_decomposed); + + return utf8_decomposed_len; +} + +hb_unicode_funcs_t * +hb_glib_get_unicode_funcs (void) +{ + static const hb_unicode_funcs_t _hb_glib_unicode_funcs = { + HB_OBJECT_HEADER_STATIC, + + NULL, /* parent */ + true, /* immutable */ + { +#define HB_UNICODE_FUNC_IMPLEMENT(name) hb_glib_unicode_##name, + HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS +#undef HB_UNICODE_FUNC_IMPLEMENT + } + }; + + return const_cast (&_hb_glib_unicode_funcs); +} + +#if GLIB_CHECK_VERSION(2,31,10) +/** + * hb_glib_blob_create: + * + * Since: 0.9.38 + **/ +hb_blob_t * +hb_glib_blob_create (GBytes *gbytes) +{ + gsize size = 0; + gconstpointer data = g_bytes_get_data (gbytes, &size); + return hb_blob_create ((const char *) data, + size, + HB_MEMORY_MODE_READONLY, + g_bytes_ref (gbytes), + (hb_destroy_func_t) g_bytes_unref); +} +#endif diff --git a/src/hb-glib.h b/src/hb-glib.h new file mode 100644 index 0000000..5f04183 --- /dev/null +++ b/src/hb-glib.h @@ -0,0 +1,56 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * Copyright © 2011 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_GLIB_H +#define HB_GLIB_H + +#include "hb.h" + +#include + +HB_BEGIN_DECLS + + +HB_EXTERN hb_script_t +hb_glib_script_to_script (GUnicodeScript script); + +HB_EXTERN GUnicodeScript +hb_glib_script_from_script (hb_script_t script); + + +HB_EXTERN hb_unicode_funcs_t * +hb_glib_get_unicode_funcs (void); + +#if GLIB_CHECK_VERSION(2,31,10) +HB_EXTERN hb_blob_t * +hb_glib_blob_create (GBytes *gbytes); +#endif + +HB_END_DECLS + +#endif /* HB_GLIB_H */ diff --git a/src/hb-gobject-enums.cc.tmpl b/src/hb-gobject-enums.cc.tmpl new file mode 100644 index 0000000..ca458a3 --- /dev/null +++ b/src/hb-gobject-enums.cc.tmpl @@ -0,0 +1,73 @@ +/*** BEGIN file-header ***/ +/* + * Copyright © 2011 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#include "hb-private.hh" + +/* g++ didn't like older gtype.h gcc-only code path. */ +#include +#if !GLIB_CHECK_VERSION(2,29,16) +#undef __GNUC__ +#undef __GNUC_MINOR__ +#define __GNUC__ 2 +#define __GNUC_MINOR__ 6 +#endif + +#include "hb-gobject.h" + +/*** END file-header ***/ + +/*** BEGIN file-production ***/ +/* enumerations from "@filename@" */ +/*** END file-production ***/ + +/*** BEGIN value-header ***/ +GType +@enum_name@_get_type (void) +{ + static gsize type_id = 0; + + if (g_once_init_enter (&type_id)) + { + static const G@Type@Value values[] = { +/*** END value-header ***/ + +/*** BEGIN value-production ***/ + { @VALUENAME@, "@VALUENAME@", "@valuenick@" }, +/*** END value-production ***/ + +/*** BEGIN value-tail ***/ + { 0, NULL, NULL } + }; + GType id = + g_@type@_register_static (g_intern_static_string ("@EnumName@"), values); + g_once_init_leave (&type_id, id); + } + + return type_id; +} + +/*** END value-tail ***/ diff --git a/src/hb-gobject-enums.h.tmpl b/src/hb-gobject-enums.h.tmpl new file mode 100644 index 0000000..e28510c --- /dev/null +++ b/src/hb-gobject-enums.h.tmpl @@ -0,0 +1,55 @@ +/*** BEGIN file-header ***/ +/* + * Copyright © 2013 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_GOBJECT_H_IN +#error "Include instead." +#endif + +#ifndef HB_GOBJECT_ENUMS_H +#define HB_GOBJECT_ENUMS_H + +#include "hb.h" + +#include + +HB_BEGIN_DECLS + + +/*** END file-header ***/ + +/*** BEGIN value-header ***/ +HB_EXTERN GType @enum_name@_get_type (void) G_GNUC_CONST; +#define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ()) + +/*** END value-header ***/ + +/*** BEGIN file-tail ***/ + +HB_END_DECLS + +#endif /* HB_GOBJECT_ENUMS_H */ +/*** END file-tail ***/ diff --git a/src/hb-gobject-structs.cc b/src/hb-gobject-structs.cc new file mode 100644 index 0000000..fef0024 --- /dev/null +++ b/src/hb-gobject-structs.cc @@ -0,0 +1,83 @@ +/* + * Copyright © 2011 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#include "hb-private.hh" + +/* g++ didn't like older gtype.h gcc-only code path. */ +#include +#if !GLIB_CHECK_VERSION(2,29,16) +#undef __GNUC__ +#undef __GNUC_MINOR__ +#define __GNUC__ 2 +#define __GNUC_MINOR__ 6 +#endif + +#include "hb-gobject.h" + +#define HB_DEFINE_BOXED_TYPE(name,copy_func,free_func) \ +GType \ +hb_gobject_##name##_get_type (void) \ +{ \ + static gsize type_id = 0; \ + if (g_once_init_enter (&type_id)) { \ + GType id = g_boxed_type_register_static (g_intern_static_string ("hb_" #name "_t"), \ + (GBoxedCopyFunc) copy_func, \ + (GBoxedFreeFunc) free_func); \ + g_once_init_leave (&type_id, id); \ + } \ + return type_id; \ +} + +#define HB_DEFINE_OBJECT_TYPE(name) \ + HB_DEFINE_BOXED_TYPE (name, hb_##name##_reference, hb_##name##_destroy); + +#define HB_DEFINE_VALUE_TYPE(name) \ + static hb_##name##_t *_hb_##name##_reference (const hb_##name##_t *l) \ + { \ + hb_##name##_t *c = (hb_##name##_t *) calloc (1, sizeof (hb_##name##_t)); \ + if (unlikely (!c)) return NULL; \ + *c = *l; \ + return c; \ + } \ + static void _hb_##name##_destroy (hb_##name##_t *l) { free (l); } \ + HB_DEFINE_BOXED_TYPE (name, _hb_##name##_reference, _hb_##name##_destroy); + +HB_DEFINE_OBJECT_TYPE (buffer) +HB_DEFINE_OBJECT_TYPE (blob) +HB_DEFINE_OBJECT_TYPE (face) +HB_DEFINE_OBJECT_TYPE (font) +HB_DEFINE_OBJECT_TYPE (font_funcs) +HB_DEFINE_OBJECT_TYPE (set) +HB_DEFINE_OBJECT_TYPE (shape_plan) +HB_DEFINE_OBJECT_TYPE (unicode_funcs) +HB_DEFINE_VALUE_TYPE (feature) +HB_DEFINE_VALUE_TYPE (glyph_info) +HB_DEFINE_VALUE_TYPE (glyph_position) +HB_DEFINE_VALUE_TYPE (segment_properties) +HB_DEFINE_VALUE_TYPE (user_data_key) + +HB_DEFINE_VALUE_TYPE (ot_math_glyph_variant) +HB_DEFINE_VALUE_TYPE (ot_math_glyph_part) diff --git a/src/hb-gobject-structs.h b/src/hb-gobject-structs.h new file mode 100644 index 0000000..1c30321 --- /dev/null +++ b/src/hb-gobject-structs.h @@ -0,0 +1,117 @@ +/* + * Copyright © 2011 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_GOBJECT_H_IN +#error "Include instead." +#endif + +#ifndef HB_GOBJECT_STRUCTS_H +#define HB_GOBJECT_STRUCTS_H + +#include "hb.h" + +#include + +HB_BEGIN_DECLS + + +/* Object types */ + +/** + * hb_gobject_blob_get_type: + * + * Since: 0.9.2 + **/ +HB_EXTERN GType hb_gobject_blob_get_type (void); +#define HB_GOBJECT_TYPE_BLOB (hb_gobject_blob_get_type ()) + +/** + * hb_gobject_buffer_get_type: + * + * Since: 0.9.2 + **/ +HB_EXTERN GType hb_gobject_buffer_get_type (void); +#define HB_GOBJECT_TYPE_BUFFER (hb_gobject_buffer_get_type ()) + +/** + * hb_gobject_face_get_type: + * + * Since: 0.9.2 + **/ +HB_EXTERN GType hb_gobject_face_get_type (void); +#define HB_GOBJECT_TYPE_FACE (hb_gobject_face_get_type ()) + +/** + * hb_gobject_font_get_type: + * + * Since: 0.9.2 + **/ +HB_EXTERN GType hb_gobject_font_get_type (void); +#define HB_GOBJECT_TYPE_FONT (hb_gobject_font_get_type ()) + +/** + * hb_gobject_font_funcs_get_type: + * + * Since: 0.9.2 + **/ +HB_EXTERN GType hb_gobject_font_funcs_get_type (void); +#define HB_GOBJECT_TYPE_FONT_FUNCS (hb_gobject_font_funcs_get_type ()) + +HB_EXTERN GType hb_gobject_set_get_type (void); +#define HB_GOBJECT_TYPE_SET (hb_gobject_set_get_type ()) + +HB_EXTERN GType hb_gobject_shape_plan_get_type (void); +#define HB_GOBJECT_TYPE_SHAPE_PLAN (hb_gobject_shape_plan_get_type ()) + +/** + * hb_gobject_unicode_funcs_get_type: + * + * Since: 0.9.2 + **/ +HB_EXTERN GType hb_gobject_unicode_funcs_get_type (void); +#define HB_GOBJECT_TYPE_UNICODE_FUNCS (hb_gobject_unicode_funcs_get_type ()) + +/* Value types */ + +HB_EXTERN GType hb_gobject_feature_get_type (void); +#define HB_GOBJECT_TYPE_FEATURE (hb_gobject_feature_get_type ()) + +HB_EXTERN GType hb_gobject_glyph_info_get_type (void); +#define HB_GOBJECT_TYPE_GLYPH_INFO (hb_gobject_glyph_info_get_type ()) + +HB_EXTERN GType hb_gobject_glyph_position_get_type (void); +#define HB_GOBJECT_TYPE_GLYPH_POSITION (hb_gobject_glyph_position_get_type ()) + +HB_EXTERN GType hb_gobject_segment_properties_get_type (void); +#define HB_GOBJECT_TYPE_SEGMENT_PROPERTIES (hb_gobject_segment_properties_get_type ()) + +HB_EXTERN GType hb_gobject_user_data_key_get_type (void); +#define HB_GOBJECT_TYPE_USER_DATA_KEY (hb_gobject_user_data_key_get_type ()) + + +HB_END_DECLS + +#endif /* HB_GOBJECT_H */ diff --git a/src/hb-gobject.h b/src/hb-gobject.h new file mode 100644 index 0000000..ea1bd25 --- /dev/null +++ b/src/hb-gobject.h @@ -0,0 +1,40 @@ +/* + * Copyright © 2011 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_GOBJECT_H +#define HB_GOBJECT_H +#define HB_GOBJECT_H_IN + +#include "hb.h" + +#include "hb-gobject-enums.h" +#include "hb-gobject-structs.h" + +HB_BEGIN_DECLS +HB_END_DECLS + +#undef HB_GOBJECT_H_IN +#endif /* HB_GOBJECT_H */ diff --git a/src/hb-graphite2.cc b/src/hb-graphite2.cc new file mode 100644 index 0000000..a2d90db --- /dev/null +++ b/src/hb-graphite2.cc @@ -0,0 +1,427 @@ +/* + * Copyright © 2011 Martin Hosken + * Copyright © 2011 SIL International + * Copyright © 2011,2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#define HB_SHAPER graphite2 +#define hb_graphite2_shaper_font_data_t gr_font +#include "hb-shaper-impl-private.hh" + +#include "hb-graphite2.h" + +#include + + +HB_SHAPER_DATA_ENSURE_DECLARE(graphite2, face) +HB_SHAPER_DATA_ENSURE_DECLARE(graphite2, font) + + +/* + * shaper face data + */ + +typedef struct hb_graphite2_tablelist_t { + struct hb_graphite2_tablelist_t *next; + hb_blob_t *blob; + unsigned int tag; +} hb_graphite2_tablelist_t; + +struct hb_graphite2_shaper_face_data_t { + hb_face_t *face; + gr_face *grface; + hb_graphite2_tablelist_t *tlist; +}; + +static const void *hb_graphite2_get_table (const void *data, unsigned int tag, size_t *len) +{ + hb_graphite2_shaper_face_data_t *face_data = (hb_graphite2_shaper_face_data_t *) data; + hb_graphite2_tablelist_t *tlist = face_data->tlist; + + hb_blob_t *blob = NULL; + + for (hb_graphite2_tablelist_t *p = tlist; p; p = p->next) + if (p->tag == tag) { + blob = p->blob; + break; + } + + if (unlikely (!blob)) + { + blob = face_data->face->reference_table (tag); + + hb_graphite2_tablelist_t *p = (hb_graphite2_tablelist_t *) calloc (1, sizeof (hb_graphite2_tablelist_t)); + if (unlikely (!p)) { + hb_blob_destroy (blob); + return NULL; + } + p->blob = blob; + p->tag = tag; + + /* TODO Not thread-safe, but fairly harmless. + * We can do the double-chcked pointer cmpexch thing here. */ + p->next = face_data->tlist; + face_data->tlist = p; + } + + unsigned int tlen; + const char *d = hb_blob_get_data (blob, &tlen); + *len = tlen; + return d; +} + +hb_graphite2_shaper_face_data_t * +_hb_graphite2_shaper_face_data_create (hb_face_t *face) +{ + hb_blob_t *silf_blob = face->reference_table (HB_GRAPHITE2_TAG_SILF); + /* Umm, we just reference the table to check whether it exists. + * Maybe add better API for this? */ + if (!hb_blob_get_length (silf_blob)) + { + hb_blob_destroy (silf_blob); + return NULL; + } + hb_blob_destroy (silf_blob); + + hb_graphite2_shaper_face_data_t *data = (hb_graphite2_shaper_face_data_t *) calloc (1, sizeof (hb_graphite2_shaper_face_data_t)); + if (unlikely (!data)) + return NULL; + + data->face = face; + data->grface = gr_make_face (data, &hb_graphite2_get_table, gr_face_preloadAll); + + if (unlikely (!data->grface)) { + free (data); + return NULL; + } + + return data; +} + +void +_hb_graphite2_shaper_face_data_destroy (hb_graphite2_shaper_face_data_t *data) +{ + hb_graphite2_tablelist_t *tlist = data->tlist; + + while (tlist) + { + hb_graphite2_tablelist_t *old = tlist; + hb_blob_destroy (tlist->blob); + tlist = tlist->next; + free (old); + } + + gr_face_destroy (data->grface); + + free (data); +} + +/* + * Since: 0.9.10 + */ +gr_face * +hb_graphite2_face_get_gr_face (hb_face_t *face) +{ + if (unlikely (!hb_graphite2_shaper_face_data_ensure (face))) return NULL; + return HB_SHAPER_DATA_GET (face)->grface; +} + + +/* + * shaper font data + */ + +static float hb_graphite2_get_advance (const void *hb_font, unsigned short gid) +{ + return ((hb_font_t *) hb_font)->get_glyph_h_advance (gid); +} + +hb_graphite2_shaper_font_data_t * +_hb_graphite2_shaper_font_data_create (hb_font_t *font) +{ + if (unlikely (!hb_graphite2_shaper_face_data_ensure (font->face))) return NULL; + + hb_face_t *face = font->face; + hb_graphite2_shaper_face_data_t *face_data = HB_SHAPER_DATA_GET (face); + + return gr_make_font_with_advance_fn (font->x_scale, font, &hb_graphite2_get_advance, face_data->grface); +} + +void +_hb_graphite2_shaper_font_data_destroy (hb_graphite2_shaper_font_data_t *data) +{ + gr_font_destroy (data); +} + +/* + * Since: 0.9.10 + */ +gr_font * +hb_graphite2_font_get_gr_font (hb_font_t *font) +{ + if (unlikely (!hb_graphite2_shaper_font_data_ensure (font))) return NULL; + return HB_SHAPER_DATA_GET (font); +} + + +/* + * shaper shape_plan data + */ + +struct hb_graphite2_shaper_shape_plan_data_t {}; + +hb_graphite2_shaper_shape_plan_data_t * +_hb_graphite2_shaper_shape_plan_data_create (hb_shape_plan_t *shape_plan HB_UNUSED, + const hb_feature_t *user_features HB_UNUSED, + unsigned int num_user_features HB_UNUSED, + const int *coords HB_UNUSED, + unsigned int num_coords HB_UNUSED) +{ + return (hb_graphite2_shaper_shape_plan_data_t *) HB_SHAPER_DATA_SUCCEEDED; +} + +void +_hb_graphite2_shaper_shape_plan_data_destroy (hb_graphite2_shaper_shape_plan_data_t *data HB_UNUSED) +{ +} + + +/* + * shaper + */ + +struct hb_graphite2_cluster_t { + unsigned int base_char; + unsigned int num_chars; + unsigned int base_glyph; + unsigned int num_glyphs; + unsigned int cluster; + float advance; +}; + +hb_bool_t +_hb_graphite2_shape (hb_shape_plan_t *shape_plan, + hb_font_t *font, + hb_buffer_t *buffer, + const hb_feature_t *features, + unsigned int num_features) +{ + hb_face_t *face = font->face; + gr_face *grface = HB_SHAPER_DATA_GET (face)->grface; + gr_font *grfont = HB_SHAPER_DATA_GET (font); + + const char *lang = hb_language_to_string (hb_buffer_get_language (buffer)); + const char *lang_end = lang ? strchr (lang, '-') : NULL; + int lang_len = lang_end ? lang_end - lang : -1; + gr_feature_val *feats = gr_face_featureval_for_lang (grface, lang ? hb_tag_from_string (lang, lang_len) : 0); + + for (unsigned int i = 0; i < num_features; i++) + { + const gr_feature_ref *fref = gr_face_find_fref (grface, features[i].tag); + if (fref) + gr_fref_set_feature_value (fref, features[i].value, feats); + } + + gr_segment *seg = NULL; + const gr_slot *is; + unsigned int ci = 0, ic = 0; + float curradvx = 0., curradvy = 0.; + + unsigned int scratch_size; + hb_buffer_t::scratch_buffer_t *scratch = buffer->get_scratch_buffer (&scratch_size); + + uint32_t *chars = (uint32_t *) scratch; + + for (unsigned int i = 0; i < buffer->len; ++i) + chars[i] = buffer->info[i].codepoint; + + /* TODO ensure_native_direction. */ + + hb_tag_t script_tag[2]; + hb_ot_tags_from_script (hb_buffer_get_script (buffer), &script_tag[0], &script_tag[1]); + + seg = gr_make_seg (grfont, grface, + script_tag[1] == HB_TAG_NONE ? script_tag[0] : script_tag[1], + feats, + gr_utf32, chars, buffer->len, + 2 | (hb_buffer_get_direction (buffer) == HB_DIRECTION_RTL ? 1 : 0)); + + if (unlikely (!seg)) { + if (feats) gr_featureval_destroy (feats); + return false; + } + + unsigned int glyph_count = gr_seg_n_slots (seg); + if (unlikely (!glyph_count)) { + if (feats) gr_featureval_destroy (feats); + gr_seg_destroy (seg); + buffer->len = 0; + return true; + } + + buffer->ensure (glyph_count); + scratch = buffer->get_scratch_buffer (&scratch_size); + while ((DIV_CEIL (sizeof (hb_graphite2_cluster_t) * buffer->len, sizeof (*scratch)) + + DIV_CEIL (sizeof (hb_codepoint_t) * glyph_count, sizeof (*scratch))) > scratch_size) + { + if (unlikely (!buffer->ensure (buffer->allocated * 2))) + { + if (feats) gr_featureval_destroy (feats); + gr_seg_destroy (seg); + return false; + } + scratch = buffer->get_scratch_buffer (&scratch_size); + } + +#define ALLOCATE_ARRAY(Type, name, len) \ + Type *name = (Type *) scratch; \ + { \ + unsigned int _consumed = DIV_CEIL ((len) * sizeof (Type), sizeof (*scratch)); \ + assert (_consumed <= scratch_size); \ + scratch += _consumed; \ + scratch_size -= _consumed; \ + } + + ALLOCATE_ARRAY (hb_graphite2_cluster_t, clusters, buffer->len); + ALLOCATE_ARRAY (hb_codepoint_t, gids, glyph_count); + +#undef ALLOCATE_ARRAY + + memset (clusters, 0, sizeof (clusters[0]) * buffer->len); + + hb_codepoint_t *pg = gids; + clusters[0].cluster = buffer->info[0].cluster; + float curradv = HB_DIRECTION_IS_BACKWARD(buffer->props.direction) ? gr_slot_origin_X(gr_seg_first_slot(seg)) : 0.; + if (HB_DIRECTION_IS_BACKWARD(buffer->props.direction)) + { + curradv = gr_slot_origin_X(gr_seg_first_slot(seg)); + clusters[0].advance = gr_seg_advance_X(seg) - curradv; + } + for (is = gr_seg_first_slot (seg), ic = 0; is; is = gr_slot_next_in_segment (is), ic++) + { + unsigned int before = gr_slot_before (is); + unsigned int after = gr_slot_after (is); + *pg = gr_slot_gid (is); + pg++; + while (clusters[ci].base_char > before && ci) + { + clusters[ci-1].num_chars += clusters[ci].num_chars; + clusters[ci-1].num_glyphs += clusters[ci].num_glyphs; + clusters[ci-1].advance += clusters[ci].advance; + ci--; + } + + if (gr_slot_can_insert_before (is) && clusters[ci].num_chars && before >= clusters[ci].base_char + clusters[ci].num_chars) + { + hb_graphite2_cluster_t *c = clusters + ci + 1; + c->base_char = clusters[ci].base_char + clusters[ci].num_chars; + c->cluster = buffer->info[c->base_char].cluster; + c->num_chars = before - c->base_char; + c->base_glyph = ic; + c->num_glyphs = 0; + if (HB_DIRECTION_IS_BACKWARD(buffer->props.direction)) + { + ci++; + clusters[ci].advance = curradv - gr_slot_origin_X(is); + } else { + clusters[ci].advance = gr_slot_origin_X(is) - curradv; + ci++; + } + curradv = gr_slot_origin_X(is); + } + clusters[ci].num_glyphs++; + + if (clusters[ci].base_char + clusters[ci].num_chars < after + 1) + clusters[ci].num_chars = after + 1 - clusters[ci].base_char; + } + + if (!HB_DIRECTION_IS_BACKWARD(buffer->props.direction)) + clusters[ci].advance = gr_seg_advance_X(seg) - curradv; + ci++; + + for (unsigned int i = 0; i < ci; ++i) + { + for (unsigned int j = 0; j < clusters[i].num_glyphs; ++j) + { + hb_glyph_info_t *info = &buffer->info[clusters[i].base_glyph + j]; + info->codepoint = gids[clusters[i].base_glyph + j]; + info->cluster = clusters[i].cluster; + info->var1.i32 = clusters[i].advance; // all glyphs in the cluster get the same advance + } + } + buffer->len = glyph_count; + + float yscale = font->y_scale / font->x_scale; + /* Positioning. */ + if (!HB_DIRECTION_IS_BACKWARD(buffer->props.direction)) + { + int currclus = -1; + const hb_glyph_info_t *info = buffer->info; + hb_glyph_position_t *pPos = hb_buffer_get_glyph_positions (buffer, NULL); + curradvx = 0; + for (is = gr_seg_first_slot (seg); is; pPos++, ++info, is = gr_slot_next_in_segment (is)) + { + pPos->x_offset = gr_slot_origin_X (is) - curradvx; + pPos->y_offset = gr_slot_origin_Y (is) * yscale - curradvy; + if (info->cluster != currclus) { + pPos->x_advance = info->var1.i32; + curradvx += pPos->x_advance; + currclus = info->cluster; + } else + pPos->x_advance = 0.; + + pPos->y_advance = gr_slot_advance_Y (is, grface, grfont) * yscale; + curradvy += pPos->y_advance; + } + } + else + { + int currclus = -1; + const hb_glyph_info_t *info = buffer->info; + hb_glyph_position_t *pPos = hb_buffer_get_glyph_positions (buffer, NULL); + curradvx = gr_seg_advance_X(seg); + for (is = gr_seg_first_slot (seg); is; pPos++, info++, is = gr_slot_next_in_segment (is)) + { + if (info->cluster != currclus) + { + pPos->x_advance = info->var1.i32; + if (currclus != -1) curradvx -= info[-1].var1.i32; + currclus = info->cluster; + } else + pPos->x_advance = 0.; + + pPos->y_advance = gr_slot_advance_Y (is, grface, grfont) * yscale; + curradvy -= pPos->y_advance; + pPos->x_offset = gr_slot_origin_X (is) - curradvx + pPos->x_advance; + pPos->y_offset = gr_slot_origin_Y (is) * yscale - curradvy; + } + hb_buffer_reverse_clusters (buffer); + } + + if (feats) gr_featureval_destroy (feats); + gr_seg_destroy (seg); + + return true; +} diff --git a/src/hb-graphite2.h b/src/hb-graphite2.h new file mode 100644 index 0000000..122c3e4 --- /dev/null +++ b/src/hb-graphite2.h @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2011 Martin Hosken + * Copyright (C) 2011 SIL International + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + */ + +#ifndef HB_GRAPHITE2_H +#define HB_GRAPHITE2_H + +#include "hb.h" + +#include + +HB_BEGIN_DECLS + + +#define HB_GRAPHITE2_TAG_SILF HB_TAG('S','i','l','f') + + +HB_EXTERN gr_face * +hb_graphite2_face_get_gr_face (hb_face_t *face); + +HB_EXTERN gr_font * +hb_graphite2_font_get_gr_font (hb_font_t *font); + + +HB_END_DECLS + +#endif /* HB_GRAPHITE2_H */ diff --git a/src/hb-icu.cc b/src/hb-icu.cc new file mode 100644 index 0000000..ee54721 --- /dev/null +++ b/src/hb-icu.cc @@ -0,0 +1,371 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * Copyright © 2009 Keith Stribley + * Copyright © 2011 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#include "hb-private.hh" + +#include "hb-icu.h" + +#include "hb-unicode-private.hh" + +#include +#include +#include +#include +#include + + +hb_script_t +hb_icu_script_to_script (UScriptCode script) +{ + if (unlikely (script == USCRIPT_INVALID_CODE)) + return HB_SCRIPT_INVALID; + + return hb_script_from_string (uscript_getShortName (script), -1); +} + +UScriptCode +hb_icu_script_from_script (hb_script_t script) +{ + if (unlikely (script == HB_SCRIPT_INVALID)) + return USCRIPT_INVALID_CODE; + + for (unsigned int i = 0; i < USCRIPT_CODE_LIMIT; i++) + if (unlikely (hb_icu_script_to_script ((UScriptCode) i) == script)) + return (UScriptCode) i; + + return USCRIPT_UNKNOWN; +} + + +static hb_unicode_combining_class_t +hb_icu_unicode_combining_class (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t unicode, + void *user_data HB_UNUSED) + +{ + return (hb_unicode_combining_class_t) u_getCombiningClass (unicode); +} + +static unsigned int +hb_icu_unicode_eastasian_width (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t unicode, + void *user_data HB_UNUSED) +{ + switch (u_getIntPropertyValue(unicode, UCHAR_EAST_ASIAN_WIDTH)) + { + case U_EA_WIDE: + case U_EA_FULLWIDTH: + return 2; + case U_EA_NEUTRAL: + case U_EA_AMBIGUOUS: + case U_EA_HALFWIDTH: + case U_EA_NARROW: + return 1; + } + return 1; +} + +static hb_unicode_general_category_t +hb_icu_unicode_general_category (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t unicode, + void *user_data HB_UNUSED) +{ + switch (u_getIntPropertyValue(unicode, UCHAR_GENERAL_CATEGORY)) + { + case U_UNASSIGNED: return HB_UNICODE_GENERAL_CATEGORY_UNASSIGNED; + + case U_UPPERCASE_LETTER: return HB_UNICODE_GENERAL_CATEGORY_UPPERCASE_LETTER; + case U_LOWERCASE_LETTER: return HB_UNICODE_GENERAL_CATEGORY_LOWERCASE_LETTER; + case U_TITLECASE_LETTER: return HB_UNICODE_GENERAL_CATEGORY_TITLECASE_LETTER; + case U_MODIFIER_LETTER: return HB_UNICODE_GENERAL_CATEGORY_MODIFIER_LETTER; + case U_OTHER_LETTER: return HB_UNICODE_GENERAL_CATEGORY_OTHER_LETTER; + + case U_NON_SPACING_MARK: return HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK; + case U_ENCLOSING_MARK: return HB_UNICODE_GENERAL_CATEGORY_ENCLOSING_MARK; + case U_COMBINING_SPACING_MARK: return HB_UNICODE_GENERAL_CATEGORY_SPACING_MARK; + + case U_DECIMAL_DIGIT_NUMBER: return HB_UNICODE_GENERAL_CATEGORY_DECIMAL_NUMBER; + case U_LETTER_NUMBER: return HB_UNICODE_GENERAL_CATEGORY_LETTER_NUMBER; + case U_OTHER_NUMBER: return HB_UNICODE_GENERAL_CATEGORY_OTHER_NUMBER; + + case U_SPACE_SEPARATOR: return HB_UNICODE_GENERAL_CATEGORY_SPACE_SEPARATOR; + case U_LINE_SEPARATOR: return HB_UNICODE_GENERAL_CATEGORY_LINE_SEPARATOR; + case U_PARAGRAPH_SEPARATOR: return HB_UNICODE_GENERAL_CATEGORY_PARAGRAPH_SEPARATOR; + + case U_CONTROL_CHAR: return HB_UNICODE_GENERAL_CATEGORY_CONTROL; + case U_FORMAT_CHAR: return HB_UNICODE_GENERAL_CATEGORY_FORMAT; + case U_PRIVATE_USE_CHAR: return HB_UNICODE_GENERAL_CATEGORY_PRIVATE_USE; + case U_SURROGATE: return HB_UNICODE_GENERAL_CATEGORY_SURROGATE; + + + case U_DASH_PUNCTUATION: return HB_UNICODE_GENERAL_CATEGORY_DASH_PUNCTUATION; + case U_START_PUNCTUATION: return HB_UNICODE_GENERAL_CATEGORY_OPEN_PUNCTUATION; + case U_END_PUNCTUATION: return HB_UNICODE_GENERAL_CATEGORY_CLOSE_PUNCTUATION; + case U_CONNECTOR_PUNCTUATION: return HB_UNICODE_GENERAL_CATEGORY_CONNECT_PUNCTUATION; + case U_OTHER_PUNCTUATION: return HB_UNICODE_GENERAL_CATEGORY_OTHER_PUNCTUATION; + + case U_MATH_SYMBOL: return HB_UNICODE_GENERAL_CATEGORY_MATH_SYMBOL; + case U_CURRENCY_SYMBOL: return HB_UNICODE_GENERAL_CATEGORY_CURRENCY_SYMBOL; + case U_MODIFIER_SYMBOL: return HB_UNICODE_GENERAL_CATEGORY_MODIFIER_SYMBOL; + case U_OTHER_SYMBOL: return HB_UNICODE_GENERAL_CATEGORY_OTHER_SYMBOL; + + case U_INITIAL_PUNCTUATION: return HB_UNICODE_GENERAL_CATEGORY_INITIAL_PUNCTUATION; + case U_FINAL_PUNCTUATION: return HB_UNICODE_GENERAL_CATEGORY_FINAL_PUNCTUATION; + } + + return HB_UNICODE_GENERAL_CATEGORY_UNASSIGNED; +} + +static hb_codepoint_t +hb_icu_unicode_mirroring (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t unicode, + void *user_data HB_UNUSED) +{ + return u_charMirror(unicode); +} + +static hb_script_t +hb_icu_unicode_script (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t unicode, + void *user_data HB_UNUSED) +{ + UErrorCode status = U_ZERO_ERROR; + UScriptCode scriptCode = uscript_getScript(unicode, &status); + + if (unlikely (U_FAILURE (status))) + return HB_SCRIPT_UNKNOWN; + + return hb_icu_script_to_script (scriptCode); +} + +#if U_ICU_VERSION_MAJOR_NUM >= 49 +static const UNormalizer2 *normalizer; +#endif + +static hb_bool_t +hb_icu_unicode_compose (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t a, + hb_codepoint_t b, + hb_codepoint_t *ab, + void *user_data HB_UNUSED) +{ +#if U_ICU_VERSION_MAJOR_NUM >= 49 + { + UChar32 ret = unorm2_composePair (normalizer, a, b); + if (ret < 0) return false; + *ab = ret; + return true; + } +#endif + + /* We don't ifdef-out the fallback code such that compiler always + * sees it and makes sure it's compilable. */ + + UChar utf16[4], normalized[5]; + unsigned int len; + hb_bool_t ret, err; + UErrorCode icu_err; + + len = 0; + err = false; + U16_APPEND (utf16, len, ARRAY_LENGTH (utf16), a, err); + if (err) return false; + U16_APPEND (utf16, len, ARRAY_LENGTH (utf16), b, err); + if (err) return false; + + icu_err = U_ZERO_ERROR; + len = unorm_normalize (utf16, len, UNORM_NFC, 0, normalized, ARRAY_LENGTH (normalized), &icu_err); + if (U_FAILURE (icu_err)) + return false; + if (u_countChar32 (normalized, len) == 1) { + U16_GET_UNSAFE (normalized, 0, *ab); + ret = true; + } else { + ret = false; + } + + return ret; +} + +static hb_bool_t +hb_icu_unicode_decompose (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t ab, + hb_codepoint_t *a, + hb_codepoint_t *b, + void *user_data HB_UNUSED) +{ +#if U_ICU_VERSION_MAJOR_NUM >= 49 + { + UChar decomposed[4]; + int len; + UErrorCode icu_err = U_ZERO_ERROR; + len = unorm2_getRawDecomposition (normalizer, ab, decomposed, + ARRAY_LENGTH (decomposed), &icu_err); + if (U_FAILURE (icu_err) || len < 0) return false; + + len = u_countChar32 (decomposed, len); + if (len == 1) { + U16_GET_UNSAFE (decomposed, 0, *a); + *b = 0; + return *a != ab; + } else if (len == 2) { + len =0; + U16_NEXT_UNSAFE (decomposed, len, *a); + U16_NEXT_UNSAFE (decomposed, len, *b); + } + return true; + } +#endif + + /* We don't ifdef-out the fallback code such that compiler always + * sees it and makes sure it's compilable. */ + + UChar utf16[2], normalized[2 * HB_UNICODE_MAX_DECOMPOSITION_LEN + 1]; + unsigned int len; + hb_bool_t ret, err; + UErrorCode icu_err; + + /* This function is a monster! Maybe it wasn't a good idea adding a + * pairwise decompose API... */ + /* Watchout for the dragons. Err, watchout for macros changing len. */ + + len = 0; + err = false; + U16_APPEND (utf16, len, ARRAY_LENGTH (utf16), ab, err); + if (err) return false; + + icu_err = U_ZERO_ERROR; + len = unorm_normalize (utf16, len, UNORM_NFD, 0, normalized, ARRAY_LENGTH (normalized), &icu_err); + if (U_FAILURE (icu_err)) + return false; + + len = u_countChar32 (normalized, len); + + if (len == 1) { + U16_GET_UNSAFE (normalized, 0, *a); + *b = 0; + ret = *a != ab; + } else if (len == 2) { + len =0; + U16_NEXT_UNSAFE (normalized, len, *a); + U16_NEXT_UNSAFE (normalized, len, *b); + + /* Here's the ugly part: if ab decomposes to a single character and + * that character decomposes again, we have to detect that and undo + * the second part :-(. */ + UChar recomposed[20]; + icu_err = U_ZERO_ERROR; + unorm_normalize (normalized, len, UNORM_NFC, 0, recomposed, ARRAY_LENGTH (recomposed), &icu_err); + if (U_FAILURE (icu_err)) + return false; + hb_codepoint_t c; + U16_GET_UNSAFE (recomposed, 0, c); + if (c != *a && c != ab) { + *a = c; + *b = 0; + } + ret = true; + } else { + /* If decomposed to more than two characters, take the last one, + * and recompose the rest to get the first component. */ + U16_PREV_UNSAFE (normalized, len, *b); /* Changes len in-place. */ + UChar recomposed[18 * 2]; + icu_err = U_ZERO_ERROR; + len = unorm_normalize (normalized, len, UNORM_NFC, 0, recomposed, ARRAY_LENGTH (recomposed), &icu_err); + if (U_FAILURE (icu_err)) + return false; + /* We expect that recomposed has exactly one character now. */ + if (unlikely (u_countChar32 (recomposed, len) != 1)) + return false; + U16_GET_UNSAFE (recomposed, 0, *a); + ret = true; + } + + return ret; +} + +static unsigned int +hb_icu_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs HB_UNUSED, + hb_codepoint_t u, + hb_codepoint_t *decomposed, + void *user_data HB_UNUSED) +{ + UChar utf16[2], normalized[2 * HB_UNICODE_MAX_DECOMPOSITION_LEN + 1]; + unsigned int len; + int32_t utf32_len; + hb_bool_t err; + UErrorCode icu_err; + + /* Copy @u into a UTF-16 array to be passed to ICU. */ + len = 0; + err = false; + U16_APPEND (utf16, len, ARRAY_LENGTH (utf16), u, err); + if (err) + return 0; + + /* Normalise the codepoint using NFKD mode. */ + icu_err = U_ZERO_ERROR; + len = unorm_normalize (utf16, len, UNORM_NFKD, 0, normalized, ARRAY_LENGTH (normalized), &icu_err); + if (icu_err) + return 0; + + /* Convert the decomposed form from UTF-16 to UTF-32. */ + icu_err = U_ZERO_ERROR; + u_strToUTF32 ((UChar32*) decomposed, HB_UNICODE_MAX_DECOMPOSITION_LEN, &utf32_len, normalized, len, &icu_err); + if (icu_err) + return 0; + + return utf32_len; +} + + +hb_unicode_funcs_t * +hb_icu_get_unicode_funcs (void) +{ + static const hb_unicode_funcs_t _hb_icu_unicode_funcs = { + HB_OBJECT_HEADER_STATIC, + + NULL, /* parent */ + true, /* immutable */ + { +#define HB_UNICODE_FUNC_IMPLEMENT(name) hb_icu_unicode_##name, + HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS +#undef HB_UNICODE_FUNC_IMPLEMENT + } + }; + +#if U_ICU_VERSION_MAJOR_NUM >= 49 + if (!hb_atomic_ptr_get (&normalizer)) { + UErrorCode icu_err = U_ZERO_ERROR; + /* We ignore failure in getNFCInstace(). */ + (void) hb_atomic_ptr_cmpexch (&normalizer, NULL, unorm2_getNFCInstance (&icu_err)); + } +#endif + return const_cast (&_hb_icu_unicode_funcs); +} diff --git a/src/hb-icu.h b/src/hb-icu.h new file mode 100644 index 0000000..2db6a7b --- /dev/null +++ b/src/hb-icu.h @@ -0,0 +1,52 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * Copyright © 2011 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_ICU_H +#define HB_ICU_H + +#include "hb.h" + +#include + +HB_BEGIN_DECLS + + +HB_EXTERN hb_script_t +hb_icu_script_to_script (UScriptCode script); + +HB_EXTERN UScriptCode +hb_icu_script_from_script (hb_script_t script); + + +HB_EXTERN hb_unicode_funcs_t * +hb_icu_get_unicode_funcs (void); + + +HB_END_DECLS + +#endif /* HB_ICU_H */ diff --git a/src/hb-mutex-private.hh b/src/hb-mutex-private.hh new file mode 100644 index 0000000..ed27035 --- /dev/null +++ b/src/hb-mutex-private.hh @@ -0,0 +1,141 @@ +/* + * Copyright © 2007 Chris Wilson + * Copyright © 2009,2010 Red Hat, Inc. + * Copyright © 2011,2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Contributor(s): + * Chris Wilson + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_MUTEX_PRIVATE_HH +#define HB_MUTEX_PRIVATE_HH + +#include "hb-private.hh" + + +/* mutex */ + +/* We need external help for these */ + +#if defined(HB_MUTEX_IMPL_INIT) \ + && defined(hb_mutex_impl_init) \ + && defined(hb_mutex_impl_lock) \ + && defined(hb_mutex_impl_unlock) \ + && defined(hb_mutex_impl_finish) + +/* Defined externally, i.e. in config.h; must have typedef'ed hb_mutex_impl_t as well. */ + + +#elif !defined(HB_NO_MT) && (defined(_WIN32) || defined(__CYGWIN__)) + +#include +typedef CRITICAL_SECTION hb_mutex_impl_t; +#define HB_MUTEX_IMPL_INIT {0} +#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_PC_APP || WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP) +#define hb_mutex_impl_init(M) InitializeCriticalSectionEx (M, 0, 0) +#else +#define hb_mutex_impl_init(M) InitializeCriticalSection (M) +#endif +#define hb_mutex_impl_lock(M) EnterCriticalSection (M) +#define hb_mutex_impl_unlock(M) LeaveCriticalSection (M) +#define hb_mutex_impl_finish(M) DeleteCriticalSection (M) + + +#elif !defined(HB_NO_MT) && (defined(HAVE_PTHREAD) || defined(__APPLE__)) + +#include +typedef pthread_mutex_t hb_mutex_impl_t; +#define HB_MUTEX_IMPL_INIT PTHREAD_MUTEX_INITIALIZER +#define hb_mutex_impl_init(M) pthread_mutex_init (M, NULL) +#define hb_mutex_impl_lock(M) pthread_mutex_lock (M) +#define hb_mutex_impl_unlock(M) pthread_mutex_unlock (M) +#define hb_mutex_impl_finish(M) pthread_mutex_destroy (M) + + +#elif !defined(HB_NO_MT) && defined(HAVE_INTEL_ATOMIC_PRIMITIVES) + +#if defined(HAVE_SCHED_H) && defined(HAVE_SCHED_YIELD) +# include +# define HB_SCHED_YIELD() sched_yield () +#else +# define HB_SCHED_YIELD() HB_STMT_START {} HB_STMT_END +#endif + +/* This actually is not a totally awful implementation. */ +typedef volatile int hb_mutex_impl_t; +#define HB_MUTEX_IMPL_INIT 0 +#define hb_mutex_impl_init(M) *(M) = 0 +#define hb_mutex_impl_lock(M) HB_STMT_START { while (__sync_lock_test_and_set((M), 1)) HB_SCHED_YIELD (); } HB_STMT_END +#define hb_mutex_impl_unlock(M) __sync_lock_release (M) +#define hb_mutex_impl_finish(M) HB_STMT_START {} HB_STMT_END + + +#elif !defined(HB_NO_MT) + +#if defined(HAVE_SCHED_H) && defined(HAVE_SCHED_YIELD) +# include +# define HB_SCHED_YIELD() sched_yield () +#else +# define HB_SCHED_YIELD() HB_STMT_START {} HB_STMT_END +#endif + +#define HB_MUTEX_INT_NIL 1 /* Warn that fallback implementation is in use. */ +typedef volatile int hb_mutex_impl_t; +#define HB_MUTEX_IMPL_INIT 0 +#define hb_mutex_impl_init(M) *(M) = 0 +#define hb_mutex_impl_lock(M) HB_STMT_START { while (*(M)) HB_SCHED_YIELD (); (*(M))++; } HB_STMT_END +#define hb_mutex_impl_unlock(M) (*(M))--; +#define hb_mutex_impl_finish(M) HB_STMT_START {} HB_STMT_END + + +#else /* HB_NO_MT */ + +typedef int hb_mutex_impl_t; +#define HB_MUTEX_IMPL_INIT 0 +#define hb_mutex_impl_init(M) HB_STMT_START {} HB_STMT_END +#define hb_mutex_impl_lock(M) HB_STMT_START {} HB_STMT_END +#define hb_mutex_impl_unlock(M) HB_STMT_START {} HB_STMT_END +#define hb_mutex_impl_finish(M) HB_STMT_START {} HB_STMT_END + + +#endif + + +#define HB_MUTEX_INIT {HB_MUTEX_IMPL_INIT} + +struct hb_mutex_t +{ + /* TODO Add tracing. */ + + hb_mutex_impl_t m; + + inline void init (void) { hb_mutex_impl_init (&m); } + inline void lock (void) { hb_mutex_impl_lock (&m); } + inline void unlock (void) { hb_mutex_impl_unlock (&m); } + inline void finish (void) { hb_mutex_impl_finish (&m); } +}; + + +#endif /* HB_MUTEX_PRIVATE_HH */ diff --git a/src/hb-object-private.hh b/src/hb-object-private.hh new file mode 100644 index 0000000..6b73ff9 --- /dev/null +++ b/src/hb-object-private.hh @@ -0,0 +1,202 @@ +/* + * Copyright © 2007 Chris Wilson + * Copyright © 2009,2010 Red Hat, Inc. + * Copyright © 2011,2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Contributor(s): + * Chris Wilson + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_OBJECT_PRIVATE_HH +#define HB_OBJECT_PRIVATE_HH + +#include "hb-private.hh" + +#include "hb-atomic-private.hh" +#include "hb-mutex-private.hh" + + +/* Debug */ + +#ifndef HB_DEBUG_OBJECT +#define HB_DEBUG_OBJECT (HB_DEBUG+0) +#endif + + +/* reference_count */ + +#define HB_REFERENCE_COUNT_INERT_VALUE -1 +#define HB_REFERENCE_COUNT_POISON_VALUE -0x0000DEAD +#define HB_REFERENCE_COUNT_INIT {HB_ATOMIC_INT_INIT(HB_REFERENCE_COUNT_INERT_VALUE)} + +struct hb_reference_count_t +{ + hb_atomic_int_t ref_count; + + inline void init (int v) { ref_count.set_unsafe (v); } + inline int get_unsafe (void) const { return ref_count.get_unsafe (); } + inline int inc (void) { return ref_count.inc (); } + inline int dec (void) { return ref_count.dec (); } + inline void finish (void) { ref_count.set_unsafe (HB_REFERENCE_COUNT_POISON_VALUE); } + + inline bool is_inert (void) const { return ref_count.get_unsafe () == HB_REFERENCE_COUNT_INERT_VALUE; } + inline bool is_valid (void) const { return ref_count.get_unsafe () > 0; } +}; + + +/* user_data */ + +#define HB_USER_DATA_ARRAY_INIT {HB_MUTEX_INIT, HB_LOCKABLE_SET_INIT} +struct hb_user_data_array_t +{ + struct hb_user_data_item_t { + hb_user_data_key_t *key; + void *data; + hb_destroy_func_t destroy; + + inline bool operator == (hb_user_data_key_t *other_key) const { return key == other_key; } + inline bool operator == (hb_user_data_item_t &other) const { return key == other.key; } + + void finish (void) { if (destroy) destroy (data); } + }; + + hb_mutex_t lock; + hb_lockable_set_t items; + + inline void init (void) { lock.init (); items.init (); } + + HB_INTERNAL bool set (hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace); + + HB_INTERNAL void *get (hb_user_data_key_t *key); + + inline void finish (void) { items.finish (lock); lock.finish (); } +}; + + +/* object_header */ + +struct hb_object_header_t +{ + hb_reference_count_t ref_count; + hb_user_data_array_t user_data; + +#define HB_OBJECT_HEADER_STATIC {HB_REFERENCE_COUNT_INIT, HB_USER_DATA_ARRAY_INIT} + + private: + ASSERT_POD (); +}; + + +/* object */ + +template +static inline void hb_object_trace (const Type *obj, const char *function) +{ + DEBUG_MSG (OBJECT, (void *) obj, + "%s refcount=%d", + function, + obj ? obj->header.ref_count.get_unsafe () : 0); +} + +template +static inline Type *hb_object_create (void) +{ + 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 +static inline void hb_object_init (Type *obj) +{ + obj->header.ref_count.init (1); + obj->header.user_data.init (); +} +template +static inline bool hb_object_is_inert (const Type *obj) +{ + return unlikely (obj->header.ref_count.is_inert ()); +} +template +static inline bool hb_object_is_valid (const Type *obj) +{ + return likely (obj->header.ref_count.is_valid ()); +} +template +static inline Type *hb_object_reference (Type *obj) +{ + hb_object_trace (obj, HB_FUNC); + if (unlikely (!obj || hb_object_is_inert (obj))) + return obj; + assert (hb_object_is_valid (obj)); + obj->header.ref_count.inc (); + return obj; +} +template +static inline bool hb_object_destroy (Type *obj) +{ + hb_object_trace (obj, HB_FUNC); + if (unlikely (!obj || hb_object_is_inert (obj))) + return false; + assert (hb_object_is_valid (obj)); + 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 +static inline bool hb_object_set_user_data (Type *obj, + hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy, + hb_bool_t replace) +{ + if (unlikely (!obj || hb_object_is_inert (obj))) + return false; + assert (hb_object_is_valid (obj)); + return obj->header.user_data.set (key, data, destroy, replace); +} + +template +static inline void *hb_object_get_user_data (Type *obj, + hb_user_data_key_t *key) +{ + if (unlikely (!obj || hb_object_is_inert (obj))) + return NULL; + assert (hb_object_is_valid (obj)); + return obj->header.user_data.get (key); +} + + +#endif /* HB_OBJECT_PRIVATE_HH */ diff --git a/src/hb-open-file-private.hh b/src/hb-open-file-private.hh new file mode 100644 index 0000000..f208419 --- /dev/null +++ b/src/hb-open-file-private.hh @@ -0,0 +1,268 @@ +/* + * Copyright © 2007,2008,2009 Red Hat, Inc. + * Copyright © 2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_OPEN_FILE_PRIVATE_HH +#define HB_OPEN_FILE_PRIVATE_HH + +#include "hb-open-type-private.hh" + + +namespace OT { + + +/* + * + * The OpenType Font File + * + */ + + +/* + * Organization of an OpenType Font + */ + +struct OpenTypeFontFile; +struct OffsetTable; +struct TTCHeader; + + +typedef struct TableRecord +{ + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + Tag tag; /* 4-byte identifier. */ + CheckSum checkSum; /* CheckSum for this table. */ + ULONG offset; /* Offset from beginning of TrueType font + * file. */ + ULONG length; /* Length of this table. */ + public: + DEFINE_SIZE_STATIC (16); +} OpenTypeTable; + +typedef struct OffsetTable +{ + friend struct OpenTypeFontFile; + + inline unsigned int get_table_count (void) const + { return numTables; } + inline const TableRecord& get_table (unsigned int i) const + { + if (unlikely (i >= numTables)) return Null(TableRecord); + return tables[i]; + } + inline bool find_table_index (hb_tag_t tag, unsigned int *table_index) const + { + Tag t; + t.set (tag); + unsigned int count = numTables; + for (unsigned int i = 0; i < count; i++) + { + if (t == tables[i].tag) + { + if (table_index) *table_index = i; + return true; + } + } + if (table_index) *table_index = Index::NOT_FOUND_INDEX; + return false; + } + inline const TableRecord& get_table_by_tag (hb_tag_t tag) const + { + unsigned int table_index; + find_table_index (tag, &table_index); + return get_table (table_index); + } + + public: + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && c->check_array (tables, TableRecord::static_size, numTables)); + } + + protected: + Tag sfnt_version; /* '\0\001\0\00' if TrueType / 'OTTO' if CFF */ + USHORT numTables; /* Number of tables. */ + USHORT searchRangeZ; /* (Maximum power of 2 <= numTables) x 16 */ + USHORT entrySelectorZ; /* Log2(maximum power of 2 <= numTables). */ + USHORT rangeShiftZ; /* NumTables x 16-searchRange. */ + TableRecord tables[VAR]; /* TableRecord entries. numTables items */ + public: + DEFINE_SIZE_ARRAY (12, tables); +} OpenTypeFontFace; + + +/* + * TrueType Collections + */ + +struct TTCHeaderVersion1 +{ + friend struct TTCHeader; + + inline unsigned int get_face_count (void) const { return table.len; } + inline const OpenTypeFontFace& get_face (unsigned int i) const { return this+table[i]; } + + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (table.sanitize (c, this)); + } + + protected: + Tag ttcTag; /* TrueType Collection ID string: 'ttcf' */ + FixedVersion<>version; /* Version of the TTC Header (1.0), + * 0x00010000u */ + ArrayOf, ULONG> + table; /* Array of offsets to the OffsetTable for each font + * from the beginning of the file */ + public: + DEFINE_SIZE_ARRAY (12, table); +}; + +struct TTCHeader +{ + friend struct OpenTypeFontFile; + + private: + + inline unsigned int get_face_count (void) const + { + switch (u.header.version.major) { + case 2: /* version 2 is compatible with version 1 */ + case 1: return u.version1.get_face_count (); + default:return 0; + } + } + inline const OpenTypeFontFace& get_face (unsigned int i) const + { + switch (u.header.version.major) { + case 2: /* version 2 is compatible with version 1 */ + case 1: return u.version1.get_face (i); + default:return Null(OpenTypeFontFace); + } + } + + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + if (unlikely (!u.header.version.sanitize (c))) return_trace (false); + switch (u.header.version.major) { + case 2: /* version 2 is compatible with version 1 */ + case 1: return_trace (u.version1.sanitize (c)); + default:return_trace (true); + } + } + + protected: + union { + struct { + Tag ttcTag; /* TrueType Collection ID string: 'ttcf' */ + FixedVersion<>version; /* Version of the TTC Header (1.0 or 2.0), + * 0x00010000u or 0x00020000u */ + } header; + TTCHeaderVersion1 version1; + } u; +}; + + +/* + * OpenType Font File + */ + +struct OpenTypeFontFile +{ + static const hb_tag_t tableTag = HB_TAG ('_','_','_','_'); /* Sanitizer needs this. */ + + static const hb_tag_t CFFTag = HB_TAG ('O','T','T','O'); /* OpenType with Postscript outlines */ + static const hb_tag_t TrueTypeTag = HB_TAG ( 0 , 1 , 0 , 0 ); /* OpenType with TrueType outlines */ + static const hb_tag_t TTCTag = HB_TAG ('t','t','c','f'); /* TrueType Collection */ + static const hb_tag_t TrueTag = HB_TAG ('t','r','u','e'); /* Obsolete Apple TrueType */ + static const hb_tag_t Typ1Tag = HB_TAG ('t','y','p','1'); /* Obsolete Apple Type1 font in SFNT container */ + + inline hb_tag_t get_tag (void) const { return u.tag; } + + inline unsigned int get_face_count (void) const + { + switch (u.tag) { + case CFFTag: /* All the non-collection tags */ + case TrueTag: + case Typ1Tag: + case TrueTypeTag: return 1; + case TTCTag: return u.ttcHeader.get_face_count (); + default: return 0; + } + } + inline const OpenTypeFontFace& get_face (unsigned int i) const + { + switch (u.tag) { + /* Note: for non-collection SFNT data we ignore index. This is because + * Apple dfont container is a container of SFNT's. So each SFNT is a + * non-TTC, but the index is more than zero. */ + case CFFTag: /* All the non-collection tags */ + case TrueTag: + case Typ1Tag: + case TrueTypeTag: return u.fontFace; + case TTCTag: return u.ttcHeader.get_face (i); + default: return Null(OpenTypeFontFace); + } + } + + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + if (unlikely (!u.tag.sanitize (c))) return_trace (false); + switch (u.tag) { + case CFFTag: /* All the non-collection tags */ + case TrueTag: + case Typ1Tag: + case TrueTypeTag: return_trace (u.fontFace.sanitize (c)); + case TTCTag: return_trace (u.ttcHeader.sanitize (c)); + default: return_trace (true); + } + } + + protected: + union { + Tag tag; /* 4-byte identifier. */ + OpenTypeFontFace fontFace; + TTCHeader ttcHeader; + } u; + public: + DEFINE_SIZE_UNION (4, tag); +}; + + +} /* namespace OT */ + + +#endif /* HB_OPEN_FILE_PRIVATE_HH */ diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh new file mode 100644 index 0000000..d90d68c --- /dev/null +++ b/src/hb-open-type-private.hh @@ -0,0 +1,1168 @@ +/* + * Copyright © 2007,2008,2009,2010 Red Hat, Inc. + * Copyright © 2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_OPEN_TYPE_PRIVATE_HH +#define HB_OPEN_TYPE_PRIVATE_HH + +#include "hb-private.hh" +#include "hb-face-private.hh" + + +namespace OT { + + + +/* + * Casts + */ + +/* Cast to struct T, reference to reference */ +template +static inline const Type& CastR(const TObject &X) +{ return reinterpret_cast (X); } +template +static inline Type& CastR(TObject &X) +{ return reinterpret_cast (X); } + +/* Cast to struct T, pointer to pointer */ +template +static inline const Type* CastP(const TObject *X) +{ return reinterpret_cast (X); } +template +static inline Type* CastP(TObject *X) +{ return reinterpret_cast (X); } + +/* StructAtOffset(P,Ofs) returns the struct T& that is placed at memory + * location pointed to by P plus Ofs bytes. */ +template +static inline const Type& StructAtOffset(const void *P, unsigned int offset) +{ return * reinterpret_cast ((const char *) P + offset); } +template +static inline Type& StructAtOffset(void *P, unsigned int offset) +{ return * reinterpret_cast ((char *) P + offset); } + +/* StructAfter(X) returns the struct T& that is placed after X. + * Works with X of variable size also. X must implement get_size() */ +template +static inline const Type& StructAfter(const TObject &X) +{ return StructAtOffset(&X, X.get_size()); } +template +static inline Type& StructAfter(TObject &X) +{ return StructAtOffset(&X, X.get_size()); } + + + +/* + * Size checking + */ + +/* Check _assertion in a method environment */ +#define _DEFINE_INSTANCE_ASSERTION1(_line, _assertion) \ + inline void _instance_assertion_on_line_##_line (void) const \ + { \ + ASSERT_STATIC (_assertion); \ + ASSERT_INSTANCE_POD (*this); /* Make sure it's POD. */ \ + } +# define _DEFINE_INSTANCE_ASSERTION0(_line, _assertion) _DEFINE_INSTANCE_ASSERTION1 (_line, _assertion) +# define DEFINE_INSTANCE_ASSERTION(_assertion) _DEFINE_INSTANCE_ASSERTION0 (__LINE__, _assertion) + +/* Check that _code compiles in a method environment */ +#define _DEFINE_COMPILES_ASSERTION1(_line, _code) \ + inline void _compiles_assertion_on_line_##_line (void) const \ + { _code; } +# define _DEFINE_COMPILES_ASSERTION0(_line, _code) _DEFINE_COMPILES_ASSERTION1 (_line, _code) +# define DEFINE_COMPILES_ASSERTION(_code) _DEFINE_COMPILES_ASSERTION0 (__LINE__, _code) + + +#define DEFINE_SIZE_STATIC(size) \ + DEFINE_INSTANCE_ASSERTION (sizeof (*this) == (size)); \ + static const unsigned int static_size = (size); \ + static const unsigned int min_size = (size); \ + inline unsigned int get_size (void) const { return (size); } + +#define DEFINE_SIZE_UNION(size, _member) \ + DEFINE_INSTANCE_ASSERTION (0*sizeof(this->u._member.static_size) + sizeof(this->u._member) == (size)); \ + static const unsigned int min_size = (size) + +#define DEFINE_SIZE_MIN(size) \ + DEFINE_INSTANCE_ASSERTION (sizeof (*this) >= (size)); \ + static const unsigned int min_size = (size) + +#define DEFINE_SIZE_ARRAY(size, array) \ + DEFINE_INSTANCE_ASSERTION (sizeof (*this) == (size) + sizeof (array[0])); \ + DEFINE_COMPILES_ASSERTION ((void) array[0].static_size) \ + static const unsigned int min_size = (size) + +#define DEFINE_SIZE_ARRAY2(size, array1, array2) \ + DEFINE_INSTANCE_ASSERTION (sizeof (*this) == (size) + sizeof (this->array1[0]) + sizeof (this->array2[0])); \ + DEFINE_COMPILES_ASSERTION ((void) array1[0].static_size; (void) array2[0].static_size) \ + static const unsigned int min_size = (size) + + + +/* + * Null objects + */ + +/* Global nul-content Null pool. Enlarge as necessary. */ +/* TODO This really should be a extern HB_INTERNAL and defined somewhere... */ +static const void *_NullPool[(256+8) / sizeof (void *)]; + +/* Generic nul-content Null objects. */ +template +static inline const Type& Null (void) { + ASSERT_STATIC (sizeof (Type) <= sizeof (_NullPool)); + return *CastP (_NullPool); +} + +/* Specializaiton for arbitrary-content arbitrary-sized Null objects. */ +#define DEFINE_NULL_DATA(Type, data) \ +static const char _Null##Type[sizeof (Type) + 1] = data; /* +1 is for nul-termination in data */ \ +template <> \ +/*static*/ inline const Type& Null (void) { \ + return *CastP (_Null##Type); \ +} /* The following line really exists such that we end in a place needing semicolon */ \ +ASSERT_STATIC (Type::min_size + 1 <= sizeof (_Null##Type)) + +/* Accessor macro. */ +#define Null(Type) Null() + + +/* + * Dispatch + */ + +template +struct hb_dispatch_context_t +{ + static const unsigned int max_debug_depth = MaxDebugDepth; + typedef Return return_t; + template + inline bool may_dispatch (const T *obj, const F *format) { return true; } + static return_t no_dispatch_return_value (void) { return Context::default_return_value (); } +}; + + +/* + * Sanitize + */ + +#ifndef HB_DEBUG_SANITIZE +#define HB_DEBUG_SANITIZE (HB_DEBUG+0) +#endif + + +#define TRACE_SANITIZE(this) \ + hb_auto_trace_t trace \ + (&c->debug_depth, c->get_name (), this, HB_FUNC, \ + ""); + +/* This limits sanitizing time on really broken fonts. */ +#ifndef HB_SANITIZE_MAX_EDITS +#define HB_SANITIZE_MAX_EDITS 32 +#endif + +struct hb_sanitize_context_t : + hb_dispatch_context_t +{ + inline hb_sanitize_context_t (void) : + debug_depth (0), + start (NULL), end (NULL), + writable (false), edit_count (0), + blob (NULL) {} + + inline const char *get_name (void) { return "SANITIZE"; } + template + inline bool may_dispatch (const T *obj, const F *format) + { return format->sanitize (this); } + template + inline return_t dispatch (const T &obj) { return obj.sanitize (this); } + static return_t default_return_value (void) { return true; } + static return_t no_dispatch_return_value (void) { return false; } + bool stop_sublookup_iteration (const return_t r) const { return !r; } + + inline void init (hb_blob_t *b) + { + this->blob = hb_blob_reference (b); + this->writable = false; + } + + inline void start_processing (void) + { + this->start = hb_blob_get_data (this->blob, NULL); + this->end = this->start + hb_blob_get_length (this->blob); + assert (this->start <= this->end); /* Must not overflow. */ + this->edit_count = 0; + this->debug_depth = 0; + + DEBUG_MSG_LEVEL (SANITIZE, start, 0, +1, + "start [%p..%p] (%lu bytes)", + this->start, this->end, + (unsigned long) (this->end - this->start)); + } + + inline void end_processing (void) + { + DEBUG_MSG_LEVEL (SANITIZE, this->start, 0, -1, + "end [%p..%p] %u edit requests", + this->start, this->end, this->edit_count); + + hb_blob_destroy (this->blob); + this->blob = NULL; + this->start = this->end = NULL; + } + + inline bool check_range (const void *base, unsigned int len) const + { + const char *p = (const char *) base; + bool ok = this->start <= p && p <= this->end && (unsigned int) (this->end - p) >= len; + + DEBUG_MSG_LEVEL (SANITIZE, p, this->debug_depth+1, 0, + "check_range [%p..%p] (%d bytes) in [%p..%p] -> %s", + p, p + len, len, + this->start, this->end, + ok ? "OK" : "OUT-OF-RANGE"); + + return likely (ok); + } + + inline bool check_array (const void *base, unsigned int record_size, unsigned int len) const + { + const char *p = (const char *) base; + bool overflows = _hb_unsigned_int_mul_overflows (len, record_size); + unsigned int array_size = record_size * len; + bool ok = !overflows && this->check_range (base, array_size); + + DEBUG_MSG_LEVEL (SANITIZE, p, this->debug_depth+1, 0, + "check_array [%p..%p] (%d*%d=%d bytes) in [%p..%p] -> %s", + p, p + (record_size * len), record_size, len, (unsigned int) array_size, + this->start, this->end, + overflows ? "OVERFLOWS" : ok ? "OK" : "OUT-OF-RANGE"); + + return likely (ok); + } + + template + inline bool check_struct (const Type *obj) const + { + return likely (this->check_range (obj, obj->min_size)); + } + + inline bool may_edit (const void *base HB_UNUSED, unsigned int len HB_UNUSED) + { + if (this->edit_count >= HB_SANITIZE_MAX_EDITS) + return false; + + const char *p = (const char *) base; + this->edit_count++; + + DEBUG_MSG_LEVEL (SANITIZE, p, this->debug_depth+1, 0, + "may_edit(%u) [%p..%p] (%d bytes) in [%p..%p] -> %s", + this->edit_count, + p, p + len, len, + this->start, this->end, + this->writable ? "GRANTED" : "DENIED"); + + return this->writable; + } + + template + inline bool try_set (const Type *obj, const ValueType &v) { + if (this->may_edit (obj, obj->static_size)) { + const_cast (obj)->set (v); + return true; + } + return false; + } + + mutable unsigned int debug_depth; + const char *start, *end; + bool writable; + unsigned int edit_count; + hb_blob_t *blob; +}; + + + +/* Template to sanitize an object. */ +template +struct Sanitizer +{ + static hb_blob_t *sanitize (hb_blob_t *blob) { + hb_sanitize_context_t c[1]; + bool sane; + + /* TODO is_sane() stuff */ + + c->init (blob); + + retry: + DEBUG_MSG_FUNC (SANITIZE, c->start, "start"); + + c->start_processing (); + + if (unlikely (!c->start)) { + c->end_processing (); + return blob; + } + + Type *t = CastP (const_cast (c->start)); + + sane = t->sanitize (c); + if (sane) { + if (c->edit_count) { + DEBUG_MSG_FUNC (SANITIZE, c->start, "passed first round with %d edits; going for second round", c->edit_count); + + /* sanitize again to ensure no toe-stepping */ + c->edit_count = 0; + sane = t->sanitize (c); + if (c->edit_count) { + DEBUG_MSG_FUNC (SANITIZE, c->start, "requested %d edits in second round; FAILLING", c->edit_count); + sane = false; + } + } + } else { + unsigned int edit_count = c->edit_count; + if (edit_count && !c->writable) { + c->start = hb_blob_get_data_writable (blob, NULL); + c->end = c->start + hb_blob_get_length (blob); + + if (c->start) { + c->writable = true; + /* ok, we made it writable by relocating. try again */ + DEBUG_MSG_FUNC (SANITIZE, c->start, "retry"); + goto retry; + } + } + } + + c->end_processing (); + + DEBUG_MSG_FUNC (SANITIZE, c->start, sane ? "PASSED" : "FAILED"); + if (sane) + return blob; + else { + hb_blob_destroy (blob); + return hb_blob_get_empty (); + } + } + + static const Type* lock_instance (hb_blob_t *blob) { + hb_blob_make_immutable (blob); + const char *base = hb_blob_get_data (blob, NULL); + return unlikely (!base) ? &Null(Type) : CastP (base); + } +}; + + + +/* + * Serialize + */ + +#ifndef HB_DEBUG_SERIALIZE +#define HB_DEBUG_SERIALIZE (HB_DEBUG+0) +#endif + + +#define TRACE_SERIALIZE(this) \ + hb_auto_trace_t trace \ + (&c->debug_depth, "SERIALIZE", c, HB_FUNC, \ + ""); + + +struct hb_serialize_context_t +{ + inline hb_serialize_context_t (void *start_, unsigned int size) + { + this->start = (char *) start_; + this->end = this->start + size; + + this->ran_out_of_room = false; + this->head = this->start; + this->debug_depth = 0; + } + + template + inline Type *start_serialize (void) + { + DEBUG_MSG_LEVEL (SERIALIZE, this->start, 0, +1, + "start [%p..%p] (%lu bytes)", + this->start, this->end, + (unsigned long) (this->end - this->start)); + + return start_embed (); + } + + inline void end_serialize (void) + { + DEBUG_MSG_LEVEL (SERIALIZE, this->start, 0, -1, + "end [%p..%p] serialized %d bytes; %s", + this->start, this->end, + (int) (this->head - this->start), + this->ran_out_of_room ? "RAN OUT OF ROOM" : "did not ran out of room"); + + } + + template + inline Type *copy (void) + { + assert (!this->ran_out_of_room); + unsigned int len = this->head - this->start; + void *p = malloc (len); + if (p) + memcpy (p, this->start, len); + return reinterpret_cast (p); + } + + template + inline Type *allocate_size (unsigned int size) + { + if (unlikely (this->ran_out_of_room || this->end - this->head < ptrdiff_t (size))) { + this->ran_out_of_room = true; + return NULL; + } + memset (this->head, 0, size); + char *ret = this->head; + this->head += size; + return reinterpret_cast (ret); + } + + template + inline Type *allocate_min (void) + { + return this->allocate_size (Type::min_size); + } + + template + inline Type *start_embed (void) + { + Type *ret = reinterpret_cast (this->head); + return ret; + } + + template + inline Type *embed (const Type &obj) + { + unsigned int size = obj.get_size (); + Type *ret = this->allocate_size (size); + if (unlikely (!ret)) return NULL; + memcpy (ret, obj, size); + return ret; + } + + template + inline Type *extend_min (Type &obj) + { + unsigned int size = obj.min_size; + assert (this->start <= (char *) &obj && (char *) &obj <= this->head && (char *) &obj + size >= this->head); + if (unlikely (!this->allocate_size (((char *) &obj) + size - this->head))) return NULL; + return reinterpret_cast (&obj); + } + + template + inline Type *extend (Type &obj) + { + unsigned int size = obj.get_size (); + assert (this->start < (char *) &obj && (char *) &obj <= this->head && (char *) &obj + size >= this->head); + if (unlikely (!this->allocate_size (((char *) &obj) + size - this->head))) return NULL; + return reinterpret_cast (&obj); + } + + inline void truncate (void *new_head) + { + assert (this->start < new_head && new_head <= this->head); + this->head = (char *) new_head; + } + + unsigned int debug_depth; + char *start, *end, *head; + bool ran_out_of_room; +}; + +template +struct Supplier +{ + inline Supplier (const Type *array, unsigned int len_) + { + head = array; + len = len_; + } + inline const Type operator [] (unsigned int i) const + { + if (unlikely (i >= len)) return Type (); + return head[i]; + } + + inline void advance (unsigned int count) + { + if (unlikely (count > len)) + count = len; + len -= count; + head += count; + } + + private: + inline Supplier (const Supplier &); /* Disallow copy */ + inline Supplier& operator= (const Supplier &); /* Disallow copy */ + + unsigned int len; + const Type *head; +}; + + + + +/* + * + * The OpenType Font File: Data Types + */ + + +/* "The following data types are used in the OpenType font file. + * All OpenType fonts use Motorola-style byte ordering (Big Endian):" */ + +/* + * Int types + */ + + +template struct BEInt; + +template +struct BEInt +{ + public: + inline void set (Type V) + { + v = V; + } + inline operator Type (void) const + { + return v; + } + private: uint8_t v; +}; +template +struct BEInt +{ + public: + 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] ); + } + private: uint8_t v[2]; +}; +template +struct BEInt +{ + public: + 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] ); + } + private: uint8_t v[3]; +}; +template +struct BEInt +{ + public: + 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] ); + } + private: uint8_t v[4]; +}; + +/* Integer types in big-endian order and no alignment requirement */ +template +struct IntType +{ + inline void set (Type i) { v.set (i); } + inline operator Type(void) const { return v; } + inline bool operator == (const IntType &o) const { return (Type) v == (Type) o.v; } + inline bool operator != (const IntType &o) const { return !(*this == o); } + static inline int cmp (const IntType *a, const IntType *b) { return b->cmp (*a); } + inline int cmp (Type a) const + { + Type b = v; + if (sizeof (Type) < sizeof (int)) + return (int) a - (int) b; + else + return a < b ? -1 : a == b ? 0 : +1; + } + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this))); + } + protected: + BEInt v; + public: + DEFINE_SIZE_STATIC (Size); +}; + +typedef IntType CHAR; /* 8-bit signed integer. */ +typedef IntType BYTE; /* 8-bit unsigned integer. */ +typedef IntType INT8; /* 8-bit signed integer. */ +typedef IntType USHORT; /* 16-bit unsigned integer. */ +typedef IntType SHORT; /* 16-bit signed integer. */ +typedef IntType ULONG; /* 32-bit unsigned integer. */ +typedef IntType LONG; /* 32-bit signed integer. */ +typedef IntType UINT24; /* 24-bit unsigned integer. */ + +/* 16-bit signed integer (SHORT) that describes a quantity in FUnits. */ +typedef SHORT FWORD; + +/* 16-bit unsigned integer (USHORT) that describes a quantity in FUnits. */ +typedef USHORT UFWORD; + +/* 16-bit signed fixed number with the low 14 bits of fraction (2.14). */ +struct F2DOT14 : SHORT +{ + //inline float to_float (void) const { return ???; } + //inline void set_float (float f) { v.set (f * ???); } + public: + DEFINE_SIZE_STATIC (2); +}; + +/* 32-bit signed fixed-point number (16.16). */ +struct Fixed: LONG +{ + //inline float to_float (void) const { return ???; } + //inline void set_float (float f) { v.set (f * ???); } + public: + DEFINE_SIZE_STATIC (4); +}; + +/* Date represented in number of seconds since 12:00 midnight, January 1, + * 1904. The value is represented as a signed 64-bit integer. */ +struct LONGDATETIME +{ + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this))); + } + protected: + LONG major; + ULONG minor; + public: + DEFINE_SIZE_STATIC (8); +}; + +/* Array of four uint8s (length = 32 bits) used to identify a script, language + * system, feature, or baseline */ +struct Tag : ULONG +{ + /* What the char* converters return is NOT nul-terminated. Print using "%.4s" */ + inline operator const char* (void) const { return reinterpret_cast (&this->v); } + inline operator char* (void) { return reinterpret_cast (&this->v); } + public: + DEFINE_SIZE_STATIC (4); +}; +DEFINE_NULL_DATA (Tag, " "); + +/* Glyph index number, same as uint16 (length = 16 bits) */ +struct GlyphID : USHORT { + static inline int cmp (const GlyphID *a, const GlyphID *b) { return b->USHORT::cmp (*a); } + inline int cmp (hb_codepoint_t a) const { return (int) a - (int) *this; } +}; + +/* Script/language-system/feature index */ +struct Index : USHORT { + static const unsigned int NOT_FOUND_INDEX = 0xFFFFu; +}; +DEFINE_NULL_DATA (Index, "\xff\xff"); + +/* Offset, Null offset = 0 */ +template +struct Offset : Type +{ + inline bool is_null (void) const { return 0 == *this; } + public: + DEFINE_SIZE_STATIC (sizeof(Type)); +}; + + +/* CheckSum */ +struct CheckSum : ULONG +{ + /* This is reference implementation from the spec. */ + static inline uint32_t CalcTableChecksum (const ULONG *Table, uint32_t Length) + { + uint32_t Sum = 0L; + const ULONG *EndPtr = Table+((Length+3) & ~3) / ULONG::static_size; + + while (Table < EndPtr) + Sum += *Table++; + return Sum; + } + + /* Note: data should be 4byte aligned and have 4byte padding at the end. */ + inline void set_for_data (const void *data, unsigned int length) + { set (CalcTableChecksum ((const ULONG *) data, length)); } + + public: + DEFINE_SIZE_STATIC (4); +}; + + +/* + * Version Numbers + */ + +template +struct FixedVersion +{ + inline uint32_t to_int (void) const { return (major << (sizeof(FixedType) * 8)) + minor; } + + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + FixedType major; + FixedType minor; + public: + DEFINE_SIZE_STATIC (2 * sizeof(FixedType)); +}; + + + +/* + * Template subclasses of Offset that do the dereferencing. + * Use: (base+offset) + */ + +template +struct OffsetTo : Offset +{ + inline const Type& operator () (const void *base) const + { + unsigned int offset = *this; + if (unlikely (!offset)) return Null(Type); + return StructAtOffset (base, offset); + } + + inline Type& serialize (hb_serialize_context_t *c, const void *base) + { + Type *t = c->start_embed (); + this->set ((char *) t - (char *) base); /* TODO(serialize) Overflow? */ + return *t; + } + + inline bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + if (unlikely (!c->check_struct (this))) return_trace (false); + unsigned int offset = *this; + if (unlikely (!offset)) return_trace (true); + if (unlikely (!c->check_range (base, offset))) return_trace (false); + const Type &obj = StructAtOffset (base, offset); + return_trace (likely (obj.sanitize (c)) || neuter (c)); + } + template + inline bool sanitize (hb_sanitize_context_t *c, const void *base, T user_data) const + { + TRACE_SANITIZE (this); + if (unlikely (!c->check_struct (this))) return_trace (false); + unsigned int offset = *this; + if (unlikely (!offset)) return_trace (true); + if (unlikely (!c->check_range (base, offset))) return_trace (false); + const Type &obj = StructAtOffset (base, offset); + return_trace (likely (obj.sanitize (c, user_data)) || neuter (c)); + } + + /* Set the offset to Null */ + inline bool neuter (hb_sanitize_context_t *c) const { + return c->try_set (this, 0); + } + DEFINE_SIZE_STATIC (sizeof(OffsetType)); +}; +template struct LOffsetTo : OffsetTo {}; +template +static inline const Type& operator + (const Base &base, const OffsetTo &offset) { return offset (base); } +template +static inline Type& operator + (Base &base, OffsetTo &offset) { return offset (base); } + + +/* + * Array Types + */ + +/* An array with a number of elements. */ +template +struct ArrayOf +{ + const Type *sub_array (unsigned int start_offset, unsigned int *pcount /* IN/OUT */) const + { + unsigned int count = len; + if (unlikely (start_offset > count)) + count = 0; + else + count -= start_offset; + count = MIN (count, *pcount); + *pcount = count; + return array + start_offset; + } + + inline const Type& operator [] (unsigned int i) const + { + if (unlikely (i >= len)) return Null(Type); + return array[i]; + } + inline Type& operator [] (unsigned int i) + { + return array[i]; + } + inline unsigned int get_size (void) const + { return len.static_size + len * Type::static_size; } + + inline bool serialize (hb_serialize_context_t *c, + unsigned int items_len) + { + TRACE_SERIALIZE (this); + if (unlikely (!c->extend_min (*this))) return_trace (false); + len.set (items_len); /* TODO(serialize) Overflow? */ + if (unlikely (!c->extend (*this))) return_trace (false); + return_trace (true); + } + + inline bool serialize (hb_serialize_context_t *c, + Supplier &items, + unsigned int items_len) + { + TRACE_SERIALIZE (this); + if (unlikely (!serialize (c, items_len))) return_trace (false); + for (unsigned int i = 0; i < items_len; i++) + array[i] = items[i]; + items.advance (items_len); + return_trace (true); + } + + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + if (unlikely (!sanitize_shallow (c))) return_trace (false); + + /* Note: for structs that do not reference other structs, + * we do not need to call their sanitize() as we already did + * a bound check on the aggregate array size. We just include + * a small unreachable expression to make sure the structs + * pointed to do have a simple sanitize(), ie. they do not + * reference other structs via offsets. + */ + (void) (false && array[0].sanitize (c)); + + return_trace (true); + } + inline bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + if (unlikely (!sanitize_shallow (c))) return_trace (false); + unsigned int count = len; + for (unsigned int i = 0; i < count; i++) + if (unlikely (!array[i].sanitize (c, base))) + return_trace (false); + return_trace (true); + } + template + inline bool sanitize (hb_sanitize_context_t *c, const void *base, T user_data) const + { + TRACE_SANITIZE (this); + if (unlikely (!sanitize_shallow (c))) return_trace (false); + unsigned int count = len; + for (unsigned int i = 0; i < count; i++) + if (unlikely (!array[i].sanitize (c, base, user_data))) + return_trace (false); + return_trace (true); + } + + template + inline int lsearch (const SearchType &x) const + { + unsigned int count = len; + for (unsigned int i = 0; i < count; i++) + if (!this->array[i].cmp (x)) + return i; + return -1; + } + + private: + inline bool sanitize_shallow (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && c->check_array (array, Type::static_size, len)); + } + + public: + LenType len; + Type array[VAR]; + public: + DEFINE_SIZE_ARRAY (sizeof (LenType), array); +}; +template struct LArrayOf : ArrayOf {}; + +/* Array of Offset's */ +template +struct OffsetArrayOf : ArrayOf > {}; + +/* Array of offsets relative to the beginning of the array itself. */ +template +struct OffsetListOf : OffsetArrayOf +{ + inline const Type& operator [] (unsigned int i) const + { + if (unlikely (i >= this->len)) return Null(Type); + return this+this->array[i]; + } + + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (OffsetArrayOf::sanitize (c, this)); + } + template + inline bool sanitize (hb_sanitize_context_t *c, T user_data) const + { + TRACE_SANITIZE (this); + return_trace (OffsetArrayOf::sanitize (c, this, user_data)); + } +}; + + +/* An array starting at second element. */ +template +struct HeadlessArrayOf +{ + inline const Type& operator [] (unsigned int i) const + { + if (unlikely (i >= len || !i)) return Null(Type); + return array[i-1]; + } + inline unsigned int get_size (void) const + { return len.static_size + (len ? len - 1 : 0) * Type::static_size; } + + inline bool serialize (hb_serialize_context_t *c, + Supplier &items, + unsigned int items_len) + { + TRACE_SERIALIZE (this); + if (unlikely (!c->extend_min (*this))) return_trace (false); + len.set (items_len); /* TODO(serialize) Overflow? */ + if (unlikely (!items_len)) return_trace (true); + if (unlikely (!c->extend (*this))) return_trace (false); + for (unsigned int i = 0; i < items_len - 1; i++) + array[i] = items[i]; + items.advance (items_len - 1); + return_trace (true); + } + + inline bool sanitize_shallow (hb_sanitize_context_t *c) const + { + return c->check_struct (this) + && c->check_array (this, Type::static_size, len); + } + + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + if (unlikely (!sanitize_shallow (c))) return_trace (false); + + /* Note: for structs that do not reference other structs, + * we do not need to call their sanitize() as we already did + * a bound check on the aggregate array size. We just include + * a small unreachable expression to make sure the structs + * pointed to do have a simple sanitize(), ie. they do not + * reference other structs via offsets. + */ + (void) (false && array[0].sanitize (c)); + + return_trace (true); + } + + LenType len; + Type array[VAR]; + public: + DEFINE_SIZE_ARRAY (sizeof (LenType), array); +}; + + +/* An array with sorted elements. Supports binary searching. */ +template +struct SortedArrayOf : ArrayOf +{ + template + inline int bsearch (const SearchType &x) const + { + /* Hand-coded bsearch here since this is in the hot inner loop. */ + int min = 0, max = (int) this->len - 1; + while (min <= max) + { + int mid = (min + max) / 2; + int c = this->array[mid].cmp (x); + if (c < 0) + max = mid - 1; + else if (c > 0) + min = mid + 1; + else + return mid; + } + return -1; + } +}; + + +/* Lazy struct and blob loaders. */ + +/* Logic is shared between hb_lazy_loader_t and hb_lazy_table_loader_t */ +template +struct hb_lazy_loader_t +{ + inline void init (hb_face_t *face_) + { + face = face_; + instance = NULL; + } + + inline void fini (void) + { + if (instance && instance != &OT::Null(T)) + { + instance->fini(); + free (instance); + } + } + + inline const T* get (void) const + { + retry: + T *p = (T *) hb_atomic_ptr_get (&instance); + if (unlikely (!p)) + { + p = (T *) calloc (1, sizeof (T)); + if (unlikely (!p)) + p = const_cast (&OT::Null(T)); + else + p->init (face); + if (unlikely (!hb_atomic_ptr_cmpexch (const_cast(&instance), NULL, p))) + { + if (p != &OT::Null(T)) + p->fini (); + goto retry; + } + } + return p; + } + + inline const T* operator-> (void) const + { + return get (); + } + + private: + hb_face_t *face; + T *instance; +}; + +/* Logic is shared between hb_lazy_loader_t and hb_lazy_table_loader_t */ +template +struct hb_lazy_table_loader_t +{ + inline void init (hb_face_t *face_) + { + face = face_; + instance = NULL; + blob = NULL; + } + + inline void fini (void) + { + hb_blob_destroy (blob); + } + + inline const T* get (void) const + { + retry: + T *p = (T *) hb_atomic_ptr_get (&instance); + if (unlikely (!p)) + { + hb_blob_t *blob_ = OT::Sanitizer::sanitize (face->reference_table (T::tableTag)); + p = const_cast(OT::Sanitizer::lock_instance (blob_)); + if (!hb_atomic_ptr_cmpexch (const_cast(&instance), NULL, p)) + { + hb_blob_destroy (blob_); + goto retry; + } + blob = blob_; + } + return p; + } + + inline const T* operator-> (void) const + { + return get(); + } + + private: + hb_face_t *face; + T *instance; + mutable hb_blob_t *blob; +}; + + +} /* namespace OT */ + + +#endif /* HB_OPEN_TYPE_PRIVATE_HH */ diff --git a/src/hb-ot-cbdt-table.hh b/src/hb-ot-cbdt-table.hh new file mode 100644 index 0000000..0a7fbf5 --- /dev/null +++ b/src/hb-ot-cbdt-table.hh @@ -0,0 +1,384 @@ +/* + * Copyright © 2016 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Seigo Nonaka + */ + +#ifndef HB_OT_CBDT_TABLE_HH +#define HB_OT_CBDT_TABLE_HH + +#include "hb-open-type-private.hh" + +namespace OT { + +struct SmallGlyphMetrics +{ + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + inline void get_extents (hb_glyph_extents_t *extents) const + { + extents->x_bearing = bearingX; + extents->y_bearing = bearingY; + extents->width = width; + extents->height = -height; + } + + BYTE height; + BYTE width; + CHAR bearingX; + CHAR bearingY; + BYTE advance; + + DEFINE_SIZE_STATIC(5); +}; + +struct BigGlyphMetrics : SmallGlyphMetrics +{ + CHAR vertBearingX; + CHAR vertBearingY; + BYTE vertAdvance; + + DEFINE_SIZE_STATIC(8); +}; + +struct SBitLineMetrics +{ + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + CHAR ascender; + CHAR decender; + BYTE widthMax; + CHAR caretSlopeNumerator; + CHAR caretSlopeDenominator; + CHAR caretOffset; + CHAR minOriginSB; + CHAR minAdvanceSB; + CHAR maxBeforeBL; + CHAR minAfterBL; + CHAR padding1; + CHAR padding2; + + DEFINE_SIZE_STATIC(12); +}; + + +/* + * Index Subtables. + */ + +struct IndexSubtableHeader +{ + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + USHORT indexFormat; + USHORT imageFormat; + ULONG imageDataOffset; + + DEFINE_SIZE_STATIC(8); +}; + +template +struct IndexSubtableFormat1Or3 +{ + inline bool sanitize (hb_sanitize_context_t *c, unsigned int glyph_count) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + c->check_array (offsetArrayZ, offsetArrayZ[0].static_size, glyph_count + 1)); + } + + bool get_image_data (unsigned int idx, + unsigned int *offset, + unsigned int *length) const + { + if (unlikely (offsetArrayZ[idx + 1] <= offsetArrayZ[idx])) + return false; + + *offset = header.imageDataOffset + offsetArrayZ[idx]; + *length = offsetArrayZ[idx + 1] - offsetArrayZ[idx]; + return true; + } + + IndexSubtableHeader header; + Offset offsetArrayZ[VAR]; + + DEFINE_SIZE_ARRAY(8, offsetArrayZ); +}; + +struct IndexSubtableFormat1 : IndexSubtableFormat1Or3 {}; +struct IndexSubtableFormat3 : IndexSubtableFormat1Or3 {}; + +struct IndexSubtable +{ + inline bool sanitize (hb_sanitize_context_t *c, unsigned int glyph_count) const + { + TRACE_SANITIZE (this); + if (!u.header.sanitize (c)) return_trace (false); + switch (u.header.indexFormat) { + case 1: return_trace (u.format1.sanitize (c, glyph_count)); + case 3: return_trace (u.format3.sanitize (c, glyph_count)); + default:return_trace (true); + } + } + + inline bool get_extents (hb_glyph_extents_t *extents) const + { + switch (u.header.indexFormat) { + case 2: case 5: /* TODO */ + case 1: case 3: case 4: /* Variable-metrics formats do not have metrics here. */ + default:return (false); + } + } + + bool get_image_data (unsigned int idx, + unsigned int *offset, + unsigned int *length, + unsigned int *format) const + { + *format = u.header.imageFormat; + switch (u.header.indexFormat) { + case 1: return u.format1.get_image_data (idx, offset, length); + case 3: return u.format3.get_image_data (idx, offset, length); + default: return false; + } + } + + protected: + union { + IndexSubtableHeader header; + IndexSubtableFormat1 format1; + IndexSubtableFormat3 format3; + /* TODO: Format 2, 4, 5. */ + } u; + public: + DEFINE_SIZE_UNION (8, header); +}; + +struct IndexSubtableRecord +{ + inline bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + firstGlyphIndex <= lastGlyphIndex && + offsetToSubtable.sanitize (c, this, lastGlyphIndex - firstGlyphIndex + 1)); + } + + inline bool get_extents (hb_glyph_extents_t *extents) const + { + return (this+offsetToSubtable).get_extents (extents); + } + + bool get_image_data (unsigned int gid, + unsigned int *offset, + unsigned int *length, + unsigned int *format) const + { + if (gid < firstGlyphIndex || gid > lastGlyphIndex) + { + return false; + } + return (this+offsetToSubtable).get_image_data (gid - firstGlyphIndex, + offset, length, format); + } + + USHORT firstGlyphIndex; + USHORT lastGlyphIndex; + LOffsetTo offsetToSubtable; + + DEFINE_SIZE_STATIC(8); +}; + +struct IndexSubtableArray +{ + inline bool sanitize (hb_sanitize_context_t *c, unsigned int count) const + { + TRACE_SANITIZE (this); + if (unlikely (!c->check_array (&indexSubtablesZ, indexSubtablesZ[0].static_size, count))) + return_trace (false); + for (unsigned int i = 0; i < count; i++) + if (unlikely (!indexSubtablesZ[i].sanitize (c, this))) + return_trace (false); + return_trace (true); + } + + public: + const IndexSubtableRecord* find_table (hb_codepoint_t glyph, unsigned int numTables) const + { + for (unsigned int i = 0; i < numTables; ++i) + { + unsigned int firstGlyphIndex = indexSubtablesZ[i].firstGlyphIndex; + unsigned int lastGlyphIndex = indexSubtablesZ[i].lastGlyphIndex; + if (firstGlyphIndex <= glyph && glyph <= lastGlyphIndex) { + return &indexSubtablesZ[i]; + } + } + return NULL; + } + + protected: + IndexSubtableRecord indexSubtablesZ[VAR]; + + public: + DEFINE_SIZE_ARRAY(0, indexSubtablesZ); +}; + +struct BitmapSizeTable +{ + friend struct CBLC; + + inline bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + indexSubtableArrayOffset.sanitize (c, base, numberOfIndexSubtables) && + c->check_range (&(base+indexSubtableArrayOffset), indexTablesSize) && + horizontal.sanitize (c) && + vertical.sanitize (c)); + } + + const IndexSubtableRecord *find_table (hb_codepoint_t glyph, const void *base) const + { + return (base+indexSubtableArrayOffset).find_table (glyph, numberOfIndexSubtables); + } + + protected: + LOffsetTo indexSubtableArrayOffset; + ULONG indexTablesSize; + ULONG numberOfIndexSubtables; + ULONG colorRef; + SBitLineMetrics horizontal; + SBitLineMetrics vertical; + USHORT startGlyphIndex; + USHORT endGlyphIndex; + BYTE ppemX; + BYTE ppemY; + BYTE bitDepth; + CHAR flags; + +public: + DEFINE_SIZE_STATIC(48); +}; + + +/* + * Glyph Bitmap Data Formats. + */ + +struct GlyphBitmapDataFormat17 +{ + SmallGlyphMetrics glyphMetrics; + ULONG dataLen; + BYTE dataZ[VAR]; + + DEFINE_SIZE_ARRAY(9, dataZ); +}; + + +/* + * CBLC -- Color Bitmap Location Table + */ + +#define HB_OT_TAG_CBLC HB_TAG('C','B','L','C') + +struct CBLC +{ + static const hb_tag_t tableTag = HB_OT_TAG_CBLC; + + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + likely (version.major == 2 || version.major == 3) && + sizeTables.sanitize (c, this)); + } + + public: + const IndexSubtableRecord *find_table (hb_codepoint_t glyph, + unsigned int *x_ppem, unsigned int *y_ppem) const + { + /* TODO: Make it possible to select strike. */ + + unsigned int count = sizeTables.len; + for (uint32_t i = 0; i < count; ++i) + { + unsigned int startGlyphIndex = sizeTables.array[i].startGlyphIndex; + unsigned int endGlyphIndex = sizeTables.array[i].endGlyphIndex; + if (startGlyphIndex <= glyph && glyph <= endGlyphIndex) + { + *x_ppem = sizeTables[i].ppemX; + *y_ppem = sizeTables[i].ppemY; + return sizeTables[i].find_table (glyph, this); + } + } + + return NULL; + } + + protected: + FixedVersion<> version; + LArrayOf sizeTables; + + public: + DEFINE_SIZE_ARRAY(8, sizeTables); +}; + +/* + * CBDT -- Color Bitmap Data Table + */ +#define HB_OT_TAG_CBDT HB_TAG('C','B','D','T') + +struct CBDT +{ + static const hb_tag_t tableTag = HB_OT_TAG_CBDT; + + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + likely (version.major == 2 || version.major == 3)); + } + + protected: + FixedVersion<>version; + BYTE dataZ[VAR]; + + public: + DEFINE_SIZE_ARRAY(4, dataZ); +}; + +} /* namespace OT */ + +#endif /* HB_OT_CBDT_TABLE_HH */ diff --git a/src/hb-ot-cmap-table.hh b/src/hb-ot-cmap-table.hh new file mode 100644 index 0000000..3a53a1c --- /dev/null +++ b/src/hb-ot-cmap-table.hh @@ -0,0 +1,535 @@ +/* + * Copyright © 2014 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_OT_CMAP_TABLE_HH +#define HB_OT_CMAP_TABLE_HH + +#include "hb-open-type-private.hh" + + +namespace OT { + + +/* + * cmap -- Character To Glyph Index Mapping Table + */ + +#define HB_OT_TAG_cmap HB_TAG('c','m','a','p') + + +struct CmapSubtableFormat0 +{ + inline bool get_glyph (hb_codepoint_t codepoint, hb_codepoint_t *glyph) const + { + hb_codepoint_t gid = codepoint < 256 ? glyphIdArray[codepoint] : 0; + if (!gid) + return false; + *glyph = gid; + return true; + } + + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + protected: + USHORT format; /* Format number is set to 0. */ + USHORT lengthZ; /* Byte length of this subtable. */ + USHORT languageZ; /* Ignore. */ + BYTE glyphIdArray[256];/* An array that maps character + * code to glyph index values. */ + public: + DEFINE_SIZE_STATIC (6 + 256); +}; + +struct CmapSubtableFormat4 +{ + struct accelerator_t + { + inline void init (const CmapSubtableFormat4 *subtable) + { + segCount = subtable->segCountX2 / 2; + endCount = subtable->values; + startCount = endCount + segCount + 1; + idDelta = startCount + segCount; + idRangeOffset = idDelta + segCount; + glyphIdArray = idRangeOffset + segCount; + glyphIdArrayLength = (subtable->length - 16 - 8 * segCount) / 2; + } + + static inline bool get_glyph_func (const void *obj, hb_codepoint_t codepoint, hb_codepoint_t *glyph) + { + const accelerator_t *thiz = (const accelerator_t *) obj; + + /* Custom two-array bsearch. */ + int min = 0, max = (int) thiz->segCount - 1; + const USHORT *startCount = thiz->startCount; + const USHORT *endCount = thiz->endCount; + unsigned int i; + while (min <= max) + { + int mid = (min + max) / 2; + if (codepoint < startCount[mid]) + max = mid - 1; + else if (codepoint > endCount[mid]) + min = mid + 1; + else + { + i = mid; + goto found; + } + } + return false; + + found: + hb_codepoint_t gid; + unsigned int rangeOffset = thiz->idRangeOffset[i]; + if (rangeOffset == 0) + gid = codepoint + thiz->idDelta[i]; + else + { + /* Somebody has been smoking... */ + unsigned int index = rangeOffset / 2 + (codepoint - thiz->startCount[i]) + i - thiz->segCount; + if (unlikely (index >= thiz->glyphIdArrayLength)) + return false; + gid = thiz->glyphIdArray[index]; + if (unlikely (!gid)) + return false; + gid += thiz->idDelta[i]; + } + + *glyph = gid & 0xFFFFu; + return true; + } + + const USHORT *endCount; + const USHORT *startCount; + const USHORT *idDelta; + const USHORT *idRangeOffset; + const USHORT *glyphIdArray; + unsigned int segCount; + unsigned int glyphIdArrayLength; + }; + + inline bool get_glyph (hb_codepoint_t codepoint, hb_codepoint_t *glyph) const + { + accelerator_t accel; + accel.init (this); + return accel.get_glyph_func (&accel, codepoint, glyph); + } + + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + if (unlikely (!c->check_struct (this))) + return_trace (false); + + if (unlikely (!c->check_range (this, length))) + { + /* Some broken fonts have too long of a "length" value. + * If that is the case, just change the value to truncate + * the subtable at the end of the blob. */ + uint16_t new_length = (uint16_t) MIN ((uintptr_t) 65535, + (uintptr_t) (c->end - + (char *) this)); + if (!c->try_set (&length, new_length)) + return_trace (false); + } + + return_trace (16 + 4 * (unsigned int) segCountX2 <= length); + } + + protected: + USHORT format; /* Format number is set to 4. */ + USHORT length; /* This is the length in bytes of the + * subtable. */ + USHORT languageZ; /* Ignore. */ + USHORT segCountX2; /* 2 x segCount. */ + USHORT searchRangeZ; /* 2 * (2**floor(log2(segCount))) */ + USHORT entrySelectorZ; /* log2(searchRange/2) */ + USHORT rangeShiftZ; /* 2 x segCount - searchRange */ + + USHORT values[VAR]; +#if 0 + USHORT endCount[segCount]; /* End characterCode for each segment, + * last=0xFFFFu. */ + USHORT reservedPad; /* Set to 0. */ + USHORT startCount[segCount]; /* Start character code for each segment. */ + SHORT idDelta[segCount]; /* Delta for all character codes in segment. */ + USHORT idRangeOffset[segCount];/* Offsets into glyphIdArray or 0 */ + USHORT glyphIdArray[VAR]; /* Glyph index array (arbitrary length) */ +#endif + + public: + DEFINE_SIZE_ARRAY (14, values); +}; + +struct CmapSubtableLongGroup +{ + friend struct CmapSubtableFormat12; + friend struct CmapSubtableFormat13; + + int cmp (hb_codepoint_t codepoint) const + { + if (codepoint < startCharCode) return -1; + if (codepoint > endCharCode) return +1; + return 0; + } + + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + private: + ULONG startCharCode; /* First character code in this group. */ + ULONG endCharCode; /* Last character code in this group. */ + ULONG glyphID; /* Glyph index; interpretation depends on + * subtable format. */ + public: + DEFINE_SIZE_STATIC (12); +}; + +template +struct CmapSubtableTrimmed +{ + inline bool get_glyph (hb_codepoint_t codepoint, hb_codepoint_t *glyph) const + { + /* Rely on our implicit array bound-checking. */ + hb_codepoint_t gid = glyphIdArray[codepoint - startCharCode]; + if (!gid) + return false; + *glyph = gid; + return true; + } + + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && glyphIdArray.sanitize (c)); + } + + protected: + UINT formatReserved; /* Subtable format and (maybe) padding. */ + UINT lengthZ; /* Byte length of this subtable. */ + UINT languageZ; /* Ignore. */ + UINT startCharCode; /* First character code covered. */ + ArrayOf + glyphIdArray; /* Array of glyph index values for character + * codes in the range. */ + public: + DEFINE_SIZE_ARRAY (5 * sizeof (UINT), glyphIdArray); +}; + +struct CmapSubtableFormat6 : CmapSubtableTrimmed {}; +struct CmapSubtableFormat10 : CmapSubtableTrimmed {}; + +template +struct CmapSubtableLongSegmented +{ + inline bool get_glyph (hb_codepoint_t codepoint, hb_codepoint_t *glyph) const + { + int i = groups.bsearch (codepoint); + if (i == -1) + return false; + *glyph = T::group_get_glyph (groups[i], codepoint); + return true; + } + + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && groups.sanitize (c)); + } + + protected: + USHORT format; /* Subtable format; set to 12. */ + USHORT reservedZ; /* Reserved; set to 0. */ + ULONG lengthZ; /* Byte length of this subtable. */ + ULONG languageZ; /* Ignore. */ + SortedArrayOf + groups; /* Groupings. */ + public: + DEFINE_SIZE_ARRAY (16, groups); +}; + +struct CmapSubtableFormat12 : CmapSubtableLongSegmented +{ + static inline hb_codepoint_t group_get_glyph (const CmapSubtableLongGroup &group, + hb_codepoint_t u) + { return group.glyphID + (u - group.startCharCode); } +}; + +struct CmapSubtableFormat13 : CmapSubtableLongSegmented +{ + static inline hb_codepoint_t group_get_glyph (const CmapSubtableLongGroup &group, + hb_codepoint_t u HB_UNUSED) + { return group.glyphID; } +}; + +typedef enum +{ + GLYPH_VARIANT_NOT_FOUND = 0, + GLYPH_VARIANT_FOUND = 1, + GLYPH_VARIANT_USE_DEFAULT = 2 +} glyph_variant_t; + +struct UnicodeValueRange +{ + inline int cmp (const hb_codepoint_t &codepoint) const + { + if (codepoint < startUnicodeValue) return -1; + if (codepoint > startUnicodeValue + additionalCount) return +1; + return 0; + } + + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + UINT24 startUnicodeValue; /* First value in this range. */ + BYTE additionalCount; /* Number of additional values in this + * range. */ + public: + DEFINE_SIZE_STATIC (4); +}; + +typedef SortedArrayOf DefaultUVS; + +struct UVSMapping +{ + inline int cmp (const hb_codepoint_t &codepoint) const + { + return unicodeValue.cmp (codepoint); + } + + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + UINT24 unicodeValue; /* Base Unicode value of the UVS */ + GlyphID glyphID; /* Glyph ID of the UVS */ + public: + DEFINE_SIZE_STATIC (5); +}; + +typedef SortedArrayOf NonDefaultUVS; + +struct VariationSelectorRecord +{ + inline glyph_variant_t get_glyph (hb_codepoint_t codepoint, + hb_codepoint_t *glyph, + const void *base) const + { + int i; + const DefaultUVS &defaults = base+defaultUVS; + i = defaults.bsearch (codepoint); + if (i != -1) + return GLYPH_VARIANT_USE_DEFAULT; + const NonDefaultUVS &nonDefaults = base+nonDefaultUVS; + i = nonDefaults.bsearch (codepoint); + if (i != -1) + { + *glyph = nonDefaults[i].glyphID; + return GLYPH_VARIANT_FOUND; + } + return GLYPH_VARIANT_NOT_FOUND; + } + + inline int cmp (const hb_codepoint_t &variation_selector) const + { + return varSelector.cmp (variation_selector); + } + + inline bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + defaultUVS.sanitize (c, base) && + nonDefaultUVS.sanitize (c, base)); + } + + UINT24 varSelector; /* Variation selector. */ + LOffsetTo + defaultUVS; /* Offset to Default UVS Table. May be 0. */ + LOffsetTo + nonDefaultUVS; /* Offset to Non-Default UVS Table. May be 0. */ + public: + DEFINE_SIZE_STATIC (11); +}; + +struct CmapSubtableFormat14 +{ + inline glyph_variant_t get_glyph_variant (hb_codepoint_t codepoint, + hb_codepoint_t variation_selector, + hb_codepoint_t *glyph) const + { + return record[record.bsearch(variation_selector)].get_glyph (codepoint, glyph, this); + } + + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + record.sanitize (c, this)); + } + + protected: + USHORT format; /* Format number is set to 14. */ + ULONG lengthZ; /* Byte length of this subtable. */ + SortedArrayOf + record; /* Variation selector records; sorted + * in increasing order of `varSelector'. */ + public: + DEFINE_SIZE_ARRAY (10, record); +}; + +struct CmapSubtable +{ + /* Note: We intentionally do NOT implement subtable formats 2 and 8. */ + + inline bool get_glyph (hb_codepoint_t codepoint, + hb_codepoint_t *glyph) const + { + switch (u.format) { + case 0: return u.format0 .get_glyph(codepoint, glyph); + case 4: return u.format4 .get_glyph(codepoint, glyph); + case 6: return u.format6 .get_glyph(codepoint, glyph); + case 10: return u.format10.get_glyph(codepoint, glyph); + case 12: return u.format12.get_glyph(codepoint, glyph); + case 13: return u.format13.get_glyph(codepoint, glyph); + case 14: + default: return false; + } + } + + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + if (!u.format.sanitize (c)) return_trace (false); + switch (u.format) { + case 0: return_trace (u.format0 .sanitize (c)); + case 4: return_trace (u.format4 .sanitize (c)); + case 6: return_trace (u.format6 .sanitize (c)); + case 10: return_trace (u.format10.sanitize (c)); + case 12: return_trace (u.format12.sanitize (c)); + case 13: return_trace (u.format13.sanitize (c)); + case 14: return_trace (u.format14.sanitize (c)); + default:return_trace (true); + } + } + + public: + union { + USHORT format; /* Format identifier */ + CmapSubtableFormat0 format0; + CmapSubtableFormat4 format4; + CmapSubtableFormat6 format6; + CmapSubtableFormat10 format10; + CmapSubtableFormat12 format12; + CmapSubtableFormat13 format13; + CmapSubtableFormat14 format14; + } u; + public: + DEFINE_SIZE_UNION (2, format); +}; + + +struct EncodingRecord +{ + inline int cmp (const EncodingRecord &other) const + { + int ret; + ret = platformID.cmp (other.platformID); + if (ret) return ret; + ret = encodingID.cmp (other.encodingID); + if (ret) return ret; + return 0; + } + + inline bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + subtable.sanitize (c, base)); + } + + USHORT platformID; /* Platform ID. */ + USHORT encodingID; /* Platform-specific encoding ID. */ + LOffsetTo + subtable; /* Byte offset from beginning of table to the subtable for this encoding. */ + public: + DEFINE_SIZE_STATIC (8); +}; + +struct cmap +{ + static const hb_tag_t tableTag = HB_OT_TAG_cmap; + + inline const CmapSubtable *find_subtable (unsigned int platform_id, + unsigned int encoding_id) const + { + EncodingRecord key; + key.platformID.set (platform_id); + key.encodingID.set (encoding_id); + + /* Note: We can use bsearch, but since it has no performance + * implications, we use lsearch and as such accept fonts with + * unsorted subtable list. */ + int result = encodingRecord./*bsearch*/lsearch (key); + if (result == -1 || !encodingRecord[result].subtable) + return NULL; + + return &(this+encodingRecord[result].subtable); + } + + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + likely (version == 0) && + encodingRecord.sanitize (c, this)); + } + + USHORT version; /* Table version number (0). */ + SortedArrayOf + encodingRecord; /* Encoding tables. */ + public: + DEFINE_SIZE_ARRAY (4, encodingRecord); +}; + + +} /* namespace OT */ + + +#endif /* HB_OT_CMAP_TABLE_HH */ diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc new file mode 100644 index 0000000..009db20 --- /dev/null +++ b/src/hb-ot-font.cc @@ -0,0 +1,631 @@ +/* + * Copyright © 2011,2014 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod, Roozbeh Pournader + */ + +#include "hb-private.hh" + +#include "hb-ot.h" + +#include "hb-font-private.hh" + +#include "hb-ot-cmap-table.hh" +#include "hb-ot-cbdt-table.hh" +#include "hb-ot-glyf-table.hh" +#include "hb-ot-head-table.hh" +#include "hb-ot-hhea-table.hh" +#include "hb-ot-hmtx-table.hh" +#include "hb-ot-os2-table.hh" +#include "hb-ot-var-hvar-table.hh" +//#include "hb-ot-post-table.hh" + + +struct hb_ot_face_metrics_accelerator_t +{ + unsigned int num_metrics; + unsigned int num_advances; + unsigned int default_advance; + unsigned short ascender; + unsigned short descender; + unsigned short line_gap; + bool has_font_extents; + + const OT::hmtxvmtx *table; + hb_blob_t *blob; + + const OT::HVARVVAR *var; + hb_blob_t *var_blob; + + inline void init (hb_face_t *face, + hb_tag_t _hea_tag, + hb_tag_t _mtx_tag, + hb_tag_t _var_tag, + hb_tag_t os2_tag, + unsigned int default_advance = 0) + { + this->default_advance = default_advance ? default_advance : face->get_upem (); + + bool got_font_extents = false; + if (os2_tag) + { + hb_blob_t *os2_blob = OT::Sanitizer::sanitize (face->reference_table (os2_tag)); + const OT::os2 *os2 = OT::Sanitizer::lock_instance (os2_blob); +#define USE_TYPO_METRICS (1u<<7) + if (0 != (os2->fsSelection & USE_TYPO_METRICS)) + { + this->ascender = os2->sTypoAscender; + this->descender = os2->sTypoDescender; + this->line_gap = os2->sTypoLineGap; + got_font_extents = (this->ascender | this->descender) != 0; + } + hb_blob_destroy (os2_blob); + } + + hb_blob_t *_hea_blob = OT::Sanitizer::sanitize (face->reference_table (_hea_tag)); + const OT::_hea *_hea = OT::Sanitizer::lock_instance (_hea_blob); + this->num_advances = _hea->numberOfLongMetrics; + if (!got_font_extents) + { + this->ascender = _hea->ascender; + this->descender = _hea->descender; + this->line_gap = _hea->lineGap; + got_font_extents = (this->ascender | this->descender) != 0; + } + hb_blob_destroy (_hea_blob); + + this->has_font_extents = got_font_extents; + + this->blob = OT::Sanitizer::sanitize (face->reference_table (_mtx_tag)); + + /* Cap num_metrics() and num_advances() based on table length. */ + unsigned int len = hb_blob_get_length (this->blob); + if (unlikely (this->num_advances * 4 > len)) + this->num_advances = len / 4; + this->num_metrics = this->num_advances + (len - 4 * this->num_advances) / 2; + + /* We MUST set num_metrics to zero if num_advances is zero. + * Our get_advance() depends on that. */ + if (unlikely (!this->num_advances)) + { + this->num_metrics = this->num_advances = 0; + hb_blob_destroy (this->blob); + this->blob = hb_blob_get_empty (); + } + this->table = OT::Sanitizer::lock_instance (this->blob); + + this->var_blob = OT::Sanitizer::sanitize (face->reference_table (_var_tag)); + this->var = OT::Sanitizer::lock_instance (this->var_blob); + } + + inline void fini (void) + { + hb_blob_destroy (this->blob); + hb_blob_destroy (this->var_blob); + } + + inline unsigned int get_advance (hb_codepoint_t glyph, + hb_font_t *font) 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 default advance. Otherwise, it means that the + * glyph index is out of bound: return zero. */ + if (this->num_metrics) + return 0; + else + return this->default_advance; + } + + return this->table->longMetric[MIN (glyph, this->num_advances - 1)].advance + + this->var->get_advance_var (glyph, font->coords, font->num_coords); // TODO Optimize?! + } +}; + +struct hb_ot_face_glyf_accelerator_t +{ + bool short_offset; + unsigned int num_glyphs; + const OT::loca *loca; + const OT::glyf *glyf; + hb_blob_t *loca_blob; + hb_blob_t *glyf_blob; + unsigned int glyf_len; + + inline void init (hb_face_t *face) + { + hb_blob_t *head_blob = OT::Sanitizer::sanitize (face->reference_table (HB_OT_TAG_head)); + const OT::head *head = OT::Sanitizer::lock_instance (head_blob); + if ((unsigned int) head->indexToLocFormat > 1 || head->glyphDataFormat != 0) + { + /* Unknown format. Leave num_glyphs=0, that takes care of disabling us. */ + hb_blob_destroy (head_blob); + return; + } + this->short_offset = 0 == head->indexToLocFormat; + hb_blob_destroy (head_blob); + + this->loca_blob = OT::Sanitizer::sanitize (face->reference_table (HB_OT_TAG_loca)); + this->loca = OT::Sanitizer::lock_instance (this->loca_blob); + this->glyf_blob = OT::Sanitizer::sanitize (face->reference_table (HB_OT_TAG_glyf)); + this->glyf = OT::Sanitizer::lock_instance (this->glyf_blob); + + this->num_glyphs = MAX (1u, hb_blob_get_length (this->loca_blob) / (this->short_offset ? 2 : 4)) - 1; + this->glyf_len = hb_blob_get_length (this->glyf_blob); + } + + inline void fini (void) + { + hb_blob_destroy (this->loca_blob); + hb_blob_destroy (this->glyf_blob); + } + + inline bool get_extents (hb_codepoint_t glyph, + hb_glyph_extents_t *extents) const + { + if (unlikely (glyph >= this->num_glyphs)) + return false; + + unsigned int start_offset, end_offset; + if (this->short_offset) + { + start_offset = 2 * this->loca->u.shortsZ[glyph]; + end_offset = 2 * this->loca->u.shortsZ[glyph + 1]; + } + else + { + start_offset = this->loca->u.longsZ[glyph]; + end_offset = this->loca->u.longsZ[glyph + 1]; + } + + if (start_offset > end_offset || end_offset > this->glyf_len) + return false; + + if (end_offset - start_offset < OT::glyfGlyphHeader::static_size) + return true; /* Empty glyph; zero extents. */ + + const OT::glyfGlyphHeader &glyph_header = OT::StructAtOffset (this->glyf, start_offset); + + extents->x_bearing = MIN (glyph_header.xMin, glyph_header.xMax); + extents->y_bearing = MAX (glyph_header.yMin, glyph_header.yMax); + extents->width = MAX (glyph_header.xMin, glyph_header.xMax) - extents->x_bearing; + extents->height = MIN (glyph_header.yMin, glyph_header.yMax) - extents->y_bearing; + + return true; + } +}; + +struct hb_ot_face_cbdt_accelerator_t +{ + hb_blob_t *cblc_blob; + hb_blob_t *cbdt_blob; + const OT::CBLC *cblc; + const OT::CBDT *cbdt; + + unsigned int cbdt_len; + float upem; + + inline void init (hb_face_t *face) + { + upem = face->get_upem(); + + cblc_blob = OT::Sanitizer::sanitize (face->reference_table (HB_OT_TAG_CBLC)); + cbdt_blob = OT::Sanitizer::sanitize (face->reference_table (HB_OT_TAG_CBDT)); + cbdt_len = hb_blob_get_length (cbdt_blob); + + if (hb_blob_get_length (cblc_blob) == 0) { + cblc = NULL; + cbdt = NULL; + return; /* Not a bitmap font. */ + } + cblc = OT::Sanitizer::lock_instance (cblc_blob); + cbdt = OT::Sanitizer::lock_instance (cbdt_blob); + + } + + inline void fini (void) + { + hb_blob_destroy (this->cblc_blob); + hb_blob_destroy (this->cbdt_blob); + } + + inline bool get_extents (hb_codepoint_t glyph, hb_glyph_extents_t *extents) const + { + unsigned int x_ppem = upem, y_ppem = upem; /* TODO Use font ppem if available. */ + + if (cblc == NULL) + return false; // Not a color bitmap font. + + const OT::IndexSubtableRecord *subtable_record = this->cblc->find_table(glyph, &x_ppem, &y_ppem); + if (subtable_record == NULL) + return false; + + if (subtable_record->get_extents (extents)) + return true; + + unsigned int image_offset = 0, image_length = 0, image_format = 0; + if (!subtable_record->get_image_data (glyph, &image_offset, &image_length, &image_format)) + return false; + + { + /* TODO Move the following into CBDT struct when adding more formats. */ + + if (unlikely (image_offset > cbdt_len || cbdt_len - image_offset < image_length)) + return false; + + switch (image_format) + { + case 17: { + if (unlikely (image_length < OT::GlyphBitmapDataFormat17::min_size)) + return false; + + const OT::GlyphBitmapDataFormat17& glyphFormat17 = + OT::StructAtOffset (this->cbdt, image_offset); + glyphFormat17.glyphMetrics.get_extents (extents); + } + break; + default: + // TODO: Support other image formats. + return false; + } + } + + /* Convert to the font units. */ + extents->x_bearing *= upem / (float) x_ppem; + extents->y_bearing *= upem / (float) y_ppem; + extents->width *= upem / (float) x_ppem; + extents->height *= upem / (float) y_ppem; + + return true; + } +}; + +typedef bool (*hb_cmap_get_glyph_func_t) (const void *obj, + hb_codepoint_t codepoint, + hb_codepoint_t *glyph); + +template +static inline bool get_glyph_from (const void *obj, + hb_codepoint_t codepoint, + hb_codepoint_t *glyph) +{ + const Type *typed_obj = (const Type *) obj; + return typed_obj->get_glyph (codepoint, glyph); +} + +template +static inline bool get_glyph_from_symbol (const void *obj, + hb_codepoint_t codepoint, + hb_codepoint_t *glyph) +{ + const Type *typed_obj = (const Type *) obj; + if (likely (typed_obj->get_glyph (codepoint, glyph))) + return true; + + if (codepoint <= 0x00FFu) + { + /* For symbol-encoded OpenType fonts, we duplicate the + * U+F000..F0FF range at U+0000..U+00FF. That's what + * Windows seems to do, and that's hinted about at: + * http://www.microsoft.com/typography/otspec/recom.htm + * under "Non-Standard (Symbol) Fonts". */ + return typed_obj->get_glyph (0xF000u + codepoint, glyph); + } + + return false; +} + +struct hb_ot_face_cmap_accelerator_t +{ + hb_cmap_get_glyph_func_t get_glyph_func; + const void *get_glyph_data; + OT::CmapSubtableFormat4::accelerator_t format4_accel; + + const OT::CmapSubtableFormat14 *uvs_table; + hb_blob_t *blob; + + inline void init (hb_face_t *face) + { + this->blob = OT::Sanitizer::sanitize (face->reference_table (HB_OT_TAG_cmap)); + const OT::cmap *cmap = OT::Sanitizer::lock_instance (this->blob); + const OT::CmapSubtable *subtable = NULL; + const OT::CmapSubtableFormat14 *subtable_uvs = NULL; + + bool symbol = false; + /* 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); + if (!subtable) + { + subtable = cmap->find_subtable (3, 0); + if (subtable) symbol = true; + } + /* Meh. */ + if (!subtable) subtable = &OT::Null(OT::CmapSubtable); + + /* UVS subtable. */ + if (!subtable_uvs) + { + const OT::CmapSubtable *st = cmap->find_subtable (0, 5); + if (st && st->u.format == 14) + subtable_uvs = &st->u.format14; + } + /* Meh. */ + if (!subtable_uvs) subtable_uvs = &OT::Null(OT::CmapSubtableFormat14); + + this->uvs_table = subtable_uvs; + + this->get_glyph_data = subtable; + if (unlikely (symbol)) + this->get_glyph_func = get_glyph_from_symbol; + else + switch (subtable->u.format) { + /* Accelerate format 4 and format 12. */ + default: this->get_glyph_func = get_glyph_from; break; + case 12: this->get_glyph_func = get_glyph_from; break; + case 4: + { + this->format4_accel.init (&subtable->u.format4); + this->get_glyph_data = &this->format4_accel; + this->get_glyph_func = this->format4_accel.get_glyph_func; + } + break; + } + } + + inline void fini (void) + { + hb_blob_destroy (this->blob); + } + + inline bool get_nominal_glyph (hb_codepoint_t unicode, + hb_codepoint_t *glyph) const + { + return this->get_glyph_func (this->get_glyph_data, unicode, glyph); + } + + inline bool get_variation_glyph (hb_codepoint_t unicode, + hb_codepoint_t variation_selector, + hb_codepoint_t *glyph) const + { + 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 get_nominal_glyph (unicode, glyph); + } +}; + +struct hb_ot_font_t +{ + hb_ot_face_cmap_accelerator_t cmap; + hb_ot_face_metrics_accelerator_t h_metrics; + hb_ot_face_metrics_accelerator_t v_metrics; + OT::hb_lazy_loader_t glyf; + OT::hb_lazy_loader_t cbdt; +}; + + +static hb_ot_font_t * +_hb_ot_font_create (hb_face_t *face) +{ + hb_ot_font_t *ot_font = (hb_ot_font_t *) calloc (1, sizeof (hb_ot_font_t)); + + if (unlikely (!ot_font)) + return NULL; + + ot_font->cmap.init (face); + ot_font->h_metrics.init (face, HB_OT_TAG_hhea, HB_OT_TAG_hmtx, HB_OT_TAG_HVAR, HB_OT_TAG_os2); + ot_font->v_metrics.init (face, HB_OT_TAG_vhea, HB_OT_TAG_vmtx, HB_OT_TAG_VVAR, HB_TAG_NONE, + ot_font->h_metrics.ascender - ot_font->h_metrics.descender); /* TODO Can we do this lazily? */ + ot_font->glyf.init (face); + ot_font->cbdt.init (face); + + return ot_font; +} + +static void +_hb_ot_font_destroy (hb_ot_font_t *ot_font) +{ + ot_font->cmap.fini (); + ot_font->h_metrics.fini (); + ot_font->v_metrics.fini (); + ot_font->glyf.fini (); + ot_font->cbdt.fini (); + + free (ot_font); +} + + +static hb_bool_t +hb_ot_get_nominal_glyph (hb_font_t *font HB_UNUSED, + void *font_data, + hb_codepoint_t unicode, + hb_codepoint_t *glyph, + void *user_data HB_UNUSED) + +{ + const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data; + return ot_font->cmap.get_nominal_glyph (unicode, glyph); +} + +static hb_bool_t +hb_ot_get_variation_glyph (hb_font_t *font HB_UNUSED, + void *font_data, + hb_codepoint_t unicode, + hb_codepoint_t variation_selector, + hb_codepoint_t *glyph, + void *user_data HB_UNUSED) +{ + const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data; + return ot_font->cmap.get_variation_glyph (unicode, variation_selector, glyph); +} + +static hb_position_t +hb_ot_get_glyph_h_advance (hb_font_t *font, + void *font_data, + hb_codepoint_t glyph, + void *user_data HB_UNUSED) +{ + const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data; + return font->em_scale_x (ot_font->h_metrics.get_advance (glyph, font)); +} + +static hb_position_t +hb_ot_get_glyph_v_advance (hb_font_t *font, + void *font_data, + hb_codepoint_t glyph, + void *user_data HB_UNUSED) +{ + const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data; + return font->em_scale_y (-(int) ot_font->v_metrics.get_advance (glyph, font)); +} + +static hb_bool_t +hb_ot_get_glyph_extents (hb_font_t *font HB_UNUSED, + void *font_data, + hb_codepoint_t glyph, + hb_glyph_extents_t *extents, + void *user_data HB_UNUSED) +{ + const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data; + bool ret = ot_font->glyf->get_extents (glyph, extents); + if (!ret) + ret = ot_font->cbdt->get_extents (glyph, extents); + // TODO Hook up side-bearings variations. + extents->x_bearing = font->em_scale_x (extents->x_bearing); + extents->y_bearing = font->em_scale_y (extents->y_bearing); + extents->width = font->em_scale_x (extents->width); + extents->height = font->em_scale_y (extents->height); + return ret; +} + +static hb_bool_t +hb_ot_get_font_h_extents (hb_font_t *font HB_UNUSED, + void *font_data, + hb_font_extents_t *metrics, + void *user_data HB_UNUSED) +{ + const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data; + metrics->ascender = font->em_scale_y (ot_font->h_metrics.ascender); + metrics->descender = font->em_scale_y (ot_font->h_metrics.descender); + metrics->line_gap = font->em_scale_y (ot_font->h_metrics.line_gap); + // TODO Hook up variations. + return ot_font->h_metrics.has_font_extents; +} + +static hb_bool_t +hb_ot_get_font_v_extents (hb_font_t *font HB_UNUSED, + void *font_data, + hb_font_extents_t *metrics, + void *user_data HB_UNUSED) +{ + const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data; + metrics->ascender = font->em_scale_x (ot_font->v_metrics.ascender); + metrics->descender = font->em_scale_x (ot_font->v_metrics.descender); + metrics->line_gap = font->em_scale_x (ot_font->v_metrics.line_gap); + // TODO Hook up variations. + return ot_font->v_metrics.has_font_extents; +} + +static hb_font_funcs_t *static_ot_funcs = NULL; + +#ifdef HB_USE_ATEXIT +static +void free_static_ot_funcs (void) +{ + hb_font_funcs_destroy (static_ot_funcs); +} +#endif + +static hb_font_funcs_t * +_hb_ot_get_font_funcs (void) +{ +retry: + hb_font_funcs_t *funcs = (hb_font_funcs_t *) hb_atomic_ptr_get (&static_ot_funcs); + + if (unlikely (!funcs)) + { + funcs = hb_font_funcs_create (); + + hb_font_funcs_set_font_h_extents_func (funcs, hb_ot_get_font_h_extents, NULL, NULL); + hb_font_funcs_set_font_v_extents_func (funcs, hb_ot_get_font_v_extents, NULL, NULL); + hb_font_funcs_set_nominal_glyph_func (funcs, hb_ot_get_nominal_glyph, NULL, NULL); + hb_font_funcs_set_variation_glyph_func (funcs, hb_ot_get_variation_glyph, NULL, NULL); + hb_font_funcs_set_glyph_h_advance_func (funcs, hb_ot_get_glyph_h_advance, NULL, NULL); + hb_font_funcs_set_glyph_v_advance_func (funcs, hb_ot_get_glyph_v_advance, NULL, NULL); + //hb_font_funcs_set_glyph_h_origin_func (funcs, hb_ot_get_glyph_h_origin, NULL, NULL); + //hb_font_funcs_set_glyph_v_origin_func (funcs, hb_ot_get_glyph_v_origin, NULL, NULL); + //hb_font_funcs_set_glyph_h_kerning_func (funcs, hb_ot_get_glyph_h_kerning, NULL, NULL); TODO + //hb_font_funcs_set_glyph_v_kerning_func (funcs, hb_ot_get_glyph_v_kerning, NULL, NULL); + hb_font_funcs_set_glyph_extents_func (funcs, hb_ot_get_glyph_extents, NULL, NULL); + //hb_font_funcs_set_glyph_contour_point_func (funcs, hb_ot_get_glyph_contour_point, NULL, NULL); TODO + //hb_font_funcs_set_glyph_name_func (funcs, hb_ot_get_glyph_name, NULL, NULL); TODO + //hb_font_funcs_set_glyph_from_name_func (funcs, hb_ot_get_glyph_from_name, NULL, NULL); TODO + + hb_font_funcs_make_immutable (funcs); + + if (!hb_atomic_ptr_cmpexch (&static_ot_funcs, NULL, funcs)) { + hb_font_funcs_destroy (funcs); + goto retry; + } + +#ifdef HB_USE_ATEXIT + atexit (free_static_ot_funcs); /* First person registers atexit() callback. */ +#endif + }; + + return funcs; +} + + +/** + * hb_ot_font_set_funcs: + * + * Since: 0.9.28 + **/ +void +hb_ot_font_set_funcs (hb_font_t *font) +{ + hb_ot_font_t *ot_font = _hb_ot_font_create (font->face); + if (unlikely (!ot_font)) + return; + + hb_font_set_funcs (font, + _hb_ot_get_font_funcs (), + ot_font, + (hb_destroy_func_t) _hb_ot_font_destroy); +} diff --git a/src/hb-ot-font.h b/src/hb-ot-font.h new file mode 100644 index 0000000..80eaa54 --- /dev/null +++ b/src/hb-ot-font.h @@ -0,0 +1,45 @@ +/* + * Copyright © 2014 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod, Roozbeh Pournader + */ + +#ifndef HB_OT_H_IN +#error "Include instead." +#endif + +#ifndef HB_OT_FONT_H +#define HB_OT_FONT_H + +#include "hb.h" + +HB_BEGIN_DECLS + + +HB_EXTERN void +hb_ot_font_set_funcs (hb_font_t *font); + + +HB_END_DECLS + +#endif /* HB_OT_FONT_H */ diff --git a/src/hb-ot-glyf-table.hh b/src/hb-ot-glyf-table.hh new file mode 100644 index 0000000..dc7aa84 --- /dev/null +++ b/src/hb-ot-glyf-table.hh @@ -0,0 +1,104 @@ +/* + * Copyright © 2015 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_OT_GLYF_TABLE_HH +#define HB_OT_GLYF_TABLE_HH + +#include "hb-open-type-private.hh" + + +namespace OT { + + +/* + * loca -- Index to Location + */ + +#define HB_OT_TAG_loca HB_TAG('l','o','c','a') + + +struct loca +{ + static const hb_tag_t tableTag = HB_OT_TAG_loca; + + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (true); + } + + public: + union { + USHORT shortsZ[VAR]; /* Location offset divided by 2. */ + ULONG longsZ[VAR]; /* Location offset. */ + } u; + DEFINE_SIZE_ARRAY (0, u.longsZ); +}; + + +/* + * glyf -- TrueType Glyph Data + */ + +#define HB_OT_TAG_glyf HB_TAG('g','l','y','f') + + +struct glyf +{ + static const hb_tag_t tableTag = HB_OT_TAG_glyf; + + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + /* We don't check for anything specific here. The users of the + * struct do all the hard work... */ + return_trace (true); + } + + public: + BYTE dataX[VAR]; /* Glyphs data. */ + + DEFINE_SIZE_ARRAY (0, dataX); +}; + +struct glyfGlyphHeader +{ + SHORT numberOfContours; /* If the number of contours is + * greater than or equal to zero, + * this is a simple glyph; if negative, + * this is a composite glyph. */ + FWORD xMin; /* Minimum x for coordinate data. */ + FWORD yMin; /* Minimum y for coordinate data. */ + FWORD xMax; /* Maximum x for coordinate data. */ + FWORD yMax; /* Maximum y for coordinate data. */ + + DEFINE_SIZE_STATIC (10); +}; + +} /* namespace OT */ + + +#endif /* HB_OT_GLYF_TABLE_HH */ diff --git a/src/hb-ot-head-table.hh b/src/hb-ot-head-table.hh new file mode 100644 index 0000000..9c3e51e --- /dev/null +++ b/src/hb-ot-head-table.hh @@ -0,0 +1,154 @@ +/* + * Copyright © 2010 Red Hat, Inc. + * Copyright © 2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_OT_HEAD_TABLE_HH +#define HB_OT_HEAD_TABLE_HH + +#include "hb-open-type-private.hh" + + +namespace OT { + + +/* + * head -- Font Header + */ + +#define HB_OT_TAG_head HB_TAG('h','e','a','d') + +struct head +{ + static const hb_tag_t tableTag = HB_OT_TAG_head; + + inline unsigned int get_upem (void) const + { + unsigned int upem = unitsPerEm; + /* If no valid head table found, assume 1000, which matches typical Type1 usage. */ + return 16 <= upem && upem <= 16384 ? upem : 1000; + } + + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && + version.major == 1 && + magicNumber == 0x5F0F3CF5u); + } + + protected: + FixedVersion<>version; /* Version of the head table--currently + * 0x00010000u for version 1.0. */ + FixedVersion<>fontRevision; /* Set by font manufacturer. */ + ULONG checkSumAdjustment; /* To compute: set it to 0, sum the + * entire font as ULONG, then store + * 0xB1B0AFBAu - sum. */ + ULONG magicNumber; /* Set to 0x5F0F3CF5u. */ + USHORT flags; /* Bit 0: Baseline for font at y=0; + * Bit 1: Left sidebearing point at x=0; + * Bit 2: Instructions may depend on point size; + * Bit 3: Force ppem to integer values for all + * internal scaler math; may use fractional + * ppem sizes if this bit is clear; + * Bit 4: Instructions may alter advance width + * (the advance widths might not scale linearly); + + * Bits 5-10: These should be set according to + * Apple's specification. However, they are not + * implemented in OpenType. + * Bit 5: This bit should be set in fonts that are + * intended to e laid out vertically, and in + * which the glyphs have been drawn such that an + * x-coordinate of 0 corresponds to the desired + * vertical baseline. + * Bit 6: This bit must be set to zero. + * Bit 7: This bit should be set if the font + * requires layout for correct linguistic + * rendering (e.g. Arabic fonts). + * Bit 8: This bit should be set for a GX font + * which has one or more metamorphosis effects + * designated as happening by default. + * Bit 9: This bit should be set if the font + * contains any strong right-to-left glyphs. + * Bit 10: This bit should be set if the font + * contains Indic-style rearrangement effects. + + * Bit 11: Font data is 'lossless,' as a result + * of having been compressed and decompressed + * with the Agfa MicroType Express engine. + * Bit 12: Font converted (produce compatible metrics) + * Bit 13: Font optimized for ClearType™. + * Note, fonts that rely on embedded bitmaps (EBDT) + * for rendering should not be considered optimized + * for ClearType, and therefore should keep this bit + * cleared. + * Bit 14: Last Resort font. If set, indicates that + * the glyphs encoded in the cmap subtables are simply + * generic symbolic representations of code point + * ranges and don’t truly represent support for those + * code points. If unset, indicates that the glyphs + * encoded in the cmap subtables represent proper + * support for those code points. + * Bit 15: Reserved, set to 0. */ + USHORT unitsPerEm; /* Valid range is from 16 to 16384. This value + * should be a power of 2 for fonts that have + * TrueType outlines. */ + LONGDATETIME created; /* Number of seconds since 12:00 midnight, + January 1, 1904. 64-bit integer */ + LONGDATETIME modified; /* Number of seconds since 12:00 midnight, + January 1, 1904. 64-bit integer */ + SHORT xMin; /* For all glyph bounding boxes. */ + SHORT yMin; /* For all glyph bounding boxes. */ + SHORT xMax; /* For all glyph bounding boxes. */ + SHORT yMax; /* For all glyph bounding boxes. */ + USHORT macStyle; /* Bit 0: Bold (if set to 1); + * Bit 1: Italic (if set to 1) + * Bit 2: Underline (if set to 1) + * Bit 3: Outline (if set to 1) + * Bit 4: Shadow (if set to 1) + * Bit 5: Condensed (if set to 1) + * Bit 6: Extended (if set to 1) + * Bits 7-15: Reserved (set to 0). */ + USHORT lowestRecPPEM; /* Smallest readable size in pixels. */ + SHORT fontDirectionHint; /* Deprecated (Set to 2). + * 0: Fully mixed directional glyphs; + * 1: Only strongly left to right; + * 2: Like 1 but also contains neutrals; + * -1: Only strongly right to left; + * -2: Like -1 but also contains neutrals. */ + public: + SHORT indexToLocFormat; /* 0 for short offsets, 1 for long. */ + SHORT glyphDataFormat; /* 0 for current format. */ + + DEFINE_SIZE_STATIC (54); +}; + + +} /* namespace OT */ + + +#endif /* HB_OT_HEAD_TABLE_HH */ diff --git a/src/hb-ot-hhea-table.hh b/src/hb-ot-hhea-table.hh new file mode 100644 index 0000000..c8e9536 --- /dev/null +++ b/src/hb-ot-hhea-table.hh @@ -0,0 +1,103 @@ +/* + * Copyright © 2011,2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_OT_HHEA_TABLE_HH +#define HB_OT_HHEA_TABLE_HH + +#include "hb-open-type-private.hh" + + +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 _hea +{ + static const hb_tag_t tableTag = HB_TAG('_','h','e','a'); + + 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) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && likely (version.major == 1)); + } + + public: + FixedVersion<>version; /* 0x00010000u for version 1.0. */ + 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)) 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 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. */ + SHORT metricDataFormat; /* 0 for current format. */ + 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 */ + + +#endif /* HB_OT_HHEA_TABLE_HH */ diff --git a/src/hb-ot-hmtx-table.hh b/src/hb-ot-hmtx-table.hh new file mode 100644 index 0000000..30aa625 --- /dev/null +++ b/src/hb-ot-hmtx-table.hh @@ -0,0 +1,102 @@ +/* + * Copyright © 2011,2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_OT_HMTX_TABLE_HH +#define HB_OT_HMTX_TABLE_HH + +#include "hb-open-type-private.hh" + + +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 LongMetric +{ + UFWORD advance; /* Advance width/height. */ + FWORD lsb; /* Leading (left/top) side bearing. */ + public: + DEFINE_SIZE_STATIC (4); +}; + +struct hmtxvmtx +{ + 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) const + { + TRACE_SANITIZE (this); + /* We don't check for anything specific here. The users of the + * struct do all the hard work... */ + return_trace (true); + } + + public: + 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 + * monospaced, only one entry need + * be in the array, but that entry is + * required. The last entry applies to + * all subsequent glyphs. */ + FWORD 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 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 side bearing + * values for each glyph. */ + public: + DEFINE_SIZE_ARRAY2 (0, longMetric, leadingBearingX); +}; + +struct hmtx : hmtxvmtx { + static const hb_tag_t tableTag = HB_OT_TAG_hmtx; +}; +struct vmtx : hmtxvmtx { + static const hb_tag_t tableTag = HB_OT_TAG_vmtx; +}; + +} /* namespace OT */ + + +#endif /* HB_OT_HMTX_TABLE_HH */ diff --git a/src/hb-ot-layout-common-private.hh b/src/hb-ot-layout-common-private.hh new file mode 100644 index 0000000..180e5f0 --- /dev/null +++ b/src/hb-ot-layout-common-private.hh @@ -0,0 +1,1721 @@ +/* + * Copyright © 2007,2008,2009 Red Hat, Inc. + * Copyright © 2010,2012 Google, Inc. + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Red Hat Author(s): Behdad Esfahbod + * Google Author(s): Behdad Esfahbod + */ + +#ifndef HB_OT_LAYOUT_COMMON_PRIVATE_HH +#define HB_OT_LAYOUT_COMMON_PRIVATE_HH + +#include "hb-ot-layout-private.hh" +#include "hb-open-type-private.hh" +#include "hb-set-private.hh" + + +#ifndef HB_MAX_NESTING_LEVEL +#define HB_MAX_NESTING_LEVEL 6 +#endif +#ifndef HB_MAX_CONTEXT_LENGTH +#define HB_MAX_CONTEXT_LENGTH 64 +#endif + + +namespace OT { + + +#define TRACE_DISPATCH(this, format) \ + hb_auto_trace_t trace \ + (&c->debug_depth, c->get_name (), this, HB_FUNC, \ + "format %d", (int) format); + + +#define NOT_COVERED ((unsigned int) -1) + + + +/* + * + * OpenType Layout Common Table Formats + * + */ + + +/* + * Script, ScriptList, LangSys, Feature, FeatureList, Lookup, LookupList + */ + +template +struct Record +{ + inline int cmp (hb_tag_t a) const { + return tag.cmp (a); + } + + struct sanitize_closure_t { + hb_tag_t tag; + const void *list_base; + }; + inline bool sanitize (hb_sanitize_context_t *c, const void *base) const + { + TRACE_SANITIZE (this); + const sanitize_closure_t closure = {tag, base}; + return_trace (c->check_struct (this) && offset.sanitize (c, base, &closure)); + } + + Tag tag; /* 4-byte Tag identifier */ + OffsetTo + offset; /* Offset from beginning of object holding + * the Record */ + public: + DEFINE_SIZE_STATIC (6); +}; + +template +struct RecordArrayOf : SortedArrayOf > { + inline const Tag& get_tag (unsigned int i) const + { + /* We cheat slightly and don't define separate Null objects + * for Record types. Instead, we return the correct Null(Tag) + * here. */ + if (unlikely (i >= this->len)) return Null(Tag); + return (*this)[i].tag; + } + inline unsigned int get_tags (unsigned int start_offset, + unsigned int *record_count /* IN/OUT */, + hb_tag_t *record_tags /* OUT */) const + { + if (record_count) { + const Record *arr = this->sub_array (start_offset, record_count); + unsigned int count = *record_count; + for (unsigned int i = 0; i < count; i++) + record_tags[i] = arr[i].tag; + } + return this->len; + } + inline bool find_index (hb_tag_t tag, unsigned int *index) const + { + /* If we want to allow non-sorted data, we can lsearch(). */ + int i = this->/*lsearch*/bsearch (tag); + if (i != -1) { + if (index) *index = i; + return true; + } else { + if (index) *index = Index::NOT_FOUND_INDEX; + return false; + } + } +}; + +template +struct RecordListOf : RecordArrayOf +{ + inline const Type& operator [] (unsigned int i) const + { return this+RecordArrayOf::operator [](i).offset; } + + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (RecordArrayOf::sanitize (c, this)); + } +}; + + +struct RangeRecord +{ + inline int cmp (hb_codepoint_t g) const { + return g < start ? -1 : g <= end ? 0 : +1 ; + } + + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this)); + } + + inline bool intersects (const hb_set_t *glyphs) const { + return glyphs->intersects (start, end); + } + + template + inline void add_coverage (set_t *glyphs) const { + glyphs->add_range (start, end); + } + + GlyphID start; /* First GlyphID in the range */ + GlyphID end; /* Last GlyphID in the range */ + USHORT value; /* Value */ + public: + DEFINE_SIZE_STATIC (6); +}; +DEFINE_NULL_DATA (RangeRecord, "\000\001"); + + +struct IndexArray : ArrayOf +{ + inline unsigned int get_indexes (unsigned int start_offset, + unsigned int *_count /* IN/OUT */, + unsigned int *_indexes /* OUT */) const + { + if (_count) { + const USHORT *arr = this->sub_array (start_offset, _count); + unsigned int count = *_count; + for (unsigned int i = 0; i < count; i++) + _indexes[i] = arr[i]; + } + return this->len; + } +}; + + +struct Script; +struct LangSys; +struct Feature; + + +struct LangSys +{ + inline unsigned int get_feature_count (void) const + { return featureIndex.len; } + inline hb_tag_t get_feature_index (unsigned int i) const + { return featureIndex[i]; } + inline unsigned int get_feature_indexes (unsigned int start_offset, + unsigned int *feature_count /* IN/OUT */, + unsigned int *feature_indexes /* OUT */) const + { return featureIndex.get_indexes (start_offset, feature_count, feature_indexes); } + + inline bool has_required_feature (void) const { return reqFeatureIndex != 0xFFFFu; } + inline unsigned int get_required_feature_index (void) const + { + if (reqFeatureIndex == 0xFFFFu) + return Index::NOT_FOUND_INDEX; + return reqFeatureIndex;; + } + + inline bool sanitize (hb_sanitize_context_t *c, + const Record::sanitize_closure_t * = NULL) const + { + TRACE_SANITIZE (this); + return_trace (c->check_struct (this) && featureIndex.sanitize (c)); + } + + Offset<> lookupOrderZ; /* = Null (reserved for an offset to a + * reordering table) */ + USHORT reqFeatureIndex;/* Index of a feature required for this + * language system--if no required features + * = 0xFFFFu */ + IndexArray featureIndex; /* Array of indices into the FeatureList */ + public: + DEFINE_SIZE_ARRAY (6, featureIndex); +}; +DEFINE_NULL_DATA (LangSys, "\0\0\xFF\xFF"); + + +struct Script +{ + inline unsigned int get_lang_sys_count (void) const + { return langSys.len; } + inline const Tag& get_lang_sys_tag (unsigned int i) const + { return langSys.get_tag (i); } + inline unsigned int get_lang_sys_tags (unsigned int start_offset, + unsigned int *lang_sys_count /* IN/OUT */, + hb_tag_t *lang_sys_tags /* OUT */) const + { return langSys.get_tags (start_offset, lang_sys_count, lang_sys_tags); } + inline const LangSys& get_lang_sys (unsigned int i) const + { + if (i == Index::NOT_FOUND_INDEX) return get_default_lang_sys (); + return this+langSys[i].offset; + } + inline bool find_lang_sys_index (hb_tag_t tag, unsigned int *index) const + { return langSys.find_index (tag, index); } + + inline bool has_default_lang_sys (void) const { return defaultLangSys != 0; } + inline const LangSys& get_default_lang_sys (void) const { return this+defaultLangSys; } + + inline bool sanitize (hb_sanitize_context_t *c, + const Record