Release-1.1.3

5 files changed, 60 insertions, 8 deletions

diff --git a/examples/Makefile.in b/examples/Makefile.in
index 01d8e41..a04c9f6 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -20,12 +20,14 @@ all: class/html/index.html \
      template/html/index.html \
      tag/html/index.html \
      group/html/index.html \
-     diagrams/html/index.html
+     diagrams/html/index.html \
+     memgrp/html/index.html
 
 clean:
 	rm -rf  class define enum file func page relates author \
                 par overload example include qtstyle jdstyle structcmd \
-		autolink tag restypedef afterdoc template tag group diagrams
+		autolink tag restypedef afterdoc template tag group diagrams \
+		memgrp
 
 class/html/index.html: class.h class.cfg
 	$(DOXYGEN)/bin/doxygen class.cfg
@@ -92,6 +94,9 @@ template/html/index.html: templ.cpp templ.cfg
 group/html/index.html: group.cpp group.cfg
 	$(DOXYGEN)/bin/doxygen group.cfg
 
+memgrp/html/index.html: memgrp.cpp memgrp.cfg
+	$(DOXYGEN)/bin/doxygen memgrp.cfg
+
 diagrams/html/index.html: diagrams_a.h diagrams_b.h diagrams_c.h diagrams_d.h diagrams_e.h diagrams.cfg
 ifneq ($(HAVE_DOT),)
 	$(DOXYGEN)/bin/doxygen diagrams.cfg
diff --git a/examples/Makefile.win.in b/examples/Makefile.win.in
index 7b27de8..9406f1e 100644
--- a/examples/Makefile.win.in
+++ b/examples/Makefile.win.in
@@ -21,14 +21,15 @@ all: class/html/index.html \
      template/html/index.html \
      tag/html/index.html \
      group/html/index.html \
-     diagrams/html/index.html
+     diagrams/html/index.html \
+     memgrp/html/index.html
 
 clean:
 	deltree /y class define enum file 
 	deltree /y func page relates author
 	deltree /y par overload example include qtstyle 
 	deltree /y jdstyle structcmd autolink resdefine 
-	deltree /y restypedef afterdoc template tag group diagrams
+	deltree /y restypedef afterdoc template tag group diagrams memgrp
 
 class/html/index.html: class.h class.cfg
 	$(DOXYDIR)\doxygen class.cfg
@@ -97,5 +98,8 @@ template/html/index.html: templ.cpp templ.cfg
 group/html/index.html: group.cpp group.cfg
 	$(DOXYDIR)\doxygen group.cfg
 
+memgrp/html/index.html: memgrp.cpp memgrp.cfg
+	$(DOXYDIR)\doxygen memgrp.cfg
+
 diagrams/html/index.html: diagrams_a.h diagrams_b.h diagrams_c.h diagrams_d.h diagrams_e.h diagrams.cfg
 	$(DOXYDIR)\doxygen diagrams.cfg
diff --git a/examples/group.cpp b/examples/group.cpp
index 7bd3255..53ea371 100644
--- a/examples/group.cpp
+++ b/examples/group.cpp
@@ -10,6 +10,11 @@
  *  This is the third group
  */
 
+/*! \defgroup group4 The Fourth Group
+ *  \ingroup group3
+ *  Group 4 is a subgroup of group 3
+ */
+
 /*! \ingroup group1 
  *  \brief class C1 in group 1
  */
@@ -35,11 +40,11 @@ class C4 {};
  */
 class C5 {};
 
-/*! \ingroup group1 group2 group3
- *  \brief class C6 in all groups
- *  \sa \link group1 The first group\endlink, group2, group3
+/*! \ingroup group1 group2 group3 group4
+ *  namespace N1 is in all groups
+ *  \sa \link group1 The first group\endlink, group2, group3, group4
  */
-class C6 {};
+namespace N1 {};
 
 /*! \file
  *  \ingroup group3
diff --git a/examples/memgrp.cfg b/examples/memgrp.cfg
new file mode 100644
index 0000000..6b0bdb7
--- /dev/null
+++ b/examples/memgrp.cfg
@@ -0,0 +1,6 @@
+PROJECT_NAME     = "Member Grouping"
+OUTPUT_DIRECTORY = memgrp
+GENERATE_LATEX   = NO
+GENERATE_MAN     = NO
+INPUT            = memgrp.cpp
+QUIET            = YES
diff --git a/examples/memgrp.cpp b/examples/memgrp.cpp
new file mode 100644
index 0000000..5501d71
--- /dev/null
+++ b/examples/memgrp.cpp
@@ -0,0 +1,32 @@
+/** A class. Details */
+class Test
+{
+  public:
+    /** @name Group1
+     */
+    //@{
+    /** Function 1 in group 1. Details. */
+    void func1InGroup1();
+    void func2InGroup1();
+    //@}
+
+    /** Function without group. Details. */
+    void ungroupedFunction();
+    void func1InGroup2();
+  protected:
+    void func2InGroup2();
+};
+
+void Test::func1InGroup1() {}
+void Test::func2InGroup1() {}
+
+/** @name Group2
+ *  Description of group 2. 
+ */
+//@{
+/** Function 2 in group 2. Details. */
+void Test::func2InGroup2() {}
+/** Function 1 in group 2. Details. */
+void Test::func1InGroup2() {}
+//@}
+