diff --git a/data/hardwired/fonts.cfg b/data/hardwired/fonts.cfg index 2a0f2ce4716..d7b30d676c9 100644 --- a/data/hardwired/fonts.cfg +++ b/data/hardwired/fonts.cfg @@ -15,18 +15,7 @@ # where a comma seperated list of fonts will result in newlines not being # rendered and font space metrics being off on Windows. # - # Additionally, despite what one might assume, "Lato" doesn't appear to - # load all Lato font variants (it has a bunch of different weight ones). - # I had thought one could specify different weights and Pango would - # automatically use the variant for that weight, but no dice. Instead, we - # need to set the weight variant we want as the distired font familt at - # render time. Right now we only have use of a "light" variant, but others - # could be added at some point. - # - # -- vultraz, 2018-02-14 - # family_order= _ "Lato" family_order_monospace= _ "DejaVu Sans Mono" - family_order_light= _ "Lato Light" family_order_script = _ "Oldania ADF Std" [/fonts] diff --git a/data/schema/fonts.cfg b/data/schema/fonts.cfg index 9c57e47c619..0f2efa0e3be 100644 --- a/data/schema/fonts.cfg +++ b/data/schema/fonts.cfg @@ -7,7 +7,6 @@ min=1 max=1 {REQUIRED_KEY family_order t_string} - {REQUIRED_KEY family_order_light t_string} {REQUIRED_KEY family_order_monospace t_string} {REQUIRED_KEY family_order_script t_string} [/tag] diff --git a/src/font/font_config.cpp b/src/font/font_config.cpp index 3127c52bf24..6df9d01fe8f 100644 --- a/src/font/font_config.cpp +++ b/src/font/font_config.cpp @@ -46,7 +46,6 @@ namespace t_string family_order_sans; t_string family_order_mono; -t_string family_order_light; t_string family_order_script; } // end anon namespace @@ -78,7 +77,6 @@ bool load_font_config() family_order_sans = fonts_config["family_order"]; family_order_mono = fonts_config["family_order_monospace"]; - family_order_light = fonts_config["family_order_light"]; family_order_script = fonts_config["family_order_script"]; if(family_order_mono.empty()) { @@ -86,11 +84,6 @@ bool load_font_config() family_order_mono = family_order_sans; } - if(family_order_light.empty()) { - ERR_FT << "No light font family order defined, falling back to sans serif order"; - family_order_light = family_order_sans; - } - if(family_order_script.empty()) { ERR_FT << "No script font family order defined, falling back to sans serif order"; family_order_script = family_order_sans; @@ -104,8 +97,6 @@ const t_string& get_font_families(family_class fclass) switch(fclass) { case FONT_MONOSPACE: return family_order_mono; - case FONT_LIGHT: - return family_order_light; case FONT_SCRIPT: return family_order_script; default: diff --git a/src/font/font_options.hpp b/src/font/font_options.hpp index 44b9d358d2d..14b4da281ee 100644 --- a/src/font/font_options.hpp +++ b/src/font/font_options.hpp @@ -27,7 +27,6 @@ enum family_class { FONT_SANS_SERIF, FONT_MONOSPACE, - FONT_LIGHT, FONT_SCRIPT, }; @@ -35,8 +34,6 @@ inline family_class str_to_family_class(const std::string& str) { if(str == "monospace") { return FONT_MONOSPACE; - } else if(str == "light") { - return FONT_LIGHT; } else if(str == "script") { return FONT_SCRIPT; }