mods for doxygen-0.49-990829

1 files changed, 87 insertions, 37 deletions

diff --git a/src/config.l b/src/config.l
index 57897e9..515de4d 100644
--- a/src/config.l
+++ b/src/config.l
@@ -81,7 +81,6 @@ QCString Config::perlPath;
 QCString Config::genTagFile;
 QCString Config::inputFilter;
 QCString Config::paperType;
-QCString Config::stripFromPath;
 QCString Config::manExtension;
 QStrList Config::includePath;                
 QStrList Config::examplePath;
@@ -93,6 +92,7 @@ QStrList Config::tagFileList;
 QStrList Config::extDocPathList;             
 QStrList Config::predefined;
 QStrList Config::extraPackageList;
+QStrList Config::stripFromPath;
 bool     Config::quietFlag           = FALSE; 
 bool     Config::recursiveFlag       = FALSE; 
 bool     Config::allExtFlag          = FALSE; 
@@ -109,6 +109,8 @@ bool     Config::compactLatexFlag    = FALSE;
 bool     Config::internalDocsFlag    = FALSE;
 bool     Config::caseSensitiveNames  = FALSE;
 bool     Config::includeSourceFlag   = FALSE;
+bool     Config::htmlHelpFlag        = FALSE;
+bool     Config::alphaIndexFlag      = FALSE;
 bool     Config::autoBriefFlag       = TRUE;
 bool     Config::warningFlag         = TRUE; 
 bool     Config::generateHtml        = TRUE;
@@ -188,7 +190,6 @@ static int yyread(char *buf,int max_size)
 <Start>"INPUT_FILTER"[ \t]*"="		{ BEGIN(GetString);  s=&Config::inputFilter;      }
 <Start>"PAPER_TYPE"[ \t]*"="		{ BEGIN(GetString);  s=&Config::paperType;        }
 <Start>"OUTPUT_LANGUAGE"[ \t]*"="	{ BEGIN(GetString);  s=&Config::outputLanguage;   }
-<Start>"STRIP_FROM_PATH"[ \t]*"="	{ BEGIN(GetString);  s=&Config::stripFromPath;    }
 <Start>"MAN_EXTENSION"[ \t]*"="		{ BEGIN(GetString);  s=&Config::manExtension;     }
 <Start>"INCLUDE_PATH"[ \t]*"="		{ BEGIN(GetStrList); l=&Config::includePath;        elemStr=""; }
 <Start>"EXAMPLE_PATH"[ \t]*"="	        { BEGIN(GetStrList); l=&Config::examplePath;        elemStr=""; }
@@ -200,6 +201,7 @@ static int yyread(char *buf,int max_size)
 <Start>"EXT_DOC_PATHS"[ \t]*"="		{ BEGIN(GetStrList); l=&Config::extDocPathList;     elemStr=""; }
 <Start>"PREDEFINED"[ \t]*"="            { BEGIN(GetStrList); l=&Config::predefined;         elemStr=""; }
 <Start>"EXTRA_PACKAGES"[ \t]*"="	{ BEGIN(GetStrList); l=&Config::extraPackageList;   elemStr=""; }
+<Start>"STRIP_FROM_PATH"[ \t]*"="	{ BEGIN(GetStrList); l=&Config::stripFromPath;      elemStr=""; }
 <Start>"QUIET"[ \t]*"="			{ BEGIN(GetBool);    b=&Config::quietFlag;        }
 <Start>"WARNINGS"[ \t]*"="              { BEGIN(GetBool);    b=&Config::warningFlag;      }
 <Start>"RECURSIVE"[ \t]*"="		{ BEGIN(GetBool);    b=&Config::recursiveFlag;    }
@@ -228,6 +230,8 @@ static int yyread(char *buf,int max_size)
 <Start>"HTML_ALIGN_MEMBERS"[ \t]*"="    { BEGIN(GetBool);    b=&Config::htmlAlignMemberFlag; }
 <Start>"SOURCE_BROWSER"[ \t]*"="        { BEGIN(GetBool);    b=&Config::includeSourceFlag; }
 <Start>"JAVADOC_AUTOBRIEF"[ \t]*"="     { BEGIN(GetBool);    b=&Config::autoBriefFlag; }
+<Start>"GENERATE_HTMLHELP"[ \t]*"="     { BEGIN(GetBool);    b=&Config::htmlHelpFlag; }
+<Start>"ALPHABETICAL_INDEX"[ \t]*"="    { BEGIN(GetBool);    b=&Config::alphaIndexFlag; }
 <Start>[a-z_A-Z0-9]+			{ err("Warning: ignoring unknown tag `%s' at line %d\n",yytext,yyLineNr); }
 <GetString,GetBool>\n			{ yyLineNr++; BEGIN(Start); }
 <GetStrList>\n				{ 
@@ -381,7 +385,6 @@ void Config::init()
   Config::genTagFile.resize(0);
   Config::inputFilter.resize(0);
   Config::paperType = "a4wide";
-  Config::stripFromPath.resize(0);
   Config::manExtension = ".3";
   Config::includePath.clear();                
   Config::examplePath.clear();
@@ -393,6 +396,7 @@ void Config::init()
   Config::extDocPathList.clear();             
   Config::predefined.clear();
   Config::extraPackageList.clear();
+  Config::stripFromPath.clear();
   Config::quietFlag           = FALSE; 
   Config::recursiveFlag       = FALSE; 
   Config::allExtFlag          = FALSE; 
@@ -409,6 +413,8 @@ void Config::init()
   Config::internalDocsFlag    = FALSE;
   Config::caseSensitiveNames  = FALSE;
   Config::includeSourceFlag   = FALSE;
+  Config::htmlHelpFlag        = FALSE;
+  Config::alphaIndexFlag      = FALSE;
   Config::warningFlag         = TRUE; 
   Config::generateHtml        = TRUE;
   Config::generateLatex       = TRUE;
@@ -429,7 +435,7 @@ void writeTemplateConfig(QFile *f,bool sl)
 #ifdef DOXYWIZARD
   t << "# Doxygen configuration generated by Doxywizard version " << versionString << endl;
 #else
-  t << "# Doxyfile " << versionString << endl;
+  t << "# Doxyfile " << versionString << endl << endl;
 #endif
   if (!sl)
   {
@@ -440,9 +446,12 @@ void writeTemplateConfig(QFile *f,bool sl)
     t << "#       TAG = value [value, ...]\n";
     t << "# Values that contain spaces should be placed between quotes (\" \")\n";
     t << "\n";
-    t << "#---------------------------------------------------------------------------\n";
-    t << "# General configuration options\n";
-    t << "#---------------------------------------------------------------------------\n";
+  }
+  t << "#---------------------------------------------------------------------------\n";
+  t << "# General configuration options\n";
+  t << "#---------------------------------------------------------------------------\n";
+  if (!sl)
+  {
     t << "\n";
     t << "# The PROJECT_NAME tag is a single word (or a sequence of word surrounded\n";
     t << "# by quotes) that should identify the project. \n";
@@ -581,7 +590,8 @@ void writeTemplateConfig(QFile *f,bool sl)
     t << "\n";
     t << "# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag\n";
     t << "# can be used to strip a user defined part of the path. Stripping is\n" ;
-    t << "# only done if the specified string matches the left-hand part of the path.\n";
+    t << "# only done if one of the specified strings matches the left-hand part of\n";
+    t << "# the path.\n";
     t << "\n";
   }
   t << "STRIP_FROM_PATH      =\n";
@@ -597,20 +607,20 @@ void writeTemplateConfig(QFile *f,bool sl)
   if (!sl)
   {
     t << "\n";
-    t << "# If the CASE_SENSE_NAMES tag is set to NO (the default) then Doxygen\n";
-    t << "# will only generate file names in lower case letters. If set to\n";
-    t << "# YES upper case letters are also allowed. This is useful if you have\n";
-    t << "# classes or files whose names only differ in case and if your file system\n";
-    t << "# supports case sensitive file names.\n";
+    t << "# If the SOURCE_BROWSER tag is set to YES than the body of a member or\n";
+    t << "# function will be appended as a block of code to the documentation of.\n";
+    t << "# that member or function.\n";
     t << "\n";
   }
   t << "SOURCE_BROWSER       = NO\n";
   if (!sl)
   {
     t << "\n";
-    t << "# If the SOURCE_BROWSER tag is set to YES than the body of a member or\n";
-    t << "# function will be appended as a block of code to the documentation of.\n";
-    t << "# that member or function.\n";
+    t << "# If the CASE_SENSE_NAMES tag is set to NO (the default) then Doxygen\n";
+    t << "# will only generate file names in lower case letters. If set to\n";
+    t << "# YES upper case letters are also allowed. This is useful if you have\n";
+    t << "# classes or files whose names only differ in case and if your file system\n";
+    t << "# supports case sensitive file names.\n";
     t << "\n";
   }
   t << "CASE_SENSE_NAMES     = NO\n";
@@ -636,9 +646,12 @@ void writeTemplateConfig(QFile *f,bool sl)
   if (!sl)
   {
     t << "\n";
-    t << "#---------------------------------------------------------------------------\n";
-    t << "# configuration options related to the input files\n";
-    t << "#---------------------------------------------------------------------------\n";
+  }
+  t << "#---------------------------------------------------------------------------\n";
+  t << "# configuration options related to the input files\n";
+  t << "#---------------------------------------------------------------------------\n";
+  if (!sl)
+  {
     t << "\n";
     t << "# The INPUT tag can be used to specify the files and/or directories that contain \n";
     t << "# documented source files. You may enter file names like \"myfile.cpp\" or \n";
@@ -708,9 +721,12 @@ void writeTemplateConfig(QFile *f,bool sl)
   if (!sl)
   {
     t << "\n";
-    t << "#---------------------------------------------------------------------------\n";
-    t << "# configuration options related to the HTML output\n";
-    t << "#---------------------------------------------------------------------------\n";
+  }
+  t << "#---------------------------------------------------------------------------\n";
+  t << "# configuration options related to the HTML output\n";
+  t << "#---------------------------------------------------------------------------\n";
+  if (!sl)
+  {
     t << "\n";
     t << "# If the GENERATE_HTML tag is set to YES (the default) Doxygen will\n";
     t << "# generate HTML output\n";
@@ -756,9 +772,31 @@ void writeTemplateConfig(QFile *f,bool sl)
   if (!sl)
   {
     t << "\n";
-    t << "#---------------------------------------------------------------------------\n";
-    t << "# configuration options related to the LaTeX output\n";
-    t << "#---------------------------------------------------------------------------\n";
+    t << "# If the GENERATE_HTMLHELP tag is set to YES, additional index files\n";
+    t << "# will be generated that can be used as input for tools like the\n";
+    t << "# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)\n";
+    t << "# of the generated HTML documentation.\n";
+    t << "\n";
+  }
+  t << "GENERATE_HTMLHELP    = NO\n";
+  if (!sl)
+  {
+    t << "\n";
+    t << "# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index\n";
+    t << "# of all compounds will be generated. Enable this if the project\n";
+    t << "# contains a lot of classes, structs, unions or interfaces.\n";
+    t << "\n";
+  }
+  t << "ALPHABETICAL_INDEX   = NO\n";
+  if (!sl)
+  {
+    t << "\n";
+  }
+  t << "#---------------------------------------------------------------------------\n";
+  t << "# configuration options related to the LaTeX output\n";
+  t << "#---------------------------------------------------------------------------\n";
+  if (!sl)
+  {
     t << "\n";
     t << "# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will\n";
     t << "# generate Latex output.\n";
@@ -803,9 +841,12 @@ void writeTemplateConfig(QFile *f,bool sl)
   if (!sl)
   {
     t << "\n";
-    t << "#---------------------------------------------------------------------------\n";
-    t << "# configuration options related to the man page output\n";
-    t << "#---------------------------------------------------------------------------\n";
+  }
+  t << "#---------------------------------------------------------------------------\n";
+  t << "# configuration options related to the man page output\n";
+  t << "#---------------------------------------------------------------------------\n";
+  if (!sl)
+  {
     t << "\n";
     t << "# If the GENERATE_MAN tag is set to YES (the default) Doxygen will\n";
     t << "# generate man pages\n";
@@ -833,9 +874,12 @@ void writeTemplateConfig(QFile *f,bool sl)
   if (!sl)
   {
     t << "\n";
-    t << "#---------------------------------------------------------------------------\n";
-    t << "# Configuration options related to the preprocessor \n";
-    t << "#---------------------------------------------------------------------------\n";
+  }
+  t << "#---------------------------------------------------------------------------\n";
+  t << "# Configuration options related to the preprocessor \n";
+  t << "#---------------------------------------------------------------------------\n";
+  if (!sl)
+  {
     t << "\n";
     t << "# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will\n";
     t << "# evaluate all C-preprocessor directives found in the sources and include\n";
@@ -892,9 +936,12 @@ void writeTemplateConfig(QFile *f,bool sl)
   if (!sl)
   {
     t << "\n";
-    t << "#---------------------------------------------------------------------------\n";
-    t << "# Configuration options related to external references \n";
-    t << "#---------------------------------------------------------------------------\n";
+  }
+  t << "#---------------------------------------------------------------------------\n";
+  t << "# Configuration options related to external references \n";
+  t << "#---------------------------------------------------------------------------\n";
+  if (!sl)
+  {
     t << "\n";
     t << "# The TAGFILES tag can be used to specify one or more tagfiles. \n";
     t << "\n";
@@ -928,9 +975,12 @@ void writeTemplateConfig(QFile *f,bool sl)
   if (!sl)
   {
     t << "\n";
-    t << "#---------------------------------------------------------------------------\n";
-    t << "# Configuration options related to the search engine \n";
-    t << "#---------------------------------------------------------------------------\n";
+  }
+  t << "#---------------------------------------------------------------------------\n";
+  t << "# Configuration options related to the search engine \n";
+  t << "#---------------------------------------------------------------------------\n";
+  if (!sl)
+  {
     t << "\n";
     t << "# The SEARCHENGINE tag specifies whether or not a search engine should be \n";
     t << "# used. If set to NO the values of all tags below this one will be ignored.\n";