summaryrefslogtreecommitdiffstats
path: root/src/memberdef.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/memberdef.cpp')
-rw-r--r--src/memberdef.cpp13
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