X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fcounters.C;h=573eeb63c35ee7311eb709a70727c1263a74ad91;hb=9ee46b846e5e84ad40ceda4f4af94aeb86cd90a2;hp=27fbc7ae3a556159b01c8e7c5a03691214d46bc7;hpb=6894fa6008fcb92d385dade7168b09b3e4cb128f;p=lyx.git diff --git a/src/counters.C b/src/counters.C index 27fbc7ae3a..573eeb63c3 100644 --- a/src/counters.C +++ b/src/counters.C @@ -1,27 +1,30 @@ -/* This file is part of - * ====================================================== +/** + * \file counters.C + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * LyX, The Document Processor + * \author Lars Gullik Bjønnes + * \author Martin Vermeer + * \author André Pönitz * - * Copyright 1995 Matthias Ettrich - * Copyright 1995-2001 The LyX Team. - * - * - * ====================================================== */ - -#ifdef __GNUG__ -#pragma implementation -#endif + * Full author contact details are available in file CREDITS. + */ #include #include "counters.h" #include "debug.h" + #include "support/lstrings.h" -#include "support/LAssert.h" +#include "support/convert.h" + +#include + +#include using std::endl; -using std::vector; +using std::ostringstream; +using std::string; Counter::Counter() @@ -59,98 +62,56 @@ void Counter::reset() value_ = 0; } + string Counter::master() const { return master_; } + void Counter::setMaster(string const & m) { master_ = m; } -Counters::Counters() -{ - // Ehh, should this take a textclass arg? - - // Sectioning counters: - newCounter("part"); - newCounter("chapter"); - newCounter("section", "chapter"); - newCounter("subsection", "section"); - newCounter("subsubsection", "subsection"); - newCounter("paragraph", "subsubsection"); - newCounter("subparagraph", "paragraph"); - - sects.push_back("chapter"); - sects.push_back("section"); - sects.push_back("subsection"); - sects.push_back("subsubsection"); - sects.push_back("paragraph"); - sects.push_back("subparagraph"); - - // Enumeration counters: - newCounter("enumi"); - newCounter("enumii", "enumi"); - newCounter("enumiii", "enumii"); - newCounter("enumiv", "enumiii"); - - enums.push_back("enumi"); - enums.push_back("enumii"); - enums.push_back("enumiii"); - enums.push_back("enumiv"); - - // Biblio: - newCounter("bibitem"); - - // Float counters: - newCounter("Figure"); - newCounter("Table"); -} - - 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]; - cit = counterList.find(newc); - cit->second.setMaster(""); } 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; } - counterList[newc]; - cit = counterList.find(newc); - cit->second.setMaster(masterc); + counterList[newc].setMaster(masterc); } -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; @@ -159,9 +120,9 @@ void Counters::set(string const & ctr, int val) } -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; @@ -172,7 +133,7 @@ void Counters::addto(string const & ctr, int val) 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; @@ -191,7 +152,7 @@ void Counters::step(string const & ctr) 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(); @@ -203,7 +164,7 @@ void Counters::step(string const & ctr) 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(); } @@ -212,7 +173,7 @@ void Counters::reset() void Counters::reset(string const & match) { - lyx::Assert(!match.empty()); + BOOST_ASSERT(!match.empty()); CounterList::iterator it = counterList.begin(); CounterList::iterator end = counterList.end(); @@ -237,144 +198,118 @@ void Counters::copy(Counters & from, Counters & to, string const & match) namespace { -inline -char loweralphaCounter(int n) +char loweralphaCounter(int const n) { if (n < 1 || n > 26) return '?'; - else - return 'a' + n - 1; + return 'a' + n - 1; } -inline -char alphaCounter(int n) +char alphaCounter(int const n) { if (n < 1 || n > 26) return '?'; - else - return 'A' + n - 1; + return 'A' + n - 1; } -inline -char hebrewCounter(int n) +char hebrewCounter(int const n) { static const char hebrew[22] = { 'à', 'á', 'â', 'ã', 'ä', 'å', 'æ', 'ç', 'è', 'é', 'ë', 'ì', 'î', 'ð', 'ñ', 'ò', 'ô', 'ö', '÷', 'ø', 'ù', 'ú' }; + if (n < 1 || n > 22) return '?'; - else - return hebrew[n-1]; + return hebrew[n - 1]; } -inline -string const romanCounter(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", "xvi", "xvii", "xviii", "xix", "xx" }; + + if (n < 1 || n > 20) + return "??"; + return roman[n - 1]; +} + + +string const romanCounter(int const n) +{ + static char const * 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]; + return roman[n - 1]; } } // namespace anon -string Counters::labelItem(string const & ctr, - string const & numbertype, - string const & langtype, - bool first) +string Counters::labelItem(string const & ctr, string const & numbertype) { - ostringstream s, o; - CounterList::iterator it = counterList.find(ctr); - if (it == counterList.end()) { - lyxerr << "Counter does not exist." << endl; - return ""; - } - string mstr = it->second.master(); - 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(); + if (counterList.find(ctr) == counterList.end()) { + lyxerr << "Counter " << ctr << " does not exist." << endl; + return string(); } - return s.str(); + + if (numbertype == "hebrew") + return string(1, hebrewCounter(value(ctr))); + + if (numbertype == "alph") + return string(1, loweralphaCounter(value(ctr))); + + if (numbertype == "Alph") + return string(1, alphaCounter(value(ctr))); + + if (numbertype == "roman") + return lowerromanCounter(value(ctr)); + + if (numbertype == "Roman") + return romanCounter(value(ctr)); + + return convert(value(ctr)); } -string Counters::numberLabel(string const & ctr, - string const & numbertype, - string const & langtype, - int head) +string Counters::counterLabel(string const & format) { - ostringstream s, o; - 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); - } + string label = format; + while (true) { +#ifdef WITH_WARNINGS +#warning Using boost::regex or boost::spirit would make this code a lot simpler... (Lgb) +#endif - } else if (numbertype == "enumeration") { - ostringstream ei, eii, eiii, eiv; - //string ei, eiii, eiv; - //char eii; - 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(); - } + size_t const i = label.find('\\', 0); + if (i == string::npos) + break; + size_t const j = label.find('{', i + 1); + if (j == string::npos) + break; + size_t const k = label.find('}', j + 1); + if (k == string::npos) + break; + string const numbertype(label, i + 1, j - i - 1); + string const counter(label, j + 1, k - j - 1); + string const rep = labelItem(counter, numbertype); + label = string(label, 0, i) + rep + string(label, k + 1, string::npos); + //lyxerr << " : " << " (" << counter << "," + // << numbertype << ") -> " << label << endl; } - return s.str(); + //lyxerr << "counterLabel: " << format << " -> " << label << endl; + return label; }