diff options
| author | Jungshik Shin <jungshik@google.com> | 2017-03-17 14:56:17 -0700 |
|---|---|---|
| committer | Roozbeh Pournader <roozbeh@google.com> | 2017-03-31 19:31:13 +0000 |
| commit | 88b111401028c33f5d7621eec33c0bae3f5e4c9e (patch) | |
| tree | 90082909b3efd2ea1a51288293a9b299681be22f | |
| parent | f2cd4371fe4985ad23473ac7885754927a578ca2 (diff) | |
Use variable fonts for Noto Sans Khmer
Update fonts.xml to use NotoSansKhmer-VF.ttf.
The weight range of Khmer is also extended to have 9 weight instances
(three more than Roboto with 200, 600 and 800).
The width range for Khmer is left alone partly because of an apparent
lack of support in fonts.xml for non-normal width fallback fonts.
Note that Noto Sans Khmer UI is left alone because of a baseline issue.
BUG: 22667753
Test: See the QA instruction in comment 10 of the bug.
Test: fontchain_lint
Change-Id: Idf6d4fec86822663ac08feb8979edacbc6c709a0
| -rw-r--r-- | data/fonts/fonts.xml | 38 | ||||
| -rwxr-xr-x | tools/fonts/fontchain_lint.py | 2 |
2 files changed, 37 insertions, 3 deletions
diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml index 38a1a466400d..76c29a9bf971 100644 --- a/data/fonts/fonts.xml +++ b/data/fonts/fonts.xml @@ -217,8 +217,42 @@ <font weight="700" style="normal">NotoSansSinhala-Bold.ttf</font> </family> <family lang="und-Khmr" variant="elegant"> - <font weight="400" style="normal">NotoSansKhmer-Regular.ttf</font> - <font weight="700" style="normal">NotoSansKhmer-Bold.ttf</font> + <font weight="100" style="normal">NotoSansKhmer-VF.ttf + <axis tag="wdth" stylevalue="100.0" /> + <axis tag="wght" stylevalue="26.0" /> + </font> + <font weight="200" style="normal">NotoSansKhmer-VF.ttf + <axis tag="wdth" stylevalue="100.0" /> + <axis tag="wght" stylevalue="39.0" /> + </font> + <font weight="300" style="normal">NotoSansKhmer-VF.ttf + <axis tag="wdth" stylevalue="100.0" /> + <axis tag="wght" stylevalue="58.0" /> + </font> + <font weight="400" style="normal">NotoSansKhmer-VF.ttf + <axis tag="wdth" stylevalue="100.0" /> + <axis tag="wght" stylevalue="90.0" /> + </font> + <font weight="500" style="normal">NotoSansKhmer-VF.ttf + <axis tag="wdth" stylevalue="100.0" /> + <axis tag="wght" stylevalue="108.0" /> + </font> + <font weight="600" style="normal">NotoSansKhmer-VF.ttf + <axis tag="wdth" stylevalue="100.0" /> + <axis tag="wght" stylevalue="128.0" /> + </font> + <font weight="700" style="normal">NotoSansKhmer-VF.ttf + <axis tag="wdth" stylevalue="100.0" /> + <axis tag="wght" stylevalue="151.0" /> + </font> + <font weight="800" style="normal">NotoSansKhmer-VF.ttf + <axis tag="wdth" stylevalue="100.0" /> + <axis tag="wght" stylevalue="169.0" /> + </font> + <font weight="900" style="normal">NotoSansKhmer-VF.ttf + <axis tag="wdth" stylevalue="100.0" /> + <axis tag="wght" stylevalue="190.0" /> + </font> </family> <family lang="und-Khmr" variant="compact"> <font weight="400" style="normal">NotoSansKhmerUI-Regular.ttf</font> diff --git a/tools/fonts/fontchain_lint.py b/tools/fonts/fontchain_lint.py index 36e0e1502066..bb11dabee8e6 100755 --- a/tools/fonts/fontchain_lint.py +++ b/tools/fonts/fontchain_lint.py @@ -234,7 +234,7 @@ def parse_fonts_xml(fonts_xml_path): for child in family: assert child.tag == 'font', ( 'Unknown tag <%s>' % child.tag) - font_file = child.text + font_file = child.text.rstrip() weight = int(child.get('weight')) assert weight % 100 == 0, ( 'Font weight "%d" is not a multiple of 100.' % weight) |