anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for #10624.

Browse Source 
If we're in the first paragraph after a division (section, etc),
use the prefix for it.

(cherry picked from commit dd2efe8d0d)
This commit is contained in:
Richard Heck 2017-04-15 22:47:11 -04:00 committed by Richard Heck
parent 0662ffb98e
commit 7d0b7e0840
2 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/Text.cpp
View File

@ -1972,12 +1972,44 @@ docstring Text::currentState(Cursor const & cur, bool devel_mode) const
docstring Text::getPossibleLabel(Cursor const & cur) const docstring Text::getPossibleLabel(Cursor const & cur) const
{ {
pit_type pit = cur.pit(); pit_type textpit = cur.pit();
Layout const * layout = &(pars_[textpit].layout());
Layout const * layout = &(pars_[pit].layout()); // Will contain the label prefix.
docstring name;
// For captions, we just take the caption type
Inset * caption_inset = cur.innerInsetOfType(CAPTION_CODE);
if (caption_inset) {
string const & ftype = static_cast<InsetCaption *>(caption_inset)->floattype();
FloatList const & fl = cur.buffer()->params().documentClass().floats();
if (fl.typeExist(ftype)) {
Floating const & flt = fl.getType(ftype);
name = from_utf8(flt.refPrefix());
}
if (name.empty())
name = from_utf8(ftype.substr(0,3));
} else {
// For section, subsection, etc...
if (layout->latextype == LATEX_PARAGRAPH && textpit != 0) {
Layout const * layout2 = &(pars_[textpit - 1].layout());
if (layout2->latextype != LATEX_PARAGRAPH) {
--textpit;
layout = layout2;
}
}
if (layout->latextype != LATEX_PARAGRAPH)
name = layout->refprefix;
// If none of the above worked, see if the inset knows.
if (name.empty()) {
InsetLayout const & il = cur.inset().getLayout();
name = il.refprefix();
}
}
docstring text; docstring text;
docstring par_text = pars_[pit].asString(AS_STR_SKIPDELETE); docstring par_text = pars_[textpit].asString(AS_STR_SKIPDELETE);
// The return string of math matrices might contain linebreaks // The return string of math matrices might contain linebreaks
par_text = subst(par_text, '\n', '-'); par_text = subst(par_text, '\n', '-');
@ -1998,39 +2030,6 @@ docstring Text::getPossibleLabel(Cursor const & cur) const
if (text.size() > max_label_length) if (text.size() > max_label_length)
text.resize(max_label_length); text.resize(max_label_length);
// Will contain the label prefix.
docstring name;
// For section, subsection, etc...
if (layout->latextype == LATEX_PARAGRAPH && pit != 0) {
Layout const * layout2 = &(pars_[pit - 1].layout());
if (layout2->latextype != LATEX_PARAGRAPH) {
--pit;
layout = layout2;
}
}
if (layout->latextype != LATEX_PARAGRAPH)
name = layout->refprefix;
// For captions, we just take the caption type
Inset * caption_inset = cur.innerInsetOfType(CAPTION_CODE);
if (caption_inset) {
string const & ftype = static_cast<InsetCaption *>(caption_inset)->floattype();
FloatList const & fl = cur.buffer()->params().documentClass().floats();
if (fl.typeExist(ftype)) {
Floating const & flt = fl.getType(ftype);
name = from_utf8(flt.refPrefix());
}
if (name.empty())
name = from_utf8(ftype.substr(0,3));
}
// If none of the above worked, see if the inset knows.
if (name.empty()) {
InsetLayout const & il = cur.inset().getLayout();
name = il.refprefix();
}
if (!name.empty()) if (!name.empty())
text = name + ':' + text; text = name + ':' + text;

3
status.23x
View File

@ -214,6 +214,9 @@ What's new
- Handle math insets properly when inserting index entries (bug 6344). - Handle math insets properly when inserting index entries (bug 6344).
- When adding a label in the first paragraph after a division (section,
etc), use the label prefix for it (bug 10624).
* INTERNALS * INTERNALS