X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCounters.cpp;h=1349c3dcbe300656c522682514850ed9c4363fe0;hb=8ea66efe16ad109a5c107716185fb82bbebca8c8;hp=d75243e703773e2cfb7b69a01f24e75e9ea3eaf2;hpb=5eb7add4092708a5a0dbabf303164be624aff72f;p=lyx.git

diff --git a/src/Counters.cpp b/src/Counters.cpp
index d75243e703..1349c3dcbe 100644
--- 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_;
@@ -157,6 +166,13 @@ Counter::StringMap & Counter::flatLabelStrings(bool in_appendix) const
 }
 
 
+Counters::Counters() : appendix_(false), subfloat_(false)
+{
+	layout_stack_.push_back(0);
+	counter_stack_.push_back(from_ascii(""));
+}
+
+
 void Counters::newCounter(docstring const & newc,
 			  docstring const & masterc, 
 			  docstring const & ls,
@@ -269,6 +285,7 @@ void Counters::reset()
 		it->second.reset();
 	counter_stack_.clear();
 	counter_stack_.push_back(from_ascii(""));
+	layout_stack_.clear();
 	layout_stack_.push_back(0);
 }
 
@@ -286,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();
@@ -554,7 +587,8 @@ docstring Counters::prettyCounter(docstring const & name,
 	Counter const & ctr = it->second;
 
 	docstring const value = theCounter(name, lang);
-	docstring const & format = ctr.prettyFormat();
+	docstring const & format =
+	    translateIfPossible(ctr.prettyFormat(), lang);
 	if (format.empty())
 		return value;
 	return subst(format, from_ascii("##"), value);
@@ -598,14 +632,7 @@ void Counters::setActiveLayout(Layout const & lay)
 
 void Counters::beginEnvironment()
 {
-	docstring cnt = counter_stack_.back();
-	counter_stack_.push_back(cnt);
-	deque<docstring>::const_iterator it = counter_stack_.begin();
-	deque<docstring>::const_iterator en = counter_stack_.end();
-//	docstring d;
-//	for (; it != en; ++it)
-//		d += " --> " + *it;
-//	LYXERR0(counter_stack_.size() << ": " << d);
+	counter_stack_.push_back(counter_stack_.back());
 }
 
 
@@ -613,12 +640,6 @@ void Counters::endEnvironment()
 {
 	LASSERT(!counter_stack_.empty(), return);
 	counter_stack_.pop_back();
-	deque<docstring>::const_iterator it = counter_stack_.begin();
-	deque<docstring>::const_iterator en = counter_stack_.end();
-//	docstring d;
-//	for (; it != en; ++it)
-//		d += " --> " + *it;
-//	LYXERR0(counter_stack_.size() << ": " << d);
 }