anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 13:31:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PDFOptions.cpp: correct fix for bug #7048.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37880 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2011-03-08 13:15:26 +00:00
parent 0bb6e39ef1
commit d3d4d31880
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/PDFOptions.cpp
View File

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