From c8d77ba88d2eff25dae6a20e9d56030e721391a6 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Wed, 9 Aug 2017 04:35:32 +0000 Subject: harfbuzz-1.4.8 git-svn-id: svn://tug.org/texlive/trunk@44996 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/harfbuzz/ChangeLog | 5 ++ Build/source/libs/harfbuzz/TLpatches/ChangeLog | 5 ++ Build/source/libs/harfbuzz/TLpatches/TL-Changes | 2 +- Build/source/libs/harfbuzz/configure | 24 +++---- Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog | 76 ++++++++++++++++++++++ Build/source/libs/harfbuzz/harfbuzz-src/NEWS | 9 +++ .../source/libs/harfbuzz/harfbuzz-src/configure.ac | 2 +- .../libs/harfbuzz/harfbuzz-src/src/check-defs.sh | 2 +- .../harfbuzz/harfbuzz-src/src/check-symbols.sh | 2 +- .../harfbuzz-src/src/hb-ot-shape-complex-indic.cc | 2 +- .../harfbuzz-src/src/hb-ot-var-avar-table.hh | 13 ++-- Build/source/libs/harfbuzz/version.ac | 2 +- 12 files changed, 122 insertions(+), 22 deletions(-) (limited to 'Build/source/libs/harfbuzz') diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog index c5cb19cc544..65453f93b2a 100644 --- a/Build/source/libs/harfbuzz/ChangeLog +++ b/Build/source/libs/harfbuzz/ChangeLog @@ -1,3 +1,8 @@ +2017-08-09 Akira Kakuto + + Import harfbuzz-1.4.8. + * version.ac: Adjusted. + 2017-07-18 Akira Kakuto Import harfbuzz-1.4.7. diff --git a/Build/source/libs/harfbuzz/TLpatches/ChangeLog b/Build/source/libs/harfbuzz/TLpatches/ChangeLog index 0112f1bba98..377f042c3ff 100644 --- a/Build/source/libs/harfbuzz/TLpatches/ChangeLog +++ b/Build/source/libs/harfbuzz/TLpatches/ChangeLog @@ -1,3 +1,8 @@ +2017-08-09 Akira Kakuto + + Imported harfbuzz-1.4.8 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + 2017-07-18 Akira Kakuto Imported harfbuzz-1.4.7 source tree from: diff --git a/Build/source/libs/harfbuzz/TLpatches/TL-Changes b/Build/source/libs/harfbuzz/TLpatches/TL-Changes index 258404a9af8..059b4ef792c 100644 --- a/Build/source/libs/harfbuzz/TLpatches/TL-Changes +++ b/Build/source/libs/harfbuzz/TLpatches/TL-Changes @@ -1,4 +1,4 @@ -Changes applied to the harfbuzz-1.4.7/ tree as obtained from: +Changes applied to the harfbuzz-1.4.8/ tree as obtained from: http://www.freedesktop.org/software/harfbuzz/release/ Removed: diff --git a/Build/source/libs/harfbuzz/configure b/Build/source/libs/harfbuzz/configure index 203e0aa5e6f..a0000508686 100755 --- a/Build/source/libs/harfbuzz/configure +++ b/Build/source/libs/harfbuzz/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for harfbuzz (TeX Live) 1.4.7. +# Generated by GNU Autoconf 2.69 for harfbuzz (TeX Live) 1.4.8. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='harfbuzz (TeX Live)' PACKAGE_TARNAME='harfbuzz--tex-live-' -PACKAGE_VERSION='1.4.7' -PACKAGE_STRING='harfbuzz (TeX Live) 1.4.7' +PACKAGE_VERSION='1.4.8' +PACKAGE_STRING='harfbuzz (TeX Live) 1.4.8' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -1312,7 +1312,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures harfbuzz (TeX Live) 1.4.7 to adapt to many kinds of systems. +\`configure' configures harfbuzz (TeX Live) 1.4.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1383,7 +1383,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of harfbuzz (TeX Live) 1.4.7:";; + short | recursive ) echo "Configuration of harfbuzz (TeX Live) 1.4.8:";; esac cat <<\_ACEOF @@ -1490,7 +1490,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -harfbuzz (TeX Live) configure 1.4.7 +harfbuzz (TeX Live) configure 1.4.8 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2080,7 +2080,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by harfbuzz (TeX Live) $as_me 1.4.7, which was +It was created by harfbuzz (TeX Live) $as_me 1.4.8, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4003,7 +4003,7 @@ fi # Define the identity of the package. PACKAGE='harfbuzz--tex-live-' - VERSION='1.4.7' + VERSION='1.4.8' cat >>confdefs.h <<_ACEOF @@ -4206,8 +4206,8 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags HB_VERSION_MAJOR=1 HB_VERSION_MINOR=4 -HB_VERSION_MICRO=7 -HB_VERSION=1.4.7 +HB_VERSION_MICRO=8 +HB_VERSION=1.4.8 ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -6866,7 +6866,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by harfbuzz (TeX Live) $as_me 1.4.7, which was +This file was extended by harfbuzz (TeX Live) $as_me 1.4.8, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6932,7 +6932,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -harfbuzz (TeX Live) config.status 1.4.7 +harfbuzz (TeX Live) config.status 1.4.8 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog index 90dde27e882..3ed9d7fef70 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog +++ b/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog @@ -1,3 +1,79 @@ +commit 5dc30451b80f6bb0079424a130875c10486e4d34 +Author: Behdad Esfahbod +Date: Mon Aug 7 21:37:07 2017 -0700 + + Two fixes to avar mapping + + 1. Handle segment with two entries correctly, + + 2. Fix rounding math. Ouch! + + Fixes https://github.com/behdad/harfbuzz/issues/521 + + src/hb-ot-var-avar-table.hh | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +commit dc2c418e397bf251faf03d824fc780ac19bb1dee +Author: Behdad Esfahbod +Date: Thu Aug 3 12:34:15 2017 +0100 + + [check-defs/symbols.sh] Drop empty-symbol lines + + Fixes https://github.com/behdad/harfbuzz/issues/510 + + src/check-defs.sh | 2 +- + src/check-symbols.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 6f38845d9c6852812eb1963a1fd7e5ec771e5ce3 +Author: Behdad Esfahbod +Date: Wed Jul 19 17:20:55 2017 -0700 + + [hb-shape] Rename --show-messages to --trace + + https://github.com/behdad/harfbuzz/issues/506 + + util/hb-shape.cc | 2 +- + util/options.cc | 2 +- + util/options.hh | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit e60350551addbd945491f662e98464c9e3e9fec5 +Author: Behdad Esfahbod +Date: Tue Jul 18 19:14:19 2017 -0700 + + [hb-shape] Improve shaping-debug output + + Before, that was printed using --debug (and in both hb-shape and + hb-view). + Changed it, now hb-shape has a new command-line argument called + --show-messages. + When invoked, it also respects other output formatting options. + The messages + are better formatted and printed to te same place that hb-shape + output is + directed to. Previously they were written to stderr. + + Fixes https://github.com/behdad/harfbuzz/issues/506 + + util/hb-ot-shape-closure.cc | 10 +++++++--- + util/hb-shape.cc | 33 +++++++++++++++++++++++++++++++-- + util/main-font-text.hh | 27 ++++----------------------- + util/options.cc | 10 +++++++--- + util/options.hh | 2 ++ + util/shape-consumer.hh | 18 ++++++++++++------ + util/view-cairo.hh | 4 ++-- + 7 files changed, 65 insertions(+), 39 deletions(-) + +commit 65f64d14005e4d0808e818b3c97bd3d600628011 +Author: Ebrahim Byagowi +Date: Wed Jul 19 02:42:53 2017 +0430 + + Unbreak arm-none-eabi build again (#514) + + src/hb-ot-shape-complex-indic.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit fc15e60eadfc89aca5b8815262b8ee888f285169 Author: Behdad Esfahbod Date: Tue Jul 18 11:24:42 2017 -0700 diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/NEWS b/Build/source/libs/harfbuzz/harfbuzz-src/NEWS index 5cbfacf23f9..b058bad3cf5 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/NEWS +++ b/Build/source/libs/harfbuzz/harfbuzz-src/NEWS @@ -1,3 +1,12 @@ +Overview of changes leading to 1.4.8 +Tuesday, August 8, 2017 +==================================== + +- Major fix to avar table handling. +- Rename hb-shape --show-message to --trace. +- Build fixes. + + Overview of changes leading to 1.4.7 Tuesday, July 18, 2017 ==================================== diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac b/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac index ec9e2986968..52134c87794 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac +++ b/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.64]) AC_INIT([HarfBuzz], - [1.4.7], + [1.4.8], [https://github.com/behdad/harfbuzz/issues/new], [harfbuzz], [http://harfbuzz.org/]) diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/check-defs.sh b/Build/source/libs/harfbuzz/harfbuzz-src/src/check-defs.sh index 65a24670e48..480d49992ff 100755 --- a/Build/source/libs/harfbuzz/harfbuzz-src/src/check-defs.sh +++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/check-defs.sh @@ -21,7 +21,7 @@ for def in $defs; do lib=`echo "$def" | sed 's/[.]def$//;s@.*/@@'` so=.libs/lib${lib}.so - EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| _fbss\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>\| __gcov_flush\>\| llvm_' | cut -d' ' -f3`" + EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] .' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| _fbss\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>\| __gcov_flush\>\| llvm_' | cut -d' ' -f3`" if test -f "$so"; then diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/check-symbols.sh b/Build/source/libs/harfbuzz/harfbuzz-src/src/check-symbols.sh index ba09ba1cc5e..d4d655d266e 100755 --- a/Build/source/libs/harfbuzz/harfbuzz-src/src/check-symbols.sh +++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/check-symbols.sh @@ -20,7 +20,7 @@ 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`" + 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/[.].*//'` diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic.cc index 0232b3057a2..02aab082cd3 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-indic.cc @@ -200,7 +200,7 @@ set_indic_properties (hb_glyph_info_t &info) cat = OT_Symbol; ASSERT_STATIC ((int) INDIC_SYLLABIC_CATEGORY_AVAGRAHA == OT_Symbol); } - else if (unlikely (hb_in_range (u, 0x17CDu, 0x17D1u) || + else if (unlikely (hb_in_range (u, 0x17CDu, 0x17D1u) || u == 0x17CBu || u == 0x17D3u || u == 0x17DDu)) /* Khmer Various signs */ { /* These can occur mid-syllable (eg. before matras), even though Unicode marks them as Syllable_Modifier. diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-var-avar-table.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-var-avar-table.hh index ace0f5f285a..464cf35bbd4 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-var-avar-table.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-var-avar-table.hh @@ -57,8 +57,13 @@ struct SegmentMaps : ArrayOf * that at least -1, 0, and +1 must be mapped. But we include these as * part of a better error recovery scheme. */ - if (!len) - return value; + if (len < 2) + { + if (!len) + return value; + else /* len == 1*/ + return value - array[0].fromCoord + array[0].toCoord; + } if (value <= array[0].fromCoord) return value - array[0].fromCoord + array[0].toCoord; @@ -76,8 +81,8 @@ struct SegmentMaps : ArrayOf int denom = array[i].fromCoord - array[i-1].fromCoord; return array[i-1].toCoord + - (array[i].toCoord - array[i-1].toCoord) * - (value - array[i-1].fromCoord + denom/2) / denom; + ((array[i].toCoord - array[i-1].toCoord) * + (value - array[i-1].fromCoord) + denom/2) / denom; } DEFINE_SIZE_ARRAY (2, array); diff --git a/Build/source/libs/harfbuzz/version.ac b/Build/source/libs/harfbuzz/version.ac index 92216186c97..75fb1a7cf0d 100644 --- a/Build/source/libs/harfbuzz/version.ac +++ b/Build/source/libs/harfbuzz/version.ac @@ -8,4 +8,4 @@ dnl dnl -------------------------------------------------------- dnl dnl m4-include this file to define the current harfbuzz version -m4_define([harfbuzz_version], [1.4.7]) +m4_define([harfbuzz_version], [1.4.8]) -- cgit v1.2.3