Move bind file format tag to LyXAction.cpp, and rename it.

[lyx.git] / src / Counters.cpp

diff --git a/src/Counters.cpp b/src/Counters.cpp
index c4ec31b017eb5db7c7d19526ee8cf859110b10a1..4960eed5be87c10617f53695f4ea27be359741ff 100644 (file)
--- a/src/Counters.cpp
+++ b/src/Counters.cpp
@@ -145,6 +145,15 @@ docstring const & Counter::master() const
 }
 
 
+bool Counter::checkAndRemoveMaster(docstring const & cnt)
+{
+       if (master_ != cnt)
+               return false;
+       master_ = docstring();
+       return true;
+}
+
+
 docstring const & Counter::labelString(bool in_appendix) const
 {
        return in_appendix ? labelstringappendix_ : labelstring_;
@@ -160,7 +169,7 @@ Counter::StringMap & Counter::flatLabelStrings(bool in_appendix) const
 Counters::Counters() : appendix_(false), subfloat_(false)
 {
        layout_stack_.push_back(0);
-       counter_stack_.push_back(0);
+       counter_stack_.push_back(from_ascii(""));
 }
 
 
@@ -294,6 +303,22 @@ void Counters::reset(docstring const & match)
 }
 
 
+bool Counters::remove(docstring const & cnt)
+{
+       bool retval = counterList_.erase(cnt);
+       if (!retval)
+               return false;
+       CounterList::iterator it = counterList_.begin();
+       CounterList::iterator end = counterList_.end();
+       for (; it != end; ++it) {
+               if (it->second.checkAndRemoveMaster(cnt))
+                       LYXERR(Debug::TCLASS, "Removed master counter `" +
+                                       to_utf8(cnt) + "' from counter: " + to_utf8(it->first));
+       }
+       return retval;
+}
+
+
 void Counters::copy(Counters & from, Counters & to, docstring const & match)
 {
        CounterList::iterator it = counterList_.begin();