FCL/sf/mw/qt: comparison tools/qdoc3/htmlgenerator.cpp

equal deleted inserted replaced

-:5dc02b23752f
+:3e2da88830cd
 QT_BEGIN_NAMESPACE
 #define COMMAND_VERSION                 Doc::alias("version")
 int HtmlGenerator::id = 0;
+bool HtmlGenerator::debugging_on = false;
+#if 0
+QString HtmlGenerator::divNavTop = "<div class=\"navTop\"><a href=\"#toc\"><img src=\"./images/bullet_up.png\"></a></div>";
+#endif
+QString HtmlGenerator::divNavTop = "";
 QString HtmlGenerator::sinceTitles[] =
 {
 "    New Namespaces",
 "    New Classes",
 inSectionHeading(false),
 inTableHeader(false),
 numTableRows(0),
 threeColumnEnumValueTable(true),
 offlineDocs(true),
+creatorDocs(true),
 funcLeftParen("\\S(\\()"),
 myTree(0),
 slow(false),
 obsoleteLinks(false)
 {
 Config::dot +
 HTMLGENERATOR_GENERATEMACREFS);
 project = config.getString(CONFIG_PROJECT);
 offlineDocs = !config.getBool(CONFIG_ONLINE);
+creatorDocs = false; //!config.getBool(CONFIG_CREATOR);
 projectDescription = config.getString(CONFIG_DESCRIPTION);
 if (projectDescription.isEmpty() && !project.isEmpty())
 projectDescription = project + " Reference Documentation";
 projectUrl = config.getString(CONFIG_URL);
 \note The html file generation is done in the base class,
 PageGenerator::generateTree().
 */
 void HtmlGenerator::generateTree(const Tree *tree, CodeMarker *marker)
 {
-#if 0
-// Copy the stylesheets from the directory containing the qdocconf file.
-// ### This should be changed to use a special directory in doc/src.
-QStringList::ConstIterator styleIter = stylesheets.begin();
-QDir configPath = QDir::current();
-while (styleIter != stylesheets.end()) {
-QString filePath = configPath.absoluteFilePath(*styleIter);
-Config::copyFile(Location(), filePath, filePath, outputDir());
-++styleIter;
-}
-#endif
 myTree = tree;
 nonCompatClasses.clear();
 mainClasses.clear();
 compatClasses.clear();
 obsoleteClasses.clear();
 serviceClasses.clear();
 findAllClasses(tree->root());
 findAllFunctions(tree->root());
 findAllLegaleseTexts(tree->root());
 findAllNamespaces(tree->root());
-#ifdef ZZZ_QDOC_QML
-findAllQmlClasses(tree->root());
-#endif
 findAllSince(tree->root());
 PageGenerator::generateTree(tree, marker);
 dcfClassesRoot.ref = "classes.html";
 threeColumnEnumValueTable = true;
 link.clear();
 sectionNumber.clear();
 }
+/*!
+Generate html from an instance of Atom.
+*/
 int HtmlGenerator::generateAtom(const Atom *atom,
 const Node *relative,
 CodeMarker *marker)
 {
 int skipAhead = 0;
 static bool in_para = false;
 switch (atom->type()) {
 case Atom::AbstractLeft:
 break;
 case Atom::AbstractRight:
 break;
 out() << highlightedCode(atom->string(), marker, relative);
 }
 out() << formattingRightMap()[ATOM_FORMATTING_TELETYPE];
 break;
 case Atom::Code:
-	out() << "<pre class=\"highlightedCode\">"
+	out() << "<pre class=\"highlightedCode brush: cpp\">"
 << trimmedTrailing(highlightedCode(indent(codeIndent,atom->string()),
 marker,relative))
 << "</pre>\n";
 	break;
 #ifdef QDOC_QML
 case Atom::Qml:
-	out() << "<pre class=\"highlightedCode\">"
+	out() << "<pre class=\"highlightedCode brush: cpp\">"
 << trimmedTrailing(highlightedCode(indent(codeIndent,atom->string()),
 marker,relative))
 << "</pre>\n";
 	break;
 #endif
 case Atom::CodeNew:
 out() << "<p>you can rewrite it as</p>\n"
-<< "<pre class=\"highlightedCode\">"
+<< "<pre class=\"highlightedCode brush: cpp\">"
 << trimmedTrailing(highlightedCode(indent(codeIndent,atom->string()),
 marker,relative))
 << "</pre>\n";
 break;
 case Atom::CodeOld:
 out() << "<p>For example, if you have code like</p>\n";
 // fallthrough
 case Atom::CodeBad:
-out() << "<pre class=\"highlightedCode\">"
+out() << "<pre class=\"highlightedCode brush: cpp\">"
 << trimmedTrailing(protectEnc(plainCode(indent(codeIndent,atom->string()))))
 << "</pre>\n";
 	break;
 case Atom::FootnoteLeft:
 // ### For now
 				if (++numTableRows % 2 == 1)
 					out() << "<tr class=\"odd\">";
 				else
 					out() << "<tr class=\"even\">";
-					out() << "<tr><th>Constant</th>"
+					out() << "<tr><th class=\"tblConst\">Constant</th>"
-<< "<th>Value</th>"
+<< "<th class=\"tblval\">Value</th>"
-<< "<th>Description</th></tr>\n";
+<< "<th class=\"tbldscr\">Description</th></tr>\n";
 }
 else {
 out() << "<table class=\"valuelist\">"
-<< "<tr><th>Constant</th><th>Value</th></tr>\n";
+<< "<tr><th class=\"tblConst\">Constant</th><th class=\"tblVal\">Value</th></tr>\n";
 }
 }
 else {
 out() << "<ol type=";
 if (atom->string() == ATOM_LIST_UPPERALPHA) {
 while (sectionNumber.size() > nextLevel) {
 sectionNumber.removeLast();
 }
 sectionNumber.last() = QString::number(sectionNumber.last().toInt() + 1);
 }
-out() << "<a name=\"sec-" << sectionNumber.join("-") << "\"></a>\n";
+out() << "<a name=\"sec-" << sectionNumber.join("-") << "\"></a>" << divNavTop << "\n";
 }
 #else
 out() << "<a name=\"" << Doc::canonicalTitle(Text::sectionHeading(atom).toString())
-<< "\"></a>\n";
+<< "\"></a>" << divNavTop << "\n";
 #endif
 break;
 case Atom::SectionRight:
 break;
 case Atom::SectionHeadingLeft:
 out() << "</tr>\n";
 break;
 case Atom::TableItemLeft:
 {
 if (inTableHeader)
-out() << "<th";
+out() << "<th ";
 else
-out() << "<td";
+out() << "<td ";
 QStringList spans = atom->string().split(",");
 if (spans.size() == 2) {
 if (spans.at(0) != "1")
 out() << " colspan=\"" << spans.at(0) << "\"";
 unknownAtom(atom);
 }
 return skipAhead;
 }
+/*!
+Generate a reference page for a C++ class.
+*/
 void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
 CodeMarker *marker)
 {
 QList<Section> sections;
 QList<Section>::ConstIterator s;
 Text subtitleText;
 if (rawTitle != fullTitle)
 subtitleText << "(" << Atom(Atom::AutoLink, fullTitle) << ")"
 << Atom(Atom::LineBreak);
-#if 0
-// No longer used because the modeule name is a breadcrumb.
-QString fixedModule = inner->moduleName();
-if (fixedModule == "Qt3SupportLight")
-fixedModule = "Qt3Support";
-if (!fixedModule.isEmpty())
-subtitleText << "[" << Atom(Atom::AutoLink, fixedModule) << " module]";
-if (fixedModule.isEmpty()) {
-QMultiMap<QString, QString> publicGroups = myTree->publicGroups();
-QList<QString> groupNames = publicGroups.values(inner->name());
-if (!groupNames.isEmpty()) {
-qSort(groupNames.begin(), groupNames.end());
-subtitleText << "[";
-for (int j=0; j<groupNames.count(); j++) {
-subtitleText <<  Atom(Atom::AutoLink, groupNames[j]);
-if (j<groupNames.count()-1)
-subtitleText <<", ";
-}
-subtitleText << "]";
-}
-}
-#endif
 generateHeader(title, inner, marker);
 sections = marker->sections(inner, CodeMarker::Summary, CodeMarker::Okay);
 generateTableOfContents(inner,marker,&sections);
 generateTitle(title, subtitleText, SmallSubTitle, inner, marker);
-#ifdef QDOC_QML
-if (classe && !classe->qmlElement().isEmpty()) {
-generateInstantiatedBy(classe,marker);
-}
-#endif
 generateBrief(inner, marker);
 generateIncludes(inner, marker);
 generateStatus(inner, marker);
 if (classe) {
 generateInherits(classe, marker);
 generateInheritedBy(classe, marker);
+#ifdef QDOC_QML
+if (!classe->qmlElement().isEmpty()) {
+generateInstantiatedBy(classe,marker);
+}
+#endif
 }
 generateThreadSafeness(inner, marker);
 generateSince(inner, marker);
 out() << "<ul>\n";
 if (!s->inherited.isEmpty())
 needOtherSection = true;
 }
 else {
 if (!s->members.isEmpty()) {
-out() << "<hr />\n";
+// out() << "<hr />\n";
 out() << "<a name=\""
 << registerRef((*s).name.toLower())
-<< "\"></a>\n";
+<< "\"></a>" << divNavTop << "\n";
 out() << "<h2>" << protectEnc((*s).name) << "</h2>\n";
 generateSection(s->members, inner, marker, CodeMarker::Summary);
 }
 if (!s->reimpMembers.isEmpty()) {
 QString name = QString("Reimplemented ") + (*s).name;
-out() << "<hr />\n";
+//  out() << "<hr />\n";
 out() << "<a name=\""
 << registerRef(name.toLower())
-<< "\"></a>\n";
+<< "\"></a>" << divNavTop << "\n";
 out() << "<h2>" << protectEnc(name) << "</h2>\n";
 generateSection(s->reimpMembers, inner, marker, CodeMarker::Summary);
 }
 if (!s->inherited.isEmpty()) {
 out() << "<ul>\n";
-generateSectionInheritedList(*s, inner, marker, true);
+generateSectionInheritedList(*s, inner, marker);
 out() << "</ul>\n";
 }
 }
 ++s;
 }
 ++s;
 }
 out() << "</ul>\n";
 }
-out() << "<a name=\"" << registerRef("details") << "\"></a>\n";
+out() << "<a name=\"" << registerRef("details") << "\"></a>" << divNavTop << "\n";
 if (!inner->doc().isEmpty()) {
-out() << "<hr />\n"
+generateExtractionMark(inner, DetailedDescriptionMark);
-<< "<div class=\"descr\"/>\n" // QTBUG-9504
+//out() << "<hr />\n"
+out() << "<div class=\"descr\">\n" // QTBUG-9504
 << "<h2>" << "Detailed Description" << "</h2>\n";
 generateBody(inner, marker);
 out() << "</div>\n"; // QTBUG-9504
 generateAlsoList(inner, marker);
+generateExtractionMark(inner, EndMark);
 }
 sections = marker->sections(inner, CodeMarker::Detailed, CodeMarker::Okay);
 s = sections.begin();
 while (s != sections.end()) {
-out() << "<hr />\n";
+//out() << "<hr />\n";
 if (!(*s).divClass.isEmpty())
-out() << "<div class=\"" << (*s).divClass << "\"/>\n"; // QTBUG-9504
+out() << "<div class=\"" << (*s).divClass << "\">\n"; // QTBUG-9504
 out() << "<h2>" << protectEnc((*s).name) << "</h2>\n";
 NodeList::ConstIterator m = (*s).members.begin();
 while (m != (*s).members.end()) {
 if ((*m)->access() != Node::Private) { // ### check necessary?
 }
 appendDcfSubSection(&dcfClassesRoot, classSection);
 }
+/*!
+Generate the html page for a qdoc file that doesn't map
+to an underlying c++ file.
+*/
 void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
 {
 SubTitleSize subTitleSize = LargeSubTitle;
 DcfSection fakeSection;
 fakeSection.title = fake->fullTitle();
 /*
 Generate the TOC for the new doc format.
 Don't generate a TOC for the home page.
 */
-if (fake->name() != QString("index.html"))
+const QmlClassNode* qml_cn = 0;
+if (fake->subType() == Node::QmlClass) {
+qml_cn = static_cast<const QmlClassNode*>(fake);
+sections = marker->qmlSections(qml_cn,CodeMarker::Summary);
+generateTableOfContents(fake,marker,&sections);
+}
+else if (fake->name() != QString("index.html"))
 generateTableOfContents(fake,marker,0);
 generateTitle(fullTitle,
 Text() << fake->subTitle(),
 subTitleSize,
 // Generate brief text and status for modules.
 generateBrief(fake, marker);
 generateStatus(fake, marker);
 if (moduleNamespaceMap.contains(fake->name())) {
-out() << "<a name=\"" << registerRef("namespaces") << "\"></a>\n";
+out() << "<a name=\"" << registerRef("namespaces") << "\"></a>" << divNavTop << "\n";
 out() << "<h2>Namespaces</h2>\n";
 generateAnnotatedList(fake, marker, moduleNamespaceMap[fake->name()]);
 }
 if (moduleClassMap.contains(fake->name())) {
-out() << "<a name=\"" << registerRef("classes") << "\"></a>\n";
+out() << "<a name=\"" << registerRef("classes") << "\"></a>" << divNavTop << "\n";
 out() << "<h2>Classes</h2>\n";
 generateAnnotatedList(fake, marker, moduleClassMap[fake->name()]);
 }
 }
 else if (fake->subType() == Node::HeaderFile) {
 appendDcfSubSection(&fakeSection, compatSection);
 }
 }
 #ifdef QDOC_QML
 else if (fake->subType() == Node::QmlClass) {
-const QmlClassNode* qml_cn = static_cast<const QmlClassNode*>(fake);
 const ClassNode* cn = qml_cn->classNode();
+generateBrief(qml_cn, marker);
 generateQmlInherits(qml_cn, marker);
+generateQmlInheritedBy(qml_cn, marker);
 generateQmlInstantiates(qml_cn, marker);
-generateBrief(qml_cn, marker);
-generateQmlInheritedBy(qml_cn, marker);
-sections = marker->qmlSections(qml_cn,CodeMarker::Summary);
 s = sections.begin();
 while (s != sections.end()) {
-out() << "<a name=\"" << registerRef((*s).name) << "\"></a>\n";
+out() << "<a name=\"" << registerRef((*s).name.toLower())
+<< "\"></a>" << divNavTop << "\n";
 out() << "<h2>" << protectEnc((*s).name) << "</h2>\n";
 generateQmlSummary(*s,fake,marker);
 ++s;
 }
-out() << "<a name=\"" << registerRef("details") << "\"></a>\n";
+generateExtractionMark(fake, DetailedDescriptionMark);
+out() << "<a name=\"" << registerRef("details") << "\"></a>" << divNavTop << "\n";
 out() << "<h2>" << "Detailed Description" << "</h2>\n";
 generateBody(fake, marker);
 if (cn)
 generateQmlText(cn->doc().body(), cn, marker, fake->name());
 generateAlsoList(fake, marker);
-out() << "<hr />\n";
+generateExtractionMark(fake, EndMark);
+//out() << "<hr />\n";
 sections = marker->qmlSections(qml_cn,CodeMarker::Detailed);
 s = sections.begin();
 while (s != sections.end()) {
 out() << "<h2>" << protectEnc((*s).name) << "</h2>\n";
 #endif
 sections = marker->sections(fake, CodeMarker::Summary, CodeMarker::Okay);
 s = sections.begin();
 while (s != sections.end()) {
-out() << "<a name=\"" << registerRef((*s).name) << "\"></a>\n";
+out() << "<a name=\"" << registerRef((*s).name) << "\"></a>" << divNavTop << "\n";
 out() << "<h2>" << protectEnc((*s).name) << "</h2>\n";
 generateSectionList(*s, fake, marker, CodeMarker::Summary);
 ++s;
 }
 Text brief = fake->doc().briefText();
 if (fake->subType() == Node::Module && !brief.isEmpty()) {
-out() << "<a name=\"" << registerRef("details") << "\"></a>\n";
+generateExtractionMark(fake, DetailedDescriptionMark);
-out() << "<div class=\"descr\"/>\n"; // QTBUG-9504
+out() << "<a name=\"" << registerRef("details") << "\"></a>" << divNavTop << "\n";
+out() << "<div class=\"descr\">\n"; // QTBUG-9504
 out() << "<h2>" << "Detailed Description" << "</h2>\n";
 }
-else
+else {
-out() << "<div class=\"descr\"/>\n"; // QTBUG-9504
+generateExtractionMark(fake, DetailedDescriptionMark);
+out() << "<div class=\"descr\">\n"; // QTBUG-9504
+}
 generateBody(fake, marker);
 out() << "</div>\n"; // QTBUG-9504
 generateAlsoList(fake, marker);
+generateExtractionMark(fake, EndMark);
 if (!fake->groupMembers().isEmpty()) {
 NodeMap groupMembersMap;
 foreach (const Node *node, fake->groupMembers()) {
 if (node->type() == Node::Class || node->type() == Node::Namespace)
 fakeSection.keywords += qMakePair(fakeSection.title, fakeSection.ref);
 sections = marker->sections(fake, CodeMarker::Detailed, CodeMarker::Okay);
 s = sections.begin();
 while (s != sections.end()) {
-out() << "<hr />\n";
+//out() << "<hr />\n";
 out() << "<h2>" << protectEnc((*s).name) << "</h2>\n";
 NodeList::ConstIterator m = (*s).members.begin();
 while (m != (*s).members.end()) {
 generateDetailedMember(*m, fake, marker);
 appendDcfSubSection(&dcfOverviewsRoot, fakeSection);
 }
 }
 }
+/*!
+Returns "html" for this subclass of Generator.
+*/
 QString HtmlGenerator::fileExtension(const Node * /* node */) const
 {
 return "html";
 }
 {
 Text breadcrumb;
 if (node->type() == Node::Class) {
 const ClassNode* cn = static_cast<const ClassNode*>(node);
 QString name =  node->moduleName();
-out() << "              <li><a href=\"modules.html\">All Modules</a></li>";
+out() << "              <li><a href=\"modules.html\">Modules</a></li>";
 if (!name.isEmpty()) {
 out() << "              <li>";
 breadcrumb << Atom(Atom::AutoLink,name);
 generateText(breadcrumb, node, marker);
 out() << "</li>\n";
 }
-breadcrumb.clear();
+if (!cn->name().isEmpty())
-if (!cn->name().isEmpty()) {
+out() << "              <li>" << cn->name() << "</li>\n";
-out() << "              <li>";
-breadcrumb << Atom(Atom::AutoLink,cn->name());
-generateText(breadcrumb, 0, marker);
-out() << "</li>\n";
-}
 }
 else if (node->type() == Node::Fake) {
 const FakeNode* fn = static_cast<const FakeNode*>(node);
 if (node->subType() == Node::Module) {
-out() << "              <li><a href=\"modules.html\">All Modules</a></li>";
+out() << "              <li><a href=\"modules.html\">Modules</a></li>";
 QString name =  node->name();
-if (!name.isEmpty()) {
+if (!name.isEmpty())
-out() << "              <li>";
+out() << "              <li>" << name << "</li>\n";
-breadcrumb << Atom(Atom::AutoLink,name);
-generateText(breadcrumb, 0, marker);
-out() << "</li>\n";
-}
 }
 else if (node->subType() == Node::Group) {
 if (fn->name() == QString("modules"))
-out() << "              <li><a href=\"modules.html\">All Modules</a></li>";
+out() << "              <li>Modules</li>";
 else {
-out() << "              <li><a href=\"" << fn->name() << "\">" << title
+out() << "              <li>" << title << "</li>";
-<< "</a></li>";
 }
 }
 else if (node->subType() == Node::Page) {
-if (fn->name() == QString("examples.html")) {
+if (fn->name() == QString("qdeclarativeexamples.html")) {
-out() << "              <li><a href=\"examples.html\">All Examples</a></li>";
+out() << "              <li><a href=\"all-examples.html\">Examples</a></li>";
+out() << "              <li>QML Examples & Demos</li>";
 }
 else if (fn->name().startsWith("examples-")) {
-out() << "              <li><a href=\"examples.html\">All Examples</a></li>";
+out() << "              <li><a href=\"all-examples.html\">Examples</a></li>";
-out() << "              <li><a href=\"" << fn->name() << "\">" << title
+out() << "              <li>" << title << "</li>";
-<< "</a></li>";
 }
 else if (fn->name() == QString("namespaces.html")) {
-out() << "              <li><a href=\"namespaces.html\">All Namespaces</a></li>";
+out() << "              <li>Namespaces</li>";
 }
 else {
-out() << "              <li><a href=\"" << fn->name() << "\">" << title
+out() << "              <li>" << title << "</li>";
-<< "</a></li>";
 }
 }
 else if (node->subType() == Node::QmlClass) {
 out() << "              <li><a href=\"qdeclarativeelements.html\">QML Elements</a></li>";
-out() << "              <li><a href=\"" << fn->name() << "\">" << title
+out() << "              <li>" << title << "</li>";
-<< "</a></li>";
 }
 else if (node->subType() == Node::Example) {
-out() << "              <li><a href=\"examples.html\">All Examples</a></li>";
+out() << "              <li><a href=\"all-examples.html\">Examples</a></li>";
 QStringList sl = fn->name().split('/');
-QString name = "examples-" + sl.at(0) + ".html";
+if (sl.contains("declarative"))
-QString t = CodeParser::titleFromName(name);
+out() << "              <li><a href=\"qdeclarativeexamples.html\">QML Examples & Demos</a></li>";
-out() << "              <li><a href=\"" << name << "\">"
+else {
-<< t << "</a></li>";
+QString name = "examples-" + sl.at(0) + ".html";
-out() << "              <li><a href=\"" << sl.at(0)
+QString t = CodeParser::titleFromName(name);
-<< "-" << sl.at(sl.size()-1) << ".html\">"
+out() << "              <li><a href=\"" << name << "\">"
-<< title << "</a></li>";
+<< t << "</a></li>";
+}
+out() << "              <li>" << title << "</li>";
 }
 }
 else if (node->type() == Node::Namespace) {
-const NamespaceNode* nsn = static_cast<const NamespaceNode*>(node);
+out() << "              <li><a href=\"namespaces.html\">Namespaces</a></li>";
-out() << "              <li><a href=\"namespaces.html\">All Namespaces</a></li>";
+out() << "              <li>" << title << "</li>";
-out() << "              <li><a href=\"" << fileName(nsn) << "\">" << title
-<< "</a></li>";
 }
 }
 void HtmlGenerator::generateHeader(const QString& title,
 const Node *node,
 CodeMarker *marker)
 {
 out() << QString("<?xml version=\"1.0\" encoding=\"%1\"?>\n").arg(outputEncoding);
 out() << "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
-out() << "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\">\n";
+out() << QString("<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"%1\" lang=\"%1\">\n").arg(naturalLanguage);
 out() << "<head>\n";
 out() << "  <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
 QString shortVersion;
 shortVersion = project + " " + shortVersion + ": ";
 if (node && !node->doc().location().isEmpty())
 if (project == "QSA")
 shortVersion = "QSA " + shortVersion + ": ";
 else
 shortVersion = "Qt " + shortVersion + ": ";
 }
+	// Generating page title
 out() << "  <title>" << shortVersion << protectEnc(title) << "</title>\n";
+	// Adding style sheet
-	out() << "  <!--[if IE]>";
+	out() << "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/style.css\" />";
-	out() << "<meta name=\"MSSmartTagsPreventParsing\" content=\"true\">";
+	// Adding jquery and functions - providing online tools and search features
-	out() << "<meta http-equiv=\"imagetoolbar\" content=\"no\">";
+	out() << "  <script src=\"scripts/jquery.js\" type=\"text/javascript\"></script>\n";
-	out() << "<![endif]-->";
+	out() << "  <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n";
-out() << "<!--[if lt IE 7]>";
+	// Adding style and js for small windows
-	out() << "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie6.css\">";
+	out() << "  <script src=\"./scripts/superfish.js\" type=\"text/javascript\"></script>\n";
-	out() << "<![endif]-->";
+	out() << "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/superfish.css\" />";
-out() << "<!--[if IE 7]>";
+	out() << "  <script src=\"./scripts/narrow.js\" type=\"text/javascript\"></script>\n";
-	out() << "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie7.css\">";
+	out() << "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/narrow.css\" />";
-	out() << "<![endif]-->";
-out() << "<!--[if IE 8]>";
+	// Adding syntax highlighter 	// future release
-	out() << "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie8.css\">";
-	out() << "<![endif]-->";
+	// Setting assistant configuration
-//out() << "  <title>Qt Reference Documentation</title>";
-out() << "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/style.css\" />\n";
-out() << "  <script src=\"scripts/jquery.js\" type=\"text/javascript\"></script>\n";
-out() << "  <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n";
-out() << "</head>\n";
 if (offlineDocs)
-out() << "<body class=\"offline\"  onload=\"CheckEmptyAndLoadList();\">\n";
+	{
+		out() << "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/style.css\" />"; // Only for Qt Creator
+		out() << "</head>\n";
+		out() << "<body class=\"offline \">\n"; // offline for  Assistant
+	}
+if (creatorDocs)
+	{
+		out() << "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/style.css\" />"; // Only for Qt Creator
+		out() << "</head>\n";
+		out() << "<body class=\"offline narrow creator\">\n"; // offline for Creator
+	}
+	// Setting online doc configuration
 else
-out() << "<body class=\"\" onload=\"CheckEmptyAndLoadList();\">\n";
+		{
+		// Browser spec styles
+		out() << "  <!--[if IE]>\n";
+		out() << "<meta name=\"MSSmartTagsPreventParsing\" content=\"true\">\n";
+		out() << "<meta http-equiv=\"imagetoolbar\" content=\"no\">\n";
+		out() << "<![endif]-->\n";
+		out() << "<!--[if lt IE 7]>\n";
+		out() << "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie6.css\">\n";
+		out() << "<![endif]-->\n";
+		out() << "<!--[if IE 7]>\n";
+		out() << "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie7.css\">\n";
+		out() << "<![endif]-->\n";
+		out() << "<!--[if IE 8]>\n";
+		out() << "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie8.css\">\n";
+		out() << "<![endif]-->\n";
+		out() << "</head>\n";
+		// CheckEmptyAndLoadList activating search
+		out() << "<body class=\"\" onload=\"CheckEmptyAndLoadList();\">\n";
+		}
 #ifdef GENERATE_MAC_REFS
 if (mainPage)
 generateMacRef(node, marker);
 #endif
 out() << QString(postHeader).replace("\\" + COMMAND_VERSION, myTree->version());
 generateBreadCrumbs(title,node,marker);
 out() << QString(postPostHeader).replace("\\" + COMMAND_VERSION, myTree->version());
-#if 0 // Removed for new docf format. MWS
+#if 0 // Removed for new doc format. MWS
 if (node && !node->links().empty())
 out() << "<p>\n" << navigationLinks << "</p>\n";
 #endif
 }
 if (node && !node->links().empty())
 out() << "<p>\n" << navigationLinks << "</p>\n";
 out() << QString(footer).replace("\\" + COMMAND_VERSION, myTree->version())
 << QString(address).replace("\\" + COMMAND_VERSION, myTree->version());
-	      out() << "  <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n";
+	    if (offlineDocs)
+		{
 out() << "</body>\n";
+		}
+	    if (creatorDocs)
+		{
+out() << "</body>\n";
+		}
+		else
+		{
+			out() << "  <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n";
+			out() << "  <!-- <script type=\"text/javascript\">\n";
+			out() << "  var _gaq = _gaq || [];\n";
+			out() << "  _gaq.push(['_setAccount', 'UA-4457116-5']);\n";
+			out() << "  _gaq.push(['_trackPageview']);\n";
+			out() << "  (function() {\n";
+			out() << "  var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\n";
+			out() << "  ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';\n";
+			out() << "  var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n";
+			out() << "  })();\n";
+			out() << "  </script> -->\n";
+			out() << "</body>\n";
+		}
 out() <<   "</html>\n";
 }
 void HtmlGenerator::generateBrief(const Node *node, CodeMarker *marker,
 const Node *relative)
 {
 Text brief = node->doc().briefText();
 if (!brief.isEmpty()) {
+generateExtractionMark(node, BriefMark);
 out() << "<p>";
 generateText(brief, node, marker);
 if (!relative || node == relative)
 out() << " <a href=\"#";
 else
 out() << " <a href=\"" << linkForNode(node, relative) << "#";
 out() << registerRef("details") << "\">More...</a></p>\n";
+generateExtractionMark(node, EndMark);
 }
 }
 void HtmlGenerator::generateIncludes(const InnerNode *inner, CodeMarker *marker)
 {
 if (!inner->includes().isEmpty()) {
-out() << "<pre class=\"highlightedCode\">"
+out() << "<pre class=\"highlightedCode brush: cpp\">"
 << trimmedTrailing(highlightedCode(indent(codeIndent,
 marker->markedUpIncludes(inner->includes())),
 marker,inner))
 << "</pre>";
 }
 // disable nested links in table of contents
 inContents = true;
 inLink = true;
 out() << "<div class=\"toc\">\n";
-out() << "<h3>Contents</h3>\n";
+out() << "<h3><a name=\"toc\">Contents</a></h3>\n";
 sectionNumber.append("1");
 out() << "<ul>\n";
 if (node->subType() == Node::Module) {
 if (moduleNamespaceMap.contains(node->name())) {
 detailsBase = 1;
 break;
 }
 }
 }
-else if (sections && (node->type() == Node::Class)) {
+else if (sections && ((node->type() == Node::Class) ||
+(node->type() == Node::Namespace) ||
+(node->subType() == Node::QmlClass))) {
 QList<Section>::ConstIterator s = sections->begin();
 while (s != sections->end()) {
 if (!s->members.isEmpty() || !s->reimpMembers.isEmpty()) {
 out() << "<li class=\"level"
 << sectionNumber.size()
 << ".html\">Prev: ";
 generateText(section.previousHeading(), node, marker);
 out() << "</a>]\n";
 #endif
 }
+		if (fake->name() != QString("index.html"))
+			{
 if (bar.current.begin() != 0) {
 out() << "[<a href=\"" << "home"
 << ".html\">Home</a>]\n";
 }
 if (bar.next.begin() != 0) {
 << ".html\">Next: ";
 generateText(Text::sectionHeading(bar.next.begin()), node, marker);
 out() << "</a>]\n";
 }
 out() << "</p>\n";
+		}
 }
 }
 #endif
 QString HtmlGenerator::generateListOfAllMemberFile(const InnerNode *inner,
 generateSectionList(sections.at(i), inner, marker, CodeMarker::Summary);
 }
 sections = marker->sections(inner, CodeMarker::Detailed, status);
 for (i = 0; i < sections.size(); ++i) {
-out() << "<hr />\n";
+//out() << "<hr />\n";
 out() << "<h2>" << protectEnc(sections.at(i).name) << "</h2>\n";
 NodeList::ConstIterator m = sections.at(i).members.begin();
 while (m != sections.at(i).members.end()) {
 if ((*m)->access() != Node::Private)
 if (++row % 2 == 1)
 out() << "<tr class=\"odd topAlign\">";
 else
 out() << "<tr class=\"even topAlign\">";
-out() << "<td><p>";
+out() << "<td class=\"tblName\"><p>";
 generateFullName(node, relative, marker);
 out() << "</p></td>";
 if (!(node->type() == Node::Fake)) {
 Text brief = node->doc().trimmedBriefText(name);
 if (!brief.isEmpty()) {
-out() << "<td><p>";
+out() << "<td class=\"tblDescr\"><p>";
 generateText(brief, node, marker);
 out() << "</p></td>";
 }
 }
 else {
-out() << "<td><p>";
+out() << "<td class=\"tblDescr\"><p>";
 out() << protectEnc(node->doc().briefText().toString());
 out() << "</p></td>";
 }
 out() << "</tr>\n";
 }
 const NodeMap &classMap,
 bool includeAlphabet,
 QString commonPrefix)
 {
 const int NumParagraphs = 37; // '0' to '9', 'A' to 'Z', '_'
-const int NumColumns = 3; // number of columns in the result
 if (classMap.isEmpty())
 return;
 /*
 if (pieces.size() == 1)
 key = pieces.last().mid(idx).toLower();
 else
 key = pieces.last().toLower();
-int paragraphNo = NumParagraphs - 1;
+int paragraphNr = NumParagraphs - 1;
 if (key[0].digitValue() != -1) {
-paragraphNo = key[0].digitValue();
+paragraphNr = key[0].digitValue();
 }
 else if (key[0] >= QLatin1Char('a') && key[0] <= QLatin1Char('z')) {
-paragraphNo = 10 + key[0].unicode() - 'a';
+paragraphNr = 10 + key[0].unicode() - 'a';
 }
-paragraphName[paragraphNo] = key[0].toUpper();
+paragraphName[paragraphNr] = key[0].toUpper();
 usedParagraphNames.insert(key[0].toLower().cell());
-paragraph[paragraphNo].insert(key, c.value());
+paragraph[paragraphNr].insert(key, c.value());
 ++c;
 }
 /*
 Each paragraph j has a size: paragraph[j].count(). In the
 We now want to compute the paragraph offset. Paragraphs 0 to 6
 start at offsets 0, 3, 4, 8, 9, 14, 23.
 */
 int paragraphOffset[NumParagraphs + 1];     // 37 + 1
-int i, j, k;
 paragraphOffset[0] = 0;
-for (j = 0; j < NumParagraphs; j++)         // j = 0..36
+for (int i=0; i<NumParagraphs; i++)         // i = 0..36
-paragraphOffset[j + 1] = paragraphOffset[j] + paragraph[j].count();
+paragraphOffset[i+1] = paragraphOffset[i] + paragraph[i].count();
-int firstOffset[NumColumns + 1];
+int curParNr = 0;
-int currentOffset[NumColumns];
+int curParOffset = 0;
-int currentParagraphNo[NumColumns];
-int currentOffsetInParagraph[NumColumns];
+/*
+Output the alphabet as a row of links.
-int numRows = (classMap.count() + NumColumns - 1) / NumColumns;
+*/
-int curParagNo = 0;
-for (i = 0; i < NumColumns; i++) {
-firstOffset[i] = qMin(i * numRows, classMap.size());
-currentOffset[i] = firstOffset[i];
-for (j = curParagNo; j < NumParagraphs; j++) {
-if (paragraphOffset[j] > firstOffset[i])
-break;
-if (paragraphOffset[j] <= firstOffset[i])
-curParagNo = j;
-}
-currentParagraphNo[i] = curParagNo;
-currentOffsetInParagraph[i] = firstOffset[i] -
-paragraphOffset[curParagNo];
-}
-firstOffset[NumColumns] = classMap.count();
 if (includeAlphabet) {
 out() << "<p  class=\"centerAlign functionIndex\"><b>";
 for (int i = 0; i < 26; i++) {
 QChar ch('a' + i);
 if (usedParagraphNames.contains(char('a' + i)))
 out() << QString("<a href=\"#%1\">%2</a>&nbsp;").arg(ch).arg(ch.toUpper());
 }
 out() << "</b></p>\n";
 }
-out() << "<table class=\"generic\">\n";
+/*
-for (k = 0; k < numRows; k++) {
+Output a <div> element to contain all the <dl> elements.
-if (++numTableRows % 2 == 1)
+*/
-out() << "<tr class=\"odd topAlign\">";
+out() << "<div class=\"flowListDiv\">\n";
-else
-out() << "<tr class=\"even topAlign\">";
+for (int i=0; i<classMap.count()-1; i++) {
-//break;
+while ((curParNr < NumParagraphs) &&
+(curParOffset == paragraph[curParNr].count())) {
-//	out() << "<tr>\n";
+++curParNr;
-for (i = 0; i < NumColumns; i++) {
+curParOffset = 0;
-if (currentOffset[i] >= firstOffset[i + 1]) {
+}
-// this column is finished
-out() << "<td>\n</td>\n"; // check why?
+/*
-}
+Starting a new paragraph means starting a new <dl>.
-else {
+*/
-while ((currentParagraphNo[i] < NumParagraphs) &&
+if (curParOffset == 0) {
-(currentOffsetInParagraph[i] == paragraph[currentParagraphNo[i]].count())) {
+if (i > 0)
-++currentParagraphNo[i];
+out() << "</dl>\n";
-currentOffsetInParagraph[i] = 0;
+if (++numTableRows % 2 == 1)
-}
+out() << "<dl class=\"flowList odd\">";
-#if 0
+else
-if (currentParagraphNo[i] >= NumParagraphs) {
+out() << "<dl class=\"flowList even\">";
-qDebug() << "### Internal error ###" << __FILE__ << __LINE__
+out() << "<dt class=\"alphaChar\">";
-<< currentParagraphNo[i] << NumParagraphs;
+if (includeAlphabet) {
-currentParagraphNo[i] = NumParagraphs - 1;
+QChar c = paragraphName[curParNr][0].toLower();
-}
+out() << QString("<a name=\"%1\"></a>").arg(c);
-#endif
+}
-out() << "<th  class=\"rightAlign alphaChar\"><p>";
+out() << "<b>"
-if (currentOffsetInParagraph[i] == 0) {
+<< paragraphName[curParNr]
-// start a new paragraph
+<< "</b>";
-if (includeAlphabet) {
+out() << "</dt>\n";
-QChar c = paragraphName[currentParagraphNo[i]][0].toLower();
+}
-out() << QString("<a name=\"%1\"></a>").arg(c);
-}
+/*
-out() << "<b>"
+Output a <dd> for the current offset in the current paragraph.
-<< paragraphName[currentParagraphNo[i]]
+*/
-<< "</b>";
+out() << "<dd>";
-}
+if ((curParNr < NumParagraphs) &&
-out() << "</p></th>\n";
+!paragraphName[curParNr].isEmpty()) {
+NodeMap::Iterator it;
-out() << "<td><p>";
+it = paragraph[curParNr].begin();
-if ((currentParagraphNo[i] < NumParagraphs) &&
+for (int i=0; i<curParOffset; i++)
-!paragraphName[currentParagraphNo[i]].isEmpty()) {
+++it;
-NodeMap::Iterator it;
-it = paragraph[currentParagraphNo[i]].begin();
+/*
-for (j = 0; j < currentOffsetInParagraph[i]; j++)
+Previously, we used generateFullName() for this, but we
-++it;
+require some special formatting.
+*/
-// Previously, we used generateFullName() for this, but we
+out() << "<a href=\"" << linkForNode(it.value(), relative) << "\">";
-// require some special formatting.
-out() << "<a href=\""
+QStringList pieces;
-<< linkForNode(it.value(), relative)
+if (it.value()->subType() == Node::QmlClass)
-<< "\">";
+pieces << it.value()->name();
-QStringList pieces;
+else
-if (it.value()->subType() == Node::QmlClass)
+pieces = fullName(it.value(), relative, marker).split("::");
-pieces << it.value()->name();
+out() << protectEnc(pieces.last());
-else
+out() << "</a>";
-pieces = fullName(it.value(), relative, marker).split("::");
+if (pieces.size() > 1) {
-out() << protectEnc(pieces.last());
+out() << " (";
-out() << "</a>";
+generateFullName(it.value()->parent(), relative, marker);
-if (pieces.size() > 1) {
+out() << ")";
-out() << " (";
+}
-generateFullName(it.value()->parent(), relative, marker);
+}
-out() << ")";
+out() << "</dd>\n";
-}
+curParOffset++;
 }
-out() << "</p></td>\n";
+out() << "</dl>\n";
+out() << "</div>\n";
-currentOffset[i]++;
-currentOffsetInParagraph[i]++;
-}
-}
-out() << "</tr>\n";
-}
-out() << "</table>\n";
 }
 void HtmlGenerator::generateFunctionIndex(const Node *relative,
 CodeMarker *marker)
 {
 CodeMarker *marker)
 {
 QMap<Text, const Node *>::ConstIterator it = legaleseTexts.begin();
 while (it != legaleseTexts.end()) {
 Text text = it.key();
-out() << "<hr />\n";
+//out() << "<hr />\n";
 generateText(text, relative, marker);
 out() << "<ul>\n";
 do {
 out() << "<li>";
 generateFullName(it.value(), relative, marker);
 ++it;
 } while (it != legaleseTexts.end() && it.key() == text);
 out() << "</ul>\n";
 }
 }
-/*void HtmlGenerator::generateSynopsis(const Node *node,
-const Node *relative,
-CodeMarker *marker,
-CodeMarker::SynopsisStyle style)
-{
-QString marked = marker->markedUpSynopsis(node, relative, style);
-QRegExp templateTag("(<[^@>]*>)");
-if (marked.indexOf(templateTag) != -1) {
-QString contents = protectEnc(marked.mid(templateTag.pos(1),
-templateTag.cap(1).length()));
-marked.replace(templateTag.pos(1), templateTag.cap(1).length(),
-contents);
-}
-marked.replace(QRegExp("<@param>([a-z]+)_([1-9n])</@param>"),
-"<i>\\1<sub>\\2</sub></i>");
-marked.replace("<@param>", "<i>");
-marked.replace("</@param>", "</i>");
-if (style == CodeMarker::Summary)
-marked.replace("@name>", "b>");
-if (style == CodeMarker::SeparateList) {
-QRegExp extraRegExp("<@extra>.*</@extra>");
-extraRegExp.setMinimal(true);
-marked.replace(extraRegExp, "");
-}
-else {
-marked.replace("<@extra>", "&nbsp;&nbsp;<tt>");
-marked.replace("</@extra>", "</tt>");
-}
-if (style != CodeMarker::Detailed) {
-marked.replace("<@type>", "");
-marked.replace("</@type>", "");
-}
-out() << highlightedCode(marked, marker, relative);
-}*/
 #ifdef QDOC_QML
 void HtmlGenerator::generateQmlItem(const Node *node,
 const Node *relative,
 CodeMarker *marker,
 if (summary) {
 marked.replace("<@type>", "");
 marked.replace("</@type>", "");
 }
-out() << highlightedCode(marked, marker, relative);
+out() << highlightedCode(marked, marker, relative, false, node);
 }
 #endif
 void HtmlGenerator::generateOverviewList(const Node *relative, CodeMarker * /* marker */)
 {
 }
 out() << "</ul>\n";
 }
 }
-#ifdef QDOC_NAME_ALIGNMENT
 void HtmlGenerator::generateSection(const NodeList& nl,
 const Node *relative,
 CodeMarker *marker,
 CodeMarker::SynopsisStyle style)
 {
-bool name_alignment = true;
+bool alignNames = true;
 if (!nl.isEmpty()) {
 bool twoColumn = false;
 if (style == CodeMarker::SeparateList) {
-name_alignment = false;
+alignNames = false;
 twoColumn = (nl.count() >= 16);
 }
 else if (nl.first()->type() == Node::Property) {
 twoColumn = (nl.count() >= 5);
-name_alignment = false;
+alignNames = false;
 }
-if (name_alignment) {
+if (alignNames) {
 out() << "<table class=\"alignedsummary\">\n";
 }
 else {
 if (twoColumn)
 out() << "<table class=\"propsummary\">\n"
 if ((*m)->access() == Node::Private) {
 ++m;
 continue;
 }
-if (name_alignment) {
+if (alignNames) {
 out() << "<tr><td class=\"memItemLeft rightAlign topAlign\"> ";
 }
 else {
 if (twoColumn && i == (int) (nl.count() + 1) / 2)
 out() << "</ul></td><td  class=\"topAlign\"><ul>\n";
 out() << "<li class=\"fn\">";
 }
-generateSynopsis(*m, relative, marker, style, name_alignment);
+generateSynopsis(*m, relative, marker, style, alignNames);
-if (name_alignment)
+if (alignNames)
 out() << "</td></tr>\n";
 else
 out() << "</li>\n";
 i++;
 ++m;
 }
-if (name_alignment)
+if (alignNames)
 out() << "</table>\n";
 else {
 out() << "</ul>\n";
 if (twoColumn)
 out() << "</td></tr>\n</table>\n";
 void HtmlGenerator::generateSectionList(const Section& section,
 const Node *relative,
 CodeMarker *marker,
 CodeMarker::SynopsisStyle style)
 {
-bool name_alignment = true;
+bool alignNames = true;
 if (!section.members.isEmpty()) {
 bool twoColumn = false;
 if (style == CodeMarker::SeparateList) {
-name_alignment = false;
+alignNames = false;
 twoColumn = (section.members.count() >= 16);
 }
 else if (section.members.first()->type() == Node::Property) {
 twoColumn = (section.members.count() >= 5);
-name_alignment = false;
+alignNames = false;
 }
-if (name_alignment) {
+if (alignNames) {
 out() << "<table class=\"alignedsummary\">\n";
 }
 else {
 if (twoColumn)
 out() << "<table class=\"propsummary\">\n"
 if ((*m)->access() == Node::Private) {
 ++m;
 continue;
 }
-if (name_alignment) {
+if (alignNames) {
 out() << "<tr><td class=\"memItemLeft topAlign rightAlign\"> ";
 }
 else {
 if (twoColumn && i == (int) (section.members.count() + 1) / 2)
 out() << "</ul></td><td class=\"topAlign\"><ul>\n";
 out() << "<li class=\"fn\">";
 }
-generateSynopsis(*m, relative, marker, style, name_alignment);
+generateSynopsis(*m, relative, marker, style, alignNames);
-if (name_alignment)
+if (alignNames)
 out() << "</td></tr>\n";
 else
 out() << "</li>\n";
 i++;
 ++m;
 }
-if (name_alignment)
+if (alignNames)
 out() << "</table>\n";
 else {
 out() << "</ul>\n";
 if (twoColumn)
 out() << "</td></tr>\n</table>\n";
 }
 }
 if (style == CodeMarker::Summary && !section.inherited.isEmpty()) {
 out() << "<ul>\n";
-generateSectionInheritedList(section, relative, marker, name_alignment);
+generateSectionInheritedList(section, relative, marker);
 out() << "</ul>\n";
 }
 }
 void HtmlGenerator::generateSectionInheritedList(const Section& section,
 const Node *relative,
-CodeMarker *marker,
+CodeMarker *marker)
-bool nameAlignment)
 {
 QList<QPair<ClassNode *, int> >::ConstIterator p = section.inherited.begin();
 while (p != section.inherited.end()) {
-if (nameAlignment)
+out() << "<li class=\"fn\">";
-out() << "<li class=\"fn\">";
-else
-out() << "<li class=\"fn\">";
 out() << (*p).second << " ";
 if ((*p).second == 1) {
 out() << section.singularMember;
 }
 else {
 void HtmlGenerator::generateSynopsis(const Node *node,
 const Node *relative,
 CodeMarker *marker,
 CodeMarker::SynopsisStyle style,
-bool nameAlignment)
+bool alignNames)
 {
 QString marked = marker->markedUpSynopsis(node, relative, style);
 QRegExp templateTag("(<[^@>]*>)");
 if (marked.indexOf(templateTag) != -1) {
 QString contents = protectEnc(marked.mid(templateTag.pos(1),
 if (style != CodeMarker::Detailed) {
 marked.replace("<@type>", "");
 marked.replace("</@type>", "");
 }
-out() << highlightedCode(marked, marker, relative, style, nameAlignment);
+out() << highlightedCode(marked, marker, relative, alignNames);
 }
 QString HtmlGenerator::highlightedCode(const QString& markedCode,
-CodeMarker *marker,
+CodeMarker* marker,
-const Node *relative,
+const Node* relative,
-CodeMarker::SynopsisStyle ,
+bool alignNames,
-bool nameAlignment)
+const Node* self)
 {
 QString src = markedCode;
 QString html;
 QStringRef arg;
 QStringRef par1;
 const QChar charLangle = '<';
 const QChar charAt = '@';
+static const QString typeTag("type");
+static const QString headerTag("headerfile");
+static const QString funcTag("func");
+static const QString linkTag("link");
 // replace all <@link> tags: "(<@link node=\"([^\"]+)\">).*(</@link>)"
-static const QString linkTag("link");
 bool done = false;
-for (int i = 0, n = src.size(); i < n;) {
+for (int i = 0, srcSize = src.size(); i < srcSize;) {
 if (src.at(i) == charLangle && src.at(i + 1).unicode() == '@') {
-if (nameAlignment && !done) {// && (i != 0)) Why was this here?
+if (alignNames && !done) {// && (i != 0)) Why was this here?
 html += "</td><td class=\"memItemRight bottomAlign\">";
 done = true;
 }
 i += 2;
-if (parseArg(src, linkTag, &i, n, &arg, &par1)) {
+if (parseArg(src, linkTag, &i, srcSize, &arg, &par1)) {
 html += "<b>";
-QString link = linkForNode(
+const Node* n = CodeMarker::nodeForString(par1.toString());
-CodeMarker::nodeForString(par1.toString()), relative);
+QString link = linkForNode(n, relative);
 addLink(link, arg, &html);
 html += "</b>";
 }
 else {
 html += charLangle;
 if (slow) {
 // is this block ever used at all?
 // replace all <@func> tags: "(<@func target=\"([^\"]*)\">)(.*)(</@func>)"
 src = html;
 html = QString();
-static const QString funcTag("func");
+for (int i = 0, srcSize = src.size(); i < srcSize;) {
-for (int i = 0, n = src.size(); i < n;) {
 if (src.at(i) == charLangle && src.at(i + 1) == charAt) {
 i += 2;
-if (parseArg(src, funcTag, &i, n, &arg, &par1)) {
+if (parseArg(src, funcTag, &i, srcSize, &arg, &par1)) {
-QString link = linkForNode(
+const Node* n = marker->resolveTarget(par1.toString(),
-marker->resolveTarget(par1.toString(),
+myTree,
-myTree,
+relative);
-relative),
+QString link = linkForNode(n, relative);
-relative);
 addLink(link, arg, &html);
 par1 = QStringRef();
 }
 else {
 html += charLangle;
 }
 // replace all "(<@(type|headerfile|func)(?: +[^>]*)?>)(.*)(</@\\2>)" tags
 src = html;
 html = QString();
-static const QString typeTags[] = { "type", "headerfile", "func" };
-for (int i = 0, n = src.size(); i < n;) {
+for (int i=0, srcSize=src.size(); i<srcSize;) {
-if (src.at(i) == charLangle && src.at(i + 1) == charAt) {
+if (src.at(i) == charLangle && src.at(i+1) == charAt) {
 i += 2;
 bool handled = false;
-for (int k = 0; k != 3; ++k) {
+if (parseArg(src, typeTag, &i, srcSize, &arg, &par1)) {
-if (parseArg(src, typeTags[k], &i, n, &arg, &par1)) {
+par1 = QStringRef();
-par1 = QStringRef();
+const Node* n = marker->resolveTarget(arg.toString(), myTree, relative, self);
-QString link = linkForNode(
+addLink(linkForNode(n,relative), arg, &html);
-marker->resolveTarget(arg.toString(), myTree, relative),
+handled = true;
-relative);
+}
-addLink(link, arg, &html);
+else if (parseArg(src, headerTag, &i, srcSize, &arg, &par1)) {
-handled = true;
+par1 = QStringRef();
-break;
+const Node* n = marker->resolveTarget(arg.toString(), myTree, relative);
-}
+addLink(linkForNode(n,relative), arg, &html);
-}
+handled = true;
+}
+else if (parseArg(src, funcTag, &i, srcSize, &arg, &par1)) {
+par1 = QStringRef();
+const Node* n = marker->resolveTarget(arg.toString(), myTree, relative);
+addLink(linkForNode(n,relative), arg, &html);
+handled = true;
+}
 if (!handled) {
 html += charLangle;
 html += charAt;
 }
 }
 "<@char>",         "<span class=\"char\">",
 "</@comment>",     "</span>",
 "</@preprocessor>","</span>",
 "</@string>",      "</span>",
 "</@char>",        "</span>"
-// "<@char>",      "<font color=blue>",
-// "</@char>",     "</font>",
-// "<@func>",      "<font color=green>",
-// "</@func>",     "</font>",
-// "<@id>",        "<i>",
-// "</@id>",       "</i>",
-// "<@keyword>",   "<b>",
-// "</@keyword>",  "</b>",
-// "<@number>",    "<font color=yellow>",
-// "</@number>",   "</font>",
-// "<@op>",        "<b>",
-// "</@op>",       "</b>",
-// "<@param>",     "<i>",
-// "</@param>",    "</i>",
-// "<@string>",    "<font color=green>",
-// "</@string>",  "</font>",
 };
 for (int i = 0, n = src.size(); i < n;) {
 if (src.at(i) == charLangle) {
 bool handled = false;
 for (int k = 0; k != 8; ++k) {
 }
 }
 return html;
 }
-#else
-void HtmlGenerator::generateSectionList(const Section& section,
-const Node *relative,
-CodeMarker *marker,
-CodeMarker::SynopsisStyle style)
-{
-if (!section.members.isEmpty()) {
-bool twoColumn = false;
-if (style == CodeMarker::SeparateList) {
-twoColumn = (section.members.count() >= 16);
-}
-else if (section.members.first()->type() == Node::Property) {
-twoColumn = (section.members.count() >= 5);
-}
-if (twoColumn)
-out() << "<table class=\"generic\">\n";
-if (++numTableRows % 2 == 1)
-out() << "<tr class=\"odd topAlign\">";
-else
-out() << "<tr class=\"even topAlign\">";
-//                  << "<tr><td  class=\"topAlign\">";
-out() << "<ul>\n";
-int i = 0;
-NodeList::ConstIterator m = section.members.begin();
-while (m != section.members.end()) {
-if ((*m)->access() == Node::Private) {
-++m;
-continue;
-}
-if (twoColumn && i == (int) (section.members.count() + 1) / 2)
-out() << "</ul></td><td class=\"topAlign\"><ul>\n";
-out() << "<li class=\"fn\">";
-if (style == CodeMarker::Accessors)
-out() << "<b>";
-generateSynopsis(*m, relative, marker, style);
-if (style == CodeMarker::Accessors)
-out() << "</b>";
-out() << "</li>\n";
-i++;
-++m;
-}
-out() << "</ul>\n";
-if (twoColumn)
-out() << "</td></tr>\n</table>\n";
-}
-if (style == CodeMarker::Summary && !section.inherited.isEmpty()) {
-out() << "<ul>\n";
-generateSectionInheritedList(section, relative, marker);
-out() << "</ul>\n";
-}
-}
-void HtmlGenerator::generateSectionInheritedList(const Section& section,
-const Node *relative,
-CodeMarker *marker)
-{
-QList<QPair<ClassNode *, int> >::ConstIterator p = section.inherited.begin();
-while (p != section.inherited.end()) {
-out() << "<li class=\"fn\">";
-out() << (*p).second << " ";
-if ((*p).second == 1) {
-out() << section.singularMember;
-} else {
-out() << section.pluralMember;
-}
-out() << " inherited from <a href=\"" << fileName((*p).first)
-<< "#" << HtmlGenerator::cleanRef(section.name.toLower()) << "\">"
-<< protectEnc(marker->plainFullName((*p).first, relative))
-<< "</a></li>\n";
-++p;
-}
-}
-void HtmlGenerator::generateSynopsis(const Node *node,
-const Node *relative,
-CodeMarker *marker,
-CodeMarker::SynopsisStyle style)
-{
-QString marked = marker->markedUpSynopsis(node, relative, style);
-QRegExp templateTag("(<[^@>]*>)");
-if (marked.indexOf(templateTag) != -1) {
-QString contents = protectEnc(marked.mid(templateTag.pos(1),
-templateTag.cap(1).length()));
-marked.replace(templateTag.pos(1), templateTag.cap(1).length(),
-contents);
-}
-marked.replace(QRegExp("<@param>([a-z]+)_([1-9n])</@param>"), "<i>\\1<sub>\\2</sub></i>");
-marked.replace("<@param>", "<i>");
-marked.replace("</@param>", "</i>");
-if (style == CodeMarker::Summary)
-marked.replace("@name>", "b>");
-if (style == CodeMarker::SeparateList) {
-QRegExp extraRegExp("<@extra>.*</@extra>");
-extraRegExp.setMinimal(true);
-marked.replace(extraRegExp, "");
-} else {
-marked.replace("<@extra>", "<tt>");
-marked.replace("</@extra>", "</tt>");
-}
-if (style != CodeMarker::Detailed) {
-marked.replace("<@type>", "");
-marked.replace("</@type>", "");
-}
-out() << highlightedCode(marked, marker, relative);
-}
-QString HtmlGenerator::highlightedCode(const QString& markedCode,
-CodeMarker *marker,
-const Node *relative)
-{
-QString src = markedCode;
-QString html;
-QStringRef arg;
-QStringRef par1;
-const QChar charLangle = '<';
-const QChar charAt = '@';
-// replace all <@link> tags: "(<@link node=\"([^\"]+)\">).*(</@link>)"
-static const QString linkTag("link");
-for (int i = 0, n = src.size(); i < n;) {
-if (src.at(i) == charLangle && src.at(i + 1) == charAt) {
-i += 2;
-if (parseArg(src, linkTag, &i, n, &arg, &par1)) {
-const Node* node = CodeMarker::nodeForString(par1.toString());
-QString link = linkForNode(node, relative);
-addLink(link, arg, &html);
-}
-else {
-html += charLangle;
-html += charAt;
-}
-}
-else {
-html += src.at(i++);
-}
-}
-if (slow) {
-// is this block ever used at all?
-// replace all <@func> tags: "(<@func target=\"([^\"]*)\">)(.*)(</@func>)"
-src = html;
-html = QString();
-static const QString funcTag("func");
-for (int i = 0, n = src.size(); i < n;) {
-if (src.at(i) == charLangle && src.at(i + 1) == charAt) {
-i += 2;
-if (parseArg(src, funcTag, &i, n, &arg, &par1)) {
-QString link = linkForNode(
-marker->resolveTarget(par1.toString(),
-myTree,
-relative),
-relative);
-addLink(link, arg, &html);
-par1 = QStringRef();
-}
-else {
-html += charLangle;
-html += charAt;
-}
-}
-else {
-html += src.at(i++);
-}
-}
-}
-// replace all "(<@(type|headerfile|func)(?: +[^>]*)?>)(.*)(</@\\2>)" tags
-src = html;
-html = QString();
-static const QString typeTags[] = { "type", "headerfile", "func" };
-for (int i = 0, n = src.size(); i < n;) {
-if (src.at(i) == charLangle && src.at(i + 1) == charAt) {
-i += 2;
-bool handled = false;
-for (int k = 0; k != 3; ++k) {
-if (parseArg(src, typeTags[k], &i, n, &arg, &par1)) {
-par1 = QStringRef();
-QString link = linkForNode(
-marker->resolveTarget(arg.toString(), myTree, relative),
-relative);
-addLink(link, arg, &html);
-handled = true;
-break;
-}
-}
-if (!handled) {
-html += charLangle;
-html += charAt;
-}
-}
-else {
-html += src.at(i++);
-}
-}
-// replace all
-// "<@comment>" -> "<span class=\"comment\">";
-// "<@preprocessor>" -> "<span class=\"preprocessor\">";
-// "<@string>" -> "<span class=\"string\">";
-// "<@char>" -> "<span class=\"char\">";
-// "</@(?:comment|preprocessor|string|char)>" -> "</span>"
-src = html;
-html = QString();
-static const QString spanTags[] = {
-"<@comment>",      "<span class=\"comment\">",
-"<@preprocessor>", "<span class=\"preprocessor\">",
-"<@string>",       "<span class=\"string\">",
-"<@char>",         "<span class=\"char\">",
-"</@comment>",     "</span>",
-"</@preprocessor>","</span>",
-"</@string>",      "</span>",
-"</@char>",        "</span>"
-// "<@char>",      "<font color=blue>",
-// "</@char>",     "</font>",
-// "<@func>",      "<font color=green>",
-// "</@func>",     "</font>",
-// "<@id>",        "<i>",
-// "</@id>",       "</i>",
-// "<@keyword>",   "<b>",
-// "</@keyword>",  "</b>",
-// "<@number>",    "<font color=yellow>",
-// "</@number>",   "</font>",
-// "<@op>",        "<b>",
-// "</@op>",       "</b>",
-// "<@param>",     "<i>",
-// "</@param>",    "</i>",
-// "<@string>",    "<font color=green>",
-// "</@string>",  "</font>",
-};
-for (int i = 0, n = src.size(); i < n;) {
-if (src.at(i) == charLangle) {
-bool handled = false;
-for (int k = 0; k != 8; ++k) {
-const QString & tag = spanTags[2 * k];
-if (tag == QStringRef(&src, i, tag.length())) {
-html += spanTags[2 * k + 1];
-i += tag.length();
-handled = true;
-break;
-}
-}
-if (!handled) {
-++i;
-if (src.at(i) == charAt ||
-(src.at(i) == QLatin1Char('/') && src.at(i + 1) == charAt)) {
-// drop 'our' unknown tags (the ones still containing '@')
-while (i < n && src.at(i) != QLatin1Char('>'))
-++i;
-++i;
-}
-else {
-// retain all others
-html += charLangle;
-}
-}
-}
-else {
-html += src.at(i);
-++i;
-}
-}
-return html;
-}
-#endif
 void HtmlGenerator::generateLink(const Atom* atom,
 const Node* /* relative */,
 CodeMarker* marker)
 {
 const EnumNode *enume;
 #ifdef GENERATE_MAC_REFS
 generateMacRef(node, marker);
 #endif
+generateExtractionMark(node, MemberMark);
 if (node->type() == Node::Enum
 && (enume = static_cast<const EnumNode *>(node))->flagsType()) {
 #ifdef GENERATE_MAC_REFS
 generateMacRef(enume->flagsType(), marker);
 #endif
 }
 else {
 out() << "<h3 class=\"fn\">";
 out() << "<a name=\"" + refForNode(node) + "\"></a>";
 generateSynopsis(node, relative, marker, CodeMarker::Detailed);
-out() << "</h3>\n";
+out() << "</h3>" << divNavTop << "\n";
 }
 generateStatus(node, marker);
 generateBody(node, marker);
 generateThreadSafeness(node, marker);
 << protectEnc(enume->name())
 << " values.</p>\n";
 }
 }
 generateAlsoList(node, marker);
+generateExtractionMark(node, EndMark);
 }
 void HtmlGenerator::findAllClasses(const InnerNode *node)
 {
 NodeList::const_iterator c = node->childNodes().constBegin();
 }
 ++child;
 }
 }
-#if 0
-const QRegExp versionSeparator("[\\-\\.]");
-const int minorIndex = version.indexOf(versionSeparator);
-const int patchIndex = version.indexOf(versionSeparator, minorIndex+1);
-version = version.left(patchIndex);
-#endif
 void HtmlGenerator::findAllFunctions(const InnerNode *node)
 {
 NodeList::ConstIterator c = node->childNodes().begin();
 while (c != node->childNodes().end()) {
 if ((*c)->access() != Node::Private) {
 }
 ++c;
 }
 }
-#ifdef ZZZ_QDOC_QML
-/*!
-This function finds all the qml element nodes and
-stores them in a map for later use.
-*/
-void HtmlGenerator::findAllQmlClasses(const InnerNode *node)
-{
-NodeList::const_iterator c = node->childNodes().constBegin();
-while (c != node->childNodes().constEnd()) {
-if ((*c)->type() == Node::Fake) {
-const FakeNode* fakeNode = static_cast<const FakeNode *>(*c);
-if (fakeNode->subType() == Node::QmlClass) {
-const QmlClassNode* qmlNode =
-static_cast<const QmlClassNode*>(fakeNode);
-const Node* n = qmlNode->classNode();
-}
-qmlClasses.insert(fakeNode->name(),*c);
-}
-++c;
-}
-}
-#endif
 int HtmlGenerator::hOffset(const Node *node)
 {
 switch (node->type()) {
 case Node::Namespace:
 case Node::Class:
 return 2;
 case Node::Fake:
-if (node->doc().briefText().isEmpty())
+return 1;
-return 1;
-else
-return 2;
 case Node::Enum:
 case Node::Typedef:
 case Node::Function:
 case Node::Property:
 default:
 NodeList::ConstIterator m;
 int count = section.members.size();
 bool twoColumn = false;
 if (section.members.first()->type() == Node::QmlProperty) {
 twoColumn = (count >= 5);
+twoColumn = false;
 }
 if (twoColumn)
 out() << "<table class=\"qmlsummary\">\n";
 			        if (++numTableRows % 2 == 1)
 				out() << "<tr class=\"odd topAlign\">";
 {
 const QmlPropertyNode* qpn = 0;
 #ifdef GENERATE_MAC_REFS
 generateMacRef(node, marker);
 #endif
+generateExtractionMark(node, MemberMark);
 out() << "<div class=\"qmlitem\">";
 if (node->subType() == Node::QmlPropertyGroup) {
 const QmlPropGroupNode* qpgn = static_cast<const QmlPropGroupNode*>(node);
 NodeList::ConstIterator p = qpgn->childNodes().begin();
 out() << "<div class=\"qmlproto\">";
 out() << "<table class=\"qmlname\">";
 while (p != qpgn->childNodes().end()) {
 if ((*p)->type() == Node::QmlProperty) {
 qpn = static_cast<const QmlPropertyNode*>(*p);
+if (++numTableRows % 2 == 1)
-				if (++numTableRows % 2 == 1)
+out() << "<tr class=\"odd\">";
-					out() << "<tr class=\"odd\">";
+else
-				else
+out() << "<tr class=\"even\">";
-					out() << "<tr class=\"even\">";
-				out() << "<td><p>";
+out() << "<td class=\"tblQmlPropNode\"><p>";
-//out() << "<tr><td>"; // old
 out() << "<a name=\"" + refForNode(qpn) + "\"></a>";
-if (!qpn->isWritable())
+if (!qpn->isWritable(myTree)) {
 out() << "<span class=\"qmlreadonly\">read-only</span>";
+}
 if (qpgn->isDefault())
 out() << "<span class=\"qmldefault\">default</span>";
 generateQmlItem(qpn, relative, marker, false);
 out() << "</td></tr>";
 }
 else if (node->type() == Node::QmlSignal) {
 const FunctionNode* qsn = static_cast<const FunctionNode*>(node);
 out() << "<div class=\"qmlproto\">";
 out() << "<table class=\"qmlname\">";
 //out() << "<tr>";
-		if (++numTableRows % 2 == 1)
+if (++numTableRows % 2 == 1)
-			out() << "<tr class=\"odd\">";
+out() << "<tr class=\"odd\">";
-		else
+else
-			out() << "<tr class=\"even\">";
+out() << "<tr class=\"even\">";
-out() << "<td><p>";
+out() << "<td class=\"tblQmlFuncNode\"><p>";
 out() << "<a name=\"" + refForNode(qsn) + "\"></a>";
 generateSynopsis(qsn,relative,marker,CodeMarker::Detailed,false);
 //generateQmlItem(qsn,relative,marker,false);
 out() << "</p></td></tr>";
 out() << "</table>";
 //out() << "<tr>";
 		if (++numTableRows % 2 == 1)
 			out() << "<tr class=\"odd\">";
 		else
 			out() << "<tr class=\"even\">";
-out() << "<td><p>";
+out() << "<td class=\"tblQmlFuncNode\"><p>";
 out() << "<a name=\"" + refForNode(qmn) + "\"></a>";
 generateSynopsis(qmn,relative,marker,CodeMarker::Detailed,false);
 out() << "</p></td></tr>";
 out() << "</table>";
 out() << "</div>";
 generateThreadSafeness(node, marker);
 generateSince(node, marker);
 generateAlsoList(node, marker);
 out() << "</div>";
 out() << "</div>";
+generateExtractionMark(node, EndMark);
 }
 /*!
 Output the "Inherits" line for the QML element,
 if there should be one.
 linkPair = cn->links()[Node::InheritsLink];
 QStringList strList(linkPair.first);
 const Node* n = myTree->findNode(strList,Node::Fake);
 if (n && n->subType() == Node::QmlClass) {
 const QmlClassNode* qcn = static_cast<const QmlClassNode*>(n);
-out() << "<p class=\"centerAlign\">";
 Text text;
-text << "[Inherits ";
+text << Atom::ParaLeft << "Inherits ";
 text << Atom(Atom::LinkNode,CodeMarker::stringForNode(qcn));
 text << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK);
 text << Atom(Atom::String, linkPair.second);
 text << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK);
-text << "]";
+text << Atom::ParaRight;
 generateText(text, cn, marker);
-out() << "</p>";
 }
 }
 }
 }
 void HtmlGenerator::generateQmlInstantiates(const QmlClassNode* qcn,
 CodeMarker* marker)
 {
 const ClassNode* cn = qcn->classNode();
 if (cn && (cn->status() != Node::Internal)) {
-out() << "<p class=\"centerAlign\">";
 Text text;
-text << "[";
+text << Atom::ParaLeft;
 text << Atom(Atom::LinkNode,CodeMarker::stringForNode(qcn));
 text << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK);
-text << Atom(Atom::String, qcn->name());
+QString name = qcn->name();
+if (name.startsWith(QLatin1String("QML:")))
+name = name.mid(4); // remove the "QML:" prefix
+text << Atom(Atom::String, name);
 text << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK);
 text << " instantiates the C++ class ";
 text << Atom(Atom::LinkNode,CodeMarker::stringForNode(cn));
 text << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK);
 text << Atom(Atom::String, cn->name());
 text << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK);
-text << "]";
+text << Atom::ParaRight;
 generateText(text, qcn, marker);
-out() << "</p>";
 }
 }
 /*!
 Output the "[QmlGraphicsXxx is instantiated by QML element Xxx]"
 CodeMarker* marker)
 {
 if (cn &&  cn->status() != Node::Internal && !cn->qmlElement().isEmpty()) {
 const Node* n = myTree->root()->findNode(cn->qmlElement(),Node::Fake);
 if (n && n->subType() == Node::QmlClass) {
-out() << "<p class=\"centerAlign\">";
 Text text;
-text << "[";
+text << Atom::ParaLeft;
 text << Atom(Atom::LinkNode,CodeMarker::stringForNode(cn));
 text << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK);
 text << Atom(Atom::String, cn->name());
 text << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK);
 text << " is instantiated by QML element ";
 text << Atom(Atom::LinkNode,CodeMarker::stringForNode(n));
 text << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK);
 text << Atom(Atom::String, n->name());
 text << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK);
-text << "]";
+text << Atom::ParaRight;
 generateText(text, cn, marker);
-out() << "</p>";
 }
 }
 }
 /*!
 writer.writeEndElement(); // qtPageIndex
 writer.writeEndDocument();
 file.close();
 }
+void HtmlGenerator::generateExtractionMark(const Node *node, ExtractionMarkType markType)
+{
+if (markType != EndMark) {
+out() << "<!-- $$$" + node->name();
+if (markType == MemberMark) {
+if (node->type() == Node::Function) {
+const FunctionNode *func = static_cast<const FunctionNode *>(node);
+if (!func->associatedProperty()) {
+if (func->overloadNumber() == 1)
+out() << "[overload1]";
+out() << "$$$" + func->name() + func->rawParameters().remove(' ');
+}
+} else if (node->type() == Node::Property) {
+out() << "-prop";
+const PropertyNode *prop = static_cast<const PropertyNode *>(node);
+const NodeList &list = prop->functions();
+foreach (const Node *propFuncNode, list) {
+if (propFuncNode->type() == Node::Function) {
+const FunctionNode *func = static_cast<const FunctionNode *>(propFuncNode);
+out() << "$$$" + func->name() + func->rawParameters().remove(' ');
+}
+}
+} else if (node->type() == Node::Enum) {
+const EnumNode *enumNode = static_cast<const EnumNode *>(node);
+foreach (const EnumItem &item, enumNode->items())
+out() << "$$$" + item.name();
+}
+} else if (markType == BriefMark) {
+out() << "-brief";
+} else if (markType == DetailedDescriptionMark) {
+out() << "-description";
+}
+out() << " -->\n";
+} else {
+out() << "<!-- @@@" + node->name() + " -->\n";
+}
+}
 #endif
-#if 0 // fossil removed for new doc format MWS 19/04/2010
-out() << "<!DOCTYPE html\n"
-"    PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"DTD/xhtml1-strict.dtd\">\n";
-out() << QString("<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"%1\" lang=\"%1\">\n").arg(naturalLanguage);
-QString shortVersion;
-if ((project != "Qtopia") && (project != "Qt Extended")) {
-shortVersion = project + " " + shortVersion + ": ";
-if (node && !node->doc().location().isEmpty())
-out() << "<!-- " << node->doc().location().fileName() << " -->\n";
-shortVersion = myTree->version();
-if (shortVersion.count(QChar('.')) == 2)
-shortVersion.truncate(shortVersion.lastIndexOf(QChar('.')));
-if (!shortVersion.isEmpty()) {
-if (project == "QSA")
-shortVersion = "QSA " + shortVersion + ": ";
-else
-shortVersion = "Qt " + shortVersion + ": ";
-}
-}
-out() << "<head>\n"
-"  <title>" << shortVersion << protectEnc(title) << "</title>\n";
-out() << QString("<meta http-equiv=\"Content-type\" content=\"text/html; charset=%1\" />").arg(outputEncoding);
-if (!style.isEmpty())
-out() << "    <style type=\"text/css\">" << style << "</style>\n";
-const QMap<QString, QString> &metaMap = node->doc().metaTagMap();
-if (!metaMap.isEmpty()) {
-QMapIterator<QString, QString> i(metaMap);
-while (i.hasNext()) {
-i.next();
-out() << "    <meta name=\"" << protectEnc(i.key()) << "\" contents=\""
-<< protectEnc(i.value()) << "\" />\n";
-}
-}
-navigationLinks.clear();
-if (node && !node->links().empty()) {
-QPair<QString,QString> linkPair;
-QPair<QString,QString> anchorPair;
-const Node *linkNode;
-if (node->links().contains(Node::PreviousLink)) {
-linkPair = node->links()[Node::PreviousLink];
-linkNode = findNodeForTarget(linkPair.first, node, marker);
-if (!linkNode || linkNode == node)
-anchorPair = linkPair;
-else
-anchorPair = anchorForNode(linkNode);
-out() << "  <link rel=\"prev\" href=\""
-<< anchorPair.first << "\" />\n";
-navigationLinks += "[Previous: <a href=\"" + anchorPair.first + "\">";
-if (linkPair.first == linkPair.second && !anchorPair.second.isEmpty())
-navigationLinks += protectEnc(anchorPair.second);
-else
-navigationLinks += protectEnc(linkPair.second);
-navigationLinks += "</a>]\n";
-}
-if (node->links().contains(Node::ContentsLink)) {
-linkPair = node->links()[Node::ContentsLink];
-linkNode = findNodeForTarget(linkPair.first, node, marker);
-if (!linkNode || linkNode == node)
-anchorPair = linkPair;
-else
-anchorPair = anchorForNode(linkNode);
-out() << "  <link rel=\"contents\" href=\""
-<< anchorPair.first << "\" />\n";
-navigationLinks += "[<a href=\"" + anchorPair.first + "\">";
-if (linkPair.first == linkPair.second && !anchorPair.second.isEmpty())
-navigationLinks += protectEnc(anchorPair.second);
-else
-navigationLinks += protectEnc(linkPair.second);
-navigationLinks += "</a>]\n";
-}
-if (node->links().contains(Node::NextLink)) {
-linkPair = node->links()[Node::NextLink];
-linkNode = findNodeForTarget(linkPair.first, node, marker);
-if (!linkNode || linkNode == node)
-anchorPair = linkPair;
-else
-anchorPair = anchorForNode(linkNode);
-out() << "  <link rel=\"next\" href=\""
-<< anchorPair.first << "\" />\n";
-navigationLinks += "[Next: <a href=\"" + anchorPair.first + "\">";
-if (linkPair.first == linkPair.second && !anchorPair.second.isEmpty())
-navigationLinks += protectEnc(anchorPair.second);
-else
-navigationLinks += protectEnc(linkPair.second);
-navigationLinks += "</a>]\n";
-}
-if (node->links().contains(Node::IndexLink)) {
-linkPair = node->links()[Node::IndexLink];
-linkNode = findNodeForTarget(linkPair.first, node, marker);
-if (!linkNode || linkNode == node)
-anchorPair = linkPair;
-else
-anchorPair = anchorForNode(linkNode);
-out() << "  <link rel=\"index\" href=\""
-<< anchorPair.first << "\" />\n";
-}
-if (node->links().contains(Node::StartLink)) {
-linkPair = node->links()[Node::StartLink];
-linkNode = findNodeForTarget(linkPair.first, node, marker);
-if (!linkNode || linkNode == node)
-anchorPair = linkPair;
-else
-anchorPair = anchorForNode(linkNode);
-out() << "  <link rel=\"start\" href=\""
-<< anchorPair.first << "\" />\n";
-}
-}
-foreach (const QString &stylesheet, stylesheets) {
-out() << "  <link href=\"" << stylesheet << "\" rel=\"stylesheet\" "
-<< "type=\"text/css\" />\n";
-}
-foreach (const QString &customHeadElement, customHeadElements) {
-out() << "  " << customHeadElement << "\n";
-}
-out() << "</head>\n"
-#endif
 QT_END_NAMESPACE

changeset 33	3e2da88830cd
parent 30	5dc02b23752f
child 37	758a864f9613