Release-1.5.2-20070610

1 files changed, 27 insertions, 15 deletions

diff --git a/src/config.l b/src/config.l
index 0fad432..e3faf84 100644
--- a/src/config.l
+++ b/src/config.l
@@ -1078,12 +1078,13 @@ void Config::check()
   s=aliasList.first();
   while (s)
   {
-    QRegExp re("[a-z_A-Z][a-z_A-Z0-9]*[ \t]*=");
+    QRegExp re1("[a-z_A-Z][a-z_A-Z0-9]*[ \t]*=");         // alias without argument
+    QRegExp re2("[a-z_A-Z][a-z_A-Z0-9]*{[0-9]*}[ \t]*="); // alias with argument
     QCString alias=s;
     alias=alias.stripWhiteSpace();
-    if (alias.find(re)!=0)
+    if (alias.find(re1)!=0 && alias.find(re2)!=0)
     {
-      config_err("Illegal alias format `%s'. Use \"name=value\"\n",
+      config_err("Illegal alias format `%s'. Use \"name=value\" or \"name(n)=value\", where n is the number of arguments\n",
 	  alias.data());
     }
     s=aliasList.next();
@@ -1250,16 +1251,12 @@ void Config::check()
     Config_getBool("INLINE_INFO")=FALSE;
   }
 
-#if 0
-  if (Config_getString("RTF_OUTPUT_ENCODING").isEmpty())
-  {
-    Config_getString("RTF_OUTPUT_ENCODING")="ISO-8859-1";
-  }
-  if (Config_getString("LATEX_OUTPUT_ENCODING").isEmpty())
+  int &depth = Config_getInt("MAX_DOT_GRAPH_DEPTH");
+  if (depth==0)
   {
-    Config_getString("LATEX_OUTPUT_ENCODING")="ISO-8859-1";
+    depth=1000;
   }
-#endif
+
   
   // add default words if needed
   QStrList &annotationFromBrief = Config_getList("ABBREVIATE_BRIEF");
@@ -2072,7 +2069,9 @@ void Config::create()
                     "If the SOURCE_BROWSER tag is set to YES then a list of source files will \n"
                     "be generated. Documented entities will be cross-referenced with these sources. \n"
 		    "Note: To get rid of all source code in the generated output, make sure also \n"
-		    "VERBATIM_HEADERS is set to NO. \n",
+		    "VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH \n"
+		    "then you must also enable this option. If you don't then doxygen will produce \n"
+		    "a warning and turn it on anyway \n",
                     FALSE
                  );
   cb = addBool(
@@ -2895,14 +2894,27 @@ void Config::create()
                     "The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of \n"
                     "nodes that will be shown in the graph. If the number of nodes in a graph \n"
                     "becomes larger than this value, doxygen will truncate the graph, which is \n"
-                    "visualized by representing a node as a red box. Note that doxygen will always \n"
-                    "show the root nodes and its direct children regardless of this setting. \n",
+                    "visualized by representing a node as a red box. Note that doxygen if the number \n"
+                    "of direct children of the root node in a graph is already larger than \n"
+		    "MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note \n"
+                    "that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. \n",
                     0,10000, 50
                 );
   ci->addDependency("HAVE_DOT");
+  ci = addInt(
+                    "MAX_DOT_GRAPH_DEPTH",
+                    "The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the \n"
+                    "graphs generated by dot. A depth value of 3 means that only nodes reachable \n"
+                    "from the root by following a path via at most 3 edges will be shown. Nodes \n"
+		    "that lay further from the root node will be omitted. Note that setting this \n"
+		    "option to 1 or 2 may greatly reduce the computation time needed for large \n"
+		    "code bases. Also note that the size of a graph can be further restricted by \n"
+                    "DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.\n",
+                    0,1000,0
+                );
+  ci->addDependency("HAVE_DOT");
   addObsolete("MAX_DOT_GRAPH_WIDTH");
   addObsolete("MAX_DOT_GRAPH_HEIGHT");
-  addObsolete("MAX_DOT_GRAPH_DEPTH");
   cb = addBool(
                     "DOT_TRANSPARENT",
 		    "Set the DOT_TRANSPARENT tag to YES to generate images with a transparent \n"