Skip to content
This repository has been archived by the owner on Jan 25, 2023. It is now read-only.

Commit

Permalink
Updated requirements.txt, tests and android XML
Browse files Browse the repository at this point in the history
  • Loading branch information
@marekjez86
marekjez86 committed Jan 13, 2022
1 parent 601c4ce commit 0a815d1
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 45 deletions.
74 changes: 37 additions & 37 deletions android-connection/noto-fonts-4-android.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<familyset version="01">
<family name="serif">
<font weight="400" style="normal" path="archive/unhinted/NotoSerifAndroid">NotoSerif-Regular.ttf</font>
<font weight="400" style="normal" postScriptName="NotoSerif" path="archive/unhinted/NotoSerifAndroid">NotoSerif-Regular.ttf</font>
<font weight="700" style="normal" path="archive/unhinted/NotoSerifAndroid">NotoSerif-Bold.ttf</font>
<font weight="400" style="italic" path="archive/unhinted/NotoSerifAndroid">NotoSerif-Italic.ttf</font>
<font weight="700" style="italic" path="archive/unhinted/NotoSerifAndroid">NotoSerif-BoldItalic.ttf</font>
Expand Down Expand Up @@ -591,39 +591,39 @@
</font>
</family>
<family lang="und-Orya" variant="elegant">
<font weight="100" style="normal" postScriptName="NotoSansOriya-Regular" path="unhinted/slim-variable-ttf">
<font weight="100" style="normal" postScriptName="NotoSansOriya-Thin" path="unhinted/slim-variable-ttf">
NotoSansOriya-VF.ttf
<axis tag="wght" stylevalue="100"/>
</font>
<font weight="200" style="normal" postScriptName="NotoSansOriya-Regular" path="unhinted/slim-variable-ttf">
<font weight="200" style="normal" postScriptName="NotoSansOriya-Thin" path="unhinted/slim-variable-ttf">
NotoSansOriya-VF.ttf
<axis tag="wght" stylevalue="200"/>
</font>
<font weight="300" style="normal" postScriptName="NotoSansOriya-Regular" path="unhinted/slim-variable-ttf">
<font weight="300" style="normal" postScriptName="NotoSansOriya-Thin" path="unhinted/slim-variable-ttf">
NotoSansOriya-VF.ttf
<axis tag="wght" stylevalue="300"/>
</font>
<font weight="400" style="normal" postScriptName="NotoSansOriya-Regular" path="unhinted/slim-variable-ttf">
<font weight="400" style="normal" postScriptName="NotoSansOriya-Thin" path="unhinted/slim-variable-ttf">
NotoSansOriya-VF.ttf
<axis tag="wght" stylevalue="400"/>
</font>
<font weight="500" style="normal" postScriptName="NotoSansOriya-Regular" path="unhinted/slim-variable-ttf">
<font weight="500" style="normal" postScriptName="NotoSansOriya-Thin" path="unhinted/slim-variable-ttf">
NotoSansOriya-VF.ttf
<axis tag="wght" stylevalue="500"/>
</font>
<font weight="600" style="normal" postScriptName="NotoSansOriya-Regular" path="unhinted/slim-variable-ttf">
<font weight="600" style="normal" postScriptName="NotoSansOriya-Thin" path="unhinted/slim-variable-ttf">
NotoSansOriya-VF.ttf
<axis tag="wght" stylevalue="600"/>
</font>
<font weight="700" style="normal" postScriptName="NotoSansOriya-Regular" path="unhinted/slim-variable-ttf">
<font weight="700" style="normal" postScriptName="NotoSansOriya-Thin" path="unhinted/slim-variable-ttf">
NotoSansOriya-VF.ttf
<axis tag="wght" stylevalue="700"/>
</font>
<font weight="800" style="normal" postScriptName="NotoSansOriya-Regular" path="unhinted/slim-variable-ttf">
<font weight="800" style="normal" postScriptName="NotoSansOriya-Thin" path="unhinted/slim-variable-ttf">
NotoSansOriya-VF.ttf
<axis tag="wght" stylevalue="800"/>
</font>
<font weight="900" style="normal" postScriptName="NotoSansOriya-Regular" path="unhinted/slim-variable-ttf">
<font weight="900" style="normal" postScriptName="NotoSansOriya-Thin" path="unhinted/slim-variable-ttf">
NotoSansOriya-VF.ttf
<axis tag="wght" stylevalue="900"/>
</font>
Expand All @@ -645,39 +645,39 @@
</font>
</family>
<family lang="und-Orya" variant="compact">
<font weight="100" style="normal" postScriptName="NotoSansOriyaUI-Regular" path="unhinted/slim-variable-ttf">
<font weight="100" style="normal" postScriptName="NotoSansOriyaUI-Thin" path="unhinted/slim-variable-ttf">
NotoSansOriyaUI-VF.ttf
<axis tag="wght" stylevalue="100"/>
</font>
<font weight="200" style="normal" postScriptName="NotoSansOriyaUI-Regular" path="unhinted/slim-variable-ttf">
<font weight="200" style="normal" postScriptName="NotoSansOriyaUI-Thin" path="unhinted/slim-variable-ttf">
NotoSansOriyaUI-VF.ttf
<axis tag="wght" stylevalue="200"/>
</font>
<font weight="300" style="normal" postScriptName="NotoSansOriyaUI-Regular" path="unhinted/slim-variable-ttf">
<font weight="300" style="normal" postScriptName="NotoSansOriyaUI-Thin" path="unhinted/slim-variable-ttf">
NotoSansOriyaUI-VF.ttf
<axis tag="wght" stylevalue="300"/>
</font>
<font weight="400" style="normal" postScriptName="NotoSansOriyaUI-Regular" path="unhinted/slim-variable-ttf">
<font weight="400" style="normal" postScriptName="NotoSansOriyaUI-Thin" path="unhinted/slim-variable-ttf">
NotoSansOriyaUI-VF.ttf
<axis tag="wght" stylevalue="400"/>
</font>
<font weight="500" style="normal" postScriptName="NotoSansOriyaUI-Regular" path="unhinted/slim-variable-ttf">
<font weight="500" style="normal" postScriptName="NotoSansOriyaUI-Thin" path="unhinted/slim-variable-ttf">
NotoSansOriyaUI-VF.ttf
<axis tag="wght" stylevalue="500"/>
</font>
<font weight="600" style="normal" postScriptName="NotoSansOriyaUI-Regular" path="unhinted/slim-variable-ttf">
<font weight="600" style="normal" postScriptName="NotoSansOriyaUI-Thin" path="unhinted/slim-variable-ttf">
NotoSansOriyaUI-VF.ttf
<axis tag="wght" stylevalue="600"/>
</font>
<font weight="700" style="normal" postScriptName="NotoSansOriyaUI-Regular" path="unhinted/slim-variable-ttf">
<font weight="700" style="normal" postScriptName="NotoSansOriyaUI-Thin" path="unhinted/slim-variable-ttf">
NotoSansOriyaUI-VF.ttf
<axis tag="wght" stylevalue="700"/>
</font>
<font weight="800" style="normal" postScriptName="NotoSansOriyaUI-Regular" path="unhinted/slim-variable-ttf">
<font weight="800" style="normal" postScriptName="NotoSansOriyaUI-Thin" path="unhinted/slim-variable-ttf">
NotoSansOriyaUI-VF.ttf
<axis tag="wght" stylevalue="800"/>
</font>
<font weight="900" style="normal" postScriptName="NotoSansOriyaUI-Regular" path="unhinted/slim-variable-ttf">
<font weight="900" style="normal" postScriptName="NotoSansOriyaUI-Thin" path="unhinted/slim-variable-ttf">
NotoSansOriyaUI-VF.ttf
<axis tag="wght" stylevalue="900"/>
</font>
Expand Down Expand Up @@ -976,22 +976,22 @@
</font>
</family>
<family lang="und-Batk">
<font weight="400" style="normal" postScriptName="NotoSansBatak" path="unhinted/ttf/NotoSansBatak">
<font weight="400" style="normal" path="unhinted/ttf/NotoSansBatak">
NotoSansBatak-Regular.ttf
</font>
</family>
<family lang="und-Brah">
<font weight="400" style="normal" postScriptName="NotoSansBrahmi" path="unhinted/ttf/NotoSansBrahmi">
<font weight="400" style="normal" path="unhinted/ttf/NotoSansBrahmi">
NotoSansBrahmi-Regular.ttf
</font>
</family>
<family lang="und-Bugi">
<font weight="400" style="normal" postScriptName="NotoSansBuginese" path="unhinted/ttf/NotoSansBuginese">
<font weight="400" style="normal" path="unhinted/ttf/NotoSansBuginese">
NotoSansBuginese-Regular.ttf
</font>
</family>
<family lang="und-Buhd">
<font weight="400" style="normal" postScriptName="NotoSansBuhid" path="unhinted/ttf/NotoSansBuhid">
<font weight="400" style="normal" path="unhinted/ttf/NotoSansBuhid">
NotoSansBuhid-Regular.ttf
</font>
</family>
Expand Down Expand Up @@ -1312,17 +1312,17 @@
</family>
<!-- Esrangela should precede Eastern and Western Syriac, since it's our default form. -->
<family lang="und-Syre">
<font weight="400" style="normal" path="archive/unhinted/NotoSansSyriac">
<font weight="400" style="normal" postScriptName="NotoSansSyriacEstrangela" path="archive/unhinted/NotoSansSyriac">
NotoSansSyriacEstrangela-Regular.ttf
</font>
</family>
<family lang="und-Syrn">
<font weight="400" style="normal" path="archive/unhinted/NotoSansSyriac">
<font weight="400" style="normal" postScriptName="NotoSansSyriacEastern" path="archive/unhinted/NotoSansSyriac">
NotoSansSyriacEastern-Regular.ttf
</font>
</family>
<family lang="und-Syrj">
<font weight="400" style="normal" path="archive/unhinted/NotoSansSyriac">
<font weight="400" style="normal" postScriptName="NotoSansSyriacWestern" path="archive/unhinted/NotoSansSyriac">
NotoSansSyriacWestern-Regular.ttf
</font>
</family>
Expand Down Expand Up @@ -1395,17 +1395,17 @@
<font weight="400" style="normal">NotoSansSymbols-Regular-Subsetted.ttf</font>
</family>
<family lang="zh-Hans">
<font weight="400" style="normal" index="2" postScriptName="NotoSansCJKjp-Regular" path="archive/unhinted/NotoSansCJK">
<font weight="400" style="normal" index="2" postScriptName="NotoSansCJKsc-Regular" path="archive/unhinted/NotoSansCJK">
NotoSansCJK-Regular.ttc
</font>
<font weight="400" style="normal" index="2" fallbackFor="serif" postScriptName="NotoSerifCJKjp-Regular" path="archive/unhinted/NotoSerifCJK">NotoSerifCJK-Regular.ttc
<font weight="400" style="normal" index="2" fallbackFor="serif" postScriptName="NotoSerifCJKsc-Regular" path="archive/unhinted/NotoSerifCJK">NotoSerifCJK-Regular.ttc
</font>
</family>
<family lang="zh-Hant,zh-Bopo">
<font weight="400" style="normal" index="3" postScriptName="NotoSansCJKjp-Regular" path="archive/unhinted/NotoSansCJK">
<font weight="400" style="normal" index="3" postScriptName="NotoSansCJKtc-Regular" path="archive/unhinted/NotoSansCJK">
NotoSansCJK-Regular.ttc
</font>
<font weight="400" style="normal" index="3" fallbackFor="serif" postScriptName="NotoSerifCJKjp-Regular" path="archive/unhinted/NotoSerifCJK">NotoSerifCJK-Regular.ttc
<font weight="400" style="normal" index="3" fallbackFor="serif" postScriptName="NotoSerifCJKtc-Regular" path="archive/unhinted/NotoSerifCJK">NotoSerifCJK-Regular.ttc
</font>
</family>
<family lang="ja">
Expand All @@ -1416,10 +1416,10 @@
</font>
</family>
<family lang="ko">
<font weight="400" style="normal" index="1" postScriptName="NotoSansCJKjp-Regular" path="archive/unhinted/NotoSansCJK">
<font weight="400" style="normal" index="1" postScriptName="NotoSansCJKkr-Regular" path="archive/unhinted/NotoSansCJK">
NotoSansCJK-Regular.ttc
</font>
<font weight="400" style="normal" index="1" fallbackFor="serif" postScriptName="NotoSerifCJKjp-Regular" path="archive/unhinted/NotoSerifCJK">NotoSerifCJK-Regular.ttc
<font weight="400" style="normal" index="1" fallbackFor="serif" postScriptName="NotoSerifCJKkr-Regular" path="archive/unhinted/NotoSerifCJK">NotoSerifCJK-Regular.ttc
</font>
</family>
<family lang="und-Zsye">
Expand Down Expand Up @@ -1480,7 +1480,7 @@
</font>
</family>
<family lang="und-Bhks">
<font weight="400" style="normal" postScriptName="NotoSansBhaiksuki" path="unhinted/ttf/NotoSansBhaiksuki">
<font weight="400" style="normal" path="unhinted/ttf/NotoSansBhaiksuki">
NotoSansBhaiksuki-Regular.ttf
</font>
</family>
Expand Down Expand Up @@ -1850,19 +1850,19 @@
</font>
</family>
<family lang="und-Tnsa">
<font weight="400" style="normal" fallbackFor="serif" postScriptName="NotoSansTangsa-Regular" path="unhinted/slim-variable-ttf">
<font weight="400" style="normal" postScriptName="NotoSansTangsa-Regular" path="unhinted/slim-variable-ttf">
NotoSansTangsa-VF.ttf
<axis tag="wght" stylevalue="400"/>
</font>
<font weight="500" style="normal" fallbackFor="serif" postScriptName="NotoSansTangsa-Regular" path="unhinted/slim-variable-ttf">
<font weight="500" style="normal" postScriptName="NotoSansTangsa-Regular" path="unhinted/slim-variable-ttf">
NotoSansTangsa-VF.ttf
<axis tag="wght" stylevalue="500"/>
</font>
<font weight="600" style="normal" fallbackFor="serif" postScriptName="NotoSansTangsa-Regular" path="unhinted/slim-variable-ttf">
<font weight="600" style="normal" postScriptName="NotoSansTangsa-Regular" path="unhinted/slim-variable-ttf">
NotoSansTangsa-VF.ttf
<axis tag="wght" stylevalue="600"/>
</font>
<font weight="700" style="normal" fallbackFor="serif" postScriptName="NotoSansTangsa-Regular" path="unhinted/slim-variable-ttf">
<font weight="700" style="normal" postScriptName="NotoSansTangsa-Regular" path="unhinted/slim-variable-ttf">
NotoSansTangsa-VF.ttf
<axis tag="wght" stylevalue="700"/>
</font>
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
fontbakery>=0.8.4
fonttools>=4.28.5
lxml>=4.7.1
pytest>=6.2.5
18 changes: 10 additions & 8 deletions tests/noto_fonts_for_android_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,12 @@ def _weight(font: ttLib.TTFont) -> Tuple[int, int, int]:
def _psname(font_el) -> str:
# Not every font element will have postScriptName tag. If it's not present then it is assumeed
# that it's the filename less extension
psn = font_el.attrib.get("postScriptName","")
if len(psn) == 0:
path = str(_font_path(font_el))
assert len(path) > 0
psn = path[path.rfind('/') + 1 : path.rfind('.')]
return psn
psn = font_el.attrib.get("postScriptName", None)
if psn:
return psn
path = _font_path(font_el)
assert path.is_file(), f"{path} missing"
return path.stem


def test_fonts_have_path():
Expand Down Expand Up @@ -177,9 +177,11 @@ def test_font_psnames():
for (font_path, font_number), xml_psname in font_to_xml_psnames.items():
font = _open_font_path(font_path, font_number)
postscript_names = get_name_entry_strings(font, _POSTSCRIPT_NAME)
assert len(postscript_names) > 0
if len(postscript_names) != 1:
errors.append(f"font file {font_path} should have a single postScriptName and not {postscript_names}")
continue
for el in xml_psname:
if not (el in postscript_names):
errors.append(f"postScriptName {postscript_names} in {font_path} doesn't match the entry in XML {el}")
errors.append(f"postScriptName=\"{postscript_names[0]}\" in font file {font_path} doesn't match the entry in XML: {el}")

assert not errors, ", ".join(errors)

0 comments on commit 0a815d1

Please sign in to comment.