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

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

Merge "Use variable fonts for Noto Sans Khmer" into oc-dev

parents 92f76ba9 88b11140

data/fonts/fonts.xml

+36 −2
Original line number Diff line number Diff line
@@ -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>

tools/fonts/fontchain_lint.py

+1 −1
Original line number Diff line number Diff line
@@ -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)