X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.cpp;h=d23f8b0b47157c37e387415b41554a4a244d6038;hb=4db3e641ed6765e005343010cb90ee8af26f8f99;hp=1d0f8b0f893c7e9992ec446ee0b295ce21b0492c;hpb=82b872365488d862a02d71f765e69c55f5260b5d;p=lyx.git

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 1d0f8b0f89..d23f8b0b47 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -617,7 +617,7 @@ bool LaTeXFeatures::hasPolyglossiaExclusiveLanguages() const
 	for (LanguageList::const_iterator cit = begin;
 	     cit != UsedLanguages_.end();
 	     ++cit) {
-		if ((*cit)->babel().empty() && !(*cit)->polyglossia().empty() && (*cit)->requires().empty())
+		if ((*cit)->isPolyglossiaExclusive())
 			return true;
 	}
 	return false;
@@ -731,8 +731,11 @@ char const * simplefeatures[] = {
 	"pdfpages",
 	"amscd",
 	"slashed",
+	"multicol",
 	"multirow",
-	"tfrupee"
+	"tfrupee",
+	"shapepar",
+	"rsphrase"
 };
 
 char const * bibliofeatures[] = {
@@ -742,7 +745,10 @@ char const * bibliofeatures[] = {
 	"apalike",
 	"astron",
 	"authordate1-4",
+	"babelbib",
+	"bibgerm",
 	"chicago",
+	"chscite",
 	"harvard",
 	"mslapa",
 	"named"
@@ -825,20 +831,25 @@ string const LaTeXFeatures::getPackages() const
 	// also unknown packages can be requested. They are silently
 	// swallowed now. We should change this eventually.
 
-	//
+	// Output all the package option stuff we have been asked to do.
+	map<string, string>::const_iterator it =
+	    params_.documentClass().packageOptions().begin();
+	map<string, string>::const_iterator en =
+	    params_.documentClass().packageOptions().end();
+	for (; it != en; ++it)
+		if (mustProvide(it->first))
+			packages << "\\PassOptionsToPackage{" << it->second << "}"
+			         << "{" << it->first << "}\n";
+
 	//  These are all the 'simple' includes.  i.e
 	//  packages which we just \usepackage{package}
-	//
 	for (int i = 0; i < nb_simplefeatures; ++i) {
 		if (mustProvide(simplefeatures[i]))
-			packages << "\\usepackage{"
-				 << simplefeatures[i] << "}\n";
+			packages << "\\usepackage{" << simplefeatures[i] << "}\n";
 	}
 
-	//
 	// The rest of these packages are somewhat more complicated
 	// than those above.
-	//
 
 	// if fontspec is used, AMS packages have to be loaded before
 	// fontspec (in BufferParams)
@@ -966,6 +977,14 @@ string const LaTeXFeatures::getPackages() const
 	if (mustProvide("jurabib"))
 		packages << "\\usepackage{jurabib}[2004/01/25]\n";
 
+	// opcit -- we pass custombst as we output \bibliographystyle ourselves
+	if (mustProvide("opcit")) {
+		if (isRequired("hyperref"))
+			packages << "\\usepackage[custombst,hyperref]{opcit}\n";
+		else
+			packages << "\\usepackage[custombst]{opcit}\n";
+	}
+
 	// xargs -- we need version 1.09 at least
 	if (mustProvide("xargs"))
 		packages << "\\usepackage{xargs}[2008/03/08]\n";