summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2021-06-13 11:49:33 (GMT)
committeralbert-github <albert.tests@gmail.com>2021-06-13 11:49:33 (GMT)
commitecde20826540d339c5f03e6ff7eb77464af9c269 (patch)
tree7e75264c85c27e50ba6a725672b5a132a65cce34
parent6200bc83119593e1f37adae88284a2d3bf8beed6 (diff)
downloadDoxygen-ecde20826540d339c5f03e6ff7eb77464af9c269.zip
Doxygen-ecde20826540d339c5f03e6ff7eb77464af9c269.tar.gz
Doxygen-ecde20826540d339c5f03e6ff7eb77464af9c269.tar.bz2
Merged brief and detailed description in case if INLINE_SIMPLE_STRUCTS with LaTeX/ RTF
When we have a program like: ``` /** \file */ /** outer */ struct Outer { /** foo */ union Foo { /** Bar */ struct FooFlags { bool cond1; /*!< \brief bar 1 * \details details1 bar 1 */ bool cond2; /*!< bar 2 */ } flags; /*!< \brief foo bar * \details details2 of foo bar */ } myMember; /*!< public member */ private: void myWork(); /*!< private member function */ }; ``` and a Doxyfile like ``` INLINE_SIMPLE_STRUCTS = YES QUIET=YES GENERATE_RTF=YES ``` We see in HTML that brief and detailed description start on a separate line, but for LaTeX and RTF (it is not implemented in docbook) the detailed description directly follows the brief description without a line separator.
-rw-r--r--src/memberdef.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index c116b7c..ef71566 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -3770,6 +3770,12 @@ void MemberDefImpl::writeMemberDocSimple(OutputList &ol, const Definition *conta
/* write detailed description */
if (!detailed.isEmpty())
{
+ if (!brief.isEmpty())
+ {
+ ol.disable(OutputGenerator::Html);
+ ol.lineBreak();
+ ol.enable(OutputGenerator::Html);
+ }
ol.generateDoc(docFile(),docLine(),
getOuterScope()?getOuterScope():container,this,
detailed+"\n",FALSE,FALSE,