DocBook: fix for nomenclature xml:id and glossary paragraphs.

[lyx.git] / src / PDFOptions.cpp

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index a4d23ee5a96627d870981b4908b3162c460d9c47..a3dd1f34e5b57e523cde903bab19e1eb57897e74 100644 (file)
--- a/src/PDFOptions.cpp
+++ b/src/PDFOptions.cpp
@@ -15,10 +15,13 @@
 
 #include "Encoding.h"
 #include "Lexer.h"
+#include "OutputParams.h"
 #include "texstream.h"
 
 #include "support/convert.h"
 #include "support/debug.h"
+#include "support/docstream.h"
+#include "support/docstring.h"
 #include "support/lstrings.h"
 
 #include <sstream>
@@ -97,9 +100,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
@@ -152,8 +162,8 @@ void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
        docstring const hs = from_utf8(hyperset);
        bool need_unicode = false;
        if (enc) {
-               for (size_t n = 0; n < hs.size(); ++n) {
-                       if (!enc->encodable(hs[n]))
+               for (char_type h : hs) {
+                       if (!enc->encodable(h))
                                need_unicode = true;
                }
        }