Bullet::Bullet(docstring const & t)
- : font(MIN), character(MIN), size(MIN), user_text(1), text(t), unicode(t)
+ : font(MIN), character(MIN), size(MIN), user_text(1), text(t), label(t)
{
testInvariant();
}
font = character = size = MIN;
user_text = 1;
text = t;
- unicode = t;
+ label = t;
testInvariant();
}
FontSize Bullet::getFontSize() const
{
-
if (size >= 0)
return bulletFontSize(size);
else
size = b.size;
user_text = b.user_text;
text = b.text;
- unicode = b.unicode;
+ label = b.label;
this->testInvariant();
return *this;
}
}
-docstring const & Bullet::getUnicode() const
+docstring const & Bullet::getLabel() const
{
if (user_text == 0)
generateText();
- return unicode;
+ return label;
}
if ((font >= 0) && (character >= 0)) {
text = bulletEntry(font, character);
- unicode = bulletUnicode(font, character);
+ label = bulletLabel(font, character);
if (size >= 0)
text = bulletSize(size) + text;
user_text = -1;
}
-docstring const Bullet::bulletUnicode(int f, int c)
+docstring const Bullet::bulletLabel(int f, int c)
{
// see comment at bulletEntry
static int UnicodeBulletPanel0[CHARMAX] = {