From 14dd3da129e26872296435814694a3251ef5e52f Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@nokia.com>
Date: Thu, 28 Oct 2010 12:36:57 +0200
Subject: qdoc: Fixed some DITA XML validation errors.

Fixed some \table problems as well.
---
 doc/src/getting-started/installation.qdoc | 11 ++++++-----
 tools/qdoc3/ditaxmlgenerator.cpp          | 24 ++++++++++++++++++------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index c6e79d9..fdb88f5 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -990,9 +990,9 @@ applications using Qt for Symbian can start right away.
     Qt from its source code, you will also need to install the development
     packages for these libraries for your system.
 
-    \table 90%
-    \header \o Name \o Library \o Notes \o Configuration options \o Minimum working version
     \raw HTML
+    <table class="generic"> 
+    <thead><tr class="qt-style topAlign"><th>Name</th><th>Library</th><th>Notes</th><th>Configuration options</th><th>Minimum working version 
     <tr id="OptionalColor">
     <td> XRender </td><td> libXrender </td><td> X Rendering Extension; used for anti-aliasing</td>
     <td><tt>-xrender</tt> or auto-detected</td><td>0.9.0</td>
@@ -1039,9 +1039,9 @@ applications using Qt for Symbian can start right away.
     </tr><tr id="PthreadColor">
     <td> pthread </td><td> libpthread </td><td> Multithreading</td>
     <td></td><td>2.3.5</td>
-    </tr>
+    </tr></th></tr></thead> 
+    </table>  
     \endraw
-    \endtable
 
     \note You must compile with XRender support to get alpha transparency
     support for pixmaps and images.
@@ -1129,8 +1129,9 @@ applications using Qt for Symbian can start right away.
             {Windows Mobile 6 Professional/Standard}
     \endlist
 
+    \bold{Note:}
     \table
-        \row \bold{Note:}
+        \row
             \o
             \list 1
                 \o Currently, there is only compile support for Windows CE 5.0
diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp
index a47a956..581335a 100644
--- a/tools/qdoc3/ditaxmlgenerator.cpp
+++ b/tools/qdoc3/ditaxmlgenerator.cpp
@@ -653,10 +653,10 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
     case Atom::BaseName:
         break;
     case Atom::BriefLeft:
-        if (relative->type() == Node::Fake) {
-            skipAhead = skipAtoms(atom, Atom::BriefRight);
-            break;
-        }
+        //if (relative->type() == Node::Fake) {
+        //skipAhead = skipAtoms(atom, Atom::BriefRight);
+        //break;
+        //}
         if (inApiDesc || inSection) {
             xmlWriter().writeStartElement("p");
             xmlWriter().writeAttribute("outputclass","brief");
@@ -697,8 +697,8 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
         }
         break;
     case Atom::BriefRight:
-        if (relative->type() != Node::Fake) 
-            xmlWriter().writeEndElement(); // </shortdesc> or </p>
+        //        if (relative->type() != Node::Fake) 
+        xmlWriter().writeEndElement(); // </shortdesc> or </p>
         noLinks = false;
         break;
     case Atom::C:
@@ -2413,6 +2413,18 @@ void DitaXmlGenerator::generateTitle(const QString& title,
 void DitaXmlGenerator::generateBrief(const Node* node, CodeMarker* marker)
 {
     Text brief = node->doc().briefText(true); // zzz
+    if (outFileName() == "requirements-x11.xml") {
+        if (brief.isEmpty())
+            qDebug() << "EMPTY BRIEF";
+        else {
+            qDebug() << "NON-EMPTY BRIEF";
+            Atom* a = brief.firstAtom();
+            while (a != 0) {
+                qDebug() << "  " << a->type() << a->typeString() << a->string();
+                a = a->next();
+            }
+        }
+    }
     if (!brief.isEmpty()) {
         generateText(brief, node, marker);
     }
-- 
cgit v0.12