Provide option to force a local language switch where a global is not allowed (fixes...

[lyx.git] / src / LaTeXFeatures.cpp

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 169f4e68737d616ce1d63b023eaa4ebc2b802ef5..bbc76d18523eb714573fdc7dc874e90baf90e8e5 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -474,6 +474,9 @@ bool LaTeXFeatures::isRequired(string const & name) const
 
 bool LaTeXFeatures::isProvided(string const & name) const
 {
+       if (params_.useNonTeXFonts)
+               return params_.documentClass().provides(name);
+
        bool const ot1 = (params_.font_encoding() == "default"
                || params_.font_encoding() == "OT1");
        bool const complete = (params_.fonts_sans == "default")
@@ -490,10 +493,15 @@ bool LaTeXFeatures::isProvided(string const & name) const
                                                                 nomath)
                || theLaTeXFonts().getLaTeXFont(
                        from_ascii(params_.fonts_typewriter)).provides(name, ot1,
+                                                                      complete,
+                                                                      nomath)
+               || theLaTeXFonts().getLaTeXFont(
+                       from_ascii(params_.fonts_math)).provides(name, ot1,
                                                                       complete,
                                                                       nomath);
 }
 
+
 bool LaTeXFeatures::mustProvide(string const & name) const
 {
        return isRequired(name) && !isProvided(name);
@@ -1273,6 +1281,7 @@ docstring const LaTeXFeatures::getTClassHTMLStyles() const
 
 
 namespace {
+
 docstring const getFloatI18nPreamble(docstring const & type,
                        docstring const & name, Language const * lang,
                        Encoding const & enc, bool const polyglossia)