diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2018-11-25 11:03:22 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2018-11-25 11:03:22 (GMT) |
| commit | 847305d5d6d0601c5370675284787ca48743b21e (patch) | |
| tree | 05fdacaaaf82668a080250d4bb303038b91cd15a | |
| parent | 549d5aeecdc909e6aa0434a2ddb30b735423ec03 (diff) | |
| parent | 5998b139855faba0e089338b6f53e8c1a6eee814 (diff) | |
| download | Doxygen-847305d5d6d0601c5370675284787ca48743b21e.zip Doxygen-847305d5d6d0601c5370675284787ca48743b21e.tar.gz Doxygen-847305d5d6d0601c5370675284787ca48743b21e.tar.bz2 | |
Merge branch 'feature/bug_xhtml_test_31' of https://github.com/albert-github/doxygen into albert-github-feature/bug_xhtml_test_31
| -rw-r--r-- | src/htmldocvisitor.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp index e1ac6d6..2502a20 100644 --- a/src/htmldocvisitor.cpp +++ b/src/htmldocvisitor.cpp @@ -1546,6 +1546,7 @@ void HtmlDocVisitor::visitPost(DocHtmlHeader *header) forceStartParagraph(header); } +static bool htmlImageForced = false; // problem with doxygen test 31 void HtmlDocVisitor::visitPre(DocImage *img) { if (img->type()==DocImage::Html) @@ -1562,7 +1563,8 @@ void HtmlDocVisitor::visitPre(DocImage *img) { typeSVG = (url.right(4)==".svg"); } - if (!inlineImage && !typeSVG) forceEndParagraph(img); + htmlImageForced = false; + if (!inlineImage && !typeSVG) htmlImageForced = forceEndParagraph(img); if (m_hide) return; QString baseName=img->name(); int i; @@ -1660,7 +1662,7 @@ void HtmlDocVisitor::visitPost(DocImage *img) if (!inlineImage && !typeSVG) { m_t << "</div>" << endl; - forceStartParagraph(img); + forceStartParagraph(img, htmlImageForced); } } else // other format |