From be602ee76006d9b8b0f6e5e75114f2ce34f7773e Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Sat, 6 Nov 2010 19:00:58 +0000 Subject: Release-1.7.2-20101106 --- Doxyfile | 6 +- INSTALL | 4 +- README | 4 +- configure | 2 +- doc/Doxyfile | 2 +- doc/arch.doc | 7 +- doc/config.doc | 2 +- doc/doxygen.sty | 4 +- src/classdef.cpp | 58 +++-- src/config.xml | 20 +- src/configoptions.cpp | 19 +- src/docparser.cpp | 5 +- src/doctokenizer.l | 1 + src/dot.cpp | 590 ++++++++++++++++++++++++++++++++++++------------- src/dot.h | 18 +- src/doxygen.cpp | 10 +- src/doxygen.css | 40 ++++ src/doxygen_css.h | 40 ++++ src/entry.cpp | 4 +- src/entry.h | 2 + src/fortrancode.l | 8 +- src/fortranscanner.l | 25 ++- src/htmldocvisitor.cpp | 13 +- src/htmlgen.cpp | 4 +- src/index.cpp | 10 +- src/index.h | 2 +- src/instdox.cpp | 3 +- src/layout.cpp | 5 +- src/memberlist.cpp | 2 +- src/scanner.l | 32 ++- src/translator_nl.h | 15 +- src/util.cpp | 4 +- src/vhdlscanner.h | 15 -- src/vhdlscanner.l | 9 +- 34 files changed, 715 insertions(+), 270 deletions(-) diff --git a/Doxyfile b/Doxyfile index 6c2dbac..c56f940 100644 --- a/Doxyfile +++ b/Doxyfile @@ -272,7 +272,7 @@ CLASS_DIAGRAMS = NO MSCGEN_PATH = HIDE_UNDOC_RELATIONS = YES HAVE_DOT = YES -DOT_FONTNAME = FreeSans +DOT_FONTNAME = Helvetica DOT_FONTSIZE = 10 DOT_FONTPATH = CLASS_GRAPH = YES @@ -286,7 +286,7 @@ CALL_GRAPH = NO CALLER_GRAPH = NO GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES -DOT_IMAGE_FORMAT = png +DOT_IMAGE_FORMAT = svg DOT_PATH = DOTFILE_DIRS = DOT_GRAPH_MAX_NODES = 50 @@ -294,4 +294,4 @@ MAX_DOT_GRAPH_DEPTH = 0 DOT_TRANSPARENT = NO DOT_MULTI_TARGETS = NO GENERATE_LEGEND = YES -DOT_CLEANUP = YES +DOT_CLEANUP = NO diff --git a/INSTALL b/INSTALL index 923fe64..edb9b04 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ -DOXYGEN Version 1.7.2 +DOXYGEN Version 1.7.2-20101106 Please read the installation section of the manual (http://www.doxygen.org/install.html) for instructions. -------- -Dimitri van Heesch (08 October 2010) +Dimitri van Heesch (06 November 2010) diff --git a/README b/README index 5711f1b..0eeba24 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -DOXYGEN Version 1.7.2 +DOXYGEN Version 1.7.2_20101106 Please read INSTALL for compilation instructions. @@ -26,4 +26,4 @@ forum. Enjoy, -Dimitri van Heesch (dimitri@stack.nl) (08 October 2010) +Dimitri van Heesch (dimitri@stack.nl) (06 November 2010) diff --git a/configure b/configure index 0e01a6e..5ae4fa6 100755 --- a/configure +++ b/configure @@ -20,7 +20,7 @@ doxygen_version_minor=7 doxygen_version_revision=2 #NOTE: Setting version_mmn to "NO" will omit mmn info from the package. -doxygen_version_mmn=NO +doxygen_version_mmn=20101106 bin_dirs=`echo $PATH | sed -e "s/:/ /g"` diff --git a/doc/Doxyfile b/doc/Doxyfile index 0c06390..b0f281e 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -44,7 +44,7 @@ EXAMPLE_PATH = ../examples RECURSIVE = NO TAGFILES = ALLEXTERNALS = NO -PERL_PATH = /usr/local/bin/perl +PERL_PATH = /usr/bin/perl SEARCHENGINE = NO PDF_HYPERLINKS = YES USE_PDFLATEX = YES diff --git a/doc/arch.doc b/doc/arch.doc index d257169..939a832 100644 --- a/doc/arch.doc +++ b/doc/arch.doc @@ -199,7 +199,7 @@ wrote the following perl script, which automatically adds or removes -d from the correct line in the Makefile: \verbatim -#!/usr/local/bin/perl +#!/usr/bin/perl $file = shift @ARGV; print "Toggle debugging mode for $file\n"; @@ -216,10 +216,10 @@ if (open(F,") { - if ( s/\(LEX\) -P([a-zA-Z]+)YY -t $file/(LEX) -d -P\1YY -t $file/g ) { + if ( s/\(LEX\) (-i )?-P([a-zA-Z]+)YY -t $file/(LEX) -d \1-P\2YY -t $file/g ) { print "Enabling debug info for $file\n"; } - elsif ( s/\(LEX\) -d -P([a-zA-Z]+)YY -t $file/(LEX) -P\1YY -t $file/g ) { + elsif ( s/\(LEX\) -d (-i )?-P([a-zA-Z]+)YY -t $file/(LEX) \1-P\2YY -t $file/g ) { print "Disabling debug info for $file\n"; } print G "$_"; @@ -234,6 +234,7 @@ else { # touch the file $now = time; utime $now, $now, $file + \endverbatim */ diff --git a/doc/config.doc b/doc/config.doc index e2b098e..1a0e130 100644 --- a/doc/config.doc +++ b/doc/config.doc @@ -2389,7 +2389,7 @@ INPUT = examples/examples.doc src FILE_PATTERNS = *.cc *.h INCLUDE_PATH = examples TAGFILES = qt.tag -PERL_PATH = /usr/local/bin/perl +PERL_PATH = /usr/bin/perl SEARCHENGINE = YES \endverbatim diff --git a/doc/doxygen.sty b/doc/doxygen.sty index 2ee9f91..3c4ba08 100644 --- a/doc/doxygen.sty +++ b/doc/doxygen.sty @@ -25,8 +25,8 @@ {\fancyplain{}{\bfseries\rightmark}} \rhead[\fancyplain{}{\bfseries\leftmark}] {\fancyplain{}{\bfseries\thepage}} -\rfoot[\fancyplain{}{\bfseries\scriptsize User Manual for Doxygen $VERSION, written by Dimitri van Heesch \copyright 1997-2006}]{} -\lfoot[]{\fancyplain{}{\bfseries\scriptsize User Manual for Doxygen $VERSION, written by Dimitri van Heesch \copyright 1997-2006}} +\rfoot[\fancyplain{}{\bfseries\scriptsize User Manual for Doxygen $VERSION, written by Dimitri van Heesch \copyright 1997-2010}]{} +\lfoot[]{\fancyplain{}{\bfseries\scriptsize User Manual for Doxygen $VERSION, written by Dimitri van Heesch \copyright 1997-2010}} \cfoot{} %---------- Internal commands used in this style file ---------------- diff --git a/src/classdef.cpp b/src/classdef.cpp index 557604f..e38a251 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -169,7 +169,11 @@ class ClassDefImpl */ bool subGrouping; + /** Reason of existance is a "use" relation */ bool usedOnly; + + /** List of titles to use for the summary */ + SDict vhdlSummaryTitles; }; void ClassDefImpl::init(const char *defFileName, const char *name, @@ -224,8 +228,9 @@ void ClassDefImpl::init(const char *defFileName, const char *name, } } -ClassDefImpl::ClassDefImpl() +ClassDefImpl::ClassDefImpl() : vhdlSummaryTitles(17) { + vhdlSummaryTitles.setAutoDelete(TRUE); } ClassDefImpl::~ClassDefImpl() @@ -364,6 +369,16 @@ void ClassDef::internalInsertMember(MemberDef *md, //printf("insertInternalMember(%s) isHidden()=%d\n",md->name().data(),md->isHidden()); if (md->isHidden()) return; + static bool optVhdl = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); + if (optVhdl) + { + QCString title=VhdlDocGen::trVhdlType(md->getMemberSpecifiers(),FALSE); + if (!m_impl->vhdlSummaryTitles.find(title)) + { + m_impl->vhdlSummaryTitles.append(title,new QCString(title)); + } + } + if (!isReference()) { static bool extractPrivate = Config_getBool("EXTRACT_PRIVATE"); @@ -1369,32 +1384,45 @@ void ClassDef::writeAuthorSection(OutputList &ol) void ClassDef::writeSummaryLinks(OutputList &ol) { + static bool vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); ol.pushGeneratorState(); ol.disableAllBut(OutputGenerator::Html); QListIterator eli( LayoutDocManager::instance().docEntries(LayoutDocManager::Class)); LayoutDocEntry *lde; bool first=TRUE; - for (eli.toFirst();(lde=eli.current());++eli) + + if (!vhdlOpt) { - if (lde->kind()==LayoutDocEntry::ClassNestedClasses && - m_impl->innerClasses && - m_impl->innerClasses->declVisible() - ) + for (eli.toFirst();(lde=eli.current());++eli) { - LayoutDocEntrySection *ls = (LayoutDocEntrySection*)lde; - writeSummaryLink(ol,"nested-classes",ls->title,first); - } - else if (lde->kind()== LayoutDocEntry::MemberDecl) - { - LayoutDocEntryMemberDecl *lmd = (LayoutDocEntryMemberDecl*)lde; - MemberList * ml = getMemberList(lmd->type); - if (ml && ml->declVisible()) + if (lde->kind()==LayoutDocEntry::ClassNestedClasses && + m_impl->innerClasses && + m_impl->innerClasses->declVisible() + ) { - writeSummaryLink(ol,ml->listTypeAsString(),lmd->title,first); + LayoutDocEntrySection *ls = (LayoutDocEntrySection*)lde; + writeSummaryLink(ol,"nested-classes",ls->title,first); + } + else if (lde->kind()== LayoutDocEntry::MemberDecl) + { + LayoutDocEntryMemberDecl *lmd = (LayoutDocEntryMemberDecl*)lde; + MemberList * ml = getMemberList(lmd->type); + if (ml && ml->declVisible()) + { + writeSummaryLink(ol,ml->listTypeAsString(),lmd->title,first); + } } } } + else // VDHL only + { + SDict::Iterator li(m_impl->vhdlSummaryTitles); + for (li.toFirst();li.current();++li) + { + writeSummaryLink(ol,li.current()->data(),li.current()->data(),first); + } + } if (!first) { ol.writeString(" \n"); diff --git a/src/config.xml b/src/config.xml index 6441508..be324a4 100644 --- a/src/config.xml +++ b/src/config.xml @@ -1267,15 +1267,15 @@ instead of the = operator. If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this tag can be used to specify a list of macro names that should be expanded. The macro definition that is found in the sources will be used. -Use the PREDEFINED tag if you want to use a different macro definition. +Use the PREDEFINED tag if you want to use a different macro definition that +overrules the definition found in the source code. ' depends='ENABLE_PREPROCESSING'>