X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FPDFOptions.cpp;h=7de277c3212162655a60fcd7b565c43dae64e35f;hb=4e69b9bac5e970572b9cf9169e3db9060c47e3b6;hp=33b2488223ee09e7548b8aeef128c5284e4755f1;hpb=0bb6e39ef1f7b4c5d023e8d0cdb444795b11ca4f;p=lyx.git

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index 33b2488223..7de277c321 100644
--- a/src/PDFOptions.cpp
+++ b/src/PDFOptions.cpp
@@ -150,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;
 		}
 	}
@@ -169,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!
@@ -178,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"