Help avoiding shortcut clashes by discriminating strings.

[lyx.git] / src / PDFOptions.cpp

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index 7729a86ea6550604382eee2e7e07ce7e897dbc44..1cf32acda40a9aada630a2dfe3d16249bd96a81f 100644 (file)
--- a/src/PDFOptions.cpp
+++ b/src/PDFOptions.cpp
@@ -177,17 +177,19 @@ int PDFOptions::writeLaTeX(OutputParams & runparams, odocstream & os,
        lines = int(count(opt.begin(), opt.end(), '\n'));
 
        // hyperref expects utf8!
-       if (need_unicode && enc && enc->iconvName() != "UTF-8") {
+       if (need_unicode && enc && enc->iconvName() != "UTF-8"
+           &&!runparams.isFullUnicode()) {
                os << "\\inputencoding{utf8}\n"
                   << setEncoding("UTF-8");
                ++lines;
        }
-       // if hyperref is loaded by the document class and hyperset is empty,
-       // nothing must be output, see bug #7048
+       // 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 (need_unicode && enc && enc->iconvName() != "UTF-8") {
+       if (need_unicode && enc && enc->iconvName() != "UTF-8"
+           &&!runparams.isFullUnicode()) {
                os << setEncoding(enc->iconvName())
                   << "\\inputencoding{" << from_ascii(enc->latexName()) << "}\n";
                ++lines;