Skip to content

Commit 7836841

Browse files
committed
issue doxygen#11932 Documentation for sub group is not generated
1 parent 0188ac5 commit 7836841

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

src/groupdef.cpp

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ class GroupDefImpl : public DefinitionMixin<GroupDef>
6363
QCString anchor() const override { return QCString(); }
6464
QCString displayName(bool=TRUE) const override { return hasGroupTitle() ? m_title : DefinitionMixin::name(); }
6565
QCString groupTitle() const override { return m_title; }
66+
QCString groupTitleAsText() const override { return m_titleAsText; }
6667
void setGroupTitle( const QCString &newtitle ) override;
6768
bool hasGroupTitle( ) const override { return m_titleSet; }
6869
void addFile(FileDef *def) override;
@@ -889,7 +890,7 @@ void GroupDefImpl::writeBriefDescription(OutputList &ol)
889890
ol.writeString(" \n");
890891
ol.enable(OutputType::RTF);
891892

892-
if (hasDetailedDescription())
893+
if (hasDetailedDescription() && m_pages.size()!=numDocMembers()) // group with non-page members
893894
{
894895
ol.disableAllBut(OutputType::Html);
895896
ol.startTextLink(QCString(),"details");
@@ -997,14 +998,7 @@ void GroupDefImpl::writeNestedGroups(OutputList &ol,const QCString &title)
997998
ol.startMemberItem(anc,OutputGenerator::MemberItemType::Normal);
998999
ol.insertMemberAlign();
9991000
ol.startIndexItem(gd->getReference(),gd->getOutputFileBase());
1000-
ol.generateDoc(gd->getDefFileName(),
1001-
gd->getDefLine(),
1002-
gd,
1003-
nullptr,
1004-
gd->groupTitle(),
1005-
DocOptions()
1006-
.setSingleLine(true)
1007-
.setAutolinkSupport(false));
1001+
ol.docify(gd->groupTitleAsText());
10081002
ol.endIndexItem(gd->getReference(),gd->getOutputFileBase());
10091003
ol.endMemberItem(OutputGenerator::MemberItemType::Normal);
10101004
if (!gd->briefDescription().isEmpty() && Config_getBool(BRIEF_MEMBER_DESC))
@@ -2070,8 +2064,7 @@ bool GroupDefImpl::hasDetailedDescription() const
20702064
return ((!briefDescription().isEmpty() && repeatBrief) ||
20712065
!documentation().isEmpty() ||
20722066
!inbodyDocumentation().isEmpty() ||
2073-
hasRequirementRefs()) &&
2074-
(m_pages.size()!=numDocMembers());
2067+
hasRequirementRefs());
20752068
}
20762069

20772070
void GroupDefImpl::overrideGroupGraph(bool e)

src/groupdef.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ class GroupDef : public DefinitionMutable, public Definition
5454
ABSTRACT_BASE_CLASS(GroupDef)
5555

5656
virtual QCString groupTitle() const = 0;
57+
virtual QCString groupTitleAsText() const = 0;
5758
virtual void setGroupTitle( const QCString &newtitle ) = 0;
5859
virtual bool hasGroupTitle( ) const = 0;
5960
virtual void addFile(FileDef *def) = 0;

0 commit comments

Comments
 (0)