diff options
Diffstat (limited to 'system/noto-emoji/patches')
| -rw-r--r-- | system/noto-emoji/patches/1e8488167c26ac1e780e374961d08f1fb1d1e880.patch | 84 | ||||
| -rw-r--r-- | system/noto-emoji/patches/d34c13fb99f07d09c0c98192e7998186a622e28c.patch | 162 |
2 files changed, 246 insertions, 0 deletions
diff --git a/system/noto-emoji/patches/1e8488167c26ac1e780e374961d08f1fb1d1e880.patch b/system/noto-emoji/patches/1e8488167c26ac1e780e374961d08f1fb1d1e880.patch new file mode 100644 index 0000000000000..35bdd3d6616cc --- /dev/null +++ b/system/noto-emoji/patches/1e8488167c26ac1e780e374961d08f1fb1d1e880.patch @@ -0,0 +1,84 @@ +From 1e8488167c26ac1e780e374961d08f1fb1d1e880 Mon Sep 17 00:00:00 2001 +From: Andrew Clemons <andrew.clemons@gmail.com> +Date: Thu, 9 Mar 2017 21:48:18 +1300 +Subject: [PATCH] Add support for "narrow" python to emoji_builder.py + +The code currently only works with wide builds since it does not take +UTF-16 surrogate pairs into account. +--- + third_party/color_emoji/emoji_builder.py | 41 ++++++++++++++++++++++++++++---- + 1 file changed, 37 insertions(+), 4 deletions(-) + +diff --git a/third_party/color_emoji/emoji_builder.py b/third_party/color_emoji/emoji_builder.py +index c118e83..3d3e0c8 100644 +--- a/third_party/color_emoji/emoji_builder.py ++++ b/third_party/color_emoji/emoji_builder.py +@@ -25,10 +25,36 @@ + + from nototools import font_data + ++def myunichr(cp): ++ if sys.maxunicode < 0x10FFFF and cp > 0xFFFF: ++ return ("\\U" + hex(cp)[2:].zfill(8)).decode("unicode-escape") ++ return unichr(cp) ++ ++def myord(high, low): ++ return (ord(high) - 0xD800) * 0x400 + (ord(low) - 0xDC00) + 0x10000 ++ ++def begins_with_surrogate(string): ++ return sys.maxunicode < 0x10FFFF and len(string) > 1 and (0xD800 <= ord(string[0]) <= 0xDBFF) and (0xDC00 <= ord(string[1]) <= 0xDFFF) ++ + def get_glyph_name_from_gsub (string, font, cmap_dict): + ligatures = font['GSUB'].table.LookupList.Lookup[0].SubTable[0].ligatures +- first_glyph = cmap_dict[ord (string[0])] +- rest_of_glyphs = [cmap_dict[ord (ch)] for ch in string[1:]] ++ ++ if begins_with_surrogate(string): ++ first_glyph = cmap_dict[myord(string[0], string[1])] ++ string = string[2:] ++ else: ++ first_glyph = cmap_dict[ord (string[0])] ++ string = string[1:] ++ ++ rest_of_glyphs = [] ++ while (len(string) > 0): ++ if begins_with_surrogate(string): ++ rest_of_glyphs.append(cmap_dict[myord(string[0], string[1])]) ++ string = string[2:] ++ else: ++ rest_of_glyphs.append(cmap_dict[ord (string[0])]) ++ string = string[1:] ++ + for ligature in ligatures[first_glyph]: + if ligature.Component == rest_of_glyphs: + return ligature.LigGlyph +@@ -462,13 +488,13 @@ def is_vs(cp): + if "_" in codes: + pieces = codes.split ("_") + cps = [int(code, 16) for code in pieces] +- uchars = "".join ([unichr(cp) for cp in cps if not is_vs(cp)]) ++ uchars = "".join ([myunichr(cp) for cp in cps if not is_vs(cp)]) + else: + cp = int(codes, 16) + if is_vs(cp): + print "ignoring unexpected vs input %04x" % cp + continue +- uchars = unichr(cp) ++ uchars = myunichr(cp) + img_files[uchars] = img_file + if not img_files: + raise Exception ("No image files found in '%s'." % glb) +@@ -483,6 +509,13 @@ def is_vs(cp): + except: + print "no cmap entry for %x" % ord(uchars) + raise ValueError("%x" % ord(uchars)) ++ elif len (uchars) == 2 and begins_with_surrogate(uchars): ++ cp = myord(uchars[0], uchars[1]) ++ try: ++ glyph_name = unicode_cmap.cmap[cp] ++ except: ++ print "no cmap entry for %x" % cp ++ raise ValueError("%x" % ord(uchars)) + else: + glyph_name = get_glyph_name_from_gsub (uchars, font, unicode_cmap.cmap) + glyph_id = font.getGlyphID (glyph_name) diff --git a/system/noto-emoji/patches/d34c13fb99f07d09c0c98192e7998186a622e28c.patch b/system/noto-emoji/patches/d34c13fb99f07d09c0c98192e7998186a622e28c.patch new file mode 100644 index 0000000000000..6b7b93f5fb9c4 --- /dev/null +++ b/system/noto-emoji/patches/d34c13fb99f07d09c0c98192e7998186a622e28c.patch @@ -0,0 +1,162 @@ +From d34c13fb99f07d09c0c98192e7998186a622e28c Mon Sep 17 00:00:00 2001 +From: Andrew Clemons <andrew.clemons@gmail.com> +Date: Tue, 7 Mar 2017 18:13:40 +1300 +Subject: [PATCH] Tidy mixed tabs and spaces + +--- + third_party/color_emoji/emoji_builder.py | 76 ++++++++++++++++---------------- + 1 file changed, 37 insertions(+), 39 deletions(-) + +diff --git a/third_party/color_emoji/emoji_builder.py b/third_party/color_emoji/emoji_builder.py +index c847fdb..c118e83 100644 +--- a/third_party/color_emoji/emoji_builder.py ++++ b/third_party/color_emoji/emoji_builder.py +@@ -33,7 +33,6 @@ def get_glyph_name_from_gsub (string, font, cmap_dict): + if ligature.Component == rest_of_glyphs: + return ligature.LigGlyph + +- + def div (a, b): + return int (round (a / float (b))) + +@@ -111,11 +110,11 @@ def write_smallGlyphMetrics (self, width, height): + line_height = (ascent + descent) * y_ppem / float (upem) + line_ascent = ascent * y_ppem / float (upem) + y_bearing = int (round (line_ascent - .5 * (line_height - height))) +- # fudge y_bearing if calculations are a bit off +- if y_bearing == 128: +- y_bearing = 127 ++ # fudge y_bearing if calculations are a bit off ++ if y_bearing == 128: ++ y_bearing = 127 + advance = width +- # print "small glyph metrics h: %d w: %d" % (height, width) ++ # print "small glyph metrics h: %d w: %d" % (height, width) + # smallGlyphMetrics + # Type Name + # BYTE height +@@ -123,14 +122,14 @@ def write_smallGlyphMetrics (self, width, height): + # CHAR BearingX + # CHAR BearingY + # BYTE Advance +- try: +- self.write (struct.pack ("BBbbB", +- height, width, +- x_bearing, y_bearing, +- advance)) +- except Exception as e: +- raise ValueError("%s, h: %d w: %d x: %d y: %d %d a:" % ( +- e, height, width, x_bearing, y_bearing, advance)) ++ try: ++ self.write (struct.pack ("BBbbB", ++ height, width, ++ x_bearing, y_bearing, ++ advance)) ++ except Exception as e: ++ raise ValueError("%s, h: %d w: %d x: %d y: %d %d a:" % ( ++ e, height, width, x_bearing, y_bearing, advance)) + + def write_format1 (self, png): + +@@ -253,11 +252,11 @@ def write_sbitLineMetrics_hori (self): + ascent = div (ascent * y_ppem, upem) + descent = - (line_height - ascent) + self.write (struct.pack ("bbBbbbbbbbbb", +- ascent, descent, +- self.strike_metrics.width, +- 0, 0, 0, +- 0, 0, 0, 0, # TODO +- 0, 0)) ++ ascent, descent, ++ self.strike_metrics.width, ++ 0, 0, 0, ++ 0, 0, 0, 0, # TODO ++ 0, 0)) + + def write_sbitLineMetrics_vert (self): + self.write_sbitLineMetrics_hori () # XXX +@@ -430,10 +429,10 @@ def drop_outline_tables (font): + print "Loaded font '%s'." % font_file + + font_metrics = FontMetrics (font['head'].unitsPerEm, +- font['hhea'].ascent, +- -font['hhea'].descent) ++ font['hhea'].ascent, ++ -font['hhea'].descent) + print "Font metrics: upem=%d ascent=%d descent=%d." % \ +- (font_metrics.upem, font_metrics.ascent, font_metrics.descent) ++ (font_metrics.upem, font_metrics.ascent, font_metrics.descent) + glyph_metrics = font['hmtx'].metrics + unicode_cmap = font['cmap'].getcmap (3, 10) + if not unicode_cmap: +@@ -449,8 +448,8 @@ def drop_outline_tables (font): + eblc.write_header () + eblc.start_strikes (len (img_prefixes)) + +- def is_vs(cp): +- return cp >= 0xfe00 and cp <= 0xfe0f ++ def is_vs(cp): ++ return cp >= 0xfe00 and cp <= 0xfe0f + + for img_prefix in img_prefixes: + print +@@ -462,13 +461,13 @@ def is_vs(cp): + codes = img_file[len (img_prefix):-4] + if "_" in codes: + pieces = codes.split ("_") +- cps = [int(code, 16) for code in pieces] ++ cps = [int(code, 16) for code in pieces] + uchars = "".join ([unichr(cp) for cp in cps if not is_vs(cp)]) + else: +- cp = int(codes, 16) +- if is_vs(cp): +- print "ignoring unexpected vs input %04x" % cp +- continue ++ cp = int(codes, 16) ++ if is_vs(cp): ++ print "ignoring unexpected vs input %04x" % cp ++ continue + uchars = unichr(cp) + img_files[uchars] = img_file + if not img_files: +@@ -479,19 +478,18 @@ def is_vs(cp): + advance = width = height = 0 + for uchars, img_file in img_files.items (): + if len (uchars) == 1: +- try: +- glyph_name = unicode_cmap.cmap[ord (uchars)] +- except: +- print "no cmap entry for %x" % ord(uchars) +- raise ValueError("%x" % ord(uchars)) ++ try: ++ glyph_name = unicode_cmap.cmap[ord (uchars)] ++ except: ++ print "no cmap entry for %x" % ord(uchars) ++ raise ValueError("%x" % ord(uchars)) + else: + glyph_name = get_glyph_name_from_gsub (uchars, font, unicode_cmap.cmap) + glyph_id = font.getGlyphID (glyph_name) + glyph_imgs[glyph_id] = img_file + if "verbose" in options: + uchars_name = ",".join (["%04X" % ord (char) for char in uchars]) +- # print "Matched U+%s: id=%d name=%s image=%s" % ( +- # uchars_name, glyph_id, glyph_name, img_file) ++ # print "Matched U+%s: id=%d name=%s image=%s" % (uchars_name, glyph_id, glyph_name, img_file) + + advance += glyph_metrics[glyph_name][0] + w, h = PNG (img_file).get_size () +@@ -529,10 +527,10 @@ def is_vs(cp): + drop_outline_tables (font) + print "Dropped outline ('glyf', 'CFF ') and related tables." + +- # hack removal of cmap pua entry for unknown flag glyph. If we try to +- # remove it earlier, getGlyphID dies. Need to restructure all of this +- # code. +- font_data.delete_from_cmap(font, [0xfe82b]) ++ # hack removal of cmap pua entry for unknown flag glyph. If we try to ++ # remove it earlier, getGlyphID dies. Need to restructure all of this ++ # code. ++ font_data.delete_from_cmap(font, [0xfe82b]) + + font.save (out_file) + print "Output font '%s' generated." % out_file |