diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-02-12 23:56:45 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-02-12 23:56:45 +0000 |
commit | b90dc59a1171567878be291e46e4b2dcc9f3e72a (patch) | |
tree | 1ab66691676db14c137e53f257696690775aacd6 /Build/source/libs/freetype2/freetype-src/src/autofit/afblue.h | |
parent | 683b449a0eecd29a5ea0927bf48b769c1b2f369b (diff) |
freetype2 2.6.3
git-svn-id: svn://tug.org/texlive/trunk@39697 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/freetype2/freetype-src/src/autofit/afblue.h')
-rw-r--r-- | Build/source/libs/freetype2/freetype-src/src/autofit/afblue.h | 217 |
1 files changed, 121 insertions, 96 deletions
diff --git a/Build/source/libs/freetype2/freetype-src/src/autofit/afblue.h b/Build/source/libs/freetype2/freetype-src/src/autofit/afblue.h index c26a9c792b0..75cd6c3fa0c 100644 --- a/Build/source/libs/freetype2/freetype-src/src/autofit/afblue.h +++ b/Build/source/libs/freetype2/freetype-src/src/autofit/afblue.h @@ -7,7 +7,7 @@ /* */ /* Auto-fitter data for blue strings (specification). */ /* */ -/* Copyright 2013-2015 by */ +/* Copyright 2013-2016 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -19,8 +19,8 @@ /***************************************************************************/ -#ifndef __AFBLUE_H__ -#define __AFBLUE_H__ +#ifndef AFBLUE_H_ +#define AFBLUE_H_ FT_BEGIN_HEADER @@ -28,32 +28,35 @@ FT_BEGIN_HEADER /* an auxiliary macro to decode a UTF-8 character -- since we only use */ /* hard-coded, self-converted data, no error checking is performed */ -#define GET_UTF8_CHAR( ch, p ) \ - ch = (unsigned char)*p++; \ - if ( ch >= 0x80 ) \ - { \ - FT_UInt len; \ - \ - \ - if ( ch < 0xE0 ) \ - { \ - len = 1; \ - ch &= 0x1F; \ - } \ - else if ( ch < 0xF0 ) \ - { \ - len = 2; \ - ch &= 0x0F; \ - } \ - else \ - { \ - len = 3; \ - ch &= 0x07; \ - } \ - \ - for ( ; len > 0; len-- ) \ - ch = ( ch << 6 ) | ( *p++ & 0x3F ); \ - } +#define GET_UTF8_CHAR( ch, p ) \ + do \ + { \ + ch = (unsigned char)*p++; \ + if ( ch >= 0x80 ) \ + { \ + FT_UInt len_; \ + \ + \ + if ( ch < 0xE0 ) \ + { \ + len_ = 1; \ + ch &= 0x1F; \ + } \ + else if ( ch < 0xF0 ) \ + { \ + len_ = 2; \ + ch &= 0x0F; \ + } \ + else \ + { \ + len_ = 3; \ + ch &= 0x07; \ + } \ + \ + for ( ; len_ > 0; len_-- ) \ + ch = ( ch << 6 ) | ( *p++ & 0x3F ); \ + } \ + } while ( 0 ) /*************************************************************************/ @@ -75,62 +78,78 @@ FT_BEGIN_HEADER typedef enum AF_Blue_String_ { AF_BLUE_STRING_ARABIC_TOP = 0, - AF_BLUE_STRING_ARABIC_BOTTOM = 13, - AF_BLUE_STRING_ARABIC_JOIN = 24, - AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP = 27, - AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM = 44, - AF_BLUE_STRING_CYRILLIC_SMALL = 61, - AF_BLUE_STRING_CYRILLIC_SMALL_DESCENDER = 78, - AF_BLUE_STRING_DEVANAGARI_BASE = 85, - AF_BLUE_STRING_DEVANAGARI_TOP = 110, - AF_BLUE_STRING_DEVANAGARI_HEAD = 135, - AF_BLUE_STRING_DEVANAGARI_BOTTOM = 160, - AF_BLUE_STRING_GREEK_CAPITAL_TOP = 167, - AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM = 182, - AF_BLUE_STRING_GREEK_SMALL_BETA_TOP = 195, - AF_BLUE_STRING_GREEK_SMALL = 208, - AF_BLUE_STRING_GREEK_SMALL_DESCENDER = 225, - AF_BLUE_STRING_HEBREW_TOP = 242, - AF_BLUE_STRING_HEBREW_BOTTOM = 259, - AF_BLUE_STRING_HEBREW_DESCENDER = 272, - AF_BLUE_STRING_LAO_TOP = 283, - AF_BLUE_STRING_LAO_BOTTOM = 308, - AF_BLUE_STRING_LAO_ASCENDER = 333, - AF_BLUE_STRING_LAO_LARGE_ASCENDER = 346, - AF_BLUE_STRING_LAO_DESCENDER = 356, - AF_BLUE_STRING_LATIN_CAPITAL_TOP = 375, - AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM = 384, - AF_BLUE_STRING_LATIN_SMALL_F_TOP = 393, - AF_BLUE_STRING_LATIN_SMALL = 401, - AF_BLUE_STRING_LATIN_SMALL_DESCENDER = 409, - AF_BLUE_STRING_LATIN_SUBS_CAPITAL_TOP = 415, - AF_BLUE_STRING_LATIN_SUBS_CAPITAL_BOTTOM = 431, - AF_BLUE_STRING_LATIN_SUBS_SMALL_F_TOP = 447, - AF_BLUE_STRING_LATIN_SUBS_SMALL = 463, - AF_BLUE_STRING_LATIN_SUBS_SMALL_DESCENDER = 491, - AF_BLUE_STRING_LATIN_SUPS_CAPITAL_TOP = 507, - AF_BLUE_STRING_LATIN_SUPS_CAPITAL_BOTTOM = 531, - AF_BLUE_STRING_LATIN_SUPS_SMALL_F_TOP = 553, - AF_BLUE_STRING_LATIN_SUPS_SMALL = 573, - AF_BLUE_STRING_LATIN_SUPS_SMALL_DESCENDER = 592, - AF_BLUE_STRING_TELUGU_TOP = 601, - AF_BLUE_STRING_TELUGU_BOTTOM = 623, - AF_BLUE_STRING_THAI_TOP = 645, - AF_BLUE_STRING_THAI_BOTTOM = 664, - AF_BLUE_STRING_THAI_ASCENDER = 686, - AF_BLUE_STRING_THAI_LARGE_ASCENDER = 696, - AF_BLUE_STRING_THAI_DESCENDER = 706, - AF_BLUE_STRING_THAI_LARGE_DESCENDER = 719, - AF_BLUE_STRING_THAI_DIGIT_TOP = 726, - af_blue_1_1 = 735, + AF_BLUE_STRING_ARABIC_BOTTOM = 18, + AF_BLUE_STRING_ARABIC_JOIN = 33, + AF_BLUE_STRING_BENGALI_BASE = 36, + AF_BLUE_STRING_BENGALI_TOP = 68, + AF_BLUE_STRING_BENGALI_HEAD = 96, + AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP = 128, + AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM = 152, + AF_BLUE_STRING_CYRILLIC_SMALL = 176, + AF_BLUE_STRING_CYRILLIC_SMALL_DESCENDER = 200, + AF_BLUE_STRING_DEVANAGARI_BASE = 209, + AF_BLUE_STRING_DEVANAGARI_TOP = 241, + AF_BLUE_STRING_DEVANAGARI_HEAD = 273, + AF_BLUE_STRING_DEVANAGARI_BOTTOM = 305, + AF_BLUE_STRING_GREEK_CAPITAL_TOP = 313, + AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM = 334, + AF_BLUE_STRING_GREEK_SMALL_BETA_TOP = 352, + AF_BLUE_STRING_GREEK_SMALL = 370, + AF_BLUE_STRING_GREEK_SMALL_DESCENDER = 394, + AF_BLUE_STRING_HEBREW_TOP = 418, + AF_BLUE_STRING_HEBREW_BOTTOM = 442, + AF_BLUE_STRING_HEBREW_DESCENDER = 460, + AF_BLUE_STRING_KANNADA_TOP = 475, + AF_BLUE_STRING_KANNADA_BOTTOM = 519, + AF_BLUE_STRING_KHMER_TOP = 551, + AF_BLUE_STRING_KHMER_SUBSCRIPT_TOP = 575, + AF_BLUE_STRING_KHMER_BOTTOM = 615, + AF_BLUE_STRING_KHMER_DESCENDER = 647, + AF_BLUE_STRING_KHMER_LARGE_DESCENDER = 681, + AF_BLUE_STRING_KHMER_SYMBOLS_WAXING_TOP = 768, + AF_BLUE_STRING_KHMER_SYMBOLS_WANING_BOTTOM = 776, + AF_BLUE_STRING_LAO_TOP = 784, + AF_BLUE_STRING_LAO_BOTTOM = 816, + AF_BLUE_STRING_LAO_ASCENDER = 848, + AF_BLUE_STRING_LAO_LARGE_ASCENDER = 864, + AF_BLUE_STRING_LAO_DESCENDER = 876, + AF_BLUE_STRING_LATIN_CAPITAL_TOP = 900, + AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM = 916, + AF_BLUE_STRING_LATIN_SMALL_F_TOP = 932, + AF_BLUE_STRING_LATIN_SMALL = 946, + AF_BLUE_STRING_LATIN_SMALL_DESCENDER = 960, + AF_BLUE_STRING_LATIN_SUBS_CAPITAL_TOP = 970, + AF_BLUE_STRING_LATIN_SUBS_CAPITAL_BOTTOM = 990, + AF_BLUE_STRING_LATIN_SUBS_SMALL_F_TOP = 1010, + AF_BLUE_STRING_LATIN_SUBS_SMALL = 1030, + AF_BLUE_STRING_LATIN_SUBS_SMALL_DESCENDER = 1066, + AF_BLUE_STRING_LATIN_SUPS_CAPITAL_TOP = 1086, + AF_BLUE_STRING_LATIN_SUPS_CAPITAL_BOTTOM = 1117, + AF_BLUE_STRING_LATIN_SUPS_SMALL_F_TOP = 1146, + AF_BLUE_STRING_LATIN_SUPS_SMALL = 1172, + AF_BLUE_STRING_LATIN_SUPS_SMALL_DESCENDER = 1197, + AF_BLUE_STRING_MYANMAR_TOP = 1208, + AF_BLUE_STRING_MYANMAR_BOTTOM = 1240, + AF_BLUE_STRING_MYANMAR_ASCENDER = 1272, + AF_BLUE_STRING_MYANMAR_DESCENDER = 1300, + AF_BLUE_STRING_TELUGU_TOP = 1332, + AF_BLUE_STRING_TELUGU_BOTTOM = 1360, + AF_BLUE_STRING_THAI_TOP = 1388, + AF_BLUE_STRING_THAI_BOTTOM = 1412, + AF_BLUE_STRING_THAI_ASCENDER = 1440, + AF_BLUE_STRING_THAI_LARGE_ASCENDER = 1452, + AF_BLUE_STRING_THAI_DESCENDER = 1464, + AF_BLUE_STRING_THAI_LARGE_DESCENDER = 1480, + AF_BLUE_STRING_THAI_DIGIT_TOP = 1488, + af_blue_1_1 = 1499, #ifdef AF_CONFIG_OPTION_CJK AF_BLUE_STRING_CJK_TOP = af_blue_1_1 + 1, - AF_BLUE_STRING_CJK_BOTTOM = af_blue_1_1 + 153, - af_blue_1_1_1 = af_blue_1_1 + 304, + AF_BLUE_STRING_CJK_BOTTOM = af_blue_1_1 + 203, + af_blue_1_1_1 = af_blue_1_1 + 404, #ifdef AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT AF_BLUE_STRING_CJK_LEFT = af_blue_1_1_1 + 1, - AF_BLUE_STRING_CJK_RIGHT = af_blue_1_1_1 + 153, - af_blue_1_1_2 = af_blue_1_1_1 + 304, + AF_BLUE_STRING_CJK_RIGHT = af_blue_1_1_1 + 204, + af_blue_1_1_2 = af_blue_1_1_1 + 405, #else af_blue_1_1_2 = af_blue_1_1_1 + 0, #endif /* AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT */ @@ -164,9 +183,10 @@ FT_BEGIN_HEADER /* blue string can't be used in more than a single writing system, which */ /* is a safe bet. */ #define AF_BLUE_PROPERTY_LATIN_TOP ( 1U << 0 ) /* must have value 1 */ -#define AF_BLUE_PROPERTY_LATIN_NEUTRAL ( 1U << 1 ) -#define AF_BLUE_PROPERTY_LATIN_X_HEIGHT ( 1U << 2 ) -#define AF_BLUE_PROPERTY_LATIN_LONG ( 1U << 3 ) +#define AF_BLUE_PROPERTY_LATIN_SUB_TOP ( 1U << 1 ) +#define AF_BLUE_PROPERTY_LATIN_NEUTRAL ( 1U << 2 ) +#define AF_BLUE_PROPERTY_LATIN_X_HEIGHT ( 1U << 3 ) +#define AF_BLUE_PROPERTY_LATIN_LONG ( 1U << 4 ) #define AF_BLUE_PROPERTY_CJK_TOP ( 1U << 0 ) /* must have value 1 */ #define AF_BLUE_PROPERTY_CJK_HORIZ ( 1U << 1 ) /* must have value 2 */ @@ -181,17 +201,22 @@ FT_BEGIN_HEADER typedef enum AF_Blue_Stringset_ { AF_BLUE_STRINGSET_ARAB = 0, - AF_BLUE_STRINGSET_CYRL = 4, - AF_BLUE_STRINGSET_DEVA = 10, - AF_BLUE_STRINGSET_GREK = 16, - AF_BLUE_STRINGSET_HEBR = 23, - AF_BLUE_STRINGSET_LAO = 27, - AF_BLUE_STRINGSET_LATN = 33, - AF_BLUE_STRINGSET_LATB = 40, - AF_BLUE_STRINGSET_LATP = 47, - AF_BLUE_STRINGSET_TELU = 54, - AF_BLUE_STRINGSET_THAI = 57, - af_blue_2_1 = 65, + AF_BLUE_STRINGSET_BENG = 4, + AF_BLUE_STRINGSET_CYRL = 9, + AF_BLUE_STRINGSET_DEVA = 15, + AF_BLUE_STRINGSET_GREK = 21, + AF_BLUE_STRINGSET_HEBR = 28, + AF_BLUE_STRINGSET_KNDA = 32, + AF_BLUE_STRINGSET_KHMR = 35, + AF_BLUE_STRINGSET_KHMS = 41, + AF_BLUE_STRINGSET_LAO = 44, + AF_BLUE_STRINGSET_LATN = 50, + AF_BLUE_STRINGSET_LATB = 57, + AF_BLUE_STRINGSET_LATP = 64, + AF_BLUE_STRINGSET_MYMR = 71, + AF_BLUE_STRINGSET_TELU = 76, + AF_BLUE_STRINGSET_THAI = 79, + af_blue_2_1 = 87, #ifdef AF_CONFIG_OPTION_CJK AF_BLUE_STRINGSET_HANI = af_blue_2_1 + 0, af_blue_2_1_1 = af_blue_2_1 + 2, @@ -227,7 +252,7 @@ FT_BEGIN_HEADER FT_END_HEADER -#endif /* __AFBLUE_H__ */ +#endif /* AFBLUE_H_ */ /* END */ |