Fix yet another thinko in the math grid paste code

[lyx.git] / src / TextClass.cpp

diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index 4058815d599e25fb1f4f46e757094380726c012d..91f68f729124df5327a9a7691c5c21d233d53ce6 100644 (file)
--- a/src/TextClass.cpp
+++ b/src/TextClass.cpp
@@ -62,7 +62,7 @@ namespace lyx {
 // You should also run the development/tools/updatelayouts.py script,
 // to update the format of all of our layout files.
 //
-int const LAYOUT_FORMAT = 80; // spitz: Requires for floats
+int const LAYOUT_FORMAT = 81; // rikiheck: GuiName for counters
 
 
 // Layout format for the current lyx file format. Controls which format is
@@ -72,20 +72,6 @@ int const LYXFILE_LAYOUT_FORMAT = LAYOUT_FORMAT;
 
 namespace {
 
-class LayoutNamesEqual : public unary_function<Layout, bool> {
-public:
-       LayoutNamesEqual(docstring const & name)
-               : name_(name)
-       {}
-       bool operator()(Layout const & c) const
-       {
-               return c.name() == name_;
-       }
-private:
-       docstring name_;
-};
-
-
 bool layout2layout(FileName const & filename, FileName const & tempfile,
                    int const format = LAYOUT_FORMAT)
 {
@@ -686,7 +672,7 @@ TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt)
                        lexrc.eatLine();
                        vector<string> const req
                                = getVectorFromString(lexrc.getString());
-                       requires_.insert(req.begin(), req.end());
+                       required_.insert(req.begin(), req.end());
                        break;
                }
 
@@ -913,7 +899,7 @@ TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt)
        // If we do not succeed, then it was not there, which means that
        // the textclass did not provide the definitions of the standard
        // insets. So we need to try to load them.
-       int erased = provides_.erase("stdinsets");
+       size_type const erased = provides_.erase("stdinsets");
        if (!erased) {
                FileName tmp = libFileSearch("layouts", "stdinsets.inc");
 
@@ -1569,11 +1555,13 @@ bool TextClass::readFloat(Lexer & lexrc)
                floatlist_.newFloat(fl);
                // each float has its own counter
                counters_.newCounter(from_ascii(type), from_ascii(within),
-                                     docstring(), docstring());
+                               docstring(), docstring(),
+                               bformat(_("%1$s (Float)"), _(name)));
                // also define sub-float counters
                docstring const subtype = "sub-" + from_ascii(type);
                counters_.newCounter(subtype, from_ascii(type),
-                                     "\\alph{" + subtype + "}", docstring());
+                               "\\alph{" + subtype + "}", docstring(),
+                                bformat(_("Sub-%1$s (Float)"), _(name)));
        }
        return getout;
 }
@@ -1613,10 +1601,7 @@ string const & TextClass::prerequisites(string const & sep) const
 bool TextClass::hasLayout(docstring const & n) const
 {
        docstring const name = n.empty() ? defaultLayoutName() : n;
-
-       return find_if(layoutlist_.begin(), layoutlist_.end(),
-                      LayoutNamesEqual(name))
-               != layoutlist_.end();
+       return getLayout(name) != nullptr;
 }
 
 
@@ -1633,10 +1618,8 @@ Layout const & TextClass::operator[](docstring const & name) const
 {
        LATTEST(!name.empty());
 
-       const_iterator it =
-               find_if(begin(), end(), LayoutNamesEqual(name));
-
-       if (it == end()) {
+       Layout const * c = getLayout(name);
+       if (!c) {
                LYXERR0("We failed to find the layout '" << name
                       << "' in the layout list. You MUST investigate!");
                for (auto const & lay : *this)
@@ -1647,7 +1630,7 @@ Layout const & TextClass::operator[](docstring const & name) const
                LASSERT(false, return dummy);
        }
 
-       return *it;
+       return *c;
 }
 
 
@@ -1656,9 +1639,8 @@ Layout & TextClass::operator[](docstring const & name)
        LATTEST(!name.empty());
        // Safe to continue, given what we do below.
 
-       iterator it = find_if(begin(), end(), LayoutNamesEqual(name));
-
-       if (it == end()) {
+       Layout * c = getLayout(name);
+       if (!c) {
                LYXERR0("We failed to find the layout '" << to_utf8(name)
                       << "' in the layout list. You MUST investigate!");
                for (auto const & lay : *this)
@@ -1668,10 +1650,10 @@ Layout & TextClass::operator[](docstring const & name)
                LATTEST(false);
                // we are here only in release mode
                layoutlist_.push_back(createBasicLayout(name, true));
-               it = find_if(begin(), end(), LayoutNamesEqual(name));
+               c = getLayout(name);
        }
 
-       return *it;
+       return *c;
 }
 
 
@@ -1682,9 +1664,9 @@ bool TextClass::deleteLayout(docstring const & name)
 
        LayoutList::iterator it =
                remove_if(layoutlist_.begin(), layoutlist_.end(),
-                         LayoutNamesEqual(name));
+                       [name](const Layout &c) { return c.name() == name; });
 
-       LayoutList::iterator end = layoutlist_.end();
+       LayoutList::iterator const end = layoutlist_.end();
        bool const ret = (it != end);
        layoutlist_.erase(it, end);
        return ret;
@@ -1725,6 +1707,30 @@ bool TextClass::load(string const & path) const
 }
 
 
+Layout const * TextClass::getLayout(docstring const & name) const
+{
+       LayoutList::const_iterator cit =
+               find_if(begin(), end(),
+                       [name](const Layout &c) { return c.name() == name; });
+       if (cit == layoutlist_.end())
+               return nullptr;
+
+       return &(*cit);
+}
+
+
+Layout * TextClass::getLayout(docstring const & name)
+{
+       LayoutList::iterator it =
+               find_if(layoutlist_.begin(), layoutlist_.end(),
+                       [name](const Layout &c) { return c.name() == name; });
+       if (it == layoutlist_.end())
+               return nullptr;
+
+       return &(*it);
+}
+
+
 bool DocumentClass::addLayoutIfNeeded(docstring const & n) const
 {
        if (hasLayout(n))