X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2FPreamble.cpp;h=b9d9a61aec52e610c0341ce9940bf75444d0919a;hb=7aaa85915fbec1b934ee9ce8511abd28d7921444;hp=26563f818c2d1f863fb1572672201548c27fc5f8;hpb=50e21b71663bab7ed48e830a5d641553ef190586;p=features.git

diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 26563f818c..b9d9a61aec 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -127,16 +127,16 @@ char const * const known_fontsizes[] = { "10pt", "11pt", "12pt", 0 };
 const char * const known_roman_fonts[] = { "ae", "beraserif", "bookman",
 "ccfonts", "chancery", "charter", "cmr", "cochineal", "crimson", "fourier",
 "garamondx", "libertine", "libertine-type1", "lmodern", "mathdesign", "mathpazo",
-"mathptmx", "newcent", "tgbonum", "tgchorus", "tgpagella", "tgschola", "tgtermes",
-"utopia", 0};
+"mathptmx", "newcent", "NotoSerif-TLF", "tgbonum", "tgchorus", "tgpagella", "tgschola",
+"tgtermes", "utopia", 0};
 
 const char * const known_sans_fonts[] = { "avant", "berasans", "biolinum-type1",
 "cmbr", "cmss", "helvet", "iwona", "iwonac", "iwonal", "iwonalc", "kurier",
-"kurierc", "kurierl", "kurierlc", "lmss", "tgadventor", "tgheros", 0};
+"kurierc", "kurierl", "kurierlc", "lmss", "NotoSans-TLF", "tgadventor", "tgheros", 0};
 
 const char * const known_typewriter_fonts[] = { "beramono", "cmtl", "cmtt",
 "courier", "lmtt", "luximono", "fourier", "libertineMono-type1", "lmodern",
-"mathpazo", "mathptmx", "newcent", "tgcursor", "txtt", 0};
+"mathpazo", "mathptmx", "newcent", "NotoMono-TLF", "tgcursor", "txtt", 0};
 
 const char * const known_math_fonts[] = { "eulervm", "newtxmath", 0};
 
@@ -760,6 +760,25 @@ void Preamble::handle_package(Parser &p, string const & name,
 			h_font_osf = "true";
 	}
 
+	if (name == "noto") {
+		// noto can have several options
+		if (opts.empty())
+			h_font_roman[0] = "NotoSerif-TLF";
+		string::size_type pos = opts.find("rm");
+		if (pos != string::npos)
+			h_font_roman[0] = "NotoSerif-TLF";
+		pos = opts.find("sf");
+		if (pos != string::npos)
+			h_font_sans[0] = "NotoSans-TLF";
+		pos = opts.find("nott");
+		if (pos != string::npos) {
+			h_font_roman[0] = "NotoSerif-TLF";
+			h_font_sans[0] = "NotoSans-TLF";
+		}
+		// noto as typewriter is handled in handling of \ttdefault
+		// special cases are handled in handling of \rmdefault and \sfdefault
+	}
+
 	// sansserif fonts
 	if (is_known(name, known_sans_fonts)) {
 		h_font_sans[0] = name;