#include "debug.h"
#include "support/lstrings.h"
-#include "support/std_sstream.h"
-#include "support/tostr.h"
+#include "support/convert.h"
#include <boost/assert.hpp>
+#include <sstream>
+
using std::endl;
using std::ostringstream;
+using std::string;
Counter::Counter()
void Counters::newCounter(string const & newc)
{
// First check if newc already exist
- CounterList::iterator cit = counterList.find(newc);
+ 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];
void Counters::newCounter(string const & newc, string const & masterc)
{
// First check if newc already exists
- CounterList::iterator cit = counterList.find(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 it = counterList.find(masterc);
+ 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;
}
}
-void Counters::set(string const & ctr, int val)
+void Counters::set(string const & ctr, int const val)
{
- CounterList::iterator it = counterList.find(ctr);
+ CounterList::iterator const it = counterList.find(ctr);
if (it == counterList.end()) {
lyxerr << "set: Counter does not exist: " << ctr << endl;
return;
}
-void Counters::addto(string const & ctr, int val)
+void Counters::addto(string const & ctr, int const val)
{
- CounterList::iterator it = counterList.find(ctr);
+ CounterList::iterator const it = counterList.find(ctr);
if (it == counterList.end()) {
lyxerr << "addto: Counter does not exist: " << ctr << endl;
return;
int Counters::value(string const & ctr) const
{
- CounterList::const_iterator cit = counterList.find(ctr);
+ CounterList::const_iterator const cit = counterList.find(ctr);
if (cit == counterList.end()) {
lyxerr << "value: Counter does not exist: " << ctr << endl;
return 0;
it->second.step();
it = counterList.begin();
- CounterList::iterator end = counterList.end();
+ CounterList::iterator const 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();
+ CounterList::iterator const end = counterList.end();
for (; it != end; ++it) {
it->second.reset();
}
namespace {
-char loweralphaCounter(int n)
+char loweralphaCounter(int const n)
{
- if (n < 1 || n > 26)
+ if (n < 1 || n > 26)
return '?';
return 'a' + n - 1;
}
-char alphaCounter(int n)
+char alphaCounter(int const n)
{
if (n < 1 || n > 26)
return '?';
}
-char hebrewCounter(int n)
+char hebrewCounter(int const n)
{
static const char hebrew[22] = {
'à', 'á', 'â', 'ã', 'ä', 'å', 'æ', 'ç', 'è',
}
-string const lowerromanCounter(int n)
+string const lowerromanCounter(int const n)
{
- static char const * roman[20] = {
+ static char const * const roman[20] = {
"i", "ii", "iii", "iv", "v",
"vi", "vii", "viii", "ix", "x",
"xi", "xii", "xiii", "xiv", "xv",
}
-string const romanCounter(int n)
+string const romanCounter(int const n)
{
- static char const * roman[20] = {
+ static char const * const roman[20] = {
"I", "II", "III", "IV", "V",
"VI", "VII", "VIII", "IX", "X",
"XI", "XII", "XIII", "XIV", "XV",
if (numbertype == "Roman")
return romanCounter(value(ctr));
- return tostr(value(ctr));
+ return convert<string>(value(ctr));
}
{
string label = format;
while (true) {
+#ifdef WITH_WARNINGS
+#warning Using boost::regex or boost::spirit would make this code a lot simpler... (Lgb)
+#endif
+
size_t const i = label.find('\\', 0);
if (i == string::npos)
break;
//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 STRCONV(os.str());
-}