X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCounters.cpp;h=75c891128efa90777a0ba9a04a7164e5e14232aa;hb=167eea3990a1a2b5e64ab05ebb26986e76c3b160;hp=a0f1d139d7cce2f0819eb31949629c7f1f26caf4;hpb=1f8bf874aad7ce9367568bfd6521f35cbb2cbe66;p=lyx.git diff --git a/src/Counters.cpp b/src/Counters.cpp index a0f1d139d7..75c891128e 100644 --- a/src/Counters.cpp +++ b/src/Counters.cpp @@ -14,6 +14,7 @@ #include #include "Counters.h" +#include "Layout.h" #include "Lexer.h" #include "support/convert.h" @@ -32,14 +33,15 @@ namespace lyx { Counter::Counter() + : initial_value_(0) { reset(); } -Counter::Counter(docstring const & mc, docstring const & ls, - docstring const & lsa) - : master_(mc), labelstring_(ls), labelstringappendix_(lsa) +Counter::Counter(docstring const & mc, docstring const & ls, + docstring const & lsa) + : initial_value_(0), master_(mc), labelstring_(ls), labelstringappendix_(lsa) { reset(); } @@ -51,13 +53,17 @@ bool Counter::read(Lexer & lex) CT_WITHIN = 1, CT_LABELSTRING, CT_LABELSTRING_APPENDIX, + CT_PRETTYFORMAT, + CT_INITIALVALUE, CT_END }; LexerKeyword counterTags[] = { { "end", CT_END }, + { "initialvalue", CT_INITIALVALUE}, { "labelstring", CT_LABELSTRING }, { "labelstringappendix", CT_LABELSTRING_APPENDIX }, + { "prettyformat", CT_PRETTYFORMAT }, { "within", CT_WITHIN } }; @@ -70,7 +76,7 @@ bool Counter::read(Lexer & lex) case Lexer::LEX_UNDEF: lex.printError("Unknown counter tag `$$Token'"); continue; - default: + default: break; } switch (le) { @@ -80,6 +86,22 @@ bool Counter::read(Lexer & lex) if (master_ == "none") master_.erase(); break; + case CT_INITIALVALUE: + lex.next(); + initial_value_ = lex.getInteger(); + // getInteger() returns -1 on error, and larger + // negative values do not make much sense. + // In the other case, we subtract one, since the + // counter will be incremented before its first use. + if (initial_value_ <= -1) + initial_value_ = 0; + else + initial_value_ -= 1; + break; + case CT_PRETTYFORMAT: + lex.next(); + prettyformat_ = lex.getDocString(); + break; case CT_LABELSTRING: lex.next(); labelstring_ = lex.getDocString(); @@ -102,6 +124,7 @@ bool Counter::read(Lexer & lex) return getout; } + void Counter::set(int v) { value_ = v; @@ -128,7 +151,7 @@ void Counter::step() void Counter::reset() { - value_ = 0; + value_ = initial_value_; } @@ -138,6 +161,15 @@ docstring const & Counter::master() const } +bool Counter::checkAndRemoveMaster(docstring const & cnt) +{ + if (master_ != cnt) + return false; + master_ = docstring(); + return true; +} + + docstring const & Counter::labelString(bool in_appendix) const { return in_appendix ? labelstringappendix_ : labelstring_; @@ -150,8 +182,15 @@ Counter::StringMap & Counter::flatLabelStrings(bool in_appendix) const } +Counters::Counters() : appendix_(false), subfloat_(false), longtable_(false) +{ + layout_stack_.push_back(0); + counter_stack_.push_back(from_ascii("")); +} + + void Counters::newCounter(docstring const & newc, - docstring const & masterc, + docstring const & masterc, docstring const & ls, docstring const & lsa) { @@ -226,7 +265,32 @@ int Counters::value(docstring const & ctr) const } -void Counters::step(docstring const & ctr) +void Counters::resetSlaves(docstring const & ctr) +{ + CounterList::iterator it = counterList_.begin(); + CounterList::iterator const end = counterList_.end(); + for (; it != end; ++it) { + if (it->second.master() == ctr) { + it->second.reset(); + resetSlaves(it->first); + } + } +} + + +void Counters::stepMaster(docstring const & ctr, UpdateType utype) +{ + CounterList::iterator it = counterList_.find(ctr); + if (it == counterList_.end()) { + lyxerr << "step: Counter does not exist: " + << to_utf8(ctr) << endl; + return; + } + step(it->second.master(), utype); +} + + +void Counters::step(docstring const & ctr, UpdateType utype) { CounterList::iterator it = counterList_.find(ctr); if (it == counterList_.end()) { @@ -236,13 +300,13 @@ void Counters::step(docstring const & ctr) } it->second.step(); - it = counterList_.begin(); - CounterList::iterator const end = counterList_.end(); - for (; it != end; ++it) { - if (it->second.master() == ctr) { - it->second.reset(); - } + if (utype == OutputUpdate) { + LBUFERR(!counter_stack_.empty()); + counter_stack_.pop_back(); + counter_stack_.push_back(ctr); } + + resetSlaves(ctr); } @@ -255,12 +319,16 @@ void Counters::reset() CounterList::iterator const end = counterList_.end(); for (; it != end; ++it) it->second.reset(); + counter_stack_.clear(); + counter_stack_.push_back(from_ascii("")); + layout_stack_.clear(); + layout_stack_.push_back(0); } void Counters::reset(docstring const & match) { - LASSERT(!match.empty(), /**/); + LASSERT(!match.empty(), return); CounterList::iterator it = counterList_.begin(); CounterList::iterator end = counterList_.end(); @@ -271,6 +339,22 @@ void Counters::reset(docstring const & match) } +bool Counters::remove(docstring const & cnt) +{ + bool retval = counterList_.erase(cnt); + if (!retval) + return false; + CounterList::iterator it = counterList_.begin(); + CounterList::iterator end = counterList_.end(); + for (; it != end; ++it) { + if (it->second.checkAndRemoveMaster(cnt)) + LYXERR(Debug::TCLASS, "Removed master counter `" + + to_utf8(cnt) + "' from counter: " + to_utf8(it->first)); + } + return retval; +} + + void Counters::copy(Counters & from, Counters & to, docstring const & match) { CounterList::iterator it = counterList_.begin(); @@ -315,9 +399,8 @@ char hebrewCounter(int const n) } - // On the special cases, see http://mathworld.wolfram.com/RomanNumerals.html -// and for a list of roman numerals up to and including 3999, see +// and for a list of roman numerals up to and including 3999, see // http://www.research.att.com/~njas/sequences/a006968.txt. (Thanks to Joost // for this info.) docstring const romanCounter(int const n) @@ -326,25 +409,25 @@ docstring const romanCounter(int const n) "I", "II", "III", "IV", "V", "VI", "VII", "VIII", "IX" }; - + static char const * const tens[9] = { "X", "XX", "XXX", "XL", "L", "LX", "LXX", "LXXX", "XC" }; - + static char const * const hunds[9] = { "C", "CC", "CCC", "CD", "D", "DC", "DCC", "DCCC", "CM" }; - - if (n > 1000 || n < 1) + + if (n >= 1000 || n < 1) return from_ascii("??"); - + int val = n; string roman; switch (n) { //special cases - case 900: + case 900: roman = "CM"; break; case 400: @@ -381,6 +464,24 @@ docstring const lowerromanCounter(int const n) return lowercase(romanCounter(n)); } + +docstring const fnsymbolCounter(int const n) +{ + switch(n) { + case 1: return docstring(1, 0x002a); //* + case 2: return docstring(1, 0x2020); // dagger + case 3: return docstring(1, 0x2021); // double dagger + case 4: return docstring(1, 0x00A7); // section sign + case 5: return docstring(1, 0x00B6); // pilcrow sign + case 6: return docstring(1, 0x2016); // vertical bar + case 7: return docstring(2, 0x002a); // two * + case 8: return docstring(2, 0x2020); // two daggers + case 9: return docstring(2, 0x2021); // two double daggers + default: + return from_ascii("?"); + }; +} + } // namespace anon @@ -412,6 +513,9 @@ docstring Counters::labelItem(docstring const & ctr, if (numbertype == "Roman") return romanCounter(val); + if (numbertype == "fnsymbol") + return fnsymbolCounter(val); + return convert(val); } @@ -419,9 +523,9 @@ docstring Counters::labelItem(docstring const & ctr, docstring Counters::theCounter(docstring const & counter, string const & lang) const { - CounterList::const_iterator it = counterList_.find(counter); + CounterList::const_iterator it = counterList_.find(counter); if (it == counterList_.end()) - return from_ascii("??"); + return from_ascii("#"); Counter const & ctr = it->second; Counter::StringMap & sm = ctr.flatLabelStrings(appendix()); Counter::StringMap::iterator smit = sm.find(lang); @@ -436,13 +540,11 @@ docstring Counters::theCounter(docstring const & counter, } -docstring Counters::flattenLabelString(docstring const & counter, +docstring Counters::flattenLabelString(docstring const & counter, bool in_appendix, string const & lang, vector & callers) const { - docstring label; - if (find(callers.begin(), callers.end(), counter) != callers.end()) { // recursion detected lyxerr << "Warning: Recursion in label for counter `" @@ -450,10 +552,10 @@ docstring Counters::flattenLabelString(docstring const & counter, << endl; return from_ascii("??"); } - - CounterList::const_iterator it = counterList_.find(counter); + + CounterList::const_iterator it = counterList_.find(counter); if (it == counterList_.end()) - return from_ascii("??"); + return from_ascii("#"); Counter const & c = it->second; docstring ls = translateIfPossible(c.labelString(in_appendix), lang); @@ -461,7 +563,7 @@ docstring Counters::flattenLabelString(docstring const & counter, callers.push_back(counter); if (ls.empty()) { if (!c.master().empty()) - ls = flattenLabelString(c.master(), in_appendix, lang, callers) + ls = flattenLabelString(c.master(), in_appendix, lang, callers) + from_ascii("."); callers.pop_back(); return ls + from_ascii("\\arabic{") + counter + "}"; @@ -474,7 +576,7 @@ docstring Counters::flattenLabelString(docstring const & counter, break; size_t const j = i + 4; size_t k = j; - while (k < ls.size() && lowercase(ls[k]) >= 'a' + while (k < ls.size() && lowercase(ls[k]) >= 'a' && lowercase(ls[k]) <= 'z') ++k; docstring const newc = ls.substr(j, k - j); @@ -503,7 +605,7 @@ docstring Counters::counterLabel(docstring const & format, break; size_t const j = i + 4; size_t k = j; - while (k < label.size() && lowercase(label[k]) >= 'a' + while (k < label.size() && lowercase(label[k]) >= 'a' && lowercase(label[k]) <= 'z') ++k; docstring const newc(label, j, k - j); @@ -530,4 +632,69 @@ docstring Counters::counterLabel(docstring const & format, } +docstring Counters::prettyCounter(docstring const & name, + string const & lang) const +{ + CounterList::const_iterator it = counterList_.find(name); + if (it == counterList_.end()) + return from_ascii("#"); + Counter const & ctr = it->second; + + docstring const value = theCounter(name, lang); + docstring const & format = + translateIfPossible(ctr.prettyFormat(), lang); + if (format.empty()) + return value; + return subst(format, from_ascii("##"), value); +} + + +docstring Counters::currentCounter() const +{ + LBUFERR(!counter_stack_.empty()); + return counter_stack_.back(); +} + + +void Counters::setActiveLayout(Layout const & lay) +{ + LASSERT(!layout_stack_.empty(), return); + Layout const * const lastlay = layout_stack_.back(); + // we want to check whether the layout has changed and, if so, + // whether we are coming out of or going into an environment. + if (!lastlay) { + layout_stack_.pop_back(); + layout_stack_.push_back(&lay); + if (lay.isEnvironment()) + beginEnvironment(); + } else if (lastlay->name() != lay.name()) { + layout_stack_.pop_back(); + layout_stack_.push_back(&lay); + if (lastlay->isEnvironment()) { + // we are coming out of an environment + // LYXERR0("Out: " << lastlay->name()); + endEnvironment(); + } + if (lay.isEnvironment()) { + // we are going into a new environment + // LYXERR0("In: " << lay.name()); + beginEnvironment(); + } + } +} + + +void Counters::beginEnvironment() +{ + counter_stack_.push_back(counter_stack_.back()); +} + + +void Counters::endEnvironment() +{ + LASSERT(!counter_stack_.empty(), return); + counter_stack_.pop_back(); +} + + } // namespace lyx