X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.C;h=5380932443a7eb72ba229aa3c208eed49ee40e90;hb=fe390e9da1538e20eabbc98977d845295f8e563d;hp=8b86836bedf5c7a92914db6d8e90d1b42e8f464f;hpb=99d1627a471b92f403598d03dfc861ddc3c11be0;p=lyx.git

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 8b86836bed..5380932443 100644
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -19,10 +19,13 @@
 #include "language.h"
 #include "encoding.h"
 #include "LString.h"
+#include "Lsstream.h"
 
 #include "support/filetools.h"
 #include "support/lstrings.h"
 
+using namespace lyx::support;
+
 using lyx::textclass_type;
 
 using std::endl;
@@ -37,6 +40,14 @@ LaTeXFeatures::LaTeXFeatures(BufferParams const & p)
 {}
 
 
+bool LaTeXFeatures::useBabel() const
+{
+	return lyxrc.language_use_babel ||
+		bufferParams().language->lang() != lyxrc.default_language ||
+		this->hasLanguages();
+}
+
+
 void LaTeXFeatures::require(string const & name)
 {
 	if (isRequired(name))
@@ -122,7 +133,7 @@ void LaTeXFeatures::includeFile(string const & key, string const & name)
 }
 
 
-bool LaTeXFeatures::hasLanguages()
+bool LaTeXFeatures::hasLanguages() const
 {
 	return !UsedLanguages.empty();
 }
@@ -142,7 +153,7 @@ string LaTeXFeatures::getLanguages() const
 }
 
 
-set<string> LaTeXFeatures::getEncodingSet(string const & doc_encoding)
+set<string> LaTeXFeatures::getEncodingSet(string const & doc_encoding) const
 {
 	set<string> encodings;
 	for (LanguageList::const_iterator it =
@@ -175,12 +186,12 @@ int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
 
 }
 
+
 string const LaTeXFeatures::getPackages() const
 {
 	ostringstream packages;
 	LyXTextClass const & tclass = params.getLyXTextClass();
 
-
 	//
 	//  These are all the 'simple' includes.  i.e
 	//  packages which we just \usepackage{package}
@@ -197,7 +208,8 @@ string const LaTeXFeatures::getPackages() const
 	//
 
 	if (isRequired("amsmath")
-	    && ! tclass.provides(LyXTextClass::amsmath)) {
+	    && !tclass.provides(LyXTextClass::amsmath)
+	    && params.use_amsmath != BufferParams::AMS_OFF) {
 		packages << "\\usepackage{amsmath}\n";
 	}
 
@@ -263,7 +275,7 @@ string const LaTeXFeatures::getPackages() const
 	}
 
 	// amssymb.sty
-	if (isRequired("amssymb") || params.use_amsmath)
+	if (isRequired("amssymb") || params.use_amsmath == BufferParams::AMS_ON)
 		packages << "\\usepackage{amssymb}\n";
 	// url.sty
 	if (isRequired("url") && ! tclass.provides(LyXTextClass::url))