#include "debug.h"
#include "support/lstrings.h"
-#include "support/tostr.h"
+#include "support/convert.h"
#include <boost/assert.hpp>
CounterList::iterator const cit = counterList.find(newc);
// if already exist give warning and return
if (cit != counterList.end()) {
- lyxerr << "The new counter already exists." << endl;
+ lyxerr << "New counter already exists: " << newc << endl;
return;
}
counterList[newc];
CounterList::iterator const cit = counterList.find(newc);
// if already existant give warning and return
if (cit != counterList.end()) {
- lyxerr << "The new counter already exists." << endl;
+ lyxerr << "New counter already exists: " << newc << endl;
return;
}
// then check if masterc exists
CounterList::iterator const it = counterList.find(masterc);
// if not give warning and return
if (it == counterList.end()) {
- lyxerr << "The master counter does not exist." << endl;
+ lyxerr << "Master counter does not exist: " << masterc << endl;
return;
}
//lyxerr << "counterLabel: " << format << " -> " << label << endl;
return label;
}
-
-
-string Counters::enumLabel(string const & ctr, string const & langtype)
-{
- ostringstream os;
-
- if (langtype == "hebrew") {
- if (ctr == "enumi")
- os << '.' << value("enumi");
- else if (ctr == "enumii")
- os << '(' << hebrewCounter(value("enumii")) << ')';
- else if (ctr == "enumiii")
- os << '.' << lowerromanCounter(value("enumiii"));
- else if (ctr == "enumiv")
- os << '.' << alphaCounter(value("enumiv"));
- } else {
- if (ctr == "enumi")
- os << value("enumi") << '.';
- else if (ctr == "enumii")
- os << '(' << loweralphaCounter(value("enumii")) << ')';
- else if (ctr == "enumiii")
- os << lowerromanCounter(value("enumiii")) << '.';
- else if (ctr == "enumiv")
- os << alphaCounter(value("enumiv")) << '.';
- }
-
- return os.str();
-}