X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCounters.cpp;h=a0f1d139d7cce2f0819eb31949629c7f1f26caf4;hb=0a7705a6736a85c3c751f7b4e9998833cdb71fc9;hp=3921cf2890db3742cad8d6a6bbfd51dc6c0911d9;hpb=c355edfb6da71b5efc9ed1ce548bd206ad9f57cb;p=lyx.git

diff --git a/src/Counters.cpp b/src/Counters.cpp
index 3921cf2890..a0f1d139d7 100644
--- a/src/Counters.cpp
+++ b/src/Counters.cpp
@@ -18,6 +18,7 @@
 
 #include "support/convert.h"
 #include "support/debug.h"
+#include "support/gettext.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"
 
@@ -143,19 +144,12 @@ docstring const & Counter::labelString(bool in_appendix) const
 }
 
 
-docstring const & Counter::flatLabelString(bool in_appendix) const
+Counter::StringMap & Counter::flatLabelStrings(bool in_appendix) const
 {
 	return in_appendix ? flatlabelstringappendix_ : flatlabelstring_;
 }
 
 
-void Counter::setFlatLabelStrings(docstring const & fls, docstring const & flsa)
-{
-	flatlabelstring_ = fls;
-	flatlabelstringappendix_ = flsa;
-}
-
-
 void Counters::newCounter(docstring const & newc,
 			  docstring const & masterc, 
 			  docstring const & ls,
@@ -177,18 +171,20 @@ bool Counters::hasCounter(docstring const & c) const
 }
 
 
-bool Counters::read(Lexer & lex, docstring const & name)
+bool Counters::read(Lexer & lex, docstring const & name, bool makenew)
 {
 	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)
+	// if makenew is false, we will just discard what we read
+	if (success && makenew)
 		counterList_[name] = cnt;
-	else
+	else if (!success)
 		LYXERR0("Error reading counter `" << name << "'!");
 	return success;
 }
@@ -257,18 +253,8 @@ void Counters::reset()
 	current_float_.erase();
 	CounterList::iterator it = counterList_.begin();
 	CounterList::iterator const end = counterList_.end();
-	std::vector<docstring> callers;
-	for (; it != end; ++it) {
+	for (; it != end; ++it)
 		it->second.reset();
-		// Compute the explicit counter labels without any
-		// \thexxx strings, in order to avoid recursion.  
-		// It only needs to be done when the textclass is
-		// updated, but in practice the extra work is probably
-		// not noticeable (JMarc)
-		docstring const fls = flattenLabelString(it->first, false, callers);
-		docstring const flsa = flattenLabelString(it->first, true, callers);
-		it->second.setFlatLabelStrings(fls, flsa);
-	}
 }
 
 
@@ -430,18 +416,29 @@ docstring Counters::labelItem(docstring const & ctr,
 }
 
 
-docstring Counters::theCounter(docstring const & counter) const
+docstring Counters::theCounter(docstring const & counter,
+			       string const & lang) const
 {
 	CounterList::const_iterator it = counterList_.find(counter); 
 	if (it == counterList_.end())
 		return from_ascii("??");
-	// FIXME: this should get translated.
-	return counterLabel(it->second.flatLabelString(appendix()));
+	Counter const & ctr = it->second;
+	Counter::StringMap & sm = ctr.flatLabelStrings(appendix());
+	Counter::StringMap::iterator smit = sm.find(lang);
+	if (smit != sm.end())
+		return counterLabel(smit->second, lang);
+
+	vector<docstring> callers;
+	docstring const & fls = flattenLabelString(counter, appendix(),
+						   lang, callers);
+	sm[lang] = fls;
+	return counterLabel(fls, lang);
 }
 
 
 docstring Counters::flattenLabelString(docstring const & counter, 
-				       bool in_appendix, 
+				       bool in_appendix,
+				       string const & lang,
 				       vector<docstring> & callers) const
 {
 	docstring label;
@@ -459,12 +456,12 @@ docstring Counters::flattenLabelString(docstring const & counter,
 		return from_ascii("??");
 	Counter const & c = it->second;
 
-	docstring ls = c.labelString(in_appendix);
+	docstring ls = translateIfPossible(c.labelString(in_appendix), lang);
 
 	callers.push_back(counter);
 	if (ls.empty()) {
 		if (!c.master().empty())
-			ls = flattenLabelString(c.master(), in_appendix, callers) 
+			ls = flattenLabelString(c.master(), in_appendix, lang, callers) 
 				+ from_ascii(".");
 		callers.pop_back();
 		return ls + from_ascii("\\arabic{") + counter + "}";
@@ -481,7 +478,8 @@ docstring Counters::flattenLabelString(docstring const & counter,
 		       && lowercase(ls[k]) <= 'z')
 			++k;
 		docstring const newc = ls.substr(j, k - j);
-		docstring const repl = flattenLabelString(newc, in_appendix, callers);
+		docstring const repl = flattenLabelString(newc, in_appendix,
+							  lang, callers);
 		ls.replace(i, k - j + 4, repl);
 	}
 	callers.pop_back();
@@ -490,15 +488,17 @@ docstring Counters::flattenLabelString(docstring const & counter,
 }
 
 
-docstring Counters::counterLabel(docstring const & format) const
+docstring Counters::counterLabel(docstring const & format,
+				 string const & lang) const
 {
 	docstring label = format;
 
 	// FIXME: Using regexps would be better, but we compile boost without
 	// wide regexps currently.
+	docstring const the = from_ascii("\\the");
 	while (true) {
-		//lyxerr << "label=" << to_utf8(label) << endl;
-		size_t const i = label.find(from_ascii("\\the"), 0);
+		//lyxerr << "label=" << label << endl;
+		size_t const i = label.find(the, 0);
 		if (i == docstring::npos)
 			break;
 		size_t const j = i + 4;
@@ -506,12 +506,11 @@ docstring Counters::counterLabel(docstring const & format) const
 		while (k < label.size() && lowercase(label[k]) >= 'a' 
 		       && lowercase(label[k]) <= 'z')
 			++k;
-		docstring const newc = label.substr(j, k - j);
-		docstring const repl = theCounter(newc);
-		label.replace(i, k - j + 4, repl);
+		docstring const newc(label, j, k - j);
+		label.replace(i, k - i, theCounter(newc, lang));
 	}
 	while (true) {
-		//lyxerr << "label=" << to_utf8(label) << endl;
+		//lyxerr << "label=" << label << endl;
 
 		size_t const i = label.find('\\', 0);
 		if (i == docstring::npos)
@@ -524,11 +523,9 @@ docstring Counters::counterLabel(docstring const & format) const
 			break;
 		docstring const numbertype(label, i + 1, j - i - 1);
 		docstring const counter(label, j + 1, k - j - 1);
-		docstring const rep = labelItem(counter, numbertype);
-		label = docstring(label, 0, i) + rep
-			+ docstring(label, k + 1, docstring::npos);
+		label.replace(i, k + 1 - i, labelItem(counter, numbertype));
 	}
-	//lyxerr << "DONE! label=" << to_utf8(label) << endl;
+	//lyxerr << "DONE! label=" << label << endl;
 	return label;
 }