cappy4king
/
marseymoji
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #315 from kabisa/bugfix/fontlinter-flag-fix 

Bugfix/fontlinter flag fix
pull/320/head
rsheeter 2020-08-20 15:06:13 -07:00 committed by GitHub
parent 0cdf6f96ff 65a6737423
commit ad60afb8aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -209,7 +209,7 @@ $(COMPRESSED_DIR)/%.png: $(QUANTIZED_DIR)/%.png | check_tools $(COMPRESSED_DIR)
$(EMOJI).ttf: check_sequence $(EMOJI).tmpl.ttf $(EMOJI_BUILDER) $(PUA_ADDER) \ $(EMOJI).ttf: check_sequence $(EMOJI).tmpl.ttf $(EMOJI_BUILDER) $(PUA_ADDER) \
$(ALL_COMPRESSED_FILES) | check_tools $(ALL_COMPRESSED_FILES) | check_tools
@$(PYTHON) $(EMOJI_BUILDER) $(SMALL_METRICS) -V $< "$@" "$(COMPRESSED_DIR)/emoji_u" @$(PYTHON) $(EMOJI_BUILDER) $(SMALL_METRICS) -V $(word 2,$^) "$@" "$(COMPRESSED_DIR)/emoji_u"
@$(PYTHON) $(PUA_ADDER) "$@" "$@-with-pua" @$(PYTHON) $(PUA_ADDER) "$@" "$@-with-pua"
@$(VS_ADDER) -vs 2640 2642 2695 --dstdir '.' -o "$@-with-pua-varsel" "$@-with-pua" @$(VS_ADDER) -vs 2640 2642 2695 --dstdir '.' -o "$@-with-pua-varsel" "$@-with-pua"
@mv "$@-with-pua-varsel" "$@" @mv "$@-with-pua-varsel" "$@"
@ -219,7 +219,7 @@ check_sequence:
ifdef BYPASS_SEQUENCE_CHECK ifdef BYPASS_SEQUENCE_CHECK
@echo Bypassing the emoji sequence checks @echo Bypassing the emoji sequence checks
else else
$(PYTHON) $(SEQUENCE_CHECK_PY) -d $(EMOJI_SRC_DIR) -c @$(PYTHON) $(SEQUENCE_CHECK_PY) -n $(ALL_NAMES) -c
endif endif
clean: clean:

35
check_emoji_sequences.py
View File

@ -90,6 +90,8 @@ def _check_valid_emoji_cps(sorted_seq_to_filepath, unicode_version):
used in forming emoji sequences. This is a 'pre-check' that reports used in forming emoji sequences. This is a 'pre-check' that reports
this specific problem.""" this specific problem."""
coverage_pass = True
valid_cps = set(unicode_data.get_emoji()) valid_cps = set(unicode_data.get_emoji())
if unicode_version is None or unicode_version >= unicode_data.PROPOSED_EMOJI_AGE: if unicode_version is None or unicode_version >= unicode_data.PROPOSED_EMOJI_AGE:
valid_cps |= unicode_data.proposed_emoji_cps() valid_cps |= unicode_data.proposed_emoji_cps()
@ -116,7 +118,11 @@ def _check_valid_emoji_cps(sorted_seq_to_filepath, unicode_version):
for cp in sorted(not_emoji): for cp in sorted(not_emoji):
fps = not_emoji[cp] fps = not_emoji[cp]
print( print(
f'check valid emoji cps: {cp} (in {len(fps)} sequences)', file=sys.stderr) f'check the following cp: {cp} - {not_emoji.get(cp)[0]} (in {len(fps)} sequences)', file=sys.stderr)
coverage_pass = False
if not coverage_pass:
exit("Please fix the problems metioned above or run: make BYPASS_SEQUENCE_CHECK='True'")
def _check_zwj(sorted_seq_to_filepath): def _check_zwj(sorted_seq_to_filepath):
@ -365,7 +371,7 @@ def collect_name_to_dirpath(directory, prefix, suffix, exclude=None):
dirs[:] = [d for d in dirs if d not in exclude] dirs[:] = [d for d in dirs if d not in exclude]
if directory != '.': if directory != '.':
dirname = path.join(directory, dirname) dirname = directory
for f in files: for f in files:
if not f.endswith(suffix): if not f.endswith(suffix):
continue continue
@ -389,25 +395,36 @@ def collect_name_to_dirpath_with_override(dirs, prefix, suffix, exclude=None):
return result return result
def run_check(dirs, prefix, suffix, exclude, unicode_version, coverage): def run_check(dirs, names, prefix, suffix, exclude, unicode_version, coverage):
msg = '' msg = ''
if unicode_version: if unicode_version:
msg = ' (%3.1f)' % unicode_version msg = ' (%3.1f)' % unicode_version
print(f'Checking files with prefix "{prefix}" and suffix "{suffix}"{msg} in: {dirs}')
name_to_dirpath = collect_name_to_dirpath_with_override( if (names and dirs):
dirs, prefix=prefix, suffix=suffix, exclude=exclude) sys.exit("Please only provide a directory or a list of names")
elif names:
name_to_dirpath = {}
for name in names:
name_to_dirpath[name] = ""
elif dirs:
print(f'Checking files with prefix "{prefix}" and suffix "{suffix}"{msg} in: {dirs}')
name_to_dirpath = collect_name_to_dirpath_with_override(dirs, prefix=prefix, suffix=suffix, exclude=exclude)
print(f'checking {len(name_to_dirpath)} names') print(f'checking {len(name_to_dirpath)} names')
seq_to_filepath = create_sequence_to_filepath(name_to_dirpath, prefix, suffix) seq_to_filepath = create_sequence_to_filepath(name_to_dirpath, prefix, suffix)
print(f'checking {len(seq_to_filepath)} sequences') print(f'checking {len(seq_to_filepath)} sequences')
check_sequence_to_filepath(seq_to_filepath, unicode_version, coverage) check_sequence_to_filepath(seq_to_filepath, unicode_version, coverage)
print('done running checks') print('Done running checks')
def main(): def main():
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument( parser.add_argument(
'-d', '--dirs', help='directory roots containing emoji images', '-d', '--dirs', help='directory roots containing emoji images',
metavar='dir', nargs='+', required=True) metavar='dir', nargs='+')
parser.add_argument(
'-n', '--names', help='list with expected emoji',
metavar='names', nargs='+')
parser.add_argument( parser.add_argument(
'-e', '--exclude', help='names of source subdirs to exclude', '-e', '--exclude', help='names of source subdirs to exclude',
metavar='dir', nargs='+') metavar='dir', nargs='+')
@ -425,7 +442,7 @@ def main():
metavar='version', type=float) metavar='version', type=float)
args = parser.parse_args() args = parser.parse_args()
run_check( run_check(
args.dirs, args.prefix, args.suffix, args.exclude, args.unicode_version, args.dirs, args.names, args.prefix, args.suffix, args.exclude, args.unicode_version,
args.coverage) args.coverage)