#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");
&& pdfborder == x.pdfborder
&& colorlinks == x.colorlinks
&& backref == x.backref
- && pagebackref == x.pagebackref ;
+ && 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() )
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';
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';
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;
// try to extract author and title from document when none is
// explicitely given
- if (title.empty() && author.empty())
- opt += "pdfusetitle,\n ";
- else
- opt += "\n ";
+ if (pdfusetitle && title.empty() && author.empty())
+ opt += "pdfusetitle,";
+ opt += "\n ";
+
opt += "bookmarks=" + convert<string>(bookmarks) + ',';
if (bookmarks) {
opt += "bookmarksnumbered=" + convert<string>(bookmarksnumbered) + ',';
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
hyperset += "\n ";
hyperset += quoted_options_get();
}
- hyperset = support::rtrim(hyperset,",");
+ hyperset = rtrim(hyperset,",");
if (!hyperset.empty())
opt += "\\hypersetup{" + hyperset + "}\n ";
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;
}
}
-//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;
pagebackref = false;
pagemode.clear();
quoted_options.clear();
- store_options = false;
+ pdfusetitle = true; //in contrast with hyperref
}
} // namespace lyx