diff options
-rw-r--r-- | src/commentscan.l | 2 | ||||
-rw-r--r-- | src/docgroup.cpp | 17 | ||||
-rw-r--r-- | src/docgroup.h | 2 | ||||
-rw-r--r-- | src/markdown.cpp | 1 |
4 files changed, 13 insertions, 9 deletions
diff --git a/src/commentscan.l b/src/commentscan.l index a52821c..933bd59 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -2545,7 +2545,7 @@ static bool handleName(const QCString &, const QCStringList &) BEGIN( NameParam ); if (!Doxygen::docGroup.isEmpty()) // end of previous member group { - Doxygen::docGroup.close(current,yyFileName,yyLineNr,TRUE); + Doxygen::docGroup.close(current,yyFileName,yyLineNr,TRUE,true); } } return stop; diff --git a/src/docgroup.cpp b/src/docgroup.cpp index 2dcca70..1f4fb6d 100644 --- a/src/docgroup.cpp +++ b/src/docgroup.cpp @@ -119,15 +119,18 @@ void DocGroup::open(Entry *e,const char *,int, bool implicit) } } -void DocGroup::close(Entry *e,const char *fileName,int line,bool foundInline) +void DocGroup::close(Entry *e,const char *fileName,int line,bool foundInline,bool implicit) { - if (m_openCount < 1) + if (!implicit) { - warn(fileName,line,"unbalanced grouping commands"); - } - else - { - m_openCount--; + if (m_openCount < 1) + { + warn(fileName,line,"unbalanced grouping commands"); + } + else + { + m_openCount--; + } } //printf("==> closeGroup(name=%s,sec=%x,file=%s,line=%d) m_autoGroupStack=%d\n", // e->name.data(),e->section,fileName,line,m_autoGroupStack.count()); diff --git a/src/docgroup.h b/src/docgroup.h index 4ce9af9..4775d90 100644 --- a/src/docgroup.h +++ b/src/docgroup.h @@ -33,7 +33,7 @@ class DocGroup void enterCompound(const char *fileName,int line,const char *name); void leaveCompound(const char *,int,const char * /*name*/); void open(Entry *e,const char *,int,bool implicit=false); - void close(Entry *e,const char *fileName,int line,bool foundInline); + void close(Entry *e,const char *fileName,int line,bool foundInline,bool implicit=false); void initGroupInfo(Entry *e); bool isEmpty() const; void clearHeader(); diff --git a/src/markdown.cpp b/src/markdown.cpp index 8154b8f..ec04b21 100644 --- a/src/markdown.cpp +++ b/src/markdown.cpp @@ -2590,6 +2590,7 @@ void MarkdownFileParser::parseInput(const char *fileName, QCString docs = fileBuf; QCString id; QCString title=extractPageTitle(docs,id).stripWhiteSpace(); + if (QString(id).startsWith("autotoc_md")) id = ""; g_indentLevel=title.isEmpty() ? 0 : -1; QCString titleFn = QFileInfo(fileName).baseName().utf8(); QCString fn = QFileInfo(fileName).fileName().utf8(); |