Incorrect number tag sequence for xhtml with htmlinclude command possible

Analogous to the `\htmlonly` also with the `\htmlinclude` command it is possible that some parts are added that cannot be inside a `<p> ... <\/p>` and thus we have to temporary close (and later reopen) the paragraph.
The option `[block]` has been added to the `\htmlinclude` command (analogous to the `\htmlonly` command).
Problem can be seen with the default doxygen test 30 (`[030_htmlinclude.dox]: test the \htmlinclude command`).

1 files changed, 6 insertions, 1 deletions

diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp
index e1ac6d6..130bbae 100644
--- a/src/htmldocvisitor.cpp
+++ b/src/htmldocvisitor.cpp
@@ -608,7 +608,12 @@ void HtmlDocVisitor::visit(DocInclude *inc)
     case DocInclude::DontInclude: 
       break;
     case DocInclude::HtmlInclude: 
-      m_t << inc->text(); 
+      {
+        bool forced = false;
+        if (inc->isBlock()) forced  = forceEndParagraph(inc);
+        m_t << inc->text();
+        if (inc->isBlock()) forceStartParagraph(inc, forced);
+      }
       break;
     case DocInclude::LatexInclude:
       break;