X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FPDFOptions.cpp;h=026c22db91cead550d2b078723203b2477549401;hb=59e3ff27ffde4f7ac54cc4849c537f9f15dd3d8f;hp=52f85552fd9de8024b067a3c05675d9ac029ea08;hpb=f739c98fd7aa9cc6c7607b2eb9e8f8da2727e988;p=lyx.git

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index 52f85552fd..026c22db91 100644
--- a/src/PDFOptions.cpp
+++ b/src/PDFOptions.cpp
@@ -15,6 +15,7 @@
 
 #include "Encoding.h"
 #include "Lexer.h"
+#include "texstream.h"
 
 #include "support/convert.h"
 #include "support/debug.h"
@@ -59,33 +60,33 @@ 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 \"" << title << "\"\n";
+		os << "\\pdf_title " << Lexer::quoteString(title) << '\n';
 	if (!author.empty())
-		os << "\\pdf_author \"" << author << "\"\n";
+		os << "\\pdf_author " << Lexer::quoteString(author) << '\n';
 	if (!subject.empty())
-		os << "\\pdf_subject \"" << subject << "\"\n";
+		os << "\\pdf_subject " << Lexer::quoteString(subject) << '\n';
 	if (!keywords.empty())
-		os << "\\pdf_keywords \"" << keywords << "\"\n";
-	
-	
+		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 \"" << quoted_options << "\"\n";
+		os << "\\pdf_quoted_options " << Lexer::quoteString(quoted_options) << '\n';
 }
 
 
@@ -95,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
@@ -132,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 + "},";
@@ -211,13 +219,25 @@ string PDFOptions::readToken(Lexer &lex, string const & token)
 	if (token == "\\use_hyperref") {
 		lex >> use_hyperref;
 	} else if (token == "\\pdf_title") {
-		lex >> title;
+		if (lex.isOK()) {
+			lex.next(true);
+			title = lex.getString();
+		}
 	} else if (token == "\\pdf_author") {
-		lex >> author;
+		if (lex.isOK()) {
+			lex.next(true);
+			author = lex.getString();
+		}
 	} else if (token == "\\pdf_subject") {
-		lex >> subject;
+		if (lex.isOK()) {
+			lex.next(true);
+			subject = lex.getString();
+		}
 	} else if (token == "\\pdf_keywords") {
-		lex >> keywords;
+		if (lex.isOK()) {
+			lex.next(true);
+			keywords = lex.getString();
+		}
 	} else if (token == "\\pdf_bookmarks") {
 		lex >> bookmarks;
 	} else if (token == "\\pdf_bookmarksnumbered") {
@@ -239,8 +259,10 @@ string PDFOptions::readToken(Lexer &lex, string const & token)
 	} else if (token == "\\pdf_pagemode") {
 		lex >> pagemode;
 	} else if (token == "\\pdf_quoted_options") {
-		lex >> quoted_options;
-		lyxerr << "Q_O=" << quoted_options << endl;
+		if (lex.isOK()) {
+			lex.next(true);
+			quoted_options = lex.getString();
+		}
 	} else {
 		return token;
 	}