diff options
| author | Roozbeh Pournader <roozbeh@google.com> | 2017-08-11 23:27:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-11 23:27:50 +0000 |
| commit | c9c6ee667f9282fdfa1cbab4ff7215ee92ad34b3 (patch) | |
| tree | 17d607704a2be8230e2a66fcae92a587eb9f4024 /data/fonts | |
| parent | db01c43523eed9d435df2a0832ccc58d1e219fa3 (diff) | |
| parent | 99975a3e25e11f5c5958d8a901d37902087c75fd (diff) | |
Merge "Support multiple languages per font in fonts.xml"
Diffstat (limited to 'data/fonts')
| -rw-r--r-- | data/fonts/fonts.xml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml index ae93608726a3..209f364e041b 100644 --- a/data/fonts/fonts.xml +++ b/data/fonts/fonts.xml @@ -19,7 +19,7 @@ effectively add 300 to the weight, this ensures that 900 is the bold paired with the 500 weight, ensuring adequate contrast. --> -<familyset version="22"> +<familyset version="23"> <!-- first font is default --> <family name="sans-serif"> <font weight="100" style="normal">Roboto-Thin.ttf</font> @@ -128,8 +128,7 @@ <font weight="400" style="normal">NotoSansArmenian-Regular.ttf</font> <font weight="700" style="normal">NotoSansArmenian-Bold.ttf</font> </family> - <!-- TODO: add Geok --> - <family lang="und-Geor"> + <family lang="und-Geor und-Geok"> <font weight="400" style="normal">NotoSansGeorgian-Regular.ttf</font> <font weight="700" style="normal">NotoSansGeorgian-Bold.ttf</font> </family> @@ -474,8 +473,7 @@ <family lang="zh-Hans"> <font weight="400" style="normal" index="2">NotoSansCJK-Regular.ttc</font> </family> - <!-- TODO: Add Bopo --> - <family lang="zh-Hant"> + <family lang="zh-Hant zh-Bopo"> <font weight="400" style="normal" index="3">NotoSansCJK-Regular.ttc</font> </family> <family lang="ja"> |