After a hiatus, I'm returning to the rewrite of InsetCommandParams, the purpose of...

[lyx.git] / src / LaTeXFeatures.cpp

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index f192813d73bfa41f8c6b34b11799038668cec89d..903b87c72244b05d53dc48e2027af5489aa0de17 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -18,7 +18,6 @@
 
 #include "Color.h"
 #include "BufferParams.h"
-#include "support/debug.h"
 #include "Encoding.h"
 #include "Floating.h"
 #include "FloatList.h"
@@ -28,9 +27,11 @@
 #include "LyXRC.h"
 #include "TextClass.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
+#include "support/lstrings.h"
 
 using namespace std;
 using namespace lyx::support;
@@ -302,7 +303,7 @@ static string const newlyxcommand_def =
 //
 /////////////////////////////////////////////////////////////////////
 
-LaTeXFeatures::PackagesList LaTeXFeatures::packages_;
+LaTeXFeatures::Packages LaTeXFeatures::packages_;
 
 
 LaTeXFeatures::LaTeXFeatures(Buffer const & b, BufferParams const & p,
@@ -322,10 +323,13 @@ bool LaTeXFeatures::useBabel() const
 
 void LaTeXFeatures::require(string const & name)
 {
-       if (isRequired(name))
-               return;
+       features_.insert(name);
+}
+
 
-       features_.push_back(name);
+void LaTeXFeatures::require(set<string> const & names)
+{
+       features_.insert(names.begin(), names.end());
 }
 
 
@@ -353,11 +357,7 @@ void LaTeXFeatures::getAvailable()
                        finished = true;
                        break;
                default:
-                       string const name = lex.getString();
-                       PackagesList::const_iterator begin = packages_.begin();
-                       PackagesList::const_iterator end   = packages_.end();
-                       if (find(begin, end, name) == end)
-                               packages_.push_back(name);
+                       packages_.insert(lex.getString());
                }
        }
 }
@@ -375,20 +375,19 @@ void LaTeXFeatures::useLayout(docstring const & layoutname)
                return;
        }
 
-       TextClass const & tclass = params_.getTextClass();
+       TextClass const & tclass = params_.textClass();
        if (tclass.hasLayout(layoutname)) {
                // Is this layout already in usedLayouts?
-               list<docstring>::const_iterator cit = usedLayouts_.begin();
-               list<docstring>::const_iterator end = usedLayouts_.end();
-               for (; cit != end; ++cit) {
-                       if (layoutname == *cit)
-                               return;
-               }
+               if (find(usedLayouts_.begin(), usedLayouts_.end(), layoutname) 
+                   != usedLayouts_.end())
+                       return;
+
+               Layout const & layout = *tclass[layoutname];
+               require(layout.requires());
 
-               LayoutPtr const & lyt = tclass[layoutname];
-               if (!lyt->depends_on().empty()) {
+               if (!layout.depends_on().empty()) {
                        ++level;
-                       useLayout(lyt->depends_on());
+                       useLayout(layout.depends_on());
                        --level;
                }
                usedLayouts_.push_back(layoutname);
@@ -404,32 +403,31 @@ void LaTeXFeatures::useLayout(docstring const & layoutname)
 
 bool LaTeXFeatures::isRequired(string const & name) const
 {
-       return find(features_.begin(), features_.end(), name) != features_.end();
+       return features_.find(name) != features_.end();
 }
 
 
 bool LaTeXFeatures::mustProvide(string const & name) const
 {
-       return isRequired(name) && !params_.getTextClass().provides(name);
+       return isRequired(name) && !params_.textClass().provides(name);
 }
 
 
 bool LaTeXFeatures::isAvailable(string const & name)
 {
-       string n = name;
        if (packages_.empty())
                getAvailable();
-       size_t loc = n.rfind(".sty");
-       if (loc == n.length() - 4) 
-               n = n.erase(name.length() - 4);
-       return find(packages_.begin(), packages_.end(), n) != packages_.end();
+       string n = name;
+       if (suffixIs(n, ".sty"))
+               n.erase(name.length() - 4);
+       return packages_.find(n) != packages_.end();
 }
 
 
 void LaTeXFeatures::addPreambleSnippet(string const & preamble)
 {
-       FeaturesList::const_iterator begin = preamble_snippets_.begin();
-       FeaturesList::const_iterator end   = preamble_snippets_.end();
+       SnippetList::const_iterator begin = preamble_snippets_.begin();
+       SnippetList::const_iterator end   = preamble_snippets_.end();
        if (find(begin, end, preamble) == end)
                preamble_snippets_.push_back(preamble);
 }
@@ -441,7 +439,7 @@ void LaTeXFeatures::useFloat(string const & name)
        // We only need float.sty if we use non builtin floats, or if we
        // use the "H" modifier. This includes modified table and
        // figure floats. (Lgb)
-       Floating const & fl = params_.getTextClass().floats().getType(name);
+       Floating const & fl = params_.textClass().floats().getType(name);
        if (!fl.type().empty() && !fl.builtin()) {
                require("float");
        }
@@ -528,6 +526,7 @@ char const * simplefeatures[] = {
        "calc",
        "units",
        "tipa",
+       "tipx",
        "framed",
        "soul",
        "textcomp",
@@ -556,7 +555,7 @@ int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
 string const LaTeXFeatures::getPackages() const
 {
        ostringstream packages;
-       TextClass const & tclass = params_.getTextClass();
+       TextClass const & tclass = params_.textClass();
 
        // FIXME: currently, we can only load packages and macros known
        // to LyX.
@@ -713,8 +712,8 @@ string const LaTeXFeatures::getMacros() const
 
        if (!preamble_snippets_.empty())
                macros << '\n';
-       FeaturesList::const_iterator pit  = preamble_snippets_.begin();
-       FeaturesList::const_iterator pend = preamble_snippets_.end();
+       SnippetList::const_iterator pit  = preamble_snippets_.begin();
+       SnippetList::const_iterator pend = preamble_snippets_.end();
        for (; pit != pend; ++pit)
                macros << *pit << '\n';
 
@@ -829,7 +828,7 @@ string const LaTeXFeatures::getBabelOptions() const
 docstring const LaTeXFeatures::getTClassPreamble() const
 {
        // the text class specific preamble
-       TextClass const & tclass = params_.getTextClass();
+       TextClass const & tclass = params_.textClass();
        odocstringstream tcpreamble;
 
        tcpreamble << tclass.preamble();
@@ -904,7 +903,7 @@ BufferParams const & LaTeXFeatures::bufferParams() const
 
 void LaTeXFeatures::getFloatDefinitions(ostream & os) const
 {
-       FloatList const & floats = params_.getTextClass().floats();
+       FloatList const & floats = params_.textClass().floats();
 
        // Here we will output the code to create the needed float styles.
        // We will try to do this as minimal as possible.