#include <config.h>
#include "Counters.h"
+#include "Layout.h"
#include "Lexer.h"
#include "support/convert.h"
#include "support/debug.h"
+#include "support/gettext.h"
#include "support/lassert.h"
#include "support/lstrings.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();
}
-docstring const & Counter::flatLabelString(bool in_appendix) const
+Counter::StringMap & Counter::flatLabelStrings(bool in_appendix) const
{
return in_appendix ? flatlabelstringappendix_ : flatlabelstring_;
}
-void Counter::setFlatLabelStrings(docstring const & fls, docstring const & flsa)
-{
- flatlabelstring_ = fls;
- flatlabelstringappendix_ = flsa;
-}
-
-
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) {
current_float_.erase();
CounterList::iterator it = counterList_.begin();
CounterList::iterator const end = counterList_.end();
- std::vector<docstring> callers;
- for (; it != end; ++it) {
+ for (; it != end; ++it)
it->second.reset();
- // Compute the explicit counter labels without any
- // \thexxx strings, in order to avoid recursion.
- // It only needs to be done when the textclass is
- // updated, but in practice the extra work is probably
- // not noticeable (JMarc)
- docstring const fls = flattenLabelString(it->first, false, callers);
- docstring const flsa = flattenLabelString(it->first, true, callers);
- it->second.setFlatLabelStrings(fls, flsa);
- }
+ counter_stack_.clear();
+ counter_stack_.push_back(from_ascii(""));
+ layout_stack_.push_back(0);
}
-//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
-//for this info.)
+// 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
+// for this info.)
docstring const romanCounter(int const n)
{
static char const * const ones[9] = {
}
-docstring Counters::theCounter(docstring const & counter) const
+docstring Counters::theCounter(docstring const & counter,
+ string const & lang) const
{
CounterList::const_iterator it = counterList_.find(counter);
if (it == counterList_.end())
return from_ascii("??");
- return counterLabel(it->second.flatLabelString(appendix()));
+ Counter const & ctr = it->second;
+ Counter::StringMap & sm = ctr.flatLabelStrings(appendix());
+ Counter::StringMap::iterator smit = sm.find(lang);
+ if (smit != sm.end())
+ return counterLabel(smit->second, lang);
+
+ vector<docstring> callers;
+ docstring const & fls = flattenLabelString(counter, appendix(),
+ lang, callers);
+ sm[lang] = fls;
+ return counterLabel(fls, lang);
}
-docstring const Counters::flattenLabelString(docstring const & counter, bool in_appendix,
+docstring Counters::flattenLabelString(docstring const & counter,
+ bool in_appendix,
+ string const & lang,
vector<docstring> & callers) const
{
docstring label;
return from_ascii("??");
Counter const & c = it->second;
- docstring ls = c.labelString(in_appendix);
+ docstring ls = translateIfPossible(c.labelString(in_appendix), lang);
callers.push_back(counter);
if (ls.empty()) {
if (!c.master().empty())
- ls = flattenLabelString(c.master(), in_appendix, callers)
+ ls = flattenLabelString(c.master(), in_appendix, lang, callers)
+ from_ascii(".");
callers.pop_back();
return ls + from_ascii("\\arabic{") + counter + "}";
&& lowercase(ls[k]) <= 'z')
++k;
docstring const newc = ls.substr(j, k - j);
- docstring const repl = flattenLabelString(newc, in_appendix, callers);
+ docstring const repl = flattenLabelString(newc, in_appendix,
+ lang, callers);
ls.replace(i, k - j + 4, repl);
}
callers.pop_back();
}
-docstring Counters::counterLabel(docstring const & format) const
+docstring Counters::counterLabel(docstring const & format,
+ string const & lang) const
{
docstring label = format;
// FIXME: Using regexps would be better, but we compile boost without
// wide regexps currently.
+ docstring const the = from_ascii("\\the");
while (true) {
- //lyxerr << "label=" << to_utf8(label) << endl;
- size_t const i = label.find(from_ascii("\\the"), 0);
+ //lyxerr << "label=" << label << endl;
+ size_t const i = label.find(the, 0);
if (i == docstring::npos)
break;
size_t const j = i + 4;
while (k < label.size() && lowercase(label[k]) >= 'a'
&& lowercase(label[k]) <= 'z')
++k;
- docstring const newc = label.substr(j, k - j);
- docstring const repl = theCounter(newc);
- label.replace(i, k - j + 4, repl);
+ docstring const newc(label, j, k - j);
+ label.replace(i, k - i, theCounter(newc, lang));
}
while (true) {
- //lyxerr << "label=" << to_utf8(label) << endl;
+ //lyxerr << "label=" << label << endl;
size_t const i = label.find('\\', 0);
if (i == docstring::npos)
break;
docstring const numbertype(label, i + 1, j - i - 1);
docstring const counter(label, j + 1, k - j - 1);
- docstring const rep = labelItem(counter, numbertype);
- label = docstring(label, 0, i) + rep
- + docstring(label, k + 1, docstring::npos);
+ label.replace(i, k + 1 - i, labelItem(counter, numbertype));
}
- //lyxerr << "DONE! label=" << to_utf8(label) << endl;
+ //lyxerr << "DONE! label=" << label << endl;
return label;
}
+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 = ctr.prettyFormat();
+ 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()
+{
+ 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);
+}
+
+
+void Counters::endEnvironment()
+{
+ 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);
+}
+
+
} // namespace lyx
projects / lyx.git / blobdiff