From e3d8421b9ed220e3a6e858cef4382b40987e7786 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 31 Oct 2017 13:56:30 -0400 Subject: [PATCH] Respond to CR. // FREEBIE --- Scripts/emoji_ranges.py | 8 ++++++-- Signal/src/util/DisplayableText.swift | 5 +++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Scripts/emoji_ranges.py b/Scripts/emoji_ranges.py index d25e0e84c..32cc9b698 100755 --- a/Scripts/emoji_ranges.py +++ b/Scripts/emoji_ranges.py @@ -10,6 +10,9 @@ def fail(message): print message sys.exit(1) +# For simplicity and compactness, we pre-define the +# emoji code planes to ensure that all of the currently-used +# emoji ranges within them are combined. big_ranges = [ (0x1F600,0x1F64F, ), (0x1F300,0x1F5FF, ), @@ -22,8 +25,6 @@ big_ranges = [ (8400, 8447,) ] -# def is_in_big_range(range_start, range_end) - if __name__ == '__main__': src_filename = "emoji-data.txt" src_dir_path = os.path.dirname(__file__) @@ -80,5 +81,8 @@ if __name__ == '__main__': # print '0x%X...0x%X, // %d Emotions' % (range_start, range_end, (1 + range_end - range_start), ) print 'EmojiRange(rangeStart:0x%X, rangeEnd:0x%X),' % (range_start, range_end, ) print 'new_ranges:', len(new_ranges) + print + print 'Copy and paste the code above into DisplayableText.swift' + print diff --git a/Signal/src/util/DisplayableText.swift b/Signal/src/util/DisplayableText.swift index dd56ec71b..32c54b493 100644 --- a/Signal/src/util/DisplayableText.swift +++ b/Signal/src/util/DisplayableText.swift @@ -22,6 +22,11 @@ extension UnicodeScalar { // https://www.unicode.org/Public/emoji/ // Current Version: // https://www.unicode.org/Public/emoji/6.0/emoji-data.txt + // + // These ranges can be code-generated using: + // + // * Scripts/emoji-data.txt + // * Scripts/emoji_ranges.py static let kEmojiRanges = [ EmojiRange(rangeStart:0x23, rangeEnd:0x23), EmojiRange(rangeStart:0x2A, rangeEnd:0x2A),