Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 131557b1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Rename the font file with PostScript name based file name"" am:... 

Merge "Revert "Rename the font file with PostScript name based file name"" am: 8b0cfd15 am: 5efafd66

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660607

Change-Id: I91da6f7fb815ac46479dd6d5b02451959cdf5f19
parents 9ee35481 5efafd66

data/fonts/fonts.xml

+121 −121

File changed.

Preview size limit exceeded, changes collapsed.

tools/fonts/fontchain_linter.py

+0 −55
Original line number Diff line number Diff line
@@ -11,12 +11,6 @@ from fontTools import ttLib 


EMOJI_VS = 0xFE0F



#TODO(179952916): Rename CutiveMono and DancingScript

CANONICAL_NAME_EXCEPTION_LIST = [

    'CutiveMono.ttf',

    'DancingScript-Regular.ttf',

]



LANG_TO_SCRIPT = {

    'as': 'Beng',

    'be': 'Cyrl',
@@ -664,53 +658,6 @@ def check_cjk_punctuation(): 
            assert_font_supports_none_of_chars(record.font, cjk_punctuation, name)





def getPostScriptName(font):

  ttf = open_font(font)

  nameTable = ttf['name']

  for name in nameTable.names:

    if name.nameID == 6 and name.platformID == 3 and name.platEncID == 1 and name.langID == 0x0409:

      return str(name)





def getSuffix(font):

  file_path, index = font

  with open(path.join(_fonts_dir, file_path), 'rb') as f:

    tag = f.read(4)

    isCollection = tag == b'ttcf'



  ttf = open_font(font)

  isType1 = ('CFF ' in ttf or 'CFF2' in ttf)



  if isType1:

    if isCollection:

      return '.otc'

    else:

      return '.otf'

  else:

    if isCollection:

      return '.ttc'

    else:

      return '.ttf'





def check_canonical_name():

  for record in _all_fonts:

    file_name, index = record.font

    if file_name in CANONICAL_NAME_EXCEPTION_LIST:

      continue



    if index and index != 0:

      continue



    psName = getPostScriptName(record.font)

    assert psName, 'PostScript must be defined'



    suffix = getSuffix(record.font)

    canonicalName = '%s%s' % (psName, suffix)



    assert file_name == canonicalName, (

        '%s is not a canonical name. Must be %s' % (file_name, canonicalName))



def main():

    global _fonts_dir

    target_out = sys.argv[1]
@@ -728,8 +675,6 @@ def main(): 


    check_cjk_punctuation()



    check_canonical_name()



    check_emoji = sys.argv[2]

    if check_emoji == 'true':

        ucd_path = sys.argv[3]