diff -urbB --minimal --exclude=Makefile* --exclude=*.pro doxygen-1.4.0/src/doxygen.cpp doxygen-1.4.0-patched/src/doxygen.cpp --- doxygen-1.4.0/src/doxygen.cpp Tue Dec 28 07:33:12 2004 +++ doxygen-1.4.0-patched/src/doxygen.cpp Tue Jan 4 16:46:45 2005 @@ -8815,9 +8815,6 @@ msg("Generating index page...\n"); writeIndex(*outputList); - msg("Generating file index...\n"); - writeFileIndex(*outputList); - msg("Generating example documentation...\n"); generateExampleDocs(); @@ -8828,26 +8825,44 @@ msg("Generating file documentation...\n"); generateFileDocs(); - msg("Generating class documentation...\n"); - generateClassDocs(); - msg("Generating page documentation...\n"); generatePageDocs(); msg("Generating group documentation...\n"); generateGroupDocs(); - if (Config_getBool("SHOW_DIRECTORIES")) + msg("Generating group index...\n"); + writeGroupIndex(*outputList); + + msg("Generating class documentation...\n"); + generateClassDocs(); + + if (Config_getBool("HAVE_DOT") && Config_getBool("GRAPHICAL_HIERARCHY")) { - msg("Generating directory documentation...\n"); - generateDirDocs(*outputList); + msg("Generating graphical class hierarchy...\n"); + writeGraphicalClassHierarchy(*outputList); } msg("Generating namespace index...\n"); generateNamespaceDocs(); - msg("Generating group index...\n"); - writeGroupIndex(*outputList); + msg("Generating namespace member index...\n"); + writeNamespaceMemberIndex(*outputList); + + if (Config_getBool("GENERATE_LEGEND")) + { + msg("Generating graph info page...\n"); + writeGraphInfo(*outputList); + } + + if (Config_getBool("SHOW_DIRECTORIES")) + { + msg("Generating directory documentation...\n"); + generateDirDocs(*outputList); + } + + msg("Generating file index...\n"); + writeFileIndex(*outputList); if (Config_getBool("SHOW_DIRECTORIES")) { @@ -8861,18 +8876,9 @@ msg("Generating file member index...\n"); writeFileMemberIndex(*outputList); - msg("Generating namespace member index...\n"); - writeNamespaceMemberIndex(*outputList); - msg("Generating page index...\n"); writePageIndex(*outputList); - if (Config_getBool("GENERATE_LEGEND")) - { - msg("Generating graph info page...\n"); - writeGraphInfo(*outputList); - } - //writeDirDependencyGraph(Config_getString("HTML_OUTPUT")); if (Config_getBool("GENERATE_RTF")) @@ -8884,12 +8890,6 @@ } } - if (Config_getBool("HAVE_DOT") && Config_getBool("GRAPHICAL_HIERARCHY")) - { - msg("Generating graphical class hierarchy...\n"); - writeGraphicalClassHierarchy(*outputList); - } - if (Doxygen::formulaList.count()>0 && Config_getBool("GENERATE_HTML")) { msg("Generating bitmaps for formulas in HTML...\n"); diff -urbB --minimal --exclude=Makefile* --exclude=*.pro doxygen-1.4.0/src/htmlgen.cpp doxygen-1.4.0-patched/src/htmlgen.cpp --- doxygen-1.4.0/src/htmlgen.cpp Tue Dec 28 07:33:13 2004 +++ doxygen-1.4.0-patched/src/htmlgen.cpp Tue Jan 4 17:07:24 2005 @@ -69,6 +69,9 @@ " padding: 2px;\n" " line-height: 140%;\n" "}\n" +"TABLE.qindex {" +" font-size: 100%;" +"}" "DIV.nav {\n" " width: 100%;\n" " background-color: #eeeeff;\n" @@ -1430,7 +1433,7 @@ bool hl,bool compact,bool &first, const QCString &relPath) { - if (!first && compact) t << " | "; + if (!first && compact) t << ", "; first=FALSE; if (!compact) t << "