* do not ignore "requires" field in MathMacro

[lyx.git] / src / BufferParams.cpp

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 809fa85f080aafd71dbae4bf1b5d5bbe9771b320..052da14fd4c14d8604f18c89f46acc8502c76acf 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -898,7 +898,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
                // thailatex does not use the inputenc package, but sets up
                // babel directly for tis620-0 encoding, therefore we must
                // not request inputenc for tis620-0 encoding
-               if (!encodings.empty() || doc_encoding != "tis620-0") {
+               if (!encodings.empty() && doc_encoding != "tis620-0") {
                        os << "\\usepackage[";
                        std::set<string>::const_iterator it = encodings.begin();
                        std::set<string>::const_iterator const end = encodings.end();
@@ -916,13 +916,21 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
                        os << "]{inputenc}\n";
                        texrow.newline();
                }
+       // utf8-plain is for XeTeX users (inputenc not desired)
        } else if (inputenc != "default" && inputenc != "tis620-0" &&
-                  inputenc != "ascii") {
+                  inputenc != "ascii" &&  inputenc != "utf8-plain") {
                os << "\\usepackage[" << from_ascii(inputenc)
                   << "]{inputenc}\n";
                texrow.newline();
        }
 
+       // The encoding "armscii8" is only available when the package "armtex" is loaded.
+       // armscii8 is used for Armenian.
+       if (language->encoding()->latexName() == "armscii8" || inputenc == "armscii8") {
+               os << "\\usepackage{armtex}\n";
+               texrow.newline();
+       }
+
        if (use_geometry || nonstandard_papersize) {
                os << "\\usepackage{geometry}\n";
                texrow.newline();