From 1a8036c5fba57cbd82c830b2e8a559ec3847bd87 Mon Sep 17 00:00:00 2001 From: nebulon42 Date: Thu, 25 May 2017 16:51:22 +0200 Subject: [PATCH] we can use variables in font definitions as carto is now capable of expanding them --- fonts.mss | 123 +----------------------------------------------------- 1 file changed, 2 insertions(+), 121 deletions(-) diff --git a/fonts.mss b/fonts.mss index 3dd8b09120..359a8e6308 100644 --- a/fonts.mss +++ b/fonts.mss @@ -145,129 +145,10 @@ regular text and can be used for emphasis. Fallback is a regular style. "Noto Sans Thaana Bold", "Noto Sans Thai UI Bold", "Noto Sans Tibetan Bold", - - "Noto Sans CJK JP Regular", - "Noto Sans Balinese Regular", - "Noto Sans Bamum Regular", - "Noto Sans Batak Regular", - "Noto Sans Buginese Regular", - "Noto Sans Buhid Regular", - "Noto Sans Canadian Aboriginal Regular", - "Noto Sans Cherokee Regular", - "Noto Sans Coptic Regular", - "Noto Sans Devanagari UI Regular", "Noto Sans Devanagari Regular", - "Noto Sans Georgian Regular", - "Noto Sans Gujarati UI Regular", "Noto Sans Gujarati Regular", - "Noto Sans Hanunoo Regular", - "Noto Sans Javanese Regular", - "Noto Sans Kayah Li Regular", - "Noto Sans Lepcha Regular", - "Noto Sans Limbu Regular", - "Noto Sans Lisu Regular", - "Noto Sans Mandaic Regular", - "Noto Sans Mongolian Regular", - "Noto Sans New Tai Lue Regular", - "Noto Sans NKo Regular", - "Noto Sans Ol Chiki Regular", - "Noto Sans Osmanya Regular", - "Noto Sans Samaritan Regular", - "Noto Sans Saurashtra Regular", - "Noto Sans Shavian Regular", - "Noto Sans Sundanese Regular", - "Noto Sans Symbols Regular", - "Noto Sans Syriac Eastern Regular", - "Noto Sans Syriac Estrangela Regular", - "Noto Sans Syriac Western Regular", - "Noto Sans Tagalog Regular", - "Noto Sans Tagbanwa Regular", - "Noto Sans Tai Le Regular", - "Noto Sans Tai Tham Regular", - "Noto Sans Tai Viet Regular", - "Noto Sans Tifinagh Regular", - "Noto Sans Vai Regular", - "Noto Sans Yi Regular", - - "Noto Naskh Arabic UI Bold", - - "Noto Naskh Arabic UI Regular", - - "Noto Emoji Regular", - - "DejaVu Sans Bold", "DejaVu Sans Book", - - "HanaMinA Regular", "HanaMinB Regular", - "Unifont Medium", "unifont Medium", "Unifont Upper Medium"; + @book-fonts; /* Italics are only available for the base font, not the other scripts. For a considerable number of labels this style will make no difference to the regular style. */ -@oblique-fonts: "Noto Sans UI Italic", - "Noto Sans UI Regular", - "Noto Sans CJK JP Regular", - "Noto Sans Armenian Regular", - "Noto Sans Balinese Regular", - "Noto Sans Bamum Regular", - "Noto Sans Batak Regular", - "Noto Sans Bengali UI Regular", - "Noto Sans Buginese Regular", - "Noto Sans Buhid Regular", - "Noto Sans Canadian Aboriginal Regular", - "Noto Sans Cham Regular", - "Noto Sans Cherokee Regular", - "Noto Sans Coptic Regular", - "Noto Sans Devanagari UI Regular", "Noto Sans Devanagari Regular", - "Noto Sans Ethiopic Regular", - "Noto Sans Georgian Regular", - "Noto Sans Gujarati UI Regular", "Noto Sans Gujarati Regular", - "Noto Sans Gurmukhi UI Regular", - "Noto Sans Hanunoo Regular", - "Noto Sans Hebrew Regular", - "Noto Sans Javanese Regular", - "Noto Sans Kannada UI Regular", - "Noto Sans Kayah Li Regular", - "Noto Sans Khmer UI Regular", - "Noto Sans Lao UI Regular", - "Noto Sans Lepcha Regular", - "Noto Sans Limbu Regular", - "Noto Sans Lisu Regular", - "Noto Sans Malayalam UI Regular", - "Noto Sans Mandaic Regular", - "Noto Sans Mongolian Regular", - "Noto Sans Myanmar UI Regular", - "Noto Sans New Tai Lue Regular", - "Noto Sans NKo Regular", - "Noto Sans Ol Chiki Regular", - "Noto Sans Oriya UI Regular", "Noto Sans Oriya Regular", - "Noto Sans Osmanya Regular", - "Noto Sans Samaritan Regular", - "Noto Sans Saurashtra Regular", - "Noto Sans Shavian Regular", - "Noto Sans Sinhala Regular", - "Noto Sans Sundanese Regular", - "Noto Sans Symbols Regular", - "Noto Sans Syriac Eastern Regular", - "Noto Sans Syriac Estrangela Regular", - "Noto Sans Syriac Western Regular", - "Noto Sans Tagalog Regular", - "Noto Sans Tagbanwa Regular", - "Noto Sans Tai Le Regular", - "Noto Sans Tai Tham Regular", - "Noto Sans Tai Viet Regular", - "Noto Sans Tamil UI Regular", - "Noto Sans Telugu UI Regular", - "Noto Sans Thaana Regular", - "Noto Sans Thai UI Regular", - "Noto Sans Tibetan Regular", - "Noto Sans Tifinagh Regular", - "Noto Sans Vai Regular", - "Noto Sans Yi Regular", - - "Noto Naskh Arabic UI Regular", - - "Noto Emoji Regular", - - "DejaVu Sans Oblique", "DejaVu Sans Book", - - "HanaMinA Regular", "HanaMinB Regular", - "Unifont Medium", "unifont Medium", "Unifont Upper Medium"; \ No newline at end of file +@oblique-fonts: "Noto Sans UI Italic", @book-fonts;