Merge "Update fontchain lint to allow different versions between emoji flag... (64671271) · Commits · e / os / android_frameworks_base

tools/fonts/fontchain_linter.py

+16 −5

Original line number	Diff line number	Diff line
		@@ -18,6 +18,13 @@ EMOJI_FONT_TO_UNICODE_MAP = {
		'2.047': 16.0,
		}

		EMOJI_FLAG_FONT_TO_UNICODE_MAP = {
		'2.034': 15.0,
		'2.042': 15.1,
		'2.047': 16.0,
		'2.048': 16.0,
		}

		EMOJI_VS = 0xFE0F

		LANG_TO_SCRIPT = {
		@@ -415,9 +422,13 @@ def check_emoji_not_compat(all_emoji, equivalent_emoji):
		def is_flag_emoji(font):
		return 0x1F1E6 in get_best_cmap(font)

		def emoji_font_version_to_unicode_version(font_version):
		def emoji_font_version_to_unicode_version(font_version, flag_font):
		version_str = '%.3f' % font_version
		assert version_str in EMOJI_FONT_TO_UNICODE_MAP, 'Unknown emoji font verion: %s' % version_str
		if flag_font:
		assert version_str in EMOJI_FLAG_FONT_TO_UNICODE_MAP, 'Unknown emoji flag font version: %s' % version_str
		return EMOJI_FLAG_FONT_TO_UNICODE_MAP[version_str]
		else:
		assert version_str in EMOJI_FONT_TO_UNICODE_MAP, 'Unknown emoji font version: %s' % version_str
		return EMOJI_FONT_TO_UNICODE_MAP[version_str]


		@@ -435,8 +446,8 @@ def check_emoji_font_coverage(emoji_fonts, all_emoji, equivalent_emoji):
		else:
		emoji_font_version = max(emoji_font_version, version)

		emoji_flag_unicode_version = emoji_font_version_to_unicode_version(emoji_flag_font_version)
		emoji_unicode_version = emoji_font_version_to_unicode_version(emoji_font_version)
		emoji_flag_unicode_version = emoji_font_version_to_unicode_version(emoji_flag_font_version, True)
		emoji_unicode_version = emoji_font_version_to_unicode_version(emoji_font_version, False)

		errors = []