X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.cpp;h=850af10169d5c09034eda8bc419f9c430af1edd2;hb=c8230ab0d0a919530c43c29395f4d9961498bf15;hp=c28d7958f6908e64ef3818b6fe518a25decfe618;hpb=c2d121f663b2814cad9190f03358d1362aab5ce5;p=lyx.git

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index c28d7958f6..850af10169 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -975,6 +975,7 @@ char const * simplefeatures[] = {
 	"forest",
 	"varwidth",
 	"footnote",
+	"tablefootnote",
 };
 
 char const * bibliofeatures[] = {
@@ -1231,7 +1232,11 @@ string const LaTeXFeatures::getPackages() const
 	// Some classes load natbib themselves, but still allow (or even require)
 	// plain numeric citations (ReVTeX is such a case, see bug 5182).
 	// This special case is indicated by the "natbib-internal" key.
-	if (mustProvide("natbib") && !isProvided("natbib-internal")) {
+	if (mustProvide("natbib")
+	    && !isProvided("natbib-internal")
+	    && !isProvided("biblatex")
+	    && !isProvided("biblatex-natbib")
+	    && !isProvided("jurabib")) {
 		packages << "\\usepackage[";
 		if (params_.citeEngineType() == ENGINE_TYPE_NUMERICAL)
 			packages << "numbers";
@@ -1250,7 +1255,11 @@ string const LaTeXFeatures::getPackages() const
 	}
 
 	// jurabib -- we need version 0.6 at least.
-	if (mustProvide("jurabib")) {
+	if (mustProvide("jurabib")
+	    && !isProvided("natbib-internal")
+	    && !isProvided("natbib")
+	    && !isProvided("biblatex")
+	    && !isProvided("biblatex-natbib")) {
 		packages << "\\usepackage";
 		if (!params_.biblio_opts.empty())
 			packages << '[' << params_.biblio_opts << ']';
@@ -1317,6 +1326,9 @@ TexString LaTeXFeatures::getMacros() const
 		macros << getPreambleSnippets();
 	}
 
+	if (mustProvide("xetexdashbreakstate"))
+		macros << "\\XeTeXdashbreakstate 0" << '\n';
+
 	if (mustProvide("papersize")) {
 		if (runparams_.flavor == OutputParams::LATEX
 		    || runparams_.flavor == OutputParams::DVILUATEX)