# HG changeset patch # User Alpar Juttner # Date 1223566952 -3600 # Node ID 8c4d380787cf264a1e529d1ee4cc1562cdee77b5 # Parent 12626fc94ccf51d14518c91d17560621646414e9# Parent 689f24ee83e6d722ebb75bb0d44db9061702b4c8 Merge from trunk diff -r 12626fc94ccf -r 8c4d380787cf doc/Doxyfile.in --- a/doc/Doxyfile.in Thu Oct 09 14:37:44 2008 +0100 +++ b/doc/Doxyfile.in Thu Oct 09 16:42:32 2008 +0100 @@ -1,4 +1,4 @@ -# Doxyfile 1.5.5 +# Doxyfile 1.5.7.1 #--------------------------------------------------------------------------- # Project related configuration options @@ -33,9 +33,11 @@ BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO SIP_SUPPORT = NO +IDL_PROPERTY_SUPPORT = YES DISTRIBUTE_GROUP_DOC = NO SUBGROUPING = YES TYPEDEF_HIDES_STRUCT = NO +SYMBOL_CACHE_SIZE = 0 #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- @@ -66,7 +68,10 @@ MAX_INITIALIZER_LINES = 5 SHOW_USED_FILES = YES SHOW_DIRECTORIES = YES +SHOW_FILES = YES +SHOW_NAMESPACES = YES FILE_VERSION_FILTER = +LAYOUT_FILE = DoxygenLayout.xml #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- @@ -75,7 +80,7 @@ WARN_IF_UNDOCUMENTED = YES WARN_IF_DOC_ERROR = YES WARN_NO_PARAMDOC = NO -WARN_FORMAT = "$file:$line: $text " +WARN_FORMAT = "$file:$line: $text" WARN_LOGFILE = doxygen.log #--------------------------------------------------------------------------- # configuration options related to the input files @@ -133,20 +138,27 @@ HTML_FOOTER = HTML_STYLESHEET = HTML_ALIGN_MEMBERS = YES -GENERATE_HTMLHELP = NO +HTML_DYNAMIC_SECTIONS = NO GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" DOCSET_BUNDLE_ID = org.doxygen.Project -HTML_DYNAMIC_SECTIONS = NO +GENERATE_HTMLHELP = NO CHM_FILE = HHC_LOCATION = GENERATE_CHI = NO +CHM_INDEX_ENCODING = BINARY_TOC = NO TOC_EXPAND = NO +GENERATE_QHP = NO +QCH_FILE = +QHP_NAMESPACE = org.doxygen.Project +QHP_VIRTUAL_FOLDER = doc +QHG_LOCATION = DISABLE_INDEX = NO ENUM_VALUES_PER_LINE = 4 GENERATE_TREEVIEW = NO TREEVIEW_WIDTH = 250 +FORMULA_FONTSIZE = 10 #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- @@ -225,6 +237,9 @@ MSCGEN_PATH = HIDE_UNDOC_RELATIONS = YES HAVE_DOT = YES +DOT_FONTNAME = FreeSans +DOT_FONTSIZE = 10 +DOT_FONTPATH = CLASS_GRAPH = YES COLLABORATION_GRAPH = NO GROUP_GRAPHS = NO diff -r 12626fc94ccf -r 8c4d380787cf doc/DoxygenLayout.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/DoxygenLayout.xml Thu Oct 09 16:42:32 2008 +0100 @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 12626fc94ccf -r 8c4d380787cf doc/Makefile.am --- a/doc/Makefile.am Thu Oct 09 14:37:44 2008 +0100 +++ b/doc/Makefile.am Thu Oct 09 16:42:32 2008 +0100 @@ -1,5 +1,6 @@ EXTRA_DIST += \ doc/Doxyfile.in \ + doc/DoxygenLayout.xml \ doc/coding_style.dox \ doc/dirs.dox \ doc/groups.dox \