From bf8f100d2c46ccc04ed8cea8668d88c0f6c37317 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Tue, 5 Apr 2016 11:43:58 +0200 Subject: [PATCH] [autofit] Provide dummy blue zone for pseudo script `none'. Even if the dummy hinter is used as the handler for `none' (which doesn't use blue zones), it is more consistent than the old value (which was 0), pointing to Arabic... * src/autofit/afblue.dat: Add `AF_BLUE_STRINGSET_NONE'. * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. * src/autofit/afstyles.h (none_dflt): Use AF_BLUE_STRINGSET_NONE. --- ChangeLog | 13 +++++++++++++ src/autofit/afblue.c | 1 + src/autofit/afblue.dat | 3 +++ src/autofit/afblue.h | 11 ++++++----- src/autofit/afstyles.h | 2 +- 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index b1a1bd44b..fce0de48f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2016-04-05 Werner Lemberg + + [autofit] Provide dummy blue zone for pseudo script `none'. + + Even if the dummy hinter is used as the handler for `none' (which + doesn't use blue zones), it is more consistent than the old value + (which was 0), pointing to Arabic... + + * src/autofit/afblue.dat: Add `AF_BLUE_STRINGSET_NONE'. + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afstyles.h (none_dflt): Use AF_BLUE_STRINGSET_NONE. + 2016-03-30 Werner Lemberg * src/pfr/pfrload.c (pfr_aux_name_load): Thinko (#47567). diff --git a/src/autofit/afblue.c b/src/autofit/afblue.c index 55704ea4c..13677cc95 100644 --- a/src/autofit/afblue.c +++ b/src/autofit/afblue.c @@ -310,6 +310,7 @@ { AF_BLUE_STRING_MYANMAR_ASCENDER, AF_BLUE_PROPERTY_LATIN_TOP }, { AF_BLUE_STRING_MYANMAR_DESCENDER, 0 }, { AF_BLUE_STRING_MAX, 0 }, + { AF_BLUE_STRING_MAX, 0 }, { AF_BLUE_STRING_SINHALA_TOP, AF_BLUE_PROPERTY_LATIN_TOP }, { AF_BLUE_STRING_SINHALA_BOTTOM, 0 }, { AF_BLUE_STRING_SINHALA_DESCENDER, 0 }, diff --git a/src/autofit/afblue.dat b/src/autofit/afblue.dat index 9ef2f7906..b31523350 100644 --- a/src/autofit/afblue.dat +++ b/src/autofit/afblue.dat @@ -534,6 +534,9 @@ AF_BLUE_STRINGSET_ENUM AF_BLUE_STRINGSETS_ARRAY AF_BLUE_STRINGSET_MAX_LEN: { AF_BLUE_STRING_MYANMAR_DESCENDER, 0 } { AF_BLUE_STRING_MAX, 0 } + AF_BLUE_STRINGSET_NONE + { AF_BLUE_STRING_MAX, 0 } + AF_BLUE_STRINGSET_SINH { AF_BLUE_STRING_SINHALA_TOP, AF_BLUE_PROPERTY_LATIN_TOP } { AF_BLUE_STRING_SINHALA_BOTTOM, 0 } diff --git a/src/autofit/afblue.h b/src/autofit/afblue.h index 832b6859b..274f8cb46 100644 --- a/src/autofit/afblue.h +++ b/src/autofit/afblue.h @@ -222,11 +222,12 @@ FT_BEGIN_HEADER AF_BLUE_STRINGSET_LATP = 64, AF_BLUE_STRINGSET_MLYM = 71, AF_BLUE_STRINGSET_MYMR = 74, - AF_BLUE_STRINGSET_SINH = 79, - AF_BLUE_STRINGSET_TAML = 83, - AF_BLUE_STRINGSET_TELU = 86, - AF_BLUE_STRINGSET_THAI = 89, - af_blue_2_1 = 97, + AF_BLUE_STRINGSET_NONE = 79, + AF_BLUE_STRINGSET_SINH = 80, + AF_BLUE_STRINGSET_TAML = 84, + AF_BLUE_STRINGSET_TELU = 87, + AF_BLUE_STRINGSET_THAI = 90, + af_blue_2_1 = 98, #ifdef AF_CONFIG_OPTION_CJK AF_BLUE_STRINGSET_HANI = af_blue_2_1 + 0, af_blue_2_1_1 = af_blue_2_1 + 2, diff --git a/src/autofit/afstyles.h b/src/autofit/afstyles.h index 9134aef2d..d8d26fd34 100644 --- a/src/autofit/afstyles.h +++ b/src/autofit/afstyles.h @@ -186,7 +186,7 @@ "no style", AF_WRITING_SYSTEM_DUMMY, AF_SCRIPT_NONE, - (AF_Blue_Stringset)0, + AF_BLUE_STRINGSET_NONE, AF_COVERAGE_DEFAULT ) STYLE( sinh_dflt, SINH_DFLT,