diff options
| author | Casper van Donderen <casper.vandonderen@nokia.com> | 2012-05-10 11:27:35 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-10 13:50:35 +0200 |
| commit | f6bd10b8ff5aacc6d214d8dd5be570a5301f9433 (patch) | |
| tree | 7c60e402e285bda199fbda352143370f8e481b8c /src/tools | |
| parent | d2456798c6d032ad27f518ed3cd7d3e82fc8d50a (diff) | |
QDoc: Generate images inline for \inlineimage
Change-Id: I1ee001870ac1289a8b0340707f62c7cc3fb84492
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/qdoc/ditaxmlgenerator.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/tools/qdoc/ditaxmlgenerator.cpp b/src/tools/qdoc/ditaxmlgenerator.cpp index b24a6af660..bed6e8a188 100644 --- a/src/tools/qdoc/ditaxmlgenerator.cpp +++ b/src/tools/qdoc/ditaxmlgenerator.cpp @@ -1279,13 +1279,11 @@ int DitaXmlGenerator::generateAtom(const Atom *atom, } } - if (currentTag() != DT_xref) + if (currentTag() != DT_xref && atom->type() != Atom::InlineImage) writeStartTag(DT_fig); writeStartTag(DT_image); writeHrefAttribute(protectEnc(fileName)); - if (atom->type() == Atom::InlineImage) - xmlWriter().writeAttribute("placement","inline"); - else { + if (atom->type() == Atom::Image) { xmlWriter().writeAttribute("placement","break"); xmlWriter().writeAttribute("align","center"); } @@ -1295,7 +1293,7 @@ int DitaXmlGenerator::generateAtom(const Atom *atom, writeEndTag(); // </alt> } writeEndTag(); // </image> - if (currentTag() != DT_xref) + if (currentTag() != DT_xref && atom->type() != Atom::InlineImage) writeEndTag(); // </fig> } break; |