From f79673bbae0a662c1428755e2719dadf944e4ba1 Mon Sep 17 00:00:00 2001 From: tomhudson Date: Tue, 5 Aug 2014 06:36:11 -0700 Subject: Test and generalize font configuration parser Add a basic unit test for the Android font configuration parser. Add a check for the new LMP file format; on detection, switch to a new (as-yet unwritten) parser. R=bungeman@google.com, djsollen@google.com, tomhudson@google.com Author: tomhudson@chromium.org Review URL: https://codereview.chromium.org/439813002 --- resources/android_fonts/pre_v17/fallback_fonts.xml | 77 +++++++ resources/android_fonts/pre_v17/system_fonts.xml | 80 +++++++ resources/android_fonts/v17/fallback_fonts.xml | 213 +++++++++++++++++++ resources/android_fonts/v17/system_fonts.xml | 138 ++++++++++++ resources/android_fonts/v22/fonts.xml | 232 +++++++++++++++++++++ 5 files changed, 740 insertions(+) create mode 100644 resources/android_fonts/pre_v17/fallback_fonts.xml create mode 100644 resources/android_fonts/pre_v17/system_fonts.xml create mode 100644 resources/android_fonts/v17/fallback_fonts.xml create mode 100644 resources/android_fonts/v17/system_fonts.xml create mode 100644 resources/android_fonts/v22/fonts.xml (limited to 'resources/android_fonts') diff --git a/resources/android_fonts/pre_v17/fallback_fonts.xml b/resources/android_fonts/pre_v17/fallback_fonts.xml new file mode 100644 index 0000000000..e23004b3d9 --- /dev/null +++ b/resources/android_fonts/pre_v17/fallback_fonts.xml @@ -0,0 +1,77 @@ + + + + + + DroidNaskh-Regular.ttf + + + + + DroidSansEthiopic-Regular.ttf + + + + + DroidSansHebrew-Regular.ttf + DroidSansHebrew-Bold.ttf + + + + + DroidSansThai.ttf + + + + + DroidSansArmenian.ttf + + + + + DroidSansGeorgian.ttf + + + + + Lohit-Devanagari.ttf + + + + + Lohit-Bengali.ttf + + + + + Lohit-Tamil.ttf + + + + + DroidSansFallback.ttf + + + diff --git a/resources/android_fonts/pre_v17/system_fonts.xml b/resources/android_fonts/pre_v17/system_fonts.xml new file mode 100644 index 0000000000..d2fe5467d2 --- /dev/null +++ b/resources/android_fonts/pre_v17/system_fonts.xml @@ -0,0 +1,80 @@ + + + + + + + sans-serif + arial + helvetica + tahoma + verdana + + + Roboto-Regular.ttf + Roboto-Bold.ttf + Roboto-Italic.ttf + Roboto-BoldItalic.ttf + + + + + + serif + times + times new roman + palatino + georgia + baskerville + goudy + fantasy + cursive + ITC Stone Serif + + + DroidSerif-Regular.ttf + DroidSerif-Bold.ttf + DroidSerif-Italic.ttf + DroidSerif-BoldItalic.ttf + + + + + + Droid Sans + + + DroidSans.ttf + DroidSans-Bold.ttf + + + + + + monospace + courier + courier new + monaco + + + DroidSansMono.ttf + + + + diff --git a/resources/android_fonts/v17/fallback_fonts.xml b/resources/android_fonts/v17/fallback_fonts.xml new file mode 100644 index 0000000000..ede7ef47d2 --- /dev/null +++ b/resources/android_fonts/v17/fallback_fonts.xml @@ -0,0 +1,213 @@ + + + + + + DroidNaskh-Regular.ttf + + + + + DroidNaskhUI-Regular.ttf + + + + + DroidSansEthiopic-Regular.ttf + + + + + DroidSansHebrew-Regular.ttf + DroidSansHebrew-Bold.ttf + + + + + NotoSansThai-Regular.ttf + NotoSansThai-Bold.ttf + + + + + NotoSansThaiUI-Regular.ttf + NotoSansThaiUI-Bold.ttf + + + + + DroidSansArmenian.ttf + + + + + DroidSansGeorgian.ttf + + + + + NotoSansDevanagari-Regular.ttf + NotoSansDevanagari-Bold.ttf + + + + + NotoSansDevanagariUI-Regular.ttf + NotoSansDevanagariUI-Bold.ttf + + + + + NotoSansTamil-Regular.ttf + NotoSansTamil-Bold.ttf + + + + + NotoSansTamilUI-Regular.ttf + NotoSansTamilUI-Bold.ttf + + + + + NotoSansMalayalam-Regular.ttf + NotoSansMalayalam-Bold.ttf + + + + + NotoSansMalayalamUI-Regular.ttf + NotoSansMalayalamUI-Bold.ttf + + + + + NotoSansBengali-Regular.ttf + NotoSansBengali-Bold.ttf + + + + + NotoSansBengaliUI-Regular.ttf + NotoSansBengaliUI-Bold.ttf + + + + + NotoSansTelugu-Regular.ttf + NotoSansTelugu-Bold.ttf + + + + + NotoSansTeluguUI-Regular.ttf + NotoSansTeluguUI-Bold.ttf + + + + + NotoSansKannada-Regular.ttf + NotoSansKannada-Bold.ttf + + + + + NotoSansKannadaUI-Regular.ttf + NotoSansKannadaUI-Bold.ttf + + + + + NotoSansKhmer-Regular.ttf + NotoSansKhmer-Bold.ttf + + + + + NotoSansKhmerUI-Regular.ttf + NotoSansKhmerUI-Bold.ttf + + + + + NotoSansLao-Regular.ttf + NotoSansLao-Bold.ttf + + + + + NotoSansLaoUI-Regular.ttf + NotoSansLaoUI-Bold.ttf + + + + + NanumGothic.ttf + + + + + Padauk-book.ttf + Padauk-bookbold.ttf + + + + + NotoSansSymbols-Regular.ttf + + + + + AndroidEmoji.ttf + + + + + NotoColorEmoji.ttf + + + + + DroidSansFallback.ttf + + + + + MTLmr3m.ttf + + + + diff --git a/resources/android_fonts/v17/system_fonts.xml b/resources/android_fonts/v17/system_fonts.xml new file mode 100644 index 0000000000..549f061b0c --- /dev/null +++ b/resources/android_fonts/v17/system_fonts.xml @@ -0,0 +1,138 @@ + + + + + + + sans-serif + arial + helvetica + tahoma + verdana + + + Roboto-Regular.ttf + Roboto-Bold.ttf + Roboto-Italic.ttf + Roboto-BoldItalic.ttf + + + + + + sans-serif-light + + + Roboto-Light.ttf + Roboto-LightItalic.ttf + + + + + + sans-serif-thin + + + Roboto-Thin.ttf + Roboto-ThinItalic.ttf + + + + + + sans-serif-condensed + + + RobotoCondensed-Regular.ttf + RobotoCondensed-Bold.ttf + RobotoCondensed-Italic.ttf + RobotoCondensed-BoldItalic.ttf + + + + + serif + times + times new roman + palatino + georgia + baskerville + goudy + fantasy + ITC Stone Serif + + + DroidSerif-Regular.ttf + DroidSerif-Bold.ttf + DroidSerif-Italic.ttf + DroidSerif-BoldItalic.ttf + + + + + + Droid Sans + + + DroidSans.ttf + DroidSans-Bold.ttf + + + + + + monospace + courier + courier new + monaco + + + DroidSansMono.ttf + + + + + + casual + + + ComingSoon.ttf + + + + + + cursive + + + DancingScript-Regular.ttf + DancingScript-Bold.ttf + + + + + + sans-serif-smallcaps + + + CarroisGothicSC-Regular.ttf + + + + diff --git a/resources/android_fonts/v22/fonts.xml b/resources/android_fonts/v22/fonts.xml new file mode 100644 index 0000000000..180d5f7d9c --- /dev/null +++ b/resources/android_fonts/v22/fonts.xml @@ -0,0 +1,232 @@ + + + + + Roboto-Thin.ttf + Roboto-ThinItalic.ttf + Roboto-Light.ttf + Roboto-LightItalic.ttf + Roboto-Regular.ttf + Roboto-Italic.ttf + Roboto-Medium.ttf + Roboto-MediumItalic.ttf + Roboto-Bold.ttf + Roboto-BoldItalic.ttf + Roboto-Black.ttf + Roboto-BlackItalic.ttf + + + + + + + + + + + RobotoCondensed-Light.ttf + RobotoCondensed-LightItalic.ttf + RobotoCondensed-Regular.ttf + RobotoCondensed-Italic.ttf + RobotoCondensed-Bold.ttf + RobotoCondensed-BoldItalic.ttf + + + + + + NotoSerif-Regular.ttf + NotoSerif-Bold.ttf + NotoSerif-Italic.ttf + NotoSerif-BoldItalic.ttf + + + + + + + + + + + + DroidSansMono.ttf + + + + + + + ComingSoon.ttf + + + + DancingScript-Regular.ttf + DancingScript-Bold.ttf + + + + CarroisGothicSC-Regular.ttf + + + + + NotoNaskh-Regular.ttf + NotoNaskh-Bold.ttf + + + NotoNaskhUI-Regular.ttf + NotoNaskhUI-Bold.ttf + + + NotoSansEthiopic-Regular.ttf + NotoSansEthiopic-Bold.ttf + + + NotoSansHebrew-Regular.ttf + NotoSansHebrew-Bold.ttf + + + NotoSansThai-Regular.ttf + NotoSansThai-Bold.ttf + + + NotoSansThaiUI-Regular.ttf + NotoSansThaiUI-Bold.ttf + + + NotoSansArmenian-Regular.ttf + NotoSansArmenian-Bold.ttf + + + NotoSansGeorgian-Regular.ttf + NotoSansGeorgian-Bold.ttf + + + NotoSansDevanagari-Regular.ttf + NotoSansDevanagari-Bold.ttf + + + NotoSansDevanagariUI-Regular.ttf + NotoSansDevanagariUI-Bold.ttf + + + + NotoSansGujarati-Regular.ttf + NotoSansGujarati-Bold.ttf + + + NotoSansGujaratiUI-Regular.ttf + NotoSansGujaratiUI-Bold.ttf + + + + NotoSansGurmukhi-Regular.ttf + NotoSansGurmukhi-Bold.ttf + + + NotoSansGurmukhiUI-Regular.ttf + NotoSansGurmukhiUI-Bold.ttf + + + NotoSansTamil-Regular.ttf + NotoSansTamil-Bold.ttf + + + NotoSansTamilUI-Regular.ttf + NotoSansTamilUI-Bold.ttf + + + NotoSansMalayalam-Regular.ttf + NotoSansMalayalam-Bold.ttf + + + NotoSansMalayalamUI-Regular.ttf + NotoSansMalayalamUI-Bold.ttf + + + NotoSansBengali-Regular.ttf + NotoSansBengali-Bold.ttf + + + NotoSansBengaliUI-Regular.ttf + NotoSansBengaliUI-Bold.ttf + + + NotoSansTelugu-Regular.ttf + NotoSansTelugu-Bold.ttf + + + NotoSansTeluguUI-Regular.ttf + NotoSansTeluguUI-Bold.ttf + + + NotoSansKannada-Regular.ttf + NotoSansKannada-Bold.ttf + + + NotoSansKannadaUI-Regular.ttf + NotoSansKannadaUI-Bold.ttf + + + NotoSansSinhala-Regular.ttf + NotoSansSinhala-Bold.ttf + + + NotoSansKhmer-Regular.ttf + NotoSansKhmer-Bold.ttf + + + NotoSansKhmerUI-Regular.ttf + NotoSansKhmerUI-Bold.ttf + + + NotoSansLao-Regular.ttf + NotoSansLao-Bold.ttf + + + NotoSansLaoUI-Regular.ttf + NotoSansLaoUI-Bold.ttf + + + NotoSansMyanmar-Regular.ttf + NotoSansMyanmar-Bold.ttf + + + NotoSansMyanmarUI-Regular.ttf + NotoSansMyanmarUI-Bold.ttf + + + NotoSansCherokee-Regular.ttf + + + NotoSansCanadianAboriginal-Regular.ttf + + + NotoSansYi-Regular.ttf + + + NotoSansHans-Regular.otf + + + NotoSansHant-Regular.otf + + + NotoSansJP-Regular.otf + + + NotoSansKR-Regular.otf + + + NanumGothic.ttf + + + NotoSansSymbols-Regular-Subsetted.ttf + + + NotoColorEmoji.ttf + + + MTLmr3m.ttf + + -- cgit v1.2.3