Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename DancingScript and CutiveMono" into sc-dev

Browse Source
This commit is contained in:
Seigo Nonaka
2021-03-02 02:45:01 +00:00
committed by Android (Google) Code Review
parent a88a2b5873 f31ac94a03
commit 444dc3366b
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/fonts/fonts.xml
View File

@@ -245,7 +245,7 @@
<alias name="monaco" to="monospace" /> <alias name="monaco" to="monospace" />
<family name="serif-monospace"> <family name="serif-monospace">
<font weight="400" style="normal">CutiveMono.ttf</font> <font weight="400" style="normal">CutiveMono-Regular.ttf</font>
</family> </family>
<alias name="courier" to="serif-monospace" /> <alias name="courier" to="serif-monospace" />
<alias name="courier new" to="serif-monospace" /> <alias name="courier new" to="serif-monospace" />
@@ -255,7 +255,7 @@
</family> </family>
<family name="cursive"> <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> <font weight="700" style="normal">DancingScript-Bold.ttf</font>
</family> </family>

8
tools/fonts/fontchain_linter.py
View File

@@ -11,12 +11,6 @@ from fontTools import ttLib
EMOJI_VS = 0xFE0F EMOJI_VS = 0xFE0F
#TODO(179952916): Rename CutiveMono and DancingScript
CANONICAL_NAME_EXCEPTION_LIST = [
'CutiveMono.ttf',
'DancingScript-Regular.ttf',
]
LANG_TO_SCRIPT = { LANG_TO_SCRIPT = {
'as': 'Beng', 'as': 'Beng',
'be': 'Cyrl', 'be': 'Cyrl',
@@ -703,8 +697,6 @@ def getSuffix(font):
def check_canonical_name(): def check_canonical_name():
for record in _all_fonts: for record in _all_fonts:
file_name, index = record.font file_name, index = record.font
if file_name in CANONICAL_NAME_EXCEPTION_LIST:
continue
if index and index != 0: if index and index != 0:
continue continue