diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-10-25 10:30:50 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-10-25 10:30:50 (GMT) |
| commit | 766b23e722743c0b99c03cf4a035b5b20cb8a88f (patch) | |
| tree | d48a6a27ddb8bbeda95a5a1bf48c637376606412 | |
| parent | cbcaa64e3ff7ad8293c95df938901694b3f472bd (diff) | |
| download | Qt-766b23e722743c0b99c03cf4a035b5b20cb8a88f.zip Qt-766b23e722743c0b99c03cf4a035b5b20cb8a88f.tar.gz Qt-766b23e722743c0b99c03cf4a035b5b20cb8a88f.tar.bz2 | |
qdoc: Fixed some DITA XML validation errors.
| -rw-r--r-- | tools/qdoc3/ditaxmlgenerator.cpp | 11 | ||||
| -rw-r--r-- | tools/qdoc3/ditaxmlgenerator.h | 2 | ||||
| -rw-r--r-- | tools/qdoc3/generator.h | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp index 3397033..e1aa519 100644 --- a/tools/qdoc3/ditaxmlgenerator.cpp +++ b/tools/qdoc3/ditaxmlgenerator.cpp @@ -1282,7 +1282,10 @@ int DitaXmlGenerator::generateAtom(const Atom *atom, xmlWriter().writeEndElement(); // </lq> break; case Atom::RawString: + xmlWriter().writeStartElement("pre"); + xmlWriter().writeAttribute("outputclass","raw-html"); xmlWriter().writeCharacters(atom->string()); + xmlWriter().writeEndElement(); // </pre> break; case Atom::SectionLeft: if (inSection || inApiDesc) { @@ -5678,4 +5681,12 @@ DitaXmlGenerator::generateInnerNode(const InnerNode* node, CodeMarker* marker) } } +/*! + Returns true if \a format is "XML" or "HTML" . + */ +bool DitaXmlGenerator::canHandleFormat(const QString& format) +{ + return (format == "HTML") || (format == this->format()); +} + QT_END_NAMESPACE diff --git a/tools/qdoc3/ditaxmlgenerator.h b/tools/qdoc3/ditaxmlgenerator.h index b457061..afa77bb 100644 --- a/tools/qdoc3/ditaxmlgenerator.h +++ b/tools/qdoc3/ditaxmlgenerator.h @@ -88,6 +88,7 @@ class DitaXmlGenerator : public PageGenerator virtual void initializeGenerator(const Config& config); virtual void terminateGenerator(); virtual QString format(); + virtual bool canHandleFormat(const QString& format); virtual void generateTree(const Tree* tree, CodeMarker* marker); QString protectEnc(const QString& string); @@ -326,4 +327,3 @@ class DitaXmlGenerator : public PageGenerator QT_END_NAMESPACE #endif - diff --git a/tools/qdoc3/generator.h b/tools/qdoc3/generator.h index bccfc5d..26d5269 100644 --- a/tools/qdoc3/generator.h +++ b/tools/qdoc3/generator.h @@ -114,7 +114,7 @@ class Generator void generateThreadSafeness(const Node *node, CodeMarker *marker); void generateSince(const Node *node, CodeMarker *marker); void generateStatus(const Node *node, CodeMarker *marker); - const Atom *generateAtomList(const Atom *atom, + const Atom* generateAtomList(const Atom *atom, const Node *relative, CodeMarker *marker, bool generate, |