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

Commit 0b645809 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert font file rename." into sc-dev

parents 527b38c7 a1245b1c

data/fonts/fonts.xml

+249 −249

File changed.

Preview size limit exceeded, changes collapsed.

libs/hwui/tests/unit/TypefaceTests.cpp

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ namespace { 


constexpr char kRobotoVariable[] = "/system/fonts/Roboto-Regular.ttf";



constexpr char kRegularFont[] = "/system/fonts/NotoSerif.ttf";

constexpr char kRegularFont[] = "/system/fonts/NotoSerif-Regular.ttf";

constexpr char kBoldFont[] = "/system/fonts/NotoSerif-Bold.ttf";

constexpr char kItalicFont[] = "/system/fonts/NotoSerif-Italic.ttf";

constexpr char kBoldItalicFont[] = "/system/fonts/NotoSerif-BoldItalic.ttf";

tools/fonts/fontchain_linter.py

+0 −47
Original line number Diff line number Diff line
@@ -665,51 +665,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 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]
@@ -727,8 +682,6 @@ def main(): 


    check_cjk_punctuation()



    check_canonical_name()



    check_emoji = sys.argv[2]

    if check_emoji == 'true':

        ucd_path = sys.argv[3]