From ebf47771d8e13195a5a5b28823759ff9bee3d15d Mon Sep 17 00:00:00 2001
From: NiLuJe <ninuje@gmail.com>
Date: Wed, 16 May 2018 10:28:06 -0400
Subject: [PATCH] Update Google Fonts (#3942)

* Minor cleanup

We don't ship Droid Sans Fallback anymore

* Tweak UI fallback font list for better coverage

* Bump base & fonts

To pickup related changes
---
 Makefile             | 1 -
 base                 | 2 +-
 frontend/ui/font.lua | 5 +++--
 resources/fonts      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index d2c0604aa..c45057b2a 100644
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,6 @@ endif
 ifeq ($(or $(EMULATE_READER),$(WIN32)),)
 	@echo "[*] Clean up, remove unused files for releases"
 	rm -rf $(INSTALL_DIR)/koreader/data/{cr3.ini,cr3skin-format.txt,desktop,devices,manual}
-	rm -rf $(INSTALL_DIR)/koreader/fonts/droid/DroidSansFallbackFull.ttf
 endif
 
 $(KOR_BASE)/$(OUTPUT_DIR)/luajit:
diff --git a/base b/base
index f4a56a7a3..39fbb5ce6 160000
--- a/base
+++ b/base
@@ -1 +1 @@
-Subproject commit f4a56a7a319496f207f9bd93d5f21bdf07aa3508
+Subproject commit 39fbb5ce6e9622734408c21201e54f090380d7f4
diff --git a/frontend/ui/font.lua b/frontend/ui/font.lua
index f1bd792cb..f6a07513a 100644
--- a/frontend/ui/font.lua
+++ b/frontend/ui/font.lua
@@ -73,9 +73,10 @@ local Font = {
         xx_smallinfofont = 18,
     },
     fallbacks = {
-        [1] = "noto/NotoSansCJK-Regular.ttf",
-        [2] = "noto/NotoSans-Regular.ttf",
+        [1] = "noto/NotoSans-Regular.ttf",
+        [2] = "noto/NotoSansCJKsc-Regular.otf",
         [3] = "freefont/FreeSans.ttf",
+        [4] = "freefont/FreeSerif.ttf",
     },
 
     fontdir = "./fonts",
diff --git a/resources/fonts b/resources/fonts
index 99ca05830..c526ac008 160000
--- a/resources/fonts
+++ b/resources/fonts
@@ -1 +1 @@
-Subproject commit 99ca05830a60e17897ac8add37e5b81458cc9c88
+Subproject commit c526ac0087cb7cbf00200659d9efc8189581d15c