diff options
| author | Roozbeh Pournader <roozbeh@google.com> | 2015-03-12 17:43:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-12 17:43:42 +0000 |
| commit | 11b6e2358aac68691f016fca07ee82be3e815f2b (patch) | |
| tree | bc494a8013ed4a4b34465038364b6acd4002acd8 | |
| parent | e770c5e45a139d709976f8c1dbb821733968b5a8 (diff) | |
| parent | db56b5a681b097f7649937e8ad4d73c1e560fb3b (diff) | |
| download | frameworks_base-11b6e2358aac68691f016fca07ee82be3e815f2b.zip frameworks_base-11b6e2358aac68691f016fca07ee82be3e815f2b.tar.gz frameworks_base-11b6e2358aac68691f016fca07ee82be3e815f2b.tar.bz2 | |
am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list.
* commit 'db56b5a681b097f7649937e8ad4d73c1e560fb3b':
Move Noto Sans Tai Le to the end of the font fallback list.
| -rw-r--r-- | data/fonts/fallback_fonts.xml | 18 | ||||
| -rw-r--r-- | data/fonts/fonts.xml | 10 |
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> |