X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FPDFOptions.cpp;h=026c22db91cead550d2b078723203b2477549401;hb=62af7ee772f16f154225d2d0b65d77f4376b6001;hp=77763bef3a378494d12d45fd061b0fdd7ece2b11;hpb=670efa8f646218f2a378f0cc614c4c37a9f6b89a;p=lyx.git

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index 77763bef3a..026c22db91 100644
--- a/src/PDFOptions.cpp
+++ b/src/PDFOptions.cpp
@@ -60,7 +60,7 @@ void PDFOptions::writeFile(ostream & os) const
 	os << "\\use_hyperref " << convert<string>(use_hyperref) << '\n';
 	if (!use_hyperref && empty())
 		return;
-	
+
 	if (!title.empty() )
 		os << "\\pdf_title " << Lexer::quoteString(title) << '\n';
 	if (!author.empty())
@@ -69,22 +69,22 @@ void PDFOptions::writeFile(ostream & os) const
 		os << "\\pdf_subject " << Lexer::quoteString(subject) << '\n';
 	if (!keywords.empty())
 		os << "\\pdf_keywords " << Lexer::quoteString(keywords) << '\n';
-	
-	
+
+
 	os << "\\pdf_bookmarks " << convert<string>(bookmarks) << '\n';
 	os << "\\pdf_bookmarksnumbered " << convert<string>(bookmarksnumbered) << '\n';
 	os << "\\pdf_bookmarksopen " << convert<string>(bookmarksopen) << '\n';
 	os << "\\pdf_bookmarksopenlevel " << bookmarksopenlevel << '\n';
-	
+
 	os << "\\pdf_breaklinks "  << convert<string>(breaklinks)  << '\n';
 	os << "\\pdf_pdfborder "   << convert<string>(pdfborder)   << '\n';
 	os << "\\pdf_colorlinks "  << convert<string>(colorlinks)  << '\n';
 	os << "\\pdf_backref "     << backref << '\n';
 	os << "\\pdf_pdfusetitle " << convert<string>(pdfusetitle) << '\n';
-	
+
 	if (!pagemode.empty())
 		os << "\\pdf_pagemode " << pagemode << '\n';
-	
+
 	if (!quoted_options.empty())
 		os << "\\pdf_quoted_options " << Lexer::quoteString(quoted_options) << '\n';
 }
@@ -96,10 +96,17 @@ void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
 	// FIXME Unicode
 	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
@@ -133,7 +140,7 @@ void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
 		// LaTeX-errors when using non-latin characters
 		if (!title.empty())
 			hyperset += "pdftitle={" + title + "},";
-		if (!author.empty())			
+		if (!author.empty())
 			hyperset += "\n pdfauthor={" + author + "},";
 		if (!subject.empty())
 			hyperset += "\n pdfsubject={" + subject + "},";