1 files changed, 16 insertions, 3 deletions

diff --git a/src/index.cpp b/src/index.cpp
index 3a17c29..bfa4954 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -3829,6 +3829,18 @@ static void writeIndex(OutputList &ol)
   ol.writeSplitBar(indexName);
   ol.writeSearchInfo();
   bool headerWritten=FALSE;
+  if (Doxygen::mainPage)
+  {
+    if (!Doxygen::mainPage->title().isEmpty())
+    {
+      if (Doxygen::mainPage->title().lower() != "notitle")
+        ol.startPageDoc(Doxygen::mainPage->title());
+      else
+        ol.startPageDoc("");
+    }
+    else
+      ol.startPageDoc(projectName);
+  }
   if (Doxygen::mainPage && !Doxygen::mainPage->title().isEmpty())
   {
     if (Doxygen::mainPage->title().lower()!="notitle")
@@ -3876,6 +3888,7 @@ static void writeIndex(OutputList &ol)
                 Doxygen::mainPage->documentation(),TRUE,FALSE
                 /*,Doxygen::mainPage->sectionDict*/);
     ol.endTextBlock();
+    ol.endPageDoc();
 
     Doxygen::insideMainPage=FALSE;
   }
@@ -4333,7 +4346,7 @@ void renderMemberIndicesAsJs(FTextStream &t,
         firstMember=FALSE;
       }
       t << endl << "{text:\"" << convertToJSString(getInfo(i)->title) << "\",url:\""
-        << convertToJSString(getInfo(i)->fname+Doxygen::htmlFileExtension) << "\"";
+        << convertToJSString(getInfo(i)->fname+Doxygen::htmlFileExtension, false) << "\"";
 
       // Check if we have many members, then add sub entries per letter...
       // quick alphabetical index
@@ -4363,7 +4376,7 @@ void renderMemberIndicesAsJs(FTextStream &t,
           else // other pages of multi page index
             anchor=fullName+"_"+is+extension+"#index_";
           t << "{text:\"" << convertToJSString(ci) << "\",url:\""
-            << convertToJSString(anchor+is) << "\"}";
+            << convertToJSString(anchor+is, false) << "\"}";
           firstLetter=FALSE;
         }
         t << "]";
@@ -4399,7 +4412,7 @@ static bool renderQuickLinksAsJs(FTextStream &t,LayoutNavEntry *root,bool first)
         firstChild=FALSE;
         QCString url = entry->url();
         t << "{text:\"" << convertToJSString(entry->title()) << "\",url:\""
-          << convertToJSString(url) << "\"";
+          << convertToJSString(url, false) << "\"";
         bool hasChildren=FALSE;
         if (entry->kind()==LayoutNavEntry::NamespaceMembers)
         {