diff options
| author | Seigo Nonaka <nona@google.com> | 2021-03-02 02:45:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-02 02:45:01 +0000 |
| commit | 444dc3366b847cd6e6d0a419e7799e3818d54a63 (patch) | |
| tree | 50721a9a37e28c92ac4331ff498231b0a43d9129 | |
| parent | a88a2b587355911d955a86265c3d3142abd6f1b7 (diff) | |
| parent | f31ac94a03092d33c86d3edd8fd9d93dd87e4e8a (diff) | |
Merge "Rename DancingScript and CutiveMono" into sc-dev
| -rw-r--r-- | data/fonts/fonts.xml | 4 | ||||
| -rwxr-xr-x | tools/fonts/fontchain_linter.py | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml index 4f188cc03282..66b8eaec4bcf 100644 --- a/data/fonts/fonts.xml +++ b/data/fonts/fonts.xml @@ -245,7 +245,7 @@ <alias name="monaco" to="monospace" /> <family name="serif-monospace"> - <font weight="400" style="normal">CutiveMono.ttf</font> + <font weight="400" style="normal">CutiveMono-Regular.ttf</font> </family> <alias name="courier" to="serif-monospace" /> <alias name="courier new" to="serif-monospace" /> @@ -255,7 +255,7 @@ </family> <family name="cursive"> - <font weight="400" style="normal">DancingScript-Regular.ttf</font> + <font weight="400" style="normal">DancingScript.ttf</font> <font weight="700" style="normal">DancingScript-Bold.ttf</font> </family> diff --git a/tools/fonts/fontchain_linter.py b/tools/fonts/fontchain_linter.py index ebc0ec1640f5..e775e1adb04e 100755 --- a/tools/fonts/fontchain_linter.py +++ b/tools/fonts/fontchain_linter.py @@ -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', @@ -703,8 +697,6 @@ def getSuffix(font): 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 |