Outliner: distinguish non-active refs from broken refs

[lyx.git] / src / PDFOptions.cpp

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index a4d23ee5a96627d870981b4908b3162c460d9c47..026c22db91cead550d2b078723203b2477549401 100644 (file)
--- a/src/PDFOptions.cpp
+++ b/src/PDFOptions.cpp
@@ -97,9 +97,16 @@ void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
        string opt;
        string hyperset;
 
-       // since LyX uses unicode, also set the PDF strings to unicode strings with the
-       // hyperref option "unicode"
-       opt += "unicode=true,";
+       // Driver needed by specific converters
+       if (!runparams.hyperref_driver.empty())
+               opt += runparams.hyperref_driver + ",";
+
+       // Since LyX uses unicode, also set the PDF strings to unicode strings
+       // with the hyperref option "unicode". (With Xe/LuaTeX and pTeX,
+       // unicode=true is the default, with Japanese (platex), the option
+       // leads to errors (even if the input encoding is UTF-8).)
+       if (!runparams.isFullUnicode() && !runparams.use_japanese)
+               opt += "unicode=true,";
 
        // only use the hyperref settings if hyperref is enabled by the user
        // see bug #7052