Counter::Counter()
+ : initial_value_(0)
{
reset();
}
Counter::Counter(docstring const & mc, docstring const & ls,
docstring const & lsa)
- : master_(mc), labelstring_(ls), labelstringappendix_(lsa)
+ : initial_value_(0), master_(mc), labelstring_(ls), labelstringappendix_(lsa)
{
reset();
}
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 },
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();
return getout;
}
+
void Counter::set(int v)
{
value_ = v;
void Counter::reset()
{
- value_ = 0;
+ value_ = initial_value_;
}
}
+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_;
}
+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 & ls,
it->second.step();
if (utype == OutputUpdate) {
- LASSERT(!counter_stack_.empty(), /* */);
+ LBUFERR(!counter_stack_.empty());
counter_stack_.pop_back();
counter_stack_.push_back(ctr);
}
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();
}
+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();
}
-
// On the special cases, see http://mathworld.wolfram.com/RomanNumerals.html
// 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
{
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);
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);
}
-docstring Counters::prettyCounter(docstring const & counter,
+docstring Counters::prettyCounter(docstring const & name,
string const & lang) const
{
- CounterList::const_iterator it = counterList_.find(counter);
+ CounterList::const_iterator it = counterList_.find(name);
if (it == counterList_.end())
- return from_ascii("??");
+ return from_ascii("#");
Counter const & ctr = it->second;
- docstring const & format = ctr.prettyFormat();
- if (format.empty()) {
- docstring cntrname = translateIfPossible(counter, lang);
- return cntrname + " " + theCounter(counter, lang);
- }
- return counterLabel(format, lang);
+
+ 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
{
- LASSERT(!counter_stack_.empty(), /* */);
+ LBUFERR(!counter_stack_.empty());
return counter_stack_.back();
}
void Counters::beginEnvironment()
{
- docstring cnt = counter_stack_.back();
- counter_stack_.push_back(cnt);
- deque<docstring>::const_iterator it = counter_stack_.begin();
- deque<docstring>::const_iterator en = counter_stack_.end();
-// docstring d;
-// for (; it != en; ++it)
-// d += " --> " + *it;
-// LYXERR0(counter_stack_.size() << ": " << d);
+ counter_stack_.push_back(counter_stack_.back());
}
{
LASSERT(!counter_stack_.empty(), return);
counter_stack_.pop_back();
- deque<docstring>::const_iterator it = counter_stack_.begin();
- deque<docstring>::const_iterator en = counter_stack_.end();
-// docstring d;
-// for (; it != en; ++it)
-// d += " --> " + *it;
-// LYXERR0(counter_stack_.size() << ": " << d);
}