X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fproducer%2Ftext%2Futils%2Ftexture_font.cpp;h=5a0421701e9078f797a1fd1ed827f4f4b49a58dc;hb=1678432d8cabef093a58e27791f68499c031dba9;hp=ad15f3836df3e09f61ed737bc7624567ae822a88;hpb=6f22c401859fcb0a6361b6b3d72f676fe9b03fa2;p=casparcg diff --git a/core/producer/text/utils/texture_font.cpp b/core/producer/text/utils/texture_font.cpp index ad15f3836..5a0421701 100644 --- a/core/producer/text/utils/texture_font.cpp +++ b/core/producer/text/utils/texture_font.cpp @@ -1,23 +1,22 @@ -#include "..\..\..\StdAfx.h" +#include "../../../StdAfx.h" #include "texture_atlas.h" #include "texture_font.h" +#include "freetype_library.h" #include +#include #include #include FT_FREETYPE_H #include FT_GLYPH_H namespace caspar { namespace core { namespace text { -struct freetype_exception : virtual caspar_exception -{ - freetype_exception() {} - explicit freetype_exception(const char* msg) : caspar_exception(msg) {} -}; - struct unicode_range { + unicode_range() : first(0), last(0) {} + unicode_range(int f, int l) : first(f), last(l) {} + int first; int last; }; @@ -30,55 +29,41 @@ struct texture_font::impl private: struct glyph_info { - glyph_info(int w, int h, float l, float t, float r, float b) : width(w), height(h), left(l), top(t), right(r), bottom(b) + glyph_info(int w, int h, double l, double t, double r, double b) : width(w), height(h), left(l), top(t), right(r), bottom(b) {} - float left, top, right, bottom; + double left, top, right, bottom; int width, height; }; - FT_Library lib_; - FT_Face face_; - texture_atlas atlas_; - float size_; - std::map glyphs_; + spl::shared_ptr face_; + texture_atlas atlas_; + double size_; + double tracking_; + bool normalize_; + std::map glyphs_; + std::wstring name_; public: - impl::impl(texture_atlas& atlas, const std::wstring& filename, float size) : lib_(nullptr), face_(nullptr), atlas_(atlas), size_(size) + impl(texture_atlas& atlas, const text_info& info, bool normalize_coordinates) + : face_(get_new_face(u8(info.font_file), u8(info.font))) + , atlas_(atlas) + , size_(info.size) + , tracking_(info.size*info.tracking/1000.0) + , normalize_(normalize_coordinates) + , name_(info.font) { - try - { - FT_Error err; - err = FT_Init_FreeType(&lib_); - if(err) throw freetype_exception("Failed to initialize freetype"); - - err = FT_New_Face(lib_, u8(filename).c_str(), 0, &face_); - if(err) throw freetype_exception("Failed to load font"); - - err = FT_Set_Char_Size(face_, (FT_F26Dot6)(size*64), 0, 72, 72); - if(err) throw freetype_exception("Failed to set font size"); - } - catch(std::exception& ex) - { - if(face_ != nullptr) - FT_Done_Face(face_); - if(lib_ != nullptr) - FT_Done_FreeType(lib_); - - throw ex; - } + if (FT_Set_Char_Size(face_.get(), static_cast(size_*64), 0, 72, 72)) + CASPAR_THROW_EXCEPTION(expected_freetype_exception() << msg_info("Failed to set font size")); } - ~impl() + void set_tracking(double tracking) { - if(face_ != nullptr) - FT_Done_Face(face_); - if(lib_ != nullptr) - FT_Done_FreeType(lib_); + tracking_ = size_ * tracking / 1000.0; } int count_glyphs_in_range(unicode_block block) - { + { unicode_range range = get_range(block); //TODO: extract info from freetype @@ -87,19 +72,18 @@ public: return range.last - range.first; } - void impl::load_glyphs(unicode_block block, const color& col) + void load_glyphs(unicode_block block, const color& col) { - FT_Error err; int flags = FT_LOAD_RENDER | FT_LOAD_FORCE_AUTOHINT | FT_LOAD_TARGET_NORMAL; unicode_range range = get_range(block); for(int i = range.first; i <= range.last; ++i) { - FT_UInt glyph_index = FT_Get_Char_Index(face_, i); + FT_UInt glyph_index = FT_Get_Char_Index(face_.get(), i); if(!glyph_index) //ignore codes that doesn't have a glyph for now. Might want to map these to a special glyph later. continue; - - err = FT_Load_Glyph(face_, glyph_index, flags); + + FT_Error err = FT_Load_Glyph(face_.get(), glyph_index, flags); if(err) continue; //igonore glyphs that fail to load const FT_Bitmap& bitmap = face_->glyph->bitmap; //shorthand notation @@ -113,79 +97,126 @@ public: } atlas_.set_region(region.x, region.y, bitmap.width, bitmap.rows, bitmap.buffer, bitmap.pitch, col); - glyphs_.insert(std::pair(i, glyph_info(bitmap.width, bitmap.rows, - region.x / (float)atlas_.width(), - region.y / (float)atlas_.height(), - (region.x + bitmap.width) / (float)atlas_.width(), - (region.y + bitmap.rows) / (float)atlas_.height()))); + glyphs_.insert(std::pair(i, glyph_info(bitmap.width, bitmap.rows, + region.x / static_cast(atlas_.width()), + region.y / static_cast(atlas_.height()), + (region.x + bitmap.width) / static_cast(atlas_.width()), + (region.y + bitmap.rows) / static_cast(atlas_.height())))); } } - std::vector create_vertex_stream(const std::wstring& str, int x, int y, int parent_width, int parent_height) + std::vector create_vertex_stream(const std::wstring& str, int x, int y, int parent_width, int parent_height, string_metrics* metrics, double shear) { //TODO: detect glyphs that aren't in the atlas and load them (and maybe that entire unicode_block on the fly - std::vector result(16*str.length(), 0); + std::vector result; + result.resize(4 * str.length()); bool use_kerning = (face_->face_flags & FT_FACE_FLAG_KERNING) == FT_FACE_FLAG_KERNING; int index = 0; FT_UInt previous = 0; - float pos_x = (float)x; - float pos_y = (float)y; + double pos_x = static_cast(x); + double pos_y = static_cast(y); - auto end = str.end(); - for(auto it = str.begin(); it != end; ++it, ++index) + int maxBearingY = 0; + int maxProtrudeUnderY = 0; + int maxHeight = 0; + + for (auto it = str.begin(), end = str.end(); it != end; ++it, ++index) { auto glyph_it = glyphs_.find(*it); - if(glyph_it != glyphs_.end()) - { + if (glyph_it != glyphs_.end()) + { const glyph_info& coords = glyph_it->second; - FT_UInt glyph_index = FT_Get_Char_Index(face_, (*it)); + FT_UInt glyph_index = FT_Get_Char_Index(face_.get(), (*it)); if(use_kerning && previous && glyph_index) { FT_Vector delta; - FT_Get_Kerning(face_, previous, glyph_index, FT_KERNING_DEFAULT, &delta); + FT_Get_Kerning(face_.get(), previous, glyph_index, FT_KERNING_DEFAULT, &delta); - pos_x += delta.x / 64.0f; + pos_x += delta.x / 64.0; } - FT_Load_Glyph(face_, glyph_index, FT_LOAD_NO_BITMAP | FT_LOAD_FORCE_AUTOHINT | FT_LOAD_TARGET_NORMAL); + FT_Load_Glyph(face_.get(), glyph_index, FT_LOAD_NO_BITMAP | FT_LOAD_FORCE_AUTOHINT | FT_LOAD_TARGET_NORMAL); + + double left = (pos_x + face_->glyph->metrics.horiBearingX / 64.0) / parent_width; + double right = ((pos_x + face_->glyph->metrics.horiBearingX / 64.0) + coords.width) / parent_width; - float left = (pos_x + face_->glyph->metrics.horiBearingX/64.0f) / parent_width ; - float right = ((pos_x + face_->glyph->metrics.horiBearingX/64.0f) + coords.width) / parent_width; + double top = (pos_y - face_->glyph->metrics.horiBearingY/64.0) / parent_height; + double bottom = ((pos_y - face_->glyph->metrics.horiBearingY / 64.0) + coords.height) / parent_height; - float top = (pos_y - face_->glyph->metrics.horiBearingY/64.0f) / parent_height; - float bottom = ((pos_y - face_->glyph->metrics.horiBearingY/64.0f) + coords.height) / parent_height; + auto ul_index = index * 4; + auto ur_index = ul_index + 1; + auto lr_index = ul_index + 2; + auto ll_index = ul_index + 3; + + //vertex 1 upper left + result[ul_index].vertex_x = left; //vertex.x + result[ul_index].vertex_y = top; //vertex.y + result[ul_index].texture_x = coords.left; //texcoord.r + result[ul_index].texture_y = coords.top; //texcoord.s + + //vertex 2 upper right + result[ur_index].vertex_x = right; //vertex.x + result[ur_index].vertex_y = top; //vertex.y + result[ur_index].texture_x = coords.right; //texcoord.r + result[ur_index].texture_y = coords.top; //texcoord.s + + //vertex 3 lower right + result[lr_index].vertex_x = right; //vertex.x + result[lr_index].vertex_y = bottom; //vertex.y + result[lr_index].texture_x = coords.right; //texcoord.r + result[lr_index].texture_y = coords.bottom; //texcoord.s + + //vertex 4 lower left + result[ll_index].vertex_x = left; //vertex.x + result[ll_index].vertex_y = bottom; //vertex.y + result[ll_index].texture_x = coords.left; //texcoord.r + result[ll_index].texture_y = coords.bottom; //texcoord.s + + int bearingY = face_->glyph->metrics.horiBearingY >> 6; - //vertex 1 top left - result[index*16 + 0] = left; //vertex.x - result[index*16 + 1] = top; //vertex.y - result[index*16 + 2] = coords.left; //texcoord.r - result[index*16 + 3] = coords.top; //texcoord.s + if(bearingY > maxBearingY) + maxBearingY = bearingY; - //vertex 2 top right - result[index*16 + 4] = right; //vertex.x - result[index*16 + 5] = top; //vertex.y - result[index*16 + 6] = coords.right; //texcoord.r - result[index*16 + 7] = coords.top; //texcoord.s + int protrudeUnderY = coords.height - bearingY; - //vertex 3 bottom right - result[index*16 + 8] = right; //vertex.x - result[index*16 + 9] = bottom; //vertex.y - result[index*16 + 10] = coords.right; //texcoord.r - result[index*16 + 11] = coords.bottom; //texcoord.s + if (protrudeUnderY > maxProtrudeUnderY) + maxProtrudeUnderY = protrudeUnderY; - //vertex 4 bottom left - result[index*16 + 12] = left; //vertex.x - result[index*16 + 13] = bottom; //vertex.y - result[index*16 + 14] = coords.left; //texcoord.r - result[index*16 + 15] = coords.bottom; //texcoord.s + if (maxBearingY + maxProtrudeUnderY > maxHeight) + maxHeight = maxBearingY + maxProtrudeUnderY; - pos_x += face_->glyph->advance.x / 64.0f; + pos_x += face_->glyph->advance.x / 64.0; + pos_x += tracking_; previous = glyph_index; } + else + { + //TODO: maybe we should try to load the glyph on the fly if it is missing. + } + } + + if(normalize_) + { + auto ratio_x = parent_width / (pos_x - x); + auto ratio_y = parent_height / static_cast(maxHeight); + + for (auto& coord : result) + { + coord.vertex_x *= ratio_x; + coord.vertex_y *= ratio_y; + } + } + + if (metrics != nullptr) + { + metrics->width = (int)(pos_x - x + 0.5); + metrics->bearingY = maxBearingY; + metrics->height = maxHeight; + metrics->protrudeUnderY = maxProtrudeUnderY; } return result; } @@ -193,11 +224,11 @@ public: string_metrics measure_string(const std::wstring& str) { string_metrics result; - + bool use_kerning = (face_->face_flags & FT_FACE_FLAG_KERNING) == FT_FACE_FLAG_KERNING; int index = 0; FT_UInt previous = 0; - float pos_x = 0; + double pos_x = 0; // float pos_y = 0; auto end = str.end(); @@ -205,29 +236,34 @@ public: { auto glyph_it = glyphs_.find(*it); if(glyph_it != glyphs_.end()) - { + { const glyph_info& coords = glyph_it->second; - FT_UInt glyph_index = FT_Get_Char_Index(face_, (*it)); + FT_UInt glyph_index = FT_Get_Char_Index(face_.get(), (*it)); if(use_kerning && previous && glyph_index) { FT_Vector delta; - FT_Get_Kerning(face_, previous, glyph_index, FT_KERNING_DEFAULT, &delta); + FT_Get_Kerning(face_.get(), previous, glyph_index, FT_KERNING_DEFAULT, &delta); - pos_x += delta.x / 64.0f; + pos_x += delta.x / 64.0; } - FT_Load_Glyph(face_, glyph_index, FT_LOAD_NO_BITMAP | FT_LOAD_FORCE_AUTOHINT | FT_LOAD_TARGET_NORMAL); + FT_Load_Glyph(face_.get(), glyph_index, FT_LOAD_NO_BITMAP | FT_LOAD_FORCE_AUTOHINT | FT_LOAD_TARGET_NORMAL); int bearingY = face_->glyph->metrics.horiBearingY >> 6; if(bearingY > result.bearingY) result.bearingY = bearingY; - if(coords.height > result.height) - result.height = coords.height; + int protrudeUnderY = coords.height - bearingY; - pos_x += face_->glyph->advance.x / 64.0f; + if (protrudeUnderY > result.protrudeUnderY) + result.protrudeUnderY = protrudeUnderY; + + if (result.bearingY + result.protrudeUnderY > result.height) + result.height = result.bearingY + result.protrudeUnderY; + + pos_x += face_->glyph->advance.x / 64.0; previous = glyph_index; } } @@ -235,242 +271,252 @@ public: result.width = (int)(pos_x+.5f); return result; } -}; -texture_font::texture_font(texture_atlas& atlas, const std::wstring& filename, float size) : impl_(new impl(atlas, filename, size)) {} -void texture_font::load_glyphs(unicode_block range, const color& col) { impl_->load_glyphs(range, col); } -std::vector texture_font::create_vertex_stream(const std::wstring& str, int x, int y, int parent_width, int parent_height) { return impl_->create_vertex_stream(str, x, y, parent_width, parent_height); } + std::wstring get_name() const + { + return name_; + } + + double get_size() const + { + return size_; + } +}; + +texture_font::texture_font(texture_atlas& atlas, const text_info& info, bool normalize_coordinates) : impl_(new impl(atlas, info, normalize_coordinates)) {} +void texture_font::load_glyphs(unicode_block range, const color& col) { impl_->load_glyphs(range, col); } +void texture_font::set_tracking(double tracking) { impl_->set_tracking(tracking); } +std::vector texture_font::create_vertex_stream(const std::wstring& str, int x, int y, int parent_width, int parent_height, string_metrics* metrics, double shear) { return impl_->create_vertex_stream(str, x, y, parent_width, parent_height, metrics, shear); } string_metrics texture_font::measure_string(const std::wstring& str) { return impl_->measure_string(str); } +std::wstring texture_font::get_name() const { return impl_->get_name(); } +double texture_font::get_size() const { return impl_->get_size(); } unicode_range get_range(unicode_block block) { - //TODO: implement - unicode_range range = {0x0000, 0x007F}; - return range; + switch(block) + { + case unicode_block::Basic_Latin: return unicode_range(0x0000, 0x007F); + case unicode_block::Latin_1_Supplement: return unicode_range(0x0080, 0x00FF); + case unicode_block::Latin_Extended_A: return unicode_range(0x0100, 0x017F); + case unicode_block::Latin_Extended_B: return unicode_range(0x0180, 0x024F); + case unicode_block::IPA_Extensions: return unicode_range(0x0250, 0x02AF); + case unicode_block::Spacing_Modifier_Letters: return unicode_range(0x02B0, 0x02FF); + case unicode_block::Combining_Diacritical_Marks: return unicode_range(0x0300, 0x036F); + case unicode_block::Greek_and_Coptic: return unicode_range(0x0370, 0x03FF); + case unicode_block::Cyrillic: return unicode_range(0x0400, 0x04FF); + case unicode_block::Cyrillic_Supplement: return unicode_range(0x0500, 0x052F); + case unicode_block::Armenian: return unicode_range(0x0530, 0x058F); + case unicode_block::Hebrew: return unicode_range(0x0590, 0x05FF); + case unicode_block::Arabic: return unicode_range(0x0600, 0x06FF); + case unicode_block::Syriac: return unicode_range(0x0700, 0x074F); + case unicode_block::Arabic_Supplement: return unicode_range(0x0750, 0x077F); + case unicode_block::Thaana: return unicode_range(0x0780, 0x07BF); + case unicode_block::NKo: return unicode_range(0x07C0, 0x07FF); + case unicode_block::Samaritan: return unicode_range(0x0800, 0x083F); + case unicode_block::Mandaic: return unicode_range(0x0840, 0x085F); + case unicode_block::Arabic_Extended_A: return unicode_range(0x08A0, 0x08FF); + case unicode_block::Devanagari: return unicode_range(0x0900, 0x097F); + case unicode_block::Bengali: return unicode_range(0x0980, 0x09FF); + case unicode_block::Gurmukhi: return unicode_range(0x0A00, 0x0A7F); + case unicode_block::Gujarati: return unicode_range(0x0A80, 0x0AFF); + case unicode_block::Oriya: return unicode_range(0x0B00, 0x0B7F); + case unicode_block::Tamil: return unicode_range(0x0B80, 0x0BFF); + case unicode_block::Telugu: return unicode_range(0x0C00, 0x0C7F); + case unicode_block::Kannada: return unicode_range(0x0C80, 0x0CFF); + case unicode_block::Malayalam: return unicode_range(0x0D00, 0x0D7F); + case unicode_block::Sinhala: return unicode_range(0x0D80, 0x0DFF); + case unicode_block::Thai: return unicode_range(0x0E00, 0x0E7F); + case unicode_block::Lao: return unicode_range(0x0E80, 0x0EFF); + case unicode_block::Tibetan: return unicode_range(0x0F00, 0x0FFF); + case unicode_block::Myanmar: return unicode_range(0x1000, 0x109F); + case unicode_block::Georgian: return unicode_range(0x10A0, 0x10FF); + case unicode_block::Hangul_Jamo: return unicode_range(0x1100, 0x11FF); + case unicode_block::Ethiopic: return unicode_range(0x1200, 0x137F); + case unicode_block::Ethiopic_Supplement: return unicode_range(0x1380, 0x139F); + case unicode_block::Cherokee: return unicode_range(0x13A0, 0x13FF); + case unicode_block::Unified_Canadian_Aboriginal_Syllabics: return unicode_range(0x1400, 0x167F); + case unicode_block::Ogham: return unicode_range(0x1680, 0x169F); + case unicode_block::Runic: return unicode_range(0x16A0, 0x16FF); + case unicode_block::Tagalog: return unicode_range(0x1700, 0x171F); + case unicode_block::Hanunoo: return unicode_range(0x1720, 0x173F); + case unicode_block::Buhid: return unicode_range(0x1740, 0x175F); + case unicode_block::Tagbanwa: return unicode_range(0x1760, 0x177F); + case unicode_block::Khmer: return unicode_range(0x1780, 0x17FF); + case unicode_block::Mongolian: return unicode_range(0x1800, 0x18AF); + case unicode_block::Unified_Canadian_Aboriginal_Syllabics_Extended: return unicode_range(0x18B0, 0x18FF); + case unicode_block::Limbu: return unicode_range(0x1900, 0x194F); + case unicode_block::Tai_Le: return unicode_range(0x1950, 0x197F); + case unicode_block::New_Tai_Lue: return unicode_range(0x1980, 0x19DF); + case unicode_block::Khmer_Symbols: return unicode_range(0x19E0, 0x19FF); + case unicode_block::Buginese: return unicode_range(0x1A00, 0x1A1F); + case unicode_block::Tai_Tham: return unicode_range(0x1A20, 0x1AAF); + case unicode_block::Balinese: return unicode_range(0x1B00, 0x1B7F); + case unicode_block::Sundanese: return unicode_range(0x1B80, 0x1BBF); + case unicode_block::Batak: return unicode_range(0x1BC0, 0x1BFF); + case unicode_block::Lepcha: return unicode_range(0x1C00, 0x1C4F); + case unicode_block::Ol_Chiki: return unicode_range(0x1C50, 0x1C7F); + case unicode_block::Sundanese_Supplement: return unicode_range(0x1CC0, 0x1CCF); + case unicode_block::Vedic_Extensions: return unicode_range(0x1CD0, 0x1CFF); + case unicode_block::Phonetic_Extensions: return unicode_range(0x1D00, 0x1D7F); + case unicode_block::Phonetic_Extensions_Supplement: return unicode_range(0x1D80, 0x1DBF); + case unicode_block::Combining_Diacritical_Marks_Supplement: return unicode_range(0x1DC0, 0x1DFF); + case unicode_block::Latin_Extended_Additional: return unicode_range(0x1E00, 0x1EFF); + case unicode_block::Greek_Extended: return unicode_range(0x1F00, 0x1FFF); + case unicode_block::General_Punctuation: return unicode_range(0x2000, 0x206F); + case unicode_block::Superscripts_and_Subscripts: return unicode_range(0x2070, 0x209F); + case unicode_block::Currency_Symbols: return unicode_range(0x20A0, 0x20CF); + case unicode_block::Combining_Diacritical_Marks_for_Symbols: return unicode_range(0x20D0, 0x20FF); + case unicode_block::Letterlike_Symbols: return unicode_range(0x2100, 0x214F); + case unicode_block::Number_Forms: return unicode_range(0x2150, 0x218F); + case unicode_block::Arrows: return unicode_range(0x2190, 0x21FF); + case unicode_block::Mathematical_Operators: return unicode_range(0x2200, 0x22FF); + case unicode_block::Miscellaneous_Technical: return unicode_range(0x2300, 0x23FF); + case unicode_block::Control_Pictures: return unicode_range(0x2400, 0x243F); + case unicode_block::Optical_Character_Recognition: return unicode_range(0x2440, 0x245F); + case unicode_block::Enclosed_Alphanumerics: return unicode_range(0x2460, 0x24FF); + case unicode_block::Box_Drawing: return unicode_range(0x2500, 0x257F); + case unicode_block::Block_Elements: return unicode_range(0x2580, 0x259F); + case unicode_block::Geometric_Shapes: return unicode_range(0x25A0, 0x25FF); + case unicode_block::Miscellaneous_Symbols: return unicode_range(0x2600, 0x26FF); + case unicode_block::Dingbats: return unicode_range(0x2700, 0x27BF); + case unicode_block::Miscellaneous_Mathematical_Symbols_A: return unicode_range(0x27C0, 0x27EF); + case unicode_block::Supplemental_Arrows_A: return unicode_range(0x27F0, 0x27FF); + case unicode_block::Braille_Patterns: return unicode_range(0x2800, 0x28FF); + case unicode_block::Supplemental_Arrows_B: return unicode_range(0x2900, 0x297F); + case unicode_block::Miscellaneous_Mathematical_Symbols_B: return unicode_range(0x2980, 0x29FF); + case unicode_block::Supplemental_Mathematical_Operators: return unicode_range(0x2A00, 0x2AFF); + case unicode_block::Miscellaneous_Symbols_and_Arrows: return unicode_range(0x2B00, 0x2BFF); + case unicode_block::Glagolitic: return unicode_range(0x2C00, 0x2C5F); + case unicode_block::Latin_Extended_C: return unicode_range(0x2C60, 0x2C7F); + case unicode_block::Coptic: return unicode_range(0x2C80, 0x2CFF); + case unicode_block::Georgian_Supplement: return unicode_range(0x2D00, 0x2D2F); + case unicode_block::Tifinagh: return unicode_range(0x2D30, 0x2D7F); + case unicode_block::Ethiopic_Extended: return unicode_range(0x2D80, 0x2DDF); + case unicode_block::Cyrillic_Extended_A: return unicode_range(0x2DE0, 0x2DFF); + case unicode_block::Supplemental_Punctuation: return unicode_range(0x2E00, 0x2E7F); + case unicode_block::CJK_Radicals_Supplement: return unicode_range(0x2E80, 0x2EFF); + case unicode_block::Kangxi_Radicals: return unicode_range(0x2F00, 0x2FDF); + case unicode_block::Ideographic_Description_Characters: return unicode_range(0x2FF0, 0x2FFF); + case unicode_block::CJK_Symbols_and_Punctuation: return unicode_range(0x3000, 0x303F); + case unicode_block::Hiragana: return unicode_range(0x3040, 0x309F); + case unicode_block::Katakana: return unicode_range(0x30A0, 0x30FF); + case unicode_block::Bopomofo: return unicode_range(0x3100, 0x312F); + case unicode_block::Hangul_Compatibility_Jamo: return unicode_range(0x3130, 0x318F); + case unicode_block::Kanbun: return unicode_range(0x3190, 0x319F); + case unicode_block::Bopomofo_Extended: return unicode_range(0x31A0, 0x31BF); + case unicode_block::CJK_Strokes: return unicode_range(0x31C0, 0x31EF); + case unicode_block::Katakana_Phonetic_Extensions: return unicode_range(0x31F0, 0x31FF); + case unicode_block::Enclosed_CJK_Letters_and_Months: return unicode_range(0x3200, 0x32FF); + case unicode_block::CJK_Compatibility: return unicode_range(0x3300, 0x33FF); + case unicode_block::CJK_Unified_Ideographs_Extension_A: return unicode_range(0x3400, 0x4DBF); + case unicode_block::Yijing_Hexagram_Symbols: return unicode_range(0x4DC0, 0x4DFF); + case unicode_block::CJK_Unified_Ideographs: return unicode_range(0x4E00, 0x9FFF); + case unicode_block::Yi_Syllables: return unicode_range(0xA000, 0xA48F); + case unicode_block::Yi_Radicals: return unicode_range(0xA490, 0xA4CF); + case unicode_block::Lisu: return unicode_range(0xA4D0, 0xA4FF); + case unicode_block::Vai: return unicode_range(0xA500, 0xA63F); + case unicode_block::Cyrillic_Extended_B: return unicode_range(0xA640, 0xA69F); + case unicode_block::Bamum: return unicode_range(0xA6A0, 0xA6FF); + case unicode_block::Modifier_Tone_Letters: return unicode_range(0xA700, 0xA71F); + case unicode_block::Latin_Extended_D: return unicode_range(0xA720, 0xA7FF); + case unicode_block::Syloti_Nagri: return unicode_range(0xA800, 0xA82F); + case unicode_block::Common_Indic_Number_Forms: return unicode_range(0xA830, 0xA83F); + case unicode_block::Phags_pa: return unicode_range(0xA840, 0xA87F); + case unicode_block::Saurashtra: return unicode_range(0xA880, 0xA8DF); + case unicode_block::Devanagari_Extended: return unicode_range(0xA8E0, 0xA8FF); + case unicode_block::Kayah_Li: return unicode_range(0xA900, 0xA92F); + case unicode_block::Rejang: return unicode_range(0xA930, 0xA95F); + case unicode_block::Hangul_Jamo_Extended_A: return unicode_range(0xA960, 0xA97F); + case unicode_block::Javanese: return unicode_range(0xA980, 0xA9DF); + case unicode_block::Cham: return unicode_range(0xAA00, 0xAA5F); + case unicode_block::Myanmar_Extended_A: return unicode_range(0xAA60, 0xAA7F); + case unicode_block::Tai_Viet: return unicode_range(0xAA80, 0xAADF); + case unicode_block::Meetei_Mayek_Extensions: return unicode_range(0xAAE0, 0xAAFF); + case unicode_block::Ethiopic_Extended_A: return unicode_range(0xAB00, 0xAB2F); + case unicode_block::Meetei_Mayek: return unicode_range(0xABC0, 0xABFF); + case unicode_block::Hangul_Syllables: return unicode_range(0xAC00, 0xD7AF); + case unicode_block::Hangul_Jamo_Extended_B: return unicode_range(0xD7B0, 0xD7FF); + case unicode_block::High_Surrogates: return unicode_range(0xD800, 0xDB7F); + case unicode_block::High_Private_Use_Surrogates: return unicode_range(0xDB80, 0xDBFF); + case unicode_block::Low_Surrogates: return unicode_range(0xDC00, 0xDFFF); + case unicode_block::Private_Use_Area: return unicode_range(0xE000, 0xF8FF); + case unicode_block::CJK_Compatibility_Ideographs: return unicode_range(0xF900, 0xFAFF); + case unicode_block::Alphabetic_Presentation_Forms: return unicode_range(0xFB00, 0xFB4F); + case unicode_block::Arabic_Presentation_Forms_A: return unicode_range(0xFB50, 0xFDFF); + case unicode_block::Variation_Selectors: return unicode_range(0xFE00, 0xFE0F); + case unicode_block::Vertical_Forms: return unicode_range(0xFE10, 0xFE1F); + case unicode_block::Combining_Half_Marks: return unicode_range(0xFE20, 0xFE2F); + case unicode_block::CJK_Compatibility_Forms: return unicode_range(0xFE30, 0xFE4F); + case unicode_block::Small_Form_Variants: return unicode_range(0xFE50, 0xFE6F); + case unicode_block::Arabic_Presentation_Forms_B: return unicode_range(0xFE70, 0xFEFF); + case unicode_block::Halfwidth_and_Fullwidth_Forms: return unicode_range(0xFF00, 0xFFEF); + case unicode_block::Specials: return unicode_range(0xFFF0, 0xFFFF); + case unicode_block::Linear_B_Syllabary: return unicode_range(0x10000, 0x1007F); + case unicode_block::Linear_B_Ideograms: return unicode_range(0x10080, 0x100FF); + case unicode_block::Aegean_Numbers: return unicode_range(0x10100, 0x1013F); + case unicode_block::Ancient_Greek_Numbers: return unicode_range(0x10140, 0x1018F); + case unicode_block::Ancient_Symbols: return unicode_range(0x10190, 0x101CF); + case unicode_block::Phaistos_Disc: return unicode_range(0x101D0, 0x101FF); + case unicode_block::Lycian: return unicode_range(0x10280, 0x1029F); + case unicode_block::Carian: return unicode_range(0x102A0, 0x102DF); + case unicode_block::Old_Italic: return unicode_range(0x10300, 0x1032F); + case unicode_block::Gothic: return unicode_range(0x10330, 0x1034F); + case unicode_block::Ugaritic: return unicode_range(0x10380, 0x1039F); + case unicode_block::Old_Persian: return unicode_range(0x103A0, 0x103DF); + case unicode_block::Deseret: return unicode_range(0x10400, 0x1044F); + case unicode_block::Shavian: return unicode_range(0x10450, 0x1047F); + case unicode_block::Osmanya: return unicode_range(0x10480, 0x104AF); + case unicode_block::Cypriot_Syllabary: return unicode_range(0x10800, 0x1083F); + case unicode_block::Imperial_Aramaic: return unicode_range(0x10840, 0x1085F); + case unicode_block::Phoenician: return unicode_range(0x10900, 0x1091F); + case unicode_block::Lydian: return unicode_range(0x10920, 0x1093F); + case unicode_block::Meroitic_Hieroglyphs: return unicode_range(0x10980, 0x1099F); + case unicode_block::Meroitic_Cursive: return unicode_range(0x109A0, 0x109FF); + case unicode_block::Kharoshthi: return unicode_range(0x10A00, 0x10A5F); + case unicode_block::Old_South_Arabian: return unicode_range(0x10A60, 0x10A7F); + case unicode_block::Avestan: return unicode_range(0x10B00, 0x10B3F); + case unicode_block::Inscriptional_Parthian: return unicode_range(0x10B40, 0x10B5F); + case unicode_block::Inscriptional_Pahlavi: return unicode_range(0x10B60, 0x10B7F); + case unicode_block::Old_Turkic: return unicode_range(0x10C00, 0x10C4F); + case unicode_block::Rumi_Numeral_Symbols: return unicode_range(0x10E60, 0x10E7F); + case unicode_block::Brahmi: return unicode_range(0x11000, 0x1107F); + case unicode_block::Kaithi: return unicode_range(0x11080, 0x110CF); + case unicode_block::Sora_Sompeng: return unicode_range(0x110D0, 0x110FF); + case unicode_block::Chakma: return unicode_range(0x11100, 0x1114F); + case unicode_block::Sharada: return unicode_range(0x11180, 0x111DF); + case unicode_block::Takri: return unicode_range(0x11680, 0x116CF); + case unicode_block::Cuneiform: return unicode_range(0x12000, 0x123FF); + case unicode_block::Cuneiform_Numbers_and_Punctuation: return unicode_range(0x12400, 0x1247F); + case unicode_block::Egyptian_Hieroglyphs: return unicode_range(0x13000, 0x1342F); + case unicode_block::Bamum_Supplement: return unicode_range(0x16800, 0x16A3F); + case unicode_block::Miao: return unicode_range(0x16F00, 0x16F9F); + case unicode_block::Kana_Supplement: return unicode_range(0x1B000, 0x1B0FF); + case unicode_block::Byzantine_Musical_Symbols: return unicode_range(0x1D000, 0x1D0FF); + case unicode_block::Musical_Symbols: return unicode_range(0x1D100, 0x1D1FF); + case unicode_block::Ancient_Greek_Musical_Notation: return unicode_range(0x1D200, 0x1D24F); + case unicode_block::Tai_Xuan_Jing_Symbols: return unicode_range(0x1D300, 0x1D35F); + case unicode_block::Counting_Rod_Numerals: return unicode_range(0x1D360, 0x1D37F); + case unicode_block::Mathematical_Alphanumeric_Symbols: return unicode_range(0x1D400, 0x1D7FF); + case unicode_block::Arabic_Mathematical_Alphabetic_Symbols: return unicode_range(0x1EE00, 0x1EEFF); + case unicode_block::Mahjong_Tiles: return unicode_range(0x1F000, 0x1F02F); + case unicode_block::Domino_Tiles: return unicode_range(0x1F030, 0x1F09F); + case unicode_block::Playing_Cards: return unicode_range(0x1F0A0, 0x1F0FF); + case unicode_block::Enclosed_Alphanumeric_Supplement: return unicode_range(0x1F100, 0x1F1FF); + case unicode_block::Enclosed_Ideographic_Supplement: return unicode_range(0x1F200, 0x1F2FF); + case unicode_block::Miscellaneous_Symbols_And_Pictographs: return unicode_range(0x1F300, 0x1F5FF); + case unicode_block::Emoticons: return unicode_range(0x1F600, 0x1F64F); + case unicode_block::Transport_And_Map_Symbols: return unicode_range(0x1F680, 0x1F6FF); + case unicode_block::Alchemical_Symbols: return unicode_range(0x1F700, 0x1F77F); + case unicode_block::CJK_Unified_Ideographs_Extension_B: return unicode_range(0x20000, 0x2A6DF); + case unicode_block::CJK_Unified_Ideographs_Extension_C: return unicode_range(0x2A700, 0x2B73F); + case unicode_block::CJK_Unified_Ideographs_Extension_D: return unicode_range(0x2B740, 0x2B81F); + case unicode_block::CJK_Compatibility_Ideographs_Supplement: return unicode_range(0x2F800, 0x2FA1F); + case unicode_block::Tags: return unicode_range(0xE0000, 0xE007F); + case unicode_block::Variation_Selectors_Supplement: return unicode_range(0xE0100, 0xE01EF); + case unicode_block::Supplementary_Private_Use_Area_A: return unicode_range(0xF0000, 0xFFFFF); + case unicode_block::Supplementary_Private_Use_Area_B: return unicode_range(0x100000, 0x10FFFF); + } + return unicode_range(0,0); } }}} - -//unicode blocks -/* - range(0x0000, 0x007F); - range(0x0080, 0x00FF); - range(0x0100, 0x017F); - range(0x0180, 0x024F); - range(0x0250, 0x02AF); - range(0x02B0, 0x02FF); - range(0x0300, 0x036F); - range(0x0370, 0x03FF); - range(0x0400, 0x04FF); - range(0x0500, 0x052F); - range(0x0530, 0x058F); - range(0x0590, 0x05FF); - range(0x0600, 0x06FF); - range(0x0700, 0x074F); - range(0x0750, 0x077F); - range(0x0780, 0x07BF); - range(0x07C0, 0x07FF); - range(0x0800, 0x083F); - range(0x0840, 0x085F); - range(0x08A0, 0x08FF); - range(0x0900, 0x097F); - range(0x0980, 0x09FF); - range(0x0A00, 0x0A7F); - range(0x0A80, 0x0AFF); - range(0x0B00, 0x0B7F); - range(0x0B80, 0x0BFF); - range(0x0C00, 0x0C7F); - range(0x0C80, 0x0CFF); - range(0x0D00, 0x0D7F); - range(0x0D80, 0x0DFF); - range(0x0E00, 0x0E7F); - range(0x0E80, 0x0EFF); - range(0x0F00, 0x0FFF); - range(0x1000, 0x109F); - range(0x10A0, 0x10FF); - range(0x1100, 0x11FF); - range(0x1200, 0x137F); - range(0x1380, 0x139F); - range(0x13A0, 0x13FF); - range(0x1400, 0x167F); - range(0x1680, 0x169F); - range(0x16A0, 0x16FF); - range(0x1700, 0x171F); - range(0x1720, 0x173F); - range(0x1740, 0x175F); - range(0x1760, 0x177F); - range(0x1780, 0x17FF); - range(0x1800, 0x18AF); - range(0x18B0, 0x18FF); - range(0x1900, 0x194F); - range(0x1950, 0x197F); - range(0x1980, 0x19DF); - range(0x19E0, 0x19FF); - range(0x1A00, 0x1A1F); - range(0x1A20, 0x1AAF); - range(0x1B00, 0x1B7F); - range(0x1B80, 0x1BBF); - range(0x1BC0, 0x1BFF); - range(0x1C00, 0x1C4F); - range(0x1C50, 0x1C7F); - range(0x1CC0, 0x1CCF); - range(0x1CD0, 0x1CFF); - range(0x1D00, 0x1D7F); - range(0x1D80, 0x1DBF); - range(0x1DC0, 0x1DFF); - range(0x1E00, 0x1EFF); - range(0x1F00, 0x1FFF); - range(0x2000, 0x206F); - range(0x2070, 0x209F); - range(0x20A0, 0x20CF); - range(0x20D0, 0x20FF); - range(0x2100, 0x214F); - range(0x2150, 0x218F); - range(0x2190, 0x21FF); - range(0x2200, 0x22FF); - range(0x2300, 0x23FF); - range(0x2400, 0x243F); - range(0x2440, 0x245F); - range(0x2460, 0x24FF); - range(0x2500, 0x257F); - range(0x2580, 0x259F); - range(0x25A0, 0x25FF); - range(0x2600, 0x26FF); - range(0x2700, 0x27BF); - range(0x27C0, 0x27EF); - range(0x27F0, 0x27FF); - range(0x2800, 0x28FF); - range(0x2900, 0x297F); - range(0x2980, 0x29FF); - range(0x2A00, 0x2AFF); - range(0x2B00, 0x2BFF); - range(0x2C00, 0x2C5F); - range(0x2C60, 0x2C7F); - range(0x2C80, 0x2CFF); - range(0x2D00, 0x2D2F); - range(0x2D30, 0x2D7F); - range(0x2D80, 0x2DDF); - range(0x2DE0, 0x2DFF); - range(0x2E00, 0x2E7F); - range(0x2E80, 0x2EFF); - range(0x2F00, 0x2FDF); - range(0x2FF0, 0x2FFF); - range(0x3000, 0x303F); - range(0x3040, 0x309F); - range(0x30A0, 0x30FF); - range(0x3100, 0x312F); - range(0x3130, 0x318F); - range(0x3190, 0x319F); - range(0x31A0, 0x31BF); - range(0x31C0, 0x31EF); - range(0x31F0, 0x31FF); - range(0x3200, 0x32FF); - range(0x3300, 0x33FF); - range(0x3400, 0x4DBF); - range(0x4DC0, 0x4DFF); - range(0x4E00, 0x9FFF); - range(0xA000, 0xA48F); - range(0xA490, 0xA4CF); - range(0xA4D0, 0xA4FF); - range(0xA500, 0xA63F); - range(0xA640, 0xA69F); - range(0xA6A0, 0xA6FF); - range(0xA700, 0xA71F); - range(0xA720, 0xA7FF); - range(0xA800, 0xA82F); - range(0xA830, 0xA83F); - range(0xA840, 0xA87F); - range(0xA880, 0xA8DF); - range(0xA8E0, 0xA8FF); - range(0xA900, 0xA92F); - range(0xA930, 0xA95F); - range(0xA960, 0xA97F); - range(0xA980, 0xA9DF); - range(0xAA00, 0xAA5F); - range(0xAA60, 0xAA7F); - range(0xAA80, 0xAADF); - range(0xAAE0, 0xAAFF); - range(0xAB00, 0xAB2F); - range(0xABC0, 0xABFF); - range(0xAC00, 0xD7AF); - range(0xD7B0, 0xD7FF); - range(0xD800, 0xDB7F); - range(0xDB80, 0xDBFF); - range(0xDC00, 0xDFFF); - range(0xE000, 0xF8FF); - range(0xF900, 0xFAFF); - range(0xFB00, 0xFB4F); - range(0xFB50, 0xFDFF); - range(0xFE00, 0xFE0F); - range(0xFE10, 0xFE1F); - range(0xFE20, 0xFE2F); - range(0xFE30, 0xFE4F); - range(0xFE50, 0xFE6F); - range(0xFE70, 0xFEFF); - range(0xFF00, 0xFFEF); - range(0xFFF0, 0xFFFF); - range(0x10000, 0x1007F); - range(0x10080, 0x100FF); - range(0x10100, 0x1013F); - range(0x10140, 0x1018F); - range(0x10190, 0x101CF); - range(0x101D0, 0x101FF); - range(0x10280, 0x1029F); - range(0x102A0, 0x102DF); - range(0x10300, 0x1032F); - range(0x10330, 0x1034F); - range(0x10380, 0x1039F); - range(0x103A0, 0x103DF); - range(0x10400, 0x1044F); - range(0x10450, 0x1047F); - range(0x10480, 0x104AF); - range(0x10800, 0x1083F); - range(0x10840, 0x1085F); - range(0x10900, 0x1091F); - range(0x10920, 0x1093F); - range(0x10980, 0x1099F); - range(0x109A0, 0x109FF); - range(0x10A00, 0x10A5F); - range(0x10A60, 0x10A7F); - range(0x10B00, 0x10B3F); - range(0x10B40, 0x10B5F); - range(0x10B60, 0x10B7F); - range(0x10C00, 0x10C4F); - range(0x10E60, 0x10E7F); - range(0x11000, 0x1107F); - range(0x11080, 0x110CF); - range(0x110D0, 0x110FF); - range(0x11100, 0x1114F); - range(0x11180, 0x111DF); - range(0x11680, 0x116CF); - range(0x12000, 0x123FF); - range(0x12400, 0x1247F); - range(0x13000, 0x1342F); - range(0x16800, 0x16A3F); - range(0x16F00, 0x16F9F); - range(0x1B000, 0x1B0FF); - range(0x1D000, 0x1D0FF); - range(0x1D100, 0x1D1FF); - range(0x1D200, 0x1D24F); - range(0x1D300, 0x1D35F); - range(0x1D360, 0x1D37F); - range(0x1D400, 0x1D7FF); - range(0x1EE00, 0x1EEFF); - range(0x1F000, 0x1F02F); - range(0x1F030, 0x1F09F); - range(0x1F0A0, 0x1F0FF); - range(0x1F100, 0x1F1FF); - range(0x1F200, 0x1F2FF); - range(0x1F300, 0x1F5FF); - range(0x1F600, 0x1F64F); - range(0x1F680, 0x1F6FF); - range(0x1F700, 0x1F77F); - range(0x20000, 0x2A6DF); - range(0x2A700, 0x2B73F); - range(0x2B740, 0x2B81F); - range(0x2F800, 0x2FA1F); - range(0xE0000, 0xE007F); - range(0xE0100, 0xE01EF); - range(0xF0000, 0xFFFFF); - range(0x100000, 0x10FFFF); -*/ \ No newline at end of file