Convenience LFUN to split an environment

[features.git] / src / BufferParams.cpp

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 37fa651b64b80476ee904885e121dcb9e983ef8b..4a009aa009ff51a4f66716d22a339a14a8e654f6 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1447,15 +1447,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 && !features.isProvided("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";
                }
        }