Release-1.2.3

1 files changed, 55 insertions, 3 deletions

diff --git a/src/config.l b/src/config.l
index 86b6578..d158cdb 100644
--- a/src/config.l
+++ b/src/config.l
@@ -1,4 +1,4 @@
-/* This file was generated by configgen on Tue Oct 10 22:16:03 2000
+/* This file was generated by configgen on Sat Oct 28 15:42:39 2000
  * from config_templ.l
  *
  * DO NOT EDIT!
@@ -121,6 +121,7 @@ QStrList Config::examplePath;
 QStrList Config::examplePatternList;
 QStrList Config::imagePath;
 QCString Config::inputFilter;
+bool     Config::filterForSourceFlag = FALSE;
 bool     Config::alphaIndexFlag = FALSE;
 int      Config::colsInAlphaIndex = 5;
 QStrList Config::ignorePrefixList;
@@ -132,6 +133,7 @@ QCString Config::htmlStyleSheet;
 bool     Config::htmlAlignMemberFlag = TRUE;
 bool     Config::htmlHelpFlag = FALSE;
 bool     Config::noIndexFlag = FALSE;
+int      Config::enumValuesPerLine = 4;
 bool     Config::generateLatex = TRUE;
 QCString Config::latexOutputDir = "latex";
 bool     Config::compactLatexFlag = FALSE;
@@ -211,6 +213,7 @@ static int               includeDepth;
 
 static QCString     tabSizeString;
 static QCString     colsInAlphaIndexString;
+static QCString     enumValuesPerLineString;
 static QCString     maxDotGraphWidthString;
 static QCString     maxDotGraphHeightString;
 
@@ -253,8 +256,12 @@ static FILE *tryPath(const char *path,const char *fileName)
   return 0;
 }
 
+static void substEnvVarsInStrList(QStrList &sl);
+static void substEnvVarsInString(QCString &s);
+
 static FILE *findFile(const char *fileName)
 {
+  substEnvVarsInStrList(includePathList);
   char *s=includePathList.first();
   while (s) // try each of the include paths
   {
@@ -275,6 +282,7 @@ static void readIncludeFile(const char *incName)
   } 
 
   QCString inc = incName;
+  substEnvVarsInString(inc);
   inc = inc.stripWhiteSpace();
   uint incLen = inc.length();
   if (inc.at(0)=='"' && inc.at(incLen-1)=='"') // strip quotes
@@ -389,6 +397,7 @@ static void readIncludeFile(const char *incName)
 <Start>"IMAGE_PATH"[ \t]*"="             { BEGIN(GetStrList); l=&Config::imagePath; l->clear(); elemStr=""; }
 <Start>"IMAGE_PATH"[ \t]*"+="            { BEGIN(GetStrList); l=&Config::imagePath; elemStr=""; }
 <Start>"INPUT_FILTER"[ \t]*"="           { BEGIN(GetString); s=&Config::inputFilter; s->resize(0); }
+<Start>"FILTER_SOURCE_FILES"[ \t]*"="    { BEGIN(GetBool); b=&Config::filterForSourceFlag; }
 <Start>"ALPHABETICAL_INDEX"[ \t]*"="     { BEGIN(GetBool); b=&Config::alphaIndexFlag; }
 <Start>"COLS_IN_ALPHA_INDEX"[ \t]*"="    { BEGIN(GetString); s=&colsInAlphaIndexString; s->resize(0); }
 <Start>"IGNORE_PREFIX"[ \t]*"="          { BEGIN(GetStrList); l=&Config::ignorePrefixList; l->clear(); elemStr=""; }
@@ -401,6 +410,7 @@ static void readIncludeFile(const char *incName)
 <Start>"HTML_ALIGN_MEMBERS"[ \t]*"="     { BEGIN(GetBool); b=&Config::htmlAlignMemberFlag; }
 <Start>"GENERATE_HTMLHELP"[ \t]*"="      { BEGIN(GetBool); b=&Config::htmlHelpFlag; }
 <Start>"DISABLE_INDEX"[ \t]*"="          { BEGIN(GetBool); b=&Config::noIndexFlag; }
+<Start>"ENUM_VALUES_PER_LINE"[ \t]*"="   { BEGIN(GetString); s=&enumValuesPerLineString; s->resize(0); }
 <Start>"GENERATE_LATEX"[ \t]*"="         { BEGIN(GetBool); b=&Config::generateLatex; }
 <Start>"LATEX_OUTPUT"[ \t]*"="           { BEGIN(GetString); s=&Config::latexOutputDir; s->resize(0); }
 <Start>"COMPACT_LATEX"[ \t]*"="          { BEGIN(GetBool); b=&Config::compactLatexFlag; }
@@ -678,6 +688,7 @@ void dumpConfig()
     }
   }
   printf("inputFilter=`%s'\n",Config::inputFilter.data());
+  printf("filterForSourceFlag=`%d'\n",Config::filterForSourceFlag);
   printf("# configuration options related to the alphabetical class index\n");
   printf("alphaIndexFlag=`%d'\n",Config::alphaIndexFlag);
   printf("colsInAlphaIndex=`%d'\n",Config::colsInAlphaIndex);
@@ -698,6 +709,7 @@ void dumpConfig()
   printf("htmlAlignMemberFlag=`%d'\n",Config::htmlAlignMemberFlag);
   printf("htmlHelpFlag=`%d'\n",Config::htmlHelpFlag);
   printf("noIndexFlag=`%d'\n",Config::noIndexFlag);
+  printf("enumValuesPerLine=`%d'\n",Config::enumValuesPerLine);
   printf("# configuration options related to the LaTeX output\n");
   printf("generateLatex=`%d'\n",Config::generateLatex);
   printf("latexOutputDir=`%s'\n",Config::latexOutputDir.data());
@@ -853,6 +865,7 @@ void Config::init()
   Config::examplePatternList.clear();
   Config::imagePath.clear();
   Config::inputFilter.resize(0);
+  Config::filterForSourceFlag = FALSE;
   Config::alphaIndexFlag = FALSE;
   Config::colsInAlphaIndex = 5;
   Config::ignorePrefixList.clear();
@@ -864,6 +877,7 @@ void Config::init()
   Config::htmlAlignMemberFlag = TRUE;
   Config::htmlHelpFlag = FALSE;
   Config::noIndexFlag = FALSE;
+  Config::enumValuesPerLine = 4;
   Config::generateLatex = TRUE;
   Config::latexOutputDir = "latex";
   Config::compactLatexFlag = FALSE;
@@ -1536,6 +1550,17 @@ void writeTemplateConfig(QFile *f,bool sl)
   if (!sl)
   {
     t << "\n";
+    t << "# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using \n";
+    t << "# INPUT_FILTER) will be used to filter the input files when producing source \n";
+    t << "# files to browse. \n";
+    t << "\n";
+  }
+  t << "FILTER_SOURCE_FILES    = ";
+  writeBoolValue(t,Config::filterForSourceFlag);
+  t << "\n";
+  if (!sl)
+  {
+    t << "\n";
   }
   t << "#---------------------------------------------------------------------------\n";
   t << "# configuration options related to the alphabetical class index\n";
@@ -1673,6 +1698,16 @@ void writeTemplateConfig(QFile *f,bool sl)
   if (!sl)
   {
     t << "\n";
+    t << "# This tag can be used to set the number of enum values (range [1..20]) \n";
+    t << "# that doxygen will group on one line in the generated HTML documentation. \n";
+    t << "\n";
+  }
+  t << "ENUM_VALUES_PER_LINE   = ";
+  writeIntValue(t,Config::enumValuesPerLine);
+  t << "\n";
+  if (!sl)
+  {
+    t << "\n";
   }
   t << "#---------------------------------------------------------------------------\n";
   t << "# configuration options related to the LaTeX output\n";
@@ -2286,6 +2321,23 @@ void configStrToVal()
     }
     Config::colsInAlphaIndex=cols;
   }
+
+  if (enumValuesPerLineString.isEmpty())
+  {
+    Config::enumValuesPerLine=4;
+  }
+  else
+  {
+    bool ok;
+    int cols = enumValuesPerLineString.toInt(&ok);
+    if (!ok || cols<1 || cols>20)
+    {
+      warn_cont("Warning: argument of ENUM_VALUES_PER_LINE is not a valid number in the range [1..20]!\n"
+	   "Using the default of 4!\n");
+      cols = 4;
+    }
+    Config::enumValuesPerLine=cols;
+  }
   
   if (maxDotGraphWidthString.isEmpty())
   {
@@ -2297,7 +2349,7 @@ void configStrToVal()
     int width =maxDotGraphWidthString.toInt(&ok);
     if (!ok)
     {
-      warn_cont("Warning: argument of MAX_DOT_GRAPH_WIDTH is not a valid number in the range [1..20]!\n"
+      warn_cont("Warning: argument of MAX_DOT_GRAPH_WIDTH is not a valid number in the range [100..30000]!\n"
 	   "Using the default of 1024 pixels!\n");
       width=1024;
     }
@@ -2322,7 +2374,7 @@ void configStrToVal()
     int height =maxDotGraphHeightString.toInt(&ok);
     if (!ok)
     {
-      warn_cont("Warning: argument of MAX_DOT_GRAPH_WIDTH is not a valid number in the range [1..20]!\n"
+      warn_cont("Warning: argument of MAX_DOT_GRAPH_WIDTH is not a valid number in the range [100..30000]!\n"
 	   "Using the default of 1024 pixels!\n");
       height=1024;
     }