X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.cpp;h=d23f8b0b47157c37e387415b41554a4a244d6038;hb=4db3e641ed6765e005343010cb90ee8af26f8f99;hp=88a5d281e9bf8ad60d90c526a4a9f11f0a81b05a;hpb=1230372566dc571fbf76adca00453d2c6009d52b;p=lyx.git

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 88a5d281e9..d23f8b0b47 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -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"
@@ -826,14 +832,14 @@ string const LaTeXFeatures::getPackages() const
 	// 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 = 
+	map<string, string>::const_iterator it =
 	    params_.documentClass().packageOptions().begin();
-	map<string, string>::const_iterator en = 
+	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";
+			packages << "\\PassOptionsToPackage{" << it->second << "}"
+			         << "{" << it->first << "}\n";
 
 	//  These are all the 'simple' includes.  i.e
 	//  packages which we just \usepackage{package}
@@ -971,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";