From ba6357a253beeff03588578154bbc311bd986a47 Mon Sep 17 00:00:00 2001
From: dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>
Date: Mon, 3 Apr 2000 16:49:13 +0000
Subject: Release 2000-04-03

---
 INSTALL                   |   8 +-
 LICENSE                   | 628 ++++++++++++++++++----------------------------
 README                    |   4 +-
 VERSION                   |   2 +-
 configure                 |   5 +-
 doc/Doxyfile              |   3 +-
 doc/Makefile.in           |   3 +-
 doc/Makefile.latex        |   3 +-
 doc/Makefile.win.in       |   3 +-
 doc/autolink.doc          |   3 +-
 doc/commands.doc          |   3 +-
 doc/config.doc            |   3 +-
 doc/doxygen.sty           |   3 +-
 doc/doxygen_manual.tex    |   3 +-
 doc/doxygen_usage.doc     |   3 +-
 doc/doxysearch_usage.doc  |   3 +-
 doc/doxytag_usage.doc     |   3 +-
 doc/faq.doc               |   3 +-
 doc/features.doc          |   3 +-
 doc/history.doc           |   3 +-
 doc/htmlcmds.doc          |   7 +-
 doc/index.doc             |   6 +-
 doc/install.doc           |   3 +-
 doc/installdox_usage.doc  |   3 +-
 doc/language.doc          |   3 +-
 doc/output.doc            |   3 +-
 doc/starting.doc          |   5 +-
 doc/todo.doc              |   3 +-
 doc/trouble.doc           |   6 +-
 examples/author.cpp       |   4 +-
 examples/define.h         |   9 +-
 packages/rpm/doxygen.spec |   2 +-
 src/Makefile.in           |   3 +-
 src/classdef.cpp          |  91 +++++--
 src/classdef.h            |   3 +-
 src/classlist.cpp         |   8 +-
 src/classlist.h           |   3 +-
 src/code.h                |   3 +-
 src/code.l                |   3 +-
 src/config.h              |   3 +-
 src/config.l              |   3 +-
 src/constexp.h            |   3 +-
 src/constexp.l            |   3 +-
 src/constexp.y            |   3 +-
 src/cppvalue.cpp          |   3 +-
 src/cppvalue.h            |   3 +-
 src/debug.cpp             |   3 +-
 src/debug.h               |   3 +-
 src/declinfo.h            |   3 +-
 src/declinfo.l            |   3 +-
 src/defargs.h             |   3 +-
 src/defargs.l             |   3 +-
 src/define.cpp            |   3 +-
 src/define.h              |   3 +-
 src/definition.cpp        |   3 +-
 src/definition.h          |   3 +-
 src/diagram.cpp           |   7 +-
 src/diagram.h             |   3 +-
 src/dot.cpp               |   9 +-
 src/dot.h                 |   3 +-
 src/doxygen.cpp           |  41 +--
 src/doxygen.h             |   3 +-
 src/doxygen.pro.in        |   3 +-
 src/doxygen.t             |   3 +-
 src/doxysearch.cpp        |   3 +-
 src/doxysearch.pro.in     |   3 +-
 src/doxytag.l             |   3 +-
 src/doxytag.pro.in        |   3 +-
 src/doxytag.t             |   3 +-
 src/entry.cpp             |   3 +-
 src/entry.h               |   3 +-
 src/example.h             |   3 +-
 src/filedef.cpp           |   3 +-
 src/filedef.h             |   3 +-
 src/filename.cpp          |   3 +-
 src/filename.h            |   3 +-
 src/formula.cpp           |   3 +-
 src/formula.h             |   3 +-
 src/gifenc.cpp            |   3 +-
 src/gifenc.h              |   3 +-
 src/groupdef.cpp          |   3 +-
 src/groupdef.h            |   3 +-
 src/htmlgen.cpp           |  57 ++++-
 src/htmlgen.h             |  13 +-
 src/htmlhelp.cpp          |   3 +-
 src/htmlhelp.h            |   3 +-
 src/image.cpp             |   3 +-
 src/image.h               |   3 +-
 src/index.cpp             |  34 ++-
 src/index.h               |   3 +-
 src/instdox.cpp           |   3 +-
 src/instdox.h             |   3 +-
 src/language.cpp          |   3 +-
 src/language.h            |   3 +-
 src/latexgen.cpp          |  38 ++-
 src/latexgen.h            |  13 +-
 src/logos.cpp             |   3 +-
 src/logos.h               |   3 +-
 src/mangen.cpp            |  37 ++-
 src/mangen.h              |  13 +-
 src/memberdef.cpp         |   7 +-
 src/memberdef.h           |   8 +-
 src/membergroup.cpp       |  50 +++-
 src/membergroup.h         |  16 +-
 src/memberlist.cpp        |  52 +++-
 src/memberlist.h          |   7 +-
 src/membername.cpp        |   3 +-
 src/membername.h          |   3 +-
 src/message.cpp           |   3 +-
 src/message.h             |   3 +-
 src/namespacedef.cpp      |   3 +-
 src/namespacedef.h        |   3 +-
 src/outputgen.cpp         |   3 +-
 src/outputgen.h           |  11 +-
 src/outputlist.cpp        |   3 +-
 src/outputlist.h          |  19 +-
 src/pre.h                 |   3 +-
 src/pre.l                 |   3 +-
 src/qtbc.h                |   3 +-
 src/rtfgen.cpp            | 169 ++++++++++++-
 src/rtfgen.h              |  42 ++--
 src/scanner.h             |   3 +-
 src/scanner.l             |  22 +-
 src/searchindex.cpp       |   3 +-
 src/searchindex.h         |   3 +-
 src/section.h             |   3 +-
 src/suffixtree.cpp        |   3 +-
 src/suffixtree.h          |   3 +-
 src/tag.h                 |   3 +-
 src/tag.l                 |   3 +-
 src/translator.h          |   3 +-
 src/translator_cz.h       |   3 +-
 src/translator_de.h       |   3 +-
 src/translator_es.h       |   3 +-
 src/translator_fi.h       |   3 +-
 src/translator_fr.h       |   3 +-
 src/translator_it.h       | 135 +++++++++-
 src/translator_jp.h       |   3 +-
 src/translator_nl.h       |   3 +-
 src/translator_ru.h       |   3 +-
 src/translator_se.h       |   3 +-
 src/util.cpp              |  55 +++-
 src/util.h                |   5 +-
 src/version.h             |   3 +-
 144 files changed, 1283 insertions(+), 680 deletions(-)

diff --git a/INSTALL b/INSTALL
index 766e33e..acda0e1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
-DOXYGEN Version 1.1.1-20000326
+DOXYGEN Version 1.1.1-20000402
 
 CONTENTS
 --------
@@ -15,8 +15,8 @@ INSTALLATION INSTRUCTIONS FOR UNIX:
 
 1.  Unpack the archive, unless you already have:
    
-     gunzip doxygen-1.1.1-20000326.src.tar.gz    # uncompress the archive
-     tar xf doxygen-1.1.1-20000326.src.tar       # unpack it
+     gunzip doxygen-1.1.1-20000402.src.tar.gz    # uncompress the archive
+     tar xf doxygen-1.1.1-20000402.src.tar       # unpack it
 
 2.  Run the configure script:
  
@@ -252,4 +252,4 @@ The latest version of doxygen can be obtained at
 
 Enjoy,
 
-Dimitri van Heesch (26 March 2000)
+Dimitri van Heesch (02 April 2000)
diff --git a/LICENSE b/LICENSE
index 7a669d2..60549be 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,31 +1,22 @@
-This program is distributed under the GNU GPL v2 (see below), 
-with the additional permission that it may be linked against Troll Tech's 
-Qt library, and distributed, without the GPL applying to Qt.   
-
------------------------------------------------------------------------
-
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
+		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
- Copyright (C) 1991 Free Software Foundation, Inc.
-                    675 Mass Ave, Cambridge, MA 02139, USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-[This is the first released version of the library GPL.  It is
- numbered 2 because it goes with version 2 of the ordinary GPL.]
-
 			    Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it.  You can use it for
-your libraries, too.
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
@@ -36,347 +27,195 @@ in new free programs; and that you know you can do these things.
 
   To protect your rights, we need to make restrictions that forbid
 anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if
-you distribute copies of the library, or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  Also, for each distributor's protection, we want to make certain
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
 that everyone understands that there is no warranty for this free
-library.  If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, so that any problems introduced by others will not reflect on
-the original authors' reputations.
-
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
   Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software.  To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-  Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs.  This
-license, the GNU Library General Public License, applies to certain
-designated libraries.  This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
-
-  The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it.  Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program.  However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
-
-  Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries.  We
-concluded that weaker conditions might promote sharing better.
-
-  However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves.  This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them.  (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.)  The hope is that this
-will lead to faster development of free libraries.
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, while the latter only
-works together with the library.
-
-  Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
+modification follow.
 
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
+		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-General Public License (also called "this License").  Each licensee is
-addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
 covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
 distribute such modifications or work under the terms of Section 1
 above, provided that you also meet all of these conditions:
 
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
+    a) You must cause the modified files to carry prominent notices
     stating that you changed the files and the date of any change.
 
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
 These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
+identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
 themselves, then this License, and its terms, do not apply to those
 sections when you distribute them as separate works.  But when you
 distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
+on the Program, the distribution of the whole must be on the terms of
 this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
+entire whole, and thus to each and every part regardless of who wrote it.
 
 Thus, it is not the intent of this section to claim rights or contest
 your rights to work written entirely by you; rather, the intent is to
 exercise the right to control the distribution of derivative or
-collective works based on the Library.
+collective works based on the Program.
 
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
 a storage or distribution medium does not bring the other work under
 the scope of this License.
 
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also compile or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    c) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    d) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the source code distributed need not include anything that is normally
-distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
 
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
 signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
+distribute the Program or its derivative works.  These actions are
 prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
 all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
+the Program or works based on it.
 
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties to
 this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
+
+  7. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
 excuse you from the conditions of this License.  If you cannot
 distribute so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
 all those who receive copies directly or indirectly through you, then
 the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
+refrain entirely from distribution of the Program.
 
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
 
 It is not the purpose of this section to induce you to infringe any
 patents or other property right claims or to contest validity of any
 such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
+integrity of the free software distribution system, which is
 implemented by public license practices.  Many people have made
 generous contributions to the wide range of software distributed
 through that system in reliance on consistent application of that
@@ -386,103 +225,116 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Library General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
 
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
 
 			    NO WARRANTY
 
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
 
-     Appendix: How to Apply These Terms to Your New Libraries
+	    How to Apply These Terms to Your New Programs
 
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
 
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
 
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
 
-    This library is distributed in the hope that it will be useful,
+    This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
 You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
+school, if any, to sign a "copyright disclaimer" for the program, if
 necessary.  Here is a sample; alter the names:
 
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
 
-  <signature of Ty Coon>, 1 April 1990
+  <signature of Ty Coon>, 1 April 1989
   Ty Coon, President of Vice
 
-That's all there is to it!
-
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/README b/README
index 0bde18b..a561013 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-DOXYGEN Version 1.1.1-20000326
+DOXYGEN Version 1.1.1-20000402
 
 Please read INSTALL for compilation instructions.
 
@@ -7,4 +7,4 @@ The latest version of doxygen can be obtained at
 
 Enjoy,
 
-Dimitri van Heesch (26 March 2000)
+Dimitri van Heesch (02 April 2000)
diff --git a/VERSION b/VERSION
index 37331ef..9d6b723 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.1-20000326
+1.1.1-20000402
diff --git a/configure b/configure
index 53b4cf5..88e6631 100755
--- a/configure
+++ b/configure
@@ -2,7 +2,7 @@
 #
 # $Id$
 #
-# Copyright (C) 1997-1999 by Dimitri van Heesch.
+# Copyright (C) 1997-2000 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 
@@ -10,7 +10,8 @@
 # for any purpose. It is provided "as is" without express or implied warranty.
 # See the GNU General Public License for more details.
 # 
-# All output generated with Doxygen is not covered by this license.
+# Documents produced by Doxygen are derivative works derived from the
+# input used in their production; they are not affected by this license.
 # 
 # shell script to configure doxygen
 
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 292db32..ecd986a 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -9,7 +9,8 @@
 # for any purpose. It is provided "as is" without express or implied warranty.
 # See the GNU General Public License for more details.
 #
-# All output generated with Doxygen is not covered by this license.
+# Documents produced by Doxygen are derivative works derived from the
+# input used in their production; they are not affected by this license.
 
 PROJECT_NAME      = 
 OUTPUT_DIRECTORY  = ..
diff --git a/doc/Makefile.in b/doc/Makefile.in
index fe1d9d2..eca81ee 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -9,7 +9,8 @@
 # for any purpose. It is provided "as is" without express or implied warranty.
 # See the GNU General Public License for more details.
 #
-# All output generated with Doxygen is not covered by this license.
+# Documents produced by Doxygen are derivative works derived from the
+# input used in their production; they are not affected by this license.
 
 all: FORCE
 	DOXYGEN_DOCDIR=$(DOXYDOCS); \
diff --git a/doc/Makefile.latex b/doc/Makefile.latex
index 3c31b09..63b77b4 100644
--- a/doc/Makefile.latex
+++ b/doc/Makefile.latex
@@ -9,7 +9,8 @@
 # for any purpose. It is provided "as is" without express or implied warranty.
 # See the GNU General Public License for more details.
 #
-# All output generated with Doxygen is not covered by this license.
+# Documents produced by Doxygen are derivative works derived from the
+# input used in their production; they are not affected by this license.
 
 all: doxygen_manual.pdf
 
diff --git a/doc/Makefile.win.in b/doc/Makefile.win.in
index c9611eb..fffaad7 100644
--- a/doc/Makefile.win.in
+++ b/doc/Makefile.win.in
@@ -9,7 +9,8 @@
 # for any purpose. It is provided "as is" without express or implied warranty.
 # See the GNU General Public License for more details.
 #
-# All output generated with Doxygen is not covered by this license.
+# Documents produced by Doxygen are derivative works derived from the
+# input used in their production; they are not affected by this license.
 
 all: FORCE
 	set DOXYGEN_DOCDIR=file:///$(DOXYGEN)
diff --git a/doc/autolink.doc b/doc/autolink.doc
index 930e95b..50214a7 100644
--- a/doc/autolink.doc
+++ b/doc/autolink.doc
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 /*! \page autolink Automatic link generation
diff --git a/doc/commands.doc b/doc/commands.doc
index cdbd4a5..87af4ba 100644
--- a/doc/commands.doc
+++ b/doc/commands.doc
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 /*! \page commands
diff --git a/doc/config.doc b/doc/config.doc
index bfbd062..188d14a 100644
--- a/doc/config.doc
+++ b/doc/config.doc
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 /*! \page config
diff --git a/doc/doxygen.sty b/doc/doxygen.sty
index c0769ec..2aa736d 100644
--- a/doc/doxygen.sty
+++ b/doc/doxygen.sty
@@ -9,7 +9,8 @@
 % for any purpose. It is provided "as is" without express or implied warranty.
 % See the GNU General Public License for more details.
 %
-% All output generated with Doxygen is not covered by this license.
+% Documents produced by Doxygen are derivative works derived from the
+% input used in their production; they are not affected by this license.
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{doxygen}
diff --git a/doc/doxygen_manual.tex b/doc/doxygen_manual.tex
index bce9b76..7f8531a 100644
--- a/doc/doxygen_manual.tex
+++ b/doc/doxygen_manual.tex
@@ -9,7 +9,8 @@
 % for any purpose. It is provided "as is" without express or implied warranty.
 % See the GNU General Public License for more details.
 %
-% All output generated with Doxygen is not covered by this license.
+% Documents produced by Doxygen are derivative works derived from the
+% input used in their production; they are not affected by this license.
 
 \documentclass[a4paper,ps2pdf]{article}
 \usepackage{a4wide}
diff --git a/doc/doxygen_usage.doc b/doc/doxygen_usage.doc
index 12baef5..f781000 100644
--- a/doc/doxygen_usage.doc
+++ b/doc/doxygen_usage.doc
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 /*! \page doxygen_usage Doxygen usage
diff --git a/doc/doxysearch_usage.doc b/doc/doxysearch_usage.doc
index 1aadceb..a74d176 100644
--- a/doc/doxysearch_usage.doc
+++ b/doc/doxysearch_usage.doc
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 /*! \page doxysearch_usage Doxysearch usage
diff --git a/doc/doxytag_usage.doc b/doc/doxytag_usage.doc
index d90611e..c6f0e3c 100644
--- a/doc/doxytag_usage.doc
+++ b/doc/doxytag_usage.doc
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 /*! \page doxytag_usage Doxytag usage
diff --git a/doc/faq.doc b/doc/faq.doc
index 0dae9e5..86389cf 100644
--- a/doc/faq.doc
+++ b/doc/faq.doc
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 /*! \page faq Frequently Asked Questions
diff --git a/doc/features.doc b/doc/features.doc
index 8363174..cf3f56a 100644
--- a/doc/features.doc
+++ b/doc/features.doc
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 /*! \page features.html
diff --git a/doc/history.doc b/doc/history.doc
index 9092b97..ed88fe2 100644
--- a/doc/history.doc
+++ b/doc/history.doc
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/doc/htmlcmds.doc b/doc/htmlcmds.doc
index 8b8b1c3..8d25c6b 100644
--- a/doc/htmlcmds.doc
+++ b/doc/htmlcmds.doc
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 /*! \page htmlcmds HTML Commands
@@ -71,9 +72,9 @@ documentation. Note that all attributes of a HTML tag are ignored
 <li>\c </SMALL> ends a \c <SMALL> section.
 <li>\c <STRONG> starts a section of bold text.
 <li>\c </STRONG> ends a section of bold text.
-<li>\c <SUB>   Starts a piece of text displayed in superscript.
+<li>\c <SUB>   Starts a piece of text displayed in subscript.
 <li>\c </SUB>  Ends a \c <SUB> section.
-<li>\c <SUP>   Starts a piece of text displayed in subscript.
+<li>\c <SUP>   Starts a piece of text displayed in superscript.
 <li>\c </SUP>  Ends a \c </SUP> section.
 <li>\c <TABLE> starts a table, the available space of a page is always 
                divided equally amount the columns. 
diff --git a/doc/index.doc b/doc/index.doc
index b47ab4a..6c1a0ce 100644
--- a/doc/index.doc
+++ b/doc/index.doc
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 /*! \page index 
@@ -42,7 +43,8 @@ It is hereby explicitly allowed that this program may be linked against
 <a href="http://www.troll.no/qt">Troll Tech's Qt library</a>, 
 and distributed, without the GPL applying to Qt.
 <p>
-All output generated by Doxygen is not covered by this license.
+Documents produced by Doxygen are derivative works derived from the
+input used in their production; they are not affected by this license.
 
 <h2>Introduction</h2>
 Doxygen is a documentation system for C, C++ and IDL. It can generate an 
diff --git a/doc/install.doc b/doc/install.doc
index 9fc0fef..2bf254b 100644
--- a/doc/install.doc
+++ b/doc/install.doc
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 /*! \page install Installation
diff --git a/doc/installdox_usage.doc b/doc/installdox_usage.doc
index b3ea7d8..a344b53 100644
--- a/doc/installdox_usage.doc
+++ b/doc/installdox_usage.doc
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 /*! \page installdox_usage Installdox usage
diff --git a/doc/language.doc b/doc/language.doc
index 4842b68..fc3e481 100644
--- a/doc/language.doc
+++ b/doc/language.doc
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 /*! \page langhowto Internationalization
diff --git a/doc/output.doc b/doc/output.doc
index 6dee1fc..48d282f 100644
--- a/doc/output.doc
+++ b/doc/output.doc
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 /*! \page output.html
diff --git a/doc/starting.doc b/doc/starting.doc
index 07dc47b..7441da8 100644
--- a/doc/starting.doc
+++ b/doc/starting.doc
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 /*! \page starting Getting started
@@ -556,7 +557,7 @@ Go to the <a href="diagrams.html">next</a> section or return to the
        edge of the arrow is labled with the variable(s) responsible for the
        relation.
        Class \c A uses class \c B, if class \c A has a member variable \c m 
-       of type C, where B is a subtype of C (e.g. C could be \c B, \c B*, \c T<B>* ). 
+       of type C, where B is a subtype of C (e.g. C could be \c B, \c B*, <code>T\<B\>*</code> ). 
   </ul>
 
 The reason why classes or structs are sometimes hidden is too prevent images
diff --git a/doc/todo.doc b/doc/todo.doc
index c58358f..7003ca0 100644
--- a/doc/todo.doc
+++ b/doc/todo.doc
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/doc/trouble.doc b/doc/trouble.doc
index b8e95f1..a69aba0 100644
--- a/doc/trouble.doc
+++ b/doc/trouble.doc
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 /*! \page trouble Troubleshooting
@@ -56,6 +57,9 @@
     improvements not everthing can be properly linked to the corresponding
     documentation, because of possible ambiguities or lack of
     information about the context in which the code fragment is found.  
+<li>It is not possible to insert a non-member function f in a class A 
+    using the \relates command, if class A already has a member with name f
+    and the same argument list.
 </ul>
 
 
diff --git a/examples/author.cpp b/examples/author.cpp
index ce1c58c..59cc7ab 100644
--- a/examples/author.cpp
+++ b/examples/author.cpp
@@ -1,8 +1,8 @@
 /*! \class WindowsNT
  *  \brief Windows Nice Try.
  *  \author Bill Gates
- *  \author Several hundred furry animals gathered in a cave and grooving
- *          with a pit.
+ *  \author Several species of small furry animals gathered together 
+ *          in a cave and grooving with a pict.
  *  \version 4.0
  *  \date    1996-1998
  *  \bug It crashes a lot and requires huge amounts of memory.
diff --git a/examples/define.h b/examples/define.h
index 393010e..68d2453 100644
--- a/examples/define.h
+++ b/examples/define.h
@@ -4,7 +4,14 @@
     This is to test the documentation of defines.
 */
 
+/*!
+  \def MAX(x,y)
+  Computes the maximum of \a x and \a y.
+*/
+
 /*! 
-   The define ABS computes the absolute value of its argument \a x.
+   Computes the absolute value of its argument \a x.
 */
 #define ABS(x) (((x)>0)?(x):-(x))
+#define MAX(x,y) ((x)>(y)?(x):(y))
+#define MIN(x,y) ((x)>(y)?(y):(x)) /*!< Computes the minimum of \a x and \a y. */
diff --git a/packages/rpm/doxygen.spec b/packages/rpm/doxygen.spec
index 50f033e..327d6e4 100644
--- a/packages/rpm/doxygen.spec
+++ b/packages/rpm/doxygen.spec
@@ -1,5 +1,5 @@
 Name: doxygen
-Version: 1.1.1-20000326
+Version: 1.1.1-20000402
 Summary: documentation system for C, C++ and IDL
 Release: 1
 Source0: doxygen-%{version}.src.tar.gz
diff --git a/src/Makefile.in b/src/Makefile.in
index 4792667..0d19f57 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -10,7 +10,8 @@
 # for any purpose. It is provided "as is" without express or implied warranty.
 # See the GNU General Public License for more details.
 # 
-# All output generated with Doxygen is not covered by this license.
+# Documents produced by Doxygen are derivative works derived from the
+# input used in their production; they are not affected by this license.
 # 
 
 all: Makefile.doxygen Makefile.doxytag Makefile.doxysearch Makefile
diff --git a/src/classdef.cpp b/src/classdef.cpp
index 55cc8a0..3b73672 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
@@ -105,7 +106,8 @@ void ClassDef::insertBaseClass(ClassDef *cd,Protection p,
                                Specifier s,const char *t)
 {
   //printf("*** insert base class %s into %s\n",cd->name().data(),name().data());
-  inherits->inSort(new BaseClassDef(cd,p,s,t));
+  //inherits->inSort(new BaseClassDef(cd,p,s,t));
+  inherits->append(new BaseClassDef(cd,p,s,t));
 }
 
 // inserts a super class in the inherited list
@@ -143,21 +145,18 @@ void ClassDef::insertMember(MemberDef *md,int groupId)
   //printf("adding %s::%s\n",name().data(),md->name().data());
   if (!isReference())
   {
-    /*************************************************/
-    /* insert member in the appropriate member group */
-    /*************************************************/
-    addMemberToGroup(md,groupId);
-    
     /********************************************/
     /* insert member in the declaration section */
     /********************************************/
     if (md->isRelated() && (Config::extractPrivateFlag || md->protection()!=Private))
     {
       related.append(md);
+      md->setSectionList(&related);
     }
     else if (md->isFriend())
     {
       friends.append(md);
+      md->setSectionList(&friends);
     }
     else
     {
@@ -165,18 +164,22 @@ void ClassDef::insertMember(MemberDef *md,int groupId)
       {
         case MemberDef::Signal:
           signals.append(md);
+          md->setSectionList(&signals);
           break;
         case MemberDef::Slot:
           switch (md->protection())
           {
             case Protected: 
               proSlots.append(md); 
+              md->setSectionList(&proSlots);
               break;
             case Public:    
               pubSlots.append(md); 
+              md->setSectionList(&pubSlots);
               break;
             case Private:   
               priSlots.append(md);
+              md->setSectionList(&priSlots);
               break;
           }
           break;
@@ -189,12 +192,15 @@ void ClassDef::insertMember(MemberDef *md,int groupId)
               {
                 case Protected: 
                   proStaticAttribs.append(md); 
+                  md->setSectionList(&proStaticAttribs);
                   break;
                 case Public:    
                   pubStaticAttribs.append(md); 
+                  md->setSectionList(&pubStaticAttribs);
                   break;
                 case Private:   
                   priStaticAttribs.append(md); 
+                  md->setSectionList(&priStaticAttribs);
                   break;
               }
             }
@@ -204,12 +210,15 @@ void ClassDef::insertMember(MemberDef *md,int groupId)
               {
                 case Protected: 
                   proStaticMembers.append(md); 
+                  md->setSectionList(&proStaticMembers);
                   break;
                 case Public:    
                   pubStaticMembers.append(md); 
+                  md->setSectionList(&pubStaticMembers);
                   break;
                 case Private:   
                   priStaticMembers.append(md); 
+                  md->setSectionList(&priStaticMembers);
                   break;
               }
             }
@@ -220,27 +229,54 @@ void ClassDef::insertMember(MemberDef *md,int groupId)
             {
               switch (md->protection())
               {
-                case Protected: proAttribs.append(md); break;
-                case Public:    pubAttribs.append(md); break;
-                case Private:   priAttribs.append(md); break;
+                case Protected: 
+                  proAttribs.append(md); 
+                  md->setSectionList(&proAttribs);
+                  break;
+                case Public:    
+                  pubAttribs.append(md); 
+                  md->setSectionList(&pubAttribs);
+                  break;
+                case Private:   
+                  priAttribs.append(md); 
+                  md->setSectionList(&priAttribs);
+                  break;
               }
             }
             else if (md->isTypedef() || md->isEnumerate())
             {
               switch (md->protection())
               {
-                case Protected: proTypes.append(md); break;
-                case Public:    pubTypes.append(md); break;
-                case Private:   priTypes.append(md); break;
+                case Protected: 
+                  proTypes.append(md); 
+                  md->setSectionList(&proTypes); 
+                  break;
+                case Public:    
+                  pubTypes.append(md); 
+                  md->setSectionList(&pubTypes); 
+                  break;
+                case Private:   
+                  priTypes.append(md); 
+                  md->setSectionList(&priTypes); 
+                  break;
               }
             }
             else // member function
             {
               switch (md->protection())
               {
-                case Protected: proMembers.append(md); break;
-                case Public:    pubMembers.append(md); break;
-                case Private:   priMembers.append(md); break;
+                case Protected: 
+                  proMembers.append(md); 
+                  md->setSectionList(&proMembers); 
+                  break;
+                case Public:    
+                  pubMembers.append(md); 
+                  md->setSectionList(&pubMembers); 
+                  break;
+                case Private:   
+                  priMembers.append(md); 
+                  md->setSectionList(&priMembers); 
+                  break;
               }
             }
           }
@@ -345,6 +381,14 @@ void ClassDef::insertMember(MemberDef *md,int groupId)
           break; 
       }
     }
+
+    /*************************************************/
+    /* insert member in the appropriate member group */
+    /*************************************************/
+    // Note: this must be done AFTER inserting the member in the 
+    // regular groups
+    addMemberToGroup(md,groupId);
+    
   }
 
   MemberInfo *mi = new MemberInfo((MemberDef *)md,Public,Normal);
@@ -408,12 +452,6 @@ void ClassDef::computeAnchors()
   setAnchors('s',&pubTypes);
   setAnchors('t',&proTypes);
   setAnchors('u',&priTypes);
-  //MemberGroupListIterator mgli(*memberGroupList);
-  //MemberGroup *mg;
-  //for (;(mg=mgli.current());++mgli)
-  //{
-  //  mg->setAnchors();
-  //}
 }
 
 // add a file name to the used files set
@@ -687,7 +725,14 @@ void ClassDef::writeDocumentation(OutputList &ol)
   MemberGroup *mg;
   for (;(mg=mgli.current());++mgli)
   {
-    mg->writeDeclarations(ol,this,0,0,0);
+    if (!mg->allMembersInSameSection()) // group is in its own section
+    {
+      mg->writeDeclarations(ol,this,0,0,0);
+    }
+    else // add this group to the corresponding member section
+    {
+      mg->addToDeclarationSection();
+    }
   }
 
   // non static public members
diff --git a/src/classdef.h b/src/classdef.h
index e3c8da9..817d50c 100644
--- a/src/classdef.h
+++ b/src/classdef.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/classlist.cpp b/src/classlist.cpp
index 8623347..527fa58 100644
--- a/src/classlist.cpp
+++ b/src/classlist.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
@@ -30,13 +31,12 @@ int ClassList::compareItems(GCI item1, GCI item2)
 {
   ClassDef *c1=(ClassDef *)item1;
   ClassDef *c2=(ClassDef *)item2;
- 
   //int prefixLength = Config::ignorePrefix.length();
   //int i1 = c1->name().left(prefixLength)==Config::ignorePrefix ? prefixLength : 0;
   //int i2 = c2->name().left(prefixLength)==Config::ignorePrefix ? prefixLength : 0;
   return stricmp(c1->name().data()+getPrefixIndex(c1->name()),
-                    c2->name().data()+getPrefixIndex(c2->name())
-                   );
+                 c2->name().data()+getPrefixIndex(c2->name())
+                );
 }
 
 ClassListIterator::ClassListIterator(const ClassList &cllist) :
diff --git a/src/classlist.h b/src/classlist.h
index 2e52083..332eeec 100644
--- a/src/classlist.h
+++ b/src/classlist.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/code.h b/src/code.h
index 00de326..2f98ab8 100644
--- a/src/code.h
+++ b/src/code.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/code.l b/src/code.l
index 82d1d1c..c0df738 100644
--- a/src/code.l
+++ b/src/code.l
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/config.h b/src/config.h
index 4cd77dc..a18fce0 100644
--- a/src/config.h
+++ b/src/config.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/config.l b/src/config.l
index 549450a..01cb527 100644
--- a/src/config.l
+++ b/src/config.l
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/constexp.h b/src/constexp.h
index c7be36d..f31e19d 100644
--- a/src/constexp.h
+++ b/src/constexp.h
@@ -11,7 +11,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/constexp.l b/src/constexp.l
index d69dc08..f73e293 100644
--- a/src/constexp.l
+++ b/src/constexp.l
@@ -11,7 +11,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/constexp.y b/src/constexp.y
index 6de51f6..f4306fb 100644
--- a/src/constexp.y
+++ b/src/constexp.y
@@ -11,7 +11,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/cppvalue.cpp b/src/cppvalue.cpp
index 7f0a5d9..25b94b4 100644
--- a/src/cppvalue.cpp
+++ b/src/cppvalue.cpp
@@ -11,7 +11,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/cppvalue.h b/src/cppvalue.h
index 0818f7e..32e0566 100644
--- a/src/cppvalue.h
+++ b/src/cppvalue.h
@@ -11,7 +11,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/debug.cpp b/src/debug.cpp
index ecad34e..5398991 100644
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/debug.h b/src/debug.h
index 4f90eaa..ce280df 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -11,7 +11,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/declinfo.h b/src/declinfo.h
index 6d89545..6cf6096 100644
--- a/src/declinfo.h
+++ b/src/declinfo.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/declinfo.l b/src/declinfo.l
index a964bf9..555cb0f 100644
--- a/src/declinfo.l
+++ b/src/declinfo.l
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/defargs.h b/src/defargs.h
index da37150..1678797 100644
--- a/src/defargs.h
+++ b/src/defargs.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/defargs.l b/src/defargs.l
index 76d1d97..5ff1fcb 100644
--- a/src/defargs.l
+++ b/src/defargs.l
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/define.cpp b/src/define.cpp
index 464c0c3..ea8d8e3 100644
--- a/src/define.cpp
+++ b/src/define.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/define.h b/src/define.h
index a2e858d..09e0140 100644
--- a/src/define.h
+++ b/src/define.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/definition.cpp b/src/definition.cpp
index 02bb2f1..b6c3bd4 100644
--- a/src/definition.cpp
+++ b/src/definition.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/definition.h b/src/definition.h
index 2b802c8..42213fd 100644
--- a/src/definition.h
+++ b/src/definition.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/diagram.cpp b/src/diagram.cpp
index 2763a28..22b2f5e 100644
--- a/src/diagram.cpp
+++ b/src/diagram.cpp
@@ -11,7 +11,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
@@ -261,7 +262,7 @@ void DiagramRow::insertClass(DiagramItem *parent,ClassDef *cd,bool doBases,
       row=diagram->at(level+1);
     }
     /* insert base classes in the next row */
-    BaseClassDef *bcd=bcl->last();
+    BaseClassDef *bcd=bcl->first();
     while (bcd)
     {
       ClassDef *ccd=bcd->classDef;
@@ -271,7 +272,7 @@ void DiagramRow::insertClass(DiagramItem *parent,ClassDef *cd,bool doBases,
             doBases?bcd->virt:Normal,
             doBases?bcd->templSpecifiers.data():"");
       }
-      bcd=bcl->prev();
+      bcd=bcl->next();
     }
   }
 }
diff --git a/src/diagram.h b/src/diagram.h
index 6959911..2557065 100644
--- a/src/diagram.h
+++ b/src/diagram.h
@@ -11,7 +11,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/dot.cpp b/src/dot.cpp
index ffa6918..3c59fd6 100644
--- a/src/dot.cpp
+++ b/src/dot.cpp
@@ -11,7 +11,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
@@ -204,7 +205,7 @@ void DotNode::addChild(DotNode *n,
     m_edgeInfo = new QList<EdgeInfo>;
     m_edgeInfo->setAutoDelete(TRUE);
   }
-  m_children->insert(0,n);
+  m_children->append(n);
   EdgeInfo *ei = new EdgeInfo;
   ei->m_color = edgeColor;
   ei->m_style = edgeStyle; 
@@ -214,7 +215,7 @@ void DotNode::addChild(DotNode *n,
     ei->m_labColor=edgeColor;
   else
     ei->m_labColor=edgeLabCol;
-  m_edgeInfo->insert(0,ei);
+  m_edgeInfo->append(ei);
 }
 
 void DotNode::addParent(DotNode *n)
@@ -610,7 +611,7 @@ DotGfxHierarchyTable::DotGfxHierarchyTable()
   initClassHierarchy(&classList);
   ClassListIterator cli(classList);
   ClassDef *cd;
-  for (cli.toFirst();(cd=cli.current());++cli)
+  for (cli.toLast();(cd=cli.current());--cli)
   {
     //printf("Trying %s superClasses=%d\n",cd->name().data(),cd->superClasses()->count());
     if (!hasVisibleRoot(cd->baseClasses()))
diff --git a/src/dot.h b/src/dot.h
index d2ba25b..97ba7a0 100644
--- a/src/dot.h
+++ b/src/dot.h
@@ -11,7 +11,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 8060e93..d53f327 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -11,7 +11,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
@@ -370,43 +371,6 @@ static void addIncludeFile(ClassDef *cd,FileDef *ifd,Entry *root)
   }
 }
 
-/*! Input is a scopeName, output is the scopename split into a
- *  namespace part (as large as possible) and a classname part.
- */
-static void extractNamespaceName(const QCString &scopeName,
-                          QCString &className,QCString &namespaceName)
-{
-  QCString clName=scopeName.copy();
-  QCString nsName;
-  if (!clName.isEmpty() && namespaceDict[clName] && getClass(clName)==0)
-  { // the whole name is a namespace (and not a class)
-    namespaceName=clName.copy();
-    className.resize(0);
-    //printf("extractNamespace `%s' => `%s|%s'\n",scopeName.data(),
-    //     className.data(),namespaceName.data());
-    return;
-  }
-  int i,p=clName.length()-2;
-  while (p>=0 && (i=clName.findRev("::",p))!=-1) 
-    // see if the first part is a namespace (and not a class)
-  {
-    if (i>0 && namespaceDict[clName.left(i)] && getClass(clName.left(i))==0)
-    {
-      namespaceName=clName.left(i);
-      className=clName.right(clName.length()-i-2);
-      //printf("extractNamespace `%s' => `%s|%s'\n",scopeName.data(),
-      //   className.data(),namespaceName.data());
-      return;
-    } 
-    p=i-2; // try a smaller piece of the scope
-  }
-  className=scopeName.copy();
-  namespaceName.resize(0);
-  //printf("extractNamespace `%s' => `%s|%s'\n",scopeName.data(),
-  //       className.data(),namespaceName.data());
-  return;
-}
-
 static bool addNamespace(Entry *root,ClassDef *cd)
 {
   // see if this class is defined inside a namespace
@@ -1837,6 +1801,7 @@ static bool findBaseClassRelation(Entry *root,ClassDef *cd,
           // the undocumented base was found in this file
           baseClass->insertUsedFile(root->fileName);
           // add class to the list
+          //classList.inSort(baseClass);
           classList.inSort(baseClass);
           //printf("ClassDict.insert(%s)\n",resolveDefines(fullName).data());
           //classDict.insert(resolveDefines(bi->name),baseClass);
diff --git a/src/doxygen.h b/src/doxygen.h
index 52f4995..aa8f4b4 100644
--- a/src/doxygen.h
+++ b/src/doxygen.h
@@ -11,7 +11,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/doxygen.pro.in b/src/doxygen.pro.in
index e00f871..eda5885 100644
--- a/src/doxygen.pro.in
+++ b/src/doxygen.pro.in
@@ -9,7 +9,8 @@
 # for any purpose. It is provided "as is" without express or implied warranty.
 # See the GNU General Public License for more details.
 #
-# All output generated with Doxygen is not covered by this license.
+# Documents produced by Doxygen are derivative works derived from the
+# input used in their production; they are not affected by this license.
 #
 # TMake project file for doxygen
 
diff --git a/src/doxygen.t b/src/doxygen.t
index 3f688bf..3cff9b1 100644
--- a/src/doxygen.t
+++ b/src/doxygen.t
@@ -9,7 +9,8 @@
 # for any purpose. It is provided "as is" without express or implied warranty.
 # See the GNU General Public License for more details.
 #
-# All output generated with Doxygen is not covered by this license.
+# Documents produced by Doxygen are derivative works derived from the
+# input used in their production; they are not affected by this license.
 #!
 #! doxygen.t: This is a custom template for building Doxygen
 #!
diff --git a/src/doxysearch.cpp b/src/doxysearch.cpp
index 57d4093..1dbad7e 100644
--- a/src/doxysearch.cpp
+++ b/src/doxysearch.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/doxysearch.pro.in b/src/doxysearch.pro.in
index 198a381..17c90e7 100644
--- a/src/doxysearch.pro.in
+++ b/src/doxysearch.pro.in
@@ -9,7 +9,8 @@
 # for any purpose. It is provided "as is" without express or implied warranty.
 # See the GNU General Public License for more details.
 #
-# All output generated with Doxygen is not covered by this license.
+# Documents produced by Doxygen are derivative works derived from the
+# input used in their production; they are not affected by this license.
 
 TEMPLATE     =  app.t
 CONFIG       =	console warn_on $extraopts
diff --git a/src/doxytag.l b/src/doxytag.l
index 8d28150..76772a7 100644
--- a/src/doxytag.l
+++ b/src/doxytag.l
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/doxytag.pro.in b/src/doxytag.pro.in
index c2a1b67..1032443 100644
--- a/src/doxytag.pro.in
+++ b/src/doxytag.pro.in
@@ -9,7 +9,8 @@
 # for any purpose. It is provided "as is" without express or implied warranty.
 # See the GNU General Public License for more details.
 #
-# All output generated with Doxygen is not covered by this license.
+# Documents produced by Doxygen are derivative works derived from the
+# input used in their production; they are not affected by this license.
 #
 # TMake project file for doxytag
 
diff --git a/src/doxytag.t b/src/doxytag.t
index f507616..b56e0a1 100644
--- a/src/doxytag.t
+++ b/src/doxytag.t
@@ -9,7 +9,8 @@
 # for any purpose. It is provided "as is" without express or implied warranty.
 # See the GNU General Public License for more details.
 #
-# All output generated with Doxygen is not covered by this license.
+# Documents produced by Doxygen are derivative works derived from the
+# input used in their production; they are not affected by this license.
 #
 #!
 #! doxytag.t: This is a custom template for building Doxytag
diff --git a/src/entry.cpp b/src/entry.cpp
index 7012339..2b4f4ce 100644
--- a/src/entry.cpp
+++ b/src/entry.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/entry.h b/src/entry.h
index 3514e85..4adc374 100644
--- a/src/entry.h
+++ b/src/entry.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/example.h b/src/example.h
index d0f8a4b..d531978 100644
--- a/src/example.h
+++ b/src/example.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/filedef.cpp b/src/filedef.cpp
index af98024..d5c5d4e 100644
--- a/src/filedef.cpp
+++ b/src/filedef.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/filedef.h b/src/filedef.h
index 5a48afc..03ef921 100644
--- a/src/filedef.h
+++ b/src/filedef.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/filename.cpp b/src/filename.cpp
index 5aa2b04..69646ec 100644
--- a/src/filename.cpp
+++ b/src/filename.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/filename.h b/src/filename.h
index cb4f207..aefacb9 100644
--- a/src/filename.h
+++ b/src/filename.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/formula.cpp b/src/formula.cpp
index cffb87c..4cd5644 100644
--- a/src/formula.cpp
+++ b/src/formula.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/formula.h b/src/formula.h
index dccf36b..a17f279 100644
--- a/src/formula.h
+++ b/src/formula.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/gifenc.cpp b/src/gifenc.cpp
index 74d800e..458d050 100644
--- a/src/gifenc.cpp
+++ b/src/gifenc.cpp
@@ -11,7 +11,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  * The GIF compression code below is based on the file ppmtogif.c of the
  * netpbm package. The original copyright message follows:
diff --git a/src/gifenc.h b/src/gifenc.h
index a4d9c3d..0aff24e 100644
--- a/src/gifenc.h
+++ b/src/gifenc.h
@@ -11,7 +11,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/groupdef.cpp b/src/groupdef.cpp
index 6c355a4..44a7639 100644
--- a/src/groupdef.cpp
+++ b/src/groupdef.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/groupdef.h b/src/groupdef.h
index 647b10f..f35536a 100644
--- a/src/groupdef.h
+++ b/src/groupdef.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index 5f8863d..408c1d7 100644
--- a/src/htmlgen.cpp
+++ b/src/htmlgen.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
@@ -199,14 +200,14 @@ void HtmlGenerator::writeStyleInfo(int part)
       t << "A.elRef { font-weight: bold }" << endl;
       t << "A.code { text-decoration: none; font-weight: normal; color: #4444ee }" << endl;
       t << "A.codeRef { font-weight: normal; color: #4444ee }" << endl;
-      t << "A.gl:link { color: #ffffff }" << endl;
-      t << "A.gl:visited { color: #ffffff }" << endl;
-      t << "A.gl { text-decoration: none; font-weight: bold; background-color: " << GROUP_COLOR << " }" << endl;
       t << "DL.el { margin-left: -1cm }" << endl;
       t << "DIV.fragment { width: 100%; border: none; background-color: #eeeeee }" << endl;
       t << "DIV.in { margin-left: 16 }" << endl;
       t << "DIV.ah { background-color: black; margin-bottom: 3; margin-top: 3 }" << endl;
       t << "TD.md { background-color: #f2f2ff }" << endl;
+      t << "DIV.groupHeader { margin-left: 16; margin-top: 12; margin-bottom: 6; font-weight: bold }" << endl;
+      t << "DIV.groupText { margin-left: 16; font-style: italic; font-size: smaller }" << endl;
+      //t << "TD.groupLine { background-color: #3080ff }" << endl;
       t << endl;
       endPlainFile();
     }
@@ -791,3 +792,51 @@ void HtmlGenerator::writeGraphicalHierarchy(DotGfxHierarchyTable &g)
 {
   g.writeGraph(t,Config::htmlOutputDir);
 }
+
+void HtmlGenerator::startMemberGroupHeader()
+{
+  //t << "<tr><td colspan=2><img src=\"null.gif\" height=8></td></tr>" << endl;
+  //t << "<tr><td colspan=2>" << endl;
+  //t << "  <div class=\"in\">" << endl;
+  //t << "    <table border=0 cellspacing=0 cellpadding=0>" << endl;
+  //t << "      <tr><td colspan=3 class=\"groupLine\"><img src=\"null.gif\" height=1></td></tr>" << endl;
+  //t << "      <tr>" << endl;
+  //t << "        <td class=\"groupLine\"><img src=\"null.gif\" width=1></td>" << endl;
+  //t << "        <td><div class=\"groupHeader\">&nbsp;&nbsp;";
+
+  t << "<tr><td colspan=2><div class=\"groupHeader\">";
+}
+
+void HtmlGenerator::endMemberGroupHeader()
+{
+  //t << "&nbsp;&nbsp;</div></td>" << endl;
+  //t << "        <td class=\"groupLine\"><img src=\"null.gif\" width=1></td>" << endl;
+  //t << "      </tr>" << endl;
+  //t << "      <tr><td colspan=3 class=\"groupLine\"><img src=\"null.gif\" height=1></td></tr>" << endl;
+  //t << "    </table>" << endl;
+  //t << "  </div>" << endl;
+  //t << "</tr>" << endl;
+  //t << "<tr><td colspan=2><img src=\"null.gif\" height=4></td></tr>" << endl;
+
+  t << "</div></td></tr>" << endl;
+}
+
+void HtmlGenerator::startMemberGroupDocs()
+{
+  //t << "<tr><td colspan=2><img src=\"null.gif\" height=4></td></tr>" << endl;
+  t << "<tr><td colspan=2><div class=\"groupText\">";
+}
+
+void HtmlGenerator::endMemberGroupDocs()
+{
+  t << "<br><br></div></td></tr>" << endl;
+}
+
+void HtmlGenerator::startMemberGroup()
+{
+}
+
+void HtmlGenerator::endMemberGroup(bool)
+{
+}
+
diff --git a/src/htmlgen.h b/src/htmlgen.h
index d34c712..75f5ce7 100644
--- a/src/htmlgen.h
+++ b/src/htmlgen.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
@@ -96,8 +97,14 @@ class HtmlGenerator : public OutputGenerator
     void startMemberList();
     void endMemberList();
     void startMemberItem(int);
-    //void memberGroupSpacing(bool inGroup);
-    //void memberGroupSeparator();
+
+    void startMemberGroupHeader();
+    void endMemberGroupHeader();
+    void startMemberGroupDocs();
+    void endMemberGroupDocs();
+    void startMemberGroup();
+    void endMemberGroup(bool);
+
     void insertMemberAlign();
     void endMemberItem(bool);
     void startMemberDescription();
diff --git a/src/htmlhelp.cpp b/src/htmlhelp.cpp
index 66a661b..5ff21f2 100644
--- a/src/htmlhelp.cpp
+++ b/src/htmlhelp.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  * The code is this file is largely based on a contribution from
  * Harm van der Heijden <H.v.d.Heijden@phys.tue.nl>
diff --git a/src/htmlhelp.h b/src/htmlhelp.h
index e10754a..f054735 100644
--- a/src/htmlhelp.h
+++ b/src/htmlhelp.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  * The code is this file is largely based on a contribution from
  * Harm van der Heijden <H.v.d.Heijden@phys.tue.nl>
diff --git a/src/image.cpp b/src/image.cpp
index 4b20aca..2b82bf5 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -11,7 +11,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/image.h b/src/image.h
index b78f4af..3d4b1a4 100644
--- a/src/image.h
+++ b/src/image.h
@@ -11,7 +11,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/index.cpp b/src/index.cpp
index b35d2be..62cf84d 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
@@ -689,9 +690,9 @@ void writeAlphabeticalClassList(OutputList &ol)
     if (cd->isLinkableInProject())
     {
       int index = getPrefixIndex(cd->name());
-      if (cd->name().at(index)!=startLetter) // new begin letter => new header
+      if (toupper(cd->name().at(index))!=startLetter) // new begin letter => new header
       {
-        startLetter=cd->name().at(index);
+        startLetter=toupper(cd->name().at(index));
         headerItems++;
       }
     }
@@ -722,10 +723,10 @@ void writeAlphabeticalClassList(OutputList &ol)
     if (cd->isLinkableInProject())
     {
       int index = getPrefixIndex(cd->name());
-      if (cd->name().at(index)!=startLetter)
+      if (toupper(cd->name().at(index))!=startLetter)
       {
         // insert a new header using a dummy class pointer.
-        startLetter=cd->name().at(index);
+        startLetter=toupper(cd->name().at(index));
         colList[col].append((ClassDef *)8); // insert dummy for the header
         row++;
         if ( row >= rows + ((col<itemsInLastRow) ? 0 : -1)) 
@@ -770,15 +771,34 @@ void writeAlphabeticalClassList(OutputList &ol)
         {
           //printf("head ClassDef=%p %s\n",cd,cd ? cd->name().data() : "<none>");
           int index = getPrefixIndex(cd->name());
-          startLetter=cd->name().at(index);
+          startLetter=toupper(cd->name().at(index));
           char s[2]; s[0]=startLetter; s[1]=0;
           ol.writeIndexHeading(s);
         }
       }
       else if (cd) // a real class, insert a link
       {
+        QCString cname;
+        QCString namesp;
+        extractNamespaceName(cd->name(),cname,namesp);
+
         ol.writeObjectLink(cd->getReference(),
-                           cd->getOutputFileBase(),0,cd->name());
+                           cd->getOutputFileBase(),0,cname);
+        if (!namesp.isEmpty())
+        {
+          ol.docify(" (");
+          NamespaceDef *nd = namespaceDict[namesp];
+          if (nd && nd->isLinkable())
+          {
+            ol.writeObjectLink(nd->getReference(),
+                           nd->getOutputFileBase(),0,namesp);
+          }
+          else
+          {
+            ol.docify(namesp);
+          }
+          ol.docify(")");
+        }
         ol.writeNonBreakableSpace();
         //printf("item ClassDef=%p %s\n",cd,cd ? cd->name().data() : "<none>");
         ++(*colIterators[j]);
diff --git a/src/index.h b/src/index.h
index 8c54a9b..56abdda 100644
--- a/src/index.h
+++ b/src/index.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/instdox.cpp b/src/instdox.cpp
index 3ab2137..0ef6b6e 100644
--- a/src/instdox.cpp
+++ b/src/instdox.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/instdox.h b/src/instdox.h
index fbb913a..f71c8fd 100644
--- a/src/instdox.h
+++ b/src/instdox.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/language.cpp b/src/language.cpp
index 39ace77..e29fa22 100644
--- a/src/language.cpp
+++ b/src/language.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/language.h b/src/language.h
index 8f3bb66..d38f494 100644
--- a/src/language.h
+++ b/src/language.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/latexgen.cpp b/src/latexgen.cpp
index 5edb999..a22a804 100644
--- a/src/latexgen.cpp
+++ b/src/latexgen.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
@@ -621,6 +622,12 @@ void LatexGenerator::writeStyleInfo(int part)
         t << "  }\n";
         t << "}\n";
         t << "{\\end{list}}\n";
+
+        t << "\\newenvironment{Indent}\n";
+        t << "  {\\begin{list}{}{\\setlength{\\leftmargin}{0.5cm}}\n";
+        t << "      \\item[]\\ignorespaces}\n";
+        t << "  {\\unskip\\end{list}}\n";
+        
         t << "\\setlength{\\parindent}{0cm}\n";
         t << "\\setlength{\\parskip}{0.2cm}\n";
         t << "\\addtocounter{secnumdepth}{1}\n";
@@ -1234,3 +1241,32 @@ void LatexGenerator::writeImage(const char *name,const char *w,const char *h)
     t << "," << h;
   t << "}}" << endl;
 }
+
+void LatexGenerator::startMemberGroupHeader()
+{
+  t << "\\begin{Indent}{\\bf ";
+}
+
+void LatexGenerator::endMemberGroupHeader()
+{
+  t << "}\\par" << endl;
+}
+
+void LatexGenerator::startMemberGroupDocs()
+{
+  t << "{\\em ";
+}
+
+void LatexGenerator::endMemberGroupDocs()
+{
+  t << "}";
+}
+
+void LatexGenerator::startMemberGroup()
+{
+}
+
+void LatexGenerator::endMemberGroup(bool)
+{
+  t << "\\end{Indent}" << endl;
+}
diff --git a/src/latexgen.h b/src/latexgen.h
index 364f86d..1012dea 100644
--- a/src/latexgen.h
+++ b/src/latexgen.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
@@ -93,8 +94,14 @@ class LatexGenerator : public OutputGenerator
     void endMemberList();
     void startMemberItem(int);
     void endMemberItem(bool);
-    //void memberGroupSpacing(bool) {}
-    //void memberGroupSeparator() {}
+
+    void startMemberGroupHeader();
+    void endMemberGroupHeader();
+    void startMemberGroupDocs();
+    void endMemberGroupDocs();
+    void startMemberGroup();
+    void endMemberGroup(bool);
+    
     void insertMemberAlign() {}
 
     void writeRuler() { t << endl << endl; /*t << "\\vspace{0.4cm}\\hrule\\vspace{0.2cm}" << endl; */ }
diff --git a/src/logos.cpp b/src/logos.cpp
index 50a5794..d019a92 100644
--- a/src/logos.cpp
+++ b/src/logos.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/logos.h b/src/logos.h
index f6bfd6a..5dbdf22 100644
--- a/src/logos.h
+++ b/src/logos.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/mangen.cpp b/src/mangen.cpp
index e4d155c..5b1a7d1 100644
--- a/src/mangen.cpp
+++ b/src/mangen.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
@@ -276,8 +277,8 @@ void ManGenerator::writeListItem()
 void ManGenerator::startCodeFragment() 
 { 
   newParagraph();
-  t << ".nf"; 
-  firstCol=FALSE;
+  t << ".nf" << endl; 
+  firstCol=TRUE;
   paragraph=FALSE;
 }
 
@@ -384,3 +385,33 @@ void ManGenerator::endMemberList()
   }
 }
 
+void ManGenerator::startMemberGroupHeader()
+{
+  t << "\n.PP\n.RI \"\\fB";
+}
+
+void ManGenerator::endMemberGroupHeader()
+{
+  t << "\\fR\"\n.br\n";
+  firstCol=TRUE;
+}
+
+void ManGenerator::startMemberGroupDocs()
+{
+}
+
+void ManGenerator::endMemberGroupDocs()
+{
+  t << "\n.PP";
+}
+
+void ManGenerator::startMemberGroup()
+{
+  t << "\n.in +1c";
+}
+
+void ManGenerator::endMemberGroup(bool)
+{
+  t << "\n.in -1c";
+  firstCol=FALSE;
+}
diff --git a/src/mangen.h b/src/mangen.h
index 7893d2e..f34caed 100644
--- a/src/mangen.h
+++ b/src/mangen.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
@@ -93,8 +94,14 @@ class ManGenerator : public OutputGenerator
     void endMemberList();
     void startMemberItem(int);
     void endMemberItem(bool);
-    //void memberGroupSpacing(bool) {}
-    //void memberGroupSeparator() {}
+
+    void startMemberGroupHeader();
+    void endMemberGroupHeader();
+    void startMemberGroupDocs();
+    void endMemberGroupDocs();
+    void startMemberGroup();
+    void endMemberGroup(bool);
+
     void writeRuler()    {}
     void writeAnchor(const char *) {}
     void startCodeFragment();
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index 3c9bcf6..2c1fd32 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
@@ -268,6 +269,7 @@ MemberDef::MemberDef(const char *t,const char *na,const char *a,const char *e,
   annUsed=FALSE;
   annShown=FALSE;
   indDepth=0;
+  section=0;
   docEnumValues=FALSE;
   // copy function template arguments (if any)
   if (tal)
@@ -591,7 +593,10 @@ void MemberDef::writeDeclaration(OutputList &ol,
       {
         htmlHelp->addIndexItem(cname,name(),cfname,anchor());
       }
+      ol.pushGeneratorState();
+      ol.disable(OutputGenerator::Man);
       ol.docify("\n");
+      ol.popGeneratorState();
     }
 
     //printf("member name=%s indDepth=%d\n",name().data(),indDepth);
diff --git a/src/memberdef.h b/src/memberdef.h
index 8a7d293..c4e3bd2 100644
--- a/src/memberdef.h
+++ b/src/memberdef.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
@@ -92,6 +93,7 @@ class MemberDef : public Definition
     bool isRelated() const               { return related; }
     bool isStatic() const                { return stat; }
     bool isInline() const                { return inLine; }
+    MemberList *getSectionList() const   { return section; }
     void setMemberType(MemberType t)     { mtype=t; }
     void setDefinition(const char *d)    { def=d; }
     void setDefFile(const char *f)       { defFile=f; }
@@ -106,6 +108,7 @@ class MemberDef : public Definition
                                            initLines=init.contains('\n');
                                          }
     void setMemberClass(ClassDef *cd)    { classDef=cd; }
+    void setSectionList(MemberList *sl)  { section=sl; }
     void makeRelated()                   { related=TRUE; } 
     void setGroupDef(GroupDef *gd)       { group=gd; }
     bool hasDocumentation();  // overrides hasDocumentation in definition.h
@@ -229,7 +232,8 @@ class MemberDef : public Definition
     bool annUsed;
     bool annShown;
     int  indDepth;
-    MemberDef *annMemb;
+    MemberList *section;      // declation list containing this member 
+    MemberDef  *annMemb;
     ArgumentList *argList;    // argument list of this member
     ArgumentList *tArgList;   // template argument list of function template
     ArgumentList *scopeTAL;   // template argument list of class template
diff --git a/src/membergroup.cpp b/src/membergroup.cpp
index c376632..75317d4 100644
--- a/src/membergroup.cpp
+++ b/src/membergroup.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
@@ -34,11 +35,14 @@
 
 MemberGroup::MemberGroup(int id,const char *hdr,const char *d) /* : Definition(idToName(id)) */
 {
-  memberList = new MemberList;
-  grpId      = id;
-  grpHeader  = hdr;
-  doc        = d;
-  scope      = 0;
+  memberList     = new MemberList;
+  grpId          = id;
+  grpHeader      = hdr;
+  doc            = d;
+  scope          = 0;
+  inSameSection  = TRUE;
+  inDeclSection  = 0;
+  numDeclMembers = -1;
   //printf("Member group docs=`%s'\n",doc.data());
 }
 
@@ -50,6 +54,15 @@ MemberGroup::~MemberGroup()
 void MemberGroup::insertMember(MemberDef *md)
 {
   //printf("MemberGroup::insertMember(%s)\n",md->name().data());
+  if (inSameSection && memberList->count()>0 && 
+      memberList->first()->getSectionList()!=md->getSectionList())
+  {
+    inSameSection=FALSE;
+  }
+  else if (inDeclSection==0)
+  {
+    inDeclSection = md->getSectionList();
+  }
   memberList->append(md);
 }
 
@@ -66,9 +79,30 @@ void MemberGroup::writeDeclarations(OutputList &ol,
 }
 
 void MemberGroup::writePlainDeclarations(OutputList &ol,
-               ClassDef *cd,NamespaceDef *nd,FileDef *fd,GroupDef *gd)
+               ClassDef *cd,NamespaceDef *nd,FileDef *fd,GroupDef *gd,
+               bool inGroup)
 {
   //printf("MemberGroup::writePlainDeclarations() memberList->count()=%d\n",memberList->count());
-  memberList->writePlainDeclarations(ol,cd,nd,fd,gd,TRUE);
+  memberList->writePlainDeclarations(ol,cd,nd,fd,gd,inGroup);
 }
 
+/*! Add this group as a subsection of the declaration section, instead
+ *  of rendering it in its own section
+ */
+void MemberGroup::addToDeclarationSection()
+{
+  if (inDeclSection)
+  {
+    inDeclSection->addMemberGroup(this);
+  }
+}
+
+int MemberGroup::countDecMembers()
+{
+  if (numDeclMembers==-1) /* number of member not cached */
+  {
+    memberList->countDecMembers(TRUE);
+    numDeclMembers = memberList->totalCount();
+  }
+  return numDeclMembers;
+}
diff --git a/src/membergroup.h b/src/membergroup.h
index d96db26..1b54596 100644
--- a/src/membergroup.h
+++ b/src/membergroup.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
@@ -44,18 +45,25 @@ class MemberGroup /* : public Definition */
     void insertMember(MemberDef *);
     void setAnchors();
     void writePlainDeclarations(OutputList &ol,
-               ClassDef *cd,NamespaceDef *nd,FileDef *fd,GroupDef *gd);
+               ClassDef *cd,NamespaceDef *nd,FileDef *fd,GroupDef *gd,
+               bool inGroup=TRUE);
     void writeDeclarations(OutputList &ol,
                ClassDef *cd,NamespaceDef *nd,FileDef *fd,GroupDef *gd);
     QCString documentation() { return doc; }
+    bool allMembersInSameSection() { return inSameSection; }
+    void addToDeclarationSection();
+    int countDecMembers();
 
   private: 
-    MemberList     *memberList;      // list of all members in the group
+    MemberList *memberList;      // list of all members in the group
     int grpId;
     QCString grpHeader;
-    QCString fileName;                   // base name of the generated file
+    QCString fileName;           // base name of the generated file
     Definition *scope;
     QCString doc;
+    MemberList *inDeclSection;
+    bool inSameSection;
+    int  numDeclMembers;
 };
 
 class MemberGroupList : public QList<MemberGroup>
diff --git a/src/memberlist.cpp b/src/memberlist.cpp
index 6e05bff..f997529 100644
--- a/src/memberlist.cpp
+++ b/src/memberlist.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
@@ -28,10 +29,12 @@
 
 MemberList::MemberList() : QList<MemberDef>()
 {
+  memberGroupList=0;
 }
 
 MemberList::~MemberList()
 {
+  delete memberGroupList;
 }
 
 int MemberList::compareItems(GCI item1, GCI item2)
@@ -85,6 +88,18 @@ void MemberList::countDecMembers(bool inGroup)
     }
     md=next();
   }
+  if (memberGroupList && !inGroup)
+  {
+    MemberGroupListIterator mgli(*memberGroupList);
+    MemberGroup *mg;
+    for (;(mg=mgli.current());++mgli)
+    {
+      printf("memberGroupList adding %d inGroup=%d\n",
+          mg->countDecMembers(),m_count);
+      m_count+=mg->countDecMembers();
+    }
+  }
+
   //printf("MemberList::countDecMembers(%d)=%d\n",inGroup,m_count);
 }
 
@@ -553,6 +568,31 @@ void MemberList::writeDeclarations(OutputList &ol,
   }
 
   writePlainDeclarations(ol,cd,nd,fd,gd,inGroup);
+  
+  if (memberGroupList)
+  {
+    printf("MemberList::writeDeclarations()\n");
+    MemberGroupListIterator mgli(*memberGroupList);
+    MemberGroup *mg;
+    while ((mg=mgli.current()))
+    {
+      ol.startMemberGroupHeader();
+      parseText(ol,mg->header());
+      ol.endMemberGroupHeader();
+      if (!mg->documentation().isEmpty())
+      {
+        printf("Member group has docs!\n");
+        ol.startMemberGroupDocs();
+        parseDoc(ol,0,0,mg->documentation());
+        ol.endMemberGroupDocs();
+      }
+      ol.startMemberGroup();
+      mg->writePlainDeclarations(ol,cd,nd,fd,gd);
+      ++mgli;
+      ol.endMemberGroup(mgli.current()==0);
+    }
+  }
+
 }
 
 void MemberList::writeDocumentation(OutputList &ol,
@@ -565,3 +605,13 @@ void MemberList::writeDocumentation(OutputList &ol,
     md->writeDocumentation(this,ol,scopeName);
   }
 }
+
+void MemberList::addMemberGroup(MemberGroup *mg)
+{
+  printf("MemberList::addMemberGroup(%p)\n",mg);
+  if (memberGroupList==0)
+  {
+    memberGroupList=new MemberGroupList;
+  }
+  memberGroupList->append(mg);
+}
diff --git a/src/memberlist.h b/src/memberlist.h
index b20a510..239d5f7 100644
--- a/src/memberlist.h
+++ b/src/memberlist.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
@@ -20,6 +21,8 @@
 #include <qlist.h>
 #include "memberdef.h"
 class GroupDef;
+class MemberGroup;
+class MemberGroupList;
 
 class MemberList : public QList<MemberDef> 
 { 
@@ -53,10 +56,12 @@ class MemberList : public QList<MemberDef>
                const char *title,const char *subtitle,bool inGroup=FALSE);
     void writeDocumentation(OutputList &ol,const char *scopeName
                /*,MemberDef::MemberType m*/);
+    void addMemberGroup(MemberGroup *mg);
 
   private:
     int varCnt,funcCnt,enumCnt,enumValCnt,typeCnt,protoCnt,defCnt,friendCnt; 
     int m_count;
+    MemberGroupList *memberGroupList;
 };
 
 class MemberListIterator : public QListIterator<MemberDef>
diff --git a/src/membername.cpp b/src/membername.cpp
index 39c1b8d..e62e629 100644
--- a/src/membername.cpp
+++ b/src/membername.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/membername.h b/src/membername.h
index 6a66a31..fb81a55 100644
--- a/src/membername.h
+++ b/src/membername.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/message.cpp b/src/message.cpp
index 50e8adb..838182f 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/message.h b/src/message.h
index 638fe58..e125cdd 100644
--- a/src/message.h
+++ b/src/message.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp
index d9da522..b1fb93a 100644
--- a/src/namespacedef.cpp
+++ b/src/namespacedef.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/namespacedef.h b/src/namespacedef.h
index ddf9fa8..797bf6b 100644
--- a/src/namespacedef.h
+++ b/src/namespacedef.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/outputgen.cpp b/src/outputgen.cpp
index 851a670..b765eec 100644
--- a/src/outputgen.cpp
+++ b/src/outputgen.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/outputgen.h b/src/outputgen.h
index 36e806d..a422338 100644
--- a/src/outputgen.h
+++ b/src/outputgen.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
@@ -102,8 +103,12 @@ class OutputGenerator
     virtual void endMemberList()    = 0;
     virtual void startMemberItem(int) = 0;
     virtual void endMemberItem(bool) = 0;
-    //virtual void memberGroupSpacing(bool) = 0;
-    //virtual void memberGroupSeparator() = 0;
+    virtual void startMemberGroupHeader() = 0;
+    virtual void endMemberGroupHeader() = 0;
+    virtual void startMemberGroupDocs() = 0;
+    virtual void endMemberGroupDocs() = 0;
+    virtual void startMemberGroup() = 0;
+    virtual void endMemberGroup(bool) = 0;
     virtual void insertMemberAlign() = 0;
 
     virtual void writeRuler() = 0;
diff --git a/src/outputlist.cpp b/src/outputlist.cpp
index fadc43b..5071ffa 100644
--- a/src/outputlist.cpp
+++ b/src/outputlist.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/outputlist.h b/src/outputlist.h
index 7357d9f..1dd11b2 100644
--- a/src/outputlist.h
+++ b/src/outputlist.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
@@ -163,10 +164,18 @@ class OutputList
     { forall(&OutputGenerator::startMemberItem,i1); }
     void endMemberItem(bool b2) 
     { forall(&OutputGenerator::endMemberItem,b2); }
-    //void memberGroupSpacing(bool b) 
-    //{ forall(&OutputGenerator::memberGroupSpacing,b); }
-    //void memberGroupSeparator() 
-    //{ forall(&OutputGenerator::memberGroupSeparator); }
+    void startMemberGroupHeader() 
+    { forall(&OutputGenerator::startMemberGroupHeader); }
+    void endMemberGroupHeader()
+    { forall(&OutputGenerator::endMemberGroupHeader); }
+    void startMemberGroupDocs()
+    { forall(&OutputGenerator::startMemberGroupDocs); }
+    void endMemberGroupDocs()
+    { forall(&OutputGenerator::endMemberGroupDocs); }
+    void startMemberGroup()
+    { forall(&OutputGenerator::startMemberGroup); }
+    void endMemberGroup(bool last)
+    { forall(&OutputGenerator::endMemberGroup,last); }
     void insertMemberAlign() 
     { forall(&OutputGenerator::insertMemberAlign); }
     void writeRuler() 
diff --git a/src/pre.h b/src/pre.h
index 42fddbd..8d10236 100644
--- a/src/pre.h
+++ b/src/pre.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/pre.l b/src/pre.l
index 3573062..eb49f58 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/qtbc.h b/src/qtbc.h
index d5e00f3..570bf93 100644
--- a/src/qtbc.h
+++ b/src/qtbc.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp
index a3e3ea6..f18d33d 100644
--- a/src/rtfgen.cpp
+++ b/src/rtfgen.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
@@ -129,6 +130,7 @@ const char *Rtf_Style_BodyText  = "\\s17\\sa60\\sb30\\widctlpar\\qj \\fs22\\cgri
 const char *Rtf_Style_DenseText = "\\s18\\widctlpar\\fs22\\cgrid ";
 const char *Rtf_Style_Header    = "\\s28\\widctlpar\\tqc\\tx4320\\tqr\\tx8640\\adjustright \\fs20\\cgrid ";
 const char *Rtf_Style_Footer    = "\\s29\\widctlpar\\tqc\\tx4320\\tqr\\tx8640\\qr\\adjustright \\fs20\\cgrid ";
+const char *Rtf_Style_GroupHeader = "\\s30\\li360\\sa60\\sb120\\keepn\\widctlpar\\adjustright \\b\\f1\\fs20\\cgrid ";
 const char *Rtf_Style_CodeExample[]  = 
 {
   "\\s40\\li0\\widctlpar\\adjustright \\shading1000\\cbpat8 \\f2\\fs16\\cgrid ",
@@ -256,6 +258,8 @@ void RTFGenerator::beginRTFDocument()
   t <<"{" << Rtf_Style_DenseText << "\\sbasedon0 \\snext18 DenseText;}\n";
   t <<"{" << Rtf_Style_Header << "\\sbasedon0 \\snext28 header;}\n";
   t <<"{" << Rtf_Style_Footer << "\\sbasedon0 \\snext29 footer;}\n";
+  t <<"{" << Rtf_Style_GroupHeader << "\\sbasedon0 \\snext30 GroupHeader}\n";
+
   for (i=0;i<indentLevels;i++)
   {
     t <<"{" << Rtf_Style_CodeExample[i] <<"\\sbasedon0 \\snext4" 
@@ -1164,6 +1168,7 @@ void RTFGenerator::startTitle()
 void RTFGenerator::startGroupHeader()
 {
   t <<"{\\comment startGroupHeader}" << endl;
+  newParagraph();
   t << Rtf_Style_Reset;
   t << Rtf_Style_Heading3; 
   t << endl;
@@ -1316,12 +1321,14 @@ void RTFGenerator::endDescItem()
 { 
   t << "{\\comment (endDescItem)}"    << endl;
   t << "}" << endl;
-  //newParagraph();
+  newParagraph();
 }
 
 void RTFGenerator::startMemberDescription() 
 { 
   t << "{\\comment (startMemberDescription)}"    << endl;
+  t << "{" << endl;
+  incrementIndentLevel();
   t << Rtf_Style_Reset << Rtf_CList_DepthStyle();
   startEmphasis();
 }
@@ -1330,6 +1337,9 @@ void RTFGenerator::endMemberDescription()
 { 
   t << "{\\comment (endMemberDescription)}"    << endl;
   endEmphasis();
+  newParagraph();
+  decrementIndentLevel();
+  t << "}" << endl;
 }
 
 void RTFGenerator::startDescList()     
@@ -1372,18 +1382,18 @@ void RTFGenerator::writeSection(const char *lab,const char *title,bool sub)
   if (sub)
   {
     // set style
-    t << Rtf_Style_Heading2; 
+    t << Rtf_Style_Heading3; 
     // make table of contents entry
-    t << "{\\tc\\tcl2 \\v ";
+    t << "{\\tc\\tcl3 \\v ";
     docify(title);
     t << "}" << endl;
   }
   else
   {
     // set style
-    t << Rtf_Style_Heading3; 
+    t << Rtf_Style_Heading2; 
     // make table of contents entry
-    t << "{\\tc\\tcl3  \\v ";
+    t << "{\\tc\\tcl2 \\v ";
     docify(title);
     t << "}" << endl;
   }
@@ -1518,11 +1528,13 @@ void RTFGenerator::writeFormula(const char *,const char *text)
 
 void RTFGenerator::startMemberItem(int) 
 { 
+  t <<"{\\comment startMemberItem }" << endl;
   t << Rtf_Style_Reset << Rtf_BList_DepthStyle() << endl; // set style to apropriate depth
 }
 
 void RTFGenerator::endMemberItem(bool) 
 {
+  t <<"{\\comment endMemberItem }" << endl;
   newParagraph();
 }
 
@@ -1566,6 +1578,8 @@ void RTFGenerator::writeNonBreakableSpace()
 void RTFGenerator::startMemberList()  
 {
   t << endl;
+  t << "{\\comment (startMemberList) }"    << endl; 
+  t << "{" << endl;
 #ifdef DELETEDCODE
   if (!insideTabbing)
     t << "\\begin{CompactItemize}" << endl; 
@@ -1574,6 +1588,8 @@ void RTFGenerator::startMemberList()
 
 void RTFGenerator::endMemberList()    
 {
+  t << "{\\comment (endMemberList) }"    << endl; 
+  t << "}" << endl;
 #ifdef DELETEDCODE
   if (!insideTabbing)
     t << "\\end{CompactItemize}"   << endl; 
@@ -1691,6 +1707,7 @@ const char * RTFGenerator::Rtf_Code_DepthStyle()
 
 void RTFGenerator::startTextBlock(bool dense)
 {
+  t << "{\\comment Start TextBlock}" << endl;
   t << "{" << endl;
   t << Rtf_Style_Reset;
   if (dense) // no spacing between "paragraphs"
@@ -1707,6 +1724,7 @@ void RTFGenerator::endTextBlock()
 {
   newParagraph();
   t << "}" << endl;
+  t << "{\\comment End TextBlock}" << endl;
   m_omitParagraph = TRUE;
 }
 
@@ -1728,8 +1746,105 @@ void RTFGenerator::endMemberSubtitle()
   t << "}" << endl;
 }
 
+void RTFGenerator::writeUmlaut(char c)
+{
+  switch(c)
+  {
+    case 'A' : t << '\304'; break;
+    case 'E' : t << '\313'; break;
+    case 'I' : t << '\317'; break;
+    case 'O' : t << '\326'; break;
+    case 'U' : t << '\334'; break;
+    case 'Y' : t << 'Y';    break;
+    case 'a' : t << '\344'; break;
+    case 'e' : t << '\353'; break;
+    case 'i' : t << '\357'; break;
+    case 'o' : t << '\366'; break;
+    case 'u' : t << '\374'; break;
+    case 'y' : t << '\377'; break;
+    default: t << '?'; break;
+  }
+}
+
+void RTFGenerator::writeAcute(char c)
+{
+  switch(c)
+  {
+    case 'A' : t << '\301'; break;
+    case 'E' : t << '\311'; break;
+    case 'I' : t << '\315'; break;
+    case 'O' : t << '\323'; break;
+    case 'U' : t << '\332'; break;
+    case 'Y' : t << '\335'; break;
+    case 'a' : t << '\341'; break;
+    case 'e' : t << '\351'; break;
+    case 'i' : t << '\355'; break;
+    case 'o' : t << '\363'; break;
+    case 'u' : t << '\372'; break;
+    case 'y' : t << '\375'; break;
+    default: t << '?'; break;
+  }
+}
+
+void RTFGenerator::writeGrave(char c)
+{
+  switch(c)
+  {
+    case 'A' : t << '\300'; break;
+    case 'E' : t << '\310'; break;
+    case 'I' : t << '\314'; break;
+    case 'O' : t << '\322'; break;
+    case 'U' : t << '\331'; break;
+    case 'a' : t << '\340'; break;
+    case 'e' : t << '\350'; break;
+    case 'i' : t << '\354'; break;
+    case 'o' : t << '\362'; break;
+    case 'u' : t << '\371'; break;
+    default: t << '?'; break;
+  }
+}
+
+void RTFGenerator::writeCirc(char c)
+{
+  switch(c)
+  {
+    case 'A' : t << '\302'; break;
+    case 'E' : t << '\312'; break;
+    case 'I' : t << '\316'; break;
+    case 'O' : t << '\324'; break;
+    case 'U' : t << '\333'; break;
+    case 'a' : t << '\342'; break;
+    case 'e' : t << '\352'; break;
+    case 'i' : t << '\356'; break;
+    case 'o' : t << '\364'; break;
+    case 'u' : t << '\373'; break;
+    default: t << '?'; break;
+  }
+}
 
+void RTFGenerator::writeTilde(char c)
+{
+  switch(c)
+  {
+    case 'A' : t << '\303'; break;
+    case 'N' : t << '\321'; break;
+    case 'O' : t << '\325'; break;
+    case 'a' : t << '\343'; break;
+    case 'n' : t << '\361'; break;
+    case 'o' : t << '\365'; break;
+    default: t << '?'; break;
+  }
+}
 
+void RTFGenerator::writeRing(char c)
+{
+  switch(c)
+  {
+    case 'A' : t << '\305'; break;
+    case 'a' : t << '\345'; break;
+    default: t << '?'; break;
+  }
+}
 
 /**
  * VERY brittle routine inline RTF's included by other RTF's.
@@ -1896,3 +2011,45 @@ bool RTFGenerator::preProcessFileInplace(const char *path,const char *name)
   QDir::setCurrent(oldDir);
   return TRUE;
 }
+
+void RTFGenerator::startMemberGroupHeader()
+{
+  t << "{\\comment startMemberGroupHeader}" << endl;
+  t << "{" << endl;
+  incrementIndentLevel();
+  t << Rtf_Style_Reset << Rtf_Style_GroupHeader;
+}
+
+void RTFGenerator::endMemberGroupHeader()
+{
+  t << "{\\comment endMemberGroupHeader}" << endl;
+  newParagraph();
+  t << Rtf_Style_Reset << Rtf_CList_DepthStyle();
+}
+
+void RTFGenerator::startMemberGroupDocs()
+{
+  t << "{\\comment startMemberGroupDocs}" << endl;
+  startEmphasis();
+}
+
+void RTFGenerator::endMemberGroupDocs()
+{
+  t << "{\\comment endMemberGroupDocs}" << endl;
+  endEmphasis();
+  newParagraph();
+}
+
+void RTFGenerator::startMemberGroup()
+{
+  t << "{\\comment startMemberGroup}" << endl;
+  t << Rtf_Style_Reset << Rtf_BList_DepthStyle() << endl;
+}
+
+void RTFGenerator::endMemberGroup(bool)
+{
+  t << "{\\comment endMemberGroup}" << endl;
+  decrementIndentLevel();
+  t << "}";
+}
+
diff --git a/src/rtfgen.h b/src/rtfgen.h
index 50aa302..f47da9b 100644
--- a/src/rtfgen.h
+++ b/src/rtfgen.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
@@ -146,23 +147,15 @@ class RTFGenerator : public OutputGenerator
     void endTableRow()      { }//t << "\\\\\\hline\n";
     void nextTableColumn()  { }//t << "&";
     void endTableColumn()   { }
-    void writeCopyright()    { t << "\\copyright"; }
+    void writeCopyright()    { t << "\251"; }
     void writeQuote()        { t << "\""; }
-    void writeUmlaut(char c) { if (c=='i') t << "\\\"{\\i}"; else 
-                                           t << "\\\"{" << c << "}"; 
-                             }
-    void writeAcute(char c)  { if (c=='i') t << "\\'{\\i}"; else
-                                           t << "\\'{"  << c << "}"; 
-                             }
-    void writeGrave(char c)  { if (c=='i') t << "\\`{\\i}"; else
-                                           t << "\\`{"  << c << "}"; 
-                             }
-    void writeCirc(char c)   { if (c=='i') t << "\\^{\\i}"; else
-                                           t << "\\^{"  << c << "}"; 
-                             }
-    void writeTilde(char c)  { t << "\\~{"  << c << "}"; }
-    void writeRing(char c)   { t << "\\" << c << c; }
-    void writeSharpS()       { t << "\"s"; }
+    void writeUmlaut(char c);
+    void writeAcute(char c);
+    void writeGrave(char c);
+    void writeCirc(char c);
+    void writeTilde(char c);
+    void writeRing(char c);
+    void writeSharpS()       { t << "\337"; }
 
     void startMemberDescription();
     void endMemberDescription();
@@ -204,6 +197,13 @@ class RTFGenerator : public OutputGenerator
     void endInclDepGraph(DotInclDepGraph &);
     void writeGraphicalHierarchy(DotGfxHierarchyTable &) {}
 
+    void startMemberGroupHeader();
+    void endMemberGroupHeader();
+    void startMemberGroupDocs();
+    void endMemberGroupDocs();
+    void startMemberGroup();
+    void endMemberGroup(bool);
+    
     void startTextBlock(bool dense);
     void endTextBlock();
     void lastIndexPage();
@@ -231,10 +231,10 @@ class RTFGenerator : public OutputGenerator
     void beginRTFDocument();
     void beginRTFChapter();
     void beginRTFSection();
-    void RtfwriteRuler_doubleline() {t << "{\\pard\\widctlpar\\brdrb\\brdrdb\\brdrw15\\brsp20 \\adjustright \\par}" << endl; };
-    void RtfwriteRuler_emboss() {t << "{\\pard\\widctlpar\\brdrb\\brdremboss\\brdrw15\\brsp20 \\adjustright \\par}" << endl; };
-    void RtfwriteRuler_thick() {t << "{\\pard\\widctlpar\\brdrb\\brdrs\\brdrw75\\brsp20 \\adjustright \\par}" << endl; };
-    void RtfwriteRuler_thin() {t << "{\\pard\\widctlpar\\brdrb\\brdrs\\brdrw5\\brsp20 \\adjustright \\par}" << endl; };
+    void RtfwriteRuler_doubleline() { t << "{\\pard\\widctlpar\\brdrb\\brdrdb\\brdrw15\\brsp20 \\adjustright \\par}" << endl; };
+    void RtfwriteRuler_emboss() { t << "{\\pard\\widctlpar\\brdrb\\brdremboss\\brdrw15\\brsp20 \\adjustright \\par}" << endl; };
+    void RtfwriteRuler_thick() { t << "{\\pard\\widctlpar\\brdrb\\brdrs\\brdrw75\\brsp20 \\adjustright \\par}" << endl; };
+    void RtfwriteRuler_thin() { t << "{\\pard\\widctlpar\\brdrb\\brdrs\\brdrw5\\brsp20 \\adjustright \\par}" << endl; };
     void WriteRTFReference(const char *label);
 };
 
diff --git a/src/scanner.h b/src/scanner.h
index f37aaba..ddb63c0 100644
--- a/src/scanner.h
+++ b/src/scanner.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/scanner.l b/src/scanner.l
index 97aa140..ff2e61a 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
   
@@ -862,7 +863,8 @@ SCOPEID   {ID}({ID}*{BN}*"::"{BN}*)*({ID}?)
 SCOPENAME (({ID}?{BN}*"::"{BN}*)*)((~{BN}*)?{ID})
 SCOPEMASK {ID}?(("::"|"#")?(~)?{ID})+
 URLMASK   [a-z_A-Z0-9\~\:\@\#\.\-\+\/]+
-WORD      ([a-z_A-Z0-9]+([^\n ]*[a-z_A_Z0-9])?)|("\""[^\n\"]"\"")
+NONTERM   [\{\}\[\]\`\~\@\|\-\+\#\$\/\\\!\%\^\&\*()a-z_A-Z<>0-9]
+WORD      ({NONTERM}+([^\n ]*{NONTERM}?))|("\""[^\n\"]"\"")
 ATTR      ({B}+[^>\n]*)?
 A         [aA]
 BOLD	  [bB]
@@ -1149,7 +1151,7 @@ DOCPARAM  ([a-z_A-Z0-9:\.\-]+)|("\"".*"\"")
 <DocHtmlScan,DocLatexScan>"//"|"/*"|"*/"	{
   					  outDoc->writeString(yytext);
   					}
-<DocHtmlScan,DocLatexScan>.		{
+<DocHtmlScan,DocLatexScan>.|\n		{
   					  char c[2];
 					  c[0]=*yytext;c[1]='\0';
   					  outDoc->writeString(c);
@@ -1201,7 +1203,7 @@ DOCPARAM  ([a-z_A-Z0-9:\.\-]+)|("\"".*"\"")
   					}
 <DocScan>{CMD}"link"/{BN}	        { BEGIN( DocLink ); }
 <DocSkipWord>[a-z_A-Z0-9.:()]+		{ BEGIN( DocScan ); }
-<DocLink>[a-z_A-Z0-9:#.~/()\-\+]+       { 
+<DocLink>[a-z_A-Z0-9:#.,~&*/<>()\-\+]+  {  // TODO: support operators as well!
   					  linkRef  = stripKnownExtensions(yytext);
 					  linkText = "";
   					  BEGIN( DocLinkText ); 
@@ -3923,10 +3925,12 @@ DOCPARAM  ([a-z_A-Z0-9:\.\-]+)|("\"".*"\"")
 					    BEGIN( tmpDocType );
 					  }
  					} 
+  /*
 <JavaDoc>"@"				{
   					  unput(*yytext);
 					  BEGIN(ClassDoc);
   					}
+  */
 <JavaDoc>^{B}*"*"+/[^/]			{
   					  //printf("---> removing %s\n",yytext);
   					}
@@ -4439,7 +4443,7 @@ DOCPARAM  ([a-z_A-Z0-9:\.\-]+)|("\"".*"\"")
 <PageDocTitle>\n			{ yyLineNr++; current->args+=" "; }
 <PageDocTitle>[^\n\<]			{ current->args+=yytext; }
 <PageDocTitle>"</"{TITLE}">"		{ BEGIN( PageDoc ); }
-<ClassDoc,Doc,JavaDoc>{CMD}"ingroup"{B}+   { 
+<ClassDoc,LineDoc,Doc,JavaDoc>{CMD}"ingroup"{B}+   { 
   					  lastGroupContext = YY_START;
   					  lineCount();
   					  BEGIN( GroupName ); 
@@ -4592,6 +4596,14 @@ DOCPARAM  ([a-z_A-Z0-9:\.\-]+)|("\"".*"\"")
 					    unput(afterDocTerminator);
 					  BEGIN(lastAfterDocContext);
   					}
+<AfterDocLine>\n{B}*("//!<"|"///<") 	{ 
+  					  yyLineNr++;
+  					  BEGIN(AfterDocLine);
+  					}
+<AfterDocLine>\n{B}*("/*!<"|"/**<") 	{ 
+  					  yyLineNr++;
+  					  BEGIN(AfterDoc);
+  					}
 <AfterDocLine>.				{ current->brief+=yytext; }
 <AfterDocBrief>"/*"|"//"		{ current->brief+=yytext; }
 <AfterDocBrief>^{B}*"*"+/[^/\n]            
diff --git a/src/searchindex.cpp b/src/searchindex.cpp
index 5d420d3..a482928 100644
--- a/src/searchindex.cpp
+++ b/src/searchindex.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/searchindex.h b/src/searchindex.h
index d8f343c..4fb2ba2 100644
--- a/src/searchindex.h
+++ b/src/searchindex.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/section.h b/src/section.h
index fd7ce60..30bf268 100644
--- a/src/section.h
+++ b/src/section.h
@@ -11,7 +11,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/suffixtree.cpp b/src/suffixtree.cpp
index 3d7d8ec..1befe25 100644
--- a/src/suffixtree.cpp
+++ b/src/suffixtree.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/suffixtree.h b/src/suffixtree.h
index b7a0958..3e59193 100644
--- a/src/suffixtree.h
+++ b/src/suffixtree.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/tag.h b/src/tag.h
index 829c1ed..33b066d 100644
--- a/src/tag.h
+++ b/src/tag.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/tag.l b/src/tag.l
index 9c6ac18..6215605 100644
--- a/src/tag.l
+++ b/src/tag.l
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/translator.h b/src/translator.h
index 77d6bbd..8f4e03c 100644
--- a/src/translator.h
+++ b/src/translator.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/translator_cz.h b/src/translator_cz.h
index 43613cd..fbf45d4 100644
--- a/src/translator_cz.h
+++ b/src/translator_cz.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/translator_de.h b/src/translator_de.h
index 6142793..7ea3cf6 100644
--- a/src/translator_de.h
+++ b/src/translator_de.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  * The translation into German was provided by
  *   Jens Breitenstein (Jens.Breitenstein@tlc.de)
diff --git a/src/translator_es.h b/src/translator_es.h
index 43e8630..99b3327 100644
--- a/src/translator_es.h
+++ b/src/translator_es.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/translator_fi.h b/src/translator_fi.h
index 3e2ced4..9d5934c 100644
--- a/src/translator_fi.h
+++ b/src/translator_fi.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 /*
diff --git a/src/translator_fr.h b/src/translator_fr.h
index ce4d0b3..89f1dc1 100644
--- a/src/translator_fr.h
+++ b/src/translator_fr.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  * The translation into French was provided by
  *   Christophe Bordeux (bordeux@lig.di.epfl.ch)
diff --git a/src/translator_it.h b/src/translator_it.h
index a533b0c..e80a4d6 100644
--- a/src/translator_it.h
+++ b/src/translator_it.h
@@ -7,11 +7,12 @@
  * Initial Italian Translation by Ahmed Aldo Faisal
  * Revised and completed by Alessandro Falappa  (June 1999)
  * Updates:
- *		1999/09/10: corrected some small typos in the "new since 0.49-990425" section
- *					added the "new since 0.49-990728" section
- *		1999/19/11: entirely rewritten the translation to correct small variations due
- *					to feature additions and to conform to the layout of the latest
- *					commented translator.h for the english language
+ *		2000/03: translated new items used since version 1.0 and 1.1.0
+ *		1999/19: entirely rewritten the translation to correct small variations due
+ *				 to feature additions and to conform to the layout of the latest
+ *				 commented translator.h for the english language
+ *		1999/09: corrected some small typos in the "new since 0.49-990425" section
+ *				 added the "new since 0.49-990728" section
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation under the terms of the GNU General Public License is hereby
@@ -19,7 +20,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
@@ -749,6 +751,127 @@ class TranslatorItalian : public Translator
     {
       return "Definizione nel file @0.";
     }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.0.0
+//////////////////////////////////////////////////////////////////////////
+
+    QCString trDeprecated()
+    {
+      return "Deprecato";
+    }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.1.0
+//////////////////////////////////////////////////////////////////////////
+
+    /*! this text is put before a collaboration diagram */
+    QCString trCollaborationDiagram(const char *clName)
+    {
+      return (QCString)"Diagramma di interrelazione per "+clName+":";
+    }
+    /*! this text is put before an include dependency graph */
+    QCString trInclDepGraph(const char *fName)
+    {
+      return (QCString)"Grafo delle dipendenze di inclusione per "+fName+":";
+    }
+    /*! header that is put before the list of constructor/destructors. */
+    QCString trConstructorDocumentation()
+    {
+      return "Documentazione dei costruttori e dei distruttori"; 
+    }
+    /*! Used in the file documentation to point to the corresponding sources. */
+    QCString trGotoSourceCode()
+    {
+      return "Vai al codice sorgente di questo file.";
+    }
+    /*! Used in the file sources to point to the corresponding documentation. */
+    QCString trGotoDocumentation()
+    {
+      return "Vai alla documentazione di questo file.";
+    }
+    /*! Text for the \pre command */
+    QCString trPrecondition()
+    {
+      return "Precondizione";
+    }
+    /*! Text for the \post command */
+    QCString trPostcondition()
+    {
+      return "Postcondizione";
+    }
+    /*! Text for the \invariant command */
+    QCString trInvariant()
+    {
+      return "Invariante";
+    }
+    /*! Text shown before a multi-line variable/enum initialization */
+    QCString trInitialValue()
+    {
+      return "Valore iniziale:";
+    }
+    /*! Text used the source code in the file index */
+    QCString trCode()
+    {
+      return "codice";
+    }
+    QCString trGraphicalHierarchy()
+    {
+      return "Grafico della gerarchia delle classi";
+    }
+    QCString trGotoGraphicalHierarchy()
+    {
+      return "Vai al grafico della gerarchia delle classi";
+    }
+    QCString trGotoTextualHierarchy()
+    {
+      return "Vai alla gerarchia delle classi (testuale)";
+    }
+    QCString trPageIndex()
+    {
+      return "Indice delle pagine";
+    }
+    QCString trNote()
+    {
+      return "Nota";
+    }
+
+    QCString trPublicTypes()
+    {
+      return "Tipi pubblici";
+    }
+    QCString trPublicAttribs()
+    {
+      return "Attributi pubblici";
+    }
+    QCString trStaticPublicAttribs()
+    {
+      return "Attributi pubblici statici";
+    }
+    QCString trProtectedTypes()
+    {
+      return "Tipi protetti";
+    }
+    QCString trProtectedAttribs()
+    {
+      return "Attributi protetti";
+    }
+    QCString trStaticProtectedAttribs()
+    {
+      return "Attributi protetti statici";
+    }
+    QCString trPrivateTypes()
+    {
+      return "Tipi privati";
+    }
+    QCString trPrivateAttribs()
+    {
+      return "Attributi privati";
+    }
+    QCString trStaticPrivateAttribs()
+    {
+      return "Attributi privati statici";
+    }
 };
 
 #endif
diff --git a/src/translator_jp.h b/src/translator_jp.h
index a57e12f..05f29e7 100644
--- a/src/translator_jp.h
+++ b/src/translator_jp.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/translator_nl.h b/src/translator_nl.h
index 63fdade..5aae01f 100644
--- a/src/translator_nl.h
+++ b/src/translator_nl.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/translator_ru.h b/src/translator_ru.h
index 9273fc7..e6b33e8 100644
--- a/src/translator_ru.h
+++ b/src/translator_ru.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/translator_se.h b/src/translator_se.h
index 853febb..1c283a4 100644
--- a/src/translator_se.h
+++ b/src/translator_se.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
diff --git a/src/util.cpp b/src/util.cpp
index 786f872..4b0d369 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
@@ -1268,7 +1269,10 @@ bool getDefs(const QCString &scName,const QCString &memberName,
   
   QCString mName=memberName;
   QCString mScope;
-  if ((im=memberName.findRev("::"))!=-1)
+  if (memberName.left(9)!="operator " && // treat operator conversion methods
+                                         // as a special case
+      (im=memberName.findRev("::"))!=-1
+     )
   {
     mScope=memberName.left(im); 
     mName=memberName.right(memberName.length()-im-2);
@@ -2036,20 +2040,23 @@ QCString substituteKeywords(const QCString &s,const char *title)
  */ 
 int getPrefixIndex(const QCString &name)
 {
+  int ni = name.findRev("::");
+  if (ni==-1) ni=0; else ni+=2;
+  //printf("getPrefixIndex(%s) ni=%d\n",name.data(),ni);
   char *s = Config::ignorePrefixList.first();
   while (s)
   {
     const char *ps=s;
-    const char *pd=name.data();
+    const char *pd=name.data()+ni;
     int i=0;
     while (*ps!=0 && *pd!=0 && *ps==*pd) ps++,pd++,i++;
     if (*ps==0 && *pd!=0)
     {
-      return i;
+      return ni+i;
     }
     s = Config::ignorePrefixList.next();
   }
-  return 0;
+  return ni;
 }
 
 //----------------------------------------------------------------------------
@@ -2123,3 +2130,41 @@ QCString convertNameToFile(const char *name)
   }
   return result;
 }
+
+/*! Input is a scopeName, output is the scopename split into a
+ *  namespace part (as large as possible) and a classname part.
+ */
+void extractNamespaceName(const QCString &scopeName,
+                          QCString &className,QCString &namespaceName)
+{
+  QCString clName=scopeName.copy();
+  QCString nsName;
+  if (!clName.isEmpty() && namespaceDict[clName] && getClass(clName)==0)
+  { // the whole name is a namespace (and not a class)
+    namespaceName=clName.copy();
+    className.resize(0);
+    //printf("extractNamespace `%s' => `%s|%s'\n",scopeName.data(),
+    //     className.data(),namespaceName.data());
+    return;
+  }
+  int i,p=clName.length()-2;
+  while (p>=0 && (i=clName.findRev("::",p))!=-1) 
+    // see if the first part is a namespace (and not a class)
+  {
+    if (i>0 && namespaceDict[clName.left(i)] && getClass(clName.left(i))==0)
+    {
+      namespaceName=clName.left(i);
+      className=clName.right(clName.length()-i-2);
+      //printf("extractNamespace `%s' => `%s|%s'\n",scopeName.data(),
+      //   className.data(),namespaceName.data());
+      return;
+    } 
+    p=i-2; // try a smaller piece of the scope
+  }
+  className=scopeName.copy();
+  namespaceName.resize(0);
+  //printf("extractNamespace `%s' => `%s|%s'\n",scopeName.data(),
+  //       className.data(),namespaceName.data());
+  return;
+}
+
diff --git a/src/util.h b/src/util.h
index 07fe0e8..a238ddf 100644
--- a/src/util.h
+++ b/src/util.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
@@ -89,5 +90,7 @@ void initClassHierarchy(ClassList *cl);
 bool hasVisibleRoot(BaseClassList *bcl);
 int minClassDistance(ClassDef *cd,ClassDef *bcd,int level=0);
 QCString convertNameToFile(const char *name);
+void extractNamespaceName(const QCString &scopeName,
+                          QCString &className,QCString &namespaceName);
 
 #endif
diff --git a/src/version.h b/src/version.h
index 4047126..1e8a2f0 100644
--- a/src/version.h
+++ b/src/version.h
@@ -10,7 +10,8 @@
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
- * All output generated with Doxygen is not covered by this license.
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
  *
  */
 
-- 
cgit v0.12

