diff options
| author | Martin Smith <martin.smith@nokia.com> | 2011-03-24 12:58:48 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2011-03-24 12:58:48 (GMT) |
| commit | 923c8805e86d5dc98f9899949a04e93d15b506d0 (patch) | |
| tree | 6d4a1983cc3655aef76379a5164b0f521bb76b30 /tools/qdoc3 | |
| parent | 8e07e0fb803fe1c3e48083a64e7c93a910c1c029 (diff) | |
| download | Qt-923c8805e86d5dc98f9899949a04e93d15b506d0.zip Qt-923c8805e86d5dc98f9899949a04e93d15b506d0.tar.gz Qt-923c8805e86d5dc98f9899949a04e93d15b506d0.tar.bz2 | |
qdoc: Don't wrap <image> in <fig> if in an <xref>
Diffstat (limited to 'tools/qdoc3')
| -rw-r--r-- | tools/qdoc3/ditaxmlgenerator.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp index 5a66007..018cbc7 100644 --- a/tools/qdoc3/ditaxmlgenerator.cpp +++ b/tools/qdoc3/ditaxmlgenerator.cpp @@ -1193,7 +1193,8 @@ int DitaXmlGenerator::generateAtom(const Atom *atom, fileName = QLatin1String("images/") + protectEnc(atom->string()); } - writeStartTag(DT_fig); + if (currentTag() != DT_xref) + writeStartTag(DT_fig); writeStartTag(DT_image); xmlWriter().writeAttribute("href",protectEnc(fileName)); if (atom->type() == Atom::InlineImage) @@ -1208,7 +1209,8 @@ int DitaXmlGenerator::generateAtom(const Atom *atom, writeEndTag(); // </alt> } writeEndTag(); // </image> - writeEndTag(); // </fig> + if (currentTag() != DT_xref) + writeEndTag(); // </fig> } break; case Atom::ImageText: |