Fix text direction issue for InsetInfo in RTL context

[lyx.git] / src / PDFOptions.cpp

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index 664688826af18c979ca6de990577f3e3337eaeb1..b030baa62e93dc7784801cd0e604718c9965c12e 100644 (file)
--- 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,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,";
@@ -132,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 + "},";
@@ -174,21 +179,15 @@ void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
                opt = "\\hypersetup{" + rtrim(opt + hyperset, ",") + "}\n";
        }
 
-       // hyperref expects LICR macros for non-ASCII chars. With Xe/LuaTeX utf-8 works, too.
-       // Usually, "(lua)inputenc" converts the input to LICR.
+       // hyperref expects LICR macros for non-ASCII chars.
+       // Usually, "(lua)inputenc" converts the input to LICR, with XeTeX utf-8 works, too.
        // As hyperref provides good coverage for \inputencoding{utf8}, we can try
        // this if the current input encoding does not support a character.
-       // FIXME: inputenc (part 1 of 2)
-       //   Replace the "FullUnicode" check with
-       //   check for loading of inputenc or luainputenc package
-       //   (see BufferParams::writeEncodingPreamble and runparams.encoding->package()).
-       //   Otherwise \inputencoding is not defined
-       //   (e.g. if "latex-encoding" is set to "ascii").
-       //   Dont forget to keep the check below (part 2) in sync!
-       if (need_unicode && enc && enc->iconvName() != "UTF-8"
-           &&!runparams.isFullUnicode()) {
-               os << "\\inputencoding{utf8}\n"
-                  << setEncoding("UTF-8");
+       // FIXME: don't use \inputencoding if "inputenc" is not loaded (#9839).
+       if (need_unicode && enc && enc->iconvName() != "UTF-8") {
+           if (runparams.flavor != OutputParams::XETEX)
+                       os << "\\inputencoding{utf8}\n";
+               os << setEncoding("UTF-8");
        }
        // If hyperref is loaded by the document class, we output
        // \hypersetup \AtBeginDocument if hypersetup is not (yet)
@@ -204,11 +203,10 @@ void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
                   << "\\fi\n";
        } else
                os << from_utf8(opt);
-       // FIXME: inputenc (part 2 of 2)
-       if (need_unicode && enc && enc->iconvName() != "UTF-8"
-           &&!runparams.isFullUnicode()) {
-               os << setEncoding(enc->iconvName())
-                  << "\\inputencoding{" << from_ascii(enc->latexName()) << "}\n";
+       if (need_unicode && enc && enc->iconvName() != "UTF-8") {
+               os << setEncoding(enc->iconvName());
+           if (runparams.flavor != OutputParams::XETEX)
+                       os << "\\inputencoding{" << from_ascii(enc->latexName()) << "}\n";
        }
 }
 
@@ -218,13 +216,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") {
@@ -246,7 +256,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;
+               if (lex.isOK()) {
+                       lex.next(true);
+                       quoted_options = lex.getString();
+               }
        } else {
                return token;
        }