Fix a few Droid font paths

pull/1508/head
NiLuJe 9 years ago
parent bd03372d93
commit 3fdd90cf3b

@ -78,7 +78,7 @@ endif
ifeq ($(or $(EMULATE_READER),$(WIN32)),) ifeq ($(or $(EMULATE_READER),$(WIN32)),)
# clean up, remove unused files for releases # 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/data/{cr3.ini,cr3skin-format.txt,desktop,devices,manual}
rm $(INSTALL_DIR)/koreader/fonts/droid/DroidSansFallbackFull.ttc rm $(INSTALL_DIR)/koreader/fonts/droid/DroidSansFallbackFull.ttf
endif endif
$(KOR_BASE)/$(OUTPUT_DIR)/luajit: $(KOR_BASE)/$(OUTPUT_DIR)/luajit:

@ -22,7 +22,7 @@ local CreDocument = Document:new{
line_space_percent = 100, line_space_percent = 100,
default_font = G_reader_settings:readSetting("cre_font") or "Noto Serif", default_font = G_reader_settings:readSetting("cre_font") or "Noto Serif",
header_font = G_reader_settings:readSetting("header_font") or "Noto Sans", header_font = G_reader_settings:readSetting("header_font") or "Noto Sans",
fallback_font = G_reader_settings:readSetting("fallback_font") or "Droid Sans Fallback H", 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,
} }

@ -35,7 +35,7 @@ local Font = {
infofont = "noto/NotoSans-Regular.ttf", infofont = "noto/NotoSans-Regular.ttf",
}, },
fallbacks = { fallbacks = {
[1] = "droid/DroidSansFallback.ttc", [1] = "droid/DroidSansFallback.ttf",
[2] = "noto/NotoSans-Regular.ttf", [2] = "noto/NotoSans-Regular.ttf",
[3] = "droid/DroidSans.ttf", [3] = "droid/DroidSans.ttf",
[4] = "freefont/FreeSans.ttf", [4] = "freefont/FreeSans.ttf",

Loading…
Cancel
Save