From db56b5a681b097f7649937e8ad4d73c1e560fb3b Mon Sep 17 00:00:00 2001
From: Roozbeh Pournader <roozbeh@google.com>
Date: Wed, 11 Feb 2015 15:45:49 -0800
Subject: 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
(cherry picked from commit 70f0a4365bbffd016470807c9dbd7e9c1ea2df9d)
---
 data/fonts/fallback_fonts.xml | 18 ++++++++----------
 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 f94fe66aeee2..42b5d5d05df2 100644
--- a/data/fonts/fallback_fonts.xml
+++ b/data/fonts/fallback_fonts.xml
@@ -333,11 +333,6 @@
             <file>NotoSansTagbanwa-Regular.ttf</file>
         </fileset>
     </family>
-    <family>
-        <fileset>
-            <file>NotoSansTaiLe-Regular.ttf</file>
-        </fileset>
-    </family>
     <family>
         <fileset>
             <file>NotoSansTaiTham-Regular.ttf</file>
@@ -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 02bf877747d5..37527e947971 100644
--- a/data/fonts/fonts.xml
+++ b/data/fonts/fonts.xml
@@ -287,9 +287,6 @@
     <family>
         <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>
@@ -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>
-- 
cgit v1.2.3-59-g8ed1b