From b65b6ac831ddfae4b9c08d26e5087d98ce9c0f2e Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@nokia.com>
Date: Wed, 27 Oct 2010 10:05:30 +0200
Subject: doc: Fixed some DITA XML validation errors.

These were in the compact list.
---
 tools/qdoc3/ditaxmlgenerator.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp
index 542960d..30d1d74 100644
--- a/tools/qdoc3/ditaxmlgenerator.cpp
+++ b/tools/qdoc3/ditaxmlgenerator.cpp
@@ -3006,24 +3006,24 @@ void DitaXmlGenerator::generateCompactList(const Node* relative,
 
     int curParNr = 0;
     int curParOffset = 0;
+    QMap<QChar,QString> cmap;
 
     /*
       Output the alphabet as a row of links.
      */
     if (includeAlphabet) {
         xmlWriter().writeStartElement("p");
-        xmlWriter().writeAttribute("outputclass","centerAlign functionIndex");
-        xmlWriter().writeStartElement("b");
+        xmlWriter().writeAttribute("outputclass","alphabet");
         for (int i = 0; i < 26; i++) {
             QChar ch('a' + i);
             if (usedParagraphNames.contains(char('a' + i))) {
                 xmlWriter().writeStartElement("xref");
-                xmlWriter().writeAttribute("href",QString("#%1").arg(ch));
+                QString guid = lookupGuid(outFileName(),QString(ch));
+                xmlWriter().writeAttribute("href",QString("#%1").arg(guid));
                 xmlWriter().writeCharacters(QString(ch.toUpper()));
                 xmlWriter().writeEndElement(); // </xref>
             }
         }
-        xmlWriter().writeEndElement(); // </b>
         xmlWriter().writeEndElement(); // </p>
     }
 
@@ -3051,15 +3051,12 @@ void DitaXmlGenerator::generateCompactList(const Node* relative,
             xmlWriter().writeStartElement("dl");
             xmlWriter().writeStartElement("dlentry");
             xmlWriter().writeStartElement("dt");
-            xmlWriter().writeAttribute("outputclass","alphaChar");
             if (includeAlphabet) {
                 QChar c = paragraphName[curParNr][0].toLower();
-                xmlWriter().writeStartElement("a");
-                xmlWriter().writeAttribute("name",c);
+                writeGuidAttribute(QString(c));
             }
-            xmlWriter().writeStartElement("b");
+            xmlWriter().writeAttribute("outputclass","sublist-header");
             xmlWriter().writeCharacters(paragraphName[curParNr]);
-            xmlWriter().writeEndElement(); // </b>
             xmlWriter().writeEndElement(); // </dt>
         }
 
-- 
cgit v0.12