diff options
| -rw-r--r-- | src/htmldocvisitor.cpp | 22 | ||||
| -rw-r--r-- | src/markdown.cpp | 2 |
2 files changed, 4 insertions, 20 deletions
diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp index 6e100fb..bb35cae 100644 --- a/src/htmldocvisitor.cpp +++ b/src/htmldocvisitor.cpp @@ -1750,7 +1750,7 @@ void HtmlDocVisitor::visitPre(DocImage *img) { src = correctURL(url,img->relPath()); } - if (typeSVG) + if (typeSVG && !inlineImage) { m_t << "<object type=\"image/svg+xml\" data=\"" << convertToHtml(src) << "\"" << sizeAttribs << attrs; @@ -1789,14 +1789,7 @@ void HtmlDocVisitor::visitPre(DocImage *img) } else if (inlineImage) { - if (typeSVG) - { - m_t << ">" << alt << "</object>"; - } - else - { - m_t << "/>"; - } + m_t << "/>"; } } else // other format -> skip @@ -1816,16 +1809,7 @@ void HtmlDocVisitor::visitPost(DocImage *img) { if (inlineImage) { - if (img->isSVG()) - { - QCString alt; - QCString attrs = htmlAttribsToString(img->attribs(),&alt); - m_t << "\">" << alt << "</object>"; - } - else - { - m_t << "\"/>"; - } + m_t << "\"/>"; } else // end <div class="caption"> { diff --git a/src/markdown.cpp b/src/markdown.cpp index b99db00..2e67145 100644 --- a/src/markdown.cpp +++ b/src/markdown.cpp @@ -652,7 +652,7 @@ static int processEmphasis(GrowBuf &out,const char *data,int offset,int size) static void writeMarkdownImage(GrowBuf &out, const char *fmt, bool explicitTitle, QCString title, QCString content, QCString link, FileDef *fd) { - out.addStr("@image "); + out.addStr("@image{inline} "); out.addStr(fmt); out.addStr(" "); out.addStr(link.mid(fd ? 0 : 5)); |