From 923c8805e86d5dc98f9899949a04e93d15b506d0 Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@nokia.com>
Date: Thu, 24 Mar 2011 13:58:48 +0100
Subject: qdoc: Don't wrap <image> in <fig> if in an <xref>

---
 tools/qdoc3/ditaxmlgenerator.cpp | 6 ++++--
 1 file 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:
-- 
cgit v0.12