diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2014-09-03 20:39:34 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2014-09-03 20:39:34 (GMT) |
| commit | 83c1a1278a48cbcd5d31f721d247e611c61c4661 (patch) | |
| tree | 75f389476de609be658d0f2f26c0bacca15b71c3 /src/memberdef.cpp | |
| parent | 808b6174027ae53083aab386a7bc0eecc72c7a0d (diff) | |
| parent | 4bbcf71defb2e2be02494b7ff68d475d1a0438ac (diff) | |
| download | Doxygen-83c1a1278a48cbcd5d31f721d247e611c61c4661.zip Doxygen-83c1a1278a48cbcd5d31f721d247e611c61c4661.tar.gz Doxygen-83c1a1278a48cbcd5d31f721d247e611c61c4661.tar.bz2 | |
Merge pull request #214 from ellert/missing-spaces
Bug 651848 & 652276 - Missing spaces in man page output
Diffstat (limited to 'src/memberdef.cpp')
| -rw-r--r-- | src/memberdef.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 4848cc4..0485c88 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -270,8 +270,11 @@ static bool writeDefArgumentList(OutputList &ol,ClassDef *cd, //{ // ol.docify(" "); //} - ol.disable(OutputGenerator::Man); ol.disable(OutputGenerator::Latex); + ol.disable(OutputGenerator::Html); + ol.docify(" "); /* man page */ + if (htmlOn) ol.enable(OutputGenerator::Html); + ol.disable(OutputGenerator::Man); ol.startEmphasis(); ol.enable(OutputGenerator::Man); if (latexOn) ol.enable(OutputGenerator::Latex); @@ -1666,12 +1669,16 @@ void MemberDef::writeDeclaration(OutputList &ol, // *** write arguments if (argsString() && !isObjCMethod()) { - if (!isDefine()) ol.writeString(" "); + if (!isDefine() && !isTypedef()) ol.writeString(" "); linkifyText(TextGeneratorOLImpl(ol), // out d, // scope getBodyDef(), // fileScope this, // self - argsString(), // text + isDefine() ? + (const char*)substitute(argsString(),",",", ") : + isTypedef() ? + (const char*)substitute(argsString(),")(",") (") : + argsString(), // text m_impl->annMemb, // autoBreak TRUE, // external FALSE, // keepSpaces |