X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FPDFOptions.h;h=4ab0d9e3ad7488c52d8f1d0943b5533e992894e6;hb=26ba2a65838731ce639a09539f617cb0f0be3b22;hp=13f83b9436b1555ee876bf9429e84fc264189da5;hpb=a8cd9a4b8fd325b00c75f601c66c6d618ba276db;p=lyx.git

diff --git a/src/PDFOptions.h b/src/PDFOptions.h
index 13f83b9436..4ab0d9e3ad 100644
--- a/src/PDFOptions.h
+++ b/src/PDFOptions.h
@@ -12,13 +12,17 @@
 #ifndef PDFOPTIONS_H
 #define PDFOPTIONS_H
 
-#include "support/strfwd.h"
-
 #include <string>
 
 namespace lyx {
 
 class Lexer;
+class OutputParams;
+class otexstream;
+
+// 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 {
@@ -30,7 +34,8 @@ public:
 	/// output to lyx header
 	void writeFile(std::ostream &) const;
 	/// output to tex header
-	void writeLaTeX(odocstream &, bool hyper_required) const;
+	void writeLaTeX(OutputParams &, otexstream &,
+			bool hyperref_already_provided) const;
 	/// read tokens from lyx header
 	std::string readToken(Lexer &lex, std::string const & token);
 	/// set implicit settings for hyperref
@@ -92,18 +97,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
@@ -135,16 +136,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;
-	
-	
-	/**
-		* Flag indicating whether user made some input into PDF preferences.
-		* We want to save options, when user decide to switch off PDF support
-		* for a while.
-		*/
-	bool store_options;
+	std::string quoted_options_check(std::string const & str) const;
 };
 
 } // namespace lyx