Merge pull request #6645 from albert-github/feature/bug_xhtml_test_11

Incorrect  tag sequence for xhtml with class diagram possible

3 files changed, 2 insertions, 2 deletions

diff --git a/src/context.cpp b/src/context.cpp
index 405d0b5..b05ee9f 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -2010,6 +2010,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
               d.writeImage(t,g_globals.outputDir,
                            relPathAsString(),
                            m_classDef->getOutputFileBase());
+	      t << "<div/></map>" << endl;
               t << "</div>";
             }
             break;
diff --git a/src/diagram.cpp b/src/diagram.cpp
index 667aa85..83e42b3 100644
--- a/src/diagram.cpp
+++ b/src/diagram.cpp
@@ -1380,7 +1380,5 @@ void ClassDiagram::writeImage(FTextStream &t,const char *path,
 #define IMAGE_EXT ".png"
   image.save((QCString)path+"/"+fileName+IMAGE_EXT);
   Doxygen::indexList->addImageFile(QCString(fileName)+IMAGE_EXT);
-  
-  if (generateMap) t << "</map>" << endl;
 }
 
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index 581f3f2..357c048 100644
--- a/src/htmlgen.cpp
+++ b/src/htmlgen.cpp
@@ -1397,6 +1397,7 @@ void HtmlGenerator::endClassDiagram(const ClassDiagram &d,
   t << "_map\">" << endl;
 
   d.writeImage(t,dir,relPath,fileName);
+  t << "<div/></map>" << endl;
   t << " </div>";
   endSectionContent(t);
   m_sectionCount++;