adjust

[lyx.git] / src / PDFOptions.cpp

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index 69be8502484c2abca4ac0832e52bb014dafe5add..22b8ff310c36440de905b59daee434bc526a0dcc 100644 (file)
--- a/src/PDFOptions.cpp
+++ b/src/PDFOptions.cpp
@@ -31,20 +31,30 @@ const string PDFOptions::pagemode_fullscreen("FullScreen");
 
 bool PDFOptions::empty() const
 {
-       return author.empty()
-               && title.empty()
-               && subject.empty()
-               && keywords.empty()
-               && pagemode.empty()
-               && bookmarksopenlevel.empty()
-               && quoted_options.empty();
+       PDFOptions x; //implicit hyperref settings
+
+       return  author == x.author
+               && title == x.title
+               && subject == x.subject
+               && keywords == x.keywords
+               && pagemode == x.pagemode
+               && quoted_options == x.quoted_options
+               && bookmarks == x.bookmarks
+               && bookmarksnumbered == x.bookmarksnumbered
+               && bookmarksopen == x.bookmarksopen
+               && bookmarksopenlevel == x.bookmarksopenlevel
+               && breaklinks == x.breaklinks
+               && pdfborder == x.pdfborder
+               && colorlinks == x.colorlinks
+               && backref == x.backref
+               && pagebackref == x.pagebackref
+               && pdfusetitle == x.pdfusetitle;
 }
 
 void PDFOptions::writeFile(ostream & os) const
 {
        os << "\\use_hyperref " << convert<string>(use_hyperref) << '\n';
-       os << "\\pdf_store_options " << convert<string>(store_options) << '\n';
-       if (!use_hyperref && !store_options)
+       if (!use_hyperref && empty())
                return;
        
        if (!title.empty() )
@@ -60,14 +70,14 @@ void PDFOptions::writeFile(ostream & os) const
        os << "\\pdf_bookmarks " << convert<string>(bookmarks) << '\n';
        os << "\\pdf_bookmarksnumbered " << convert<string>(bookmarksnumbered) << '\n';
        os << "\\pdf_bookmarksopen " << convert<string>(bookmarksopen) << '\n';
-       if (!bookmarksopenlevel.empty())
-               os << "\\pdf_bookmarksopenlevel \"" << bookmarksopenlevel << "\"\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 "     << convert<string>(backref)     << '\n';
        os << "\\pdf_pagebackref " << convert<string>(pagebackref) << '\n';
+       os << "\\pdf_pdfusetitle " << convert<string>(pdfusetitle) << '\n';
        
        if (!pagemode.empty())
                os << "\\pdf_pagemode " << pagemode << '\n';
@@ -76,48 +86,66 @@ void PDFOptions::writeFile(ostream & os) const
                os << "\\pdf_quoted_options \"" << quoted_options << "\"\n";
 }
 
-void PDFOptions::writeLaTeX(odocstringstream &os) const
+void PDFOptions::writeLaTeX(odocstringstream &os, bool hyper_required) const
 {
-       if (!use_hyperref)
+       if (!use_hyperref && !hyper_required)
                return;
        
        string opt;
        
        opt = "\\usepackage[";
-       if (!title.empty())
-               opt += "pdftitle={"   + title + "},\n";
-       if (!author.empty())
-               opt += "pdfauthor={"  + author + "},\n";
-       if (!subject.empty())
-               opt += "pdfsubject={" + subject + "},\n";
-       if (!keywords.empty())
-               opt += "pdfkeywords={" + keywords + "},\n";
+       // since LyX uses unicode, also set the PDF strings to unicode strings with the
+       // hyperref option "unicode"
+       opt += "unicode=true, ";
        
+       // try to extract author and title from document when none is
+       // explicitely given
+       if (pdfusetitle && title.empty() && author.empty())
+               opt += "pdfusetitle,";
+       opt += "\n ";
+
        opt += "bookmarks=" + convert<string>(bookmarks) + ',';
        if (bookmarks) {
                opt += "bookmarksnumbered=" + convert<string>(bookmarksnumbered) + ',';
                opt += "bookmarksopen=" + convert<string>(bookmarksopen) + ',';
-       
-               if (bookmarksopen && !bookmarksopenlevel.empty())
-                       opt += "bookmarksopenlevel=" + bookmarksopenlevel + ',';
+               if (bookmarksopen)
+                       opt += "bookmarksopenlevel=" + convert<string>(bookmarksopenlevel) + ',';
        }
-       
+       opt += "\n ";
        opt += "breaklinks="     + convert<string>(breaklinks) + ',';
-       
+
        opt += "pdfborder={0 0 " ;
        opt += (pdfborder ?'0':'1');
-       opt += "},\n";
-       
-       opt += "colorlinks="     + convert<string>(colorlinks) + ',';
+       opt += "},";
+
        opt += "backref="        + convert<string>(backref) + ',';
        opt += "pagebackref="    + convert<string>(pagebackref) + ',';
-       
+       opt += "\n ";
+       opt += "colorlinks="     + convert<string>(colorlinks) + ',';
        if (!pagemode.empty())
                opt += "pdfpagemode=" + pagemode + ',';
-       opt += quoted_options_get();
        
        opt = support::rtrim(opt,",");
-       opt += "]{hyperref}\n";
+       opt += "]\n {hyperref}\n";
+
+       // load the pdftitle etc. as hypersetup, otherwise you'll get
+       // LaTeX-errors when using non-latin characters
+       string hyperset;
+       if (!title.empty())
+               hyperset += "pdftitle={"   + title + "},";
+       if (!author.empty())
+               hyperset += "\n pdfauthor={"  + author + "},";
+       if (!subject.empty())
+               hyperset += "\n pdfsubject={" + subject + "},";
+       if (!keywords.empty())
+               hyperset += "\n pdfkeywords={" + keywords + "},";
+       if (!quoted_options.empty()){
+               hyperset += "\n ";
+               hyperset += quoted_options_get();
+       }
+       hyperset = support::rtrim(hyperset,",");
+       if (!hyperset.empty())
+               opt += "\\hypersetup{" + hyperset + "}\n ";
        
        // FIXME UNICODE
        os << from_utf8(opt);
@@ -154,12 +182,12 @@ string PDFOptions::readToken(Lexer &lex, string const & token)
                lex >> backref;
        } else if (token == "\\pdf_pagebackref") {
                lex >> pagebackref;
+       } else if (token == "\\pdf_pdfusetitle") {
+               lex >> pdfusetitle;
        } else if (token == "\\pdf_pagemode") {
                lex >> pagemode;
        } else if (token == "\\pdf_quoted_options") {
                lex >> quoted_options;
-       } else if (token == "\\pdf_store_options") {
-               lex >> store_options;
        } else {
                return token;
        }
@@ -167,14 +195,13 @@ string PDFOptions::readToken(Lexer &lex, string const & token)
 }
 
 
-//prepared for check
+// prepared for check
 string PDFOptions::quoted_options_get() const
 {
        return quoted_options;
 }
 
-
-// Keep implicit hyperref settings
+// set implicit settings for hyperref
 void PDFOptions::clear()
 {
        use_hyperref            = false;
@@ -185,7 +212,7 @@ void PDFOptions::clear()
        bookmarks               = true;
        bookmarksnumbered       = false;
        bookmarksopen           = false;
-       bookmarksopenlevel.clear();
+       bookmarksopenlevel      = 1;
        breaklinks              = false;
        pdfborder               = false;
        colorlinks              = false;
@@ -193,7 +220,7 @@ void PDFOptions::clear()
        pagebackref             = false;
        pagemode.clear();
        quoted_options.clear();
-       store_options           = false;
+       pdfusetitle             = true;  //in contrast with hyperref
 }
 
 } // namespace lyx