summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2019-08-04 09:45:14 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2019-08-04 09:45:14 (GMT)
commita4dde87ba3c008ff463af7b6d6d02d13212ea695 (patch)
tree814d298efd79fe3672283aa62ec207fff93bf9c1
parentfd6b2c70a4865d9385bd9dc57939877c31ac4fa9 (diff)
parent397ce928225448507d225bab56f51ed71ff8b431 (diff)
downloadDoxygen-a4dde87ba3c008ff463af7b6d6d02d13212ea695.zip
Doxygen-a4dde87ba3c008ff463af7b6d6d02d13212ea695.tar.gz
Doxygen-a4dde87ba3c008ff463af7b6d6d02d13212ea695.tar.bz2
Merge branch 'feature/bug_doc_cont' of https://github.com/albert-github/doxygen into albert-github-feature/bug_doc_cont
-rw-r--r--src/commentscan.l3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/commentscan.l b/src/commentscan.l
index 933bd59..1d7297a 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -812,6 +812,7 @@ static inline void setOutput(OutputContext ctx)
}
else
{
+ if (!current->doc.isEmpty()) current->doc += "\n";
pOutputString = &current->doc;
inContext = OutputDoc; // need to switch to detailed docs, see bug 631380
}
@@ -3146,6 +3147,8 @@ bool parseCommentBlock(/* in */ ParserInterface *parser,
parseMore = FALSE;
inBody = isInbody;
outputXRef.resize(0);
+ if (!(isBrief || isAutoBriefOn))
+ if (!current->doc.isEmpty()) current->doc += "\n";
setOutput( isBrief || isAutoBriefOn ? OutputBrief : OutputDoc );
briefEndsAtDot = isAutoBriefOn;
g_condCount = 0;