X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FPDFOptions.cpp;h=222be517e836779ad9502d8f9815ef3117d3eaaa;hb=937a52b64d184c4d9ac69a842fc9a6ed0dcee40b;hp=436e8f2e195e5de5e123cba0a288ff3f62ec0427;hpb=c6648aaeb9d9b870aa65a48fe649388198a0f5bd;p=lyx.git

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index 436e8f2e19..222be517e8 100644
--- a/src/PDFOptions.cpp
+++ b/src/PDFOptions.cpp
@@ -102,7 +102,7 @@ void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
 
 	// only use the hyperref settings if hyperref is enabled by the user
 	// see bug #7052
-	if(use_hyperref) {
+	if (use_hyperref) {
 		// try to extract author and title from document when none is
 		// explicitly given
 		if (pdfusetitle && title.empty() && author.empty())
@@ -141,7 +141,6 @@ void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
 			hyperset += quoted_options;
 		}
 		hyperset = rtrim(hyperset,",");
-
 	}
 
 	// check if the hyperref settings use an encoding that exceeds
@@ -151,7 +150,7 @@ void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
 	bool need_unicode = false;
 	if (enc) {
 		for (size_t n = 0; n < hs.size(); ++n) {
-			if (enc->latexChar(hs[n], true) != docstring(1, hs[n]))
+			if (!enc->encodable(hs[n]))
 				need_unicode = true;
 		}
 	}
@@ -170,7 +169,7 @@ void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
 		// FIXME: rename in this case the PDF settings dialog checkbox
 		//  label from "Use Hyperref" to "Customize Hyperref Settings"
 		//  as discussd in bug #6293
-		opt = "\\hypersetup{" + opt + hyperset + "}\n";
+		opt = "\\hypersetup{" + rtrim(opt + hyperset, ",") + "}\n";
 	}
 
 	// hyperref expects utf8!
@@ -179,9 +178,19 @@ void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
 		os << "\\inputencoding{utf8}\n"
 		   << setEncoding("UTF-8");
 	}
-	// FIXME: handle the case that hyperref is loaded by the document class and
-	// hyperset is empty, see bug #7048
-	if (!(hyperref_already_provided && hyperset.empty()))
+	// If hyperref is loaded by the document class, we output
+	// \hypersetup \AtBeginDocument if hypersetup is not (yet)
+	// defined. In this case, the class loads hyperref late
+	// (see bug #7048).
+	if (hyperref_already_provided && !opt.empty()) {
+		os << "\\ifx\\hypersetup\\undefined\n"
+		   << "  \\AtBeginDocument{%\n    "
+		   << from_utf8(opt)
+		   << "  }\n"
+		   << "\\else\n  "
+		   << from_utf8(opt)
+		   << "\\fi\n";
+	} else
 		os << from_utf8(opt);
 
 	if (need_unicode && enc && enc->iconvName() != "UTF-8"
@@ -234,7 +243,7 @@ string PDFOptions::readToken(Lexer &lex, string const & token)
 
 
 // check the string from UI
-string PDFOptions::quoted_options_check(string const str) const
+string PDFOptions::quoted_options_check(string const & str) const
 {
 	return subst(str, "\n", "");
 }