Release-1.5.5-20080309

INSTALL

-DOXYGEN Version 1.5.5-20080307
+DOXYGEN Version 1.5.5-20080309
 
 Please read the installation section of the manual 
 (http://www.doxygen.org/install.html) for instructions.
 
 --------
-Dimitri van Heesch (07 March 2008)
+Dimitri van Heesch (09 March 2008)

README

-DOXYGEN Version 1.5.5_20080307
+DOXYGEN Version 1.5.5_20080309
 
 Please read INSTALL for compilation instructions.
 
@@ -17,4 +17,4 @@ to subscribe to the lists or to visit the archives.
 
 Enjoy,
 
-Dimitri van Heesch (dimitri@stack.nl) (07 March 2008)
+Dimitri van Heesch (dimitri@stack.nl) (09 March 2008)

configure

@@ -20,7 +20,7 @@ doxygen_version_minor=5
 doxygen_version_revision=5
 
 #NOTE: Setting version_mmn to "NO" will omit mmn info from the package.
-doxygen_version_mmn=20080307
+doxygen_version_mmn=20080309
 
 bin_dirs=`echo $PATH | sed -e "s/:/ /g"`
 

doc/config.doc

@@ -203,7 +203,9 @@ followed by the descriptions of the tags grouped by category.
 \refitem cfg_separate_member_pages SEPARATE_MEMBER_PAGES
 \refitem cfg_short_names SHORT_NAMES
 \refitem cfg_show_dirs SHOW_DIRECTORIES
+\refitem cfg_show_files SHOW_FILES
 \refitem cfg_show_include_files SHOW_INCLUDE_FILES
+\refitem cfg_show_namespaces SHOW_NAMESPACES
 \refitem cfg_show_used_files SHOW_USED_FILES
 \refitem cfg_sip_support SIP_SUPPORT
 \refitem cfg_skip_function_macros SKIP_FUNCTION_MACROS
@@ -766,6 +768,20 @@ function's detailed documentation block.
  then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
  in the documentation.
 
+\anchor cfg_show_files
+<dt>\c SHOW_FILES <dd>
+ \addindex SHOW_FILES
+ Set the \c SHOW_FILES tag to \c NO to disable the generation of the Files page.
+ This will remove the Files entry from the Quick Index and from the
+ Folder Tree View (if specified). The default is \c YES.
+
+\anchor cfg_show_namespaces
+<dt>\c SHOW_NAMESPACES <dd>
+ \addindex SHOW_NAMESPACES
+ Set the \c SHOW_NAMESPACES tag to \c NO to disable the generation of the
+ Namespaces page.  This will remove the Namespaces entry from the Quick Index
+ and from the Folder Tree View (if specified). The default is \c YES.
+
 </dl>
 
 \section messages_input Options related to warning and progress messages 

src/config.l

@@ -1972,6 +1972,20 @@ void Config::create()
 		    "in the documentation. The default is NO.\n",
 		    FALSE
               );
+  cb = addBool(
+                    "SHOW_FILES",
+                    "Set the SHOW_FILES tag to NO to disable the generation of the Files page.\n"
+                    "This will remove the Files entry from the Quick Index and from the \n"
+                    "Folder Tree View (if specified). The default is YES.\n",
+                    TRUE
+                );
+  cb = addBool(
+                    "SHOW_NAMESPACES",
+                    "Set the SHOW_NAMESPACES tag to NO to disable the generation of the \n"
+                    "Namespaces page.  This will remove the Namespaces entry from the Quick Index\n"
+                    "and from the Folder Tree View (if specified). The default is YES.\n",
+                    TRUE
+                );
   cs = addString(  "FILE_VERSION_FILTER",
                    "The FILE_VERSION_FILTER tag can be used to specify a program or script that \n"
 		   "doxygen should invoke to get the current version for each file (typically from \n"

src/filedef.cpp

@@ -1449,3 +1449,10 @@ void FileDef::writeMemberDocumentation(OutputList &ol,MemberList::ListType lt,co
   MemberList * ml = getMemberList(lt);
   if (ml) ml->writeDocumentation(ol,name(),this,title);
 }
+
+bool FileDef::isLinkableInProject() const
+{
+  static bool showFiles = Config_getBool("SHOW_FILES");
+  return hasDocumentation() && !isReference() && showFiles;
+}
+

src/filedef.h

@@ -116,10 +116,7 @@ class FileDef : public Definition
     /*! Returns version of this file. */
     QCString getVersion() const { return fileVersion; }
     
-    bool isLinkableInProject() const
-    {
-      return hasDocumentation() && !isReference();
-    }
+    bool isLinkableInProject() const;
 
     bool isLinkable() const
     {

src/fortrancode.l

@@ -542,7 +542,7 @@ void endUseScope()
   currentUseNames= useStack.pop(); 
   if (currentUseNames == 0) 
   {
-     fprintf(stderr,"fortrancode.l: stack empty!"); 
+     fprintf(stderr,"WARNING: fortrancode.l: stack empty!"); 
      //exit(-1);
   }
 }
@@ -691,7 +691,7 @@ IGNORE (IMPLICIT{BS}NONE|CONTAINS|WRITE|READ|ALLOCATE|DEALLOCATE|SIZE)
                                           currentModule=0;
 					  REJECT;
                                         }
-<Start>"end"({BS_}("program"|"module"|"type"|"interface"))? {  //
+<Start>^{BS}"end"({BS}("program"|"module"|"type"|"interface")({BS_}{ID})?)?{BS}/(\n|!) {  //
                                           endUseScope();
  					  startFontClass("keyword"); 
   					  codifyLines(yytext);
@@ -722,7 +722,7 @@ IGNORE (IMPLICIT{BS}NONE|CONTAINS|WRITE|READ|ALLOCATE|DEALLOCATE|SIZE)
 <Subprog>"\n"                           { codifyLines(yytext);
                                           yy_pop_state();
                                         }
-<Start>"end"({BS_}{SUBPROG})?           {  // Fortran subroutine or function ends
+<Start>"^{BS}end"({BS}{SUBPROG}({BS_}{ID})?)?{BS}/(\n|!) {  // Fortran subroutine or function ends
                                           //cout << "===> end function " << yytext << endl;
                                           endUseScope();
    					  startFontClass("keyword");
@@ -860,6 +860,8 @@ IGNORE (IMPLICIT{BS}NONE|CONTAINS|WRITE|READ|ALLOCATE|DEALLOCATE|SIZE)
 					  endFontClass();
                                           yy_pop_state();
                                         }           
+<String>.                               {str+=yytext;}
+
 <*>\"|\'                                { /* string starts */
 					  /* if(YY_START == StrIgnore) REJECT; // ignore in simple comments */
                                           yy_push_state(YY_START);
@@ -867,7 +869,6 @@ IGNORE (IMPLICIT{BS}NONE|CONTAINS|WRITE|READ|ALLOCATE|DEALLOCATE|SIZE)
                                           BEGIN(String);
 					  str=yytext;
                                         }
-<String>.                               {str+=yytext;}
  /*-----------------------------------------------------------------------------*/
 
 <*>\n					{

src/index.cpp

@@ -3008,7 +3008,8 @@ void writeIndex(OutputList &ol)
     {
       ol.startIndexSection(isCompoundIndex);
       ol.parseText(/*projPrefix+*/
-          (vhdlOpt ? VhdlDocGen::trDesignUnitIndex() : 
+          (fortranOpt ? theTranslator->trCompoundIndexFortran() :
+           vhdlOpt ? VhdlDocGen::trDesignUnitIndex() : 
                      theTranslator->trCompoundIndex()
           ));
       ol.endIndexSection(isCompoundIndex);

src/namespacedef.cpp

@@ -769,12 +769,19 @@ bool NamespaceDef::isLinkableInProject() const
   int i = name().findRev("::");
   if (i==-1) i=0; else i+=2;
   static bool extractAnonNs = Config_getBool("EXTRACT_ANON_NSPACES");
-  if (extractAnonNs && name().mid(i,20)=="anonymous_namespace{")
+  static bool showNamespaces = Config_getBool("SHOW_NAMESPACES");
+  if (extractAnonNs &&                             // extract anonymous ns
+      name().mid(i,20)=="anonymous_namespace{" &&  // correct prefix
+      showNamespaces)                              // not disabled by config
   {
     return TRUE;
   }
-  return !name().isEmpty() && name().at(i)!='@' &&
-    hasDocumentation() && !isReference() && !isHidden() && !isArtificial();
+  return !name().isEmpty() && name().at(i)!='@' && // not anonymous
+    hasDocumentation() &&  // documented
+    !isReference() &&      // not an external reference
+    !isHidden() &&         // not hidden
+    !isArtificial() &&     // or artificial
+    showNamespaces;        // not disabled by config
 }
 
 bool NamespaceDef::isLinkable() const