Release-1.2.9.1

Doxyfile

@@ -110,7 +110,7 @@ COMPACT_LATEX          = NO
 PAPER_TYPE             = a4wide
 EXTRA_PACKAGES         = 
 LATEX_HEADER           = 
-PDF_HYPERLINKS         = NO
+PDF_HYPERLINKS         = YES
 USE_PDFLATEX           = NO
 LATEX_BATCHMODE        = NO
 #---------------------------------------------------------------------------

INSTALL

-DOXYGEN Version 1.2.9
+DOXYGEN Version 1.2.9.1
 
 Please read the installation section of the manual for instructions.
 
 --------
-Dimitri van Heesch (01 August 2001)
+Dimitri van Heesch (05 August 2001)

README

-DOXYGEN Version 1.2.9
+DOXYGEN Version 1.2.9.1
 
 Please read INSTALL for compilation instructions.
 
@@ -17,4 +17,4 @@ to subscribe to the lists or to visit the archives.
 
 Enjoy,
 
-Dimitri van Heesch (dimitri@stack.nl) (01 August 2001)
+Dimitri van Heesch (dimitri@stack.nl) (05 August 2001)

VERSION

-1.2.9
+1.2.9.1

addon/doxywizard/doxywizard.cpp

@@ -62,7 +62,7 @@ static bool loadConfig( QString loadFile )
 
   // parse the config file
   // this will initialize the various Config data members
-  if (Config::instance()->parse(loadFile))
+  if (!Config::instance()->parse(loadFile))
   {
     QMessageBox::warning(0,
                          "Warning","Cannot open or read input "+loadFile+"!",
@@ -89,7 +89,7 @@ static bool saveConfig( QString saveFile )
     return FALSE; // failure
   }
 
-  Config::instance()->writeTemplate(&f,TRUE,TRUE); // write brief config file
+  Config::instance()->writeTemplate(&f,TRUE,FALSE); // write brief config file
 
   return TRUE; // success
 }

addon/xmlparse/basehandler.h

+/******************************************************************************
+ *
+ * $Id$
+ *
+ *
+ * Copyright (C) 1997-2001 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ */
+
 #ifndef _BASEHANDLER_H
 #define _BASEHANDLER_H
 

addon/xmlparse/compoundhandler.cpp

+/******************************************************************************
+ *
+ * $Id$
+ *
+ *
+ * Copyright (C) 1997-2001 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ */
+
 #include "mainhandler.h"
 #include "compoundhandler.h"
 #include "dochandler.h"

addon/xmlparse/compoundhandler.h

+/******************************************************************************
+ *
+ * $Id$
+ *
+ *
+ * Copyright (C) 1997-2001 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ */
 #ifndef _COMPOUNDHANDLER_H
 #define _COMPOUNDHANDLER_H
 

addon/xmlparse/dochandler.cpp

+/******************************************************************************
+ *
+ * $Id$
+ *
+ *
+ * Copyright (C) 1997-2001 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ */
+
 #include "dochandler.h"
 
 //----------------------------------------------------------------------
@@ -217,6 +232,37 @@ void ListHandler::startListItem(const QXmlAttributes& attrib)
   m_children.append(liHandler);
 }
 
+//----------------------------------------------------------------------
+// ParameterHandler
+//----------------------------------------------------------------------
+
+
+//----------------------------------------------------------------------
+// ParameterListHandler
+//----------------------------------------------------------------------
+
+ParameterListHandler::ParameterListHandler(IBaseHandler *parent) 
+  : DocNode(ParameterList), m_parent(parent)
+{
+  addEndHandler("parameterlist",this,&ParameterListHandler::endParameterList);
+  m_parameters.setAutoDelete(TRUE);
+  m_curParam=0;
+}
+
+ParameterListHandler::~ParameterListHandler()
+{
+}
+
+void ParameterListHandler::startParameterList(const QXmlAttributes& /*attrib*/)
+{
+  m_parent->setDelegate(this);
+}
+
+void ParameterListHandler::endParameterList()
+{
+  m_parent->setDelegate(0);
+}
+
 //----------------------------------------------------------------------
 // ParagraphHandler
 //----------------------------------------------------------------------
@@ -268,6 +314,14 @@ void ParagraphHandler::startOrderedList(const QXmlAttributes& attrib)
   m_children.append(listHandler);
 }
 
+void ParagraphHandler::startParameterList(const QXmlAttributes& attrib)
+{
+  addTextNode();
+  ParameterListHandler *parListHandler = new ParameterListHandler(this);
+  parListHandler->startParameterList(attrib);
+  m_children.append(parListHandler);
+}
+
 void ParagraphHandler::addTextNode()
 {
   if (!m_curString.isEmpty())

addon/xmlparse/dochandler.h

+/******************************************************************************
+ *
+ * $Id$
+ *
+ *
+ * Copyright (C) 1997-2001 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ */
+
 #ifndef _DOCHANDLER_H
 #define _DOCHANDLER_H
 
@@ -7,6 +22,13 @@
 
 #include "basehandler.h"
 
+class ParagraphHandler;
+
+//-----------------------------------------------------------------------------
+
+/*! \brief Node of a structured documentation tree.
+ *
+ */
 class DocNode
 {
   public:
@@ -28,7 +50,8 @@ class DocNode
       MarkupModifier,
       ItemizedList,
       OrderedList,
-      ListItem
+      ListItem,
+      ParameterList
     };
     DocNode(NodeKind k) : m_kind(k) {}
     virtual ~DocNode() {}
@@ -37,6 +60,12 @@ class DocNode
     NodeKind m_kind;
 };
 
+//-----------------------------------------------------------------------------
+
+
+/*! \brief Node representing a piece of text.
+ *
+ */
 class TextNode : public DocNode
 {
   public:
@@ -48,6 +77,11 @@ class TextNode : public DocNode
     int m_markup;
 };
 
+//-----------------------------------------------------------------------------
+
+/*! \brief Node representing a change in the markup style.
+ *
+ */
 class MarkupModifierNode : public DocNode
 {
   public:
@@ -59,6 +93,12 @@ class MarkupModifierNode : public DocNode
     bool m_enabled;
 };
 
+
+//-----------------------------------------------------------------------------
+
+/*! \brief Handles markup commands in the XML input. 
+ *
+ */
 class MarkupHandler : public BaseFallBackHandler<MarkupHandler>
 {
   public:
@@ -90,6 +130,12 @@ class MarkupHandler : public BaseFallBackHandler<MarkupHandler>
     int             m_curMarkup;
 };
 
+
+//-----------------------------------------------------------------------------
+
+/*! \brief Node representing a list item.
+ *
+ */
 class ListItemHandler : public DocNode, public BaseHandler<ListItemHandler>
 {
   public:
@@ -104,6 +150,12 @@ class ListItemHandler : public DocNode, public BaseHandler<ListItemHandler>
     QList<DocNode>  m_children;
 };
 
+
+//-----------------------------------------------------------------------------
+
+/*! \brief Node representing list of items.
+ *
+ */
 class ListHandler : public DocNode, public BaseHandler<ListHandler>
 {
   public:
@@ -118,6 +170,53 @@ class ListHandler : public DocNode, public BaseHandler<ListHandler>
     QList<DocNode>  m_children;
 };
 
+
+//-----------------------------------------------------------------------------
+
+/*! \brief Node representing a parameter.
+ *
+ */
+class ParameterHandler : public DocNode, 
+                         public BaseHandler<ParameterHandler>
+{
+  public:
+    ParameterHandler(IBaseHandler *parent);
+    virtual ~ParameterHandler();
+    virtual void startParameterList(const QXmlAttributes& attrib);
+    virtual void endParameterList();
+
+  private:
+    IBaseHandler     *m_parent;
+    QString           m_name;
+    ParagraphHandler *m_description;
+};
+
+
+//-----------------------------------------------------------------------------
+
+/* \brief Node representing a parameter list.
+ *
+ */
+class ParameterListHandler : public DocNode, 
+                             public BaseHandler<ParameterListHandler>
+{
+  public:
+    ParameterListHandler(IBaseHandler *parent);
+    virtual ~ParameterListHandler();
+    virtual void startParameterList(const QXmlAttributes& attrib);
+    virtual void endParameterList();
+
+  private:
+    IBaseHandler            *m_parent;
+    QList<ParameterHandler>  m_parameters;
+    ParameterHandler        *m_curParam;
+};
+
+//-----------------------------------------------------------------------------
+
+/*! \brief Node representing a paragraph of text and commands.
+ *
+ */
 class ParagraphHandler : public DocNode, public BaseHandler<ParagraphHandler>
 {
   public:
@@ -125,6 +224,7 @@ class ParagraphHandler : public DocNode, public BaseHandler<ParagraphHandler>
     virtual void endParagraph();
     virtual void startItemizedList(const QXmlAttributes& attrib);
     virtual void startOrderedList(const QXmlAttributes& attrib);
+    virtual void startParameterList(const QXmlAttributes& attrib);
 
     ParagraphHandler(IBaseHandler *parent);
     virtual ~ParagraphHandler();
@@ -136,7 +236,11 @@ class ParagraphHandler : public DocNode, public BaseHandler<ParagraphHandler>
     MarkupHandler  *m_markupHandler;
 };
 
+//-----------------------------------------------------------------------------
 
+/*! \brief Node representing a documentation block.
+ *
+ */
 class DocHandler : public BaseHandler<DocHandler>
 {
   public:

addon/xmlparse/main.cpp

+/******************************************************************************
+ *
+ * $Id$
+ *
+ *
+ * Copyright (C) 1997-2001 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ */
+
 #include "mainhandler.h"
 
 #include <qstring.h>

addon/xmlparse/mainhandler.cpp

+/******************************************************************************
+ *
+ * $Id$
+ *
+ *
+ * Copyright (C) 1997-2001 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ */
+
 #include "mainhandler.h"
 
 void MainHandler::startCompound(const QXmlAttributes& attrib)

addon/xmlparse/mainhandler.h

+/******************************************************************************
+ *
+ * $Id$
+ *
+ *
+ * Copyright (C) 1997-2001 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ */
+
 #ifndef _MAINHANDLER_H
 #define _MAINHANDLER_H
 

addon/xmlparse/memberhandler.cpp

+/******************************************************************************
+ *
+ * $Id$
+ *
+ *
+ * Copyright (C) 1997-2001 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ */
+
 #include "memberhandler.h"
 #include "sectionhandler.h"
 #include "dochandler.h"

addon/xmlparse/memberhandler.h

+/******************************************************************************
+ *
+ * $Id$
+ *
+ *
+ * Copyright (C) 1997-2001 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ */
+
 #ifndef _MEMBERHANDLER_H
 #define _MEMBERHANDLER_H
 

addon/xmlparse/paramhandler.cpp

+/******************************************************************************
+ *
+ * $Id$
+ *
+ *
+ * Copyright (C) 1997-2001 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ */
+
 #include "paramhandler.h"
 #include "memberhandler.h"
 

addon/xmlparse/paramhandler.h

+/******************************************************************************
+ *
+ * $Id$
+ *
+ *
+ * Copyright (C) 1997-2001 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ */
+
 #ifndef _PARAMHANDLER_H
 #define _PARAMHANDLER_H
 

addon/xmlparse/sectionhandler.cpp

+/******************************************************************************
+ *
+ * $Id$
+ *
+ *
+ * Copyright (C) 1997-2001 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ */
+
 #include "compoundhandler.h"
 #include "sectionhandler.h"
 

addon/xmlparse/sectionhandler.h

+/******************************************************************************
+ *
+ * $Id$
+ *
+ *
+ * Copyright (C) 1997-2001 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ */
+
 #ifndef _SECTIONHANDLER_H
 #define _SECTIONHANDLER_H
 

doc/commands.doc

@@ -62,6 +62,8 @@ documentation:
 <li> \refitem cmddeprecated \deprecated
 <li> \refitem cmddontinclude \dontinclude
 <li> \refitem cmde \e
+<li> \refitem cmdelse \else
+<li> \refitem cmdelseif \elseif
 <li> \refitem cmdem \em
 <li> \refitem cmdendcode \endcode
 <li> \refitem cmdendhtmlonly \endhtmlonly
@@ -81,6 +83,7 @@ documentation:
 <li> \refitem cmdhtmlinclude \htmlinclude
 <li> \refitem cmdhtmlonly \htmlonly
 <li> \refitem cmdif \if
+<li> \refitem cmdifnot \\ifnot
 <li> \refitem cmdimage \image
 <li> \refitem cmdinclude \include
 <li> \refitem cmdingroup \ingroup
@@ -663,15 +666,40 @@ Public/Protected/Private/... section.
   a deprecated entity. Can be used to describe alternatives, 
   expected life span, etc.
 
+<hr>
+\subsection cmdelse \else 
+
+  \addindex \else
+  Starts a conditional section if the previous conditional section 
+  was not enabled. The previous section should have been started with 
+  a \c \\if, \c \\ifnot, or \c \\elseif command.
+
+  \sa \ref cmdif "\\if", \ref cmdifnot "\\ifnot", \ref cmdelseif "\\elseif",
+      \ref cmdendif "\\endif."
+
+<hr>
+\subsection cmdelseif \elseif <section-label>
+
+  \addindex \elseif
+  Starts a conditional documentation section if the previous section 
+  was not enabled. A conditional section is
+  disabled by default. To enable it you must put the
+  section-label after the \ref cfg_enabled_sections "ENABLED_SECTIONS" 
+  tag in the configuration
+  file. Conditional blocks can be nested. A nested section is
+  only enabled if all enclosing sections are enabled as well.
+
+  \sa sections \ref cmdendif "\\endif", \ref cmdifnot "\\ifnot", 
+              \ref cmdelse "\\else", and \ref cmdelseif "\\elseif".
 
 <hr>
 \subsection cmdendif \endif 
 
-  \addindex \endif
-  Ends a conditional section that was started with \c \if.
-  For each \c \if one and only one matching \c \endif must follow.
+  \addindex \\endif
+  Ends a conditional section that was started with \c \\if or \c \\ifnot
+  For each \c \\if or \c \\ifnot one and only one matching \c \\endif must follow.
 
-  \sa \ref cmdif "\\if"
+  \sa \ref cmdif "\\if", and \ref cmdifnot "\\ifnot".
 
 <hr>
 \subsection cmdexception \exception <exception-object> { exception description }
@@ -694,9 +722,9 @@ Public/Protected/Private/... section.
 <hr>
 \subsection cmdif \if <section-label>
 
-  \addindex \if
+  \addindex \\if
   Starts a conditional documentation section. The section ends 
-  with a matching \c \endif command. A conditional section is
+  with a matching \c \\endif command. A conditional section is
   disabled by default. To enable it you must put the
   section-label after the \ref cfg_enabled_sections "ENABLED_SECTIONS" 
   tag in the configuration
@@ -720,7 +748,22 @@ Public/Protected/Private/... section.
    */
 \endverbatim  
 
-  \sa section \ref cmdendif "\\endif".
+  \sa sections \ref cmdendif "\\endif", \ref cmdifnot "\\ifnot", 
+              \ref cmdelse "\\else", and \ref cmdelseif "\\elseif".
+
+<hr>
+\subsection cmdifnot \ifnot <section-label>
+
+  \addindex \ifnot
+  Starts a conditional documentation section. The section ends 
+  with a matching \c \\endif command. This conditional section is
+  enabled by default. To disable it you must put the
+  section-label after the \ref cfg_enabled_sections "ENABLED_SECTIONS" 
+  tag in the configuration
+  file. 
+
+  \sa sections \ref cmdendif "\\endif", \ref cmdif "\\if", 
+              \ref cmdelse "\\else", and \ref cmdelseif "\\elseif".
 
 <hr>
 \subsection cmdinvariant \invariant { description of invariant }

packages/rpm/doxygen.spec

 Name: doxygen
-Version: 1.2.9
+Version: 1.2.9.1
 Summary: documentation system for C, C++ and IDL
 Release: 4
 Source: doxygen-%{version}.src.tar.gz
@@ -41,7 +41,7 @@ Autor:
 %setup -n doxygen-%{version}
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --with-doxywizard --with-xmlgen
+CFLAGS="$RPM_OPT_FLAGS" ./configure --with-doxywizard 
 # the next path is Suse specific
 QTDIR=/usr/lib/qt2
 PATH=${QTDIR}/bin:$PATH

src/classdef.cpp

@@ -88,15 +88,15 @@ ClassDef::ClassDef(
   m_memberGroupList->setAutoDelete(TRUE);
   m_memberGroupDict = new MemberGroupDict(17);
   m_innerClasses = new ClassSDict(17);
-  int i=name().findRev("::");
-  if (i==-1)
-  {
-    m_scopelessName=name();
-  }
-  else
-  {
-    m_scopelessName=name().right(name().length()-i-2);
-  }
+  //int i=name().findRev("::"); // TODO: broken if A<N::C> is the class name
+  //if (i==-1)
+  //{
+  //  m_scopelessName=name();
+  //}
+  //else
+  //{
+  //  m_scopelessName=name().right(name().length()-i-2);
+  //}
   m_subGrouping=TRUE;
   m_isTemplBaseClass=-1;
   m_templateInstances = 0;
@@ -415,7 +415,7 @@ void ClassDef::insertMember(MemberDef *md)
                   enumValMembers.append(md);
                 break;
               case MemberDef::Function:
-                if (md->name()==m_scopelessName ||         // constructor
+                if (md->name()==localName() ||         // constructor
                     (md->name().find('~')!=-1 &&  // hack to detect destructor
                      md->name().find("operator")==-1
                     )
@@ -2232,6 +2232,7 @@ void ClassDef::getTemplateParameterLists(QList<ArgumentList> &lists) const
 QCString ClassDef::qualifiedNameWithTemplateParameters(
     QList<ArgumentList> *actualParams) const
 {
+  //printf("qualifiedNameWithTemplateParameters() localName=%s\n",localName().data());
   QCString scName;
   Definition *d=getOuterScope();
   if (d)
@@ -2268,7 +2269,7 @@ QCString ClassDef::qualifiedNameWithTemplateParameters(
       }
     }
   }
-  //printf("scope=%s qualifiedName=%s\n",name().data(),scName.data());
+  //printf("qualifiedNameWithTemplateParameters: scope=%s qualifiedName=%s\n",name().data(),scName.data());
   return scName;
 }
 

src/classdef.h

@@ -325,7 +325,7 @@ class ClassDef : public Definition
     /*! Bare name of the class without any scoping prefixes 
      *  (like for nested classes and classes inside namespaces)
      */ 
-    QCString m_scopelessName;              
+    //QCString m_scopelessName;              
 
     /*! List of base class (or super-classes) from which this class derives
      *  directly. 

src/classlist.cpp

@@ -35,8 +35,8 @@ int ClassList::compareItems(GCI item1, GCI item2)
 {
   ClassDef *c1=(ClassDef *)item1;
   ClassDef *c2=(ClassDef *)item2;
-  return stricmp(c1->name().data()+getPrefixIndex(c1->name()),
-                 c2->name().data()+getPrefixIndex(c2->name())
+  return stricmp(c1->name().data()+getPrefixIndex(c1->localName()),
+                 c2->name().data()+getPrefixIndex(c2->localName())
                 );
 }
 
@@ -44,8 +44,8 @@ int ClassSDict::compareItems(GCI item1, GCI item2)
 {
   ClassDef *c1=(ClassDef *)item1;
   ClassDef *c2=(ClassDef *)item2;
-  return stricmp(c1->name().data()+getPrefixIndex(c1->name()),
-                 c2->name().data()+getPrefixIndex(c2->name())
+  return stricmp(c1->name().data()+getPrefixIndex(c1->localName()),
+                 c2->name().data()+getPrefixIndex(c2->localName())
                 );
 }
 

src/declinfo.h

@@ -23,7 +23,6 @@
 
 extern void parseFuncDecl(const QCString &decl,
                           QCString &clName,
-                          QCString &classTempList,
                           QCString &type,
                           QCString &name,
                           QCString &args,

src/declinfo.l

@@ -206,7 +206,7 @@ ID	([a-z_A-Z][a-z_A-Z0-9]*)|(@[0-9]+)
 /*@ ----------------------------------------------------------------------------
  */
 
-void parseFuncDecl(const QCString &decl,QCString &cl,QCString &ctl,QCString &t,
+void parseFuncDecl(const QCString &decl,QCString &cl,QCString &t,
                    QCString &n,QCString &a,QCString &ftl,QCString &exc)
 {
   inputString   = decl;
@@ -256,9 +256,11 @@ void parseFuncDecl(const QCString &decl,QCString &cl,QCString &ctl,QCString &t,
 	cl+=c;
     }
   }
-#endif
   cl=stripTemplateSpecifiersFromScope(removeRedundantWhiteSpace(scope),FALSE); 
   ctl.resize(0);
+#endif
+
+  cl=scope;
   n=removeRedundantWhiteSpace(name);
   int il,ir;
   if ((il=n.find('<'))!=-1 && (ir=n.findRev('>'))!=-1)

src/definition.cpp

@@ -34,12 +34,7 @@ Definition::Definition(const char *df,int dl,
   m_defFileName = df;
   m_defLine = dl;
   m_name=name; 
-  m_localName=name;
-  int i=m_localName.findRev("::");
-  if (i!=-1)
-  {
-    m_localName=m_localName.right(m_localName.length()-i-2);
-  }
+  m_localName=stripScope(name);
   m_brief=b; 
   m_doc=d; 
   m_sectionDict=0, 
@@ -451,7 +446,7 @@ void Definition::addInnerCompound(Definition *)
 
 QCString Definition::qualifiedName() const
 {
-  //printf("start Definition::qualifiedName()\n");
+  //printf("start Definition::qualifiedName() localName=%s\n",m_localName.data());
   if (m_outerScope==0) 
   {
     if (m_localName=="<globalScope>") return "";

src/doc.l

@@ -892,7 +892,6 @@ OPMASK    ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
 %x      DocEmphasis
 %x      DocBold
 %x      DocCode
-%x	DocIf
 %x      DocCodeBlock
 %x      DocInternal
 %x      DocLink
@@ -1506,9 +1505,7 @@ OPMASK    ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
 					    inParamBlock=TRUE;
 					    currentListIndent.push("D");
 					    outDoc->startParamList();
-					    outDoc->startBold();
 					    scanString(theTranslator->trParameters()+": ");
-					    outDoc->endBold();
   					    outDoc->endDescTitle();
   					    outDoc->writeDescItem();
 					    outDoc->startDescTable();
@@ -1532,9 +1529,7 @@ OPMASK    ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
 					    inRetValBlock=TRUE;
 					    currentListIndent.push("D");
 					    outDoc->startParamList();
-					    outDoc->startBold();
 					    scanString(theTranslator->trReturnValues()+": ");
-					    outDoc->endBold();
   					    outDoc->endDescTitle();
   					    outDoc->writeDescItem();
 					    outDoc->startDescTable();
@@ -1558,9 +1553,7 @@ OPMASK    ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
 					    inExceptionBlock=TRUE;
 					    currentListIndent.push("D");
 					    outDoc->startParamList();
-					    outDoc->startBold();
 					    scanString(theTranslator->trExceptions()+": ");
-					    outDoc->endBold();
   					    outDoc->endDescTitle();
 					    outDoc->writeDescItem();
 					    outDoc->startDescTable();
@@ -1574,18 +1567,14 @@ OPMASK    ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
 <DocScan>"\\capt".*
 <DocParam>({DOCPARAM}{BN}*","{BN}*)*{DOCPARAM}{BSEP}* {
 					  outDoc->startDescTableTitle();
-					  outDoc->startEmphasis();
   					  outDoc->docify(substitute(yytext,"\"","").stripWhiteSpace()); 
-					  outDoc->endEmphasis();
 					  outDoc->endDescTableTitle();
 					  outDoc->startDescTableData();
 					  BEGIN(DocScan);
   					}
 <DocException>{SCOPENAME}		{
 					  outDoc->startDescTableTitle();
-					  outDoc->startEmphasis();
   					  outDoc->docify(yytext); 
-					  outDoc->endEmphasis();
 					  outDoc->endDescTableTitle();
 					  outDoc->startDescTableData();
 					  BEGIN(DocScan);
@@ -1646,6 +1635,7 @@ OPMASK    ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
 <DocScan>{CMD}"refitem"/{BN}		{
   					  BEGIN(DocRefItem);
   					}
+  /*
 <DocScan>{CMD}"if"/{BN}			{
   					  outDoc->pushGeneratorState();
 					  depthIf++;
@@ -1671,6 +1661,7 @@ OPMASK    ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
 					  }
 					  BEGIN(DocScan);
   					}
+  */
 <DocRefName>{SCOPENAME}|{FILE}		{
   					  QCString ref=yytext;
 					  SectionInfo *sec;

src/htmlgen.h

@@ -209,9 +209,9 @@ class HtmlGenerator : public OutputGenerator
     void endDescTable()
     { t << "</table>" << endl; }
     void startDescTableTitle()
-    { t << "<tr><td valign=top>"; }
+    { t << "<tr><td valign=top><em>"; }
     void endDescTableTitle()
-    { t << endl << "&nbsp;</td>"; }
+    { t << endl << "</em>&nbsp;</td>"; }
     void startDescTableData()
     { t << "<td>" << endl; }
     void endDescTableData()

src/index.cpp

@@ -1194,7 +1194,7 @@ void writeAlphabeticalClassList(OutputList &ol)
   {
     if (cd->isLinkableInProject() && cd->templateMaster()==0)
     {
-      int index = getPrefixIndex(cd->name());
+      int index = getPrefixIndex(cd->localName());
       if (toupper(cd->name().at(index))!=startLetter) // new begin letter => new header
       {
         startLetter=toupper(cd->name().at(index));
@@ -1227,7 +1227,7 @@ void writeAlphabeticalClassList(OutputList &ol)
   {
     if (cd->isLinkableInProject() && cd->templateMaster()==0)
     {
-      int index = getPrefixIndex(cd->name());
+      int index = getPrefixIndex(cd->localName());
       if (toupper(cd->name().at(index))!=startLetter)
       {
         // insert a new header using a dummy class pointer.
@@ -1275,7 +1275,7 @@ void writeAlphabeticalClassList(OutputList &ol)
         if (cd)
         {
           //printf("head ClassDef=%p %s\n",cd,cd ? cd->name().data() : "<none>");
-          int index = getPrefixIndex(cd->name());
+          int index = getPrefixIndex(cd->localName());
           startLetter=toupper(cd->name().at(index));
           char s[2]; s[0]=startLetter; s[1]=0;
           ol.writeIndexHeading(s);

src/latexgen.cpp

@@ -540,7 +540,7 @@ void LatexGenerator::startIndexSection(IndexSections is)
         bool found=FALSE;
         for (cli.toFirst();(cd=cli.current()) && !found;++cli)
         {
-          if (cd->isLinkableInProject())
+          if (cd->isLinkableInProject() && cd->templateMaster()==0)
           {
             if (compactLatex) t << "\\section"; else t << "\\chapter";
             t << "{"; //Compound Documentation}\n";
@@ -711,7 +711,7 @@ void LatexGenerator::endIndexSection(IndexSections is)
         bool found=FALSE;
         for (cli.toFirst();(cd=cli.current()) && !found;++cli)
         {
-          if (cd->isLinkableInProject())
+          if (cd->isLinkableInProject() && cd->templateMaster()==0)
           {
             t << "}\n\\input{" << cd->getOutputFileBase() << "}\n";
             found=TRUE;
@@ -719,7 +719,7 @@ void LatexGenerator::endIndexSection(IndexSections is)
         }
         for (;(cd=cli.current());++cli)
         {
-          if (cd->isLinkableInProject())
+          if (cd->isLinkableInProject() && cd->templateMaster()==0)
           {
             if (compactLatex) t << "\\input"; else t << "\\include";
             t << "{" << cd->getOutputFileBase() << "}\n";

src/latexgen.h

@@ -217,9 +217,9 @@ class LatexGenerator : public OutputGenerator
     void endDescTable()
     { t << "\\end{description}" << endl; }
     void startDescTableTitle()
-    { t << "\\item[" << endl; }
+    { t << "\\item[{\\em " << endl; }
     void endDescTableTitle()
-    { t << "]"; }
+    { t << "}]"; }
     void startDescTableData() {}
     void endDescTableData() {}
     void lastIndexPage() {}

src/mangen.h

@@ -201,8 +201,8 @@ class ManGenerator : public OutputGenerator
     
     void startDescTable() {}
     void endDescTable() {}
-    void startDescTableTitle() { writeListItem(); startBold(); }
-    void endDescTableTitle() { endBold(); }
+    void startDescTableTitle() { writeListItem(); startBold(); startEmphasis(); }
+    void endDescTableTitle() { endEmphasis(); endBold(); }
     void startDescTableData() { t << endl; firstCol=TRUE; }
     void endDescTableData() {}
 

src/memberdef.cpp

@@ -553,7 +553,8 @@ bool MemberDef::isBriefSectionVisible() const
     // only include members that are non-private unless EXTRACT_PRIVATE is
     // set to YES or the member is part of a group
     bool visibleIfPrivate = (protection()!=Private || 
-                             Config_getBool("EXTRACT_PRIVATE")
+                             Config_getBool("EXTRACT_PRIVATE") ||
+                             mtype==Friend
                             );
     
     bool visible = visibleIfStatic && visibleIfDocumented && 
@@ -666,7 +667,7 @@ void MemberDef::writeDeclaration(OutputList &ol,
   if (tArgList)
   {
     writeTemplatePrefix(ol,tArgList);
-    ol.lineBreak();
+    //ol.lineBreak();
   }
 
   QCString ltype(type);
@@ -879,7 +880,8 @@ bool MemberDef::isDetailedSectionLinkable() const
   // only include members that are non-private unless EXTRACT_PRIVATE is
   // set to YES or the member is part of a group
   bool privateFilter = (protection()!=Private || 
-                           Config_getBool("EXTRACT_PRIVATE")
+                           Config_getBool("EXTRACT_PRIVATE") ||
+                           mtype==Friend
                           );
 
   // member is part of an anonymous scope that is the type of
@@ -1198,9 +1200,7 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol,
         if (a->hasDocumentation())
         {
           ol.startDescTableTitle();
-          ol.startEmphasis();
           ol.docify(a->name);
-          ol.endEmphasis();
           ol.endDescTableTitle();
           ol.startDescTableData();
           parseDoc(ol,m_defFileName,m_defLine,scopeName,name(),a->docs+"\n");
@@ -1475,7 +1475,8 @@ bool MemberDef::isLinkableInProject() const
   return !name().isEmpty() && name().at(0)!='@' &&
          ((hasDocumentation() && !isReference())  
          ) && 
-         (prot!=Private || Config_getBool("EXTRACT_PRIVATE")) && // not a private class member
+         (prot!=Private || Config_getBool("EXTRACT_PRIVATE") || 
+          mtype==Friend) && // not a hidden member due to protection
          (classDef!=0 || Config_getBool("EXTRACT_STATIC") || 
           !isStatic()); // not a static file/namespace member
 }

src/memberdef.h

@@ -231,6 +231,7 @@ class MemberDef : public Definition
                ArgumentList *actualArgs);
     void setTemplateMaster(MemberDef *mt) { m_templateMaster=mt; }
         
+    bool visited;
     
   private:
     ClassDef   *classDef;     // member of or related to 

src/rtfgen.cpp

@@ -1005,7 +1005,7 @@ void RTFGenerator::startIndexSection(IndexSections is)
         bool found=FALSE;
         for (cli.toFirst();(cd=cli.current()) && !found;++cli)
         {
-          if (cd->isLinkableInProject())
+          if (cd->isLinkableInProject() && cd->templateMaster()==0)
           {
             beginRTFChapter();
             found=TRUE;
@@ -1238,7 +1238,7 @@ void RTFGenerator::endIndexSection(IndexSections is)
         t << "{\\tc \\v " << theTranslator->trClassDocumentation() << "}"<< endl;
         for (cli.toFirst();(cd=cli.current()) && !found;++cli)
         {
-          if (cd->isLinkableInProject())
+          if (cd->isLinkableInProject() && cd->templateMaster()==0)
           {
             t << "\\par " << Rtf_Style_Reset << endl;
             t << "{\\field\\fldedit{\\*\\fldinst INCLUDETEXT \"";
@@ -1249,7 +1249,7 @@ void RTFGenerator::endIndexSection(IndexSections is)
         }
         for (;(cd=cli.current());++cli)
         {
-          if (cd->isLinkableInProject())
+          if (cd->isLinkableInProject() && cd->templateMaster()==0)
           {
             t << "\\par " << Rtf_Style_Reset << endl;
             beginRTFSection();
@@ -2230,11 +2230,13 @@ void RTFGenerator::startDescTableTitle()
   //t << Rtf_BList_DepthStyle() << endl;
   DBG_RTF(t << "{\\comment (startDescTableTitle) }"    << endl)
   startBold();
+  startEmphasis();
 }
 
 void RTFGenerator::endDescTableTitle()
 {
   DBG_RTF(t << "{\\comment (endDescTableTitle) }"    << endl)
+  endEmphasis();
   endBold();
   t << "  ";
 }

src/scanner.l

@@ -76,6 +76,7 @@ static int              lastAnchorContext;
 static int              lastInitializerContext;
 static int              lastClassTemplSpecContext;
 static int              lastSkipHtmlCommentContext;
+static int              lastIfContext;
 static int              nextDefContext;
 static int              overloadContext;
 static Protection	protection;
@@ -84,7 +85,6 @@ static int		sharpCount   = 0 ;
 static int		roundCount   = 0 ;
 static int		curlyCount   = 0 ;
 static int		squareCount  = 0 ;
-static int              ifCount      = 0 ;
 static int              padCount     = 0 ;
 static int              todoStartContext = 0;
 static QCString         todoString;
@@ -148,6 +148,8 @@ static Grouping  lastDefGroup( "", Grouping::GROUPING_LOWEST );
 static bool             insideFormula;
 static bool  	        insideTryBlock=FALSE;
 
+static int              depthIf;
+
 //-----------------------------------------------------------------------------
 
 static void initParser()
@@ -161,7 +163,6 @@ static void initParser()
   sharpCount = 0;
   roundCount = 0;
   curlyCount = 0;
-  ifCount = 0;
   memberGroupId = NOGROUP;
   mtype = Method;
   gstat = FALSE;
@@ -171,6 +172,8 @@ static void initParser()
   autoGroupStack.clear();
   insideTryBlock = FALSE;
   insideIDL = FALSE;
+  autoGroupStack.setAutoDelete(TRUE);
+  lastDefGroup.groupname.resize(0);
 }
 
 static void initEntry()
@@ -481,6 +484,9 @@ TITLE     [tT][iI][tT][lL][eE]
 %x      SkipSharp
 %x	SkipRound
 %x	SkipSquare
+%x	SkipSection
+%x	IfGuard
+%x	IfNotGuard
 %x	TypedefName
 %x	TryFunctionBlock
 %x	TryFunctionBlockEnd
@@ -1297,7 +1303,7 @@ TITLE     [tT][iI][tT][lL][eE]
 					    BEGIN(AfterDoc);
 					  }
   					}
-<FindMembers,FindFields>"//"([!/]?){B}*{CMD}"{"|"/*"([!*]?){B}*{CMD}"{"	{
+<FindMembers,FindFields>("//"([!/]?){B}*{CMD}"{")|("/*"([!*]?){B}*{CMD}"{")	{
   					  startGroup();
 					  tmpDocType=-1;
 					  if (current_root->section & Entry::SCOPE_MASK)
@@ -2624,7 +2630,9 @@ TITLE     [tT][iI][tT][lL][eE]
 					    current->inside = current_root->name+"::";
 					  BEGIN( LineDoc );
 					}
-<FindMembers>"extern"{BN}+"\"C"("++")?"\""{BN}*("{")?
+<FindMembers>"extern"{BN}+"\"C"("++")?"\""{BN}*("{")?  {
+					  lineCount();
+					}
 <FindMembers>"{"			{
   					  current->type.resize(0);
   					  current->name.resize(0);
@@ -3411,6 +3419,102 @@ TITLE     [tT][iI][tT][lL][eE]
 <PageDocTitle>\n			{ yyLineNr++; current->args+=" "; }
 <PageDocTitle>[^\n\<]			{ current->args+=yytext; }
 <PageDocTitle>"</"{TITLE}">"		{ BEGIN( PageDoc ); }
+
+  /* escaped versions of the conditional commands (for putting them in the docs) */
+<ClassDoc,Doc,AfterDoc,PageDoc,ExampleDoc>{CMD}{CMD}"if"/[^a-z_A-Z0-9]     { current->doc+=&yytext[1]; }
+<ClassDoc,Doc,AfterDoc,PageDoc,ExampleDoc>{CMD}{CMD}"ifnot"/[^a-z_A-Z0-9]  { current->doc+=&yytext[1]; }
+<ClassDoc,Doc,AfterDoc,PageDoc,ExampleDoc>{CMD}{CMD}"elseif"/[^a-z_A-Z0-9] { current->doc+=&yytext[1]; }
+<ClassDoc,Doc,AfterDoc,PageDoc,ExampleDoc>{CMD}{CMD}"else"/[^a-z_A-Z0-9]   { current->doc+=&yytext[1]; }
+<ClassDoc,Doc,AfterDoc,PageDoc,ExampleDoc>{CMD}{CMD}"endif"/[^a-z_A-Z0-9]  { current->doc+=&yytext[1]; }
+<LineDoc,JavaDoc>{CMD}{CMD}"if"/[^a-z_A-Z0-9]     { current->brief+=&yytext[1]; }
+<LineDoc,JavaDoc>{CMD}{CMD}"ifnot"/[^a-z_A-Z0-9]  { current->brief+=&yytext[1]; }
+<LineDoc,JavaDoc>{CMD}{CMD}"elseif"/[^a-z_A-Z0-9] { current->brief+=&yytext[1]; }
+<LineDoc,JavaDoc>{CMD}{CMD}"else"/[^a-z_A-Z0-9]   { current->brief+=&yytext[1]; }
+<LineDoc,JavaDoc>{CMD}{CMD}"endif"/[^a-z_A-Z0-9]  { current->brief+=&yytext[1]; }
+
+  /* conditional commands */
+<ClassDoc,LineDoc,Doc,JavaDoc,AfterDoc,PageDoc,ExampleDoc>{CMD}"if"{B}+ {
+                                          lastIfContext = YY_START;
+					  BEGIN(IfGuard);
+  					}
+<ClassDoc,LineDoc,Doc,JavaDoc,AfterDoc,PageDoc,ExampleDoc>{CMD}"ifnot"{B}+ {
+                                          lastIfContext = YY_START;
+					  BEGIN(IfNotGuard);
+  					}
+<ClassDoc,LineDoc,Doc,JavaDoc,AfterDoc,PageDoc,ExampleDoc>{CMD}"if"(\r?)\n |
+<IfGuard>\n				{
+  					  warn(yyFileName,yyLineNr,"Missing guard for if statement!");
+					  yyLineNr++;
+					}  
+<IfGuard>[^\n\t ]+			{
+  					  if (Config_getList("ENABLED_SECTIONS").find(yytext)==-1) // not enabled
+					  {
+					    BEGIN(SkipSection);
+  					    depthIf=1;
+					  }
+					  else // section enabled
+					  {
+					    BEGIN(lastIfContext);
+					  }
+  					}
+<IfNotGuard>\n				{
+  					  warn(yyFileName,yyLineNr,"Missing guard for ifnot statement!");
+					  yyLineNr++;
+					}  
+<IfNotGuard>[^\n\t ]+			{
+  					  if (Config_getList("ENABLED_SECTIONS").find(yytext)==-1) // not enabled
+					  {
+					    BEGIN(lastIfContext);
+					  }
+					  else // section enabled
+					  {
+  					    depthIf=1;
+					    BEGIN(SkipSection);
+					  }
+  					}
+<SkipSection>{CMD}"if"/[^a-z_A-Z0-9]	{
+  					  depthIf++;
+  					}
+<SkipSection>{CMD}"endif"/[^a-z_A-Z0-9]	{
+  					  if (--depthIf<=0)
+					  {
+					    BEGIN(lastIfContext);
+					  }
+  					}
+<SkipSection>{CMD}"else"/[^a-z_A-Z0-9]	{
+  					  if (depthIf==1)
+					  {
+					    depthIf=0;
+					    BEGIN(lastIfContext);
+					  }
+  					}
+<SkipSection>{CMD}"elseif"/[^a-z_A-Z0-9] {
+  					  if (depthIf==1)
+					  {
+					    BEGIN(IfGuard);
+					  }
+  					}
+<SkipSection>"*/"			{
+  					  unput('/');unput('*');
+					  BEGIN( lastIfContext );
+  					}
+<SkipSection>\n				{
+  					  yyLineNr++;
+  					}
+<SkipSection>"//"|"*/"			  					
+<ClassDoc,Doc,JavaDoc,AfterDoc,PageDoc,ExampleDoc>{CMD}"elseif"/[^a-z_A-Z0-9] {
+                                          // previous section enabled => absorb else
+  					}
+<ClassDoc,Doc,JavaDoc,AfterDoc,PageDoc,ExampleDoc>{CMD}"else"/[^a-z_A-Z0-9] {
+                                          // section was enable => skip now
+  					  depthIf=1;
+  					  BEGIN(SkipSection);
+  					}
+<ClassDoc,Doc,JavaDoc,AfterDoc,PageDoc,ExampleDoc>{CMD}"endif"/[^a-z_A-Z0-9] {
+                                          // section enabled => absorb endif
+  					}
+
+
 <ClassDoc,LineDoc,Doc,JavaDoc,AfterDoc>{CMD}"ingroup"{B}+   { 
   					  lastGroupContext = YY_START;
   					  lineCount();
@@ -3868,7 +3972,9 @@ static void parseCompounds(Entry *rt)
       //  ce->name.data(),ce->program.data());
       // init scanner state
       padCount=0;
+      depthIf = 0;
       inputString = ce->program;
+      lastDefGroup.groupname.resize(0);
       inputPosition = 0;
       scanYYrestart( scanYYin ) ;
       if (ce->section==Entry::ENUM_SEC)
@@ -3900,6 +4006,11 @@ static void parseCompounds(Entry *rt)
       scanYYlex() ;
       delete current; current=0;
       ce->program.resize(0);
+
+      if (depthIf>0)
+      {
+	warn(yyFileName,yyLineNr,"Documentation block ended in the middle of a conditional section!");
+      }
     }
     parseCompounds(ce);
   }
@@ -3911,6 +4022,7 @@ void parseMain(Entry *rt)
 {
   initParser();
   anonCount     = 0;
+  depthIf       = 0;
   protection    = Public;
   mtype         = Method;
   gstat         = FALSE;
@@ -3920,10 +4032,13 @@ void parseMain(Entry *rt)
   current       = new Entry;
   inputString   = rt->program;
   inputPosition = 0;
-  ifCount=0;
   scanYYrestart( scanYYin );
   BEGIN( FindMembers );
   scanYYlex();
+  if (depthIf>0)
+  {
+    warn(yyFileName,yyLineNr,"Documentation block ended in the middle of a conditional section!");
+  }
   rt->program.resize(0);
   delete current; current=0;
   parseCompounds(rt);

src/util.h

@@ -160,6 +160,8 @@ QList<ArgumentList> *copyArgumentLists(const QList<ArgumentList> *srcLists);
 QCString stripTemplateSpecifiersFromScope(const QCString &fullName,
                                           bool parentOnly=TRUE);
 QCString resolveTypeDef(Definition *d,const QCString &name);
+QCString mergeScopes(const QCString &leftScope,const QCString &rightScope);
+int getScopeFragment(const QCString &s,int p,int *l);
 
 #endif
 

src/xmlgen.cpp

@@ -38,8 +38,8 @@ static inline void writeXMLString(QTextStream &t,const char *s)
   t << convertToXML(s);
 }
 
-static void writeXMLLink(QTextStream &t,const char *compoundId,const char *memId,
-                  const char *text)
+static void writeXMLLink(QTextStream &t,const char *compoundId,
+                  const char *memId,const char *text)
 {
   if (memId==0)
   {