Update Noto CJK fonts to version 1.002.

The Noto CJK issues that have been fixed include:
 - https://code.google.com/p/noto/issues/detail?id=74
 - https://code.google.com/p/noto/issues/detail?id=126
 - https://code.google.com/p/noto/issues/detail?id=136
 - https://code.google.com/p/noto/issues/detail?id=151
 - https://code.google.com/p/noto/issues/detail?id=182
 - https://code.google.com/p/noto/issues/detail?id=193
 - https://code.google.com/p/noto/issues/detail?id=266

Also:
 - Reorganize the whole repo to separate CJK and non-CJK fonts, to
   reflect their different licenses.
 - Update and improve documentation.
 - Add a script for creating the Noto Japanese subset.

Bug: 19390244
Change-Id: Ida23677cbd90207b61d46a0cf59b15183e3dae5d

130 files changed, 714 insertions, 66 deletions

diff --git a/Android.mk b/Android.mk
index 5113408..adce92b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,23 +12,81 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# We have to use BUILD_PREBUILT instead of PRODUCT_COPY_FIES,
+NOTO_DIR := $(call my-dir)
+
+# We have to use BUILD_PREBUILT instead of PRODUCT_COPY_FILES,
 # to copy over the NOTICE file.
+#############################################################################
+# $(1): The source file name in LOCAL_PATH.
+#       It also serves as the module name and the dest file name.
+#############################################################################
+define build-one-font-module
+$(eval include $(CLEAR_VARS))\
+$(eval LOCAL_MODULE := $(1))\
+$(eval LOCAL_SRC_FILES := $(1))\
+$(eval LOCAL_MODULE_CLASS := ETC)\
+$(eval LOCAL_MODULE_TAGS := optional)\
+$(eval LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts)\
+$(eval include $(BUILD_PREBUILT))
+endef
+
+
+#############################################################################
+# First "build" the Noto CJK fonts, which have their own directory and
+# license. These are only included in EXTENDED_FONT_FOOTPRINT builds.
+#############################################################################
 
-LOCAL_PATH := $(call my-dir)
+ifeq ($(EXTENDED_FONT_FOOTPRINT),true)
+LOCAL_PATH := $(NOTO_DIR)/cjk
+
+font_src_files := \
+    NotoSansKR-Regular.otf \
+    NotoSansSC-Regular.otf \
+    NotoSansTC-Regular.otf
+
+$(foreach f, $(font_src_files), $(call build-one-font-module, $(f)))
 font_src_files :=
 
 #############################################################################
-# The following fonts are included in all builds
+# Include NotoSansJP, or a subset.
 #############################################################################
-font_src_files += \
+
+ifeq ($(FONT_NOTOSANS_JP_FULL),true)
+noto_sans_jp_src := NotoSansJP-Regular.otf
+else
+noto_sans_jp_src := NotoSansJP-Regular-Subsetted.otf
+endif # FONT_NOTOSANS_JP_FULL
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := NotoSansJP-Regular.otf
+LOCAL_SRC_FILES := $(noto_sans_jp_src)
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts
+include $(BUILD_PREBUILT)
+
+noto_sans_jp_src :=
+
+endif # EXTENDED_FONT_FOOTPRINT
+
+
+#############################################################################
+# Now "build" the rest of the fonts, which live in a separate subdirectory.
+#############################################################################
+LOCAL_PATH := $(NOTO_DIR)/other
+NOTO_DIR :=
+
+#############################################################################
+# The following fonts are included in all builds.
+#############################################################################
+font_src_files := \
     NotoSerif-Regular.ttf \
     NotoSerif-Bold.ttf \
     NotoSerif-Italic.ttf \
     NotoSerif-BoldItalic.ttf
 
 #############################################################################
-# The following fonts are only included in EXTENDED_FONT_FOOTPRINT builds
+# The following fonts are only included in EXTENDED_FONT_FOOTPRINT builds.
 #############################################################################
 ifeq ($(EXTENDED_FONT_FOOTPRINT),true)
 font_src_files += \
@@ -51,12 +109,9 @@ font_src_files += \
     NotoSansGurmukhi-Bold.ttf \
     NotoSansGurmukhiUI-Regular.ttf \
     NotoSansGurmukhiUI-Bold.ttf \
-    NotoSansHans-Regular.otf \
-    NotoSansHant-Regular.otf \
     NotoSansHanunoo-Regular.ttf \
     NotoSansJavanese-Regular.ttf \
     NotoSansKayahLi-Regular.ttf \
-    NotoSansKR-Regular.otf \
     NotoSansLepcha-Regular.ttf \
     NotoSansLimbu-Regular.ttf \
     NotoSansLisu-Regular.ttf \
@@ -88,10 +143,8 @@ font_src_files += \
     NotoSansYi-Regular.ttf
 endif # EXTENDED_FONT_FOOTPRINT
 
-
-
 #############################################################################
-# The following fonts are excluded from SMALLER_FONT_FOOTPRINT builds
+# The following fonts are excluded from SMALLER_FONT_FOOTPRINT builds.
 #############################################################################
 ifneq ($(SMALLER_FONT_FOOTPRINT),true)
 font_src_files += \
@@ -140,7 +193,7 @@ font_src_files += \
 endif # !SMALLER_FONT_FOOTPRINT
 
 #############################################################################
-# The following fonts are excluded from MINIMAL_FONT_FOOTPRINT builds
+# The following fonts are excluded from MINIMAL_FONT_FOOTPRINT builds.
 #############################################################################
 ifneq ($(MINIMAL_FONT_FOOTPRINT),true)
 font_src_files += \
@@ -156,20 +209,6 @@ font_src_files += \
     NotoSansHebrew-Bold.ttf
 endif # !MINIMAL_FONT_FOOTPRINT
 
-#############################################################################
-# $(1): The source file name in LOCAL_PATH.
-#       It also serves as the module name and the dest file name.
-#############################################################################
-define build-one-font-module
-$(eval include $(CLEAR_VARS))\
-$(eval LOCAL_MODULE := $(1))\
-$(eval LOCAL_SRC_FILES := $(1))\
-$(eval LOCAL_MODULE_CLASS := ETC)\
-$(eval LOCAL_MODULE_TAGS := optional)\
-$(eval LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts)\
-$(eval include $(BUILD_PREBUILT))
-endef
-
 $(foreach f, $(font_src_files), $(call build-one-font-module, $(f)))
 build-one-font-module :=
 font_src_files :=
@@ -178,7 +217,6 @@ font_src_files :=
 # Use a larger subset of Noto Sans Symbols on EXTENDED_FONT_FOOTPRINT
 # builds, but a smaller subset on other devices.
 #############################################################################
-
 ifeq ($(EXTENDED_FONT_FOOTPRINT),true)
 noto_symbols_src := NotoSansSymbols-Regular-Subsetted-Extended.ttf
 else  # !EXTENDED_FONT_FOOTPRINT
@@ -200,7 +238,6 @@ noto_symbols_src :=
 # but without it on other builds. On SMALLER_FONT_FOOTPRINT devices, no
 # color emoji font is included.
 #############################################################################
-
 ifneq ($(SMALLER_FONT_FOOTPRINT),true)
 
 ifeq ($(EXTENDED_FONT_FOOTPRINT),true)
@@ -220,27 +257,3 @@ include $(BUILD_PREBUILT)
 color_emoji_src :=
 
 endif # !SMALLER_FONT_FOOTPRINT
-
-#############################################################################
-# Include NotoSansJP (or a subset) in EXTENDED_FONT_FOOTPRINT builds.
-#############################################################################
-
-ifeq ($(EXTENDED_FONT_FOOTPRINT),true)
-
-ifeq ($(FONT_NOTOSANS_JP_FULL),true)
-noto_sans_jp_src := NotoSansJP-Regular.otf
-else
-noto_sans_jp_src := NotoSansJP-Regular-Subsetted.otf
-endif # FONT_NOTOSANS_JP_FULL
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := NotoSansJP-Regular.otf
-LOCAL_SRC_FILES := $(noto_sans_jp_src)
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts
-include $(BUILD_PREBUILT)
-
-noto_sans_jp_src :=
-
-endif # EXTENDED_FONT_FOOTPRINT
diff --git a/NotoSansJP-Regular-Subsetted.otf b/NotoSansJP-Regular-Subsetted.otf
deleted file mode 100644
index 09b3e73..0000000
--- a/NotoSansJP-Regular-Subsetted.otf
+++ /dev/null
diff --git a/NotoSansKR-Regular.otf b/NotoSansKR-Regular.otf
deleted file mode 100644
index 4ad6ef3..0000000
--- a/NotoSansKR-Regular.otf
+++ /dev/null
diff --git a/README b/README
deleted file mode 100644
index e6ab2da..0000000
--- a/README
+++ /dev/null
@@ -1,12 +0,0 @@
-This directory contains the fonts from the Noto project, chosen for
-Android. For more detail about Noto, please refer to:
-
-https://code.google.com/p/noto/
-
-The tagline is: "Fonts support all languages/characters in Unicode"
-
-The above is the authoritative repository for the fonts. This directory
-does not necessarily track it exactly, and contains only the fonts
-needed for Android (the unhinted versions in particular, if both hinted
-and unhinted versions are available, for size reasons), so does not
-include any utilities or installers.
diff --git a/README.android b/README.android
new file mode 100644
index 0000000..7520f1f
--- /dev/null
+++ b/README.android
@@ -0,0 +1,8 @@
+This directory contains the fonts from the Noto project, chosen for
+Android.
+
+The fonts for Chinese, Japanese, and Korean have a different license
+and copyright holder, and are included in a separate subdirectory
+from the rest of the fonts.
+
+See README.android files in each subdirectory for details.
diff --git a/MODULE_LICENSE_APACHE2 b/cjk/MODULE_LICENSE_OFL
index e69de29..e69de29 100644
--- a/MODULE_LICENSE_APACHE2
+++ b/cjk/MODULE_LICENSE_OFL
diff --git a/cjk/NOTICE b/cjk/NOTICE
new file mode 100644
index 0000000..d952d62
--- /dev/null
+++ b/cjk/NOTICE
@@ -0,0 +1,92 @@
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font
+creation efforts of academic and linguistic communities, and to
+provide a free and open framework in which fonts may be shared and
+improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software
+components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to,
+deleting, or substituting -- in part or in whole -- any of the
+components of the Original Version, by changing formats or by porting
+the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed,
+modify, redistribute, and sell modified and unmodified copies of the
+Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in
+Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the
+corresponding Copyright Holder. This restriction only applies to the
+primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created using
+the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/cjk/NotoSansJP-Regular-Subsetted.otf b/cjk/NotoSansJP-Regular-Subsetted.otf
new file mode 100644
index 0000000..ea9d854
--- /dev/null
+++ b/cjk/NotoSansJP-Regular-Subsetted.otf
diff --git a/NotoSansJP-Regular.otf b/cjk/NotoSansJP-Regular.otf
index fd9e37a..a1f5d6b 100644
--- a/NotoSansJP-Regular.otf
+++ b/cjk/NotoSansJP-Regular.otf
diff --git a/cjk/NotoSansKR-Regular.otf b/cjk/NotoSansKR-Regular.otf
new file mode 100644
index 0000000..45cc164
--- /dev/null
+++ b/cjk/NotoSansKR-Regular.otf
diff --git a/NotoSansHans-Regular.otf b/cjk/NotoSansSC-Regular.otf
index dfc0a62..e6b0cac 100644
--- a/NotoSansHans-Regular.otf
+++ b/cjk/NotoSansSC-Regular.otf
diff --git a/NotoSansHant-Regular.otf b/cjk/NotoSansTC-Regular.otf
index 2b09859..47d0708 100644
--- a/NotoSansHant-Regular.otf
+++ b/cjk/NotoSansTC-Regular.otf
diff --git a/cjk/README.android b/cjk/README.android
new file mode 100644
index 0000000..aeb6a72
--- /dev/null
+++ b/cjk/README.android
@@ -0,0 +1,15 @@
+URL: https://code.google.com/p/noto/
+Version: 1.002
+License: OFL 1.1
+License File: NOTICE
+
+Description:
+Noto CJK fonts, for supporting Chinese, Japanese, and Korean.
+
+Local Modifications:
+This directory contains a special fallback form of the fonts, created
+for Android.
+
+Additionally, a subset of Noto Sans Japenese is included, for
+completing character coverage when Motoya fonts are used instead of
+the complete Noto Sans Japanese.
diff --git a/cjk/subset_noto_sans_jp.py b/cjk/subset_noto_sans_jp.py
new file mode 100755
index 0000000..7cb1b62
--- /dev/null
+++ b/cjk/subset_noto_sans_jp.py
@@ -0,0 +1,516 @@
+#!/usr/bin/env python
+#
+# Copyright 2015 The Android Open Source Project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Subset the Noto Sans Japanese font."""
+
+from nototools import subset
+
+CHARSET = [
+    0x22EF, # MIDLINE HORIZONTAL ELLIPSIS
+    0x3031, # VERTICAL KANA REPEAT MARK
+    0x3032, # VERTICAL KANA REPEAT WITH VOICED SOUND MARK
+    0x3033, # VERTICAL KANA REPEAT MARK UPPER HALF
+    0x3034, # VERTICAL KANA REPEAT WITH VOICED SOUND MARK UPPER HALF
+    0x3035, # VERTICAL KANA REPEAT MARK LOWER HALF
+    0x303B, # VERTICAL IDEOGRAPHIC ITERATION MARK
+    0x3094, # HIRAGANA LETTER VU
+    0x3095, # HIRAGANA LETTER SMALL KA
+    0x3096, # HIRAGANA LETTER SMALL KE
+    0x3099, # COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
+    0x309A, # COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+    0x309F, # HIRAGANA DIGRAPH YORI
+    0x30F7, # KATAKANA LETTER VA
+    0x30F8, # KATAKANA LETTER VI
+    0x30F9, # KATAKANA LETTER VE
+    0x30FA, # KATAKANA LETTER VO
+    0x30FF, # KATAKANA DIGRAPH KOTO
+    0x31F0, # KATAKANA LETTER SMALL KU
+    0x31F1, # KATAKANA LETTER SMALL SI
+    0x31F2, # KATAKANA LETTER SMALL SU
+    0x31F3, # KATAKANA LETTER SMALL TO
+    0x31F4, # KATAKANA LETTER SMALL NU
+    0x31F5, # KATAKANA LETTER SMALL HA
+    0x31F6, # KATAKANA LETTER SMALL HI
+    0x31F7, # KATAKANA LETTER SMALL HU
+    0x31F8, # KATAKANA LETTER SMALL HE
+    0x31F9, # KATAKANA LETTER SMALL HO
+    0x31FA, # KATAKANA LETTER SMALL MU
+    0x31FB, # KATAKANA LETTER SMALL RA
+    0x31FC, # KATAKANA LETTER SMALL RI
+    0x31FD, # KATAKANA LETTER SMALL RU
+    0x31FE, # KATAKANA LETTER SMALL RE
+    0x31FF, # KATAKANA LETTER SMALL RO
+    0x32D0, # CIRCLED KATAKANA A
+    0x32D1, # CIRCLED KATAKANA I
+    0x32D2, # CIRCLED KATAKANA U
+    0x32D3, # CIRCLED KATAKANA E
+    0x32D4, # CIRCLED KATAKANA O
+    0x32D5, # CIRCLED KATAKANA KA
+    0x32D6, # CIRCLED KATAKANA KI
+    0x32D7, # CIRCLED KATAKANA KU
+    0x32D8, # CIRCLED KATAKANA KE
+    0x32D9, # CIRCLED KATAKANA KO
+    0x32DA, # CIRCLED KATAKANA SA
+    0x32DB, # CIRCLED KATAKANA SI
+    0x32DC, # CIRCLED KATAKANA SU
+    0x32DD, # CIRCLED KATAKANA SE
+    0x32DE, # CIRCLED KATAKANA SO
+    0x32DF, # CIRCLED KATAKANA TA
+    0x32E0, # CIRCLED KATAKANA TI
+    0x32E1, # CIRCLED KATAKANA TU
+    0x32E2, # CIRCLED KATAKANA TE
+    0x32E3, # CIRCLED KATAKANA TO
+    0x32E4, # CIRCLED KATAKANA NA
+    0x32E5, # CIRCLED KATAKANA NI
+    0x32E6, # CIRCLED KATAKANA NU
+    0x32E7, # CIRCLED KATAKANA NE
+    0x32E8, # CIRCLED KATAKANA NO
+    0x32E9, # CIRCLED KATAKANA HA
+    0x32EA, # CIRCLED KATAKANA HI
+    0x32EB, # CIRCLED KATAKANA HU
+    0x32EC, # CIRCLED KATAKANA HE
+    0x32ED, # CIRCLED KATAKANA HO
+    0x32EE, # CIRCLED KATAKANA MA
+    0x32EF, # CIRCLED KATAKANA MI
+    0x32F0, # CIRCLED KATAKANA MU
+    0x32F1, # CIRCLED KATAKANA ME
+    0x32F2, # CIRCLED KATAKANA MO
+    0x32F3, # CIRCLED KATAKANA YA
+    0x32F4, # CIRCLED KATAKANA YU
+    0x32F5, # CIRCLED KATAKANA YO
+    0x32F6, # CIRCLED KATAKANA RA
+    0x32F7, # CIRCLED KATAKANA RI
+    0x32F8, # CIRCLED KATAKANA RU
+    0x32F9, # CIRCLED KATAKANA RE
+    0x32FA, # CIRCLED KATAKANA RO
+    0x32FB, # CIRCLED KATAKANA WA
+    0x32FC, # CIRCLED KATAKANA WI
+    0x32FD, # CIRCLED KATAKANA WE
+    0x32FE, # CIRCLED KATAKANA WO
+    0x3300, # SQUARE APAATO
+    0x3301, # SQUARE ARUHUA
+    0x3302, # SQUARE ANPEA
+    0x3304, # SQUARE ININGU
+    0x3305, # SQUARE INTI
+    0x3306, # SQUARE UON
+    0x3307, # SQUARE ESUKUUDO
+    0x3308, # SQUARE EEKAA
+    0x3309, # SQUARE ONSU
+    0x330A, # SQUARE OOMU
+    0x330B, # SQUARE KAIRI
+    0x330C, # SQUARE KARATTO
+    0x330E, # SQUARE GARON
+    0x330F, # SQUARE GANMA
+    0x3310, # SQUARE GIGA
+    0x3311, # SQUARE GINII
+    0x3312, # SQUARE KYURII
+    0x3313, # SQUARE GIRUDAA
+    0x3315, # SQUARE KIROGURAMU
+    0x3316, # SQUARE KIROMEETORU
+    0x3317, # SQUARE KIROWATTO
+    0x3319, # SQUARE GURAMUTON
+    0x331A, # SQUARE KURUZEIRO
+    0x331B, # SQUARE KUROONE
+    0x331C, # SQUARE KEESU
+    0x331D, # SQUARE KORUNA
+    0x331E, # SQUARE KOOPO
+    0x331F, # SQUARE SAIKURU
+    0x3320, # SQUARE SANTIIMU
+    0x3321, # SQUARE SIRINGU
+    0x3324, # SQUARE DAASU
+    0x3325, # SQUARE DESI
+    0x3328, # SQUARE NANO
+    0x3329, # SQUARE NOTTO
+    0x332A, # SQUARE HAITU
+    0x332D, # SQUARE BAARERU
+    0x332E, # SQUARE PIASUTORU
+    0x332F, # SQUARE PIKURU
+    0x3330, # SQUARE PIKO
+    0x3331, # SQUARE BIRU
+    0x3332, # SQUARE HUARADDO
+    0x3333, # SQUARE HUIITO
+    0x3334, # SQUARE BUSSYERU
+    0x3335, # SQUARE HURAN
+    0x3337, # SQUARE PESO
+    0x3338, # SQUARE PENIHI
+    0x3339, # SQUARE HERUTU
+    0x333A, # SQUARE PENSU
+    0x333C, # SQUARE BEETA
+    0x333D, # SQUARE POINTO
+    0x333E, # SQUARE BORUTO
+    0x333F, # SQUARE HON
+    0x3340, # SQUARE PONDO
+    0x3341, # SQUARE HOORU
+    0x3342, # SQUARE HOON
+    0x3343, # SQUARE MAIKURO
+    0x3344, # SQUARE MAIRU
+    0x3345, # SQUARE MAHHA
+    0x3346, # SQUARE MARUKU
+    0x3347, # SQUARE MANSYON
+    0x3348, # SQUARE MIKURON
+    0x334B, # SQUARE MEGA
+    0x334C, # SQUARE MEGATON
+    0x334E, # SQUARE YAADO
+    0x334F, # SQUARE YAARU
+    0x3350, # SQUARE YUAN
+    0x3352, # SQUARE RIRA
+    0x3353, # SQUARE RUPII
+    0x3354, # SQUARE RUUBURU
+    0x3355, # SQUARE REMU
+    0x3356, # SQUARE RENTOGEN
+    0x2000B, # CJK UNIFIED IDEOGRAPH-2000B
+    0x200A2, # CJK UNIFIED IDEOGRAPH-200A2
+    0x200A4, # CJK UNIFIED IDEOGRAPH-200A4
+    0x200B0, # CJK UNIFIED IDEOGRAPH-200B0
+    0x200F5, # CJK UNIFIED IDEOGRAPH-200F5
+    0x20158, # CJK UNIFIED IDEOGRAPH-20158
+    0x201A2, # CJK UNIFIED IDEOGRAPH-201A2
+    0x20213, # CJK UNIFIED IDEOGRAPH-20213
+    0x2032B, # CJK UNIFIED IDEOGRAPH-2032B
+    0x20371, # CJK UNIFIED IDEOGRAPH-20371
+    0x20381, # CJK UNIFIED IDEOGRAPH-20381
+    0x203F9, # CJK UNIFIED IDEOGRAPH-203F9
+    0x2044A, # CJK UNIFIED IDEOGRAPH-2044A
+    0x20509, # CJK UNIFIED IDEOGRAPH-20509
+    0x2053F, # CJK UNIFIED IDEOGRAPH-2053F
+    0x205B1, # CJK UNIFIED IDEOGRAPH-205B1
+    0x205D6, # CJK UNIFIED IDEOGRAPH-205D6
+    0x206EC, # CJK UNIFIED IDEOGRAPH-206EC
+    0x2074F, # CJK UNIFIED IDEOGRAPH-2074F
+    0x207C8, # CJK UNIFIED IDEOGRAPH-207C8
+    0x20807, # CJK UNIFIED IDEOGRAPH-20807
+    0x2083A, # CJK UNIFIED IDEOGRAPH-2083A
+    0x208B9, # CJK UNIFIED IDEOGRAPH-208B9
+    0x2090E, # CJK UNIFIED IDEOGRAPH-2090E
+    0x2097C, # CJK UNIFIED IDEOGRAPH-2097C
+    0x20984, # CJK UNIFIED IDEOGRAPH-20984
+    0x2099D, # CJK UNIFIED IDEOGRAPH-2099D
+    0x20A64, # CJK UNIFIED IDEOGRAPH-20A64
+    0x20AD3, # CJK UNIFIED IDEOGRAPH-20AD3
+    0x20B1D, # CJK UNIFIED IDEOGRAPH-20B1D
+    0x20BB7, # CJK UNIFIED IDEOGRAPH-20BB7
+    0x20D45, # CJK UNIFIED IDEOGRAPH-20D45
+    0x20D58, # CJK UNIFIED IDEOGRAPH-20D58
+    0x20DE1, # CJK UNIFIED IDEOGRAPH-20DE1
+    0x20E64, # CJK UNIFIED IDEOGRAPH-20E64
+    0x20E95, # CJK UNIFIED IDEOGRAPH-20E95
+    0x20F5F, # CJK UNIFIED IDEOGRAPH-20F5F
+    0x21201, # CJK UNIFIED IDEOGRAPH-21201
+    0x2123D, # CJK UNIFIED IDEOGRAPH-2123D
+    0x21255, # CJK UNIFIED IDEOGRAPH-21255
+    0x21274, # CJK UNIFIED IDEOGRAPH-21274
+    0x2127B, # CJK UNIFIED IDEOGRAPH-2127B
+    0x212D7, # CJK UNIFIED IDEOGRAPH-212D7
+    0x212E4, # CJK UNIFIED IDEOGRAPH-212E4
+    0x212FD, # CJK UNIFIED IDEOGRAPH-212FD
+    0x2131B, # CJK UNIFIED IDEOGRAPH-2131B
+    0x21344, # CJK UNIFIED IDEOGRAPH-21344
+    0x213C4, # CJK UNIFIED IDEOGRAPH-213C4
+    0x2146D, # CJK UNIFIED IDEOGRAPH-2146D
+    0x2146E, # CJK UNIFIED IDEOGRAPH-2146E
+    0x21647, # CJK UNIFIED IDEOGRAPH-21647
+    0x216B4, # CJK UNIFIED IDEOGRAPH-216B4
+    0x21706, # CJK UNIFIED IDEOGRAPH-21706
+    0x21742, # CJK UNIFIED IDEOGRAPH-21742
+    0x218BD, # CJK UNIFIED IDEOGRAPH-218BD
+    0x219C3, # CJK UNIFIED IDEOGRAPH-219C3
+    0x21A1A, # CJK UNIFIED IDEOGRAPH-21A1A
+    0x21C56, # CJK UNIFIED IDEOGRAPH-21C56
+    0x21D2D, # CJK UNIFIED IDEOGRAPH-21D2D
+    0x21D45, # CJK UNIFIED IDEOGRAPH-21D45
+    0x21D62, # CJK UNIFIED IDEOGRAPH-21D62
+    0x21D78, # CJK UNIFIED IDEOGRAPH-21D78
+    0x21D92, # CJK UNIFIED IDEOGRAPH-21D92
+    0x21D9C, # CJK UNIFIED IDEOGRAPH-21D9C
+    0x21DA1, # CJK UNIFIED IDEOGRAPH-21DA1
+    0x21DB7, # CJK UNIFIED IDEOGRAPH-21DB7
+    0x21DE0, # CJK UNIFIED IDEOGRAPH-21DE0
+    0x21E33, # CJK UNIFIED IDEOGRAPH-21E33
+    0x21E34, # CJK UNIFIED IDEOGRAPH-21E34
+    0x21F1E, # CJK UNIFIED IDEOGRAPH-21F1E
+    0x21F76, # CJK UNIFIED IDEOGRAPH-21F76
+    0x21FFA, # CJK UNIFIED IDEOGRAPH-21FFA
+    0x2217B, # CJK UNIFIED IDEOGRAPH-2217B
+    0x22218, # CJK UNIFIED IDEOGRAPH-22218
+    0x2231E, # CJK UNIFIED IDEOGRAPH-2231E
+    0x223AD, # CJK UNIFIED IDEOGRAPH-223AD
+    0x22609, # CJK UNIFIED IDEOGRAPH-22609
+    0x226F3, # CJK UNIFIED IDEOGRAPH-226F3
+    0x2285B, # CJK UNIFIED IDEOGRAPH-2285B
+    0x228AB, # CJK UNIFIED IDEOGRAPH-228AB
+    0x22AB8, # CJK UNIFIED IDEOGRAPH-22AB8
+    0x22B46, # CJK UNIFIED IDEOGRAPH-22B46
+    0x22B4F, # CJK UNIFIED IDEOGRAPH-22B4F
+    0x22B50, # CJK UNIFIED IDEOGRAPH-22B50
+    0x22BA6, # CJK UNIFIED IDEOGRAPH-22BA6
+    0x22C1D, # CJK UNIFIED IDEOGRAPH-22C1D
+    0x22C24, # CJK UNIFIED IDEOGRAPH-22C24
+    0x22DE1, # CJK UNIFIED IDEOGRAPH-22DE1
+    0x22FEB, # CJK UNIFIED IDEOGRAPH-22FEB
+    0x231B6, # CJK UNIFIED IDEOGRAPH-231B6
+    0x231C3, # CJK UNIFIED IDEOGRAPH-231C3
+    0x231C4, # CJK UNIFIED IDEOGRAPH-231C4
+    0x231F5, # CJK UNIFIED IDEOGRAPH-231F5
+    0x23372, # CJK UNIFIED IDEOGRAPH-23372
+    0x233D0, # CJK UNIFIED IDEOGRAPH-233D0
+    0x233D2, # CJK UNIFIED IDEOGRAPH-233D2
+    0x233D3, # CJK UNIFIED IDEOGRAPH-233D3
+    0x233D5, # CJK UNIFIED IDEOGRAPH-233D5
+    0x233DA, # CJK UNIFIED IDEOGRAPH-233DA
+    0x233DF, # CJK UNIFIED IDEOGRAPH-233DF
+    0x233E4, # CJK UNIFIED IDEOGRAPH-233E4
+    0x2344A, # CJK UNIFIED IDEOGRAPH-2344A
+    0x2344B, # CJK UNIFIED IDEOGRAPH-2344B
+    0x23451, # CJK UNIFIED IDEOGRAPH-23451
+    0x23465, # CJK UNIFIED IDEOGRAPH-23465
+    0x234E4, # CJK UNIFIED IDEOGRAPH-234E4
+    0x23594, # CJK UNIFIED IDEOGRAPH-23594
+    0x235C4, # CJK UNIFIED IDEOGRAPH-235C4
+    0x23638, # CJK UNIFIED IDEOGRAPH-23638
+    0x23639, # CJK UNIFIED IDEOGRAPH-23639
+    0x2363A, # CJK UNIFIED IDEOGRAPH-2363A
+    0x23647, # CJK UNIFIED IDEOGRAPH-23647
+    0x2370C, # CJK UNIFIED IDEOGRAPH-2370C
+    0x2371C, # CJK UNIFIED IDEOGRAPH-2371C
+    0x23763, # CJK UNIFIED IDEOGRAPH-23763
+    0x23764, # CJK UNIFIED IDEOGRAPH-23764
+    0x237E7, # CJK UNIFIED IDEOGRAPH-237E7
+    0x237F1, # CJK UNIFIED IDEOGRAPH-237F1
+    0x237FF, # CJK UNIFIED IDEOGRAPH-237FF
+    0x23824, # CJK UNIFIED IDEOGRAPH-23824
+    0x2383D, # CJK UNIFIED IDEOGRAPH-2383D
+    0x23A98, # CJK UNIFIED IDEOGRAPH-23A98
+    0x23C7F, # CJK UNIFIED IDEOGRAPH-23C7F
+    0x23CBE, # CJK UNIFIED IDEOGRAPH-23CBE
+    0x23D00, # CJK UNIFIED IDEOGRAPH-23D00
+    0x23D0E, # CJK UNIFIED IDEOGRAPH-23D0E
+    0x23DD3, # CJK UNIFIED IDEOGRAPH-23DD3
+    0x23DF9, # CJK UNIFIED IDEOGRAPH-23DF9
+    0x23DFA, # CJK UNIFIED IDEOGRAPH-23DFA
+    0x23F7E, # CJK UNIFIED IDEOGRAPH-23F7E
+    0x2404B, # CJK UNIFIED IDEOGRAPH-2404B
+    0x24096, # CJK UNIFIED IDEOGRAPH-24096
+    0x24103, # CJK UNIFIED IDEOGRAPH-24103
+    0x241C6, # CJK UNIFIED IDEOGRAPH-241C6
+    0x243BC, # CJK UNIFIED IDEOGRAPH-243BC
+    0x243D0, # CJK UNIFIED IDEOGRAPH-243D0
+    0x24629, # CJK UNIFIED IDEOGRAPH-24629
+    0x246A5, # CJK UNIFIED IDEOGRAPH-246A5
+    0x247F1, # CJK UNIFIED IDEOGRAPH-247F1
+    0x24896, # CJK UNIFIED IDEOGRAPH-24896
+    0x24A4D, # CJK UNIFIED IDEOGRAPH-24A4D
+    0x24B56, # CJK UNIFIED IDEOGRAPH-24B56
+    0x24B6F, # CJK UNIFIED IDEOGRAPH-24B6F
+    0x24C16, # CJK UNIFIED IDEOGRAPH-24C16
+    0x24D14, # CJK UNIFIED IDEOGRAPH-24D14
+    0x24E04, # CJK UNIFIED IDEOGRAPH-24E04
+    0x24E0E, # CJK UNIFIED IDEOGRAPH-24E0E
+    0x24E37, # CJK UNIFIED IDEOGRAPH-24E37
+    0x24E6A, # CJK UNIFIED IDEOGRAPH-24E6A
+    0x24E8B, # CJK UNIFIED IDEOGRAPH-24E8B
+    0x24FF2, # CJK UNIFIED IDEOGRAPH-24FF2
+    0x2504A, # CJK UNIFIED IDEOGRAPH-2504A
+    0x25055, # CJK UNIFIED IDEOGRAPH-25055
+    0x25122, # CJK UNIFIED IDEOGRAPH-25122
+    0x251A9, # CJK UNIFIED IDEOGRAPH-251A9
+    0x251E5, # CJK UNIFIED IDEOGRAPH-251E5
+    0x2521E, # CJK UNIFIED IDEOGRAPH-2521E
+    0x2524C, # CJK UNIFIED IDEOGRAPH-2524C
+    0x2542E, # CJK UNIFIED IDEOGRAPH-2542E
+    0x2548E, # CJK UNIFIED IDEOGRAPH-2548E
+    0x254D9, # CJK UNIFIED IDEOGRAPH-254D9
+    0x2550E, # CJK UNIFIED IDEOGRAPH-2550E
+    0x255A7, # CJK UNIFIED IDEOGRAPH-255A7
+    0x2567F, # CJK UNIFIED IDEOGRAPH-2567F
+    0x25771, # CJK UNIFIED IDEOGRAPH-25771
+    0x257A9, # CJK UNIFIED IDEOGRAPH-257A9
+    0x257B4, # CJK UNIFIED IDEOGRAPH-257B4
+    0x25874, # CJK UNIFIED IDEOGRAPH-25874
+    0x259C4, # CJK UNIFIED IDEOGRAPH-259C4
+    0x259D4, # CJK UNIFIED IDEOGRAPH-259D4
+    0x25AE3, # CJK UNIFIED IDEOGRAPH-25AE3
+    0x25AE4, # CJK UNIFIED IDEOGRAPH-25AE4
+    0x25AF1, # CJK UNIFIED IDEOGRAPH-25AF1
+    0x25BB2, # CJK UNIFIED IDEOGRAPH-25BB2
+    0x25C4B, # CJK UNIFIED IDEOGRAPH-25C4B
+    0x25C64, # CJK UNIFIED IDEOGRAPH-25C64
+    0x25DA1, # CJK UNIFIED IDEOGRAPH-25DA1
+    0x25E2E, # CJK UNIFIED IDEOGRAPH-25E2E
+    0x25E56, # CJK UNIFIED IDEOGRAPH-25E56
+    0x25E62, # CJK UNIFIED IDEOGRAPH-25E62
+    0x25E65, # CJK UNIFIED IDEOGRAPH-25E65
+    0x25EC2, # CJK UNIFIED IDEOGRAPH-25EC2
+    0x25EE8, # CJK UNIFIED IDEOGRAPH-25EE8
+    0x25F23, # CJK UNIFIED IDEOGRAPH-25F23
+    0x25F5C, # CJK UNIFIED IDEOGRAPH-25F5C
+    0x25FD4, # CJK UNIFIED IDEOGRAPH-25FD4
+    0x25FE0, # CJK UNIFIED IDEOGRAPH-25FE0
+    0x25FFB, # CJK UNIFIED IDEOGRAPH-25FFB
+    0x2600C, # CJK UNIFIED IDEOGRAPH-2600C
+    0x26017, # CJK UNIFIED IDEOGRAPH-26017
+    0x26060, # CJK UNIFIED IDEOGRAPH-26060
+    0x260ED, # CJK UNIFIED IDEOGRAPH-260ED
+    0x26222, # CJK UNIFIED IDEOGRAPH-26222
+    0x26270, # CJK UNIFIED IDEOGRAPH-26270
+    0x26286, # CJK UNIFIED IDEOGRAPH-26286
+    0x2667E, # CJK UNIFIED IDEOGRAPH-2667E
+    0x266B0, # CJK UNIFIED IDEOGRAPH-266B0
+    0x2671D, # CJK UNIFIED IDEOGRAPH-2671D
+    0x268DD, # CJK UNIFIED IDEOGRAPH-268DD
+    0x268EA, # CJK UNIFIED IDEOGRAPH-268EA
+    0x2696F, # CJK UNIFIED IDEOGRAPH-2696F
+    0x26999, # CJK UNIFIED IDEOGRAPH-26999
+    0x269DD, # CJK UNIFIED IDEOGRAPH-269DD
+    0x26A1E, # CJK UNIFIED IDEOGRAPH-26A1E
+    0x26A58, # CJK UNIFIED IDEOGRAPH-26A58
+    0x26A8C, # CJK UNIFIED IDEOGRAPH-26A8C
+    0x26AB7, # CJK UNIFIED IDEOGRAPH-26AB7
+    0x26AFF, # CJK UNIFIED IDEOGRAPH-26AFF
+    0x26C29, # CJK UNIFIED IDEOGRAPH-26C29
+    0x26C73, # CJK UNIFIED IDEOGRAPH-26C73
+    0x26C9E, # CJK UNIFIED IDEOGRAPH-26C9E
+    0x26CDD, # CJK UNIFIED IDEOGRAPH-26CDD
+    0x26E40, # CJK UNIFIED IDEOGRAPH-26E40
+    0x26E65, # CJK UNIFIED IDEOGRAPH-26E65
+    0x26F94, # CJK UNIFIED IDEOGRAPH-26F94
+    0x26FF6, # CJK UNIFIED IDEOGRAPH-26FF6
+    0x26FF7, # CJK UNIFIED IDEOGRAPH-26FF7
+    0x26FF8, # CJK UNIFIED IDEOGRAPH-26FF8
+    0x270F4, # CJK UNIFIED IDEOGRAPH-270F4
+    0x27139, # CJK UNIFIED IDEOGRAPH-27139
+    0x273DA, # CJK UNIFIED IDEOGRAPH-273DA
+    0x273DB, # CJK UNIFIED IDEOGRAPH-273DB
+    0x273FE, # CJK UNIFIED IDEOGRAPH-273FE
+    0x27410, # CJK UNIFIED IDEOGRAPH-27410
+    0x27449, # CJK UNIFIED IDEOGRAPH-27449
+    0x27614, # CJK UNIFIED IDEOGRAPH-27614
+    0x27615, # CJK UNIFIED IDEOGRAPH-27615
+    0x27631, # CJK UNIFIED IDEOGRAPH-27631
+    0x27684, # CJK UNIFIED IDEOGRAPH-27684
+    0x27693, # CJK UNIFIED IDEOGRAPH-27693
+    0x2770E, # CJK UNIFIED IDEOGRAPH-2770E
+    0x27723, # CJK UNIFIED IDEOGRAPH-27723
+    0x27752, # CJK UNIFIED IDEOGRAPH-27752
+    0x27985, # CJK UNIFIED IDEOGRAPH-27985
+    0x279B4, # CJK UNIFIED IDEOGRAPH-279B4
+    0x27BB3, # CJK UNIFIED IDEOGRAPH-27BB3
+    0x27BBE, # CJK UNIFIED IDEOGRAPH-27BBE
+    0x27BC7, # CJK UNIFIED IDEOGRAPH-27BC7
+    0x27C3C, # CJK UNIFIED IDEOGRAPH-27C3C
+    0x27CB8, # CJK UNIFIED IDEOGRAPH-27CB8
+    0x27DA0, # CJK UNIFIED IDEOGRAPH-27DA0
+    0x27E10, # CJK UNIFIED IDEOGRAPH-27E10
+    0x2808A, # CJK UNIFIED IDEOGRAPH-2808A
+    0x280BB, # CJK UNIFIED IDEOGRAPH-280BB
+    0x28277, # CJK UNIFIED IDEOGRAPH-28277
+    0x28282, # CJK UNIFIED IDEOGRAPH-28282
+    0x282F3, # CJK UNIFIED IDEOGRAPH-282F3
+    0x283CD, # CJK UNIFIED IDEOGRAPH-283CD
+    0x2840C, # CJK UNIFIED IDEOGRAPH-2840C
+    0x28455, # CJK UNIFIED IDEOGRAPH-28455
+    0x2856B, # CJK UNIFIED IDEOGRAPH-2856B
+    0x285C8, # CJK UNIFIED IDEOGRAPH-285C8
+    0x285C9, # CJK UNIFIED IDEOGRAPH-285C9
+    0x286D7, # CJK UNIFIED IDEOGRAPH-286D7
+    0x286FA, # CJK UNIFIED IDEOGRAPH-286FA
+    0x28946, # CJK UNIFIED IDEOGRAPH-28946
+    0x2896B, # CJK UNIFIED IDEOGRAPH-2896B
+    0x28987, # CJK UNIFIED IDEOGRAPH-28987
+    0x28988, # CJK UNIFIED IDEOGRAPH-28988
+    0x289BA, # CJK UNIFIED IDEOGRAPH-289BA
+    0x289BB, # CJK UNIFIED IDEOGRAPH-289BB
+    0x28A1E, # CJK UNIFIED IDEOGRAPH-28A1E
+    0x28A43, # CJK UNIFIED IDEOGRAPH-28A43
+    0x28A71, # CJK UNIFIED IDEOGRAPH-28A71
+    0x28A99, # CJK UNIFIED IDEOGRAPH-28A99
+    0x28ACD, # CJK UNIFIED IDEOGRAPH-28ACD
+    0x28ADD, # CJK UNIFIED IDEOGRAPH-28ADD
+    0x28AE4, # CJK UNIFIED IDEOGRAPH-28AE4
+    0x28BC1, # CJK UNIFIED IDEOGRAPH-28BC1
+    0x28BEF, # CJK UNIFIED IDEOGRAPH-28BEF
+    0x28CDD, # CJK UNIFIED IDEOGRAPH-28CDD
+    0x28D10, # CJK UNIFIED IDEOGRAPH-28D10
+    0x28D71, # CJK UNIFIED IDEOGRAPH-28D71
+    0x28DFB, # CJK UNIFIED IDEOGRAPH-28DFB
+    0x28E17, # CJK UNIFIED IDEOGRAPH-28E17
+    0x28E1F, # CJK UNIFIED IDEOGRAPH-28E1F
+    0x28E89, # CJK UNIFIED IDEOGRAPH-28E89
+    0x28EEB, # CJK UNIFIED IDEOGRAPH-28EEB
+    0x28EF6, # CJK UNIFIED IDEOGRAPH-28EF6
+    0x28F32, # CJK UNIFIED IDEOGRAPH-28F32
+    0x28FF8, # CJK UNIFIED IDEOGRAPH-28FF8
+    0x292A0, # CJK UNIFIED IDEOGRAPH-292A0
+    0x292B1, # CJK UNIFIED IDEOGRAPH-292B1
+    0x29490, # CJK UNIFIED IDEOGRAPH-29490
+    0x295CF, # CJK UNIFIED IDEOGRAPH-295CF
+    0x296F0, # CJK UNIFIED IDEOGRAPH-296F0
+    0x29719, # CJK UNIFIED IDEOGRAPH-29719
+    0x29750, # CJK UNIFIED IDEOGRAPH-29750
+    0x298C6, # CJK UNIFIED IDEOGRAPH-298C6
+    0x29A72, # CJK UNIFIED IDEOGRAPH-29A72
+    0x29D4B, # CJK UNIFIED IDEOGRAPH-29D4B
+    0x29DDB, # CJK UNIFIED IDEOGRAPH-29DDB
+    0x29E15, # CJK UNIFIED IDEOGRAPH-29E15
+    0x29E3D, # CJK UNIFIED IDEOGRAPH-29E3D
+    0x29E49, # CJK UNIFIED IDEOGRAPH-29E49
+    0x29E8A, # CJK UNIFIED IDEOGRAPH-29E8A
+    0x29EC4, # CJK UNIFIED IDEOGRAPH-29EC4
+    0x29EDB, # CJK UNIFIED IDEOGRAPH-29EDB
+    0x29EE9, # CJK UNIFIED IDEOGRAPH-29EE9
+    0x29FCE, # CJK UNIFIED IDEOGRAPH-29FCE
+    0x29FD7, # CJK UNIFIED IDEOGRAPH-29FD7
+    0x2A01A, # CJK UNIFIED IDEOGRAPH-2A01A
+    0x2A02F, # CJK UNIFIED IDEOGRAPH-2A02F
+    0x2A082, # CJK UNIFIED IDEOGRAPH-2A082
+    0x2A0F9, # CJK UNIFIED IDEOGRAPH-2A0F9
+    0x2A190, # CJK UNIFIED IDEOGRAPH-2A190
+    0x2A38C, # CJK UNIFIED IDEOGRAPH-2A38C
+    0x2A437, # CJK UNIFIED IDEOGRAPH-2A437
+    0x2A5F1, # CJK UNIFIED IDEOGRAPH-2A5F1
+    0x2A602, # CJK UNIFIED IDEOGRAPH-2A602
+    0x2A61A, # CJK UNIFIED IDEOGRAPH-2A61A
+    0x2A6B2, # CJK UNIFIED IDEOGRAPH-2A6B2
+    0x2A9E6, # CJK UNIFIED IDEOGRAPH-2A9E6
+    0x2B746, # CJK UNIFIED IDEOGRAPH-2B746
+    0x2B751, # CJK UNIFIED IDEOGRAPH-2B751
+    0x2B753, # CJK UNIFIED IDEOGRAPH-2B753
+    0x2B75A, # CJK UNIFIED IDEOGRAPH-2B75A
+    0x2B75C, # CJK UNIFIED IDEOGRAPH-2B75C
+    0x2B765, # CJK UNIFIED IDEOGRAPH-2B765
+    0x2B776, # CJK UNIFIED IDEOGRAPH-2B776
+    0x2B777, # CJK UNIFIED IDEOGRAPH-2B777
+    0x2B77C, # CJK UNIFIED IDEOGRAPH-2B77C
+    0x2B782, # CJK UNIFIED IDEOGRAPH-2B782
+    0x2B789, # CJK UNIFIED IDEOGRAPH-2B789
+    0x2B78B, # CJK UNIFIED IDEOGRAPH-2B78B
+    0x2B78E, # CJK UNIFIED IDEOGRAPH-2B78E
+    0x2B794, # CJK UNIFIED IDEOGRAPH-2B794
+    0x2B7AC, # CJK UNIFIED IDEOGRAPH-2B7AC
+    0x2B7AF, # CJK UNIFIED IDEOGRAPH-2B7AF
+    0x2B7BD, # CJK UNIFIED IDEOGRAPH-2B7BD
+    0x2B7C9, # CJK UNIFIED IDEOGRAPH-2B7C9
+    0x2B7CF, # CJK UNIFIED IDEOGRAPH-2B7CF
+    0x2B7D2, # CJK UNIFIED IDEOGRAPH-2B7D2
+    0x2B7D8, # CJK UNIFIED IDEOGRAPH-2B7D8
+    0x2B7F0, # CJK UNIFIED IDEOGRAPH-2B7F0
+    0x2B80D, # CJK UNIFIED IDEOGRAPH-2B80D
+    0x2B817, # CJK UNIFIED IDEOGRAPH-2B817
+    0x2B81A, # CJK UNIFIED IDEOGRAPH-2B81A
+]
+
+subset.subset_font('NotoSansJP-Regular.otf',
+                   'NotoSansJP-Regular-Subsetted.otf',
+                   include=CHARSET)
diff --git a/fonts.mk b/fonts.mk
index a86798c..7375a87 100644
--- a/fonts.mk
+++ b/fonts.mk
@@ -55,8 +55,6 @@ PRODUCT_PACKAGES := \
     NotoSansGurmukhi-Bold.ttf \
     NotoSansGurmukhiUI-Regular.ttf \
     NotoSansGurmukhiUI-Bold.ttf \
-    NotoSansHans-Regular.otf \
-    NotoSansHant-Regular.otf \
     NotoSansHanunoo-Regular.ttf \
     NotoSansHebrew-Regular.ttf \
     NotoSansHebrew-Bold.ttf \
@@ -99,6 +97,7 @@ PRODUCT_PACKAGES := \
     NotoSansOriyaUI-Bold.ttf \
     NotoSansRejang-Regular.ttf \
     NotoSansSaurashtra-Regular.ttf \
+    NotoSansSC-Regular.otf \
     NotoSansSinhala-Regular.ttf \
     NotoSansSinhala-Bold.ttf \
     NotoSansSundanese-Regular.ttf \
@@ -113,6 +112,7 @@ PRODUCT_PACKAGES := \
     NotoSansTamil-Bold.ttf \
     NotoSansTamilUI-Regular.ttf \
     NotoSansTamilUI-Bold.ttf \
+    NotoSansTC-Regular.otf \
     NotoSansTelugu-Regular.ttf \
     NotoSansTelugu-Bold.ttf \
     NotoSansTeluguUI-Regular.ttf \
diff --git a/other/MODULE_LICENSE_APACHE2 b/other/MODULE_LICENSE_APACHE2
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/other/MODULE_LICENSE_APACHE2
diff --git a/NOTICE b/other/NOTICE
index d645695..d645695 100644
--- a/NOTICE
+++ b/other/NOTICE
diff --git a/NotoColorEmoji-Subsetted.ttf b/other/NotoColorEmoji-Subsetted.ttf
index 112a4d5..112a4d5 100644
--- a/NotoColorEmoji-Subsetted.ttf
+++ b/other/NotoColorEmoji-Subsetted.ttf
diff --git a/NotoColorEmoji.ttf b/other/NotoColorEmoji.ttf
index 5b248cc..5b248cc 100644
--- a/NotoColorEmoji.ttf
+++ b/other/NotoColorEmoji.ttf
diff --git a/NotoNaskh-Bold.ttf b/other/NotoNaskh-Bold.ttf
index 00a5fdc..00a5fdc 100644
--- a/NotoNaskh-Bold.ttf
+++ b/other/NotoNaskh-Bold.ttf
diff --git a/NotoNaskh-Regular.ttf b/other/NotoNaskh-Regular.ttf
index eaba984..eaba984 100644
--- a/NotoNaskh-Regular.ttf
+++ b/other/NotoNaskh-Regular.ttf
diff --git a/NotoNaskhUI-Bold.ttf b/other/NotoNaskhUI-Bold.ttf
index 95df42c..95df42c 100644
--- a/NotoNaskhUI-Bold.ttf
+++ b/other/NotoNaskhUI-Bold.ttf
diff --git a/NotoNaskhUI-Regular.ttf b/other/NotoNaskhUI-Regular.ttf
index 85a9eff..85a9eff 100644
--- a/NotoNaskhUI-Regular.ttf
+++ b/other/NotoNaskhUI-Regular.ttf
diff --git a/NotoSansArmenian-Bold.ttf b/other/NotoSansArmenian-Bold.ttf
index cc85598..cc85598 100644
--- a/NotoSansArmenian-Bold.ttf
+++ b/other/NotoSansArmenian-Bold.ttf
diff --git a/NotoSansArmenian-Regular.ttf b/other/NotoSansArmenian-Regular.ttf
index 67f96a5..67f96a5 100644
--- a/NotoSansArmenian-Regular.ttf
+++ b/other/NotoSansArmenian-Regular.ttf
diff --git a/NotoSansBalinese-Regular.ttf b/other/NotoSansBalinese-Regular.ttf
index 5298392..5298392 100644
--- a/NotoSansBalinese-Regular.ttf
+++ b/other/NotoSansBalinese-Regular.ttf
diff --git a/NotoSansBamum-Regular.ttf b/other/NotoSansBamum-Regular.ttf
index d5a83b4..d5a83b4 100644
--- a/NotoSansBamum-Regular.ttf
+++ b/other/NotoSansBamum-Regular.ttf
diff --git a/NotoSansBatak-Regular.ttf b/other/NotoSansBatak-Regular.ttf
index bb2ab92..bb2ab92 100644
--- a/NotoSansBatak-Regular.ttf
+++ b/other/NotoSansBatak-Regular.ttf
diff --git a/NotoSansBengali-Bold.ttf b/other/NotoSansBengali-Bold.ttf
index 5c894bd..5c894bd 100644
--- a/NotoSansBengali-Bold.ttf
+++ b/other/NotoSansBengali-Bold.ttf
diff --git a/NotoSansBengali-Regular.ttf b/other/NotoSansBengali-Regular.ttf
index 504f0e9..504f0e9 100644
--- a/NotoSansBengali-Regular.ttf
+++ b/other/NotoSansBengali-Regular.ttf
diff --git a/NotoSansBengaliUI-Bold.ttf b/other/NotoSansBengaliUI-Bold.ttf
index b07ae01..b07ae01 100644
--- a/NotoSansBengaliUI-Bold.ttf
+++ b/other/NotoSansBengaliUI-Bold.ttf
diff --git a/NotoSansBengaliUI-Regular.ttf b/other/NotoSansBengaliUI-Regular.ttf
index b45d6de..b45d6de 100644
--- a/NotoSansBengaliUI-Regular.ttf
+++ b/other/NotoSansBengaliUI-Regular.ttf
diff --git a/NotoSansBuginese-Regular.ttf b/other/NotoSansBuginese-Regular.ttf
index dba9783..dba9783 100644
--- a/NotoSansBuginese-Regular.ttf
+++ b/other/NotoSansBuginese-Regular.ttf
diff --git a/NotoSansBuhid-Regular.ttf b/other/NotoSansBuhid-Regular.ttf
index 84b656a..84b656a 100644
--- a/NotoSansBuhid-Regular.ttf
+++ b/other/NotoSansBuhid-Regular.ttf
diff --git a/NotoSansCanadianAboriginal-Regular.ttf b/other/NotoSansCanadianAboriginal-Regular.ttf
index 9628f56..9628f56 100644
--- a/NotoSansCanadianAboriginal-Regular.ttf
+++ b/other/NotoSansCanadianAboriginal-Regular.ttf
diff --git a/NotoSansCham-Bold.ttf b/other/NotoSansCham-Bold.ttf
index a71469c..a71469c 100644
--- a/NotoSansCham-Bold.ttf
+++ b/other/NotoSansCham-Bold.ttf
diff --git a/NotoSansCham-Regular.ttf b/other/NotoSansCham-Regular.ttf
index 937606d..937606d 100644
--- a/NotoSansCham-Regular.ttf
+++ b/other/NotoSansCham-Regular.ttf
diff --git a/NotoSansCherokee-Regular.ttf b/other/NotoSansCherokee-Regular.ttf
index 1f28fa7..1f28fa7 100644
--- a/NotoSansCherokee-Regular.ttf
+++ b/other/NotoSansCherokee-Regular.ttf
diff --git a/NotoSansCoptic-Regular.ttf b/other/NotoSansCoptic-Regular.ttf
index f47a40c..f47a40c 100644
--- a/NotoSansCoptic-Regular.ttf
+++ b/other/NotoSansCoptic-Regular.ttf
diff --git a/NotoSansDevanagari-Bold.ttf b/other/NotoSansDevanagari-Bold.ttf
index 3862ae8..3862ae8 100644
--- a/NotoSansDevanagari-Bold.ttf
+++ b/other/NotoSansDevanagari-Bold.ttf
diff --git a/NotoSansDevanagari-Regular.ttf b/other/NotoSansDevanagari-Regular.ttf
index 51182c5..51182c5 100644
--- a/NotoSansDevanagari-Regular.ttf
+++ b/other/NotoSansDevanagari-Regular.ttf
diff --git a/NotoSansDevanagariUI-Bold.ttf b/other/NotoSansDevanagariUI-Bold.ttf
index 6546bd0..6546bd0 100644
--- a/NotoSansDevanagariUI-Bold.ttf
+++ b/other/NotoSansDevanagariUI-Bold.ttf
diff --git a/NotoSansDevanagariUI-Regular.ttf b/other/NotoSansDevanagariUI-Regular.ttf
index 703ac14..703ac14 100644
--- a/NotoSansDevanagariUI-Regular.ttf
+++ b/other/NotoSansDevanagariUI-Regular.ttf
diff --git a/NotoSansEthiopic-Bold.ttf b/other/NotoSansEthiopic-Bold.ttf
index 1017302..1017302 100644
--- a/NotoSansEthiopic-Bold.ttf
+++ b/other/NotoSansEthiopic-Bold.ttf
diff --git a/NotoSansEthiopic-Regular.ttf b/other/NotoSansEthiopic-Regular.ttf
index 83f09a8..83f09a8 100644
--- a/NotoSansEthiopic-Regular.ttf
+++ b/other/NotoSansEthiopic-Regular.ttf
diff --git a/NotoSansGeorgian-Bold.ttf b/other/NotoSansGeorgian-Bold.ttf
index 80b9324..80b9324 100644
--- a/NotoSansGeorgian-Bold.ttf
+++ b/other/NotoSansGeorgian-Bold.ttf
diff --git a/NotoSansGeorgian-Regular.ttf b/other/NotoSansGeorgian-Regular.ttf
index 98e102b..98e102b 100644
--- a/NotoSansGeorgian-Regular.ttf
+++ b/other/NotoSansGeorgian-Regular.ttf
diff --git a/NotoSansGlagolitic-Regular.ttf b/other/NotoSansGlagolitic-Regular.ttf
index d85b301..d85b301 100644
--- a/NotoSansGlagolitic-Regular.ttf
+++ b/other/NotoSansGlagolitic-Regular.ttf
diff --git a/NotoSansGujarati-Bold.ttf b/other/NotoSansGujarati-Bold.ttf
index 8413835..8413835 100644
--- a/NotoSansGujarati-Bold.ttf
+++ b/other/NotoSansGujarati-Bold.ttf
diff --git a/NotoSansGujarati-Regular.ttf b/other/NotoSansGujarati-Regular.ttf
index e7f1d31..e7f1d31 100644
--- a/NotoSansGujarati-Regular.ttf
+++ b/other/NotoSansGujarati-Regular.ttf
diff --git a/NotoSansGujaratiUI-Bold.ttf b/other/NotoSansGujaratiUI-Bold.ttf
index a1f63be..a1f63be 100644
--- a/NotoSansGujaratiUI-Bold.ttf
+++ b/other/NotoSansGujaratiUI-Bold.ttf
diff --git a/NotoSansGujaratiUI-Regular.ttf b/other/NotoSansGujaratiUI-Regular.ttf
index e69c125..e69c125 100644
--- a/NotoSansGujaratiUI-Regular.ttf
+++ b/other/NotoSansGujaratiUI-Regular.ttf
diff --git a/NotoSansGurmukhi-Bold.ttf b/other/NotoSansGurmukhi-Bold.ttf
index d1727a2..d1727a2 100644
--- a/NotoSansGurmukhi-Bold.ttf
+++ b/other/NotoSansGurmukhi-Bold.ttf
diff --git a/NotoSansGurmukhi-Regular.ttf b/other/NotoSansGurmukhi-Regular.ttf
index 4dd589c..4dd589c 100644
--- a/NotoSansGurmukhi-Regular.ttf
+++ b/other/NotoSansGurmukhi-Regular.ttf
diff --git a/NotoSansGurmukhiUI-Bold.ttf b/other/NotoSansGurmukhiUI-Bold.ttf
index a0f157d..a0f157d 100644
--- a/NotoSansGurmukhiUI-Bold.ttf
+++ b/other/NotoSansGurmukhiUI-Bold.ttf
diff --git a/NotoSansGurmukhiUI-Regular.ttf b/other/NotoSansGurmukhiUI-Regular.ttf
index d7483b9..d7483b9 100644
--- a/NotoSansGurmukhiUI-Regular.ttf
+++ b/other/NotoSansGurmukhiUI-Regular.ttf
diff --git a/NotoSansHanunoo-Regular.ttf b/other/NotoSansHanunoo-Regular.ttf
index 57a22b7..57a22b7 100644
--- a/NotoSansHanunoo-Regular.ttf
+++ b/other/NotoSansHanunoo-Regular.ttf
diff --git a/NotoSansHebrew-Bold.ttf b/other/NotoSansHebrew-Bold.ttf
index 2ba5219..2ba5219 100644
--- a/NotoSansHebrew-Bold.ttf
+++ b/other/NotoSansHebrew-Bold.ttf
diff --git a/NotoSansHebrew-Regular.ttf b/other/NotoSansHebrew-Regular.ttf
index 49d3158..49d3158 100644
--- a/NotoSansHebrew-Regular.ttf
+++ b/other/NotoSansHebrew-Regular.ttf
diff --git a/NotoSansJavanese-Regular.ttf b/other/NotoSansJavanese-Regular.ttf
index 96ac014..96ac014 100644
--- a/NotoSansJavanese-Regular.ttf
+++ b/other/NotoSansJavanese-Regular.ttf
diff --git a/NotoSansKannada-Bold.ttf b/other/NotoSansKannada-Bold.ttf
index 1028e5d..1028e5d 100644
--- a/NotoSansKannada-Bold.ttf
+++ b/other/NotoSansKannada-Bold.ttf
diff --git a/NotoSansKannada-Regular.ttf b/other/NotoSansKannada-Regular.ttf
index 47d16e9..47d16e9 100644
--- a/NotoSansKannada-Regular.ttf
+++ b/other/NotoSansKannada-Regular.ttf
diff --git a/NotoSansKannadaUI-Bold.ttf b/other/NotoSansKannadaUI-Bold.ttf
index 0ad0f3a..0ad0f3a 100644
--- a/NotoSansKannadaUI-Bold.ttf
+++ b/other/NotoSansKannadaUI-Bold.ttf
diff --git a/NotoSansKannadaUI-Regular.ttf b/other/NotoSansKannadaUI-Regular.ttf
index 4c156c0..4c156c0 100644
--- a/NotoSansKannadaUI-Regular.ttf
+++ b/other/NotoSansKannadaUI-Regular.ttf
diff --git a/NotoSansKayahLi-Regular.ttf b/other/NotoSansKayahLi-Regular.ttf
index 97f21f3..97f21f3 100644
--- a/NotoSansKayahLi-Regular.ttf
+++ b/other/NotoSansKayahLi-Regular.ttf
diff --git a/NotoSansKhmer-Bold.ttf b/other/NotoSansKhmer-Bold.ttf
index f422ab7..f422ab7 100644
--- a/NotoSansKhmer-Bold.ttf
+++ b/other/NotoSansKhmer-Bold.ttf
diff --git a/NotoSansKhmer-Regular.ttf b/other/NotoSansKhmer-Regular.ttf
index 57289fe..57289fe 100644
--- a/NotoSansKhmer-Regular.ttf
+++ b/other/NotoSansKhmer-Regular.ttf
diff --git a/NotoSansKhmerUI-Bold.ttf b/other/NotoSansKhmerUI-Bold.ttf
index a9177b2..a9177b2 100644
--- a/NotoSansKhmerUI-Bold.ttf
+++ b/other/NotoSansKhmerUI-Bold.ttf
diff --git a/NotoSansKhmerUI-Regular.ttf b/other/NotoSansKhmerUI-Regular.ttf
index c711240..c711240 100644
--- a/NotoSansKhmerUI-Regular.ttf
+++ b/other/NotoSansKhmerUI-Regular.ttf
diff --git a/NotoSansLao-Bold.ttf b/other/NotoSansLao-Bold.ttf
index b97d74c..b97d74c 100644
--- a/NotoSansLao-Bold.ttf
+++ b/other/NotoSansLao-Bold.ttf
diff --git a/NotoSansLao-Regular.ttf b/other/NotoSansLao-Regular.ttf
index 71f3e2d..71f3e2d 100644
--- a/NotoSansLao-Regular.ttf
+++ b/other/NotoSansLao-Regular.ttf
diff --git a/NotoSansLaoUI-Bold.ttf b/other/NotoSansLaoUI-Bold.ttf
index 1761363..1761363 100644
--- a/NotoSansLaoUI-Bold.ttf
+++ b/other/NotoSansLaoUI-Bold.ttf
diff --git a/NotoSansLaoUI-Regular.ttf b/other/NotoSansLaoUI-Regular.ttf
index 101fb90..101fb90 100644
--- a/NotoSansLaoUI-Regular.ttf
+++ b/other/NotoSansLaoUI-Regular.ttf
diff --git a/NotoSansLepcha-Regular.ttf b/other/NotoSansLepcha-Regular.ttf
index 4d3b1ad..4d3b1ad 100644
--- a/NotoSansLepcha-Regular.ttf
+++ b/other/NotoSansLepcha-Regular.ttf
diff --git a/NotoSansLimbu-Regular.ttf b/other/NotoSansLimbu-Regular.ttf
index 40f7c89..40f7c89 100644
--- a/NotoSansLimbu-Regular.ttf
+++ b/other/NotoSansLimbu-Regular.ttf
diff --git a/NotoSansLisu-Regular.ttf b/other/NotoSansLisu-Regular.ttf
index 620f05e..620f05e 100644
--- a/NotoSansLisu-Regular.ttf
+++ b/other/NotoSansLisu-Regular.ttf
diff --git a/NotoSansMalayalam-Bold.ttf b/other/NotoSansMalayalam-Bold.ttf
index 766c3f5..766c3f5 100644
--- a/NotoSansMalayalam-Bold.ttf
+++ b/other/NotoSansMalayalam-Bold.ttf
diff --git a/NotoSansMalayalam-Regular.ttf b/other/NotoSansMalayalam-Regular.ttf
index 6698a35..6698a35 100644
--- a/NotoSansMalayalam-Regular.ttf
+++ b/other/NotoSansMalayalam-Regular.ttf
diff --git a/NotoSansMalayalamUI-Bold.ttf b/other/NotoSansMalayalamUI-Bold.ttf
index 903a8c1..903a8c1 100644
--- a/NotoSansMalayalamUI-Bold.ttf
+++ b/other/NotoSansMalayalamUI-Bold.ttf
diff --git a/NotoSansMalayalamUI-Regular.ttf b/other/NotoSansMalayalamUI-Regular.ttf
index ee3863c..ee3863c 100644
--- a/NotoSansMalayalamUI-Regular.ttf
+++ b/other/NotoSansMalayalamUI-Regular.ttf
diff --git a/NotoSansMandaic-Regular.ttf b/other/NotoSansMandaic-Regular.ttf
index 154b838..154b838 100644
--- a/NotoSansMandaic-Regular.ttf
+++ b/other/NotoSansMandaic-Regular.ttf
diff --git a/NotoSansMeeteiMayek-Regular.ttf b/other/NotoSansMeeteiMayek-Regular.ttf
index b5a364a..b5a364a 100644
--- a/NotoSansMeeteiMayek-Regular.ttf
+++ b/other/NotoSansMeeteiMayek-Regular.ttf
diff --git a/NotoSansMongolian-Regular.ttf b/other/NotoSansMongolian-Regular.ttf
index 804dccb..804dccb 100644
--- a/NotoSansMongolian-Regular.ttf
+++ b/other/NotoSansMongolian-Regular.ttf
diff --git a/NotoSansMyanmar-Bold.ttf b/other/NotoSansMyanmar-Bold.ttf
index 2a274c8..2a274c8 100644
--- a/NotoSansMyanmar-Bold.ttf
+++ b/other/NotoSansMyanmar-Bold.ttf
diff --git a/NotoSansMyanmar-Regular.ttf b/other/NotoSansMyanmar-Regular.ttf
index 3692dd0..3692dd0 100644
--- a/NotoSansMyanmar-Regular.ttf
+++ b/other/NotoSansMyanmar-Regular.ttf
diff --git a/NotoSansMyanmarUI-Bold.ttf b/other/NotoSansMyanmarUI-Bold.ttf
index 51eb7c9..51eb7c9 100644
--- a/NotoSansMyanmarUI-Bold.ttf
+++ b/other/NotoSansMyanmarUI-Bold.ttf
diff --git a/NotoSansMyanmarUI-Regular.ttf b/other/NotoSansMyanmarUI-Regular.ttf
index 9d318fd..9d318fd 100644
--- a/NotoSansMyanmarUI-Regular.ttf
+++ b/other/NotoSansMyanmarUI-Regular.ttf
diff --git a/NotoSansNKo-Regular.ttf b/other/NotoSansNKo-Regular.ttf
index 3ea2382..3ea2382 100644
--- a/NotoSansNKo-Regular.ttf
+++ b/other/NotoSansNKo-Regular.ttf
diff --git a/NotoSansNewTaiLue-Regular.ttf b/other/NotoSansNewTaiLue-Regular.ttf
index 17d79c0..17d79c0 100644
--- a/NotoSansNewTaiLue-Regular.ttf
+++ b/other/NotoSansNewTaiLue-Regular.ttf
diff --git a/NotoSansOlChiki-Regular.ttf b/other/NotoSansOlChiki-Regular.ttf
index 76fbe6e..76fbe6e 100644
--- a/NotoSansOlChiki-Regular.ttf
+++ b/other/NotoSansOlChiki-Regular.ttf
diff --git a/NotoSansOriya-Bold.ttf b/other/NotoSansOriya-Bold.ttf
index fae50b9..fae50b9 100644
--- a/NotoSansOriya-Bold.ttf
+++ b/other/NotoSansOriya-Bold.ttf
diff --git a/NotoSansOriya-Regular.ttf b/other/NotoSansOriya-Regular.ttf
index 5924c78..5924c78 100644
--- a/NotoSansOriya-Regular.ttf
+++ b/other/NotoSansOriya-Regular.ttf
diff --git a/NotoSansOriyaUI-Bold.ttf b/other/NotoSansOriyaUI-Bold.ttf
index a6a83cd..a6a83cd 100644
--- a/NotoSansOriyaUI-Bold.ttf
+++ b/other/NotoSansOriyaUI-Bold.ttf
diff --git a/NotoSansOriyaUI-Regular.ttf b/other/NotoSansOriyaUI-Regular.ttf
index b18fafc..b18fafc 100644
--- a/NotoSansOriyaUI-Regular.ttf
+++ b/other/NotoSansOriyaUI-Regular.ttf
diff --git a/NotoSansRejang-Regular.ttf b/other/NotoSansRejang-Regular.ttf
index 04c5ab9..04c5ab9 100644
--- a/NotoSansRejang-Regular.ttf
+++ b/other/NotoSansRejang-Regular.ttf
diff --git a/NotoSansSaurashtra-Regular.ttf b/other/NotoSansSaurashtra-Regular.ttf
index ea7bc83..ea7bc83 100644
--- a/NotoSansSaurashtra-Regular.ttf
+++ b/other/NotoSansSaurashtra-Regular.ttf
diff --git a/NotoSansSinhala-Bold.ttf b/other/NotoSansSinhala-Bold.ttf
index 0760568..0760568 100644
--- a/NotoSansSinhala-Bold.ttf
+++ b/other/NotoSansSinhala-Bold.ttf
diff --git a/NotoSansSinhala-Regular.ttf b/other/NotoSansSinhala-Regular.ttf
index 86cdeea..86cdeea 100644
--- a/NotoSansSinhala-Regular.ttf
+++ b/other/NotoSansSinhala-Regular.ttf
diff --git a/NotoSansSundanese-Regular.ttf b/other/NotoSansSundanese-Regular.ttf
index 7549d1a..7549d1a 100644
--- a/NotoSansSundanese-Regular.ttf
+++ b/other/NotoSansSundanese-Regular.ttf
diff --git a/NotoSansSylotiNagri-Regular.ttf b/other/NotoSansSylotiNagri-Regular.ttf
index a831ebe..a831ebe 100644
--- a/NotoSansSylotiNagri-Regular.ttf
+++ b/other/NotoSansSylotiNagri-Regular.ttf
diff --git a/NotoSansSymbols-Regular-Subsetted-Extended.ttf b/other/NotoSansSymbols-Regular-Subsetted-Extended.ttf
index 1501990..1501990 100644
--- a/NotoSansSymbols-Regular-Subsetted-Extended.ttf
+++ b/other/NotoSansSymbols-Regular-Subsetted-Extended.ttf
diff --git a/NotoSansSymbols-Regular-Subsetted.ttf b/other/NotoSansSymbols-Regular-Subsetted.ttf
index 7c4227e..7c4227e 100644
--- a/NotoSansSymbols-Regular-Subsetted.ttf
+++ b/other/NotoSansSymbols-Regular-Subsetted.ttf
diff --git a/NotoSansSymbols-Regular.ttf b/other/NotoSansSymbols-Regular.ttf
index 5f38857..5f38857 100644
--- a/NotoSansSymbols-Regular.ttf
+++ b/other/NotoSansSymbols-Regular.ttf
diff --git a/NotoSansSyriacEstrangela-Regular.ttf b/other/NotoSansSyriacEstrangela-Regular.ttf
index dcb3310..dcb3310 100644
--- a/NotoSansSyriacEstrangela-Regular.ttf
+++ b/other/NotoSansSyriacEstrangela-Regular.ttf
diff --git a/NotoSansTagbanwa-Regular.ttf b/other/NotoSansTagbanwa-Regular.ttf
index 3aaf4f0..3aaf4f0 100644
--- a/NotoSansTagbanwa-Regular.ttf
+++ b/other/NotoSansTagbanwa-Regular.ttf
diff --git a/NotoSansTaiLe-Regular.ttf b/other/NotoSansTaiLe-Regular.ttf
index 0f59524..0f59524 100644
--- a/NotoSansTaiLe-Regular.ttf
+++ b/other/NotoSansTaiLe-Regular.ttf
diff --git a/NotoSansTaiTham-Regular.ttf b/other/NotoSansTaiTham-Regular.ttf
index 821499c..821499c 100644
--- a/NotoSansTaiTham-Regular.ttf
+++ b/other/NotoSansTaiTham-Regular.ttf
diff --git a/NotoSansTaiViet-Regular.ttf b/other/NotoSansTaiViet-Regular.ttf
index d08fb43..d08fb43 100644
--- a/NotoSansTaiViet-Regular.ttf
+++ b/other/NotoSansTaiViet-Regular.ttf
diff --git a/NotoSansTamil-Bold.ttf b/other/NotoSansTamil-Bold.ttf
index fee5352..fee5352 100644
--- a/NotoSansTamil-Bold.ttf
+++ b/other/NotoSansTamil-Bold.ttf
diff --git a/NotoSansTamil-Regular.ttf b/other/NotoSansTamil-Regular.ttf
index 085afea..085afea 100644
--- a/NotoSansTamil-Regular.ttf
+++ b/other/NotoSansTamil-Regular.ttf
diff --git a/NotoSansTamilUI-Bold.ttf b/other/NotoSansTamilUI-Bold.ttf
index 65136f4..65136f4 100644
--- a/NotoSansTamilUI-Bold.ttf
+++ b/other/NotoSansTamilUI-Bold.ttf
diff --git a/NotoSansTamilUI-Regular.ttf b/other/NotoSansTamilUI-Regular.ttf
index 6c7c589..6c7c589 100644
--- a/NotoSansTamilUI-Regular.ttf
+++ b/other/NotoSansTamilUI-Regular.ttf
diff --git a/NotoSansTelugu-Bold.ttf b/other/NotoSansTelugu-Bold.ttf
index b177d5a..b177d5a 100644
--- a/NotoSansTelugu-Bold.ttf
+++ b/other/NotoSansTelugu-Bold.ttf
diff --git a/NotoSansTelugu-Regular.ttf b/other/NotoSansTelugu-Regular.ttf
index 76149ab..76149ab 100644
--- a/NotoSansTelugu-Regular.ttf
+++ b/other/NotoSansTelugu-Regular.ttf
diff --git a/NotoSansTeluguUI-Bold.ttf b/other/NotoSansTeluguUI-Bold.ttf
index c8ac2a1..c8ac2a1 100644
--- a/NotoSansTeluguUI-Bold.ttf
+++ b/other/NotoSansTeluguUI-Bold.ttf
diff --git a/NotoSansTeluguUI-Regular.ttf b/other/NotoSansTeluguUI-Regular.ttf
index 5cf491d..5cf491d 100644
--- a/NotoSansTeluguUI-Regular.ttf
+++ b/other/NotoSansTeluguUI-Regular.ttf
diff --git a/NotoSansThaana-Bold.ttf b/other/NotoSansThaana-Bold.ttf
index 6dd59be..6dd59be 100644
--- a/NotoSansThaana-Bold.ttf
+++ b/other/NotoSansThaana-Bold.ttf
diff --git a/NotoSansThaana-Regular.ttf b/other/NotoSansThaana-Regular.ttf
index 01ecfe2..01ecfe2 100644
--- a/NotoSansThaana-Regular.ttf
+++ b/other/NotoSansThaana-Regular.ttf
diff --git a/NotoSansThai-Bold.ttf b/other/NotoSansThai-Bold.ttf
index f35c0ad..f35c0ad 100644
--- a/NotoSansThai-Bold.ttf
+++ b/other/NotoSansThai-Bold.ttf
diff --git a/NotoSansThai-Regular.ttf b/other/NotoSansThai-Regular.ttf
index ad9ea67..ad9ea67 100644
--- a/NotoSansThai-Regular.ttf
+++ b/other/NotoSansThai-Regular.ttf
diff --git a/NotoSansThaiUI-Bold.ttf b/other/NotoSansThaiUI-Bold.ttf
index 6a68487..6a68487 100644
--- a/NotoSansThaiUI-Bold.ttf
+++ b/other/NotoSansThaiUI-Bold.ttf
diff --git a/NotoSansThaiUI-Regular.ttf b/other/NotoSansThaiUI-Regular.ttf
index 1092345..1092345 100644
--- a/NotoSansThaiUI-Regular.ttf
+++ b/other/NotoSansThaiUI-Regular.ttf
diff --git a/NotoSansTifinagh-Regular.ttf b/other/NotoSansTifinagh-Regular.ttf
index 1866e55..1866e55 100644
--- a/NotoSansTifinagh-Regular.ttf
+++ b/other/NotoSansTifinagh-Regular.ttf
diff --git a/NotoSansVai-Regular.ttf b/other/NotoSansVai-Regular.ttf
index 0c7a7ac..0c7a7ac 100644
--- a/NotoSansVai-Regular.ttf
+++ b/other/NotoSansVai-Regular.ttf
diff --git a/NotoSansYi-Regular.ttf b/other/NotoSansYi-Regular.ttf
index 71fb876..71fb876 100644
--- a/NotoSansYi-Regular.ttf
+++ b/other/NotoSansYi-Regular.ttf
diff --git a/NotoSerif-Bold.ttf b/other/NotoSerif-Bold.ttf
index a54567e..a54567e 100644
--- a/NotoSerif-Bold.ttf
+++ b/other/NotoSerif-Bold.ttf
diff --git a/NotoSerif-BoldItalic.ttf b/other/NotoSerif-BoldItalic.ttf
index 56ceceb..56ceceb 100644
--- a/NotoSerif-BoldItalic.ttf
+++ b/other/NotoSerif-BoldItalic.ttf
diff --git a/NotoSerif-Italic.ttf b/other/NotoSerif-Italic.ttf
index 519b860..519b860 100644
--- a/NotoSerif-Italic.ttf
+++ b/other/NotoSerif-Italic.ttf
diff --git a/NotoSerif-Regular.ttf b/other/NotoSerif-Regular.ttf
index c4eff9e..c4eff9e 100644
--- a/NotoSerif-Regular.ttf
+++ b/other/NotoSerif-Regular.ttf
diff --git a/other/README.android b/other/README.android
new file mode 100644
index 0000000..eda76bd
--- /dev/null
+++ b/other/README.android
@@ -0,0 +1,16 @@
+URL: https://code.google.com/p/noto/
+Version: various
+License: Apache 2.0
+License File: NOTICE
+
+Description:
+Noto fonts, for supporting several languages and scripts.
+
+Local Modifications:
+This directory does not necessarily track upstream exactly, and
+contains only the fonts needed for Android (the unhinted versions in
+particular). We do not include any of the tools.
+
+Additionally:
+* The fonts here may be subsetted or compressed for size.
+* Tamil and Malayalam fonts are scaled by 90%.