anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

XHTML: fix generation of many useless </section>.

Browse Source
This commit is contained in:
Thibaut Cuvelier 2020-09-11 00:44:49 +02:00
parent faec783822
commit 5f0720e947
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/output_xhtml.cpp
View File

@ -611,20 +611,26 @@ void xhtmlParagraphs(Text const & text,
// Think about adding <section> and/or </section>s. // Think about adding <section> and/or </section>s.
if (style.category() == from_utf8("Sectioning")) { if (style.category() == from_utf8("Sectioning")) {
int level = style.toclevel;
// Need to close a previous section if it has the same level or a higher one (close <section> if opening a // Need to close a previous section if it has the same level or a higher one (close <section> if opening a
// <h2> after a <h2>, <h3>, <h4>, <h5>, or <h6>). More examples: // <h2> after a <h2>, <h3>, <h4>, <h5> or <h6>). More examples:
// - current: h2; back: h1; do not close any <section> // - current: h2; back: h1; do not close any <section>
// - current: h1; back: h2; close two <section> (first the <h2>, then the <h1>, so a new <h1> can come) // - current: h1; back: h2; close two <section> (first the <h2>, then the <h1>, so a new <h1> can come)
// The level (h1, h2, etc.) corresponds to style.toclevel. while (!headerLevels.empty() && level <= headerLevels.top()) {
while (! headerLevels.empty() && style.toclevel <= headerLevels.top()) { // Output the tag only if it corresponds to a legit section.
headerLevels.pop(); int stackLevel = headerLevels.top();
if (stackLevel != Layout::NOT_IN_TOC && level > 1) { // <h1> is the document title.
xs << xml::EndTag("section"); xs << xml::EndTag("section");
xs << xml::CR(); xs << xml::CR();
} }
headerLevels.pop();
}
// Open the new one. // Open the new section: first push it onto the stack, then output it in XHTML.
headerLevels.push(style.toclevel); headerLevels.push(level);
if (style.toclevel > 1) { // <h1> is the document title. // Some sectioning-like elements should not be output (such as FrontMatter).
if (level != Layout::NOT_IN_TOC && level > 1) { // <h1> is the document title.
xs << xml::StartTag("section"); xs << xml::StartTag("section");
xs << xml::CR(); xs << xml::CR();
} }
@ -669,9 +675,11 @@ void xhtmlParagraphs(Text const & text,
// If need be, close <section>s, but only at the end of the document (otherwise, dealt with at the beginning // If need be, close <section>s, but only at the end of the document (otherwise, dealt with at the beginning
// of the loop). // of the loop).
while (! headerLevels.empty() && headerLevels.top() > 1) { while (!headerLevels.empty() && headerLevels.top() > Layout::NOT_IN_TOC) {
docstring tag = from_utf8("</section>");
headerLevels.pop(); headerLevels.pop();
xs << xml::EndTag("section") << xml::CR(); xs << XMLStream::ESCAPE_NONE << tag;
xs << xml::CR();
} }
} }