summaryrefslogtreecommitdiffstats
path: root/src/htmldocvisitor.cpp
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2018-12-11 18:15:01 (GMT)
committeralbert-github <albert.tests@gmail.com>2018-12-11 18:15:01 (GMT)
commit57633468f2f0cfb7d4f93bf58c3e8801824dca8d (patch)
tree5d51ec3ae75b4f4c50b915e04a7251329a9159d0 /src/htmldocvisitor.cpp
parentfcab07461bde28c38d77ecf2954e9efdaac1379c (diff)
downloadDoxygen-57633468f2f0cfb7d4f93bf58c3e8801824dca8d.zip
Doxygen-57633468f2f0cfb7d4f93bf58c3e8801824dca8d.tar.gz
Doxygen-57633468f2f0cfb7d4f93bf58c3e8801824dca8d.tar.bz2
Tag sequence incorrect for svg image (XHTML)
svg images should also follow the rules a for other type images regarding div tag and paragraph tags
Diffstat (limited to 'src/htmldocvisitor.cpp')
-rw-r--r--src/htmldocvisitor.cpp16
1 files changed, 3 insertions, 13 deletions
diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp
index 4555fe4..74564ca 100644
--- a/src/htmldocvisitor.cpp
+++ b/src/htmldocvisitor.cpp
@@ -1616,7 +1616,7 @@ void HtmlDocVisitor::visitPre(DocImage *img)
{
typeSVG = (url.right(4)==".svg");
}
- if (!inlineImage && !typeSVG)
+ if (!inlineImage)
{
forceEndParagraph(img);
}
@@ -1627,7 +1627,7 @@ void HtmlDocVisitor::visitPre(DocImage *img)
{
baseName=baseName.right(baseName.length()-i-1);
}
- if (!inlineImage && !typeSVG) m_t << "<div class=\"image\">" << endl;
+ if (!inlineImage) m_t << "<div class=\"image\">" << endl;
QCString sizeAttribs;
if (!img->width().isEmpty())
{
@@ -1697,16 +1697,6 @@ void HtmlDocVisitor::visitPost(DocImage *img)
{
if (m_hide) return;
bool inlineImage = img->isInlineImage();
- bool typeSVG = FALSE;
- QCString url = img->url();
- if (url.isEmpty())
- {
- typeSVG = (img->name().right(4)==".svg");
- }
- else
- {
- typeSVG = (url.right(4)==".svg");
- }
if (img->hasCaption())
{
if (inlineImage)
@@ -1714,7 +1704,7 @@ void HtmlDocVisitor::visitPost(DocImage *img)
else
m_t << "</div>";
}
- if (!inlineImage && !typeSVG)
+ if (!inlineImage)
{
m_t << "</div>" << endl;
forceStartParagraph(img);