X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FPDFOptions.cpp;h=af36cf16a5eb85f759dc20a14612446024554d53;hb=d83e0022017fa6245173e55332f60b7a4a78dc31;hp=33b2488223ee09e7548b8aeef128c5284e4755f1;hpb=0bb6e39ef1f7b4c5d023e8d0cdb444795b11ca4f;p=lyx.git

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()) {