Release-1.5.1-20061202

INSTALL

-DOXYGEN Version 1.5.1
+DOXYGEN Version 1.5.1-20061202
 
 Please read the installation section of the manual 
 (http://www.doxygen.org/install.html) for instructions.
 
 --------
-Dimitri van Heesch (29 October 2006)
+Dimitri van Heesch (02 December 2006)

Makefile.in

@@ -60,19 +60,20 @@ install: doxywizard_install
 
 install_docs: 
 	$(INSTTOOL) -d $(DOCDIR)
-	cp -r doc $(DOCDIR)
+	$(MAKE) -C examples
+	$(MAKE) -C doc 
+	$(MAKE) -C latex 
+	cp latex/doxygen_manual.pdf $(DOCDIR)
+	#cp -r doc $(DOCDIR)
 	cp -r examples $(DOCDIR)
-	echo "DOXYGEN  = $(INSTALL)" >  $(DOCDIR)/doc/Makefile
-	echo "DOXYDOCS = .."         >> $(DOCDIR)/doc/Makefile
-	echo "VERSION  = $(VERSION)" >> $(DOCDIR)/doc/Makefile
-	echo "PERL     = $(PERL)"    >> $(DOCDIR)/doc/Makefile
-	cat doc/Makefile.in          >> $(DOCDIR)/doc/Makefile
-	cd $(DOCDIR)/examples ; $(MAKE)
-	cd $(DOCDIR)/doc ; $(MAKE)
-	rm -rf $(DOCDIR)/doc
-	cd $(DOCDIR)/latex ; $(MAKE)
-	cp $(DOCDIR)/latex/doxygen_manual.pdf $(DOCDIR)
-	rm -rf $(DOCDIR)/latex
+	cp -r html $(DOCDIR)
+	#echo "DOXYGEN  = $(INSTALL)" >  $(DOCDIR)/doc/Makefile
+	#echo "DOXYDOCS = .."         >> $(DOCDIR)/doc/Makefile
+	#echo "VERSION  = $(VERSION)" >> $(DOCDIR)/doc/Makefile
+	#echo "PERL     = $(PERL)"    >> $(DOCDIR)/doc/Makefile
+	#cat doc/Makefile.in          >> $(DOCDIR)/doc/Makefile
+	#rm -rf $(DOCDIR)/doc
+	#rm -rf $(DOCDIR)/latex
 
 docs: FORCE
 	cd examples ; $(MAKE)

README

-DOXYGEN Version 1.5.1
+DOXYGEN Version 1.5.1_20061202
 
 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) (29 October 2006)
+Dimitri van Heesch (dimitri@stack.nl) (02 December 2006)

addon/doxywizard/Makefile.in

 #
-# 
+# $Id$
 #
 # Copyright (C) 1997-2006 by Dimitri van Heesch.
 # 

addon/doxywizard/Makefile.win_nmake.in

 #
-# 
+# $Id$
 #
 # Copyright (C) 1997-2006 by Dimitri van Heesch.
 # 

addon/doxywizard/doxywizard.pro.in

 #
-# 
+# $Id$
 #
 # Copyright (C) 1997-2006 by Dimitri van Heesch.
 #

addon/doxywizard/expert.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

addon/doxywizard/expert.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

addon/doxywizard/inputbool.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

addon/doxywizard/inputbool.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

addon/doxywizard/inputint.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

addon/doxywizard/inputint.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

addon/doxywizard/inputstring.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

addon/doxywizard/inputstring.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

addon/doxywizard/inputstrlist.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

addon/doxywizard/inputstrlist.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

addon/doxywizard/qtbc.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

addon/doxywizard/version.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

configure

@@ -20,7 +20,7 @@ doxygen_version_minor=5
 doxygen_version_revision=1
 
 #NOTE: Setting version_mmn to "NO" will omit mmn info from the package.
-doxygen_version_mmn=NO
+doxygen_version_mmn=20061202
 
 bin_dirs=`echo $PATH | sed -e "s/:/ /g"`
 
@@ -217,6 +217,9 @@ if test -z "$f_platform"; then
     Cygwin:*)
       f_platform=win32-g++
       ;;
+    CYGWIN:*)
+      f_platform=win32-g++
+      ;;
     *MiNT:*)
       f_platform=m68k-atari-mint-g++
       ;;
@@ -432,15 +435,13 @@ fi
 test -f .makeconfig && rm .makeconfig
 test -f .tmakeconfig && rm .tmakeconfig
 
-if test -z $PWD; then
-  PWD=`pwd`
-fi
+configPWD=`pwd`
 
 cat > .makeconfig <<EOF
-DOXYGEN   = $PWD
-TMAKEPATH = $PWD/tmake/lib/$f_platform
+DOXYGEN   = $configPWD
+TMAKEPATH = $configPWD/tmake/lib/$f_platform
 ENV       = env TMAKEPATH=\$(TMAKEPATH)
-TMAKE     = $PWD/tmake/bin/tmake
+TMAKE     = $configPWD/tmake/bin/tmake
 MAKE      = $f_make
 PERL      = $f_perl
 RM        = rm -f
@@ -513,6 +514,11 @@ EOF
 EOF
   fi
 fi
+if test "$f_platform" = "hpux-g++"; then
+  cat >> .tmakeconfig <<EOF
+    TMAKE_CXXFLAGS += -D_LARGEFILE_SOURCE
+EOF
+fi
 if test "$f_wizard" = YES; then
   cat >> .tmakeconfig <<EOF
 TMAKE_MOC = $QTDIR/bin/moc

doc/config.doc

@@ -73,6 +73,7 @@ followed by the descriptions of the tags grouped by category.
 \refitem cfg_cols_in_alpha_index COLS_IN_ALPHA_INDEX
 \refitem cfg_compact_latex COMPACT_LATEX 
 \refitem cfg_compact_rtf COMPACT_RTF
+\refitem cfg_cpp_cli_support CPP_CLI_SUPPORT
 \refitem cfg_create_subdirs CREATE_SUBDIRS
 \refitem cfg_details_at_top DETAILS_AT_TOP 
 \refitem cfg_directory_graph DIRECTORY_GRAPH
@@ -393,6 +394,12 @@ followed by the descriptions of the tags grouped by category.
  func(std::string) {}). This also make the inheritance and collaboration
  diagrams that involve STL classes more complete and accurate.
 
+\anchor cfg_cpp_cli_support
+<dt>\c CPP_CLI_SUPPORT <dd>
+ \addindex CPP_CLI_SUPPORT
+ If you use Microsoft's C++/CLI language, you should set this option to YES to
+ enable parsing support.
+
 \anchor cfg_distribute_group_doc
 <dt>\c DISTRIBUTE_GROUP_DOC <dd>
  \addindex DISTRIBUTE_GROUP_DOC

doc/language.doc

@@ -23,7 +23,7 @@ text fragments, generated by doxygen, can be produced in languages other
 than English (the default). The output language is chosen through the
 configuration file (with default name and known as Doxyfile).
 
-Currently (version 1.4.7), 33 languages 
+Currently (version 1.5.1), 33 languages 
 are supported (sorted alphabetically):
 Afrikaans, Arabic, Brazilian Portuguese, Catalan, Chinese, Chinese
 Traditional, Croatian, Czech, Danish, Dutch, English, Finnish, French,
@@ -136,9 +136,9 @@ when the translator was updated.
   </tr>
   <tr bgcolor="#ffffff">
     <td>Greek</td>
-    <td>Harry Kalogirou</td>
-    <td>harkal at rainbow dot cs dot unipi dot gr</td>
-    <td>1.2.11</td>
+    <td>Paul Gessos</td>
+    <td>nickreserved at yahoo dot com</td>
+    <td>up-to-date</td>
   </tr>
   <tr bgcolor="#ffffff">
     <td>Hungarian</td>
@@ -306,7 +306,7 @@ when the translator was updated.
   \hline
   German & Jens Seidel & {\tt\tiny jensseidel@users.sf.net} & up-to-date \\
   \hline
-  Greek & Harry Kalogirou & {\tt\tiny harkal@rainbow.cs.unipi.gr} & 1.2.11 \\
+  Greek & Paul Gessos & {\tt\tiny nickreserved@yahoo.com} & up-to-date \\
   \hline
   Hungarian & \'{A}kos Kiss & {\tt\tiny akiss@users.sourceforge.net} & 1.4.6 \\
   ~ & F\"{o}ldv\'{a}ri Gy\"{o}rgy & {\tt\tiny foldvari lost@cyberspace} & ~ \\

doc/maintainers.txt

@@ -55,7 +55,7 @@ TranslatorGerman
 Jens Seidel: jensseidel@users.sf.net
 
 TranslatorGreek
-Harry Kalogirou: harkal@rainbow.cs.unipi.gr
+Paul Gessos: nickreserved@yahoo.com
 
 TranslatorHungarian
 Ákos Kiss: akiss@users.sourceforge.net

doc/translator_report.txt

-(1.4.7)
+(1.5.1)
 
 Doxygen supports the following 33 languages (sorted alphabetically):
 
@@ -8,7 +8,7 @@ German, Greek, Hungarian, Indonesian, Italian, Japanese (+En), Korean
 (+En), Lithuanian, Norwegian, Persian, Polish, Portuguese, Romanian,
 Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
 
-Of them, 13 translators are up-to-date, 20 translators are based on
+Of them, 14 translators are up-to-date, 19 translators are based on
 some adapter class, and 2 are English based.
 
 ----------------------------------------------------------------------
@@ -27,6 +27,7 @@ still may be some details listed even for them:
   TranslatorEnglish
   TranslatorFrench
   TranslatorGerman
+  TranslatorGreek -- Remove the obsolete methods (never used).
   TranslatorItalian
   TranslatorJapanese -- Remove the obsolete methods (never used).
   TranslatorRussian
@@ -55,9 +56,12 @@ must be implemented to become up-to-date:
   TranslatorRomanian              1.4.1 	 2 methods to implement
   TranslatorPortuguese            1.3.3 	13 methods to implement
   TranslatorSlovak                1.2.18	22 methods to implement
-  TranslatorGreek                 1.2.11	27 methods to implement
   TranslatorFinnish               obsolete	96 methods to implement
 
+Note: The adapter classes TranslatorAdapter_1_2_11,
+TranslatorAdapter_1_2_13, TranslatorAdapter_1_2_16,
+TranslatorAdapter_1_2_17 are not used and can be removed.
+
 ----------------------------------------------------------------------
 The following translator classes derive directly from the
 TranslatorEnglish. The class identifier has the suffix 'En' that says
@@ -243,40 +247,10 @@ TranslatorFinnish   (TranslatorEnglish)  96 methods to implement
     QCString trNoDescriptionAvailable()
 
 
-TranslatorGreek   (TranslatorAdapter_1_2_11)  27 methods to implement
+TranslatorGreek   (Translator)
 ---------------
 
-  Implements 167 of the required methods.
-
-  Missing methods (should be implemented):
-
-    virtual QCString trOverloadText()
-    virtual QCString trEventDocumentation()
-    virtual QCString trDirIndex()
-    virtual QCString trImplementedFromList(int numEntries)
-    virtual QCString trPackageMembers()
-    virtual QCString trStaticPackageMembers()
-    virtual QCString trDirDocumentation()
-    virtual QCString trSearchResultsTitle()
-    virtual QCString trDirectories()
-    virtual QCString trDeprecatedList()
-    virtual QCString trDirDescription()
-    virtual QCString trStaticPackageAttribs()
-    virtual QCString trCallGraph()
-    virtual QCString trPackageTypes()
-    virtual QCString trImplementedInList(int numEntries)
-    virtual QCString trSearchResults(int numDocuments)
-    virtual QCString trPackageAttribs()
-    virtual QCString trSearchMatches()
-    virtual QCString trEvents()
-    virtual QCString trCallerGraph()
-    virtual QCString trReferences()
-    virtual QCString trSourceFile(QCString & filename)
-    virtual QCString trDirReference(const char * dirName)
-    virtual QCString trDir(bool first_capital, bool singular)
-    virtual QCString trSearchForIndex()
-    virtual QCString trAll()
-    virtual QCString trRTFTableOfContents()
+  Implements 194 of the required methods.
 
   Obsolete methods (should be removed, never used):
 

src/Makefile.in

 
 #
-# 
+# $Id$
 #
 # Copyright (C) 1997-2006 by Dimitri van Heesch.
 # 

src/bufstr.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.

src/classdef.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
@@ -2086,6 +2086,7 @@ void ClassDef::mergeMembers()
   bool inlineInheritedMembers = Config_getBool("INLINE_INHERITED_MEMB" );
   if (baseClasses())
   {
+    //printf("  => has base classes!\n");
     BaseClassListIterator bcli(*baseClasses());
     BaseClassDef *bcd;
     for ( ; (bcd=bcli.current()) ; ++bcli )
@@ -2096,17 +2097,17 @@ void ClassDef::mergeMembers()
       bClass->mergeMembers();
 
       MemberNameInfoSDict *srcMnd  = bClass->memberNameInfoSDict();
-      MemberNameInfoSDict *dstMnd  =         m_impl->allMemberNameInfoSDict;
+      MemberNameInfoSDict *dstMnd  = m_impl->allMemberNameInfoSDict;
 
-      if (srcMnd && dstMnd)
+      if (srcMnd)
       {
         MemberNameInfoSDict::Iterator srcMnili(*srcMnd);
         MemberNameInfo *srcMni;
         for ( ; (srcMni=srcMnili.current()) ; ++srcMnili)
         {
-          //printf("Base member name %s\n",srcMni->memberName());
+          //printf("    Base member name %s\n",srcMni->memberName());
           MemberNameInfo *dstMni;
-          if ((dstMni=dstMnd->find(srcMni->memberName())))
+          if (dstMnd!=0 && (dstMni=dstMnd->find(srcMni->memberName())))
             // a member with that name is already in the class.
             // the member may hide or reimplement the one in the sub class
             // or there may be another path to the base class that is already 
@@ -2298,6 +2299,12 @@ void ClassDef::mergeMembers()
               }
             }
 
+            if (dstMnd==0)
+            {
+              m_impl->allMemberNameInfoSDict = new MemberNameInfoSDict(17);
+              m_impl->allMemberNameInfoSDict->setAutoDelete(TRUE);
+              dstMnd = m_impl->allMemberNameInfoSDict;
+            }
             // add it to the dictionary
             dstMnd->append(newMni->memberName(),newMni);
           }
@@ -2317,7 +2324,7 @@ void ClassDef::mergeCategory(ClassDef *category)
   category->setCategoryOf(this);
     
   MemberNameInfoSDict *srcMnd  = category->memberNameInfoSDict();
-  MemberNameInfoSDict *dstMnd  =           m_impl->allMemberNameInfoSDict;
+  MemberNameInfoSDict *dstMnd  = m_impl->allMemberNameInfoSDict;
 
   if (srcMnd && dstMnd)
   {

src/classdef.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
@@ -23,7 +23,7 @@
 #include <qdict.h>
 #include <qstrlist.h>
 
-#include "entry.h"
+//#include "entry.h"
 #include "memberlist.h"
 #include "definition.h"
 #include "sortdict.h"
@@ -56,13 +56,13 @@ class ClassDef : public Definition
 {
   public:
     /*! The various compound types */
-    enum CompoundType { Class=Entry::CLASS_SEC, 
-                        Struct=Entry::STRUCT_SEC, 
-                        Union=Entry::UNION_SEC,
-                        Interface=Entry::INTERFACE_SEC,
-                        Protocol=Entry::PROTOCOL_SEC,
-                        Category=Entry::CATEGORY_SEC,
-                        Exception=Entry::EXCEPTION_SEC
+    enum CompoundType { Class, //=Entry::CLASS_SEC, 
+                        Struct, //=Entry::STRUCT_SEC, 
+                        Union, //=Entry::UNION_SEC,
+                        Interface, //=Entry::INTERFACE_SEC,
+                        Protocol, //=Entry::PROTOCOL_SEC,
+                        Category, //=Entry::CATEGORY_SEC,
+                        Exception //=Entry::EXCEPTION_SEC
                       };
 
     /*! Creates a new compound definition.

src/classlist.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/classlist.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/code.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/commentcnv.h

 /*****************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/commentcnv.l

 /*****************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/commentscan.l

@@ -656,24 +656,31 @@ static inline void setOutput(OutputContext ctx)
     }
   }
 
+  int oldContext = inContext;
   inContext = ctx;
   if (inContext!=OutputXRef && inBody) inContext=OutputInbody;
   switch(inContext)
   {
     case OutputDoc:
-      stripTrailingWhiteSpace(current->doc);
-      if (current->docFile.isEmpty())
+      if (oldContext!=inContext)
       {
-        current->docFile = yyFileName;
-        current->docLine = yyLineNr;
+        stripTrailingWhiteSpace(current->doc);
+        if (current->docFile.isEmpty())
+        {
+          current->docFile = yyFileName;
+          current->docLine = yyLineNr;
+        }
       }
       pOutputString = &current->doc;
       break;
     case OutputBrief:
-      if (current->briefFile.isEmpty())
+      if (oldContext!=inContext)
       {
-        current->briefFile = yyFileName;
-        current->briefLine = yyLineNr;
+	if (current->briefFile.isEmpty())
+	{
+	  current->briefFile = yyFileName;
+	  current->briefLine = yyLineNr;
+	}
       }
       pOutputString = &current->brief;
       break;

src/compound.xsd

@@ -147,8 +147,22 @@
     <xsd:attribute name="virt" type="DoxVirtualKind" />
     <xsd:attribute name="volatile" type="DoxBool" />
     <xsd:attribute name="mutable" type="DoxBool" />
+    <!-- Qt property -->
     <xsd:attribute name="readable" type="DoxBool" use="optional"/>
     <xsd:attribute name="writable" type="DoxBool" use="optional"/>
+    <!-- C++/CLI variable -->
+    <xsd:attribute name="initonly" type="DoxBool" use="optional"/>
+    <!-- C++/CLI and C# property -->
+    <xsd:attribute name="settable" type="DoxBool" use="optional"/>
+    <xsd:attribute name="gettable" type="DoxBool" use="optional"/>
+    <!-- C++/CLI function -->
+    <xsd:attribute name="final" type="DoxBool" use="optional"/>
+    <xsd:attribute name="sealed" type="DoxBool" use="optional"/>
+    <xsd:attribute name="new" type="DoxBool" use="optional"/>
+    <!-- C++/CLI event -->
+    <xsd:attribute name="add" type="DoxBool" use="optional"/>
+    <xsd:attribute name="remove" type="DoxBool" use="optional"/>
+    <xsd:attribute name="raise" type="DoxBool" use="optional"/>
   </xsd:complexType>
 
   <xsd:complexType name="descriptionType" mixed="true">

src/compound_xsd.h

@@ -147,8 +147,22 @@
 "    <xsd:attribute name=\"virt\" type=\"DoxVirtualKind\" />\n"
 "    <xsd:attribute name=\"volatile\" type=\"DoxBool\" />\n"
 "    <xsd:attribute name=\"mutable\" type=\"DoxBool\" />\n"
+"    <!-- Qt property -->\n"
 "    <xsd:attribute name=\"readable\" type=\"DoxBool\" use=\"optional\"/>\n"
 "    <xsd:attribute name=\"writable\" type=\"DoxBool\" use=\"optional\"/>\n"
+"    <!-- C++/CLI variable -->\n"
+"    <xsd:attribute name=\"initonly\" type=\"DoxBool\" use=\"optional\"/>\n"
+"    <!-- C++/CLI and C# property -->\n"
+"    <xsd:attribute name=\"settable\" type=\"DoxBool\" use=\"optional\"/>\n"
+"    <xsd:attribute name=\"gettable\" type=\"DoxBool\" use=\"optional\"/>\n"
+"    <!-- C++/CLI function -->\n"
+"    <xsd:attribute name=\"final\" type=\"DoxBool\" use=\"optional\"/>\n"
+"    <xsd:attribute name=\"sealed\" type=\"DoxBool\" use=\"optional\"/>\n"
+"    <xsd:attribute name=\"new\" type=\"DoxBool\" use=\"optional\"/>\n"
+"    <!-- C++/CLI event -->\n"
+"    <xsd:attribute name=\"add\" type=\"DoxBool\" use=\"optional\"/>\n"
+"    <xsd:attribute name=\"remove\" type=\"DoxBool\" use=\"optional\"/>\n"
+"    <xsd:attribute name=\"raise\" type=\"DoxBool\" use=\"optional\"/>\n"
 "  </xsd:complexType>\n"
 "\n"
 "  <xsd:complexType name=\"descriptionType\" mixed=\"true\">\n"

src/config.l

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
@@ -1556,6 +1556,12 @@ void Config::create()
 		    "diagrams that involve STL classes more complete and accurate. \n",
 		    FALSE
 		 );
+  cb = addBool(
+                    "CPP_CLI_SUPPORT",
+		    "If you use Microsoft's C++/CLI language, you should set this option to YES to\n"
+		    "enable parsing support.\n",
+		    FALSE
+      	         );
   cb = addBool(
                     "DISTRIBUTE_GROUP_DOC",
                     "If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC \n"

src/constexp.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.

src/constexp.l

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.

src/constexp.y

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.

src/cppvalue.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.

src/cppvalue.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.

src/debug.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/debug.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.

src/declinfo.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/declinfo.l

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/defargs.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/defargs.l

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/defgen.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.

src/defgen.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/define.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/define.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/definition.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/definition.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/diagram.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.

src/diagram.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.

src/dirdef.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/docparser.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
@@ -2037,6 +2037,34 @@ DocRef::DocRef(DocNode *parent,const QString &target) :
            target.data()); 
 }
 
+static void flattenParagraphs(QList<DocNode> &children)
+{
+  QListIterator<DocNode> li(children);
+  QList<DocNode> newChildren;
+  DocNode *dn;
+  for (li.toFirst();(dn=li.current());++li)
+  {
+    if (dn->kind()==DocNode::Kind_Para)
+    {
+      DocPara *para = (DocPara*)dn;
+      QList<DocNode> &paraChildren = para->children();
+      paraChildren.setAutoDelete(FALSE); // unlink children from paragraph node
+      QListIterator<DocNode> li2(paraChildren);
+      DocNode *dn2;
+      for (li2.toFirst();(dn2=li2.current());++li2)
+      {
+        newChildren.append(dn2); // add them to new node
+      }
+    }
+  }
+  children.clear();
+  QListIterator<DocNode> li3(newChildren);
+  for (li3.toFirst();(dn=li3.current());++li3)
+  {
+    children.append(dn);
+  }
+}
+
 void DocRef::parse()
 {
   g_nodeStack.push(this);
@@ -2072,6 +2100,7 @@ void DocRef::parse()
     internalValidatingParseDoc(this,m_children,m_text);
     docParserPopContext();
     g_insideHtmlLink=FALSE;
+    flattenParagraphs(m_children);
   }
 
   handlePendingStyleCommands(this,m_children);
@@ -4799,6 +4828,7 @@ int DocPara::handleHtmlStartTag(const QString &tagName,const HtmlAttribList &tag
         {
           DocRef *ref = new DocRef(this,cref);
           m_children.append(ref);
+          ref->parse();
         }
         else
         {

src/docparser.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
@@ -971,6 +971,7 @@ class DocPara : public CompAccept<DocPara>, public DocNode
     bool isFirst() const        { return m_isFirst; }
     bool isLast() const         { return m_isLast; }
     const QList<DocNode> &children() const { return m_children; }
+    QList<DocNode> &children()  { return m_children; }
 
     int handleCommand(const QString &cmdName);
     int handleHtmlStartTag(const QString &tagName,const HtmlAttribList &tagHtmlAttribs);

src/doctokenizer.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.

src/doctokenizer.l

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.

src/docvisitor.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.

src/dot.cpp

 /*****************************************************************************
  *
- * 
+ * $Id$
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.

src/dot.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.

src/doxygen.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.

src/doxygen.pro.in

 #
-# 
+# $Id$
 #
 # Copyright (C) 1997-2006 by Dimitri van Heesch.
 #

src/doxytag.l

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/doxytag.pro.in

 # 
-# 
+# $Id$
 #
 # Copyright (C) 1997-2006 by Dimitri van Heesch.
 # 

src/doxytag.t

 #
-# 
+# $Id$
 #
 # Copyright (C) 1997-2006 by Dimitri van Heesch.
 #

src/entry.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
@@ -89,7 +89,7 @@ Entry::Entry(const Entry &e)
   mGrpId      = e.mGrpId;
   bodyLine    = e.bodyLine;
   endBodyLine = e.endBodyLine;
-  memSpec     = e.memSpec;
+  spec        = e.spec;
   initializer = e.initializer;
   initLines   = e.initLines;
   callGraph   = e.callGraph;
@@ -241,7 +241,7 @@ void Entry::reset()
   stat    = FALSE;
   proto   = FALSE;
   explicitExternal = FALSE;
-  memSpec  = 0;
+  spec  = 0;
   objc = FALSE;
   hidden = FALSE;
   subGrouping = TRUE;
@@ -343,7 +343,7 @@ static bool saveEntry(Entry *e,FileStorage *f)
   marshalUInt(f,HEADER);
   marshalInt(f,(int)e->protection);
   marshalInt(f,(int)e->mtype);
-  marshalInt(f,e->memSpec);
+  marshalInt(f,e->spec);
   marshalInt(f,e->initLines);
   marshalBool(f,e->stat);
   marshalBool(f,e->explicitExternal);
@@ -401,7 +401,7 @@ static bool loadEntry(Entry *e,FileStorage *f)
   }
   e->protection       = (Protection)unmarshalInt(f);
   e->mtype            = (MethodTypes)unmarshalInt(f);
-  e->memSpec          = unmarshalInt(f);
+  e->spec             = unmarshalInt(f);
   e->initLines        = unmarshalInt(f);
   e->stat             = unmarshalBool(f);
   e->explicitExternal = unmarshalBool(f);

src/entry.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
@@ -113,7 +113,8 @@ class ArgumentList : public QList<Argument>
     ArgumentList() : QList<Argument>(), 
                      constSpecifier(FALSE),
                      volatileSpecifier(FALSE),
-                     pureSpecifier(FALSE) { setAutoDelete(TRUE); }
+                     pureSpecifier(FALSE)
+                     { setAutoDelete(TRUE); }
     /*! Destroys the argument list */
    ~ArgumentList() {}
     bool hasDocumentation() const;
@@ -187,16 +188,17 @@ class Entry
     /*! Kind of entries that are supported */
     enum Sections { 
       CLASS_SEC        = 0x00000001, 
-      STRUCT_SEC       = 0x00000002,
-      UNION_SEC        = 0x00000004, 
-      EXCEPTION_SEC    = 0x00000008,
+      //STRUCT_SEC       = 0x00000002,
+      //UNION_SEC        = 0x00000004, 
+      //EXCEPTION_SEC    = 0x00000008,
       NAMESPACE_SEC    = 0x00000010,
-      INTERFACE_SEC    = 0x00000020,
-      PROTOCOL_SEC     = 0x00000040,
-      CATEGORY_SEC     = 0x00000080,
-      COMPOUND_MASK    = CLASS_SEC | STRUCT_SEC | UNION_SEC | 
-                         INTERFACE_SEC | EXCEPTION_SEC | 
-                         PROTOCOL_SEC | CATEGORY_SEC,
+      //INTERFACE_SEC    = 0x00000020,
+      //PROTOCOL_SEC     = 0x00000040,
+      //CATEGORY_SEC     = 0x00000080,
+      COMPOUND_MASK    = CLASS_SEC //| STRUCT_SEC | UNION_SEC | 
+                         //INTERFACE_SEC | EXCEPTION_SEC | 
+                         //PROTOCOL_SEC | CATEGORY_SEC
+                         ,
       SCOPE_MASK       = COMPOUND_MASK | NAMESPACE_SEC,
       
       CLASSDOC_SEC     = 0x00000800, 
@@ -251,6 +253,28 @@ class Entry
       Writable  = 0x0040,
       Final     = 0x0080,
       Abstract  = 0x0100,
+      Addable   = 0x0200,
+      Removable = 0x0400,
+      Raisable  = 0x0800,
+      Override  = 0x1000,
+      New       = 0x2000,
+      Sealed    = 0x4000,
+      Initonly  = 0x8000
+    };
+    enum ClassSpecifier
+    {
+      Template       = 0x0001,
+      Generic        = 0x0002,
+      Ref            = 0x0004,
+      Value          = 0x0008,
+      Interface      = 0x0010,
+      Struct         = 0x0020,
+      Union          = 0x0040,
+      Exception      = 0x0080,
+      Protocol       = 0x0100,
+      Category       = 0x0200,
+      SealedClass    = 0x0400,
+      AbstractClass  = 0x0800
     };
     enum GroupDocType
     {
@@ -290,7 +314,7 @@ class Entry
     // content
     Protection protection;    //!< class protection
     MethodTypes mtype;        //!< signal, slot, (dcop) method, or property?
-    int  memSpec;             //!< member specifiers
+    int  spec;                //!< class/member specifiers
     int  initLines;           //!< define/variable initializer lines to show 
     bool stat;                //!< static ?
     bool explicitExternal;    //!< explicitly defined as external?

src/example.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/filedef.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/filedef.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/filename.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/filename.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/formula.cpp

 /******************************************************************************
  i
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/formula.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/groupdef.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/groupdef.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/htmlattrib.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/htmldocvisitor.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.

src/htmldocvisitor.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.

src/htmlgen.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
@@ -431,13 +431,13 @@ static const char tabs_css[] =
 "   background-position: 0% -150px;\n"
 "}\n"
 "\n"
-"DIV.tabs LI#current A\n"
+"DIV.tabs LI.current A\n"
 "{\n"
 "   background-position: 100% -150px;\n"
 "   border-width     : 0px;\n"
 "}\n"
 "\n"
-"DIV.tabs LI#current SPAN\n"
+"DIV.tabs LI.current SPAN\n"
 "{\n"
 "   background-position: 0% -150px;\n"
 "   padding-bottom   : 6px;\n"
@@ -1580,7 +1580,7 @@ static void endQuickIndexList(QTextStream &t,bool compact)
 {
   if (compact) 
   {
-    t << "  </ul>";
+    t << "  </ul>\n";
     t << "</div>\n";
   }
   else 
@@ -1593,7 +1593,7 @@ static void startQuickIndexItem(QTextStream &t,const char *l,
                                 bool hl,bool /*compact*/,
                                 const QCString &relPath)
 {
-  t << "    <li"; if (hl) t << " id=\"current\"";
+  t << "    <li"; if (hl) t << " class=\"current\"";
   t << "><a ";
   t << "href=\"" << relPath << l << "\">";
   t << "<span>";

src/htmlgen.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/htmlhelp.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/htmlhelp.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/image.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.

src/image.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.

src/index.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
@@ -22,6 +22,7 @@
 #include <qfile.h>
 
 class MemberDef;
+class OutputList;
 
 enum IndexSections
 {
@@ -45,37 +46,6 @@ enum IndexSections
   isEndIndex
 };
 
-class OutputList;
-
-void writeIndex(OutputList &ol);
-void writeHierarchicalIndex(OutputList &ol);
-void writeAlphabeticalIndex(OutputList &ol);
-void writeClassHierarchy(OutputList &ol);
-void writeAnnotatedIndex(OutputList &ol);
-void writeAnnotatedClassList(OutputList &ol);
-void writeMemberList(OutputList &ol,bool useSections);
-
-void writeSourceIndex(OutputList &ol);
-void writeHeaderIndex(OutputList &ol);
-void writeHeaderFileList(OutputList &ol);
-
-void writeExampleIndex(OutputList &ol);
-void writePageIndex(OutputList &ol);
-void writeFileIndex(OutputList &ol);
-void writeNamespaceIndex(OutputList &ol);
-void writeGroupIndex(OutputList &ol);
-void writeDirIndex(OutputList &ol);
-void writePackageIndex(OutputList &ol);
-
-void writeClassMemberIndex(OutputList &ol);
-void writeFileMemberIndex(OutputList &ol);
-void writeNamespaceMemberIndex(OutputList &ol);
-
-void writeGraphicalClassHierarchy(OutputList &ol);
-void writeGraphInfo(OutputList &ol);
-
-void countDataStructures();
-
 enum HighlightedItem
 {
   HLI_None=0,
@@ -149,6 +119,31 @@ enum ClassHighlight
   CHL_Total = CHL_Exceptions+1
 };
 
+void writeIndex(OutputList &ol);
+void writeHierarchicalIndex(OutputList &ol);
+void writeAlphabeticalIndex(OutputList &ol);
+void writeClassHierarchy(OutputList &ol);
+void writeAnnotatedIndex(OutputList &ol);
+void writeAnnotatedClassList(OutputList &ol);
+void writeMemberList(OutputList &ol,bool useSections);
+void writeSourceIndex(OutputList &ol);
+void writeHeaderIndex(OutputList &ol);
+void writeHeaderFileList(OutputList &ol);
+void writeExampleIndex(OutputList &ol);
+void writePageIndex(OutputList &ol);
+void writeFileIndex(OutputList &ol);
+void writeNamespaceIndex(OutputList &ol);
+void writeGroupIndex(OutputList &ol);
+void writeDirIndex(OutputList &ol);
+void writePackageIndex(OutputList &ol);
+void writeClassMemberIndex(OutputList &ol);
+void writeFileMemberIndex(OutputList &ol);
+void writeNamespaceMemberIndex(OutputList &ol);
+void writeGraphicalClassHierarchy(OutputList &ol);
+void writeGraphInfo(OutputList &ol);
+
+void countDataStructures();
+
 extern int annotatedClasses;
 extern int hierarchyClasses;
 extern int documentedFiles;

src/instdox.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/instdox.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/language.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/latexdocvisitor.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.

src/latexdocvisitor.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.

src/latexgen.cpp

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
@@ -962,7 +962,7 @@ void LatexGenerator::endIndexValue(const char *name,bool hasBrief)
 //void LatexGenerator::writeClassLink(const char *,const char *,
 //                                    const char *,const char *name)
 //{
-//  t << "{\\bf";
+//  t << "{\\bf ";
 //  docify(name);
 //  t << "}"; 
 //}

src/latexgen.h

 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *

src/libdoxycfg.pro.in

 #
-# 
+# $Id$
 #
 # Copyright (C) 1997-2006 by Dimitri van Heesch.
 #