X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fcounters.C;h=573eeb63c35ee7311eb709a70727c1263a74ad91;hb=9ee46b846e5e84ad40ceda4f4af94aeb86cd90a2;hp=1411660facf68c86cb2bdb80b9d8658dfc33f4a0;hpb=9c2ba3c4ff17e15876a2ed6987ea44838a38d43b;p=lyx.git diff --git a/src/counters.C b/src/counters.C index 1411660fac..573eeb63c3 100644 --- a/src/counters.C +++ b/src/counters.C @@ -81,7 +81,7 @@ void Counters::newCounter(string const & 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]; @@ -94,14 +94,14 @@ void Counters::newCounter(string const & newc, string const & masterc) 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; } @@ -313,31 +313,3 @@ string Counters::counterLabel(string const & format) //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(); -}