Commit 7a119638 authored by Dimitri van Heesch's avatar Dimitri van Heesch

Merge branch 'NimbusKit-feature-groupbreadcrumbs'

parents c5c76305 c7c7d73c
...@@ -3361,7 +3361,6 @@ remove the intermediate dot files that are used to generate the various graphs. ...@@ -3361,7 +3361,6 @@ remove the intermediate dot files that are used to generate the various graphs.
]]> ]]>
</docs> </docs>
</option> </option>
<option type='obsolete' id='USE_WINDOWS_ENCODING'/> <option type='obsolete' id='USE_WINDOWS_ENCODING'/>
<option type='obsolete' id='DETAILS_AT_TOP'/> <option type='obsolete' id='DETAILS_AT_TOP'/>
<option type='obsolete' id='QTHELP_FILE'/> <option type='obsolete' id='QTHELP_FILE'/>
......
...@@ -6353,26 +6353,42 @@ void addRefItem(const QList<ListItemInfo> *sli, ...@@ -6353,26 +6353,42 @@ void addRefItem(const QList<ListItemInfo> *sli,
} }
} }
void addGroupListToTitle(OutputList &ol,Definition *d) bool recursivelyAddGroupListToTitle(OutputList &ol,Definition *d,bool root)
{ {
GroupList *groups = d->partOfGroups(); GroupList *groups = d->partOfGroups();
if (groups) // write list of group to which this definition belongs if (groups) // write list of group to which this definition belongs
{
if (root)
{ {
ol.pushGeneratorState(); ol.pushGeneratorState();
ol.disableAllBut(OutputGenerator::Html); ol.disableAllBut(OutputGenerator::Html);
ol.writeString("<div class=\"ingroups\">"); ol.writeString("<div class=\"ingroups\">");
}
GroupListIterator gli(*groups); GroupListIterator gli(*groups);
GroupDef *gd; GroupDef *gd;
bool first=TRUE; bool first=true;
for (gli.toFirst();(gd=gli.current());++gli) for (gli.toFirst();(gd=gli.current());++gli)
{ {
if (recursivelyAddGroupListToTitle(ol, gd, FALSE))
{
ol.writeString(" &raquo; ");
}
if (!first) { ol.writeString(" &#124; "); } else first=FALSE; if (!first) { ol.writeString(" &#124; "); } else first=FALSE;
ol.writeObjectLink(gd->getReference(), ol.writeObjectLink(gd->getReference(),gd->getOutputFileBase(),0,gd->groupTitle());
gd->getOutputFileBase(),0,gd->groupTitle());
} }
if (root)
{
ol.writeString("</div>"); ol.writeString("</div>");
ol.popGeneratorState(); ol.popGeneratorState();
} }
return true;
}
return false;
}
void addGroupListToTitle(OutputList &ol,Definition *d)
{
recursivelyAddGroupListToTitle(ol,d,TRUE);
} }
void filterLatexString(FTextStream &t,const char *str, void filterLatexString(FTextStream &t,const char *str,
......
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