summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2017-08-21 09:32:12 (GMT)
committerGitHub <noreply@github.com>2017-08-21 09:32:12 (GMT)
commit3ae2ec6fb1fb372c8acd802cc528f27800a309e3 (patch)
treed4b15a1a7c587fd07a37bebc02814984992511fc
parentf8cb29c0509d7f03c635dce394aec95ca06a37b6 (diff)
parent9d0908359363dbb43236767669c214721700acf7 (diff)
downloadDoxygen-3ae2ec6fb1fb372c8acd802cc528f27800a309e3.zip
Doxygen-3ae2ec6fb1fb372c8acd802cc528f27800a309e3.tar.gz
Doxygen-3ae2ec6fb1fb372c8acd802cc528f27800a309e3.tar.bz2
Merge pull request #582 from artur-kink/master
Fixup man page NAME section when page has title
-rw-r--r--src/pagedef.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/pagedef.cpp b/src/pagedef.cpp
index 1210305..e797b050 100644
--- a/src/pagedef.cpp
+++ b/src/pagedef.cpp
@@ -169,6 +169,11 @@ void PageDef::writeDocumentation(OutputList &ol)
ol.endTitleHead(manPageName, manPageName);
if (si)
{
+ ol.pushGeneratorState();
+ ol.disableAllBut(OutputGenerator::Man);
+ ol.writeString(" - ");
+ ol.popGeneratorState();
+
ol.generateDoc(docFile(),docLine(),this,0,si->title,TRUE,FALSE,0,TRUE,FALSE);
ol.endSection(si->label,si->type);
}
@@ -230,7 +235,7 @@ void PageDef::writePageDocumentation(OutputList &ol)
ol.startTextBlock();
QCString docStr = documentation()+inbodyDocumentation();
- if (!docStr.isEmpty())
+ if (hasBriefDescription() && !Doxygen::sectionDict->find(name()))
{
ol.pushGeneratorState();
ol.disableAllBut(OutputGenerator::Man);