#include <config.h>
#include "Counters.h"
-
#include "Lexer.h"
#include "support/convert.h"
#include "support/debug.h"
-#include "support/lstrings.h"
-
#include "support/lassert.h"
+#include "support/lstrings.h"
+#include <algorithm>
#include <sstream>
using namespace std;
}
-docstring const & Counter::labelString() const
+docstring const & Counter::labelString(bool in_appendix) const
+{
+ return in_appendix ? labelstringappendix_ : labelstring_;
+}
+
+
+docstring const & Counter::flatLabelString(bool in_appendix) const
{
- return labelstring_;
+ return in_appendix ? flatlabelstringappendix_ : flatlabelstring_;
}
-docstring const & Counter::labelStringAppendix() const
+void Counter::setFlatLabelStrings(docstring const & fls, docstring const & flsa)
{
- return labelstringappendix_;
+ flatlabelstring_ = fls;
+ flatlabelstringappendix_ = flsa;
}
<< endl;
return;
}
- counterList[newc] = Counter(masterc, ls, lsa);
+ counterList_[newc] = Counter(masterc, ls, lsa);
}
bool Counters::hasCounter(docstring const & c) const
{
- return counterList.find(c) != counterList.end();
+ return counterList_.find(c) != counterList_.end();
}
{
if (hasCounter(name)) {
LYXERR(Debug::TCLASS, "Reading existing counter " << to_utf8(name));
- return counterList[name].read(lex);
+ return counterList_[name].read(lex);
}
LYXERR(Debug::TCLASS, "Reading new counter " << to_utf8(name));
Counter cnt;
bool success = cnt.read(lex);
if (success)
- counterList[name] = cnt;
+ counterList_[name] = cnt;
else
LYXERR0("Error reading counter `" << name << "'!");
return success;
void Counters::set(docstring const & ctr, int const val)
{
- CounterList::iterator const it = counterList.find(ctr);
- if (it == counterList.end()) {
+ CounterList::iterator const it = counterList_.find(ctr);
+ if (it == counterList_.end()) {
lyxerr << "set: Counter does not exist: "
<< to_utf8(ctr) << endl;
return;
void Counters::addto(docstring const & ctr, int const val)
{
- CounterList::iterator const it = counterList.find(ctr);
- if (it == counterList.end()) {
+ CounterList::iterator const it = counterList_.find(ctr);
+ if (it == counterList_.end()) {
lyxerr << "addto: Counter does not exist: "
<< to_utf8(ctr) << endl;
return;
int Counters::value(docstring const & ctr) const
{
- CounterList::const_iterator const cit = counterList.find(ctr);
- if (cit == counterList.end()) {
+ CounterList::const_iterator const cit = counterList_.find(ctr);
+ if (cit == counterList_.end()) {
lyxerr << "value: Counter does not exist: "
<< to_utf8(ctr) << endl;
return 0;
void Counters::step(docstring const & ctr)
{
- CounterList::iterator it = counterList.find(ctr);
- if (it == counterList.end()) {
+ CounterList::iterator it = counterList_.find(ctr);
+ if (it == counterList_.end()) {
lyxerr << "step: Counter does not exist: "
<< to_utf8(ctr) << endl;
return;
}
it->second.step();
- it = counterList.begin();
- CounterList::iterator const end = counterList.end();
+ it = counterList_.begin();
+ CounterList::iterator const end = counterList_.end();
for (; it != end; ++it) {
if (it->second.master() == ctr) {
it->second.reset();
appendix_ = false;
subfloat_ = false;
current_float_.erase();
- CounterList::iterator it = counterList.begin();
- CounterList::iterator const end = counterList.end();
+ CounterList::iterator it = counterList_.begin();
+ CounterList::iterator const end = counterList_.end();
+ std::vector<docstring> callers;
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);
}
}
{
LASSERT(!match.empty(), /**/);
- CounterList::iterator it = counterList.begin();
- CounterList::iterator end = counterList.end();
+ CounterList::iterator it = counterList_.begin();
+ CounterList::iterator end = counterList_.end();
for (; it != end; ++it) {
if (it->first.find(match) != string::npos)
it->second.reset();
void Counters::copy(Counters & from, Counters & to, docstring const & match)
{
- CounterList::iterator it = counterList.begin();
- CounterList::iterator end = counterList.end();
+ CounterList::iterator it = counterList_.begin();
+ CounterList::iterator end = counterList_.end();
for (; it != end; ++it) {
if (it->first.find(match) != string::npos || match == "") {
to.set(it->first, from.value(it->first));
-//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::labelItem(docstring const & ctr,
- docstring const & numbertype)
+ docstring const & numbertype) const
{
- CounterList::const_iterator const cit = counterList.find(ctr);
- if (cit == counterList.end()) {
+ CounterList::const_iterator const cit = counterList_.find(ctr);
+ if (cit == counterList_.end()) {
lyxerr << "Counter "
<< to_utf8(ctr)
<< " does not exist." << endl;
}
-docstring Counters::theCounter(docstring const & counter)
+docstring Counters::theCounter(docstring const & counter) const
{
- std::set<docstring> callers;
- return theCounter(counter, callers);
+ CounterList::const_iterator it = counterList_.find(counter);
+ if (it == counterList_.end())
+ return from_ascii("??");
+ // FIXME: this should get translated.
+ return counterLabel(it->second.flatLabelString(appendix()));
}
-docstring Counters::theCounter(docstring const & counter,
- std::set<docstring> & callers)
-{
- if (!hasCounter(counter))
- return from_ascii("??");
+docstring Counters::flattenLabelString(docstring const & counter,
+ bool in_appendix,
+ vector<docstring> & callers) const
+{
docstring label;
- if (callers.find(counter) == callers.end()) {
+ if (find(callers.begin(), callers.end(), counter) != callers.end()) {
+ // recursion detected
+ lyxerr << "Warning: Recursion in label for counter `"
+ << counter << "' detected"
+ << endl;
+ return from_ascii("??");
+ }
- pair<std::set<docstring>::iterator, bool> result = callers.insert(counter);
-
- Counter const & c = counterList[counter];
- docstring ls = appendix() ? c.labelStringAppendix() : c.labelString();
+ CounterList::const_iterator it = counterList_.find(counter);
+ if (it == counterList_.end())
+ return from_ascii("??");
+ Counter const & c = it->second;
- if (ls.empty()) {
- if (!c.master().empty())
- ls = from_ascii("\\the") + c.master() + from_ascii(".");
- ls += from_ascii("\\arabic{") + counter + "}";
- }
+ docstring ls = c.labelString(in_appendix);
- label = counterLabel(ls, &callers);
+ callers.push_back(counter);
+ if (ls.empty()) {
+ if (!c.master().empty())
+ ls = flattenLabelString(c.master(), in_appendix, callers)
+ + from_ascii(".");
+ callers.pop_back();
+ return ls + from_ascii("\\arabic{") + counter + "}";
+ }
- callers.erase(result.first);
- } else {
- // recursion detected
- lyxerr << "Warning: Recursion in label for counter `"
- << counter << "' detected"
- << endl;
+ while (true) {
+ //lyxerr << "ls=" << to_utf8(ls) << endl;
+ size_t const i = ls.find(from_ascii("\\the"), 0);
+ if (i == docstring::npos)
+ break;
+ size_t const j = i + 4;
+ size_t k = j;
+ while (k < ls.size() && lowercase(ls[k]) >= 'a'
+ && lowercase(ls[k]) <= 'z')
+ ++k;
+ docstring const newc = ls.substr(j, k - j);
+ docstring const repl = flattenLabelString(newc, in_appendix, callers);
+ ls.replace(i, k - j + 4, repl);
}
+ callers.pop_back();
- return label;
+ return ls;
}
-docstring Counters::counterLabel(docstring const & format,
- std::set<docstring> * callers)
+docstring Counters::counterLabel(docstring const & format) const
{
docstring label = format;
// FIXME: Using regexps would be better, but we compile boost without
// wide regexps currently.
-
while (true) {
//lyxerr << "label=" << to_utf8(label) << endl;
size_t const i = label.find(from_ascii("\\the"), 0);
if (i == docstring::npos)
break;
- size_t j = i + 4;
+ size_t const j = i + 4;
size_t k = j;
while (k < label.size() && lowercase(label[k]) >= 'a'
&& lowercase(label[k]) <= 'z')
++k;
- docstring counter = label.substr(j, k - j);
- docstring repl = callers? theCounter(counter, *callers):
- theCounter(counter);
+ docstring const newc = label.substr(j, k - j);
+ docstring const repl = theCounter(newc);
label.replace(i, k - j + 4, repl);
}
-
while (true) {
//lyxerr << "label=" << to_utf8(label) << endl;
projects / lyx.git / blobdiff