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

Commit eaf3f545 authored by Roozbeh Pournader's avatar Roozbeh Pournader Committed by Android Git Automerger
Browse files

am 03340feb: Merge "Update Naskh font names to match upstream and add Tibetan." into mnc-dev 

* commit '03340feb':
  Update Naskh font names to match upstream and add Tibetan.
parents 0a5db3e2 03340feb

data/fonts/fallback_fonts.xml

+9 −4
Original line number Diff line number Diff line
@@ -35,14 +35,14 @@ 
<familyset>

    <family>

        <fileset>

            <file variant="elegant">NotoNaskh-Regular.ttf</file>

            <file variant="elegant">NotoNaskh-Bold.ttf</file>

            <file variant="elegant">NotoNaskhArabic-Regular.ttf</file>

            <file variant="elegant">NotoNaskhArabic-Bold.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file variant="compact">NotoNaskhUI-Regular.ttf</file>

            <file variant="compact">NotoNaskhUI-Bold.ttf</file>

            <file variant="compact">NotoNaskhArabicUI-Regular.ttf</file>

            <file variant="compact">NotoNaskhArabicUI-Bold.ttf</file>

        </fileset>

    </family>

    <family>
@@ -385,6 +385,11 @@ 
            <file>NotoSansTaiViet-Regular.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file>NotoSansTibetan-Regular.ttf</file>

        </fileset>

    </family>

    <family>

        <fileset>

            <file>NotoSansTifinagh-Regular.ttf</file>

data/fonts/fonts.xml

+7 −4
Original line number Diff line number Diff line
@@ -94,12 +94,12 @@ 


    <!-- fallback fonts -->

    <family variant="elegant">

        <font weight="400" style="normal">NotoNaskh-Regular.ttf</font>

        <font weight="700" style="normal">NotoNaskh-Bold.ttf</font>

        <font weight="400" style="normal">NotoNaskhArabic-Regular.ttf</font>

        <font weight="700" style="normal">NotoNaskhArabic-Bold.ttf</font>

    </family>

    <family variant="compact">

        <font weight="400" style="normal">NotoNaskhUI-Regular.ttf</font>

        <font weight="700" style="normal">NotoNaskhUI-Bold.ttf</font>

        <font weight="400" style="normal">NotoNaskhArabicUI-Regular.ttf</font>

        <font weight="700" style="normal">NotoNaskhArabicUI-Bold.ttf</font>

    </family>

    <family>

        <font weight="400" style="normal">NotoSansEthiopic-Regular.ttf</font>
@@ -319,6 +319,9 @@ 
    <family>

        <font weight="400" style="normal">NotoSansTaiViet-Regular.ttf</font>

    </family>

    <family>

        <font weight="400" style="normal">NotoSansTibetan-Regular.ttf</font>

    </family>

    <family>

        <font weight="400" style="normal">NotoSansTifinagh-Regular.ttf</font>

    </family>