summaryrefslogtreecommitdiff
path: root/Build/source/libs/harfbuzz/harfbuzz-src
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2017-01-06 05:18:37 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2017-01-06 05:18:37 +0000
commit64caca9c0701991751d651c4c31f8dff6d97f449 (patch)
tree8067dae3900b2f4c6e62bb73c7369e87c83933e8 /Build/source/libs/harfbuzz/harfbuzz-src
parent18c40a6c8865e922a9ef0277a06d1cde8e7caaad (diff)
harfbuzz 1.4.1
git-svn-id: svn://tug.org/texlive/trunk@42879 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/harfbuzz/harfbuzz-src')
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog39
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/NEWS10
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/configure.ac14
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-unicode.cc6
4 files changed, 61 insertions, 8 deletions
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog
index 1e7f04a098c..787b06eeec6 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog
@@ -1,3 +1,42 @@
+commit 31f7b1bb94c2cef7ce58df52ddd1b09b42e8f596
+Author: Behdad Esfahbod <behdad@behdad.org>
+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 <behdad@behdad.org>
+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 <behdad@behdad.org>
+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 <fred.wang@free.fr>
Date: Tue Jan 3 05:55:09 2017 +0100
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/NEWS b/Build/source/libs/harfbuzz/harfbuzz-src/NEWS
index 6f733af2551..8c3ef117dd7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/NEWS
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/NEWS
@@ -1,3 +1,13 @@
+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
====================================
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac b/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac
index 78869a99ecc..32dcf18ed28 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.0],
+ [1.4.1],
[https://github.com/behdad/harfbuzz/issues/new],
[harfbuzz],
[http://harfbuzz.org/])
@@ -289,9 +289,13 @@ AM_CONDITIONAL(HAVE_ICU_BUILTIN, $have_icu && test "x$with_icu" = "xbuiltin")
dnl ===========================================================================
-have_ucdn=true
-if $have_glib || test \( $have_icu -a "x$with_icu" = "xbuiltin" \); then
- have_ucdn=false
+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])
@@ -501,9 +505,9 @@ AC_MSG_NOTICE([
Build configuration:
Unicode callbacks (you want at least one):
+ Builtin (UCDN): ${have_ucdn}
Glib: ${have_glib}
ICU: ${have_icu}
- UCDN: ${have_ucdn}
Font callbacks (the more the better):
FreeType: ${have_freetype}
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-unicode.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-unicode.cc
index 487d10b9395..d553a7172f0 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-unicode.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-unicode.cc
@@ -131,12 +131,12 @@ hb_unicode_funcs_get_default (void)
#define HB_UNICODE_FUNCS_IMPLEMENT(set) \
return hb_##set##_get_unicode_funcs ();
-#ifdef HAVE_GLIB
+#if defined(HAVE_UCDN)
+ HB_UNICODE_FUNCS_IMPLEMENT(ucdn)
+#elif defined(HAVE_GLIB)
HB_UNICODE_FUNCS_IMPLEMENT(glib)
#elif defined(HAVE_ICU) && defined(HAVE_ICU_BUILTIN)
HB_UNICODE_FUNCS_IMPLEMENT(icu)
-#elif defined(HAVE_UCDN)
- HB_UNICODE_FUNCS_IMPLEMENT(ucdn)
#else
#define HB_UNICODE_FUNCS_NIL 1
HB_UNICODE_FUNCS_IMPLEMENT(nil)