From: Juergen Spitzmueller <spitz@lyx.org>
Date: Tue, 29 May 2012 11:25:30 +0000 (+0200)
Subject: Load bibtopic after hyperref (bug #8005)
X-Git-Tag: 2.1.0beta1~1825
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=9fc92f783c5a11bf3e1463b2c8768d08bb139c4d;p=features.git

Load bibtopic after hyperref (bug #8005)
---

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index b9854e5867..7fdba576e7 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1781,6 +1781,11 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
 		// hyperref loads this automatically
 		lyxpreamble += "\\usepackage{nameref}\n";
 
+	// bibtopic needs to be loaded after hyperref.
+	// the dot provides the aux file naming which LyX can detect.
+	if (features.mustProvide("bibtopic"))
+		lyxpreamble += "\\usepackage[dot]{bibtopic}\n";
+
 	// Will be surrounded by \makeatletter and \makeatother when not empty
 	docstring atlyxpreamble;
 
diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 2a3d099ff5..b5fe2af404 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -786,11 +786,6 @@ string const LaTeXFeatures::getPackages() const
 	if (mustProvide("xargs"))
 		packages << "\\usepackage{xargs}[2008/03/08]\n";
 
-	// bibtopic -- the dot provides the aux file naming which
-	// LyX can detect.
-	if (mustProvide("bibtopic"))
-		packages << "\\usepackage[dot]{bibtopic}\n";
-
 	if (mustProvide("xy"))
 		packages << "\\usepackage[all]{xy}\n";