#include <config.h>
#include "Counters.h"
+#include "Layout.h"
#include "Lexer.h"
#include "support/convert.h"
}
-Counter::Counter(docstring const & mc, docstring const & ls,
- docstring const & lsa)
+Counter::Counter(docstring const & mc, docstring const & ls,
+ docstring const & lsa)
: master_(mc), labelstring_(ls), labelstringappendix_(lsa)
{
reset();
CT_WITHIN = 1,
CT_LABELSTRING,
CT_LABELSTRING_APPENDIX,
+ CT_PRETTYFORMAT,
CT_END
};
{ "end", CT_END },
{ "labelstring", CT_LABELSTRING },
{ "labelstringappendix", CT_LABELSTRING_APPENDIX },
+ { "prettyformat", CT_PRETTYFORMAT },
{ "within", CT_WITHIN }
};
if (master_ == "none")
master_.erase();
break;
+ case CT_PRETTYFORMAT:
+ lex.next();
+ prettyformat_ = lex.getDocString();
+ break;
case CT_LABELSTRING:
lex.next();
labelstring_ = lex.getDocString();
}
+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,
}
-bool Counters::read(Lexer & lex, docstring const & name)
+bool Counters::read(Lexer & lex, docstring const & name, bool makenew)
{
if (hasCounter(name)) {
LYXERR(Debug::TCLASS, "Reading existing counter " << to_utf8(name));
return counterList_[name].read(lex);
}
+
LYXERR(Debug::TCLASS, "Reading new counter " << to_utf8(name));
Counter cnt;
bool success = cnt.read(lex);
- if (success)
+ // if makenew is false, we will just discard what we read
+ if (success && makenew)
counterList_[name] = cnt;
- else
+ else if (!success)
LYXERR0("Error reading counter `" << name << "'!");
return success;
}
}
-void Counters::step(docstring const & ctr)
+void Counters::step(docstring const & ctr, UpdateType utype)
{
CounterList::iterator it = counterList_.find(ctr);
if (it == counterList_.end()) {
}
it->second.step();
+ if (utype == OutputUpdate) {
+ LASSERT(!counter_stack_.empty(), /* */);
+ counter_stack_.pop_back();
+ counter_stack_.push_back(ctr);
+ }
it = counterList_.begin();
CounterList::iterator const end = counterList_.end();
for (; it != end; ++it) {
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);
}
}
+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 & 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
+{
+ LASSERT(!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