X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FPDFOptions.cpp;h=b030baa62e93dc7784801cd0e604718c9965c12e;hb=f63de41c4c2180705b44c3444718d7f35df89b8a;hp=77763bef3a378494d12d45fd061b0fdd7ece2b11;hpb=670efa8f646218f2a378f0cc614c4c37a9f6b89a;p=lyx.git diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp index 77763bef3a..b030baa62e 100644 --- a/src/PDFOptions.cpp +++ b/src/PDFOptions.cpp @@ -60,7 +60,7 @@ void PDFOptions::writeFile(ostream & os) const os << "\\use_hyperref " << convert(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(bookmarks) << '\n'; os << "\\pdf_bookmarksnumbered " << convert(bookmarksnumbered) << '\n'; os << "\\pdf_bookmarksopen " << convert(bookmarksopen) << '\n'; os << "\\pdf_bookmarksopenlevel " << bookmarksopenlevel << '\n'; - + os << "\\pdf_breaklinks " << convert(breaklinks) << '\n'; os << "\\pdf_pdfborder " << convert(pdfborder) << '\n'; os << "\\pdf_colorlinks " << convert(colorlinks) << '\n'; os << "\\pdf_backref " << backref << '\n'; os << "\\pdf_pdfusetitle " << convert(pdfusetitle) << '\n'; - + if (!pagemode.empty()) os << "\\pdf_pagemode " << pagemode << '\n'; - + if (!quoted_options.empty()) os << "\\pdf_quoted_options " << Lexer::quoteString(quoted_options) << '\n'; } @@ -96,7 +96,11 @@ void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os, // FIXME Unicode string opt; string hyperset; - + + // 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" opt += "unicode=true,"; @@ -133,7 +137,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 + "},";