Fairly trivial change here: Just protect against inheriting limits to

[lyx.git] / src / PDFOptions.cpp

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index 09bd79652a906447091e27dade3561c8d10ab4a4..af36cf16a5eb85f759dc20a14612446024554d53 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
@@ -174,27 +172,26 @@ int PDFOptions::writeLaTeX(OutputParams & runparams, odocstream & os,
                opt = "\\hypersetup{" + 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;
        }
-       // 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()))
-       //      os << from_utf8(opt);
+       // If hyperref is loaded by the document class, we output
+       // \hypersetup \AtBeginDocument, since the class might
+       // load hyperref late, see bug #7048.
+       if (hyperref_already_provided && !opt.empty())
+               os << "\\AtBeginDocument{%\n";
+       os << from_utf8(opt);
+       if (hyperref_already_provided && !opt.empty())
+               os << "}";
 
        if (need_unicode && enc && enc->iconvName() != "UTF-8"
            &&!runparams.isFullUnicode()) {
                os << setEncoding(enc->iconvName())
                   << "\\inputencoding{" << from_ascii(enc->latexName()) << "}\n";
-               ++lines;
        }
-       return lines;
 }