summaryrefslogtreecommitdiffstats
path: root/src/htmldocvisitor.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2018-12-03 19:31:21 (GMT)
committerGitHub <noreply@github.com>2018-12-03 19:31:21 (GMT)
commit7fa0f6968e5544039c8c7c5e74706ab3d0d5a3e5 (patch)
tree0bbefd96ba7647b590b23a5f6c8efe1476a23f0b /src/htmldocvisitor.cpp
parent83216e860205fcef3251c9a374d2f526cd52417d (diff)
parent1c0a565a28582d0bc0776988ffef16565563e950 (diff)
downloadDoxygen-7fa0f6968e5544039c8c7c5e74706ab3d0d5a3e5.zip
Doxygen-7fa0f6968e5544039c8c7c5e74706ab3d0d5a3e5.tar.gz
Doxygen-7fa0f6968e5544039c8c7c5e74706ab3d0d5a3e5.tar.bz2
Merge pull request #6643 from albert-github/feature/bug_xhtml_test_30
Incorrect number tag sequence for xhtml with htmlinclude command possible
Diffstat (limited to 'src/htmldocvisitor.cpp')
-rw-r--r--src/htmldocvisitor.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp
index 484af1b..e679445 100644
--- a/src/htmldocvisitor.cpp
+++ b/src/htmldocvisitor.cpp
@@ -659,7 +659,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;