diff options
| author | Martin Smith <martin.smith@nokia.com> | 2011-03-04 12:25:20 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2011-03-04 12:25:20 (GMT) |
| commit | 94d15eaa3beb436b071903ddaa70c384aed988da (patch) | |
| tree | 55419df4ff40c5ab46ecda5e1037b2e9202fcc6b /tools/qdoc3/ditaxmlgenerator.cpp | |
| parent | 47d2de6b4296b664d10485e7facc4756be1e5c4f (diff) | |
| download | Qt-94d15eaa3beb436b071903ddaa70c384aed988da.zip Qt-94d15eaa3beb436b071903ddaa70c384aed988da.tar.gz Qt-94d15eaa3beb436b071903ddaa70c384aed988da.tar.bz2 | |
qdoc: Added enum values and tag names for <prolog> and <metadata>
These contain many subelements, whose tages were also added.
Diffstat (limited to 'tools/qdoc3/ditaxmlgenerator.cpp')
| -rw-r--r-- | tools/qdoc3/ditaxmlgenerator.cpp | 58 |
1 files changed, 53 insertions, 5 deletions
diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp index 6f7de73..ced14cc 100644 --- a/tools/qdoc3/ditaxmlgenerator.cpp +++ b/tools/qdoc3/ditaxmlgenerator.cpp @@ -96,11 +96,21 @@ QString DitaXmlGenerator::ditaTags[] = "apiDesc", "APIMap", "apiName", + "audience", + "author", "b", "body", "bodydiv", + "brand", + "category", "codeblock", "comment", + "component", + "copyrholder", + "copyright", + "copyryear", + "created", + "critdates", "cxxAPIMap", "cxxClass", "cxxClassAbstract", @@ -194,6 +204,8 @@ QString DitaXmlGenerator::ditaTags[] = "cxxVariableReimplemented", "cxxVariableScopedName", "cxxVariableStorageClassSpecifierStatic", + "data", + "data-about", "dd", "dl", "dlentry", @@ -203,21 +215,33 @@ QString DitaXmlGenerator::ditaTags[] = "i", "image", "keyword", + "keywords", "li", "link", "linktext", "lq", + "metadata", "ol", + "othermeta", "p", "parameter", + "permissions", "ph", + "platform", "pre", + "prodinfo", + "prodname", + "prolog", + "publisher", "related-links", + "resourceid", + "revised", "row", "section", "sectiondiv", "shortdesc", "simpletable", + "source", "stentry", "sthead", "strow", @@ -233,8 +257,11 @@ QString DitaXmlGenerator::ditaTags[] = "topicmeta", "topicref", "tt", - "ul", "u", + "ul", + "unknown", + "vrm", + "vrmlist", "xref", "" }; @@ -1611,8 +1638,11 @@ DitaXmlGenerator::generateClassLikeNode(const InnerNode* inner, CodeMarker* mark generateHeader(inner, fullTitle); generateBrief(inner, marker); // <shortdesc> - // not included: <prolog> - + writeStartTag(DT_prolog); + writeStartTag(DT_metadata); + writeEndTag(); // <metadata> + writeEndTag(); // <prolog> + writeStartTag(DT_cxxClassDetail); writeStartTag(DT_cxxClassDefinition); writeLocation(nsn); @@ -1735,7 +1765,10 @@ DitaXmlGenerator::generateClassLikeNode(const InnerNode* inner, CodeMarker* mark generateHeader(inner, fullTitle); generateBrief(inner, marker); // <shortdesc> - // not included: <prolog> + writeStartTag(DT_prolog); + writeStartTag(DT_metadata); + writeEndTag(); // <metadata> + writeEndTag(); // <prolog> writeStartTag(DT_cxxClassDetail); writeStartTag(DT_cxxClassDefinition); @@ -1876,6 +1909,12 @@ DitaXmlGenerator::generateClassLikeNode(const InnerNode* inner, CodeMarker* mark */ generateHeader(inner, fullTitle); generateBrief(inner, marker); // <shortdesc> + + writeStartTag(DT_prolog); + writeStartTag(DT_metadata); + writeEndTag(); // <metadata> + writeEndTag(); // <prolog> + writeStartTag(DT_cxxClassDetail); writeStartTag(DT_apiDesc); xmlWriter().writeAttribute("spectitle",title); @@ -1996,7 +2035,10 @@ DitaXmlGenerator::generateClassLikeNode(const InnerNode* inner, CodeMarker* mark generateHeader(inner, fullTitle); generateBrief(inner, marker); // <shortdesc> - // not included: <prolog> + writeStartTag(DT_prolog); + writeStartTag(DT_metadata); + writeEndTag(); // <metadata> + writeEndTag(); // <prolog> writeStartTag(DT_cxxClassDetail); writeStartTag(DT_apiDesc); @@ -2106,6 +2148,12 @@ void DitaXmlGenerator::generateFakeNode(const FakeNode* fake, CodeMarker* marker generateHeader(fake, fullTitle); generateBrief(fake, marker); // <shortdesc> + + writeStartTag(DT_prolog); + writeStartTag(DT_metadata); + writeEndTag(); // <metadata> + writeEndTag(); // <prolog> + writeStartTag(DT_body); if (fake->subType() == Node::Module) { generateStatus(fake, marker); |