X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.cpp;h=e4f563a456faf5b378792678d1b0b714979bea85;hb=f34394460a1c22937c9732f55f00aa6952764264;hp=9a73c8e21ed36f0a6b6cbb4ab8f205899cf4b43c;hpb=0dd741e4da1de79e2d7ddffb27cee8a3c451ad59;p=lyx.git

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 9a73c8e21e..e4f563a456 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -314,6 +314,25 @@ static docstring const rtloutputdblcol_def = from_ascii(
 	"\\@mparswitchtrue\n");
 
 
+/////////////////////////////////////////////////////////////////////
+//
+// LyXHTML strings
+//
+/////////////////////////////////////////////////////////////////////
+
+static docstring const lyxnoun_style = from_ascii(
+	"dfn.lyxnoun {\n"
+  "  font-variant: small-caps;\n"
+  "}\n");
+
+
+// this is how it normally renders, but it might not always do so.
+static docstring const lyxstrikeout_style = from_ascii(
+	"del.strikeout {\n"
+  "  text-decoration: line-through;\n"
+  "}\n");
+
+
 /////////////////////////////////////////////////////////////////////
 //
 // LaTeXFeatures
@@ -598,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;
@@ -698,7 +717,7 @@ char const * simplefeatures[] = {
 	"mathrsfs",
 	"mathabx",
 	"mathtools",
-	"cancel",
+	// "cancel",
 	"ascii",
 	"url",
 	"covington",
@@ -716,6 +735,21 @@ char const * simplefeatures[] = {
 	"tfrupee"
 };
 
+char const * bibliofeatures[] = {
+	// Known bibliography packages (will be loaded before natbib)
+	"achicago",
+	"apacite",
+	"apalike",
+	"astron",
+	"authordate1-4",
+	"chicago",
+	"harvard",
+	"mslapa",
+	"named"
+};
+
+int const nb_bibliofeatures = sizeof(bibliofeatures) / sizeof(char const *);
+
 int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
 
 }
@@ -791,20 +825,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)
@@ -818,6 +857,9 @@ string const LaTeXFeatures::getPackages() const
 	if (mustProvide("fixltx2e"))
 		packages << "\\usepackage{fixltx2e}\n";
 
+        if (mustProvide("cancel") &&
+            params_.use_package("cancel") != BufferParams::package_off)
+                packages << "\\usepackage{cancel}\n";
 	// wasysym is a simple feature, but it must be after amsmath if both
 	// are used
 	// wasysym redefines some integrals (e.g. iint) from amsmath. That
@@ -851,6 +893,10 @@ string const LaTeXFeatures::getPackages() const
 	    params_.use_package("stmaryrd") != BufferParams::package_off)
 		packages << "\\usepackage{stmaryrd}\n";
 
+	if (mustProvide("stackrel") &&
+	    params_.use_package("stackrel") != BufferParams::package_off)
+		packages << "\\usepackage{stackrel}\n";
+
 	if (mustProvide("undertilde") &&
 		params_.use_package("undertilde") != BufferParams::package_off)
 		packages << "\\usepackage{undertilde}\n";
@@ -890,6 +936,17 @@ string const LaTeXFeatures::getPackages() const
 	    params_.use_package("esint") != BufferParams::package_off)
 		packages << "\\usepackage{esint}\n";
 
+	// Known bibliography packages (simple \usepackage{package})
+	for (int i = 0; i < nb_bibliofeatures; ++i) {
+		if (mustProvide(bibliofeatures[i]))
+			packages << "\\usepackage{"
+				 << bibliofeatures[i] << "}\n";
+	}
+
+	// Compatibility between achicago and natbib
+	if (mustProvide("achicago") && mustProvide("natbib"))
+		packages << "\\let\\achicagobib\\thebibliography\n";
+
 	// natbib.sty
 	// Some classes load natbib themselves, but still allow (or even require)
 	// plain numeric citations (ReVTeX is such a case, see bug 5182).
@@ -903,6 +960,13 @@ string const LaTeXFeatures::getPackages() const
 		packages << "]{natbib}\n";
 	}
 
+	// Compatibility between achicago and natbib
+	if (mustProvide("achicago") && mustProvide("natbib")) {
+		packages << "\\let\\thebibliography\\achicagobib\n";
+		packages << "\\let\\SCcite\\astroncite\n";
+		packages << "\\let\\UnexpandableProtect\\protect\n";
+	}
+
 	// jurabib -- we need version 0.6 at least.
 	if (mustProvide("jurabib"))
 		packages << "\\usepackage{jurabib}[2004/01/25]\n";
@@ -1260,6 +1324,13 @@ docstring const LaTeXFeatures::getTClassHTMLStyles() const
 	DocumentClass const & tclass = params_.documentClass();
 	odocstringstream tcpreamble;
 
+	if (mustProvide("noun"))
+		tcpreamble << lyxnoun_style;
+	// this isn't exact, but it won't hurt that much if it
+	// wasn't for this.
+	if (mustProvide("ulem"))
+		tcpreamble << lyxstrikeout_style;
+
 	tcpreamble << tclass.htmlstyles();
 
 	list<docstring>::const_iterator cit = usedLayouts_.begin();