X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FPDFOptions.cpp;h=644f26e738bcfe49523dfd5991c8ece4d0b6c559;hb=5e0121cf5854a2a0039e6cb4970aeddb18bd4b23;hp=8ef2665631b9fbbca860ceb0de1c1643d55d0abd;hpb=9383f4c3c6f9cfab2d658701ba66e2b54cd68bea;p=lyx.git

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index 8ef2665631..644f26e738 100644
--- a/src/PDFOptions.cpp
+++ b/src/PDFOptions.cpp
@@ -12,15 +12,17 @@
 
 #include "PDFOptions.h"
 
+#include "Lexer.h"
+
 #include "support/convert.h"
-#include "support/lstrings.h"
 #include "support/debug.h"
-#include "Lexer.h"
+#include "support/lstrings.h"
 
 #include <sstream>
 #include <string>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
@@ -49,6 +51,7 @@ bool PDFOptions::empty() const
 		&& pdfusetitle == x.pdfusetitle;
 }
 
+
 void PDFOptions::writeFile(ostream & os) const
 {
 	os << "\\use_hyperref " << convert<string>(use_hyperref) << '\n';
@@ -84,14 +87,11 @@ void PDFOptions::writeFile(ostream & os) const
 		os << "\\pdf_quoted_options \"" << quoted_options << "\"\n";
 }
 
-void PDFOptions::writeLaTeX(odocstream & os, bool hyper_required) const
+
+void PDFOptions::writeLaTeX(odocstream & os, bool hyperref_already_provided) const
 {
-	if (!use_hyperref && !hyper_required)
-		return;
-	
 	string opt;
 	
-	opt = "\\usepackage[";
 	// since LyX uses unicode, also set the PDF strings to unicode strings with the
 	// hyperref option "unicode"
 	opt += "unicode=true, ";
@@ -123,8 +123,7 @@ void PDFOptions::writeLaTeX(odocstream & os, bool hyper_required) const
 	if (!pagemode.empty())
 		opt += "pdfpagemode=" + pagemode + ',';
 	
-	opt = support::rtrim(opt,",");
-	opt += "]\n {hyperref}\n";
+
 
 	// load the pdftitle etc. as hypersetup, otherwise you'll get
 	// LaTeX-errors when using non-latin characters
@@ -139,11 +138,28 @@ void PDFOptions::writeLaTeX(odocstream & os, bool hyper_required) const
 		hyperset += "\n pdfkeywords={" + keywords + "},";
 	if (!quoted_options.empty()){
 		hyperset += "\n ";
-		hyperset += quoted_options_get();
+		hyperset += quoted_options;
 	}
-	hyperset = support::rtrim(hyperset,",");
-	if (!hyperset.empty())
-		opt += "\\hypersetup{" + hyperset + "}\n ";
+	hyperset = rtrim(hyperset,",");
+
+
+	// use in \\usepackage parameter as not all options can be handled inside \\hypersetup
+	if (!hyperref_already_provided) {
+		opt = rtrim(opt,",");
+		opt = "\\usepackage[" + opt + "]\n {hyperref}\n";
+
+		if (!hyperset.empty())
+			opt += "\\hypersetup{" + hyperset + "}\n ";
+	} else
+		// only in case hyperref is already loaded by the current text class
+		// try to put it into hyperset
+		//
+		// FIXME: this still does not fix the cases where hyperref is loaded
+		//        and the option is active only when part of usepackage parameter
+		//        (e.g. pdfusetitle).
+		{
+			opt = "\\hypersetup{" + opt + hyperset + "}\n ";
+		}
 	
 	// FIXME UNICODE
 	os << from_utf8(opt);
@@ -193,12 +209,13 @@ string PDFOptions::readToken(Lexer &lex, string const & token)
 }
 
 
-// prepared for check
-string PDFOptions::quoted_options_get() const
+// check the string from UI
+string PDFOptions::quoted_options_check(string const str) const
 {
-	return quoted_options;
+	return subst(str, "\n", "");
 }
 
+
 // set implicit settings for hyperref
 void PDFOptions::clear()
 {