X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FPDFOptions.h;h=756c2f70a4e37482dc8be9c84853b47f17c9c2b1;hb=19c7902b53a911bb721bf56c38b6f39e6e7df156;hp=82d08841cb698fb3dc8b734c8a0eef72b4d6f2bb;hpb=65a9b1a683b5c30609aba5713dca576874f34e13;p=lyx.git

diff --git a/src/PDFOptions.h b/src/PDFOptions.h
index 82d08841cb..756c2f70a4 100644
--- a/src/PDFOptions.h
+++ b/src/PDFOptions.h
@@ -12,26 +12,35 @@
 #ifndef PDFOPTIONS_H
 #define PDFOPTIONS_H
 
-#include "support/docstream.h"
+#include "OutputParams.h"
+
+#include "support/strfwd.h"
+
+#include <string>
 
 namespace lyx {
 
 class Lexer;
 
+// FIXME UNICODE
+// Write functions need to use odostream instead of ostream before
+// we can use docstring instead of string.
+
 /// Options for PDF generation
 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(OutputParams &, otexstream &,
+			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();
 
 	///
@@ -90,18 +99,14 @@ public:
 	bool colorlinks;
 	/**
 		* Adds backlink text to the end of each item in the bibliography,
-		* as a list of section numbers.
+		* as a list of section/slide/page numbers.
 		* This can only work properly if there is a blank line after each
 		* \bibitem.
-		* backref        boolean false
-		*/
-	bool backref;
-	/**
-		* Adds backlink text to the end of each item in the bibliography,
-		* as a list of page numbers.
-		* pagebackref       boolean false
+		* backref   string  empty(="section"), "false", "section", "slide", "page"
+		*
+		* Internally we use false/section/slide/pages. See also bug 5340.
 		*/
-	bool pagebackref;
+	std::string backref;
 	/**
 		* Determines how the file is opening in Acrobat;
 		* the possibilities are None, UseThumbs (show thumbnails), UseOutlines
@@ -116,6 +121,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;
 	/**
@@ -124,8 +138,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;
 	
 	
 	/**