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

diff --git a/src/Counters.cpp b/src/Counters.cpp
index a0f1d139d7..e73e2d8913 100644
--- a/src/Counters.cpp
+++ b/src/Counters.cpp
@@ -14,6 +14,7 @@
 #include <config.h>
 
 #include "Counters.h"
+#include "Layout.h"
 #include "Lexer.h"
 
 #include "support/convert.h"
@@ -37,8 +38,8 @@ Counter::Counter()
 }
 
 
-Counter::Counter(docstring const & mc, docstring const & ls, 
-		 docstring const & lsa)
+Counter::Counter(docstring const & mc, docstring const & ls,  
+                docstring const & lsa)
 	: master_(mc), labelstring_(ls), labelstringappendix_(lsa)
 {
 	reset();
@@ -51,6 +52,7 @@ bool Counter::read(Lexer & lex)
 		CT_WITHIN = 1,
 		CT_LABELSTRING,
 		CT_LABELSTRING_APPENDIX,
+		CT_PRETTYFORMAT,
 		CT_END
 	};
 
@@ -58,6 +60,7 @@ bool Counter::read(Lexer & lex)
 		{ "end", CT_END },
 		{ "labelstring", CT_LABELSTRING },
 		{ "labelstringappendix", CT_LABELSTRING_APPENDIX },
+		{ "prettyformat", CT_PRETTYFORMAT },
 		{ "within", CT_WITHIN }
 	};
 
@@ -80,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();
@@ -102,6 +109,7 @@ bool Counter::read(Lexer & lex)
 	return getout;
 }
 
+
 void Counter::set(int v)
 {
 	value_ = v;
@@ -138,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_;
@@ -150,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,
@@ -226,7 +250,7 @@ int Counters::value(docstring const & ctr) const
 }
 
 
-void Counters::step(docstring const & ctr)
+void Counters::step(docstring const & ctr, UpdateType utype)
 {
 	CounterList::iterator it = counterList_.find(ctr);
 	if (it == counterList_.end()) {
@@ -236,6 +260,11 @@ void Counters::step(docstring const & ctr)
 	}
 
 	it->second.step();
+	if (utype == OutputUpdate) {
+		LBUFERR(!counter_stack_.empty());
+		counter_stack_.pop_back();
+		counter_stack_.push_back(ctr);
+	}
 	it = counterList_.begin();
 	CounterList::iterator const end = counterList_.end();
 	for (; it != end; ++it) {
@@ -255,12 +284,16 @@ void Counters::reset()
 	CounterList::iterator const end = counterList_.end();
 	for (; it != end; ++it)
 		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();
@@ -271,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();
@@ -315,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
@@ -421,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);
@@ -453,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);
@@ -530,4 +578,69 @@ 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
+{ 
+	LBUFERR(!counter_stack_.empty());
+	return counter_stack_.back(); 
+}
+
+
+void Counters::setActiveLayout(Layout const & lay)
+{
+	LASSERT(!layout_stack_.empty(), return);
+	Layout const * const lastlay = layout_stack_.back();
+	// we want to check whether the layout has changed and, if so,
+	// whether we are coming out of or going into an environment.
+	if (!lastlay) { 
+		layout_stack_.pop_back();
+		layout_stack_.push_back(&lay);
+		if (lay.isEnvironment())
+			beginEnvironment();
+	} else if (lastlay->name() != lay.name()) {
+		layout_stack_.pop_back();
+		layout_stack_.push_back(&lay);
+		if (lastlay->isEnvironment()) {
+			// we are coming out of an environment
+			// LYXERR0("Out: " << lastlay->name());
+			endEnvironment();
+		}
+		if (lay.isEnvironment()) {
+			// we are going into a new environment
+			// LYXERR0("In: " << lay.name());
+			beginEnvironment();
+		}
+	} 
+}
+
+
+void Counters::beginEnvironment()
+{
+	counter_stack_.push_back(counter_stack_.back());
+}
+
+
+void Counters::endEnvironment()
+{
+	LASSERT(!counter_stack_.empty(), return);
+	counter_stack_.pop_back();
+}
+
+
 } // namespace lyx