anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use a more transparent lexic for bullet label functions

Browse Source
This commit is contained in:
Juergen Spitzmueller 2022-03-05 09:00:47 +01:00
parent ad31043987
commit c02fe70797
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Buffer.cpp
View File

@ -5158,7 +5158,7 @@ void Buffer::Impl::setLabel(ParIterator & it, UpdateType utype) const
switch(layout.labeltype) {
case LABEL_ITEMIZE: {
par.params().labelString(
bp.user_defined_bullet(par.itemdepth).getUnicode());
bp.user_defined_bullet(par.itemdepth).getLabel());
break;
}

14
src/Bullet.cpp
View File

@ -54,7 +54,7 @@ Bullet::Bullet(int f, int c, int s)
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();
}
@ -98,7 +98,7 @@ void Bullet::setText(docstring const & t)
font = character = size = MIN;
user_text = 1;
text = t;
unicode = t;
label = t;
testInvariant();
}
@ -139,7 +139,7 @@ Bullet & Bullet::operator=(Bullet const & b)
size = b.size;
user_text = b.user_text;
text = b.text;
unicode = b.unicode;
label = b.label;
this->testInvariant();
return *this;
}
@ -153,11 +153,11 @@ docstring const & Bullet::getText() const
}
docstring const & Bullet::getUnicode() const
docstring const & Bullet::getLabel() const
{
if (user_text == 0)
generateText();
return unicode;
return label;
}
@ -196,7 +196,7 @@ void Bullet::generateText() const
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;
@ -379,7 +379,7 @@ FontSize Bullet::bulletFontSize(int s)
}
docstring const Bullet::bulletUnicode(int f, int c)
docstring const Bullet::bulletLabel(int f, int c)
{
// see comment at bulletEntry
static int UnicodeBulletPanel0[CHARMAX] = {

10
src/Bullet.h
View File

@ -45,10 +45,10 @@ public:
int getSize() const;
///
FontSize getFontSize() const;
///
/// The text to be output
docstring const & getText() const;
///
docstring const & getUnicode() const;
/// The label displayed in the workarea
docstring const & getLabel() const;
///
Bullet & operator=(Bullet const &);
///
@ -85,7 +85,7 @@ private:
///
static FontSize bulletFontSize(int);
///
static docstring const bulletUnicode(int, int);
static docstring const bulletLabel(int, int);
///
int font;
@ -111,7 +111,7 @@ private:
and size settings.
*/
mutable docstring text;
mutable docstring unicode;
mutable docstring label;
};