Permalink
Browse files

Bug 735145 - QHP toc broken if mainpage with PROJECT_NAME title has s…

…ections/subpages
  • Loading branch information...
Dimitri van Heesch
Dimitri van Heesch committed Aug 24, 2014
1 parent fdd1c3f commit 745955f576cbd7b5f7601c55937d9c42db8161e8
Showing with 22 additions and 8 deletions.
  1. +13 −2 src/index.cpp
  2. +8 −4 src/qhp.cpp
  3. +1 −2 src/qhp.h
View
@@ -3079,6 +3079,17 @@ static void countRelatedPages(int &docPages,int &indexPages)
//----------------------------------------------------------------------------
static bool mainPageHasOwnTitle()
{
static QCString projectName = Config_getString("PROJECT_NAME");
QCString title;
if (Doxygen::mainPage)
{
title = filterTitle(Doxygen::mainPage->title());
}
return !projectName.isEmpty() && mainPageHasTitle() && qstricmp(title,projectName)!=0;
}
static void writePages(PageDef *pd,FTVHelp *ftv)
{
//printf("writePages()=%s pd=%p mainpage=%p\n",pd->name().data(),pd,Doxygen::mainPage);
@@ -3115,8 +3126,8 @@ static void writePages(PageDef *pd,FTVHelp *ftv)
}
}
if (hasSubPages && ftv) ftv->incContentsDepth();
bool doIndent = (hasSections || hasSubPages) &&
(pd!=Doxygen::mainPage || mainPageHasTitle());
bool doIndent = (hasSections || hasSubPages) &&
(pd!=Doxygen::mainPage || mainPageHasOwnTitle());
if (doIndent)
{
Doxygen::indexList->incContentsDepth();
View
@@ -53,7 +53,7 @@ static QCString makeRef(const char * withoutExtension, const char * anchor)
return result+"#"+anchor;
}
Qhp::Qhp() : m_prevSectionLevel(0), m_sectionLevel(0)
Qhp::Qhp() : m_prevSectionLevel(0), m_sectionLevel(0), m_skipMainPageSection(FALSE)
{
m_doc.setIndentLevel(0);
m_toc.setIndentLevel(2);
@@ -177,14 +177,13 @@ void Qhp::finalize()
void Qhp::incContentsDepth()
{
m_sectionLevel++;
//printf("Qhp::incContentsDepth() %d->%d\n",m_sectionLevel-1,m_sectionLevel);
}
void Qhp::decContentsDepth()
{
//printf("Qhp::decContentsDepth() %d->%d\n",m_sectionLevel,m_sectionLevel-1);
if (m_sectionLevel <= 0)
if (m_sectionLevel<=0 || (m_sectionLevel==1 && m_skipMainPageSection))
{
m_skipMainPageSection=FALSE;
return;
}
m_sectionLevel--;
@@ -208,6 +207,7 @@ void Qhp::addContentsItem(bool /*isDir*/, const char * name,
setPrevSection(name, f, anchor, m_sectionLevel);
// Close sections as needed
//printf("Qhp::addContentsItem() closing %d sections\n",diff);
for (; diff > 0; diff--)
{
m_toc.close("section");
@@ -331,6 +331,10 @@ void Qhp::handlePrevSection()
m_toc.openClose("section", attributes);
}
}
else
{
m_skipMainPageSection=TRUE;
}
clearPrevSection();
}
View
@@ -64,8 +64,7 @@ class Qhp : public IndexIntf
int m_prevSectionLevel;
int m_sectionLevel;
//QCString m_prevIdName;
//QCString m_prevIdRef;
bool m_skipMainPageSection;
};
#endif // DOXYGEN_QHP_H

0 comments on commit 745955f

Please sign in to comment.