X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCounters.cpp;h=e73e2d89139c6da6a12d0308633980ee72779284;hb=4db3e641ed6765e005343010cb90ee8af26f8f99;hp=d7ef519ab8ced45cb288b14bf03f77f3c8d782cc;hpb=31fcb5c97eefa15a8729deb48914927e2b58ccf5;p=lyx.git

diff --git a/src/Counters.cpp b/src/Counters.cpp
index d7ef519ab8..e73e2d8913 100644
--- a/src/Counters.cpp
+++ b/src/Counters.cpp
@@ -109,6 +109,7 @@ bool Counter::read(Lexer & lex)
 	return getout;
 }
 
+
 void Counter::set(int v)
 {
 	value_ = v;
@@ -145,6 +146,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_;
@@ -251,7 +261,7 @@ void Counters::step(docstring const & ctr, UpdateType utype)
 
 	it->second.step();
 	if (utype == OutputUpdate) {
-		LASSERT(!counter_stack_.empty(), /* */);
+		LBUFERR(!counter_stack_.empty());
 		counter_stack_.pop_back();
 		counter_stack_.push_back(ctr);
 	}
@@ -283,7 +293,7 @@ void Counters::reset()
 
 void Counters::reset(docstring const & match)
 {
-	LASSERT(!match.empty(), /**/);
+	LASSERT(!match.empty(), return);
 
 	CounterList::iterator it = counterList_.begin();
 	CounterList::iterator end = counterList_.end();
@@ -294,6 +304,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();
@@ -338,7 +364,6 @@ char hebrewCounter(int const n)
 }
 
 
-
 // On the special cases, see http://mathworld.wolfram.com/RomanNumerals.html
 // and for a list of roman numerals up to and including 3999, see 
 // http://www.research.att.com/~njas/sequences/a006968.txt. (Thanks to Joost
@@ -451,7 +476,7 @@ docstring Counters::theCounter(docstring const & counter,
 	if (smit != sm.end())
 		return counterLabel(smit->second, lang);
 
-	deque<docstring> callers;
+	vector<docstring> callers;
 	docstring const & fls = flattenLabelString(counter, appendix(),
 						   lang, callers);
 	sm[lang] = fls;
@@ -462,7 +487,7 @@ docstring Counters::theCounter(docstring const & counter,
 docstring Counters::flattenLabelString(docstring const & counter, 
 				       bool in_appendix,
 				       string const & lang,
-				       deque<docstring> & callers) const
+				       vector<docstring> & callers) const
 {
 	docstring label;
 
@@ -562,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);
@@ -571,7 +597,7 @@ docstring Counters::prettyCounter(docstring const & name,
 
 docstring Counters::currentCounter() const
 { 
-	LASSERT(!counter_stack_.empty(), /* */);
+	LBUFERR(!counter_stack_.empty());
 	return counter_stack_.back(); 
 }