}
if (!par->labelstring.empty()) {
- par->labelstring.erase();
+ par->labelstring.clear();
}
if (layout->margintype == MARGIN_MANUAL) {
if (!layout->labelstring.empty())
par->labelstring = layout->labelstring;
else
- par->labelstring.erase();
+ par->labelstring.clear();
}
else {
if (!layout->labelstring_appendix.empty())
par->labelstring = layout->labelstring_appendix;
else
- par->labelstring.erase();
+ par->labelstring.clear();
}
if (!par->appendix){
pos = par->PositionInParFromPos(pos);
par = tmppar;
}
- if (par->IsDummy() && par->previous &&
+ if (par->IsDummy() && par->previous &&
par->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
- while (par->previous &&
- par->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE){
+ while (par->previous &&
+ ((par->previous->IsDummy() && par->previous->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) ||
+ (par->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE))) {
par = par->previous ;
+ if (par->IsDummy() &&
+ par->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
+ pos += par->last + 1;
}
if (par->previous) {
par = par->previous;