Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(546)

Unified Diff: resources/android_fonts/v17/fallback_fonts-ja.xml

Issue 912053003: Fix append_fallback_font_families_for_locale. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Full test and address comments. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/core/SkTemplates.h ('k') | src/ports/SkFontConfigParser_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: resources/android_fonts/v17/fallback_fonts-ja.xml
diff --git a/resources/android_fonts/pre_v17/fallback_fonts.xml b/resources/android_fonts/v17/fallback_fonts-ja.xml
similarity index 64%
copy from resources/android_fonts/pre_v17/fallback_fonts.xml
copy to resources/android_fonts/v17/fallback_fonts-ja.xml
index e23004b3d9961db5c3655255f5913dfea3bb8909..5f9b5ed948bf04cae5af5403a839e0b7e827ec40 100644
--- a/resources/android_fonts/pre_v17/fallback_fonts.xml
+++ b/resources/android_fonts/v17/fallback_fonts-ja.xml
@@ -21,11 +21,20 @@
fallback fonts. That file can also specify the order in which the fallback fonts should be
searched, to ensure that a vendor-provided font will be used before another fallback font
which happens to handle the same glyph.
+
+ Han languages (Chinese, Japanese, and Korean) share a common range of unicode characters;
+ their ordering in the fallback or vendor files gives priority to the first in the list.
+ Locale-specific ordering can be configured by adding language and region codes to the end
+ of the filename (e.g. /system/etc/fallback_fonts-ja.xml). When no region code is used,
+ as with this example, all regions are matched. Use separate files for each supported locale.
+ The standard fallback file (fallback_fonts.xml) is used when a locale does not have its own
+ file. All fallback files must contain the same complete set of fonts; only their ordering
+ can differ.
-->
<familyset>
<family>
<fileset>
- <file>DroidNaskh-Regular.ttf</file>
+ <file>DroidNaskh-Regular-SystemUI.ttf</file>
</fileset>
</family>
<family>
@@ -56,7 +65,18 @@
</family>
<family>
<fileset>
- <file>Lohit-Devanagari.ttf</file>
+ <file>DroidSansDevanagari-Regular.ttf</file>
+ </fileset>
+ </family>
+ <family>
+ <fileset>
+ <file>DroidSansTamil-Regular.ttf</file>
+ <file>DroidSansTamil-Bold.ttf</file>
+ </fileset>
+ </family>
+ <family>
+ <fileset>
+ <file>AnjaliNewLipi-light.ttf</file>
</fileset>
</family>
<family>
@@ -66,7 +86,22 @@
</family>
<family>
<fileset>
- <file>Lohit-Tamil.ttf</file>
+ <file>Lohit-Kannada.ttf</file>
+ </fileset>
+ </family>
+ <family>
+ <fileset>
+ <file>Lohit-Telugu.ttf</file>
+ </fileset>
+ </family>
+ <family>
+ <fileset>
+ <file>AndroidEmoji.ttf</file>
+ </fileset>
+ </family>
+ <family>
+ <fileset>
+ <file>MTLmr3m.ttf</file>
</fileset>
</family>
<family>
« no previous file with comments | « include/core/SkTemplates.h ('k') | src/ports/SkFontConfigParser_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698