From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sun, 5 Apr 2020 13:23:22 +0000 (+0200)
Subject: Strip polyglossia options from pdf string
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3d1d18be27a74b789c051c4892169a438097f617;p=features.git

Strip polyglossia options from pdf string

Fixes #11813
---

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index ec11ac2c88..4be7e21197 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1858,6 +1858,7 @@ Buffer::ExportStatus Buffer::writeLaTeXSource(otexstream & os,
 	// This is only set once per document (in master)
 	if (!runparams.is_child) {
 		runparams.use_polyglossia = features.usePolyglossia();
+		runparams.use_hyperref = features.isRequired("hyperref");
 		runparams.use_CJK = features.mustProvide("CJK");
 	}
 	LYXERR(Debug::LATEX, "  Buffer validation done.");
@@ -4108,6 +4109,7 @@ unique_ptr<TexRow> Buffer::getSourceCode(odocstream & os, string const & format,
 			LaTeXFeatures features(*this, params(), runparams);
 			validate(features);
 			runparams.use_polyglossia = features.usePolyglossia();
+			runparams.use_hyperref = features.isRequired("hyperref");
 			// latex or literate
 			otexstream ots(os);
 			// output above
diff --git a/src/Font.cpp b/src/Font.cpp
index a6580fda21..c344ac9ea8 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -228,8 +228,13 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 	    && language() != prev.language()) {
 		if (!language()->polyglossia().empty()) {
 			string tmp = "\\text" + language()->polyglossia();
-			if (!language()->polyglossiaOpts().empty())
+			if (!language()->polyglossiaOpts().empty()) {
 				tmp += "[" + language()->polyglossiaOpts() + "]";
+				if (runparams.use_hyperref && runparams.moving_arg)
+					// We need to strip the command for
+					// the pdf string, see #11813
+					tmp = "\\texorpdfstring{" + tmp + "}{}";
+			}
 			tmp += "{";
 			os << from_ascii(tmp);
 			count += tmp.length();
diff --git a/src/OutputParams.cpp b/src/OutputParams.cpp
index d26955e69a..d10de5ed74 100644
--- a/src/OutputParams.cpp
+++ b/src/OutputParams.cpp
@@ -22,7 +22,7 @@ OutputParams::OutputParams(Encoding const * enc)
 	: flavor(LATEX), math_flavor(NotApplicable), nice(false), is_child(false),
 	  moving_arg(false), intitle(false), inbranch(false), inulemcmd(0),
 	  local_font(0),master_language(0), encoding(enc), free_spacing(false),
-	  use_babel(false), use_polyglossia(false), use_CJK(false),
+	  use_babel(false), use_polyglossia(false), use_hyperref(false), use_CJK(false),
 	  use_indices(false), use_japanese(false), linelen(0), depth(0),
 	  exportdata(new ExportData), postpone_fragile_stuff(false), inDisplayMath(false),
 	  wasDisplayMath(false), inComment(false), openbtUnit(false), only_childbibs(false),
diff --git a/src/OutputParams.h b/src/OutputParams.h
index 5503d8b7cd..5aa6080de7 100644
--- a/src/OutputParams.h
+++ b/src/OutputParams.h
@@ -177,6 +177,10 @@ public:
 	*/
 	bool use_polyglossia;
 
+	/** Do we use hyperref?
+	*/
+	bool use_hyperref;
+
 	/// Do we use the CJK package?
 	bool use_CJK;