X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FCounters.cpp;h=e73e2d89139c6da6a12d0308633980ee72779284;hb=3d4076b598deb18660e50ec9c327efc3b15f15d0;hp=626596a83301d6121dd742f625ced09751f66f4e;hpb=caa4e94bf02b9d3131bc280390fae44683fd5e9a;p=lyx.git

diff --git a/src/Counters.cpp b/src/Counters.cpp
index 626596a833..e73e2d8913 100644
--- a/src/Counters.cpp
+++ b/src/Counters.cpp
@@ -52,6 +52,7 @@ bool Counter::read(Lexer & lex)
 		CT_WITHIN = 1,
 		CT_LABELSTRING,
 		CT_LABELSTRING_APPENDIX,
+		CT_PRETTYFORMAT,
 		CT_END
 	};
 
@@ -59,6 +60,7 @@ bool Counter::read(Lexer & lex)
 		{ "end", CT_END },
 		{ "labelstring", CT_LABELSTRING },
 		{ "labelstringappendix", CT_LABELSTRING_APPENDIX },
+		{ "prettyformat", CT_PRETTYFORMAT },
 		{ "within", CT_WITHIN }
 	};
 
@@ -81,6 +83,10 @@ bool Counter::read(Lexer & lex)
 				if (master_ == "none")
 					master_.erase();
 				break;
+			case CT_PRETTYFORMAT:
+				lex.next();
+				prettyformat_ = lex.getDocString();
+				break;
 			case CT_LABELSTRING:
 				lex.next();
 				labelstring_ = lex.getDocString();
@@ -103,6 +109,7 @@ bool Counter::read(Lexer & lex)
 	return getout;
 }
 
+
 void Counter::set(int v)
 {
 	value_ = v;
@@ -139,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_;
@@ -151,6 +167,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,
@@ -238,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);
 	}
@@ -263,13 +286,14 @@ void Counters::reset()
 		it->second.reset();
 	counter_stack_.clear();
 	counter_stack_.push_back(from_ascii(""));
+	layout_stack_.clear();
 	layout_stack_.push_back(0);
 }
 
 
 void Counters::reset(docstring const & match)
 {
-	LASSERT(!match.empty(), /**/);
+	LASSERT(!match.empty(), return);
 
 	CounterList::iterator it = counterList_.begin();
 	CounterList::iterator end = counterList_.end();
@@ -280,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();
@@ -324,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
@@ -430,7 +469,7 @@ docstring Counters::theCounter(docstring const & counter,
 {
 	CounterList::const_iterator it = counterList_.find(counter); 
 	if (it == counterList_.end())
-		return from_ascii("??");
+		return from_ascii("#");
 	Counter const & ctr = it->second;
 	Counter::StringMap & sm = ctr.flatLabelStrings(appendix());
 	Counter::StringMap::iterator smit = sm.find(lang);
@@ -462,7 +501,7 @@ docstring Counters::flattenLabelString(docstring const & counter,
 		
 	CounterList::const_iterator it = counterList_.find(counter); 
 	if (it == counterList_.end())
-		return from_ascii("??");
+		return from_ascii("#");
 	Counter const & c = it->second;
 
 	docstring ls = translateIfPossible(c.labelString(in_appendix), lang);
@@ -539,9 +578,26 @@ docstring Counters::counterLabel(docstring const & format,
 }
 
 
+docstring Counters::prettyCounter(docstring const & name,
+			       string const & lang) const
+{
+	CounterList::const_iterator it = counterList_.find(name); 
+	if (it == counterList_.end())
+		return from_ascii("#");
+	Counter const & ctr = it->second;
+
+	docstring const value = theCounter(name, lang);
+	docstring const & format =
+	    translateIfPossible(ctr.prettyFormat(), lang);
+	if (format.empty())
+		return value;
+	return subst(format, from_ascii("##"), value);
+}
+
+
 docstring Counters::currentCounter() const
 { 
-	LASSERT(!counter_stack_.empty(), /* */);
+	LBUFERR(!counter_stack_.empty());
 	return counter_stack_.back(); 
 }
 
@@ -576,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());
 }
 
 
@@ -591,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);
 }