From 5ebed6655b962b0c9edf585312f6236f23a60391 Mon Sep 17 00:00:00 2001
From: NiLuJe <ninuje@gmail.com>
Date: Tue, 8 Jul 2014 02:11:17 +0200
Subject: [PATCH] Use Noto instead of Droid, where appropriate.

---
 frontend/document/credocument.lua |  4 ++--
 frontend/ui/font.lua              | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/frontend/document/credocument.lua b/frontend/document/credocument.lua
index 8a46b7989..0843681a3 100644
--- a/frontend/document/credocument.lua
+++ b/frontend/document/credocument.lua
@@ -19,8 +19,8 @@ local CreDocument = Document:new{
     engine_initilized = false,
 
     line_space_percent = 100,
-    default_font = G_reader_settings:readSetting("cre_font") or "FreeSerif",
-    header_font = G_reader_settings:readSetting("header_font") or "FreeSans",
+    default_font = G_reader_settings:readSetting("cre_font") or "Noto Serif",
+    header_font = G_reader_settings:readSetting("header_font") or "Noto Sans",
     fallback_font = G_reader_settings:readSetting("fallback_font") or "Droid Sans Fallback",
     default_css = "./data/cr3.css",
     options = CreOptions,
diff --git a/frontend/ui/font.lua b/frontend/ui/font.lua
index a0d0bd010..b714c7d3b 100644
--- a/frontend/ui/font.lua
+++ b/frontend/ui/font.lua
@@ -4,18 +4,18 @@ local DEBUG = require("dbg")
 local Font = {
     fontmap = {
         -- default font for menu contents
-        cfont = "droid/DroidSans.ttf",
+        cfont = "noto/NotoSans-Regular.ttf",
         -- default font for title
         --tfont = "NimbusSanL-BoldItal.cff",
-        tfont = "droid/DroidSans.ttf",
+        tfont = "noto/NotoSans-Bold.ttf",
         -- default font for footer
-        ffont = "droid/DroidSans.ttf",
+        ffont = "noto/NotoSans-Regular.ttf",
 
         -- default font for reading position info
-        rifont = "droid/DroidSans.ttf",
+        rifont = "noto/NotoSans-Regular.ttf",
 
         -- default font for pagination display
-        pgfont = "droid/DroidSans.ttf",
+        pgfont = "noto/NotoSans-Regular.ttf",
 
         -- selectmenu: font for item shortcut
         scfont = "droid/DroidSansMono.ttf",
@@ -23,19 +23,20 @@ local Font = {
         -- help page: font for displaying keys
         hpkfont = "droid/DroidSansMono.ttf",
         -- font for displaying help messages
-        hfont = "droid/DroidSans.ttf",
+        hfont = "noto/NotoSans-Regular.ttf",
 
         -- font for displaying input content
         -- we have to use mono here for better distance controlling
         infont = "droid/DroidSansMono.ttf",
 
         -- font for info messages
-        infofont = "droid/DroidSans.ttf",
+        infofont = "noto/NotoSans-Regular.ttf",
     },
     fallbacks = {
         [1] = "droid/DroidSansFallback.ttf",
-        [2] = "droid/DroidSans.ttf",
-        [3] = "freefont/FreeSans.ttf",
+        [2] = "noto/NotoSans-Regular.ttf",
+        [3] = "droid/DroidSans.ttf",
+        [4] = "freefont/FreeSans.ttf",
     },
 
     fontdir = os.getenv("FONTDIR") or "./fonts",