anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix logic of new InsetFlex::updateBuffer() routine from a9614f1.

Browse Source
This commit is contained in:
Richard Heck 2013-05-28 09:41:44 -04:00
parent b47422bac2
commit 39ea882806
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/insets/InsetFlex.cpp
View File

@ -129,21 +129,28 @@ void InsetFlex::doDispatch(Cursor & cur, FuncRequest & cmd)
void InsetFlex::updateBuffer(ParIterator const & it, UpdateType utype)
{
BufferParams const & bp = buffer().masterBuffer()->params();
Counters & cnts = bp.documentClass().counters();
if (utype == OutputUpdate) {
// the counter is local to this inset
cnts.saveLastCounter();
}
InsetLayout const & il = getLayout();
docstring const & count = il.counter();
docstring custom_label = translateIfPossible(il.labelstring());
if (cnts.hasCounter(count))
Counters & cnts = bp.documentClass().counters();
docstring const & count = il.counter();
bool const have_counter = cnts.hasCounter(count);
if (have_counter) {
cnts.step(count, utype);
custom_label += ' ' +
cnts.theCounter(count, it.paragraph().getParLanguage(bp)->code());
}
setLabel(custom_label);
bool const save_counter = have_counter && utype == OutputUpdate;
if (save_counter) {
// we assume the counter is local to this inset
// if this turns out to be wrong in some case, we will
// need a layout flag
cnts.saveLastCounter();
}
InsetCollapsable::updateBuffer(it, utype);
if (utype == OutputUpdate)
if (save_counter)
cnts.restoreLastCounter();
}