Use Noto instead of Droid, where appropriate.

pull/708/head
NiLuJe 10 years ago
parent c6e6e0a5f2
commit 5ebed6655b

@ -19,8 +19,8 @@ local CreDocument = Document:new{
engine_initilized = false, engine_initilized = false,
line_space_percent = 100, line_space_percent = 100,
default_font = G_reader_settings:readSetting("cre_font") or "FreeSerif", default_font = G_reader_settings:readSetting("cre_font") or "Noto Serif",
header_font = G_reader_settings:readSetting("header_font") or "FreeSans", header_font = G_reader_settings:readSetting("header_font") or "Noto Sans",
fallback_font = G_reader_settings:readSetting("fallback_font") or "Droid Sans Fallback", fallback_font = G_reader_settings:readSetting("fallback_font") or "Droid Sans Fallback",
default_css = "./data/cr3.css", default_css = "./data/cr3.css",
options = CreOptions, options = CreOptions,

@ -4,18 +4,18 @@ local DEBUG = require("dbg")
local Font = { local Font = {
fontmap = { fontmap = {
-- default font for menu contents -- default font for menu contents
cfont = "droid/DroidSans.ttf", cfont = "noto/NotoSans-Regular.ttf",
-- default font for title -- default font for title
--tfont = "NimbusSanL-BoldItal.cff", --tfont = "NimbusSanL-BoldItal.cff",
tfont = "droid/DroidSans.ttf", tfont = "noto/NotoSans-Bold.ttf",
-- default font for footer -- default font for footer
ffont = "droid/DroidSans.ttf", ffont = "noto/NotoSans-Regular.ttf",
-- default font for reading position info -- default font for reading position info
rifont = "droid/DroidSans.ttf", rifont = "noto/NotoSans-Regular.ttf",
-- default font for pagination display -- default font for pagination display
pgfont = "droid/DroidSans.ttf", pgfont = "noto/NotoSans-Regular.ttf",
-- selectmenu: font for item shortcut -- selectmenu: font for item shortcut
scfont = "droid/DroidSansMono.ttf", scfont = "droid/DroidSansMono.ttf",
@ -23,19 +23,20 @@ local Font = {
-- help page: font for displaying keys -- help page: font for displaying keys
hpkfont = "droid/DroidSansMono.ttf", hpkfont = "droid/DroidSansMono.ttf",
-- font for displaying help messages -- font for displaying help messages
hfont = "droid/DroidSans.ttf", hfont = "noto/NotoSans-Regular.ttf",
-- font for displaying input content -- font for displaying input content
-- we have to use mono here for better distance controlling -- we have to use mono here for better distance controlling
infont = "droid/DroidSansMono.ttf", infont = "droid/DroidSansMono.ttf",
-- font for info messages -- font for info messages
infofont = "droid/DroidSans.ttf", infofont = "noto/NotoSans-Regular.ttf",
}, },
fallbacks = { fallbacks = {
[1] = "droid/DroidSansFallback.ttf", [1] = "droid/DroidSansFallback.ttf",
[2] = "droid/DroidSans.ttf", [2] = "noto/NotoSans-Regular.ttf",
[3] = "freefont/FreeSans.ttf", [3] = "droid/DroidSans.ttf",
[4] = "freefont/FreeSans.ttf",
}, },
fontdir = os.getenv("FONTDIR") or "./fonts", fontdir = os.getenv("FONTDIR") or "./fonts",

Loading…
Cancel
Save