Disable setting vertical lines when using a formal table

[lyx.git] / src / PDFOptions.cpp

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index 33b2488223ee09e7548b8aeef128c5284e4755f1..664688826af18c979ca6de990577f3e3337eaeb1 100644 (file)
--- a/src/PDFOptions.cpp
+++ b/src/PDFOptions.cpp
@@ -121,6 +121,8 @@ void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
                opt += "pdfborder={0 0 ";
                opt += (pdfborder ? '0' : '1');
                opt += "},";
+               if (pdfborder)
+                       opt += "pdfborderstyle={},";
                opt += "backref=" + backref + ',';
                opt += "colorlinks=" + convert<string>(colorlinks) + ',';
                if (!pagemode.empty())
@@ -150,7 +152,7 @@ void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
        bool need_unicode = false;
        if (enc) {
                for (size_t n = 0; n < hs.size(); ++n) {
-                       if (enc->latexChar(hs[n], true) != docstring(1, hs[n]))
+                       if (!enc->encodable(hs[n]))
                                need_unicode = true;
                }
        }
@@ -169,20 +171,40 @@ void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
                // FIXME: rename in this case the PDF settings dialog checkbox
                //  label from "Use Hyperref" to "Customize Hyperref Settings"
                //  as discussd in bug #6293
-               opt = "\\hypersetup{" + opt + hyperset + "}\n";
+               opt = "\\hypersetup{" + rtrim(opt + hyperset, ",") + "}\n";
        }
 
-       // hyperref expects utf8!
+       // hyperref expects LICR macros for non-ASCII chars. With Xe/LuaTeX utf-8 works, too.
+       // Usually, "(lua)inputenc" converts the input to LICR.
+       // 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: handle the case that hyperref is loaded by the document class and
-       // hyperset is empty, see bug #7048
-       if (!(hyperref_already_provided && hyperset.empty()))
+       // If hyperref is loaded by the document class, we output
+       // \hypersetup \AtBeginDocument if hypersetup is not (yet)
+       // defined. In this case, the class loads hyperref late
+       // (see bug #7048).
+       if (hyperref_already_provided && !opt.empty()) {
+               os << "\\ifx\\hypersetup\\undefined\n"
+                  << "  \\AtBeginDocument{%\n    "
+                  << from_utf8(opt)
+                  << "  }\n"
+                  << "\\else\n  "
+                  << from_utf8(opt)
+                  << "\\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())
@@ -233,7 +255,7 @@ string PDFOptions::readToken(Lexer &lex, string const & token)
 
 
 // check the string from UI
-string PDFOptions::quoted_options_check(string const str) const
+string PDFOptions::quoted_options_check(string const & str) const
 {
        return subst(str, "\n", "");
 }