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

[lyx.git] / src / LaTeXFeatures.cpp

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index a29ee11f7b4fbffe668cb721ef08e88722aea4d8..cf85ec564880e4ee7a45761877088ec115d4e162 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -373,12 +373,13 @@ void LaTeXFeatures::useLanguage(Language const * lang)
                UsedLanguages_.insert(lang);
        if (lang->lang() == "vietnamese")
                require("vietnamese");
-       else if (lang->lang() == "japanese")
-               require("japanese");
        // CJK languages do not have a babel name.
        // They use the CJK package
        if (lang->encoding()->package() == Encoding::CJK)
                require("CJK");
+       // japanese package is special
+       if (lang->encoding()->package() == Encoding::japanese)
+               require("japanese");
 }
 
 
@@ -420,7 +421,8 @@ set<string> LaTeXFeatures::getEncodingSet(string const & doc_encoding) const
        LanguageList::const_iterator end = UsedLanguages_.end();
        for (; it != end; ++it)
                if ((*it)->encoding()->latexName() != doc_encoding &&
-                   (*it)->encoding()->package() == Encoding::inputenc)
+                   ((*it)->encoding()->package() == Encoding::inputenc
+                    || (*it)->encoding()->package() == Encoding::japanese))
                        encodings.insert((*it)->encoding()->latexName());
        return encodings;
 }
@@ -469,10 +471,11 @@ char const * simplefeatures[] = {
        "endnotes",
        "ifthen",
        "amsthm",
-       "listings",
+       // listings is handled in BufferParams.cpp
        "bm",
        "pdfpages",
-       "relsize"
+       "relsize",
+       "amscd"
 };
 
 int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
@@ -582,7 +585,7 @@ string const LaTeXFeatures::getPackages() const
 
        // setspace.sty
        if (mustProvide("setspace") && !tclass.provides("SetSpace"))
-    packages << "\\usepackage{setspace}\n";
+               packages << "\\usepackage{setspace}\n";
 
        // amssymb.sty
        if (mustProvide("amssymb")
@@ -596,7 +599,10 @@ string const LaTeXFeatures::getPackages() const
                packages << "\\usepackage{esint}\n";
 
        // natbib.sty
-       if (mustProvide("natbib")) {
+       // Some classes load natbib themselves, but still allow (or even require)
+       // plain numeric citations (ReVTeX is such a case, see bug 5182).
+       // This special case is indicated by the "natbib-internal" key.
+       if (mustProvide("natbib") && !tclass.provides("natbib-internal")) {
                packages << "\\usepackage[";
                if (params_.citeEngine() == ENGINE_NATBIB_NUMERICAL)
                        packages << "numbers";