From: Günter Milde <milde@lyx.org>
Date: Sat, 2 Mar 2019 19:24:05 +0000 (+0100)
Subject: Fix/simplify "if" clause for application of \textcyrrillic or \textgreek.
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~2527
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=68b6198d635e2448c89c3f85caf146fd72951f8c;p=features.git

Fix/simplify "if" clause for application of \textcyrrillic or \textgreek.

Also with Xe/LuaTeX only required with non-native font encodings.
---

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 0ad14ce353..27aecb5eae 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -924,8 +924,7 @@ int Paragraph::Private::latexSurrogatePair(BufferParams const & bparams,
 		length -= pos;
 		latex2 = latex2.substr(pos, length);
 		// and place it before the accent macro if required (#6463)
-		if (Encodings::needsScriptWrapper(script, fontenc)
-			|| runparams.isFullUnicode()) {
+		if (Encodings::needsScriptWrapper(script, fontenc)) {
 			scriptmacro = from_ascii("\\" + script + "{");
 			cb = from_ascii("}");
 		}
@@ -1010,10 +1009,8 @@ int Paragraph::Private::writeScriptChars(BufferParams const & bparams,
 	int length = brace2;
 	bool closing_brace = true;
 	// We only need the script macro with non-native font encodings
-	// and with XeTeX/LuaTeX (with TeX fonts)
-	if (!Encodings::needsScriptWrapper(script, fontenc)
-	    && !runparams.isFullUnicode()) {
-		// Correct font encoding is being used, so we can avoid \text[greek|cyr].
+	if (!Encodings::needsScriptWrapper(script, fontenc)) {
+		// Correct font encoding is being used, so we can avoid \text(greek|cyrrillic).
 		pos = brace1 + 1;
 		length -= pos;
 		closing_brace = false;