Merge branch 'lineno'

1 files changed, 26 insertions, 1 deletions

diff --git a/src/docparser.cpp b/src/docparser.cpp
index 7e050b3..8efe8fa 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -26,6 +26,7 @@
 #include <qdict.h>
 #include <qregexp.h>
 #include <ctype.h>
+#include <qcstringlist.h>
 
 #include "doxygen.h"
 #include "debug.h"
@@ -5204,7 +5205,31 @@ void DocPara::handleInclude(const QCString &cmdName,DocInclude::Type t)
 {
   DBG(("handleInclude(%s)\n",qPrint(cmdName)));
   int tok=doctokenizerYYlex();
-  if (tok!=TK_WHITESPACE)
+  if (tok==TK_WORD && g_token->name=="{")
+  {
+    doctokenizerYYsetStateOptions();
+    tok=doctokenizerYYlex();
+    doctokenizerYYsetStatePara();
+    QCStringList optList=QCStringList::split(",",g_token->name);
+    if (t==DocInclude::Include && optList.contains("lineno"))
+    {
+      t = DocInclude::IncWithLines;
+    }
+    else if (t==DocInclude::Snippet && optList.contains("lineno"))
+    {
+      t = DocInclude::SnipWithLines;
+    }
+    else if (t==DocInclude::Include && optList.contains("doc"))
+    {
+      t = DocInclude::IncludeDoc;
+    }
+    else if (t==DocInclude::Snippet && optList.contains("doc"))
+    {
+      t = DocInclude::SnippetDoc;
+    }
+    tok=doctokenizerYYlex();
+  }
+  else if (tok!=TK_WHITESPACE)
   {
     warn_doc_error(g_fileName,doctokenizerYYlineno,"expected whitespace after %s command",
         qPrint(cmdName));