}
+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)
+{
+ 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.reset();
counter_stack_.clear();
counter_stack_.push_back(from_ascii(""));
+ layout_stack_.clear();
layout_stack_.push_back(0);
}
}
+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();
{
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 value = theCounter(name, lang);
docstring const & format = ctr.prettyFormat();
- // FIXME We need to "flatten" the format to get proper output,
- // but doing so will take a bit of work.
- if (true || format.empty()) {
- docstring cntrname = translateIfPossible(counter, lang);
- return cntrname + " " + theCounter(counter, lang);
- }
- return counterLabel(format, lang);
+ if (format.empty())
+ return value;
+ return subst(format, from_ascii("##"), value);
}
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);
}