X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fcounters.C;h=573eeb63c35ee7311eb709a70727c1263a74ad91;hb=9ee46b846e5e84ad40ceda4f4af94aeb86cd90a2;hp=29df4ed5df0cecdcca2470e79867bfac156d2740;hpb=6c3d48c0c6d38bd20392ae5b4e69d60b676256c7;p=lyx.git diff --git a/src/counters.C b/src/counters.C index 29df4ed5df..573eeb63c3 100644 --- a/src/counters.C +++ b/src/counters.C @@ -14,7 +14,6 @@ #include "counters.h" #include "debug.h" -#include "gettext.h" #include "support/lstrings.h" #include "support/convert.h" @@ -82,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]; @@ -95,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; } @@ -314,24 +313,3 @@ string Counters::counterLabel(string const & format) //lyxerr << "counterLabel: " << format << " -> " << label << endl; return label; } - - -string Counters::enumLabel(string const & ctr, Buffer const & buf) -{ - string format; - - if (ctr == "enumi") { - format = N_("\\arabic{enumi}."); - } - else if (ctr == "enumii") { - format = N_("(\\alph{enumii})"); - } - else if (ctr == "enumiii") { - format = N_("\\roman{enumiii}."); - } - else if (ctr == "enumiv") { - format = N_("\\Alph{enumiv}."); - } - - return counterLabel(buf.B_(format)); -}