The branch, 2.0.x, has been updated. - Log -----------------------------------------------------------------
commit 0695fd54d800fd83e98fc227f7cb435f32a86b46 Merge: daf4490 a692b62 Author: Juergen Spitzmueller <[email protected]> Date: Tue May 29 13:27:48 2012 +0200 Merge branch '2.0.x' of git.lyx.org:lyx into 2.0.x commit daf44909c0b3e0abaafe3b9d7d8e69f79446638d Author: Juergen Spitzmueller <[email protected]> Date: Tue May 29 13:23:08 2012 +0200 Load bibtopic after hyperref (bug #8005) diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp index 775b8a3..c64597c 100644 --- a/src/BufferParams.cpp +++ b/src/BufferParams.cpp @@ -1787,6 +1787,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 70e39bb..1d4f31c 100644 --- a/src/LaTeXFeatures.cpp +++ b/src/LaTeXFeatures.cpp @@ -767,11 +767,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"; diff --git a/status.20x b/status.20x index 77b0282..5ae8948 100644 --- a/status.20x +++ b/status.20x @@ -124,6 +124,9 @@ What's new - Fix generation of a lyx archive when included files have spaces embedded in their names (bug 8164). + +- Load bibtopic after hyperref, thus preventing a LaTeX error when back + references are used (bug 8005). * USER INTERFACE ----------------------------------------------------------------------- Summary of changes: src/BufferParams.cpp | 5 +++++ src/LaTeXFeatures.cpp | 5 ----- status.20x | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) hooks/post-receive -- The LyX Source Repository
