X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FPDFOptions.cpp;h=6734beaafa78468d2c4fee5f9da6a2f23c2c886b;hb=044933b0d929e759d0c7badf55eafc471623cc0c;hp=52f85552fd9de8024b067a3c05675d9ac029ea08;hpb=f739c98fd7aa9cc6c7607b2eb9e8f8da2727e988;p=lyx.git

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index 52f85552fd..6734beaafa 100644
--- a/src/PDFOptions.cpp
+++ b/src/PDFOptions.cpp
@@ -61,13 +61,13 @@ void PDFOptions::writeFile(ostream & os) const
 		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';
@@ -85,7 +85,7 @@ void PDFOptions::writeFile(ostream & os) const
 		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';
 }
 
 
@@ -211,13 +211,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 +251,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;
 	}