Commit 83c1a127 authored by Dimitri van Heesch's avatar Dimitri van Heesch

Merge pull request #214 from ellert/missing-spaces

Bug 651848 & 652276 - Missing spaces in man page output
parents 808b6174 4bbcf71d
...@@ -2837,14 +2837,14 @@ static void addVariable(EntryNav *rootNav,int isFuncPtr=-1) ...@@ -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]" 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->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()); //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) 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->type=root->type.left(root->type.length()-1);
root->args.prepend(")"); root->args.prepend(") ");
} }
} }
......
...@@ -270,8 +270,11 @@ static bool writeDefArgumentList(OutputList &ol,ClassDef *cd, ...@@ -270,8 +270,11 @@ static bool writeDefArgumentList(OutputList &ol,ClassDef *cd,
//{ //{
// ol.docify(" "); // ol.docify(" ");
//} //}
ol.disable(OutputGenerator::Man);
ol.disable(OutputGenerator::Latex); 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.startEmphasis();
ol.enable(OutputGenerator::Man); ol.enable(OutputGenerator::Man);
if (latexOn) ol.enable(OutputGenerator::Latex); if (latexOn) ol.enable(OutputGenerator::Latex);
...@@ -1666,12 +1669,16 @@ void MemberDef::writeDeclaration(OutputList &ol, ...@@ -1666,12 +1669,16 @@ void MemberDef::writeDeclaration(OutputList &ol,
// *** write arguments // *** write arguments
if (argsString() && !isObjCMethod()) if (argsString() && !isObjCMethod())
{ {
if (!isDefine()) ol.writeString(" "); if (!isDefine() && !isTypedef()) ol.writeString(" ");
linkifyText(TextGeneratorOLImpl(ol), // out linkifyText(TextGeneratorOLImpl(ol), // out
d, // scope d, // scope
getBodyDef(), // fileScope getBodyDef(), // fileScope
this, // self this, // self
argsString(), // text isDefine() ?
(const char*)substitute(argsString(),",",", ") :
isTypedef() ?
(const char*)substitute(argsString(),")(",") (") :
argsString(), // text
m_impl->annMemb, // autoBreak m_impl->annMemb, // autoBreak
TRUE, // external TRUE, // external
FALSE, // keepSpaces FALSE, // keepSpaces
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment