Embedding: saving inzip name to .lyx file so that embedded files can always be found...

[lyx.git] / src / PDFOptions.cpp

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index 5ed2fa59c30e5bab78a54fd6cbd243e6cb85977b..307c9b169f05c89e8a4e4748f1b2e64b90e83fd0 100644 (file)
--- a/src/PDFOptions.cpp
+++ b/src/PDFOptions.cpp
@@ -14,18 +14,17 @@
 
 #include "support/convert.h"
 #include "support/lstrings.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "Lexer.h"
 
 #include <sstream>
 #include <string>
 
-namespace lyx {
+using namespace std;
+using namespace lyx::support;
 
+namespace lyx {
 
-using std::ostream;
-using std::ostringstream;
-using std::string;
 
 const string PDFOptions::pagemode_fullscreen("FullScreen");
 
@@ -70,7 +69,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';
-       os << "\\pdf_bookmarksopenlevel \"" << bookmarksopenlevel << "\"\n";
+       os << "\\pdf_bookmarksopenlevel " << bookmarksopenlevel << '\n';
        
        os << "\\pdf_breaklinks "  << convert<string>(breaklinks)  << '\n';
        os << "\\pdf_pdfborder "   << convert<string>(pdfborder)   << '\n';
@@ -86,9 +85,9 @@ void PDFOptions::writeFile(ostream & os) const
                os << "\\pdf_quoted_options \"" << quoted_options << "\"\n";
 }
 
-void PDFOptions::writeLaTeX(odocstringstream &os) const
+void PDFOptions::writeLaTeX(odocstream & os, bool hyper_required) const
 {
-       if (!use_hyperref)
+       if (!use_hyperref && !hyper_required)
                return;
        
        string opt;
@@ -125,7 +124,7 @@ void PDFOptions::writeLaTeX(odocstringstream &os) const
        if (!pagemode.empty())
                opt += "pdfpagemode=" + pagemode + ',';
        
-       opt = support::rtrim(opt,",");
+       opt = rtrim(opt,",");
        opt += "]\n {hyperref}\n";
 
        // load the pdftitle etc. as hypersetup, otherwise you'll get
@@ -143,7 +142,7 @@ void PDFOptions::writeLaTeX(odocstringstream &os) const
                hyperset += "\n ";
                hyperset += quoted_options_get();
        }
-       hyperset = support::rtrim(hyperset,",");
+       hyperset = rtrim(hyperset,",");
        if (!hyperset.empty())
                opt += "\\hypersetup{" + hyperset + "}\n ";
        
@@ -188,8 +187,6 @@ string PDFOptions::readToken(Lexer &lex, string const & token)
                lex >> pagemode;
        } else if (token == "\\pdf_quoted_options") {
                lex >> quoted_options;
-       } else if (token == "\\pdf_store_options") {
-               //leftover from previous option; intended for later removal
        } else {
                return token;
        }