Load bibtopic after hyperref (bug #8005)

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index b9854e5867bf1669d6fe37a62bb1bba380306966..7fdba576e7c706a969badd9cfa91f88523ead699 100644 (file)
--- 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 2a3d099ff5c5a13f1f03c3d01790d9174b54a203..b5fe2af404effb6b2fdae7130c2413abd6de8159 100644 (file)
--- 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";