From: Enrico Forestieri <forenr@lyx.org>
Date: Sat, 22 Dec 2012 22:06:18 +0000 (+0100)
Subject: Fix bug #8467: "Corrupted NFSS tables" error when Cyrillic character in an equation
X-Git-Tag: 2.0.6~181
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3eb7422bd6196f1ce9db7558d17f15ba054de566;p=features.git

Fix bug #8467: "Corrupted NFSS tables" error when Cyrillic character in an equation
(cherry picked from commit 25e4bf4b27b5b404e706ac7cf6f9f6c48cb57b33)

Conflicts:

	src/BufferParams.cpp
---

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 6c706479e2..71620c37b9 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1389,15 +1389,27 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
 	// XeTeX and LuaTeX (with OS fonts) work without fontenc
 	if (font_encoding() != "default" && language->lang() != "japanese"
 	    && !useNonTeXFonts && !tclass.provides("fontenc")) {
+		docstring extra_encoding;
+		if (features.mustProvide("textgreek"))
+			extra_encoding += from_ascii("LGR");
+		if (features.mustProvide("textcyr")) {
+			if (!extra_encoding.empty())
+				extra_encoding.push_back(',');
+			extra_encoding += from_ascii("T2A");
+		}
+		if (!extra_encoding.empty() && !font_encoding().empty())
+			extra_encoding.push_back(',');
 		size_t fars = language_options.str().find("farsi");
 		size_t arab = language_options.str().find("arabic");
 		if (language->lang() == "arabic_arabi"
 			|| language->lang() == "farsi" || fars != string::npos
 			|| arab != string::npos) {
-			os << "\\usepackage[" << from_ascii(font_encoding())
+			os << "\\usepackage[" << extra_encoding
+			   << from_ascii(font_encoding())
 			   << ",LFE,LAE]{fontenc}\n";
 		} else {
-			os << "\\usepackage[" << from_ascii(font_encoding())
+			os << "\\usepackage[" << extra_encoding
+			   << from_ascii(font_encoding())
 			   << "]{fontenc}\n";
 		}
 	}
diff --git a/status.20x b/status.20x
index 0ce3ebe742..c9746f65fa 100644
--- a/status.20x
+++ b/status.20x
@@ -83,6 +83,9 @@ What's new
 
 - Fix crash while exporting document with images to xhtml from the command-line
 
+- In order to avoid NFSS problems with certain font packages, load the needed
+  font encodings when inserting cyrillic and/or greek characters (bug 8467).
+
 
 * USER INTERFACE