From: Jürgen Spitzmüller <spitz@lyx.org>
Date: Tue, 8 Mar 2011 13:15:26 +0000 (+0000)
Subject: PDFOptions.cpp: correct fix for bug #7048.
X-Git-Tag: 2.0.0~567
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d3d4d31880534a5f37c02c6c96b41414f1a1d89d;p=features.git

PDFOptions.cpp: correct fix for bug #7048.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37880 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index 33b2488223..af36cf16a5 100644
--- a/src/PDFOptions.cpp
+++ b/src/PDFOptions.cpp
@@ -178,10 +178,14 @@ void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
 		os << "\\inputencoding{utf8}\n"
 		   << setEncoding("UTF-8");
 	}
-	// FIXME: handle the case that hyperref is loaded by the document class and
-	// hyperset is empty, see bug #7048
-	if (!(hyperref_already_provided && hyperset.empty()))
-		os << from_utf8(opt);
+	// If hyperref is loaded by the document class, we output
+	// \hypersetup \AtBeginDocument, since the class might
+	// load hyperref late, see bug #7048.
+	if (hyperref_already_provided && !opt.empty())
+		os << "\\AtBeginDocument{%\n";
+	os << from_utf8(opt);
+	if (hyperref_already_provided && !opt.empty())
+		os << "}";
 
 	if (need_unicode && enc && enc->iconvName() != "UTF-8"
 	    &&!runparams.isFullUnicode()) {