diff options
Diffstat (limited to 'tools/qdoc3')
| -rw-r--r-- | tools/qdoc3/ditaxmlgenerator.cpp | 58 | ||||
| -rw-r--r-- | tools/qdoc3/ditaxmlgenerator.h | 29 |
2 files changed, 81 insertions, 6 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); diff --git a/tools/qdoc3/ditaxmlgenerator.h b/tools/qdoc3/ditaxmlgenerator.h index fb09013..2384a90 100644 --- a/tools/qdoc3/ditaxmlgenerator.h +++ b/tools/qdoc3/ditaxmlgenerator.h @@ -87,11 +87,21 @@ class DitaXmlGenerator : public PageGenerator DT_apiDesc, DT_APIMap, DT_apiName, + DT_audience, + DT_author, DT_b, DT_body, DT_bodydiv, + DT_brand, + DT_category, DT_codeblock, DT_comment, + DT_component, + DT_copyrholder, + DT_copyright, + DT_copyryear, + DT_created, + DT_critdates, DT_cxxAPIMap, DT_cxxClass, DT_cxxClassAbstract, @@ -185,6 +195,8 @@ class DitaXmlGenerator : public PageGenerator DT_cxxVariableReimplemented, DT_cxxVariableScopedName, DT_cxxVariableStorageClassSpecifierStatic, + DT_data, + DT_dataabout, DT_dd, DT_dl, DT_dlentry, @@ -194,21 +206,33 @@ class DitaXmlGenerator : public PageGenerator DT_i, DT_image, DT_keyword, + DT_keywords, DT_li, DT_link, DT_linktext, DT_lq, + DT_metadata, DT_ol, + DT_othermeta, DT_p, DT_parameter, + DT_permissions, DT_ph, + DT_platform, DT_pre, + DT_prodinfo, + DT_prodname, + DT_prolog, + DT_publisher, DT_relatedLinks, + DT_resourceid, + DT_revised, DT_row, DT_section, DT_sectiondiv, DT_shortdesc, DT_simpletable, + DT_source, DT_stentry, DT_sthead, DT_strow, @@ -224,8 +248,11 @@ class DitaXmlGenerator : public PageGenerator DT_topicmeta, DT_topicref, DT_tt, - DT_ul, DT_u, + DT_ul, + DT_unknown, + DT_vrm, + DT_vrmlist, DT_xref, DT_LAST }; |