Merge branch 'master' of github.com:doxygen/doxygen

2 files changed, 19 insertions, 7 deletions

diff --git a/addon/doxyparse/doxyparse.cpp b/addon/doxyparse/doxyparse.cpp
index 24769e0..d0b43d5 100644
--- a/addon/doxyparse/doxyparse.cpp
+++ b/addon/doxyparse/doxyparse.cpp
@@ -236,6 +236,21 @@ static void referenceTo(MemberDef* md) {
   printReferenceTo(type, signature, defined_in);
 }
 
+void protectionInformation(Protection protection) {
+  if (protection == Public) {
+    printProtection("public");
+  }
+  else if (protection == Protected) {
+    printProtection("protected");
+  }
+  else if (protection == Private) {
+    printProtection("private");
+  }
+  else if (protection == Package) {
+    printProtection("package");
+  }
+}
+
 void cModule(ClassDef* cd) {
   MemberList* ml = cd->getMemberList(MemberListType_variableMembers);
   if (ml) {
@@ -249,9 +264,7 @@ void cModule(ClassDef* cd) {
     MemberDef* md;
     for (mli.toFirst(); (md=mli.current()); ++mli) {
       printDefinition("variable", cd->name().data() + std::string("::") + md->name().data(), md->getDefLine());
-      if (md->protection() == Public) {
-        printProtection("public");
-      }
+      protectionInformation(md->protection());
     }
   }
 }
@@ -311,9 +324,7 @@ static void lookupSymbol(Definition *d) {
     std::string type = md->memberTypeName().data();
     std::string signature = functionSignature(md);
     printDefinition(type, signature, md->getDefLine());
-    if (md->protection() == Public) {
-      printProtection("public");
-    }
+    protectionInformation(md->protection());
     if (md->isFunction() && md->isPrototype()) {
       prototypeInformation(md);
     }
diff --git a/doc/commands.doc b/doc/commands.doc
index be526a0..350b5fe 100644
--- a/doc/commands.doc
+++ b/doc/commands.doc
@@ -605,7 +605,8 @@ Structural indicators
 
   \par Important:
   The documentation of global functions, variables, typedefs, and enums will
-  only be included in the output if the file they are in is documented as well.
+  only be included in the output if the file they are in is documented as well
+  or if \ref cfg_javadoc_autobrief "EXTRACT_ALL" is set to \c YES.
 
   \par Example:
   \include file.h