Don't allow newline characters in document settings.

[lyx.git] / src / PDFOptions.cpp

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index d9f637e95135105f5d2aeb7e02c0d806cf36204f..62d0480e1f81bd11d4db2390d1103ac9cea5fa83 100644 (file)
--- a/src/PDFOptions.cpp
+++ b/src/PDFOptions.cpp
@@ -89,10 +89,9 @@ void PDFOptions::writeFile(ostream & os) const
 }
 
 
-int PDFOptions::writeLaTeX(OutputParams & runparams, odocstream & os,
+void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
                            bool hyperref_already_provided) const
 {
-       int lines = 0;
        // FIXME Unicode
        string opt;
        string hyperset;
@@ -103,7 +102,7 @@ int PDFOptions::writeLaTeX(OutputParams & runparams, odocstream & os,
 
        // only use the hyperref settings if hyperref is enabled by the user
        // see bug #7052
-       if(use_hyperref) {
+       if (use_hyperref) {
                // try to extract author and title from document when none is
                // explicitly given
                if (pdfusetitle && title.empty() && author.empty())
@@ -142,7 +141,6 @@ int PDFOptions::writeLaTeX(OutputParams & runparams, odocstream & os,
                        hyperset += quoted_options;
                }
                hyperset = rtrim(hyperset,",");
-
        }
 
        // check if the hyperref settings use an encoding that exceeds
@@ -171,30 +169,35 @@ int PDFOptions::writeLaTeX(OutputParams & runparams, odocstream & 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";
        }
 
-       lines = int(count(opt.begin(), opt.end(), '\n'));
-
        // hyperref expects utf8!
        if (need_unicode && enc && enc->iconvName() != "UTF-8"
            &&!runparams.isFullUnicode()) {
                os << "\\inputencoding{utf8}\n"
                   << setEncoding("UTF-8");
-               ++lines;
        }
-       // if hyperref is loaded by the document class and hyperset is empty,
-       // nothing must be output, 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);
 
        if (need_unicode && enc && enc->iconvName() != "UTF-8"
            &&!runparams.isFullUnicode()) {
                os << setEncoding(enc->iconvName())
                   << "\\inputencoding{" << from_ascii(enc->latexName()) << "}\n";
-               ++lines;
        }
-       return lines;
 }