summaryrefslogtreecommitdiffstats
path: root/src/docparser.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-12-19 14:33:12 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-12-19 14:33:12 (GMT)
commitc7f7c954ec1356e7f361da0d655c72ca0012a0cf (patch)
treea4d1f7095c4a089986dc9ad2500a8348f05f84fd /src/docparser.cpp
parentf9c9edba086f544b813ff036ea9209744da18c44 (diff)
downloadDoxygen-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/docparser.cpp')
-rw-r--r--src/docparser.cpp8
1 files changed, 4 insertions, 4 deletions
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