Release-1.1.5_20000709

2 files changed, 33 insertions, 10 deletions

diff --git a/addon/configgen/config_templ.l b/addon/configgen/config_templ.l
index e3c6b03..6ba22a6 100644
--- a/addon/configgen/config_templ.l
+++ b/addon/configgen/config_templ.l
@@ -326,9 +326,9 @@ void configStrToVal()
 	   "Using the default of 1024 pixels!\n");
       width=1024;
     }
-    else if (width<250) // clip to lower bound
+    else if (width<100) // clip to lower bound
     {
-      width=250;
+      width=100;
     }
     else if (width>30000) // clip to upper bound
     {
@@ -351,9 +351,9 @@ void configStrToVal()
 	   "Using the default of 1024 pixels!\n");
       height=1024;
     }
-    else if (height<250) // clip to lower bound
+    else if (height<100) // clip to lower bound
     {
-      height=250;
+      height=100;
     }
     else if (height>30000) // clip to upper bound
     {
@@ -625,6 +625,28 @@ void checkConfig()
     err("Could not create output directory %s\n",Config::manOutputDir.data());
     exit(1);
   }
+
+  // expand the relative stripFromPath values
+  char *sfp = Config::stripFromPath.first();
+  while (sfp)
+  {
+    QCString path = sfp;
+    if (path.at(0)!='/' && (path.length()<=2 || path.at(1)!=':'))
+    {
+      QFileInfo fi(path);
+      if (fi.exists() && fi.isDir())
+      {
+	int i = Config::stripFromPath.at();
+	Config::stripFromPath.remove();
+	if (Config::stripFromPath.at()==i) // did not remove last item
+	  Config::stripFromPath.insert(i,fi.absFilePath()+"/");
+	else
+	  Config::stripFromPath.append(fi.absFilePath()+"/");
+      }
+    }
+    sfp = Config::stripFromPath.next();
+  }
+  
   
   // Test to see if HTML header is valid
   if (!Config::headerFile.isEmpty())
diff --git a/addon/configgen/configgen.cpp b/addon/configgen/configgen.cpp
index 003ee1b..4f90610 100644
--- a/addon/configgen/configgen.cpp
+++ b/addon/configgen/configgen.cpp
@@ -762,7 +762,7 @@ 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"
-                    "Spanish and Russian\n"
+                    "Spanish, Russian, Croatian and Polish.\n"
                    );
   ConfigString::addFixedValue("outputLanguage","English");
   ConfigString::addFixedValue("outputLanguage","Dutch");
@@ -771,11 +771,12 @@ void init()
   ConfigString::addFixedValue("outputLanguage","Czech");
   ConfigString::addFixedValue("outputLanguage","Swedish");
   ConfigString::addFixedValue("outputLanguage","German");
-  ConfigString::addFixedValue("outputLanguage","Russian");
-  ConfigString::addFixedValue("outputLanguage","Japanese");
   ConfigString::addFixedValue("outputLanguage","Finnish");
+  ConfigString::addFixedValue("outputLanguage","Japanese");
   ConfigString::addFixedValue("outputLanguage","Spanish");
+  ConfigString::addFixedValue("outputLanguage","Russian");
   ConfigString::addFixedValue("outputLanguage","Croatian");
+  ConfigString::addFixedValue("outputLanguage","Polish");
   ConfigBool::add(  "noIndexFlag",
                     "DISABLE_INDEX",
                     "FALSE",
@@ -821,7 +822,7 @@ void init()
                     "HIDE_UNDOC_CLASSES",
                     "FALSE",
                     "hide undocumented members.",
-                    "If the HIDE_UNDOC_CLASSESS tag is set to YES, Doxygen will hide all \n"
+                    "If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all \n"
                     "undocumented classes that are normally visible in the class hierarchy. \n"
                     "If set to NO (the default) these class will be included in the various \n"
                     "overviews. This option has no effect if EXTRACT_ALL is enabled. \n"
@@ -1555,7 +1556,7 @@ void init()
                     "this value, doxygen will try to truncate the graph, so that it fits within \n"
                     "the specified constraint. Beware that most browsers cannot cope with very \n"
                     "large images. \n",
-                    250,30000
+                    100,30000
                 );
   addDependency("maxDotGraphWidth","haveDotFlag");
   ConfigInt::add(   "maxDotGraphHeight",
@@ -1567,7 +1568,7 @@ void init()
                     "this value, doxygen will try to truncate the graph, so that it fits within \n"
                     "the specified constraint. Beware that most browsers cannot cope with very \n"
                     "large images. \n",
-                    250,30000
+                    100,30000
                 );
   addDependency("maxDotGraphHeight","haveDotFlag");