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

diff --git a/src/Counters.cpp b/src/Counters.cpp
index 2c661eda48..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_;
@@ -296,10 +305,17 @@ void Counters::reset(docstring const & match)
 
 bool Counters::remove(docstring const & cnt)
 {
-	// NOTE It might be worth trying to remove this counter
-	// as "master" for any counter that declares it, but we
-	// don't actually need to do so.
-	return counterList_.erase(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;
 }
 
 
@@ -571,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);