summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2019-07-07 13:59:44 (GMT)
committeralbert-github <albert.tests@gmail.com>2019-07-07 13:59:44 (GMT)
commit397ce928225448507d225bab56f51ed71ff8b431 (patch)
treea1250562946a2dfe3bbb18ec7d9583210e1c0302
parent54f758e77fad281c0bcc80c3322cbb1822334b37 (diff)
downloadDoxygen-397ce928225448507d225bab56f51ed71ff8b431.zip
Doxygen-397ce928225448507d225bab56f51ed71ff8b431.tar.gz
Doxygen-397ce928225448507d225bab56f51ed71ff8b431.tar.bz2
Incorrect joining documentation sections.
In case we have a documentation block that is interrupted the following part is directly appended to it without an appropriate newline and results, in this case, in messages like: ``` aa.c:13: warning: Illegal command @verbatim as part of a title section aa.c:15: warning: unexpected command endverbatim bb.f:13: warning: Illegal command @verbatim as part of a title section bb.f:15: warning: unexpected command endverbatim ``` We need a solution at 2 places due to the reset of of `OutputBrief` to `OutputDoc` in `setOutput` The original problem results from the "The R Project for Statistical Computing" version 3.6.1 in the Fortran part.
-rw-r--r--src/commentscan.l3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/commentscan.l b/src/commentscan.l
index 665360c..dc676d4 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -827,6 +827,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
}
@@ -3158,6 +3159,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;