diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2014-12-19 14:33:12 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2014-12-19 14:33:12 (GMT) |
| commit | c7f7c954ec1356e7f361da0d655c72ca0012a0cf (patch) | |
| tree | a4d1f7095c4a089986dc9ad2500a8348f05f84fd /src | |
| parent | f9c9edba086f544b813ff036ea9209744da18c44 (diff) | |
| download | Doxygen-c7f7c954ec1356e7f361da0d655c72ca0012a0cf.zip Doxygen-c7f7c954ec1356e7f361da0d655c72ca0012a0cf.tar.gz Doxygen-c7f7c954ec1356e7f361da0d655c72ca0012a0cf.tar.bz2 | |
Bug 735584 - Reached end of file while still insided a (nested) comment in Markdown
Diffstat (limited to 'src')
| -rw-r--r-- | src/commentcnv.l | 2 | ||||
| -rw-r--r-- | src/docparser.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/commentcnv.l b/src/commentcnv.l index 352985f..64e18be 100644 --- a/src/commentcnv.l +++ b/src/commentcnv.l @@ -1011,7 +1011,7 @@ void convertCppComments(BufStr *inBuf,BufStr *outBuf,const char *fileName) warn(g_fileName,ctx->lineNr,"Conditional section%sdoes not have " "a corresponding \\endcond command within this file.",sectionInfo.data()); } - if (g_nestingCount>0 || (YY_START==CComment && g_lang!=SrcLangExt_Markdown)) + if (g_nestingCount>0 && g_lang!=SrcLangExt_Markdown) { QCString tmp= "(probable line reference: "; bool first = TRUE; diff --git a/src/docparser.cpp b/src/docparser.cpp index 12eae8a..4d77537 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -1044,11 +1044,11 @@ static void handleUnclosedStyleCommands() } } -static void handleLinkedWord(DocNode *parent,QList<DocNode> &children) +static void handleLinkedWord(DocNode *parent,QList<DocNode> &children,bool ignoreAutoLinkFlag=FALSE) { QCString name = linkToText(SrcLangExt_Unknown,g_token->name,TRUE); static bool autolinkSupport = Config_getBool("AUTOLINK_SUPPORT"); - if (!autolinkSupport) // no autolinking -> add as normal word + if (!autolinkSupport && !ignoreAutoLinkFlag) // no autolinking -> add as normal word { children.append(new DocWord(parent,name)); return; @@ -1130,7 +1130,7 @@ static void handleLinkedWord(DocNode *parent,QList<DocNode> &children) // special case, where matching Foo: fails to be an Obj-C reference, // but Foo itself might be linkable. g_token->name=g_token->name.left(len-1); - handleLinkedWord(parent,children); + handleLinkedWord(parent,children,ignoreAutoLinkFlag); children.append(new DocWord(parent,":")); } else if (!g_insideHtmlLink && (cd=getClass(g_token->name+"-p"))) @@ -6113,7 +6113,7 @@ int DocPara::handleHtmlStartTag(const QCString &tagName,const HtmlAttribList &ta bool inSeeBlock = g_inSeeBlock; g_token->name = cref; g_inSeeBlock = TRUE; - handleLinkedWord(this,m_children); + handleLinkedWord(this,m_children,TRUE); g_inSeeBlock = inSeeBlock; } else // <see cref="...">...</see> style |