1 files changed, 11 insertions, 8 deletions

diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index 6cb6e71..93262c1 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -735,13 +735,6 @@ void MemberDef::writeDeclaration(OutputList &ol,
     if (!cname.isEmpty()) doxyName.prepend(cname+"::");
     ol.startDoxyAnchor(cfname,cname,anchor(),doxyName);
 
-    ol.addIndexItem(name(),cname);
-    ol.addIndexItem(cname,name());
-
-    if (hasHtmlHelp)
-    {
-      htmlHelp->addIndexItem(cname,name(),cfname,anchor());
-    }
     ol.pushGeneratorState();
     ol.disable(OutputGenerator::Man);
     ol.docify("\n");
@@ -1035,10 +1028,18 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol,
       else if (getFileDef())      scopeName=getFileDef()->name();
     }
   
-    // get definition. 
     QCString cname  = container->name();
     QCString cfname = container->getOutputFileBase();  
 
+    ol.addIndexItem(name(),cname);
+    ol.addIndexItem(cname,name());
+
+    if (Config_getBool("GENERATE_HTML") && Config_getBool("GENERATE_HTMLHELP"))
+    {
+      HtmlHelp *htmlHelp = HtmlHelp::getInstance();
+      htmlHelp->addIndexItem(cname,name(),cfname,anchor());
+    }
+
     // get member name
     QCString doxyName=name().copy();
     // prepend scope if there is any. TODO: make this optional for C only docs
@@ -1909,7 +1910,9 @@ void MemberDef::writeEnumDeclaration(OutputList &typeDecl,
           {
             typeDecl.pushGeneratorState();
             typeDecl.disableAllBut(OutputGenerator::Html);
+            typeDecl.enable(OutputGenerator::Latex);
             typeDecl.lineBreak(); 
+            typeDecl.disable(OutputGenerator::Latex);
             typeDecl.writeString("  ");
             typeDecl.popGeneratorState();
           }