From 7d5366966e4f29b1ccf112e42bc32a3f64bfb0bb Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@nokia.com>
Date: Thu, 9 Sep 2010 09:58:27 +0200
Subject: qdoc: Generate more xml for module pages.

---
 tools/qdoc3/ditaxmlgenerator.cpp | 66 +++++++++++++++++++++++++---------------
 tools/qdoc3/ditaxmlgenerator.h   |  3 ++
 2 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp
index d2b20a6..55e873f 100644
--- a/tools/qdoc3/ditaxmlgenerator.cpp
+++ b/tools/qdoc3/ditaxmlgenerator.cpp
@@ -657,14 +657,14 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
     case Atom::Code:
         writer.writeStartElement("pre");
         writer.writeAttribute("outputclass","highlightedcode");
-        writeText(atom->string(), marker, relative);
+        writeText(trimmedTrailing(atom->string()), marker, relative);
         writer.writeEndElement(); // </pre>
 	break;
     case Atom::Qml:
         writer.writeStartElement("pre");
         writer.writeAttribute("outputclass","highlightedcode");
-        writeText(atom->string(), marker, relative);
-        writer.writeEndElement(); // pre
+        writeText(trimmedTrailing(atom->string()), marker, relative);
+        writer.writeEndElement(); // </pre>
 	break;
     case Atom::CodeNew:
         writer.writeStartElement("p");
@@ -672,7 +672,7 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
         writer.writeEndElement(); // </p>
         writer.writeStartElement("pre");
         writer.writeAttribute("outputclass","highlightedcode");
-        writeText(atom->string(), marker, relative);
+        writeText(trimmedTrailing(atom->string()), marker, relative);
         writer.writeEndElement(); // </pre>
         break;
     case Atom::CodeOld:
@@ -683,7 +683,7 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
     case Atom::CodeBad:
         writer.writeStartElement("pre");
         writer.writeAttribute("outputclass","highlightedcode");
-        writer.writeCharacters(trimmedTrailing(protectEnc(plainCode(indent(codeIndent,atom->string())))));
+        writer.writeCharacters(trimmedTrailing(protectEnc(plainCode(atom->string()))));
         writer.writeEndElement(); // </pre>
 	break;
     case Atom::FootnoteLeft:
@@ -1516,6 +1516,25 @@ DitaXmlGenerator::generateClassLikeNode(const InnerNode* inner, CodeMarker* mark
 }
 
 /*!
+  Write a paragraph for the \a target and a poaragraph for
+  the \a header. Use the \a attribute for the \a header.
+ */
+void DitaXmlGenerator::writeTargetAndHeader(const QString& target,
+                                            const QString& header,
+                                            const QString& attribute)
+{
+    writer.writeStartElement("p");
+    writeGuidAttribute(registerRef(target));
+    writer.writeAttribute("outputclass","target");
+    writer.writeCharacters(header);
+    writer.writeEndElement(); // </p>
+    writer.writeStartElement("p");
+    writer.writeAttribute("outputclass",attribute);
+    writer.writeCharacters(header);
+    writer.writeEndElement(); // </p>
+}
+
+/*!
   Generate the html page for a qdoc file that doesn't map
   to an underlying c++ file.
  */
@@ -1585,10 +1604,25 @@ void DitaXmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker
     writer.writeEndElement(); // </title>
     
     generateBrief(fake, marker); // <shortdesc>
+    if (fake->subType() == Node::Module) {
+        generateStatus(fake, marker);
+        if (moduleNamespaceMap.contains(fake->name())) {
+            writeTargetAndHeader("namespaces","Namespaces","h2");
+            generateAnnotatedList(fake, marker, moduleNamespaceMap[fake->name()]);
+        }
+        if (moduleClassMap.contains(fake->name())) {
+            writeTargetAndHeader("classes","Classes","h2");
+            generateAnnotatedList(fake, marker, moduleClassMap[fake->name()]);
+        }
+    }
 
     if (!fake->doc().isEmpty()) {
         writer.writeStartElement("body");
+        if (fake->subType() == Node::Module) {
+            writeTargetAndHeader("details","Detailed Description","h2");
+        }
         generateBody(fake, marker);
+        generateAlsoList(fake, marker);
         writer.writeEndElement(); // </body>
     }
     writer.writeEndElement(); // </topic>
@@ -1608,22 +1642,7 @@ void DitaXmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker
                   fake,
                   marker);
     
-    if (fake->subType() == Node::Module) {
-        // Generate brief text and status for modules.
-        generateBrief(fake, marker);
-        generateStatus(fake, marker);
 
-        if (moduleNamespaceMap.contains(fake->name())) {
-            out() << "<a name=\"" << registerRef("namespaces") << "\"></a>\n";
-            out() << "<h2>Namespaces</h2>\n";
-            generateAnnotatedList(fake, marker, moduleNamespaceMap[fake->name()]);
-        }
-        if (moduleClassMap.contains(fake->name())) {
-            out() << "<a name=\"" << registerRef("classes") << "\"></a>\n";
-            out() << "<h2>Classes</h2>\n";
-            generateAnnotatedList(fake, marker, moduleClassMap[fake->name()]);
-        }
-    }
     else if (fake->subType() == Node::HeaderFile) {
         // Generate brief text and status for modules.
         generateBrief(fake, marker);
@@ -1711,10 +1730,6 @@ void DitaXmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker
     else
         out() << "<div class=\"descr\"/>\n"; // QTBUG-9504
 
-    generateBody(fake, marker);
-    out() << "</div>\n"; // QTBUG-9504
-    generateAlsoList(fake, marker);
-
     if (!fake->groupMembers().isEmpty()) {
         NodeMap groupMembersMap;
         foreach (const Node *node, fake->groupMembers()) {
@@ -3248,7 +3263,8 @@ QString DitaXmlGenerator::registerRef(const QString& ref)
         if (prevRef.isEmpty()) {
             prevRef = ref;
             break;
-        } else if (prevRef == ref) {
+        }
+        else if (prevRef == ref) {
             break;
         }
         clean += "x";
diff --git a/tools/qdoc3/ditaxmlgenerator.h b/tools/qdoc3/ditaxmlgenerator.h
index 91d7147..fe7a434 100644
--- a/tools/qdoc3/ditaxmlgenerator.h
+++ b/tools/qdoc3/ditaxmlgenerator.h
@@ -110,6 +110,9 @@ class DitaXmlGenerator : public PageGenerator
     virtual QString linkForNode(const Node *node, const Node *relative);
     virtual QString refForAtom(Atom *atom, const Node *node);
     
+    void writeTargetAndHeader(const QString& target,
+                              const QString& header,
+                              const QString& attribute);
     QString fullQualification(const Node* n);
 
     void writeDerivations(const ClassNode* cn, CodeMarker* marker);
-- 
cgit v0.12