Add button to stop processing

[features.git] / src / output_xhtml.cpp

diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index 7d9a69bd6ae6369627f7b734968f0f7069b4dab1..f1bcfb879b3cfba5b579fdde04d05b65bc9c41a8 100644 (file)
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Richard Heck
+ * \author Richard Kimberly Heck
  *
  * This code is based upon output_docbook.cpp
  *
@@ -15,12 +15,10 @@
 #include "output_xhtml.h"
 
 #include "Buffer.h"
-#include "buffer_funcs.h"
 #include "BufferParams.h"
 #include "Counters.h"
 #include "Font.h"
 #include "Layout.h"
-#include "OutputParams.h"
 #include "Paragraph.h"
 #include "ParagraphList.h"
 #include "ParagraphParameters.h"
@@ -28,13 +26,10 @@
 #include "Text.h"
 #include "TextClass.h"
 
-#include "support/convert.h"
-#include "support/debug.h"
 #include "support/lassert.h"
-#include "support/lstrings.h"
-#include "support/textutils.h"
 
 #include <stack>
+#include <iostream>
 
 // Uncomment to activate debugging code.
 // #define XHTML_DEBUG
@@ -610,21 +605,29 @@ void xhtmlParagraphs(Text const & text,
                ParagraphList::const_iterator send;
 
                // Think about adding <section> and/or </section>s.
+               // Document title is not in Sectioning, but rather in FrontMatter, so that it does not need to be taken
+               // into account.
                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
-                       // <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: 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() && style.toclevel <= headerLevels.top()) {
+                       while (!headerLevels.empty() && level <= headerLevels.top()) {
+                               // Output the tag only if it corresponds to a legit section.
+                               int stackLevel = headerLevels.top();
+                               if (stackLevel != Layout::NOT_IN_TOC) {
+                                       xs << xml::EndTag("section");
+                                       xs << xml::CR();
+                               }
                                headerLevels.pop();
-                               xs << xml::EndTag("section");
-                               xs << xml::CR();
                        }
 
-                       // Open the new one.
-                       headerLevels.push(style.toclevel);
-                       if (style.toclevel > 1) { // <h1> is the document title.
+                       // Open the new section: first push it onto the stack, then output it in XHTML.
+                       headerLevels.push(level);
+                       // Some sectioning-like elements should not be output (such as FrontMatter).
+                       if (level != Layout::NOT_IN_TOC ) {
                                xs << xml::StartTag("section");
                                xs << xml::CR();
                        }
@@ -669,9 +672,10 @@ 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
        // of the loop).
-       while (! headerLevels.empty() && headerLevels.top() > 1) {
+       while (!headerLevels.empty() && headerLevels.top() != Layout::NOT_IN_TOC) {
                headerLevels.pop();
-               xs << xml::EndTag("section") << xml::CR();
+               xs << xml::EndTag("section");
+               xs << xml::CR();
        }
 }