DocBook: make all make* functions have the same argument order.

[lyx.git] / src / PDFOptions.cpp

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index d64cc2975e90ffc8f9057c14cca6ecd22faa5b7b..026c22db91cead550d2b078723203b2477549401 100644 (file)
--- a/src/PDFOptions.cpp
+++ b/src/PDFOptions.cpp
@@ -102,11 +102,10 @@ void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
                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
-       // and the option leads to errors with some Japanese document classes)
-       if (!runparams.isFullUnicode() 
-               && (!runparams.use_japanese || runparams.encoding->iconvName() == "UTF-8"))
+       // 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