Made bread crumb trails enabled unconditionally

2 files changed, 10 insertions, 17 deletions

diff --git a/src/config.xml b/src/config.xml
index 89c1422..5a0af59 100644
--- a/src/config.xml
+++ b/src/config.xml
@@ -3361,15 +3361,6 @@ remove the intermediate dot files that are used to generate the various graphs.
 ]]>
       </docs>
     </option>
-    <option type='bool' id='BREAD_CRUMB_TRAIL' defval='0'>
-      <docs>
-<![CDATA[
-If the \c BREAD_CRUMB_TRAIL tag is set to \c YES then the complete bread crumb
-trail for a page will be displayed rather than just the root group.
-]]>
-      </docs>
-    </option>
-
     <option type='obsolete' id='USE_WINDOWS_ENCODING'/>
     <option type='obsolete' id='DETAILS_AT_TOP'/>
     <option type='obsolete' id='QTHELP_FILE'/>
diff --git a/src/util.cpp b/src/util.cpp
index 9dd7bca..0049098 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -6353,12 +6353,13 @@ void addRefItem(const QList<ListItemInfo> *sli,
   }
 }
 
-bool recursivelyAddGroupListToTitle(OutputList &ol,Definition *d,bool root,bool shouldRecurse)
+bool recursivelyAddGroupListToTitle(OutputList &ol,Definition *d,bool root)
 {
   GroupList *groups = d->partOfGroups();
   if (groups) // write list of group to which this definition belongs
   {
-    if (root) {
+    if (root)
+    {
       ol.pushGeneratorState();
       ol.disableAllBut(OutputGenerator::Html);
       ol.writeString("<div class=\"ingroups\">");
@@ -6368,14 +6369,15 @@ bool recursivelyAddGroupListToTitle(OutputList &ol,Definition *d,bool root,bool
     bool first=true;
     for (gli.toFirst();(gd=gli.current());++gli)
     {
-      if (shouldRecurse && recursivelyAddGroupListToTitle(ol, gd, false, shouldRecurse)) {
-        ol.writeString(" > ");
+      if (recursivelyAddGroupListToTitle(ol, gd, FALSE))
+      {
+        ol.writeString(" &raquo; ");
       }
       if (!first) { ol.writeString(" &#124; "); } else first=FALSE;
-      ol.writeObjectLink(gd->getReference(),
-          gd->getOutputFileBase(),0,gd->groupTitle());
+      ol.writeObjectLink(gd->getReference(),gd->getOutputFileBase(),0,gd->groupTitle());
     }
-    if (root) {
+    if (root)
+    {
       ol.writeString("</div>");
       ol.popGeneratorState();
     }
@@ -6386,7 +6388,7 @@ bool recursivelyAddGroupListToTitle(OutputList &ol,Definition *d,bool root,bool
 
 void addGroupListToTitle(OutputList &ol,Definition *d)
 {
-  recursivelyAddGroupListToTitle(ol,d,true,Config_getBool("BREAD_CRUMB_TRAIL"));
+  recursivelyAddGroupListToTitle(ol,d,TRUE);
 }
 
 void filterLatexString(FTextStream &t,const char *str,