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 33b2488223ee09e7548b8aeef128c5284e4755f1..af36cf16a5eb85f759dc20a14612446024554d53 100644 (file)
--- 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()) {