diff options
| -rw-r--r-- | src/doxygen.cpp | 4 | ||||
| -rw-r--r-- | src/memberdef.cpp | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 8b72f86..8ab4591 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -2837,14 +2837,14 @@ static void addVariable(EntryNav *rootNav,int isFuncPtr=-1) else if (root->type.find(')',i)!=-1) // function ptr, not variable like "int (*bla)[10]" { root->type=root->type.left(root->type.length()-1); - root->args.prepend(")"); + root->args.prepend(") "); //printf("root->type=%s root->args=%s\n",root->type.data(),root->args.data()); } } else if (root->type.find("typedef ")!=-1 && root->type.right(2)=="()") // typedef void (func)(int) { root->type=root->type.left(root->type.length()-1); - root->args.prepend(")"); + root->args.prepend(") "); } } 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 |