summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2010-10-27 08:05:30 (GMT)
committerMartin Smith <martin.smith@nokia.com>2010-10-27 08:05:30 (GMT)
commitb65b6ac831ddfae4b9c08d26e5087d98ce9c0f2e (patch)
treebe0a18a9953a621b47471d868a75335d25828bf2
parent7f8bb137427160070c3461fc161199f82d4731e4 (diff)
downloadQt-b65b6ac831ddfae4b9c08d26e5087d98ce9c0f2e.zip
Qt-b65b6ac831ddfae4b9c08d26e5087d98ce9c0f2e.tar.gz
Qt-b65b6ac831ddfae4b9c08d26e5087d98ce9c0f2e.tar.bz2
doc: Fixed some DITA XML validation errors.
These were in the compact list.
-rw-r--r--tools/qdoc3/ditaxmlgenerator.cpp15
1 files 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>
}