summaryrefslogtreecommitdiffstats
path: root/data/fonts
diff options
context:
space:
mode:
authorRoozbeh Pournader <roozbeh@google.com>2015-02-11 15:45:49 -0800
committerRoozbeh Pournader <roozbeh@google.com>2015-02-11 15:45:49 -0800
commit70f0a4365bbffd016470807c9dbd7e9c1ea2df9d (patch)
tree8026c24adca15cf665741355a06c767833c735fa /data/fonts
parentae0fdaf5e864ab755e54243006e7116fbb375a7b (diff)
downloadframeworks_base-70f0a4365bbffd016470807c9dbd7e9c1ea2df9d.zip
frameworks_base-70f0a4365bbffd016470807c9dbd7e9c1ea2df9d.tar.gz
frameworks_base-70f0a4365bbffd016470807c9dbd7e9c1ea2df9d.tar.bz2
Move Noto Sans Tai Le to the end of the font fallback list.
This is to make sure the East Asian punctuation shared between CJK languages and Tai Le are rendered from the CJK fonts when no language is specified for the text, or CJK text is rendered in a non-CJK locale. Also remove the old comment about 64k glyphs limit. Bug: 19355391 Change-Id: Ic2cbc79cecf9539ace8a432f373685eeff81e106
Diffstat (limited to 'data/fonts')
-rw-r--r--data/fonts/fallback_fonts.xml18
-rw-r--r--data/fonts/fonts.xml10
2 files changed, 15 insertions, 13 deletions
diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml
index f94fe66..42b5d5d 100644
--- a/data/fonts/fallback_fonts.xml
+++ b/data/fonts/fallback_fonts.xml
@@ -335,11 +335,6 @@
</family>
<family>
<fileset>
- <file>NotoSansTaiLe-Regular.ttf</file>
- </fileset>
- </family>
- <family>
- <fileset>
<file>NotoSansTaiTham-Regular.ttf</file>
</fileset>
</family>
@@ -408,10 +403,13 @@
<file lang="ja">MTLmr3m.ttf</file>
</fileset>
</family>
- <!-- Note: complex scripts (i.e. those requiring shaping in Harfbuzz) have
- a cumulative limit of 64k glyphs. Thus, if they are placed after the
- large fonts such as DroidSansFallback, they are likely to render
- incorrectly. Please use caution when putting fonts toward the end of
- the list.
+ <!--
+ Noto Sans Tai Le is intentionally kept last, to make sure it doesn't override
+ the East Asian punctuation for Chinese.
-->
+ <family>
+ <fileset>
+ <file>NotoSansTaiLe-Regular.ttf</file>
+ </fileset>
+ </family>
</familyset>
diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml
index 02bf877..37527e9 100644
--- a/data/fonts/fonts.xml
+++ b/data/fonts/fonts.xml
@@ -288,9 +288,6 @@
<font weight="400" style="normal">NotoSansTagbanwa-Regular.ttf</font>
</family>
<family>
- <font weight="400" style="normal">NotoSansTaiLe-Regular.ttf</font>
- </family>
- <family>
<font weight="400" style="normal">NotoSansTaiTham-Regular.ttf</font>
</family>
<family>
@@ -332,4 +329,11 @@
<family lang="ja">
<font weight="400" style="normal">MTLmr3m.ttf</font>
</family>
+ <!--
+ Noto Sans Tai Le is intentionally kept last, to make sure it doesn't override
+ the East Asian punctuation for Chinese.
+ -->
+ <family>
+ <font weight="400" style="normal">NotoSansTaiLe-Regular.ttf</font>
+ </family>
</familyset>