Paragraph::inInset() shall not be used if the owner inset was not initialized. Make...

[lyx.git] / src / BufferParams.cpp

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 7c56e0058c23f500c6a9c36e40b03e26fd621246..2b4e937da3861ab81d32c9492693e0f895a8d194 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1016,17 +1016,18 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
                                language_options << ',';
                        language_options << language->babel();
                }
-               // if Vietnamese is used, babel must directly be loaded with the
-               // language options, not in the class options, see
+               // if Vietnamese is used, babel must directly be loaded
+               // with language options, not in the class options, see
                // http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg129417.html
                size_t viet = language_options.str().find("vietnam");
                // viet = string::npos when not found
-               // if Japanese is used, babel must directly be loaded with the
-               // language options, not in the class options, see
+               // if Japanese is used, babel must directly be loaded
+               // with language options, not in the class options, see
                // http://bugzilla.lyx.org/show_bug.cgi?id=4597#c4
                size_t japan = language_options.str().find("japanese");
                // japan = string::npos when not found
-               if (lyxrc.language_global_options && !language_options.str().empty()
+               if (lyxrc.language_global_options
+                       && !language_options.str().empty()
                        && viet == string::npos && japan == string::npos)
                        clsoptions << language_options.str() << ',';
        }
@@ -1062,9 +1063,11 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
 
        // set font encoding
        // this one is not per buffer
-       // for arabic_arabi and farsi we also need to load the LAE and LFE encoding
+       // for arabic_arabi and farsi we also need to load the LAE and
+       // LFE encoding
        if (lyxrc.fontenc != "default" && language->lang() != "japanese") {
-               if (language->lang() == "arabic_arabi" || language->lang() == "farsi") {
+               if (language->lang() == "arabic_arabi"
+                   || language->lang() == "farsi") {
                        os << "\\usepackage[" << from_ascii(lyxrc.fontenc)
                           << ",LFE,LAE]{fontenc}\n";
                        texrow.newline();
@@ -1078,13 +1081,20 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
        // handle inputenc etc.
        writeEncodingPreamble(os, features, texrow);
 
-       if (!listings_params.empty()) {
+       if (!listings_params.empty() || features.isRequired("listings")) {
                os << "\\usepackage{listings}\n";
                texrow.newline();
+       }
+       if (!listings_params.empty()) {
                os << "\\lstset{";
-               // do not test validity because listings_params is supposed to be valid
-               string par = InsetListingsParams(listings_params).separatedParams(true);
-               os << from_ascii(par);
+               // do not test validity because listings_params is 
+               // supposed to be valid
+               string par =
+                       InsetListingsParams(listings_params).separatedParams(true);
+               // we can't support all packages, but we should load the color package
+               if (par.find("\\color", 0) != string::npos)
+                       features.require("color");
+               os << from_utf8(par);
                // count the number of newlines
                for (size_t i = 0; i < par.size(); ++i)
                        if (par[i] == '\n')
@@ -1867,8 +1877,8 @@ void BufferParams::writeEncodingPreamble(odocstream & os,
                set<string> encodings =
                        features.getEncodingSet(doc_encoding);
 
-               // If the encodings EUC-JP-plain, JIS-plain, or SJIS-plain are used, the
-               // package inputenc must be omitted. Therefore set the encoding to empty.
+               // If the "japanese" package (i.e. pLaTeX) is used,
+               // inputenc must be omitted.
                // see http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg129680.html
                if (package == Encoding::japanese)
                     features.require("japanese");
@@ -1916,9 +1926,10 @@ void BufferParams::writeEncodingPreamble(odocstream & os,
                }
        }
 
-       // The encoding "armscii8" is only available when the package "armtex" is loaded.
-       // armscii8 is used for Armenian.
-       if (language->encoding()->latexName() == "armscii8" || inputenc == "armscii8") {
+       // The encoding "armscii8" (for Armenian) is only available when
+       // the package "armtex" is loaded.
+       if (language->encoding()->latexName() == "armscii8"
+           || inputenc == "armscii8") {
                os << "\\usepackage{armtex}\n";
                texrow.newline();
        }