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();
void Counter::reset()
{
- value_ = 0;
+ value_ = initial_value_;
}
}
-Counters::Counters() : appendix_(false), subfloat_(false)
+Counters::Counters() : appendix_(false), subfloat_(false), longtable_(false)
{
layout_stack_.push_back(0);
counter_stack_.push_back(from_ascii(""));
it->second.step();
if (utype == OutputUpdate) {
- LBUFERR(!counter_stack_.empty(), _("Empty counter stack!"));
+ LBUFERR(!counter_stack_.empty());
counter_stack_.pop_back();
counter_stack_.push_back(ctr);
}
return lowercase(romanCounter(n));
}
+
+docstring const fnsymbolCounter(int const n)
+{
+ switch(n) {
+ case 1: return docstring(1, 0x002a); //*
+ case 2: return docstring(1, 0x2020); // dagger
+ case 3: return docstring(1, 0x2021); // double dagger
+ case 4: return docstring(1, 0x00A7); // section sign
+ case 5: return docstring(1, 0x00B6); // pilcrow sign
+ case 6: return docstring(1, 0x2016); // vertical bar
+ case 7: return docstring(2, 0x002a); // two *
+ case 8: return docstring(2, 0x2020); // two daggers
+ case 9: return docstring(2, 0x2021); // two double daggers
+ default:
+ return from_ascii("?");
+ };
+}
+
} // namespace anon
if (numbertype == "Roman")
return romanCounter(val);
+ if (numbertype == "fnsymbol")
+ return fnsymbolCounter(val);
+
return convert<docstring>(val);
}
docstring Counters::currentCounter() const
{
- LBUFERR(!counter_stack_.empty(), _("Empty counter stack!"));
+ LBUFERR(!counter_stack_.empty());
return counter_stack_.back();
}