From 16275ff6b9abc085a498428170047f2bee9ee30b Mon Sep 17 00:00:00 2001
From: Martin Smith <msmith@trolltech.com>
Date: Wed, 27 May 2009 14:28:06 +0200
Subject: A few html code generator fixes.

There was an empty <div> element with a name that came after it.
I moved the name inside the <div> element. And there were some <b>
elements that began inside one element and ended inside the next
element. I just removed them, because they didn't really add
anything. And I made the "Access functions:" bold.
---
 tools/qdoc3/htmlgenerator.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 798cbb5..e2e6950 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -2207,18 +2207,14 @@ void HtmlGenerator::generateSectionList(const Section& section,
             else {
                 if (twoColumn && i == (int) (section.members.count() + 1) / 2)
                     out() << "</ul></td><td valign=\"top\"><ul>\n";
-                out() << "<li><div class=\"fn\"></div>";
+                out() << "<li><div class=\"fn\">";
             }
 
-            if (style == CodeMarker::Accessors)
-                out() << "<b>";
             generateSynopsis(*m, relative, marker, style, name_alignment);
-            if (style == CodeMarker::Accessors)
-                out() << "</b>";
             if (name_alignment)
                 out() << "</td></tr>\n";
             else
-                out() << "</li>\n";
+                out() << "</div></li>\n";
             i++;
             ++m;
         }
@@ -2283,8 +2279,10 @@ void HtmlGenerator::generateSynopsis(const Node *node,
     marked.replace("<@param>", "<i>");
     marked.replace("</@param>", "</i>");
 
-    if (style == CodeMarker::Summary)
-        marked.replace("@name>", "b>");
+    if (style == CodeMarker::Summary) {
+        marked.replace("<@name>", "");   // was "<b>"
+        marked.replace("</@name>", "");  // was "</b>"
+    }
 
     if (style == CodeMarker::SeparateList) {
         QRegExp extraRegExp("<@extra>.*</@extra>");
@@ -3090,7 +3088,7 @@ void HtmlGenerator::generateDetailedMember(const Node *node,
         section.members += property->resetters();
 
         if (!section.members.isEmpty()) {
-            out() << "<p>Access functions:</p>\n";
+            out() << "<p><b>Access functions:</b></p>\n";
             generateSectionList(section, node, marker, CodeMarker::Accessors);
         }
     }
-- 
cgit v0.12