Fix bug #9813

[lyx.git] / src / PDFOptions.cpp

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index afbd5e5f6423256f1fe2c2daaa39edefdf7b4553..664688826af18c979ca6de990577f3e3337eaeb1 100644 (file)
--- a/src/PDFOptions.cpp
+++ b/src/PDFOptions.cpp
@@ -174,9 +174,19 @@ void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
                opt = "\\hypersetup{" + rtrim(opt + hyperset, ",") + "}\n";
        }
 
-       // hyperref expects utf8!
+       // hyperref expects LICR macros for non-ASCII chars. With Xe/LuaTeX utf-8 works, too.
+       // Usually, "(lua)inputenc" converts the input to LICR.
+       // As hyperref provides good coverage for \inputencoding{utf8}, we can try
+       // this if the current input encoding does not support a character.
+       // FIXME: inputenc (part 1 of 2)
+       //   Replace the "FullUnicode" check with
+       //   check for loading of inputenc or luainputenc package
+       //   (see BufferParams::writeEncodingPreamble and runparams.encoding->package()).
+       //   Otherwise \inputencoding is not defined
+       //   (e.g. if "latex-encoding" is set to "ascii").
+       //   Dont forget to keep the check below (part 2) in sync!
        if (need_unicode && enc && enc->iconvName() != "UTF-8"
-           &&!runparams.isFullUnicode()) { // FIXME: check must be done for useNonTeXFonts!
+           &&!runparams.isFullUnicode()) {
                os << "\\inputencoding{utf8}\n"
                   << setEncoding("UTF-8");
        }
@@ -194,9 +204,9 @@ void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
                   << "\\fi\n";
        } else
                os << from_utf8(opt);
-
+       // FIXME: inputenc (part 2 of 2)
        if (need_unicode && enc && enc->iconvName() != "UTF-8"
-           &&!runparams.isFullUnicode()) { // FIXME: check for useNonTeXFonts!
+           &&!runparams.isFullUnicode()) {
                os << setEncoding(enc->iconvName())
                   << "\\inputencoding{" << from_ascii(enc->latexName()) << "}\n";
        }