From 0385fc6ae80a324feb8e8c19e015e4a485bb56d1 Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@nokia.com>
Date: Wed, 29 Sep 2010 11:52:03 +0200
Subject: qdoc: Added outputclass attribute for sections and titles.

---
 tools/qdoc3/ditaxmlgenerator.cpp | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp
index ce140af..c3b6fab 100644
--- a/tools/qdoc3/ditaxmlgenerator.cpp
+++ b/tools/qdoc3/ditaxmlgenerator.cpp
@@ -1312,6 +1312,7 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
         inSection = true;
         xmlWriter().writeStartElement("section");
         writeGuidAttribute(Doc::canonicalTitle(Text::sectionHeading(atom).toString()));
+        xmlWriter().writeAttribute("outputclass","details");
         break;
     case Atom::SectionRight:
         if (inSection) {
@@ -1597,9 +1598,10 @@ DitaXmlGenerator::generateClassLikeNode(const InnerNode* inner, CodeMarker* mark
                 QString attr;
                 if (!s->members.isEmpty()) {
                     xmlWriter().writeStartElement("section");
-                    attr = "h2 " + cleanRef((*s).name).toLower();
+                    attr = cleanRef((*s).name).toLower() + " redundant";
                     xmlWriter().writeAttribute("outputclass",attr);
                     xmlWriter().writeStartElement("title");
+                    xmlWriter().writeAttribute("outputclass","h2");
                     xmlWriter().writeCharacters(protectEnc((*s).name));
                     xmlWriter().writeEndElement(); // </title>
                     generateSection(s->members, inner, marker, CodeMarker::Summary);
@@ -1608,10 +1610,11 @@ DitaXmlGenerator::generateClassLikeNode(const InnerNode* inner, CodeMarker* mark
                 }
                 if (!s->reimpMembers.isEmpty()) {
                     QString name = QString("Reimplemented ") + (*s).name;
-                    attr = "h2 " + cleanRef(name).toLower();
+                    attr = cleanRef(name).toLower() + " redundant";
                     xmlWriter().writeStartElement("section");
                     xmlWriter().writeAttribute("outputclass",attr);
                     xmlWriter().writeStartElement("title");
+                    xmlWriter().writeAttribute("outputclass","h2");
                     xmlWriter().writeCharacters(protectEnc(name));
                     xmlWriter().writeEndElement(); // </title>
                     generateSection(s->reimpMembers, inner, marker, CodeMarker::Summary);
@@ -1623,8 +1626,9 @@ DitaXmlGenerator::generateClassLikeNode(const InnerNode* inner, CodeMarker* mark
         }
         if (needOtherSection) {
             xmlWriter().writeStartElement("section");
-            xmlWriter().writeAttribute("outputclass","h3 additional-inherited-members");
+            xmlWriter().writeAttribute("outputclass","additional-inherited-members redundant");
             xmlWriter().writeStartElement("title");
+            xmlWriter().writeAttribute("outputclass","h3");
             xmlWriter().writeCharacters("Additional Inherited Members");
             xmlWriter().writeEndElement(); // </title>
             s = summarySections.begin();
@@ -2430,8 +2434,8 @@ QString DitaXmlGenerator::generateLowStatusMemberFile(const InnerNode* inner,
     
     for (i = 0; i < sections.size(); ++i) {
         xmlWriter().writeStartElement("section");
-        xmlWriter().writeAttribute("outputclass","h2");
         xmlWriter().writeStartElement("title");
+        xmlWriter().writeAttribute("outputclass","h2");
         xmlWriter().writeCharacters(protectEnc(sections.at(i).name));
         xmlWriter().writeEndElement(); // </title>
         generateSection(sections.at(i).members, inner, marker, CodeMarker::Summary);
@@ -5337,19 +5341,29 @@ void DitaXmlGenerator::writeDetailedDescription(const Node* node,
         if (apiDesc) {
             inApiDesc = true;
             xmlWriter().writeStartElement(APIDESC);
-            // zzz xmlWriter().writeAttribute("id",node->guid());
-            if (!title.isEmpty())
+            if (!title.isEmpty()) {
+                writeGuidAttribute(title);
                 xmlWriter().writeAttribute("spectitle",title);
+            }
+            else
+                writeGuidAttribute("Detailed Description");
+            xmlWriter().writeAttribute("outputclass","details");
         }
         else {
             inSection = true;
             xmlWriter().writeStartElement("section");
-            // zzz xmlWriter().writeAttribute("id",node->guid());
             if (!title.isEmpty()) {
+                writeGuidAttribute(title);
+                xmlWriter().writeAttribute("outputclass","details");
                 xmlWriter().writeStartElement("title");
+                xmlWriter().writeAttribute("outputclass","h2");
                 xmlWriter().writeCharacters(title);
                 xmlWriter().writeEndElement(); // </title>
             }
+            else {
+                writeGuidAttribute("Detailed Description");
+                xmlWriter().writeAttribute("outputclass","details");
+            }
         }
         generateBody(node, marker);
         if (inApiDesc) {
-- 
cgit v0.12