The logic of the endParagraph() routine is wrong. We should first

[lyx.git] / src / LaTeXFeatures.cpp

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 4caa066688ddf07a9e9a31771aa94dc2987746ee..f1d315cae84e3341ebea09efdff2715cce1b9aeb 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -575,6 +575,8 @@ char const * simplefeatures[] = {
        "mathdesign",
        "mathrsfs",
        "mathabx",
+       "mathtools",
+       "cancel",
        "ascii",
        "url",
        "covington",
@@ -690,7 +692,7 @@ string const LaTeXFeatures::getPackages() const
                packages << amsPackages;
 
        // fixltx2e must be loaded after amsthm, since amsthm produces an error with
-       // the redefined \[ command (bug 7233). Load is as early as possible, since
+       // the redefined \[ command (bug 7233). Load it as early as possible, since
        // other packages might profit from it.
        if (mustProvide("fixltx2e"))
                packages << "\\usepackage{fixltx2e}\n";
@@ -704,24 +706,27 @@ string const LaTeXFeatures::getPackages() const
        // integral symbols from wasysym and amsmath.
        // See http://www.lyx.org/trac/ticket/1942
        if (mustProvide("wasysym") &&
-           (params_.use_esint != BufferParams::package_off || !isRequired("esint")))
+           params_.use_package("wasysym") != BufferParams::package_off &&
+           (params_.use_package("esint") != BufferParams::package_off || !isRequired("esint")))
                packages << "\\usepackage{wasysym}\n";
 
        // accents must be loaded after amsmath
-       if (mustProvide("accents"))
+       if (mustProvide("accents") &&
+           params_.use_package("accents") != BufferParams::package_off)
                packages << "\\usepackage{accents}\n";
 
        // mathdots must be loaded after amsmath
        if (mustProvide("mathdots") &&
-               params_.use_mathdots != BufferParams::package_off)
+               params_.use_package("mathdots") != BufferParams::package_off)
                packages << "\\usepackage{mathdots}\n";
 
        // yhmath must be loaded after amsmath
-       if (mustProvide("yhmath"))
+       if (mustProvide("yhmath") &&
+           params_.use_package("yhmath") != BufferParams::package_off)
                packages << "\\usepackage{yhmath}\n";
 
        if (mustProvide("undertilde") &&
-               params_.use_undertilde != BufferParams::package_off)
+               params_.use_package("undertilde") != BufferParams::package_off)
                packages << "\\usepackage{undertilde}\n";
 
        // [x]color and pdfcolmk are handled in getColorOptions() above
@@ -756,7 +761,7 @@ string const LaTeXFeatures::getPackages() const
        // esint must be after amsmath and wasysym, since it will redeclare
        // inconsistent integral symbols
        if (mustProvide("esint") &&
-           params_.use_esint != BufferParams::package_off)
+           params_.use_package("esint") != BufferParams::package_off)
                packages << "\\usepackage{esint}\n";
 
        // natbib.sty
@@ -765,7 +770,7 @@ string const LaTeXFeatures::getPackages() const
        // 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)
+               if (params_.citeEngineType() == ENGINE_TYPE_NUMERICAL)
                        packages << "numbers";
                else
                        packages << "authoryear";
@@ -795,9 +800,8 @@ string const LaTeXFeatures::getPackages() const
                packages << "\\PassOptionsToPackage{normalem}{ulem}\n"
                            "\\usepackage{ulem}\n";
 
-       if (params_.use_mhchem == BufferParams::package_on ||
-           (mustProvide("mhchem") &&
-            params_.use_mhchem != BufferParams::package_off))
+       if (mustProvide("mhchem") &&
+           params_.use_package("mhchem") != BufferParams::package_off)
                packages << "\\PassOptionsToPackage{version=3}{mhchem}\n"
                            "\\usepackage{mhchem}\n";
 
@@ -1050,7 +1054,7 @@ string const LaTeXFeatures::loadAMSPackages() const
                tmp << "\\usepackage{amsthm}\n";
 
        if (mustProvide("amsmath")
-           && params_.use_amsmath != BufferParams::package_off) {
+           && params_.use_package("amsmath") != BufferParams::package_off) {
                tmp << "\\usepackage{amsmath}\n";
        } else {
                // amsbsy and amstext are already provided by amsmath
@@ -1061,7 +1065,7 @@ string const LaTeXFeatures::loadAMSPackages() const
        }
 
        if (mustProvide("amssymb")
-           || params_.use_amsmath == BufferParams::package_on)
+           || params_.use_package("amsmath") == BufferParams::package_on)
                tmp << "\\usepackage{amssymb}\n";
 
        return tmp.str();
@@ -1121,10 +1125,13 @@ docstring const LaTeXFeatures::getTClassHTMLPreamble() const
 }
 
 
-docstring const LaTeXFeatures::getTClassHTMLStyles() const {
+docstring const LaTeXFeatures::getTClassHTMLStyles() const
+{
        DocumentClass const & tclass = params_.documentClass();
        odocstringstream tcpreamble;
 
+       tcpreamble << tclass.htmlstyles();
+
        list<docstring>::const_iterator cit = usedLayouts_.begin();
        list<docstring>::const_iterator end = usedLayouts_.end();
        for (; cit != end; ++cit)
@@ -1149,6 +1156,15 @@ docstring const getFloatI18nPreamble(docstring const & type,
                        docstring const & name, Language const * lang,
                        Encoding const & enc, bool const polyglossia)
 {
+       // Check whether name can be encoded in the buffer encoding
+       bool encodable = true;
+       for (size_t i = 0; i < name.size(); ++i) {
+               if (!enc.encodable(name[i])) {
+                       encodable = false;
+                       break;
+               }
+       }
+
        docstring const language = polyglossia ? from_ascii(lang->polyglossia())
                                               : from_ascii(lang->babel());
        docstring const langenc = from_ascii(lang->encoding()->iconvName());
@@ -1156,9 +1172,9 @@ docstring const getFloatI18nPreamble(docstring const & type,
        docstring const bufenc = from_ascii(enc.iconvName());
        docstring const s1 = docstring(1, 0xF0000);
        docstring const s2 = docstring(1, 0xF0001);
-       docstring const translated = (langenc == bufenc) ? name
+       docstring const translated = encodable ? name
                : from_ascii("\\inputencoding{") + texenc + from_ascii("}")
-                       + s1 + langenc + s2 + translated + s1 + bufenc + s2;
+                       + s1 + langenc + s2 + name + s1 + bufenc + s2;
 
        odocstringstream os;
        os << "\\addto\\captions" << language