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

diff --git a/src/Counters.cpp b/src/Counters.cpp
index d7ef519ab8..75c891128e 100644
--- a/src/Counters.cpp
+++ b/src/Counters.cpp
@@ -33,14 +33,15 @@ namespace lyx {
 
 
 Counter::Counter()
+	: initial_value_(0)
 {
 	reset();
 }
 
 
-Counter::Counter(docstring const & mc, docstring const & ls,  
+Counter::Counter(docstring const & mc, docstring const & ls,
                 docstring const & lsa)
-	: master_(mc), labelstring_(ls), labelstringappendix_(lsa)
+	: initial_value_(0), master_(mc), labelstring_(ls), labelstringappendix_(lsa)
 {
 	reset();
 }
@@ -53,11 +54,13 @@ bool Counter::read(Lexer & lex)
 		CT_LABELSTRING,
 		CT_LABELSTRING_APPENDIX,
 		CT_PRETTYFORMAT,
+		CT_INITIALVALUE,
 		CT_END
 	};
 
 	LexerKeyword counterTags[] = {
 		{ "end", CT_END },
+	  { "initialvalue", CT_INITIALVALUE},
 		{ "labelstring", CT_LABELSTRING },
 		{ "labelstringappendix", CT_LABELSTRING_APPENDIX },
 		{ "prettyformat", CT_PRETTYFORMAT },
@@ -73,7 +76,7 @@ bool Counter::read(Lexer & lex)
 			case Lexer::LEX_UNDEF:
 				lex.printError("Unknown counter tag `$$Token'");
 				continue;
-			default: 
+			default:
 				break;
 		}
 		switch (le) {
@@ -83,6 +86,18 @@ bool Counter::read(Lexer & lex)
 				if (master_ == "none")
 					master_.erase();
 				break;
+			case CT_INITIALVALUE:
+				lex.next();
+				initial_value_ = lex.getInteger();
+				// getInteger() returns -1 on error, and larger
+				// negative values do not make much sense.
+				// In the other case, we subtract one, since the
+				// counter will be incremented before its first use.
+				if (initial_value_ <= -1)
+					initial_value_ = 0;
+				else
+					initial_value_ -= 1;
+				break;
 			case CT_PRETTYFORMAT:
 				lex.next();
 				prettyformat_ = lex.getDocString();
@@ -109,6 +124,7 @@ bool Counter::read(Lexer & lex)
 	return getout;
 }
 
+
 void Counter::set(int v)
 {
 	value_ = v;
@@ -135,7 +151,7 @@ void Counter::step()
 
 void Counter::reset()
 {
-	value_ = 0;
+	value_ = initial_value_;
 }
 
 
@@ -145,6 +161,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,7 +182,7 @@ Counter::StringMap & Counter::flatLabelStrings(bool in_appendix) const
 }
 
 
-Counters::Counters() : appendix_(false), subfloat_(false)
+Counters::Counters() : appendix_(false), subfloat_(false), longtable_(false)
 {
 	layout_stack_.push_back(0);
 	counter_stack_.push_back(from_ascii(""));
@@ -165,7 +190,7 @@ Counters::Counters() : appendix_(false), subfloat_(false)
 
 
 void Counters::newCounter(docstring const & newc,
-			  docstring const & masterc, 
+			  docstring const & masterc,
 			  docstring const & ls,
 			  docstring const & lsa)
 {
@@ -240,6 +265,31 @@ int Counters::value(docstring const & ctr) const
 }
 
 
+void Counters::resetSlaves(docstring const & ctr)
+{
+	CounterList::iterator it = counterList_.begin();
+	CounterList::iterator const end = counterList_.end();
+	for (; it != end; ++it) {
+		if (it->second.master() == ctr) {
+			it->second.reset();
+			resetSlaves(it->first);
+		}
+	}
+}
+
+
+void Counters::stepMaster(docstring const & ctr, UpdateType utype)
+{
+	CounterList::iterator it = counterList_.find(ctr);
+	if (it == counterList_.end()) {
+		lyxerr << "step: Counter does not exist: "
+		       << to_utf8(ctr) << endl;
+		return;
+	}
+	step(it->second.master(), utype);
+}
+
+
 void Counters::step(docstring const & ctr, UpdateType utype)
 {
 	CounterList::iterator it = counterList_.find(ctr);
@@ -251,17 +301,12 @@ 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);
 	}
-	it = counterList_.begin();
-	CounterList::iterator const end = counterList_.end();
-	for (; it != end; ++it) {
-		if (it->second.master() == ctr) {
-			it->second.reset();
-		}
-	}
+
+	resetSlaves(ctr);
 }
 
 
@@ -283,7 +328,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 +339,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,9 +399,8 @@ 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 
+// 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
 // for this info.)
 docstring const romanCounter(int const n)
@@ -349,25 +409,25 @@ docstring const romanCounter(int const n)
 		"I",   "II",  "III", "IV", "V",
 		"VI",  "VII", "VIII", "IX"
 	};
-	
+
 	static char const * const tens[9] = {
 		"X", "XX", "XXX", "XL", "L",
 		"LX", "LXX", "LXXX", "XC"
 	};
-	
+
 	static char const * const hunds[9] = {
 		"C", "CC", "CCC", "CD", "D",
 		"DC", "DCC", "DCCC", "CM"
 	};
-	
-	if (n > 1000 || n < 1) 
+
+	if (n >= 1000 || n < 1)
 		return from_ascii("??");
-	
+
 	int val = n;
 	string roman;
 	switch (n) {
 	//special cases
-	case 900: 
+	case 900:
 		roman = "CM";
 		break;
 	case 400:
@@ -404,6 +464,24 @@ docstring const lowerromanCounter(int const n)
 	return lowercase(romanCounter(n));
 }
 
+
+docstring const fnsymbolCounter(int const n)
+{
+	switch(n) {
+	case 1: return docstring(1, 0x002a); //*
+	case 2: return docstring(1, 0x2020); // dagger
+	case 3: return docstring(1, 0x2021); // double dagger
+	case 4: return docstring(1, 0x00A7); // section sign
+	case 5: return docstring(1, 0x00B6); // pilcrow sign
+	case 6: return docstring(1, 0x2016); // vertical bar
+	case 7: return docstring(2, 0x002a); // two *
+	case 8: return docstring(2, 0x2020); // two daggers
+	case 9: return docstring(2, 0x2021); // two double daggers
+	default:
+		return from_ascii("?");
+	};
+}
+
 } // namespace anon
 
 
@@ -435,6 +513,9 @@ docstring Counters::labelItem(docstring const & ctr,
 	if (numbertype == "Roman")
 		return romanCounter(val);
 
+	if (numbertype == "fnsymbol")
+		return fnsymbolCounter(val);
+
 	return convert<docstring>(val);
 }
 
@@ -442,7 +523,7 @@ docstring Counters::labelItem(docstring const & ctr,
 docstring Counters::theCounter(docstring const & counter,
 			       string const & lang) const
 {
-	CounterList::const_iterator it = counterList_.find(counter); 
+	CounterList::const_iterator it = counterList_.find(counter);
 	if (it == counterList_.end())
 		return from_ascii("#");
 	Counter const & ctr = it->second;
@@ -451,7 +532,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;
@@ -459,13 +540,11 @@ docstring Counters::theCounter(docstring const & counter,
 }
 
 
-docstring Counters::flattenLabelString(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;
-
 	if (find(callers.begin(), callers.end(), counter) != callers.end()) {
 		// recursion detected
 		lyxerr << "Warning: Recursion in label for counter `"
@@ -473,8 +552,8 @@ docstring Counters::flattenLabelString(docstring const & counter,
 		       << endl;
 		return from_ascii("??");
 	}
-		
-	CounterList::const_iterator it = counterList_.find(counter); 
+
+	CounterList::const_iterator it = counterList_.find(counter);
 	if (it == counterList_.end())
 		return from_ascii("#");
 	Counter const & c = it->second;
@@ -484,7 +563,7 @@ docstring Counters::flattenLabelString(docstring const & counter,
 	callers.push_back(counter);
 	if (ls.empty()) {
 		if (!c.master().empty())
-			ls = flattenLabelString(c.master(), in_appendix, lang, callers) 
+			ls = flattenLabelString(c.master(), in_appendix, lang, callers)
 				+ from_ascii(".");
 		callers.pop_back();
 		return ls + from_ascii("\\arabic{") + counter + "}";
@@ -497,7 +576,7 @@ docstring Counters::flattenLabelString(docstring const & counter,
 			break;
 		size_t const j = i + 4;
 		size_t k = j;
-		while (k < ls.size() && lowercase(ls[k]) >= 'a' 
+		while (k < ls.size() && lowercase(ls[k]) >= 'a'
 		       && lowercase(ls[k]) <= 'z')
 			++k;
 		docstring const newc = ls.substr(j, k - j);
@@ -526,7 +605,7 @@ docstring Counters::counterLabel(docstring const & format,
 			break;
 		size_t const j = i + 4;
 		size_t k = j;
-		while (k < label.size() && lowercase(label[k]) >= 'a' 
+		while (k < label.size() && lowercase(label[k]) >= 'a'
 		       && lowercase(label[k]) <= 'z')
 			++k;
 		docstring const newc(label, j, k - j);
@@ -556,13 +635,14 @@ docstring Counters::counterLabel(docstring const & format,
 docstring Counters::prettyCounter(docstring const & name,
 			       string const & lang) const
 {
-	CounterList::const_iterator it = counterList_.find(name); 
+	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 = ctr.prettyFormat();
+	docstring const & format =
+	    translateIfPossible(ctr.prettyFormat(), lang);
 	if (format.empty())
 		return value;
 	return subst(format, from_ascii("##"), value);
@@ -570,9 +650,9 @@ docstring Counters::prettyCounter(docstring const & name,
 
 
 docstring Counters::currentCounter() const
-{ 
-	LASSERT(!counter_stack_.empty(), /* */);
-	return counter_stack_.back(); 
+{
+	LBUFERR(!counter_stack_.empty());
+	return counter_stack_.back();
 }
 
 
@@ -582,7 +662,7 @@ void Counters::setActiveLayout(Layout const & lay)
 	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) { 
+	if (!lastlay) {
 		layout_stack_.pop_back();
 		layout_stack_.push_back(&lay);
 		if (lay.isEnvironment())
@@ -600,7 +680,7 @@ void Counters::setActiveLayout(Layout const & lay)
 			// LYXERR0("In: " << lay.name());
 			beginEnvironment();
 		}
-	} 
+	}
 }