summaryrefslogtreecommitdiffstats
path: root/src/config.l
diff options
context:
space:
mode:
Diffstat (limited to 'src/config.l')
-rw-r--r--src/config.l34
1 files changed, 28 insertions, 6 deletions
diff --git a/src/config.l b/src/config.l
index 57064e7..2a2174e 100644
--- a/src/config.l
+++ b/src/config.l
@@ -829,7 +829,7 @@ void writeTemplateConfig(QFile *f,bool sl)
t << "# information to generate all constant output in the proper language. \n";
t << "# The default language is English, other supported languages are: \n";
t << "# Dutch, French, Italian, Czech, Swedish, German, Finnish, Japanese, \n";
- t << "# Spanish and Russian\n";
+ t << "# Spanish, Russian, Croatian and Polish.\n";
t << "\n";
}
t << "OUTPUT_LANGUAGE = ";
@@ -894,7 +894,7 @@ void writeTemplateConfig(QFile *f,bool sl)
if (!sl)
{
t << "\n";
- t << "# If the HIDE_UNDOC_CLASSESS tag is set to YES, Doxygen will hide all \n";
+ t << "# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all \n";
t << "# undocumented classes that are normally visible in the class hierarchy. \n";
t << "# If set to NO (the default) these class will be included in the various \n";
t << "# overviews. This option has no effect if EXTRACT_ALL is enabled. \n";
@@ -1994,9 +1994,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
{
@@ -2019,9 +2019,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
{
@@ -2333,6 +2333,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())