anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-18 21:45:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DocBook: better handling of paragraphs containing notes in the abstract.

Browse Source
This commit is contained in:
Thibaut Cuvelier 2020-07-20 02:47:40 +02:00
parent be3e79c2a0
commit 51939801f5
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/output_docbook.cpp
View File

@ -669,7 +669,15 @@ DocBookInfoTag getParagraphsWithInfo(ParagraphList const &paragraphs, pit_type c
pit_type cpit = bpit; pit_type cpit = bpit;
while (cpit < epit) { while (cpit < epit) {
Layout const &style = paragraphs[cpit].layout(); // Skip paragraphs only containing one note.
Paragraph const &par = paragraphs[cpit];
if (par.size() == 1 && dynamic_cast<InsetNote*>(paragraphs[cpit].insetList().get(0))) {
cpit += 1;
continue;
}
// Based on layout information, store this paragraph in one set: should be in <info>, must be.
Layout const &style = par.layout();
if (style.docbookininfo() == "always") { if (style.docbookininfo() == "always") {
mustBeInInfo.emplace(cpit); mustBeInInfo.emplace(cpit);
} else if (style.docbookininfo() == "maybe") { } else if (style.docbookininfo() == "maybe") {
@ -680,7 +688,8 @@ DocBookInfoTag getParagraphsWithInfo(ParagraphList const &paragraphs, pit_type c
} }
cpit += 1; cpit += 1;
} }
// Now, bpit points to the last paragraph that has things that could go in <info>. // Now, cpit points to the last paragraph that has things that could go in <info>.
// bpit is still the beginning of the <info> part.
return make_tuple(shouldBeInInfo, mustBeInInfo, bpit, cpit); return make_tuple(shouldBeInInfo, mustBeInInfo, bpit, cpit);
} }