Allow dissolution of insets inside mathed

[lyx.git] / src / PDFOptions.cpp

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index 1fdaab61f0583c70090c3a1fb5729bf45899cf7d..e25dd0710ebdb9235ef085d1070c4632ae75cbbc 100644 (file)
--- a/src/PDFOptions.cpp
+++ b/src/PDFOptions.cpp
@@ -31,13 +31,23 @@ 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 ;
 }
 
 void PDFOptions::writeFile(ostream & os) const
@@ -60,8 +70,7 @@ 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';
@@ -97,8 +106,8 @@ void PDFOptions::writeLaTeX(odocstringstream &os) const
                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) + ',';
@@ -113,8 +122,10 @@ void PDFOptions::writeLaTeX(odocstringstream &os) const
        opt += "colorlinks="     + convert<string>(colorlinks) + ',';
        if (!pagemode.empty())
                opt += "pdfpagemode=" + pagemode + ',';
-       opt += "\n ";
-       opt += quoted_options_get();
+       if (!quoted_options.empty()){
+               opt += "\n ";
+               opt += quoted_options_get();
+       }
        opt = support::rtrim(opt,",");
        opt += "]\n {hyperref}\n";
        
@@ -172,7 +183,6 @@ string PDFOptions::quoted_options_get() const
        return quoted_options;
 }
 
-
 // Keep implicit hyperref settings
 void PDFOptions::clear()
 {
@@ -184,7 +194,7 @@ void PDFOptions::clear()
        bookmarks               = true;
        bookmarksnumbered       = false;
        bookmarksopen           = false;
-       bookmarksopenlevel.clear();
+       bookmarksopenlevel      = 1;
        breaklinks              = false;
        pdfborder               = false;
        colorlinks              = false;