Release-1.3.5-20040105

1 files changed, 20 insertions, 10 deletions

diff --git a/src/config.l b/src/config.l
index b2f7848..7b097f6 100644
--- a/src/config.l
+++ b/src/config.l
@@ -2,7 +2,7 @@
  *
  * 
  *
- * Copyright (C) 1997-2003 by Dimitri van Heesch.
+ * Copyright (C) 1997-2004 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation under the terms of the GNU General Public License is hereby 
@@ -721,6 +721,8 @@ static void substEnvVarsInStrList(QStrList &sl)
     bool wasQuoted = (result.find(' ')!=-1) || (result.find('\t')!=-1);
     substEnvVarsInString(result);
 
+    //printf("Result %s was quoted=%d\n",result.data(),wasQuoted);
+
     if (!wasQuoted) /* as a result of the expansion, a single string
 		       may have expanded into a list, which we'll
 		       add to sl. If the orginal string already 
@@ -776,19 +778,19 @@ static void substEnvVarsInStrList(QStrList &sl)
 	sl.insert(sl.at(),result.right(l-p)); // insert new item before current item.
 	sl.next();                 // current item is now the old item
       }
-
-      // remove the old unexpanded string from the list
-      i=sl.at();
-      sl.remove(); // current item index changes if the last element is removed.
-      if (sl.at()==i)     // not last item
-	s = sl.current();
-      else                // just removed last item
-	s = 0;
     }
     else // just goto the next element in the list
     {
-      s=sl.next();
+      sl.insert(sl.at(),result);
+      sl.next();
     }
+    // remove the old unexpanded string from the list
+    int i=sl.at();
+    sl.remove(); // current item index changes if the last element is removed.
+    if (sl.at()==i)     // not last item
+	s = sl.current();
+    else                // just removed last item
+	s = 0;
   }
 }
 
@@ -1673,6 +1675,14 @@ void Config::create()
                     TRUE
                  );
   cb = addBool(
+                    "SORT_BRIEF_DOCS",
+                    "If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the \n"
+                    "brief documentation of file, namespace and class members alphabetically \n"
+                    "by member name. If set to NO (the default) the members will appear in \n"
+                    "declaration order. \n",
+                    FALSE
+                 );
+  cb = addBool(
                     "GENERATE_TODOLIST",
                     "The GENERATE_TODOLIST tag can be used to enable (YES) or \n"
                     "disable (NO) the todo list. This list is created by putting \\todo \n"