X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCounters.cpp;h=cf4bfeed43f644412e9ff11710c7ece07a940d0e;hb=24fe5b08c0e1dfb739738acb6fc995da7315d35f;hp=f1b249dcc47bfcaf99a5d2aa9cc9f8e18804d4e8;hpb=88177a89cb15a528f462dc1645397f76deda44f5;p=lyx.git

diff --git a/src/Counters.cpp b/src/Counters.cpp
index f1b249dcc4..cf4bfeed43 100644
--- a/src/Counters.cpp
+++ b/src/Counters.cpp
@@ -14,22 +14,22 @@
 #include <config.h>
 
 #include "Counters.h"
-#include "debug.h"
 
-#include "support/lstrings.h"
+#include "Lexer.h"
+
 #include "support/convert.h"
+#include "support/debug.h"
+#include "support/lstrings.h"
 
-#include <boost/assert.hpp>
+#include "support/lassert.h"
 
 #include <sstream>
 
-using std::endl;
-using std::ostringstream;
-using std::string;
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::lowercase;
 
 Counter::Counter()
 {
@@ -45,6 +45,63 @@ Counter::Counter(docstring const & mc, docstring const & ls,
 }
 
 
+bool Counter::read(Lexer & lex)
+{
+	enum {
+		CT_WITHIN = 1,
+		CT_LABELSTRING,
+		CT_LABELSTRING_APPENDIX,
+		CT_END
+	};
+
+	LexerKeyword counterTags[] = {
+		{ "end", CT_END },
+		{ "labelstring", CT_LABELSTRING },
+		{ "labelstringappendix", CT_LABELSTRING_APPENDIX },
+		{ "within", CT_WITHIN }
+	};
+
+	lex.pushTable(counterTags);
+
+	bool getout = false;
+	while (!getout && lex.isOK()) {
+		int le = lex.lex();
+		switch (le) {
+			case Lexer::LEX_UNDEF:
+				lex.printError("Unknown counter tag `$$Token'");
+				continue;
+			default: 
+				break;
+		}
+		switch (le) {
+			case CT_WITHIN:
+				lex.next();
+				master_ = lex.getDocString();
+				if (master_ == "none")
+					master_.erase();
+				break;
+			case CT_LABELSTRING:
+				lex.next();
+				labelstring_ = lex.getDocString();
+				labelstringappendix_ = labelstring_;
+				break;
+			case CT_LABELSTRING_APPENDIX:
+				lex.next();
+				labelstringappendix_ = lex.getDocString();
+				break;
+			case CT_END:
+				getout = true;
+				break;
+		}
+	}
+
+	// Here if have a full counter if getout == true
+	if (!getout)
+		LYXERR0("No End tag found for counter!");
+	lex.popTable();
+	return getout;
+}
+
 void Counter::set(int v)
 {
 	value_ = v;
@@ -114,6 +171,23 @@ bool Counters::hasCounter(docstring const & c) const
 }
 
 
+bool Counters::read(Lexer & lex, docstring const & name)
+{
+	if (hasCounter(name)) {
+		LYXERR(Debug::TCLASS, "Reading existing counter " << to_utf8(name));
+		return counterList[name].read(lex);
+	}
+	LYXERR(Debug::TCLASS, "Reading new counter " << to_utf8(name));
+	Counter cnt;
+	bool success = cnt.read(lex);
+	if (success)
+		counterList[name] = cnt;
+	else
+		LYXERR0("Error reading counter `" << name << "'!");
+	return success;
+}
+
+
 void Counters::set(docstring const & ctr, int const val)
 {
 	CounterList::iterator const it = counterList.find(ctr);
@@ -173,6 +247,7 @@ void Counters::step(docstring const & ctr)
 void Counters::reset()
 {
 	appendix_ = false;
+	subfloat_ = false;
 	current_float_.erase();
 	CounterList::iterator it = counterList.begin();
 	CounterList::iterator const end = counterList.end();
@@ -184,7 +259,7 @@ void Counters::reset()
 
 void Counters::reset(docstring const & match)
 {
-	BOOST_ASSERT(!match.empty());
+	LASSERT(!match.empty(), /**/);
 
 	CounterList::iterator it = counterList.begin();
 	CounterList::iterator end = counterList.end();
@@ -302,7 +377,7 @@ docstring const romanCounter(int const n)
 
 docstring const lowerromanCounter(int const n)
 {
-	return support::lowercase(romanCounter(n));
+	return lowercase(romanCounter(n));
 }
 
 } // namespace anon
@@ -341,23 +416,48 @@ docstring Counters::labelItem(docstring const & ctr,
 
 
 docstring Counters::theCounter(docstring const & counter)
+{
+	std::set<docstring> callers;
+	return theCounter(counter, callers);
+}
+
+docstring Counters::theCounter(docstring const & counter,
+                               std::set<docstring> & callers)
 {
 	if (!hasCounter(counter))
 		return from_ascii("??");
 
-	Counter const & c = counterList[counter];
-	docstring ls = appendix() ? c.labelStringAppendix() : c.labelString();
+	docstring label;
 
-	if (ls.empty()) {
-		if (!c.master().empty())
-			ls = from_ascii("\\the") + c.master() + from_ascii(".");
-		ls += from_ascii("\\arabic{") + counter + "}";
+	if (callers.find(counter) == callers.end()) {
+		
+		pair<std::set<docstring>::iterator, bool> result = callers.insert(counter);
+
+		Counter const & c = counterList[counter];
+		docstring ls = appendix() ? c.labelStringAppendix() : c.labelString();
+
+		if (ls.empty()) {
+			if (!c.master().empty())
+				ls = from_ascii("\\the") + c.master() + from_ascii(".");
+			ls += from_ascii("\\arabic{") + counter + "}";
+		}
+
+		label = counterLabel(ls, &callers);
+
+		callers.erase(result.first);
+	} else {
+		// recursion detected
+		lyxerr << "Warning: Recursion in label for counter `"
+			   << counter << "' detected"
+			   << endl;
 	}
-	return counterLabel(ls);
+
+	return label;
 }
 
 
-docstring Counters::counterLabel(docstring const & format)
+docstring Counters::counterLabel(docstring const & format,
+                                 std::set<docstring> * callers)
 {
 	docstring label = format;
 
@@ -375,10 +475,11 @@ docstring Counters::counterLabel(docstring const & format)
 		       && lowercase(label[k]) <= 'z')
 			++k;
 		docstring counter = label.substr(j, k - j);
-		docstring repl = theCounter(counter);
+		docstring repl = callers? theCounter(counter, *callers): 
+			                      theCounter(counter);
 		label.replace(i, k - j + 4, repl);
 	}
-	
+
 	while (true) {
 		//lyxerr << "label=" << to_utf8(label) << endl;