X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fcounters.C;h=cc5d3328ee46609ca81cc402ebdc53b0efb3cfe9;hb=1b0cfa4381f8efa0f724bfc661c108d73242d1d6;hp=0fa97db461f040137e307a809a0810d7d6b6dd11;hpb=6396f9a204bfa7a154729dfaa17dc7abc619f7d0;p=lyx.git

diff --git a/src/counters.C b/src/counters.C
index 0fa97db461..cc5d3328ee 100644
--- a/src/counters.C
+++ b/src/counters.C
@@ -1,6 +1,6 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
  *
  *           Copyright 1995 Matthias Ettrich
@@ -18,7 +18,11 @@
 #include "counters.h"
 #include "debug.h"
 
+#include "support/lstrings.h"
+#include "support/LAssert.h"
+
 using std::endl;
+using std::vector;
 
 
 Counter::Counter()
@@ -48,7 +52,6 @@ int Counter::value() const
 void Counter::step()
 {
 	++value_;
-	onstep.emit();
 }
 
 
@@ -58,62 +61,61 @@ void Counter::reset()
 }
 
 
-Counters::~Counters() 
+string Counter::master() const
 {
-	// We need this since we store the Counter's as pointers in
-	// the counterList.
-	for (CounterList::iterator it = counterList.begin();
-	     it != counterList.end();
-	     ++it)
-		delete it->second;
+	return master_;
 }
 
 
+void Counter::setMaster(string const & m)
+{
+	master_ = m;
+}
+
+
+
 void Counters::newCounter(string const & newc)
 {
 	// First check if newc already exist
 	CounterList::iterator cit = counterList.find(newc);
-	// if alrady exist give warning and return
+	// if already exist give warning and return
 	if (cit != counterList.end()) {
-		lyxerr << "The new counter already exist." << endl;
+		lyxerr << "The new counter already exists." << endl;
 		return;
 	}
-	counterList[newc] = new Counter;
+	counterList[newc];
 }
 
 
-void Counters::newCounter(string const & newc, string const & oldc)
+void Counters::newCounter(string const & newc, string const & masterc)
 {
-	// First check if newc already exist
+	// First check if newc already exists
 	CounterList::iterator cit = counterList.find(newc);
 	// if already existant give warning and return
 	if (cit != counterList.end()) {
-		lyxerr << "The new counter already exist." << endl;
+		lyxerr << "The new counter already exists." << endl;
 		return;
 	}
-	// then check if oldc exist
-	CounterList::iterator it = counterList.find(oldc);
+	// then check if masterc exists
+	CounterList::iterator it = counterList.find(masterc);
 	// if not give warning and return
 	if (it == counterList.end()) {
-		lyxerr << "The old counter does not exist." << endl;
+		lyxerr << "The master counter does not exist." << endl;
 		return;
 	}
 
-	Counter * tmp = new Counter;
-	it->second->onstep.connect(SigC::slot(tmp,
-					      &Counter::reset));
-	counterList[newc] = tmp;
+	counterList[newc].setMaster(masterc);
 }
 
 
-void Counters::set(string const & ctr, int val) 
+void Counters::set(string const & ctr, int val)
 {
 	CounterList::iterator it = counterList.find(ctr);
 	if (it == counterList.end()) {
-		lyxerr << "Counter does not exist." << endl;
+		lyxerr << "set: Counter does not exist: " << ctr << endl;
 		return;
 	}
-	it->second->set(val);
+	it->second.set(val);
 }
 
 
@@ -121,21 +123,21 @@ void Counters::addto(string const & ctr, int val)
 {
 	CounterList::iterator it = counterList.find(ctr);
 	if (it == counterList.end()) {
-		lyxerr << "Counter does not exist." << endl;
+		lyxerr << "addto: Counter does not exist: " << ctr << endl;
 		return;
 	}
-	it->second->addto(val);
+	it->second.addto(val);
 }
 
 
-int Counters::value(string const & ctr) const 
+int Counters::value(string const & ctr) const
 {
 	CounterList::const_iterator cit = counterList.find(ctr);
 	if (cit == counterList.end()) {
-		lyxerr << "Counter does not exist." << endl;
+		lyxerr << "value: Counter does not exist: " << ctr << endl;
 		return 0;
 	}
-	return cit->second->value();
+	return cit->second.value();
 }
 
 
@@ -143,8 +145,203 @@ void Counters::step(string const & ctr)
 {
 	CounterList::iterator it = counterList.find(ctr);
 	if (it == counterList.end()) {
-		lyxerr << "Counter does not exist." << endl;
+		lyxerr << "step: Counter does not exist: " << ctr << endl;
 		return;
 	}
-	it->second->step();
+
+	it->second.step();
+	it = counterList.begin();
+	CounterList::iterator end = counterList.end();
+	for (; it != end; ++it) {
+		if (it->second.master() == ctr) {
+			it->second.reset();
+		}
+	}
+}
+
+
+void Counters::reset()
+{
+	CounterList::iterator it = counterList.begin();
+	CounterList::iterator end = counterList.end();
+	for (; it != end; ++it) {
+		it->second.reset();
+	}
+}
+
+
+void Counters::reset(string const & match)
+{
+	lyx::Assert(!match.empty());
+
+	CounterList::iterator it = counterList.begin();
+	CounterList::iterator end = counterList.end();
+	for (; it != end; ++it) {
+		if (it->first.find(match) != string::npos)
+			it->second.reset();
+	}
+}
+
+
+void Counters::copy(Counters & from, Counters & to, string const & match)
+{
+	CounterList::iterator it = counterList.begin();
+	CounterList::iterator end = counterList.end();
+	for (; it != end; ++it) {
+		if (it->first.find(match) != string::npos || match == "") {
+			to.set(it->first, from.value(it->first));
+		}
+	}
+}
+
+
+namespace {
+
+inline
+char loweralphaCounter(int n)
+{
+	if (n < 1 || n > 26)
+		return '?';
+	else
+		return 'a' + n - 1;
+}
+
+
+inline
+char alphaCounter(int n)
+{
+	if (n < 1 || n > 26)
+		return '?';
+	else
+		return 'A' + n - 1;
+}
+
+
+inline
+char hebrewCounter(int n)
+{
+	static const char hebrew[22] = {
+		'à', 'á', 'â', 'ã', 'ä', 'å', 'æ', 'ç', 'è',
+		'é', 'ë', 'ì', 'î', 'ð', 'ñ', 'ò', 'ô', 'ö',
+		'÷', 'ø', 'ù', 'ú'
+	};
+	if (n < 1 || n > 22)
+		return '?';
+	else
+		return hebrew[n-1];
+}
+
+
+inline
+string const romanCounter(int n)
+{
+	static char const * roman[20] = {
+		"i",   "ii",  "iii", "iv", "v",
+		"vi",  "vii", "viii", "ix", "x",
+		"xi",  "xii", "xiii", "xiv", "xv",
+		"xvi", "xvii", "xviii", "xix", "xx"
+	};
+	if (n < 1 || n > 20)
+		return "??";
+	else
+		return roman[n-1];
+}
+
+} // namespace anon
+
+
+string Counters::labelItem(string const & ctr,
+			   string const & numbertype,
+			   string const & langtype,
+			   bool first)
+{
+	ostringstream s;
+	ostringstream o;
+
+	CounterList::iterator it = counterList.find(ctr);
+	if (it == counterList.end()) {
+		lyxerr << "Counter does not exist." << endl;
+		return "";
+	}
+
+	if (!first) {
+		s << "." << value(ctr);
+	} else {
+		if (numbertype == "sectioning" || numbertype == "appendix") {
+			if (numbertype == "appendix") {
+				if (langtype == "hebrew") {
+					o << hebrewCounter(value(ctr));
+				} else {
+					o << alphaCounter(value(ctr));
+				}
+			} else o << value(ctr);
+		}
+		s << o.str();
+	}
+
+	return STRCONV(s.str());
+}
+
+
+string Counters::numberLabel(string const & ctr,
+			     string const & numbertype,
+			     string const & langtype,
+			     int head)
+{
+	ostringstream s;
+
+	if (numbertype == "sectioning" || numbertype == "appendix") {
+		if (ctr == "chapter" && head == 0) {
+			s << labelItem("chapter", numbertype, langtype, true);
+		} else if (ctr == "section" && head <= 1) {
+			s << numberLabel("chapter", numbertype, langtype, head)
+			  << labelItem("section", numbertype, langtype, head == 1);
+		} else if (ctr == "subsection" && head <= 2) {
+			s << numberLabel("section", numbertype, langtype, head)
+			  << labelItem("subsection", numbertype, langtype, head == 2);
+		} else if (ctr == "subsubsection" && head <= 3) {
+			s << numberLabel("subsection", numbertype, langtype, head)
+			  << labelItem("subsubsection", numbertype, langtype, head == 3);
+		} else if (ctr == "paragraph" && head <= 4) {
+			s << numberLabel("subsubsection", numbertype, langtype, head)
+			  << labelItem("paragraph", numbertype, langtype, head == 4);
+		} else if (ctr == "subparagraph" && head <= 5) {
+			s << numberLabel("paragraph", numbertype, langtype, head)
+			  << labelItem("subparagraph", numbertype, langtype, head == 5);
+		} else if (ctr == "figure" || ctr == "table") {
+			// figure, table, ...
+			lyxerr << "Counter:" << ctr << endl;
+			s << numberLabel("chapter", numbertype, langtype, head)
+			  << labelItem(ctr, numbertype, langtype, head == 1);
+		}
+
+	} else if (numbertype == "enumeration") {
+		ostringstream ei;
+		ostringstream eii;
+		ostringstream eiii;
+		ostringstream eiv;
+
+		if (langtype == "hebrew") {
+			ei << '.' << value("enumi");
+			eii << '(' << hebrewCounter(value("enumii")) << ')';
+			eiii << '.' << romanCounter(value("enumiii"));
+			eiv << '.' << alphaCounter(value("enumiv"));
+		} else {
+			ei << value("enumi") << '.';
+			eii << '(' << loweralphaCounter(value("enumii")) << ')';
+			eiii << romanCounter(value("enumiii")) << '.';
+			eiv << alphaCounter(value("enumiv")) << '.';
+		}
+		if (ctr == "enumii") {
+			s << eii.str();
+		} else if (ctr == "enumi") {
+			s << ei.str();
+		} else if (ctr == "enumiii") {
+			s << eiii.str();
+		} else if (ctr == "enumiv") {
+			s << eiv.str();
+		}
+	}
+
+	return STRCONV(s.str());
 }