X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FPDFOptions.h;h=47e4c4136c07072340ed9eb29616d3ee147b118e;hb=a49c4e3454e428eeb0f2678eb9db3d086b2b789c;hp=d34132b13059fd51a4b0bbd523953a57f13a2a60;hpb=6881ac8c4c9da9fc7ddcdc613fc9cc650a0f555d;p=lyx.git

diff --git a/src/PDFOptions.h b/src/PDFOptions.h
index d34132b130..47e4c4136c 100644
--- a/src/PDFOptions.h
+++ b/src/PDFOptions.h
@@ -12,9 +12,9 @@
 #ifndef PDFOPTIONS_H
 #define PDFOPTIONS_H
 
+#include "support/strfwd.h"
 
 #include <string>
-#include "support/docstream.h"
 
 namespace lyx {
 
@@ -25,15 +25,15 @@ class PDFOptions {
 public:
 	///
 	PDFOptions() { clear(); }
-	/// check for string settings
+	/// check whether user added any settings for hyperref
 	bool empty() const;
 	/// output to lyx header
 	void writeFile(std::ostream &) const;
 	/// output to tex header
-	void writeLaTeX(odocstringstream &) const;
+	void writeLaTeX(odocstream &, bool hyperref_already_provided) const;
 	/// read tokens from lyx header
 	std::string readToken(Lexer &lex, std::string const & token);
-	/// keep implicit hyperref settings
+	/// set implicit settings for hyperref
 	void clear();
 
 	///
@@ -67,7 +67,7 @@ public:
 		* Level (\maxdimen) to which bookmarks are open
 		* bookmarksopenlevel    parameter
 		*/
-	std::string bookmarksopenlevel;
+	int bookmarksopenlevel;
 	/**
 		* Allows link text to break across lines.
 		* breaklinks        boolean false
@@ -118,6 +118,15 @@ public:
 		* dialog -> PDFOptions.pagemode .
 		*/
 	std::string pagemode;
+	/**
+		* Flag indicating whether hyperref tries to derive the values for
+		* pdftitle and pdfauthor from \title and \author.
+		* pdfusetitle       boolean false
+		*
+		* Note that we use true as default value instead. The option is also
+		* used in latex output only when title and author is not filled.
+	*/
+	bool pdfusetitle;
 	///latex string
 	static const std::string pagemode_fullscreen;
 	/**
@@ -126,8 +135,10 @@ public:
 	std::string quoted_options;
 	/**
 		* Possible syntax check of users additional parameters here.
+		* Returns repaired string. For the time being only newlines
+		* are checked.
 		*/
-	std::string quoted_options_get() const;
+	std::string quoted_options_check(std::string const str) const;
 	
 	
 	/**