Ticket #11518: 0001-Implemented-BFont-Blocks-added-build-feature-for-fon.patch

build/jam/BuildFeatures

@@ -303 +303 @@
     Echo "Freetype support not available on $(TARGET_PACKAGING_ARCH)" ;
 }
 
+# fontconfig
+if [ IsPackageAvailable fontconfig_devel ] {
+    ExtractBuildFeatureArchives fontconfig :
+        file: base fontconfig
+            runtime: lib
+        file: devel fontconfig_devel
+            depends: base
+            library: $(developLibDir)/libfontconfig.so
+            headers: $(developHeadersDir) $(developHeadersDir)/fontconfig
+        ;
+
+    EnableBuildFeatures fontconfig ;
+} else {
+    Echo "fontconfig support not available on $(TARGET_PACKAGING_ARCH)" ;
+}
 
 # Gutenprint
 if [ IsPackageAvailable gutenprint_devel ] {

headers/os/interface/Font.h

@@ -1 +1 @@
 /*
- * Copyright 2005-2015, Haiku, Inc. All rights reserved.
+ * Copyright 2005-2017, Haiku, Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
 #ifndef _FONT_H_
@@ -120 +120 @@
 };
 
 
+struct unicode_block_range {
+    uint32                  start;
+    uint32                  end;
+    const unicode_block&    block;
+
+    uint32 Count() const { return end + 1 - start; }
+};
+
+
 struct edge_info {
     float   left;
     float   right;
@@ -371 +380 @@
 {
     fData[0] = block.fData[0];
     fData[1] = block.fData[1];
+
     return *this;
 }
 

headers/os/interface/UnicodeBlockObjects.h

@@ -1 +1 @@
 /*
- * Copyright 2001-2009, Haiku, Inc. All rights reserved.
+ * Copyright 2001-2017, Haiku, Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
 #ifndef _UNICODEBLOCKOBJECTS_H
@@ -10 +10 @@
 
 
 // Unicode block list with their unicode encoding range
+//
+// Original BeOS-compatible blocks
 const unicode_block B_BASIC_LATIN_BLOCK(                    /* 0000 - 007F          */  0x0000000000000000LL, 0x0000000000000001LL);
 const unicode_block B_LATIN1_SUPPLEMENT_BLOCK(              /* 0080 - 00FF          */  0x0000000000000000LL, 0x0000000000000002LL);
 const unicode_block B_LATIN_EXTENDED_A_BLOCK(               /* 0100 - 017F          */  0x0000000000000000LL, 0x0000000000000004LL);
@@ -82 +84 @@
 const unicode_block B_SPECIALS_BLOCK(                       /* FEFF and FFF0 - FFFF */  0x0000000000000020LL, 0x0000000000000000LL);
 const unicode_block B_TIBETAN_BLOCK(                        /* 0F00 - 0FBF          */  0x0000000000000040LL, 0x0000000000000000LL);
 
+// Haiku additional Unicode blocks
+const unicode_block B_SYRIAC_BLOCK(                         /* 0700 - 074F          */  0LL, 0LL, 1LL <<  8, 0LL);
+const unicode_block B_ARABIC_SUPPLEMENT_BLOCK(              /* 0750 - 077F          */  0LL, 0LL, 1LL <<  9, 0LL);
+const unicode_block B_THAANA_BLOCK(                         /* 0780 - 07BF          */  0LL, 0LL, 1LL << 10, 0LL);
+const unicode_block B_N_KO_BLOCK(                           /* 07C0 - 07FF          */  0LL, 0LL, 1LL << 11, 0LL);
+const unicode_block B_SINHALA_BLOCK(                        /* 0D80 - 0DFF          */  0LL, 0LL, 1LL << 12, 0LL);
+const unicode_block B_MYANMAR_BLOCK(                        /* 1000 - 109F          */  0LL, 0LL, 1LL << 13, 0LL);
+const unicode_block B_ETHIOPIC_BLOCK(                       /* 1200 - 137F          */  0LL, 0LL, 1LL << 14, 0LL);
+const unicode_block B_ETHIOPIC_SUPPLEMENT_BLOCK(            /* 1380 - 139F          */  0LL, 0LL, 1LL << 15, 0LL);
+const unicode_block B_CHEROKEE_BLOCK(                       /* 13A0 - 13FF          */  0LL, 0LL, 1LL << 16, 0LL);
+const unicode_block B_UNIFIED_CANADIAN_ABORIGINAL_BLOCK(    /* 1400 - 167F          */  0LL, 0LL, 1LL << 17, 0LL);
+const unicode_block B_OGHAM_BLOCK(                          /* 1680 - 169F          */  0LL, 0LL, 1LL << 18, 0LL);
+const unicode_block B_RUNIC_BLOCK(                          /* 16A0 - 16FF          */  0LL, 0LL, 1LL << 19, 0LL);
+const unicode_block B_TAGALOG_BLOCK(                        /* 1700 - 171F          */  0LL, 0LL, 1LL << 20, 0LL);
+const unicode_block B_HANUNOO_BLOCK(                        /* 1720 - 173F          */  0LL, 0LL, 1LL << 21, 0LL);
+const unicode_block B_BUHID_BLOCK(                          /* 1740 - 175F          */  0LL, 0LL, 1LL << 22, 0LL);
+const unicode_block B_TAGBANWA_BLOCK(                       /* 1760 - 177F          */  0LL, 0LL, 1LL << 23, 0LL);
+const unicode_block B_KHMER_BLOCK(                          /* 1780 - 17FF          */  0LL, 0LL, 1LL << 24, 0LL);
+const unicode_block B_MONGOLIAN_BLOCK(                      /* 1800 - 18AF          */  0LL, 0LL, 1LL << 25, 0LL);
+const unicode_block B_LIMBU_BLOCK(                          /* 1900 - 194F          */  0LL, 0LL, 1LL << 26, 0LL);
+const unicode_block B_TAI_LE_BLOCK(                         /* 1950 - 197F          */  0LL, 0LL, 1LL << 27, 0LL);
+const unicode_block B_NEW_TAI_LUE_BLOCK(                    /* 1980 - 19DF          */  0LL, 0LL, 1LL << 28, 0LL);
+const unicode_block B_KHMER_SYMBOLS_BLOCK(                  /* 19E0 - 19FF          */  0LL, 0LL, 1LL << 29, 0LL);
+const unicode_block B_BUGINESE_BLOCK(                       /* 1A00 - 1A1F          */  0LL, 0LL, 1LL << 30, 0LL);
+const unicode_block B_BALINESE_BLOCK(                       /* 1B00 - 1B7F          */  0LL, 0LL, 1LL << 31, 0LL);
+const unicode_block B_SUNDANESE_BLOCK(                      /* 1B80 - 1BBF          */  0LL, 0LL, 1LL << 32, 0LL);
+const unicode_block B_LEPCHA_BLOCK(                         /* 1C00 - 1C4F          */  0LL, 0LL, 1LL << 33, 0LL);
+const unicode_block B_OL_CHIKI_BLOCK(                       /* 1C50 - 1C7F          */  0LL, 0LL, 1LL << 34, 0LL);
+const unicode_block B_PHONETIC_EXTENSIONS_BLOCK(            /* 1D00 - 1D7F          */  0LL, 0LL, 1LL << 35, 0LL);
+const unicode_block B_PHONETIC_EXTENSIONS_SUPPLEMENT_BLOCK( /* 1D80 - 1DBF          */  0LL, 0LL, 1LL << 36, 0LL);
+const unicode_block B_COMBINING_MARKS_SUPPLEMENT_BLOCK(     /* 1DC0 - 1DFF          */  0LL, 0LL, 1LL << 37, 0LL);
+const unicode_block B_MISC_MATHEMATICAL_SYMBOLS_A_BLOCK(    /* 27C0 - 27EF          */  0LL, 0LL, 1LL << 38, 0LL);
+const unicode_block B_SUPPLEMENTAL_ARROWS_A_BLOCK(          /* 27F0 - 27FF          */  0LL, 0LL, 1LL << 39, 0LL);
+const unicode_block B_BRAILLE_PATTERNS_BLOCK(               /* 2800 - 28FF          */  0LL, 0LL, 1LL << 40, 0LL);
+const unicode_block B_SUPPLEMENTAL_ARROWS_B_BLOCK(          /* 2900 - 297F          */  0LL, 0LL, 1LL << 41, 0LL);
+const unicode_block B_MISC_MATHEMATICAL_SYMBOLS_B_BLOCK(    /* 2980 - 29FF          */  0LL, 0LL, 1LL << 42, 0LL);
+const unicode_block B_SUPPLEMENTAL_MATH_OPERATORS_BLOCK(    /* 2A00 - 2AFF          */  0LL, 0LL, 1LL << 43, 0LL);
+const unicode_block B_MISC_SYMBOLS_AND_ARROWS_BLOCK(        /* 2B00 - 2BFF          */  0LL, 0LL, 1LL << 44, 0LL);
+const unicode_block B_GLAGOTIC_BLOCK(                       /* 2C00 - 2C5F          */  0LL, 0LL, 1LL << 45, 0LL);
+const unicode_block B_LATIN_EXTENDED_C_BLOCK(               /* 2C60 - 2C7F          */  0LL, 0LL, 1LL << 46, 0LL);
+const unicode_block B_COPTIC_BLOCK(                         /* 2C80 - 2CFF          */  0LL, 0LL, 1LL << 47, 0LL);
+const unicode_block B_GEORGIAN_SUPPLEMENT_BLOCK(            /* 2D00 - 2D2F          */  0LL, 0LL, 1LL << 48, 0LL);
+const unicode_block B_TIFINAGH_BLOCK(                       /* 2D30 - 2D7F          */  0LL, 0LL, 1LL << 49, 0LL);
+const unicode_block B_ETHIOPIC_EXTENDED_BLOCK(              /* 2D80 - 2DDF          */  0LL, 0LL, 1LL << 50, 0LL);
+const unicode_block B_CYRILLIC_EXTENDED_A_BLOCK(            /* 2DE0 - 2DFF          */  0LL, 0LL, 1LL << 51, 0LL);
+const unicode_block B_SUPPLEMENTAL_PUNCTUATION_BLOCK(       /* 2E00 - 2E7F          */  0LL, 0LL, 1LL << 52, 0LL);
+const unicode_block B_CJK_RADICALS_SUPPLEMENT_BLOCK(        /* 2E80 - 2EFF          */  0LL, 0LL, 1LL << 53, 0LL);
+const unicode_block B_KANGXI_RADICALS_BLOCK(                /* 2F00 - 2FDF          */  0LL, 0LL, 1LL << 54, 0LL);
+const unicode_block B_IDEOGRAPHIC_DESCRIPTION_BLOCK(        /* 2FF0 - 2FFF          */  0LL, 0LL, 1LL << 55, 0LL);
+const unicode_block B_BOPOMOFO_EXTENDED_BLOCK(              /* 31A0 - 31BF          */  0LL, 0LL, 1LL << 56, 0LL);
+const unicode_block B_CJK_STROKES_BLOCK(                    /* 31C0 - 31EF          */  0LL, 0LL, 1LL << 57, 0LL);
+const unicode_block B_KATAKANA_PHONETIC_EXTENSIONS_BLOCK(   /* 31F0 - 31FF          */  0LL, 0LL, 1LL << 58, 0LL);
+const unicode_block B_CJK_UNIFIED_IDEOGRAPHS_EXT_A_BLOCK(   /* 3400 - 4DBF          */  0LL, 0LL, 1LL << 59, 0LL);
+const unicode_block B_YIJING_HEXAGRAM_SYMBOLS_BLOCK(        /* 4DC0 - 4DFF          */  0LL, 0LL, 1LL << 60, 0LL);
+const unicode_block B_YI_SYLLABLES_BLOCK(                   /* A000 - A48F          */  0LL, 0LL, 1LL << 61, 0LL);
+const unicode_block B_YI_RADICALS_BLOCK(                    /* A490 - A4CF          */  0LL, 0LL, 1LL << 62, 0LL);
+const unicode_block B_VAI_BLOCK(                            /* A500 - A63F          */  0LL, 0LL, 1LL << 63, 0LL);
+const unicode_block B_CYRILLIC_EXTENDED_B_BLOCK(            /* A640 - A69F          */  0LL, 0LL,       0LL, 0LL);
+const unicode_block B_MODIFIER_TONE_LETTERS_BLOCK(          /* A700 - A71F          */  0LL, 1LL <<  1, 0LL, 0LL);
+const unicode_block B_LATIN_EXTENDED_D_BLOCK(               /* A720 - A7FF          */  0LL, 1LL <<  2, 0LL, 0LL);
+const unicode_block B_SYLOTI_NAGRI_BLOCK(                   /* A800 - A82F          */  0LL, 1LL <<  3, 0LL, 0LL);
+const unicode_block B_PHAGS_PA_BLOCK(                       /* A840 - A87F          */  0LL, 1LL <<  4, 0LL, 0LL);
+const unicode_block B_SAURASHTRA_BLOCK(                     /* A880 - A8DF          */  0LL, 1LL <<  5, 0LL, 0LL);
+const unicode_block B_KAYAH_LI_BLOCK(                       /* A900 - A92F          */  0LL, 1LL <<  6, 0LL, 0LL);
+const unicode_block B_REJANG_BLOCK(                         /* A930 - A95F          */  0LL, 1LL <<  7, 0LL, 0LL);
+const unicode_block B_CHAM_BLOCK(                           /* AA00 - AA5F          */  0LL, 1LL <<  8, 0LL, 0LL);
+const unicode_block B_HANGUL_SYLLABLES_BLOCK(               /* AC00 - D7AF          */  0LL, 1LL <<  9, 0LL, 0LL);
+const unicode_block B_VARIATION_SELECTORS_BLOCK(            /* FE00 - FE0F          */  0LL, 1LL << 10, 0LL, 0LL);
+const unicode_block B_VERTICAL_FORMS_BLOCK(                 /* FE10 - FE1F          */  0LL, 1LL << 11, 0LL, 0LL);
+const unicode_block B_LINEAR_B_SYLLABARY_BLOCK(             /* 10000 - 1007F        */  0LL, 1LL << 12, 0LL, 0LL);
+const unicode_block B_LINEAR_B_IDEOGRAMS_BLOCK(             /* 10080 - 100FF        */  0LL, 1LL << 13, 0LL, 0LL);
+const unicode_block B_AEGEAN_NUMBERS_BLOCK(                 /* 10100 - 1013F        */  0LL, 1LL << 14, 0LL, 0LL);
+const unicode_block B_ANCIENT_GREEK_NUMBERS_BLOCK(          /* 10140 - 1018F        */  0LL, 1LL << 15, 0LL, 0LL);
+const unicode_block B_ANCIENT_SYMBOLS_BLOCK(                /* 10190 - 101CF        */  0LL, 1LL << 16, 0LL, 0LL);
+const unicode_block B_PHAISTOS_DISC_BLOCK(                  /* 101D0 - 101FF        */  0LL, 1LL << 17, 0LL, 0LL);
+const unicode_block B_LYCIAN_BLOCK(                         /* 10280 - 1029F        */  0LL, 1LL << 18, 0LL, 0LL);
+const unicode_block B_CARIAN_BLOCK(                         /* 102A0 - 102DF        */  0LL, 1LL << 19, 0LL, 0LL);
+const unicode_block B_OLD_ITALIC_BLOCK(                     /* 10300 - 1032F        */  0LL, 1LL << 20, 0LL, 0LL);
+const unicode_block B_GOTHIC_BLOCK(                         /* 10330 - 1034F        */  0LL, 1LL << 21, 0LL, 0LL);
+const unicode_block B_UGARITIC_BLOCK(                       /* 10380 - 1039F        */  0LL, 1LL << 22, 0LL, 0LL);
+const unicode_block B_OLD_PERSIAN_BLOCK(                    /* 103A0 - 103DF        */  0LL, 1LL << 23, 0LL, 0LL);
+const unicode_block B_DESERET_BLOCK(                        /* 10400 - 1044F        */  0LL, 1LL << 24, 0LL, 0LL);
+const unicode_block B_SHAVIAN_BLOCK(                        /* 10450 - 1047F        */  0LL, 1LL << 25, 0LL, 0LL);
+const unicode_block B_OSMANYA_BLOCK(                        /* 10480 - 104AF        */  0LL, 1LL << 26, 0LL, 0LL);
+const unicode_block B_CYPRIOT_SYLLABARY_BLOCK(              /* 10800 - 1083F        */  0LL, 1LL << 27, 0LL, 0LL);
+const unicode_block B_PHOENICIAN_BLOCK(                     /* 10900 - 1091F        */  0LL, 1LL << 28, 0LL, 0LL);
+const unicode_block B_LYDIAN_BLOCK(                         /* 10920 - 1093F        */  0LL, 1LL << 29, 0LL, 0LL);
+const unicode_block B_KHAROSHTHI_BLOCK(                     /* 10A00 - 10A5F        */  0LL, 1LL << 30, 0LL, 0LL);
+const unicode_block B_CUNEIFORM_BLOCK(                      /* 12000 - 123FF        */  0LL, 1LL << 31, 0LL, 0LL);
+const unicode_block B_CUNEIFORM_NUMBERS_PUNCTUATION_BLOCK(  /* 12400 - 1247F        */  0LL, 1LL << 32, 0LL, 0LL);
+const unicode_block B_BYZANTINE_MUSICAL_SYMBOLS_BLOCK(      /* 1D000 - 1D0FF        */  0LL, 1LL << 33, 0LL, 0LL);
+const unicode_block B_MUSICAL_SYMBOLS_BLOCK(                /* 1D100 - 1D1FF        */  0LL, 1LL << 34, 0LL, 0LL);
+const unicode_block B_ANCIENT_GREEK_MUSICAL_SYMBOLS_BLOCK(  /* 1D200 - 1D24F        */  0LL, 1LL << 35, 0LL, 0LL);
+const unicode_block B_TAI_XUAN_JING_SYMBOLS_BLOCK(          /* 1D300 - 1D35F        */  0LL, 1LL << 36, 0LL, 0LL);
+const unicode_block B_COUNTING_ROD_NUMERALS_BLOCK(          /* 1D360 - 1D37F        */  0LL, 1LL << 37, 0LL, 0LL);
+const unicode_block B_MATHEMATICAL_ALPHANUM_SYMBOLS_BLOCK(  /* 1D400 - 1D7FF        */  0LL, 1LL << 38, 0LL, 0LL);
+const unicode_block B_MAHJONG_TILES_BLOCK(                  /* 1F000 - 1F02F        */  0LL, 1LL << 39, 0LL, 0LL);
+const unicode_block B_DOMINO_TILES_BLOCK(                   /* 1F030 - 1F09F        */  0LL, 1LL << 40, 0LL, 0LL);
+const unicode_block B_CJK_UNIFIED_IDEOGRAPHS_EXT_B_BLOCK(   /* 20000 - 2A6DF        */  0LL, 1LL << 41, 0LL, 0LL);
+const unicode_block B_CJK_IDEOGRAPHS_SUPPLEMENT_BLOCK(      /* 2F800 - 2FA1F        */  0LL, 1LL << 42, 0LL, 0LL);
+const unicode_block B_TAGS_BLOCK(                           /* E0000 - E007F        */  0LL, 1LL << 43, 0LL, 0LL);
+const unicode_block B_VARIATION_SELECTORS_SUPPLEMENT_BLOCK( /* E0100 - E01EF        */  0LL, 1LL << 44, 0LL, 0LL);
+const unicode_block B_SUPPLEMENTARY_PRIVATE_USE_A_BLOCK(    /* F0000 - FFFFF        */  0LL, 1LL << 45, 0LL, 0LL);
+const unicode_block B_SUPPLEMENTARY_PRIVATE_USE_B_BLOCK(    /* 100000 - 10FFFF      */  0LL, 1LL << 46, 0LL, 0LL);
+const unicode_block B_CYRILLIC_SUPPLEMENT_BLOCK(            /* 0500 - 052F          */  0LL, 1LL << 47, 0LL, 0LL);
+const unicode_block B_HIGH_PRIVATE_USE_SURROGATES_BLOCK(    /* DB80 - DBFF          */  0LL, 1LL << 48, 0LL, 0LL);
+
+
+const unicode_block_range kUnicodeBlockMap[] = {
+    {0x0000, 0x007f, B_BASIC_LATIN_BLOCK },
+    {0x0080, 0x00ff, B_LATIN1_SUPPLEMENT_BLOCK },
+    {0x0100, 0x017f, B_LATIN_EXTENDED_A_BLOCK },
+    {0x0180, 0x024f, B_LATIN_EXTENDED_B_BLOCK },
+    {0x0250, 0x02af, B_IPA_EXTENSIONS_BLOCK },
+    {0x02b0, 0x02ff, B_SPACING_MODIFIER_LETTERS_BLOCK },
+    {0x0300, 0x036f, B_COMBINING_DIACRITICAL_MARKS_BLOCK },
+    {0x0370, 0x03cf, B_BASIC_GREEK_BLOCK },
+    {0x03d0, 0x03ff, B_GREEK_SYMBOLS_AND_COPTIC_BLOCK },
+    {0x0400, 0x04ff, B_CYRILLIC_BLOCK },
+    {0x0500, 0x052f, B_CYRILLIC_SUPPLEMENT_BLOCK },
+    {0x0530, 0x058f, B_ARMENIAN_BLOCK },
+    {0x0590, 0x05cf, B_BASIC_HEBREW_BLOCK },
+    {0x05d0, 0x05ff, B_HEBREW_EXTENDED_BLOCK },
+    {0x0600, 0x0670, B_BASIC_ARABIC_BLOCK },
+    {0x0671, 0x06ff, B_ARABIC_EXTENDED_BLOCK },
+    {0x0700, 0x074f, B_SYRIAC_BLOCK },
+    {0x0750, 0x077f, B_ARABIC_SUPPLEMENT_BLOCK },
+    {0x0780, 0x07bf, B_THAANA_BLOCK },
+    {0x07c0, 0x07ff, B_N_KO_BLOCK },
+    {0x0900, 0x097f, B_DEVANAGARI_BLOCK },
+    {0x0980, 0x09ff, B_BENGALI_BLOCK },
+    {0x0a00, 0x0a7f, B_GURMUKHI_BLOCK },
+    {0x0a80, 0x0aff, B_GUJARATI_BLOCK },
+    {0x0b00, 0x0b7f, B_ORIYA_BLOCK },
+    {0x0b80, 0x0bff, B_TAMIL_BLOCK },
+    {0x0c00, 0x0c7f, B_TELUGU_BLOCK },
+    {0x0c80, 0x0cff, B_KANNADA_BLOCK},
+    {0x0d00, 0x0d7f, B_MALAYALAM_BLOCK},
+    {0x0d80, 0x0dff, B_SINHALA_BLOCK},
+    {0x0e00, 0x0e7f, B_THAI_BLOCK},
+    {0x0e80, 0x0eff, B_LAO_BLOCK},
+    {0x0f00, 0x0fff, B_TIBETAN_BLOCK},
+    {0x1000, 0x109f, B_MYANMAR_BLOCK},
+    {0x10a0, 0x10ff, B_BASIC_GEORGIAN_BLOCK},
+    {0x1100, 0x11ff, B_HANGUL_JAMO_BLOCK},
+    {0x1200, 0x137f, B_ETHIOPIC_BLOCK},
+    {0x1380, 0x139f, B_ETHIOPIC_SUPPLEMENT_BLOCK},
+    {0x13a0, 0x13ff, B_CHEROKEE_BLOCK},
+    {0x1400, 0x167f, B_UNIFIED_CANADIAN_ABORIGINAL_BLOCK},
+    {0x1680, 0x169f, B_OGHAM_BLOCK},
+    {0x16a0, 0x16ff, B_RUNIC_BLOCK},
+    {0x1700, 0x171f, B_TAGALOG_BLOCK},
+    {0x1720, 0x173f, B_HANUNOO_BLOCK},
+    {0x1740, 0x175f, B_BUHID_BLOCK},
+    {0x1760, 0x177f, B_TAGBANWA_BLOCK},
+    {0x1780, 0x17ff, B_KHMER_BLOCK},
+    {0x1800, 0x18af, B_MONGOLIAN_BLOCK},
+    {0x1900, 0x194f, B_LIMBU_BLOCK},
+    {0x1950, 0x197f, B_TAI_LE_BLOCK},
+    {0x1980, 0x19df, B_NEW_TAI_LUE_BLOCK},
+    {0x19e0, 0x19ff, B_KHMER_SYMBOLS_BLOCK},
+    {0x1a00, 0x1a1f, B_BUGINESE_BLOCK},
+    {0x1b00, 0x1b7f, B_BALINESE_BLOCK},
+    {0x1b80, 0x1bbf, B_SUNDANESE_BLOCK},
+    {0x1c00, 0x1c4f, B_LEPCHA_BLOCK},
+    {0x1c50, 0x1c7f, B_OL_CHIKI_BLOCK},
+    {0x1d00, 0x1d7f, B_PHONETIC_EXTENSIONS_BLOCK},
+    {0x1d80, 0x1dbf, B_PHONETIC_EXTENSIONS_SUPPLEMENT_BLOCK},
+    {0x1dc0, 0x1dff, B_COMBINING_MARKS_SUPPLEMENT_BLOCK},
+    {0x1e00, 0x1eff, B_LATIN_EXTENDED_ADDITIONAL_BLOCK},
+    {0x1f00, 0x1fff, B_GREEK_EXTENDED_BLOCK},
+    {0x2000, 0x206f, B_GENERAL_PUNCTUATION_BLOCK},
+    {0x2070, 0x209f, B_SUPERSCRIPTS_AND_SUBSCRIPTS_BLOCK},
+    {0x20a0, 0x20cf, B_CURRENCY_SYMBOLS_BLOCK},
+    {0x20d0, 0x20ff, B_COMBINING_MARKS_FOR_SYMBOLS_BLOCK},
+    {0x2100, 0x214f, B_LETTERLIKE_SYMBOLS_BLOCK},
+    {0x2150, 0x218f, B_NUMBER_FORMS_BLOCK},
+    {0x2190, 0x21ff, B_ARROWS_BLOCK},
+    {0x2200, 0x22ff, B_MATHEMATICAL_OPERATORS_BLOCK},
+    {0x2300, 0x23ff, B_MISCELLANEOUS_TECHNICAL_BLOCK},
+    {0x2400, 0x243f, B_CONTROL_PICTURES_BLOCK},
+    {0x2440, 0x245f, B_OPTICAL_CHARACTER_RECOGNITION_BLOCK},
+    {0x2460, 0x24ff, B_ENCLOSED_ALPHANUMERICS_BLOCK},
+    {0x2500, 0x257f, B_BOX_DRAWING_BLOCK},
+    {0x2580, 0x259f, B_BLOCK_ELEMENTS_BLOCK},
+    {0x25a0, 0x25ff, B_GEOMETRIC_SHAPES_BLOCK},
+    {0x2600, 0x26ff, B_MISCELLANEOUS_SYMBOLS_BLOCK},
+    {0x2700, 0x27bf, B_DINGBATS_BLOCK},
+    {0x27c0, 0x27ef, B_MISC_MATHEMATICAL_SYMBOLS_A_BLOCK},
+    {0x27f0, 0x27ff, B_SUPPLEMENTAL_ARROWS_A_BLOCK},
+    {0x2800, 0x28ff, B_BRAILLE_PATTERNS_BLOCK},
+    {0x2900, 0x297f, B_SUPPLEMENTAL_ARROWS_B_BLOCK},
+    {0x2980, 0x29ff, B_MISC_MATHEMATICAL_SYMBOLS_B_BLOCK},
+    {0x2a00, 0x2aff, B_SUPPLEMENTAL_MATH_OPERATORS_BLOCK},
+    {0x2b00, 0x2bff, B_MISC_SYMBOLS_AND_ARROWS_BLOCK},
+    {0x2c00, 0x2c5f, B_GLAGOTIC_BLOCK},
+    {0x2c60, 0x2c7f, B_LATIN_EXTENDED_C_BLOCK},
+    {0x2c80, 0x2cff, B_COPTIC_BLOCK},
+    {0x2d00, 0x2d2f, B_GEORGIAN_SUPPLEMENT_BLOCK},
+    {0x2d30, 0x2d7f, B_TIFINAGH_BLOCK},
+    {0x2d80, 0x2ddf, B_ETHIOPIC_EXTENDED_BLOCK},
+    {0x2de0, 0x2dff, B_CYRILLIC_EXTENDED_A_BLOCK},
+    {0x2e00, 0x2e7f, B_SUPPLEMENTAL_PUNCTUATION_BLOCK},
+    {0x2e80, 0x2eff, B_CJK_RADICALS_SUPPLEMENT_BLOCK},
+    {0x2f00, 0x2fdf, B_KANGXI_RADICALS_BLOCK},
+    {0x2ff0, 0x2fff, B_IDEOGRAPHIC_DESCRIPTION_BLOCK},
+    {0x3000, 0x303f, B_CJK_SYMBOLS_AND_PUNCTUATION_BLOCK},
+    {0x3040, 0x309f, B_HIRAGANA_BLOCK},
+    {0x30a0, 0x30ff, B_KATAKANA_BLOCK},
+    {0x3100, 0x312f, B_BOPOMOFO_BLOCK},
+    {0x3130, 0x318f, B_HANGUL_COMPATIBILITY_JAMO_BLOCK},
+    {0x3190, 0x319f, B_CJK_MISCELLANEOUS_BLOCK},
+    {0x31a0, 0x31bf, B_BOPOMOFO_EXTENDED_BLOCK},
+    {0x31c0, 0x31ef, B_CJK_STROKES_BLOCK},
+    {0x31f0, 0x31ff, B_KATAKANA_PHONETIC_EXTENSIONS_BLOCK},
+    {0x3200, 0x32ff, B_ENCLOSED_CJK_LETTERS_AND_MONTHS_BLOCK},
+    {0x3300, 0x33ff, B_CJK_COMPATIBILITY_BLOCK},
+    {0x3400, 0x4dbf, B_CJK_UNIFIED_IDEOGRAPHS_EXT_A_BLOCK},
+    {0x4dc0, 0x4dff, B_YIJING_HEXAGRAM_SYMBOLS_BLOCK},
+    {0x4e00, 0x9fff, B_CJK_UNIFIED_IDEOGRAPHS_BLOCK},
+    {0xa000, 0xa48f, B_YI_SYLLABLES_BLOCK},
+    {0xa490, 0xa4cf, B_YI_RADICALS_BLOCK},
+    {0xa500, 0xa63f, B_VAI_BLOCK},
+    {0xa640, 0xa69f, B_CYRILLIC_EXTENDED_B_BLOCK},
+    {0xa700, 0xa71f, B_MODIFIER_TONE_LETTERS_BLOCK},
+    {0xa720, 0xa7ff, B_LATIN_EXTENDED_D_BLOCK},
+    {0xa800, 0xa82f, B_SYLOTI_NAGRI_BLOCK},
+    {0xa840, 0xa87f, B_PHAGS_PA_BLOCK},
+    {0xa880, 0xa8df, B_SAURASHTRA_BLOCK},
+    {0xa900, 0xa92f, B_KAYAH_LI_BLOCK},
+    {0xa930, 0xa95f, B_REJANG_BLOCK},
+    {0xaa00, 0xaa5f, B_CHAM_BLOCK},
+    {0xac00, 0xd7af, B_HANGUL_SYLLABLES_BLOCK},
+    {0xd800, 0xdb7f, B_HIGH_SURROGATES_BLOCK},
+    {0xdb80, 0xdbff, B_HIGH_PRIVATE_USE_SURROGATES_BLOCK},
+    {0xdc00, 0xdfff, B_LOW_SURROGATES_BLOCK},
+    {0xe000, 0xf8ff, B_PRIVATE_USE_AREA_BLOCK},
+    {0xf900, 0xfaff, B_CJK_COMPATIBILITY_IDEOGRAPHS_BLOCK},
+    {0xfb00, 0xfb4f, B_ALPHABETIC_PRESENTATION_FORMS_BLOCK},
+    {0xfb50, 0xfdff, B_ARABIC_PRESENTATION_FORMS_A_BLOCK},
+    {0xfe00, 0xfe0f, B_VARIATION_SELECTORS_BLOCK},
+    {0xfe10, 0xfe1f, B_VERTICAL_FORMS_BLOCK},
+    {0xfe20, 0xfe2f, B_COMBINING_HALF_MARKS_BLOCK},
+    {0xfe30, 0xfe4f, B_CJK_COMPATIBILITY_FORMS_BLOCK},
+    {0xfe50, 0xfe6f, B_SMALL_FORM_VARIANTS_BLOCK},
+    {0xfe70, 0xfeff, B_ARABIC_PRESENTATION_FORMS_B_BLOCK},
+    {0xff00, 0xffef, B_HALFWIDTH_AND_FULLWIDTH_FORMS_BLOCK},
+    {0xfff0, 0xffff, B_SPECIALS_BLOCK},
+    {0x010000, 0x01007f, B_LINEAR_B_SYLLABARY_BLOCK},
+    {0x010080, 0x0100ff, B_LINEAR_B_IDEOGRAMS_BLOCK},
+    {0x010100, 0x01013f, B_AEGEAN_NUMBERS_BLOCK},
+    {0x010140, 0x01018f, B_ANCIENT_GREEK_NUMBERS_BLOCK},
+    {0x010190, 0x0101cf, B_ANCIENT_SYMBOLS_BLOCK},
+    {0x0101d0, 0x0101ff, B_PHAISTOS_DISC_BLOCK},
+    {0x010280, 0x01029f, B_LYCIAN_BLOCK},
+    {0x0102a0, 0x0102df, B_CARIAN_BLOCK},
+    {0x010300, 0x01032f, B_OLD_ITALIC_BLOCK},
+    {0x010330, 0x01034f, B_GOTHIC_BLOCK},
+    {0x010380, 0x01039f, B_UGARITIC_BLOCK},
+    {0x0103a0, 0x0103df, B_OLD_PERSIAN_BLOCK},
+    {0x010400, 0x01044f, B_DESERET_BLOCK},
+    {0x010450, 0x01047f, B_SHAVIAN_BLOCK},
+    {0x010480, 0x0104af, B_OSMANYA_BLOCK},
+    {0x010800, 0x01083f, B_CYPRIOT_SYLLABARY_BLOCK},
+    {0x010900, 0x01091f, B_PHOENICIAN_BLOCK},
+    {0x010920, 0x01093f, B_LYDIAN_BLOCK},
+    {0x010a00, 0x010a5f, B_KHAROSHTHI_BLOCK},
+    {0x012000, 0x0123ff, B_CUNEIFORM_BLOCK},
+    {0x012400, 0x01247f, B_CUNEIFORM_NUMBERS_PUNCTUATION_BLOCK},
+    {0x01d000, 0x01d0ff, B_BYZANTINE_MUSICAL_SYMBOLS_BLOCK},
+    {0x01d100, 0x01d1ff, B_MUSICAL_SYMBOLS_BLOCK},
+    {0x01d200, 0x01d24f, B_ANCIENT_GREEK_MUSICAL_SYMBOLS_BLOCK},
+    {0x01d300, 0x01d35f, B_TAI_XUAN_JING_SYMBOLS_BLOCK},
+    {0x01d360, 0x01d37f, B_COUNTING_ROD_NUMERALS_BLOCK},
+    {0x01d400, 0x01d7ff, B_MATHEMATICAL_ALPHANUM_SYMBOLS_BLOCK},
+    {0x01f000, 0x01f02f, B_MAHJONG_TILES_BLOCK},
+    {0x01f030, 0x01f09f, B_DOMINO_TILES_BLOCK},
+    {0x020000, 0x02a6df, B_CJK_UNIFIED_IDEOGRAPHS_EXT_B_BLOCK},
+    {0x02f800, 0x02fa1f, B_CJK_IDEOGRAPHS_SUPPLEMENT_BLOCK},
+    {0x0e0000, 0x0e007f, B_TAGS_BLOCK},
+    {0x0e0100, 0x0e01ef, B_VARIATION_SELECTORS_SUPPLEMENT_BLOCK},
+    {0x0f0000, 0x0fffff, B_SUPPLEMENTARY_PRIVATE_USE_A_BLOCK},
+    {0x100000, 0x10ffff, B_SUPPLEMENTARY_PRIVATE_USE_B_BLOCK},
+};
+
+const uint32 kNumUnicodeBlockRanges
+    = sizeof(kUnicodeBlockMap) / sizeof(kUnicodeBlockMap[0]);
+
 #endif  // _UNICODEBLOCKOBJECTS_H

headers/private/app/ServerProtocol.h

@@ -1 +1 @@
 /*
- * Copyright 2001-2015, Haiku.
+ * Copyright 2001-2017, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -143 +143 @@
     AS_GET_HAS_GLYPHS,
     AS_GET_GLYPH_SHAPES,
     AS_GET_TRUNCATED_STRINGS,
+    AS_GET_UNICODE_BLOCKS,
 
     // Screen methods
     AS_VALID_SCREEN_ID,

src/kits/interface/Font.cpp

@@ -1 +1 @@
 /*
- * Copyright 2001-2015, Haiku, Inc.
+ * Copyright 2001-2017, Haiku, Inc.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -839 +839 @@
 unicode_block
 BFont::Blocks() const
 {
-    // TODO: Add Block support
-    return unicode_block(~0LL, ~0LL);
+    BPrivate::AppServerLink link;
+    link.StartMessage(AS_GET_UNICODE_BLOCKS);
+    link.Attach<uint16>(fFamilyID);
+    link.Attach<uint16>(fStyleID);
+
+    int32 status;
+    if (link.FlushWithReply(status) != B_OK
+        || status != B_OK) {
+        return unicode_block(~0LL, ~0LL, ~0LL, ~0LL);
+    }
+
+    unicode_block blocksForFont;
+    link.Read<unicode_block>(&blocksForFont);
+
+    return blocksForFont;
 }
 
 

src/servers/app/Jamfile

@@ -32 +32 @@
     ;
 
 UseBuildFeatureHeaders freetype ;
-Includes [ FGristFiles AppServer.cpp BitmapManager.cpp Canvas.cpp
+if [ FIsBuildFeatureEnabled fontconfig ] {
+    SubDirC++Flags -DFONTCONFIG_ENABLED ;
+    UseBuildFeatureHeaders fontconfig ;
+    Includes [ FGristFiles AppServer.cpp BitmapManager.cpp Canvas.cpp
+    ClientMemoryAllocator.cpp Desktop.cpp DesktopSettings.cpp
+    DrawState.cpp DrawingEngine.cpp Layer.cpp PictureBoundingBoxPlayer.cpp
+    ServerApp.cpp ServerBitmap.cpp ServerCursor.cpp ServerFont.cpp
+    ServerPicture.cpp ServerWindow.cpp View.cpp Window.cpp WorkspacesView.cpp
+    $(decorator_src) $(font_src) ]
+    : [ BuildFeatureAttribute freetype : headers ]
+      [ BuildFeatureAttribute fontconfig : headers ] ;
+} else {
+    Includes [ FGristFiles AppServer.cpp BitmapManager.cpp Canvas.cpp
     ClientMemoryAllocator.cpp Desktop.cpp DesktopSettings.cpp
     DrawState.cpp DrawingEngine.cpp Layer.cpp PictureBoundingBoxPlayer.cpp
     ServerApp.cpp ServerBitmap.cpp ServerCursor.cpp ServerFont.cpp
     ServerPicture.cpp ServerWindow.cpp View.cpp Window.cpp WorkspacesView.cpp
     $(decorator_src) $(font_src) ]
     : [ BuildFeatureAttribute freetype : headers ] ;
-
+}
 
 local BROKEN_64 = ;
 if $(TARGET_ARCH) != x86_64 {
@@ -103 +115 @@
     libaslocal.a $(BROKEN_64)libasremote.a $(BROKEN_64)libashtml5.a
     libasdrawing.a libpainter.a libagg.a
     [ BuildFeatureAttribute freetype : library ]
+    [ BuildFeatureAttribute fontconfig : library ]
     libstackandtile.a liblinprog.a libtextencoding.so shared
     [ TargetLibstdc++ ]
 

src/servers/app/ProfileMessageSupport.cpp

@@ -1 +1 @@
 /*
- * Copyright 2007-2009, Haiku Inc. All rights reserved.
+ * Copyright 2007-2017, Haiku Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -125 +125 @@
         CODE(AS_GET_HAS_GLYPHS);
         CODE(AS_GET_GLYPH_SHAPES);
         CODE(AS_GET_TRUNCATED_STRINGS);
+        CODE(AS_GET_UNICODE_BLOCKS);
 
         // Screen methods
         CODE(AS_VALID_SCREEN_ID);

src/servers/app/ServerApp.cpp

@@ -1 +1 @@
 /*
- * Copyright 2001-2016, Haiku.
+ * Copyright 2001-2017, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -2028 +2028 @@
             break;
         }
 
+        case AS_GET_UNICODE_BLOCKS:
+        {
+            FTRACE(("ServerApp %s: AS_GET_UNICODE_BLOCKS\n", Signature()));
+
+            // Attached Data:
+            // 1) uint16 family ID
+            // 2) uint16 style ID
+
+            // Returns:
+            // 1) unicode_block - bitfield of Unicode blocks in font
+
+            uint16 familyID, styleID;
+            float size;
+            link.Read<uint16>(&familyID);
+            link.Read<uint16>(&styleID);
+            link.Read<float>(&size);
+
+            ServerFont font;
+            status_t status = font.SetFamilyAndStyle(familyID, styleID);
+            if (status == B_OK) {
+                unicode_block blocksForFont;
+                font.GetUnicodeBlocks(blocksForFont);
+
+                fLink.Attach(&blocksForFont, sizeof(blocksForFont));
+            } else
+                fLink.StartMessage(status);
+
+            fLink.Flush();
+            break;
+        }
+
         case AS_GET_GLYPH_SHAPES:
         {
             FTRACE(("ServerApp %s: AS_GET_GLYPH_SHAPES\n", Signature()));

src/servers/app/ServerFont.cpp

@@ -1 +1 @@
 /*
- * Copyright 2001-2016, Haiku.
+ * Copyright 2001-2017, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -22 +22 @@
 #include FT_GLYPH_H
 #include FT_OUTLINE_H
 
+#ifdef FONTCONFIG_ENABLED
+
+#include <fontconfig.h>
+#include <fcfreetype.h>
+
+#endif // FONTCONFIG_ENABLED
+
 #include <Shape.h>
 #include <String.h>
+#include <UnicodeBlockObjects.h>
 #include <UTF8.h>
 
 #include <agg_bounding_rect.h>
@@ -437 +445 @@
 }
 
 
+#ifdef FONTCONFIG_ENABLED
+
+void
+FindBlockForCodepoint(uint32 codePoint, unicode_block &blocksForMap)
+{
+    uint32 min = 0;
+    uint32 max = kNumUnicodeBlockRanges;
+
+    while (max >= min) {
+        uint32 guess = (max + min) / 2;
+        uint32 start = kUnicodeBlockMap[guess].start;
+        uint32 end = kUnicodeBlockMap[guess].end;
+
+        if (start <= codePoint && end >= codePoint) {
+            blocksForMap = blocksForMap | kUnicodeBlockMap[guess].block;
+            max = min;
+        }
+
+        if (end < codePoint) {
+            min = guess + 1;
+        } else {
+            max = guess - 1;
+        }
+    }
+}
+
+/*
+    parses charmap from fontconfig.  See fontconfig docs for FcCharSetFirstPage
+    and FcCharSetNextPage for details on format.
+*/
+void
+ParseFcMap(FcChar32 charMap[], FcChar32 baseCodePoint, unicode_block &blocksForMap)
+{
+    for (int i = 0; i < FC_CHARSET_MAP_SIZE; ++i) {
+        FcChar32 curVal = charMap[i];
+        uint32 rangeStart = 0;
+
+        for (int bit = 32; bit > 0; --bit) {
+            if (curVal & 0x80000000) {
+                if (rangeStart == 0) {
+                    rangeStart = bit;
+                }
+            } else if (rangeStart > 0) {
+                uint32 startPoint = baseCodePoint + (32 * i) + (rangeStart - 1);
+                uint32 endPoint = baseCodePoint + (32 * i) + (bit - 1);
+
+                FindBlockForCodepoint(startPoint, blocksForMap);
+                FindBlockForCodepoint(endPoint, blocksForMap);
+
+                rangeStart = 0;
+            }
+
+            curVal <<= 1;
+        }
+    }
+}
+
+#endif // FONTCONFIG_ENABLED
+
+
+/*!
+    \brief Gets a bitmap that indicates which Unicode blocks are in the font.
+    \param unicode_block to store bitmap in
+    \return B_OK; bitmap will be empty if something went wrong
+*/
+status_t
+ServerFont::GetUnicodeBlocks(unicode_block &blocksForFont)
+{
+    blocksForFont = unicode_block(0LL, 0LL);
+
+#ifdef FONTCONFIG_ENABLED
+    FT_Face face = GetTransformedFace(true, true);
+
+    FcCharSet *charSet = FcFreeTypeCharSet(face, NULL);
+
+    if (charSet == NULL)
+        return B_ERROR;
+
+    FcChar32 charMap[FC_CHARSET_MAP_SIZE];
+    FcChar32 next = 0;
+
+    FcChar32 baseCodePoint = FcCharSetFirstPage(charSet, charMap, &next);
+
+    if (baseCodePoint == FC_CHARSET_DONE)
+        return B_OK;
+
+    ParseFcMap(charMap, baseCodePoint, blocksForFont);
+
+    while (next != FC_CHARSET_DONE) {
+        baseCodePoint = FcCharSetNextPage(charSet, charMap, &next);
+
+        ParseFcMap(charMap, baseCodePoint, blocksForFont);
+    }
+#endif // FONTCONFIG_ENABLED
+
+    return B_OK;
+}
+
+
 class HasGlyphsConsumer {
  public:
     HasGlyphsConsumer(bool* hasArray)

src/servers/app/ServerFont.h

@@ -1 +1 @@
 /*
- * Copyright 2001-2008, Haiku.
+ * Copyright 2001-2017 Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -163 +163 @@
                                                float width) const;
 
             Transformable       EmbeddedTransformation() const;
+            status_t            GetUnicodeBlocks(unicode_block &blocksForFont);
 
 protected:
     friend class FontStyle;