Author: spitz
Date: Tue Mar 8 14:15:26 2011
New Revision: 37880
URL: http://www.lyx.org/trac/changeset/37880
Log:
PDFOptions.cpp: correct fix for bug #7048.
Modified:
lyx-devel/trunk/src/PDFOptions.cpp
Modified: lyx-devel/trunk/src/PDFOptions.cpp
==============================================================================
--- lyx-devel/trunk/src/PDFOptions.cpp Tue Mar 8 14:00:48 2011 (r37879)
+++ lyx-devel/trunk/src/PDFOptions.cpp Tue Mar 8 14:15:26 2011 (r37880)
@@ -178,10 +178,14 @@
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()) {
