Release-1.2.3

2 files changed, 44 insertions, 4 deletions

diff --git a/addon/configgen/config_templ.l b/addon/configgen/config_templ.l
index 98a688f..81d4acf 100644
--- a/addon/configgen/config_templ.l
+++ b/addon/configgen/config_templ.l
@@ -140,8 +140,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
   {
@@ -162,6 +166,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
@@ -430,6 +435,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())
   {
@@ -441,7 +463,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;
     }
@@ -466,7 +488,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;
     }
diff --git a/addon/configgen/configgen.cpp b/addon/configgen/configgen.cpp
index c9d5a2d..95aab45 100644
--- a/addon/configgen/configgen.cpp
+++ b/addon/configgen/configgen.cpp
@@ -775,8 +775,8 @@ void init()
                     "information to generate all constant output in the proper language. \n"
                     "The default language is English, other supported languages are: \n"
                     "Dutch, French, Italian, Czech, Swedish, German, Finnish, Japanese, \n"
-                    "Korean, Hungarian, Spanish, Romanian, Russian, Croatian, Polish, \n"
-                    "Portuguese and Slovene.\n"
+                    "Korean, Hungarian, Norwegian, Spanish, Romanian, Russian, Croatian, \n"
+                    "Polish, Portuguese and Slovene.\n"
                    );
   ConfigString::addFixedValue("outputLanguage","Croatian");
   ConfigString::addFixedValue("outputLanguage","Czech");
@@ -789,6 +789,7 @@ void init()
   ConfigString::addFixedValue("outputLanguage","Italian");
   ConfigString::addFixedValue("outputLanguage","Japanese");
   ConfigString::addFixedValue("outputLanguage","Korean");
+  ConfigString::addFixedValue("outputLanguage","Norwegian");
   ConfigString::addFixedValue("outputLanguage","Romanian");
   ConfigString::addFixedValue("outputLanguage","Russian");
   ConfigString::addFixedValue("outputLanguage","Polish");
@@ -1169,6 +1170,14 @@ void init()
                     "to standard output. \n",
                     ConfigString::File
                    );
+  ConfigBool::add(  "filterForSourceFlag",
+                    "FILTER_SOURCE_FILES",
+                    "FALSE",
+                    "do we filter source files?",
+                    "If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using \n"
+                    "INPUT_FILTER) will be used to filter the input files when producing source \n"
+                    "files to browse. \n"
+                );    
   
   //-----------------------------------------------------------------------------------------------
   ConfigInfo::add(  "Index","configuration options related to the alphabetical class index");
@@ -1279,6 +1288,15 @@ void init()
                     "the value YES disables it. \n"
                  );
   addDependency("noIndexFlag","generateHtml");
+  ConfigInt::add(   "enumValuesPerLine",
+                    "ENUM_VALUES_PER_LINE",
+                    "4",
+                    "number of enum values that are put on one line",
+                    "This tag can be used to set the number of enum values (range [1..20]) \n"
+                    "that doxygen will group on one line in the generated HTML documentation. \n",
+                    1,20
+                );
+  addDependency("enumValuesPerLine","generateHtml");
   //-----------------------------------------------------------------------------------------------
   ConfigInfo::add(  "LaTeX","configuration options related to the LaTeX output");
   //-----------------------------------------------------------------------------------------------