From: Scott Kostyshak <skostysh@lyx.org>
Date: Fri, 25 Nov 2016 02:47:45 +0000 (-0500)
Subject: Warn if child has diff non-Tex font settings
X-Git-Tag: 2.3.0alpha1~559
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b613be1dd890e395c593da2f25b04eb39cb8b808;p=features.git

Warn if child has diff non-Tex font settings

It is easy to come across problems when the settings are not the
same.

This is consistent with our current warning about different document
classes.

For discussion and a motivating MWE, see:
https://www.mail-archive.com/search?l=mid&q=20161121024539.kn6rsqotaw4n2efk%40klay
---

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 6a11b1d0b9..7a35edd173 100644
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -657,6 +657,18 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
 				Alert::warning(_("Different textclasses"), text, true);
 			}
 
+			string const child_tf = tmp->params().useNonTeXFonts ? "true" : "false";
+			string const master_tf = masterBuffer->params().useNonTeXFonts ? "true" : "false";
+			if (tmp->params().useNonTeXFonts != masterBuffer->params().useNonTeXFonts) {
+				docstring text = bformat(_("Included file `%1$s'\n"
+					"has use-non-TeX-fonts set to `%2$s'\n"
+					"while parent file has use-non-TeX-fonts set to `%3$s'."),
+					included_file.displayName(),
+					from_utf8(child_tf),
+					from_utf8(master_tf));
+				Alert::warning(_("Different use-non-TeX-fonts settings"), text, true);
+			}
+
 			// Make sure modules used in child are all included in master
 			// FIXME It might be worth loading the children's modules into the master
 			// over in BufferParams rather than doing this check.