Release-1.2.11-20011003

20 files changed, 1415 insertions, 1353 deletions

diff --git a/src/bufstr.h b/src/bufstr.h
index 550ec4d..b771c03 100644
--- a/src/bufstr.h
+++ b/src/bufstr.h
@@ -31,7 +31,7 @@ class BufStr : public QCString
     {
       if (offset>=size()) 
       {
-        resize(size()+spareRoom);
+        QCString::resize(size()+spareRoom);
       }
       data()[offset++]=c;
     }
@@ -39,7 +39,7 @@ class BufStr : public QCString
     {
       if (offset+len>=size()) 
       {
-        resize(size()+len+spareRoom);
+        QCString::resize(size()+len+spareRoom);
       }
       memcpy(data()+offset,a,len);
       offset+=len;
@@ -49,16 +49,21 @@ class BufStr : public QCString
     {
       if (offset+s>=size()) 
       {
-        resize(size()+s+spareRoom);
+        QCString::resize(size()+s+spareRoom);
       }
       offset+=s;
     }
     void resize( uint newlen )
     {
-      QCString::resize(newlen);
-      if (offset>newlen)
+      //QCString::resize(newlen);
+      //if (offset>newlen)
+      //{
+      //  offset=newlen;
+      //}
+      offset=newlen;
+      if (offset>=size()) 
       {
-        offset=newlen;
+        QCString::resize(size()+spareRoom);
       }
     }
   private:
diff --git a/src/code.l b/src/code.l
index 39f5e6e..a6f0fb1 100644
--- a/src/code.l
+++ b/src/code.l
@@ -231,7 +231,7 @@ static void startCodeLine()
 static void endFontClass();
 static void endCodeLine()
 {
-  endFontClass();
+  if (g_currentFontClass) { g_code->endFontClass(); }
   g_code->endCodeLine();
 }
 
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index b3582f0..6f9ba95 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -70,8 +70,9 @@ static QDict<Entry> classEntries(1009);
 ClassSDict     Doxygen::classSDict(1009);         
 ClassSDict     Doxygen::hiddenClasses(257);
 
-NamespaceList  Doxygen::namespaceList;           // all namespaces
-NamespaceDict  Doxygen::namespaceDict(257);      
+//NamespaceList  Doxygen::namespaceList;           // all namespaces
+//NamespaceDict  Doxygen::namespaceDict(257);      
+NamespaceSDict  Doxygen::namespaceSDict(17);      
 
 MemberNameList Doxygen::memberNameList;          // class member + related functions
 MemberNameDict Doxygen::memberNameDict(10007);   
@@ -123,7 +124,7 @@ void clearAll()
   delete outputList; outputList=0;
 
   Doxygen::classSDict.clear();       
-  Doxygen::namespaceList.clear();   
+  Doxygen::namespaceSDict.clear();   
   Doxygen::pageSDict->clear();         
   Doxygen::exampleSDict->clear();      
   Doxygen::memberNameList.clear();  
@@ -132,7 +133,6 @@ void clearAll()
   Doxygen::groupList.clear();       
   Doxygen::formulaList.clear();     
   Doxygen::classSDict.clear();        
-  Doxygen::namespaceDict.clear();     
   Doxygen::memberNameDict.clear();  
   Doxygen::functionNameDict.clear();
   Doxygen::sectionDict.clear();       
@@ -161,8 +161,6 @@ void statistics()
   Doxygen::imageNameDict->statistics();
   fprintf(stderr,"--- dotFileNameDict stats ----\n");
   Doxygen::dotFileNameDict->statistics();
-  fprintf(stderr,"--- namespaceDict stats ----\n");
-  Doxygen::namespaceDict.statistics();
   fprintf(stderr,"--- memberNameDict stats ----\n");
   Doxygen::memberNameDict.statistics();
   fprintf(stderr,"--- functionNameDict stats ----\n");
@@ -713,7 +711,7 @@ ArgumentList *getTemplateArgumentsFromName(
   int i,p=0;
   while ((i=name.find("::",p))!=-1)
   {
-    NamespaceDef *nd = Doxygen::namespaceDict[name.left(i)];
+    NamespaceDef *nd = Doxygen::namespaceSDict[name.left(i)];
     if (nd==0)
     {
       ClassDef *cd = getClass(name.left(i));
@@ -982,7 +980,7 @@ static void buildNamespaceList(Entry *root)
       //printf("Found namespace %s in %s at line %d\n",root->name.data(),
       //        root->fileName.data(), root->startLine);
       NamespaceDef *nd;
-      if ((nd=Doxygen::namespaceDict[fullName])) // existing namespace
+      if ((nd=Doxygen::namespaceSDict[fullName])) // existing namespace
       {
         if (!root->doc.isEmpty() || !root->brief.isEmpty()) // block contains docs
         { 
@@ -1051,8 +1049,7 @@ static void buildNamespaceList(Entry *root)
         nd->setBodySegment(root->bodyLine,root->endBodyLine);
         nd->setBodyDef(fd);
         // add class to the list
-        Doxygen::namespaceList.inSort(nd);
-        Doxygen::namespaceDict.insert(fullName,nd);
+        Doxygen::namespaceSDict.inSort(fullName,nd);
 
         // also add namespace to the correct structural context 
         Definition *d = findScopeFromQualifiedName(Doxygen::globalScope,fullName);
@@ -1177,8 +1174,7 @@ static void findUsingDirectives(Entry *root)
         nd->setBriefDescription(root->brief);
         nd->insertUsedFile(root->fileName);
         // add class to the list
-        Doxygen::namespaceList.inSort(nd);
-        Doxygen::namespaceDict.insert(root->name,nd);
+        Doxygen::namespaceSDict.inSort(root->name,nd);
         nd->setRefItems(root->todoId,root->testId,root->bugId);
       }
     }
@@ -3225,11 +3221,11 @@ static void computeMemberReferences()
     }
     fn=Doxygen::inputNameList.next();
   }
-  NamespaceDef *nd=Doxygen::namespaceList.first();
-  while (nd)
+  NamespaceSDict::Iterator nli(Doxygen::namespaceSDict);
+  NamespaceDef *nd=0;
+  for (nli.toFirst();(nd=nli.current());++nli)
   {
     nd->computeAnchors();
-    nd=Doxygen::namespaceList.next();
   }
   GroupDef *gd=Doxygen::groupList.first();
   while (gd)
@@ -3355,14 +3351,14 @@ static void addTodoTestBugReferences()
     }
     fn=Doxygen::inputNameList.next();
   }
-  NamespaceDef *nd=Doxygen::namespaceList.first();
-  while (nd)
+  NamespaceSDict::Iterator nli(Doxygen::namespaceSDict);
+  NamespaceDef *nd=0;
+  for (nli.toFirst();(nd=nli.current());++nli)
   {
     addRefItem(nd->todoId(),nd->testId(),nd->bugId(),
                theTranslator->trNamespace(TRUE,TRUE),
                nd->getOutputFileBase(),nd->name());
     addFileMemberTodoTestBugReferences(nd);
-    nd=Doxygen::namespaceList.next();
   }
   GroupDef *gd=Doxygen::groupList.first();
   while (gd)
@@ -5081,7 +5077,7 @@ static void addSourceReferences()
     }
   }
   // add source references for namespace definitions
-  NamespaceListIterator nli(Doxygen::namespaceList);
+  NamespaceSDict::Iterator nli(Doxygen::namespaceSDict);
   NamespaceDef *nd=0;
   for (nli.toFirst();(nd=nli.current());++nli)
   {
@@ -5251,11 +5247,11 @@ static void addMembersToMemberGroup()
     fn=Doxygen::inputNameList.next();
   }
   // for each namespace
-  NamespaceDef *nd=Doxygen::namespaceList.first();
-  while (nd)
+  NamespaceSDict::Iterator nli(Doxygen::namespaceSDict);
+  NamespaceDef *nd;
+  for ( ; (nd=nli.current()) ; ++nli )
   {
     nd->addMembersToMemberGroup();
-    nd=Doxygen::namespaceList.next();
   }
   // for each group
   GroupDef *gd=Doxygen::groupList.first();
@@ -5290,11 +5286,11 @@ static void distributeMemberGroupDocumentation()
     fn=Doxygen::inputNameList.next();
   }
   // for each namespace
-  NamespaceDef *nd=Doxygen::namespaceList.first();
-  while (nd)
+  NamespaceSDict::Iterator nli(Doxygen::namespaceSDict);
+  NamespaceDef *nd;
+  for ( ; (nd=nli.current()) ; ++nli )
   {
     nd->distributeMemberGroupDocumentation();
-    nd=Doxygen::namespaceList.next();
   }
   // for each group
   GroupDef *gd=Doxygen::groupList.first();
@@ -5770,7 +5766,7 @@ static void generateNamespaceDocs()
 {
   writeNamespaceIndex(*outputList);
   
-  NamespaceListIterator nli(Doxygen::namespaceList);
+  NamespaceSDict::Iterator nli(Doxygen::namespaceSDict);
   NamespaceDef *nd;
   for (;(nd=nli.current());++nli)
   {
@@ -6083,6 +6079,7 @@ static void copyAndFilterFile(const char *fileName,BufStr &dest)
   // try to open file
   int size=0;
   uint oldPos = dest.curPos();
+  //printf(".......oldPos=%d\n",oldPos);
 
   QFileInfo fi(fileName);
   if (!fi.exists()) return;
@@ -6136,7 +6133,8 @@ static void copyAndFilterFile(const char *fileName,BufStr &dest)
   //printf("filter char at %p size=%d newSize=%d\n",dest.data()+oldPos,size,newSize);
   if (newSize!=size) // we removed chars
   {
-    dest.resize(newSize); // resize the array
+    dest.resize(oldPos+newSize); // resize the array
+    //printf(".......resizing from %d to %d\n",oldPos+size,oldPos+newSize);
   }
 }
 
diff --git a/src/doxygen.h b/src/doxygen.h
index de5372d..aa85485 100644
--- a/src/doxygen.h
+++ b/src/doxygen.h
@@ -83,8 +83,9 @@ class Doxygen
     static StringDict namespaceAliasDict;
     static GroupList groupList;
     static GroupDict groupDict;
-    static NamespaceList namespaceList;
-    static NamespaceDict namespaceDict;
+    //static NamespaceList namespaceList;
+    //static NamespaceDict namespaceDict;
+    static NamespaceSDict namespaceSDict;
     static FormulaList formulaList;
     static FormulaDict formulaDict;
     static FormulaDict formulaNameDict;
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index 286b35d..8ef3df0 100644
--- a/src/htmlgen.cpp
+++ b/src/htmlgen.cpp
@@ -819,12 +819,12 @@ void HtmlGenerator::endIndexKey()
   t << "</td>";
 }
 
-void HtmlGenerator::startIndexValue() 
+void HtmlGenerator::startIndexValue(bool) 
 { 
   t << "<td>"; 
 }
 
-void HtmlGenerator::endIndexValue(const char *)
+void HtmlGenerator::endIndexValue(const char *,bool)
 {
   t << "</td></tr>" << endl;
 }
diff --git a/src/htmlgen.h b/src/htmlgen.h
index c220473..40a37bc 100644
--- a/src/htmlgen.h
+++ b/src/htmlgen.h
@@ -68,8 +68,8 @@ class HtmlGenerator : public OutputGenerator
     void endIndexList();
     void startIndexKey();
     void endIndexKey();
-    void startIndexValue();
-    void endIndexValue(const char *);
+    void startIndexValue(bool);
+    void endIndexValue(const char *,bool);
     void startItemList()  { t << "<ul>"  << endl; }
     void endItemList()    { t << "</ul>" << endl; }
     void startEnumList()  { t << "<ol>"  << endl; }
diff --git a/src/index.cpp b/src/index.cpp
index 79cc8cc..492c4da 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -944,8 +944,9 @@ void writeFileIndex(OutputList &ol)
           ol.popGeneratorState();
         }
         ol.endIndexKey();
-        ol.startIndexValue();
-        if (!fd->briefDescription().isEmpty())
+        bool hasBrief = !fd->briefDescription().isEmpty();
+        ol.startIndexValue(hasBrief);
+        if (hasBrief)
         {
           //ol.docify(" (");
           parseDoc(ol,
@@ -954,7 +955,7 @@ void writeFileIndex(OutputList &ol)
               abbreviate(fd->briefDescription(),fd->name()));
           //ol.docify(")");
         }
-        ol.endIndexValue(fd->getOutputFileBase());
+        ol.endIndexValue(fd->getOutputFileBase(),hasBrief);
         //ol.popGeneratorState();
         // --------------------------------------------------------
       }
@@ -986,7 +987,7 @@ void writeFileIndex(OutputList &ol)
 int countNamespaces()
 {
   int count=0;
-  NamespaceListIterator nli(Doxygen::namespaceList);
+  NamespaceSDict::Iterator nli(Doxygen::namespaceSDict);
   NamespaceDef *nd;
   for (;(nd=nli.current());++nli)
   {
@@ -1034,8 +1035,10 @@ void writeNamespaceIndex(OutputList &ol)
   ol.endTextBlock();
 
   bool first=TRUE;
-  NamespaceDef *nd=Doxygen::namespaceList.first();
-  while (nd)
+
+  NamespaceSDict::Iterator nli(Doxygen::namespaceSDict);
+  NamespaceDef *nd;
+  for (nli.toFirst();(nd=nli.current());++nli)
   {
     if (nd->isLinkableInProject())
     {
@@ -1048,8 +1051,9 @@ void writeNamespaceIndex(OutputList &ol)
       ol.startIndexKey();
       ol.writeObjectLink(0,nd->getOutputFileBase(),0,nd->name());
       ol.endIndexKey();
-      ol.startIndexValue();
-      if (!nd->briefDescription().isEmpty())
+      bool hasBrief = !nd->briefDescription().isEmpty();
+      ol.startIndexValue(hasBrief);
+      if (hasBrief)
       {
         //ol.docify(" (");
         parseDoc(ol,
@@ -1058,7 +1062,7 @@ void writeNamespaceIndex(OutputList &ol)
                  abbreviate(nd->briefDescription(),nd->name()));
         //ol.docify(")");
       }
-      ol.endIndexValue(nd->getOutputFileBase());
+      ol.endIndexValue(nd->getOutputFileBase(),hasBrief);
       //ol.writeEndAnnoItem(nd->getOutputFileBase());
       if (hasHtmlHelp)
       {
@@ -1069,7 +1073,6 @@ void writeNamespaceIndex(OutputList &ol)
         ftvHelp->addContentsItem(FALSE,nd->getReference(),nd->getOutputFileBase(),0,nd->name());
       }
     }
-    nd=Doxygen::namespaceList.next();
   }
   if (!first) ol.endIndexList();
   if (hasHtmlHelp)
@@ -1124,8 +1127,9 @@ void writeAnnotatedClassList(OutputList &ol)
       ol.startIndexKey();
       ol.writeObjectLink(0,cd->getOutputFileBase(),0,cd->displayName());
       ol.endIndexKey();
-      ol.startIndexValue();
-      if (!cd->briefDescription().isEmpty())
+      bool hasBrief = !cd->briefDescription().isEmpty();
+      ol.startIndexValue(hasBrief);
+      if (hasBrief)
       {
         //ol.docify(" (");
         parseDoc(ol,
@@ -1134,7 +1138,7 @@ void writeAnnotatedClassList(OutputList &ol)
                  abbreviate(cd->briefDescription(),cd->name()));
         //ol.docify(")");
       }
-      ol.endIndexValue(cd->getOutputFileBase());
+      ol.endIndexValue(cd->getOutputFileBase(),hasBrief);
       //ol.writeEndAnnoItem(cd->getOutputFileBase());
       if (hasHtmlHelp)
       {
@@ -1167,8 +1171,9 @@ void writePackageList(OutputList &ol)
       ol.startIndexKey();
       ol.writeObjectLink(0,pd->getOutputFileBase(),0,pd->name());
       ol.endIndexKey();
-      ol.startIndexValue();
-      if (!pd->briefDescription().isEmpty())
+      bool hasBrief = !pd->briefDescription().isEmpty();
+      ol.startIndexValue(hasBrief);
+      if (hasBrief)
       {
         //ol.docify(" (");
         parseDoc(ol,
@@ -1177,7 +1182,7 @@ void writePackageList(OutputList &ol)
             abbreviate(pd->briefDescription(),pd->name()));
         //ol.docify(")");
       }
-      ol.endIndexValue(pd->getOutputFileBase());
+      ol.endIndexValue(pd->getOutputFileBase(),hasBrief);
       
       //ol.writeEndAnnoItem(pd->getOutputFileBase());
       if (hasHtmlHelp)
diff --git a/src/latexgen.cpp b/src/latexgen.cpp
index 6b4f901..da50b21 100644
--- a/src/latexgen.cpp
+++ b/src/latexgen.cpp
@@ -520,9 +520,10 @@ void LatexGenerator::startIndexSection(IndexSections is)
       break;
     case isNamespaceDocumentation:
       {
-        NamespaceDef *nd=Doxygen::namespaceList.first();
+        NamespaceSDict::Iterator nli(Doxygen::namespaceSDict);
+        NamespaceDef *nd;
         bool found=FALSE;
-        while (nd && !found)
+        for (nli.toFirst();(nd=nli.current()) && !found;++nli)
         {
           if (nd->isLinkableInProject())
           {
@@ -530,7 +531,6 @@ void LatexGenerator::startIndexSection(IndexSections is)
             t << "{"; // Namespace Documentation}\n":
             found=TRUE;
           }
-          nd=Doxygen::namespaceList.next();
         } 
       }
       break;
@@ -683,25 +683,25 @@ void LatexGenerator::endIndexSection(IndexSections is)
       break;
     case isNamespaceDocumentation:
       {
-        NamespaceDef *nd=Doxygen::namespaceList.first();
+        NamespaceSDict::Iterator nli(Doxygen::namespaceSDict);
+        NamespaceDef *nd;
         bool found=FALSE;
-        while (nd && !found)
+        for (nli.toFirst();(nd=nli.current()) && !found;++nli)
         {
           if (nd->isLinkableInProject())
           {
             t << "}\n\\input{" << nd->getOutputFileBase() << "}\n";
             found=TRUE;
           }
-          nd=Doxygen::namespaceList.next();
         }
-        while (nd)
+        while ((nd=nli.current()))
         {
           if (nd->isLinkableInProject())
           {
             if (compactLatex) t << "\\input"; else t << "\\include";
             t << "{" << nd->getOutputFileBase() << "}\n";
           }
-          nd=Doxygen::namespaceList.next();
+          ++nli;
         }
       }
       break;
@@ -916,14 +916,15 @@ void LatexGenerator::endIndexKey()
 {
 }
 
-void LatexGenerator::startIndexValue()
+void LatexGenerator::startIndexValue(bool hasBrief)
 {
-  t << " (";
+  t << " ";
+  if (hasBrief) t << "(";
 }
 
-void LatexGenerator::endIndexValue(const char *name)
+void LatexGenerator::endIndexValue(const char *name,bool hasBrief)
 {
-  t << ")";
+  if (hasBrief) t << ")";
   t << "}{\\pageref{" << name << "}}{}" << endl;
 }
 
diff --git a/src/latexgen.h b/src/latexgen.h
index 802542a..dccabdf 100644
--- a/src/latexgen.h
+++ b/src/latexgen.h
@@ -65,8 +65,8 @@ class LatexGenerator : public OutputGenerator
     void endIndexList()   { t << "\\end{CompactList}"      << endl; }
     void startIndexKey();
     void endIndexKey();
-    void startIndexValue();
-    void endIndexValue(const char *);
+    void startIndexValue(bool);
+    void endIndexValue(const char *,bool);
     void startItemList()  { t << "\\begin{CompactItemize}" << endl; }
     void endItemList()    { t << "\\end{CompactItemize}"   << endl; }
     void startEnumList()  { t << "\\begin{enumerate}"      << endl; }
diff --git a/src/mangen.h b/src/mangen.h
index 6599c1e..a5f15fe 100644
--- a/src/mangen.h
+++ b/src/mangen.h
@@ -63,8 +63,8 @@ class ManGenerator : public OutputGenerator
     void endIndexList()   { newParagraph(); } 
     void startIndexKey() {}
     void endIndexKey()   {} 
-    void startIndexValue() {}
-    void endIndexValue(const char *)   {} 
+    void startIndexValue(bool) {}
+    void endIndexValue(const char *,bool)   {} 
     void startItemList()  {}
     void endItemList()    { newParagraph(); }
     void startEnumList()  {}
diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp
index 2722b23..72223f5 100644
--- a/src/namespacedef.cpp
+++ b/src/namespacedef.cpp
@@ -32,9 +32,9 @@ NamespaceDef::NamespaceDef(const char *df,int dl,
    Definition(df,dl,name)
 {
   fileName=(QCString)"namespace"+name;
-  classSDict = new ClassSDict(257);
-  namespaceSDict = new NamespaceSDict(257);
-  m_innerCompounds = new SDict<Definition>(257);
+  classSDict = new ClassSDict(17);
+  namespaceSDict = new NamespaceSDict(17);
+  m_innerCompounds = new SDict<Definition>(17);
   usingDirList = 0;
   usingDeclList = 0;
   setReference(lref);
diff --git a/src/namespacedef.h b/src/namespacedef.h
index 514d250..ab0393b 100644
--- a/src/namespacedef.h
+++ b/src/namespacedef.h
@@ -77,22 +77,8 @@ class NamespaceDef : public Definition
   //protected:
   //  void addMemberListToGroup(MemberList *,bool (MemberDef::*)() const);
 
-  private:
-    //QCString reference;
-    QCString fileName;
-    QStrList files;
-
-    /*! Classes inside this namespace */
-    ClassSDict *classSDict;
-    /*! Namespaces inside this namespace */
-    NamespaceSDict *namespaceSDict;
-
-    NamespaceList *usingDirList;
-    ClassList *usingDeclList;
-    SDict<Definition> *m_innerCompounds;
-
-    MemberList allMemberList;
-
+  public:
+    
     // members in the declaration part of the documentation
     MemberList decDefineMembers;
     MemberList decProtoMembers;
@@ -110,6 +96,23 @@ class NamespaceDef : public Definition
     MemberList docFuncMembers;
     MemberList docVarMembers;
 
+    /*! Classes inside this namespace */
+    ClassSDict *classSDict;
+    /*! Namespaces inside this namespace */
+    NamespaceSDict *namespaceSDict;
+
+  private:
+    //QCString reference;
+    QCString fileName;
+    QStrList files;
+
+
+    NamespaceList *usingDirList;
+    ClassList *usingDeclList;
+    SDict<Definition> *m_innerCompounds;
+
+    MemberList allMemberList;
+
     /* user defined member groups */
     MemberGroupList    *memberGroupList;
     MemberGroupDict    *memberGroupDict;
diff --git a/src/outputgen.h b/src/outputgen.h
index dbc2351..ed73543 100644
--- a/src/outputgen.h
+++ b/src/outputgen.h
@@ -316,8 +316,8 @@ class OutputGenerator : public BaseOutputDocInterface
     virtual void endIndexList()   = 0;
     virtual void startIndexKey() = 0;
     virtual void endIndexKey()   = 0;
-    virtual void startIndexValue() = 0;
-    virtual void endIndexValue(const char *)   = 0;
+    virtual void startIndexValue(bool) = 0;
+    virtual void endIndexValue(const char *,bool) = 0;
     virtual void startAlphabeticalIndexList() = 0;
     virtual void endAlphabeticalIndexList() = 0;
     virtual void writeIndexHeading(const char *s) = 0;
diff --git a/src/outputlist.h b/src/outputlist.h
index 625c7a5..619792c 100644
--- a/src/outputlist.h
+++ b/src/outputlist.h
@@ -109,10 +109,10 @@ class OutputList : public OutputDocInterface
     { forall(&OutputGenerator::startIndexKey); }
     void endIndexKey()
     { forall(&OutputGenerator::endIndexKey); }
-    void startIndexValue()
-    { forall(&OutputGenerator::startIndexValue); }
-    void endIndexValue(const char *name)
-    { forall(&OutputGenerator::endIndexValue,name); }
+    void startIndexValue(bool b)
+    { forall(&OutputGenerator::startIndexValue,b); }
+    void endIndexValue(const char *name,bool b)
+    { forall(&OutputGenerator::endIndexValue,name,b); }
     void startItemList() 
     { forall(&OutputGenerator::startItemList); }
     void endItemList() 
diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp
index 5313f9b..338d889 100644
--- a/src/rtfgen.cpp
+++ b/src/rtfgen.cpp
@@ -985,16 +985,16 @@ void RTFGenerator::startIndexSection(IndexSections is)
     case isNamespaceDocumentation:
       {
         // Namespace Documentation
-        NamespaceDef *nd=Doxygen::namespaceList.first();
+        NamespaceSDict::Iterator nli(Doxygen::namespaceSDict);
+        NamespaceDef *nd;
         bool found=FALSE;
-        while (nd && !found)
+        for (nli.toFirst();(nd=nli.current()) && !found;++nli)
         {
           if (nd->isLinkableInProject())
           {
             beginRTFChapter();
             found=TRUE;
           }
-          nd=Doxygen::namespaceList.next();
         } 
       }
       break;
@@ -1202,9 +1202,10 @@ void RTFGenerator::endIndexSection(IndexSections is)
       break;
     case isNamespaceDocumentation:
       {
-        NamespaceDef *nd=Doxygen::namespaceList.first();
+        NamespaceSDict::Iterator nli(Doxygen::namespaceSDict);
+        NamespaceDef *nd;
         bool found=FALSE;
-        while (nd && !found)
+        for (nli.toFirst();(nd=nli.current()) && !found;++nli)
         {
           if (nd->isLinkableInProject())
           {
@@ -1214,9 +1215,8 @@ void RTFGenerator::endIndexSection(IndexSections is)
             t << ".rtf\" \\\\*MERGEFORMAT}{\\fldrslt includedstuff}}\n";
             found=TRUE;
           }
-          nd=Doxygen::namespaceList.next();
         }
-        while (nd)
+        while ((nd=nli.current()))
         {
           if (nd->isLinkableInProject())
           {
@@ -1226,7 +1226,7 @@ void RTFGenerator::endIndexSection(IndexSections is)
             t << nd->getOutputFileBase();
             t << ".rtf\" \\\\*MERGEFORMAT}{\\fldrslt includedstuff}}\n";
           }
-          nd=Doxygen::namespaceList.next();
+          ++nli;
         }
       }
       break;
@@ -1578,15 +1578,16 @@ void RTFGenerator::endIndexKey()
 {
 }
 
-void RTFGenerator::startIndexValue() 
+void RTFGenerator::startIndexValue(bool hasBrief) 
 { 
-  t << " (";
+  t << " ";
+  if (hasBrief) t << "(";
 }
 
-void RTFGenerator::endIndexValue(const char *name)
+void RTFGenerator::endIndexValue(const char *name,bool hasBrief)
 {
   DBG_RTF(t << "{\\comment (endIndexKey)}" << endl)
-  t << ")";
+  if (hasBrief) t << ")";
   t << "} ";
   if (name)
   {
@@ -1967,42 +1968,41 @@ void RTFGenerator::startDescList(SectionTypes)
 void RTFGenerator::endDescTitle()      
 { 
   DBG_RTF(t << "{\\comment (endDescTitle) }"    << endl)
-  //endBold();
+  endBold();
+  t << "}";
   newParagraph();
-  //t << Rtf_Style_Reset << styleStack.top();
   incrementIndentLevel();
   t << Rtf_Style_Reset << Rtf_DList_DepthStyle();
 }
 
-void RTFGenerator::startParamList(ParamListTypes)     
-{ 
-  DBG_RTF(t << "{\\comment (startParamList)}"    << endl)
-  t << "{";
-  incrementIndentLevel();
-  newParagraph();
+void RTFGenerator::writeDescItem()
+{
+  DBG_RTF(t << "{\\comment (writeDescItem) }"    << endl)
+  //	incrementIndentLevel();
+  //t << Rtf_Style_Reset << Rtf_CList_DepthStyle();
 }
 
-void RTFGenerator::endParamList()       
+void RTFGenerator::endDescList()       
 {
-  DBG_RTF(t << "{\\comment (endParamList)}"    << endl)
+  DBG_RTF(t << "{\\comment (endDescList)}"    << endl)
   newParagraph();
-  t << "}";
+  //t << "}";
   decrementIndentLevel();
   m_omitParagraph = TRUE;
   //t << Rtf_Style_Reset << styleStack.top() << endl;
+  t << Rtf_Style_Reset << endl;
 }
 
-
-void RTFGenerator::writeDescItem()
-{
-  DBG_RTF(t << "{\\comment (writeDescItem) }"    << endl)
-  //	incrementIndentLevel();
-  //t << Rtf_Style_Reset << Rtf_CList_DepthStyle();
+void RTFGenerator::startParamList(ParamListTypes)     
+{ 
+  DBG_RTF(t << "{\\comment (startParamList)}"    << endl)
+  t << "{";
+  newParagraph();
 }
 
-void RTFGenerator::endDescList()       
+void RTFGenerator::endParamList()       
 {
-  DBG_RTF(t << "{\\comment (endDescList)}"    << endl)
+  DBG_RTF(t << "{\\comment (endParamList)}"    << endl)
   newParagraph();
   t << "}";
   decrementIndentLevel();
@@ -2010,6 +2010,7 @@ void RTFGenerator::endDescList()
   //t << Rtf_Style_Reset << styleStack.top() << endl;
 }
 
+
 void RTFGenerator::startSection(const char *,const char *title,bool sub)
 {
   DBG_RTF(t << "{\\comment (startSection)}"    << endl)
diff --git a/src/rtfgen.h b/src/rtfgen.h
index b2971ad..a1a9f56 100644
--- a/src/rtfgen.h
+++ b/src/rtfgen.h
@@ -66,8 +66,8 @@ class RTFGenerator : public OutputGenerator
     void endIndexList();
     void startIndexKey();
     void endIndexKey();
-    void startIndexValue();
-    void endIndexValue(const char *);
+    void startIndexValue(bool);
+    void endIndexValue(const char *,bool);
     void startItemList();
     void endItemList();
     void startEnumList();
diff --git a/src/sortdict.h b/src/sortdict.h
index 77991ea..e78d038 100644
--- a/src/sortdict.h
+++ b/src/sortdict.h
@@ -169,6 +169,12 @@ class SDict
       return m_dict->find(key);
     }
 
+    /*! Equavalent to find(). */
+    T *operator[](const char *key)
+    {
+      return m_dict->find(key);
+    }
+
     /*! Returns the item at position \a i in the sorted dictionary */
     T *at(uint i)
     {
diff --git a/src/translator_sk.h b/src/translator_sk.h
index 5cb8621..05ad9d9 100644
--- a/src/translator_sk.h
+++ b/src/translator_sk.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * 
+ *
  *
  * Copyright (C) 1997-2001 by Dimitri van Heesch.
  *
@@ -13,1319 +13,1324 @@
  * Documents produced by Doxygen are derivative works derived from the
  * input used in their production; they are not affected by this license.
  *
+ * ----------------------------------------------------------------------------
+ *
+ * Slovak translation by Stanislav Kudlac (skudlac@pobox.sk)
+ *
+ * ----------------------------------------------------------------------------
  */
 
 #ifndef TRANSLATOR_SK_H
 #define TRANSLATOR_SK_H
 
-class TranslatorSlovak : public TranslatorAdapter_1_2_7
+class TranslatorSlovak : public Translator
 {
   private:
-    /*! The Decode() inline assumes the source written in the
-        Windows encoding (maintainer only dependent).
-     */
-    inline QCString Decode(const QCString & sInput)
-    {
+	/*! The Decode() inline assumes the source written in the
+		Windows encoding (maintainer only dependent).
+	 */
+	inline QCString Decode(const QCString & sInput)
+	{
 #ifdef _WIN32
-      return sInput;
+	  return sInput;
 #else
-      return Win1250ToISO88592(sInput);
+	  return Win1250ToISO88592(sInput);
 #endif
-    }
+	}
 
   public:
-    // --- Language control methods -------------------
+	// --- Language control methods -------------------
 
-    virtual QCString idLanguage()
-    { return "slovak"; }
+	virtual QCString idLanguage()
+	{ return "slovak"; }
 
-    virtual QCString latexLanguageSupportCommand()
-    { return "\\usepackage{slovak}\n"; }
+	virtual QCString latexLanguageSupportCommand()
+	{ return "\\usepackage{slovak}\n"; }
 
-    /*! return the language charset. This will be used for the HTML output */
-    virtual QCString idLanguageCharset()
-    {
+	/*! return the language charset. This will be used for the HTML output */
+	virtual QCString idLanguageCharset()
+	{
 #ifdef _WIN32
-        return "windows-1250";
+		return "windows-1250";
 #else
-        return "iso-8859-2";
+		return "iso-8859-2";
 #endif
-    }
-
-    // --- Language translation methods -------------------
-
-    /*! used in the compound documentation before a list of related functions. */
-    virtual QCString trRelatedFunctions()
-    { return Decode("Súvisiace funkcie"); }
-
-    /*! subscript for the related functions. */
-    virtual QCString trRelatedSubscript()
-    { return Decode("(Uvedené funkcie niesú členskými funkciami.)"); }
-
-    /*! header that is put before the detailed description of files, classes and namespaces. */
-    virtual QCString trDetailedDescription()
-    { return Decode("Detailný popis"); }
-
-    /*! header that is put before the list of typedefs. */
-    virtual QCString trMemberTypedefDocumentation()
-    { return Decode("Dokumentácia k členským typom"); }
-
-    /*! header that is put before the list of enumerations. */
-    virtual QCString trMemberEnumerationDocumentation()
-    { return Decode("Dokumentácia k členským enumeráciám"); }
-
-    /*! header that is put before the list of member functions. */
-    virtual QCString trMemberFunctionDocumentation()
-    { return Decode("Dokumentácia k metódam"); }
-
-    /*! header that is put before the list of member attributes. */
-    virtual QCString trMemberDataDocumentation()
-    {
-      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-      {
-        return Decode("Dokumentácia k položkám");
-      }
-      else
-      {
-        return Decode("Dokumentácia k dátovým členom");
-      }
-    }
-
-    /*! this is the text of a link put after brief descriptions. */
-    virtual QCString trMore()
-    { return Decode("..."); }
-
-    /*! put in the class documentation */
-    virtual QCString trListOfAllMembers()
-    { return Decode("Zoznam všetkých členov."); }
-
-    /*! used as the title of the "list of all members" page of a class */
-    virtual QCString trMemberList()
-    { return Decode("Zoznam členov triedy"); }
-
-    /*! this is the first part of a sentence that is followed by a class name */
-    virtual QCString trThisIsTheListOfAllMembers()
-    { return Decode("Tu nájdete úplný zoznam členov triedy "); }
-
-    /*! this is the remainder of the sentence after the class name */
-    virtual QCString trIncludingInheritedMembers()
-    { return Decode(", vrátane všetkých zdedených členov."); }
-
-    /*! this is put at the author sections at the bottom of man pages.
-     *  parameter s is name of the project name.
-     */
-    virtual QCString trGeneratedAutomatically(const char *s)
-    { QCString result="Generované automaticky programom Doxygen "
-                      "zo zdrojových textov";
-      if (s) result+=(QCString)" projektu "+s;
-      result+=".";
-      return Decode(result);
-    }
-
-    /*! put after an enum name in the list of all members */
-    virtual QCString trEnumName()
-    { return Decode("meno enumerácie"); }
-
-    /*! put after an enum value in the list of all members */
-    virtual QCString trEnumValue()
-    { return Decode("hodnota enumerácie"); }
-
-    /*! put after an undocumented member in the list of all members */
-    virtual QCString trDefinedIn()
-    { return Decode("definovaný v"); }
-
-    // quick reference sections
-
-    /*! This is put above each page as a link to the list of all groups of
-     *  compounds or files (see the \\group command).
-     */
-    virtual QCString trModules()
-    { return Decode("Moduly"); }
-
-    /*! This is put above each page as a link to the class hierarchy */
-    virtual QCString trClassHierarchy()
-    { return Decode("Hierarchia tried"); }
-
-    /*! This is put above each page as a link to the list of annotated classes */
-    virtual QCString trCompoundList()
-    {
-      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-      {
-        return Decode("Dátové štruktúry");
-      }
-      else
-      {
-        return Decode("Zoznam tried");
-      }
-    }
-
-    /*! This is put above each page as a link to the list of documented files */
-    virtual QCString trFileList()
-    { return Decode("Zoznam súborov"); }
-
-    /*! This is put above each page as a link to the list of all verbatim headers */
-    virtual QCString trHeaderFiles()
-    { return Decode("Zoznam hlavičkových súborov"); }
-
-    /*! This is put above each page as a link to all members of compounds. */
-    virtual QCString trCompoundMembers()
-    {
-      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-      {
-        return Decode("Dátové položky");
-      }
-      else
-      {
-        return Decode("Zoznam členov tried");
-      }
-    }
-
-    /*! This is put above each page as a link to all members of files. */
-    virtual QCString trFileMembers()
-    {
-      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-      {
-        return Decode("Globálne symboly");
-      }
-      else
-      {
-        return Decode("Symboly v súboroch");
-      }
-    }
-
-    /*! This is put above each page as a link to all related pages. */
-    virtual QCString trRelatedPages()
-    { return Decode("Ostatné stránky"); }
-
-    /*! This is put above each page as a link to all examples. */
-    virtual QCString trExamples()
-    { return Decode("Príklady"); }
-
-    /*! This is put above each page as a link to the search engine. */
-    virtual QCString trSearch()
-    { return Decode("Hľadať"); }
-
-    /*! This is an introduction to the class hierarchy. */
-    virtual QCString trClassHierarchyDescription()
-    { return Decode("Tu nájdete zoznam, vyjadrujúci vzťah dedičnosti tried. "
-             "Je zoradený približne (ale nie úplne) podľa abecedy:");
-    }
-
-    /*! This is an introduction to the list with all files. */
-    virtual QCString trFileListDescription(bool extractAll)
-    {
-      QCString result="Tu nájdete zoznam všetkých ";
-      if (!extractAll) result+="dokumentovaných ";
-      result+="súborov so stručnými popismi:";
-      return Decode(result);
-    }
-
-    /*! This is an introduction to the annotated compound list. */
-    virtual QCString trCompoundListDescription()
-    {
-      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-      {
-        return Decode("Nasledujúci zoznam obsahuje identifikáciu dátových "
-                      "štruktúr a ich stručné popisy:");
-      }
-      else
-      {
-        return Decode("Nasledujúci zoznam obsahuje predovšetkým identifikáciu "
-                      "tried, ale nachádzajú sa tu i ďalšie netriviálne prvky, "
-                      "ako sú štruktúry (struct), uniony (union) a rozhrania "
-                      "(interface). V zozname sú uvedené ich stručné "
-                      "popisy:");
-      }
-    }
-
-    /*! This is an introduction to the page with all class members. */
-    virtual QCString trCompoundMembersDescription(bool extractAll)
-    {
-      QCString result= "Tu nájdete zoznam všetkých ";
-      if (!extractAll)
-      {
-        result += "dokumentovaných ";
-      }
-
-      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-      {
-        result += "položiek štruktúr (struct) a unionov (union) ";
-      }
-      else
-      {
-        result += "členov tried ";
-      }
-
-      result += "s odkazmi na ";
-
-      if (extractAll)
-      {
-        if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-        {
-          result += "dokumentáciu štruktúr/unionov, ku ktorým prislúchajú:";
-        }
-        else
-        {
-          result += "dokumentáciu tried, ku ktorým prislúchajú:";
-        }
-      }
-      else
-      {
-        if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-        {
-          result+="štruktúry/uniony, ku ktorým prislúchajú:";
-        }
-        else
-        {
-          result+="triedy, ku ktorým prislúchajú:";
-        }
-      }
-
-      return Decode(result);
-    }
-
-    /*! This is an introduction to the page with all file members. */
-    virtual QCString trFileMembersDescription(bool extractAll)
-    {
-      QCString result="Tu nájdete zoznam všetkých ";
-      if (!extractAll) result+="dokumentovaných ";
-
-      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-      {
-        result+="funkcií, premenných, makier, enumerácií a definícií typov (typedef) "
-                "s odkazmi na ";
-      }
-      else
-      {
-        result+="symbolov, ktoré sú definované na úrovni svojich súborov. "
-                "Pre každý symbol je uvedený odkaz na ";
-      }
-
-      if (extractAll)
-        result+="súbory, ku ktorým prislúchajú:";
-      else
-        result+="dokumentáciu:";
-
-      return Decode(result);
-    }
-
-    /*! This is an introduction to the page with the list of all header files. */
-    virtual QCString trHeaderFilesDescription()
-    { return Decode("Tu nájdete hlavičkové súbory, ktoré tvoria "
-             "aplikačné programové rozhranie (API):"); }
-
-    /*! This is an introduction to the page with the list of all examples */
-    virtual QCString trExamplesDescription()
-    { return Decode("Tu nájdete zoznam všetkých príkladov:"); }
-
-    /*! This is an introduction to the page with the list of related pages */
-    virtual QCString trRelatedPagesDescription()
-    { return Decode("Nasledujúci zoznam odkazuje na ďalšie stránky projektu, "
-                    "ktoré majú charakter usporiadaných zoznamov informácií, "
-                    "pozbieraných z rôznych miest v zdrojových súboroch:"); }
-
-    /*! This is an introduction to the page with the list of class/file groups */
-    virtual QCString trModulesDescription()
-    { return Decode("Tu nájdete zoznam všetkých modulov:"); }
-
-    /*! This sentences is used in the annotated class/file lists if no brief
-     * description is given.
-     */
-    virtual QCString trNoDescriptionAvailable()
-    { return Decode("Popis nieje k dispozícii"); }
-
-    // index titles (the project name is prepended for these)
-
-
-    /*! This is used in HTML as the title of index.html. */
-    virtual QCString trDocumentation()
-    { return Decode("Dokumentácia"); }
-
-    /*! This is used in LaTeX as the title of the chapter with the
-     * index of all groups.
-     */
-    virtual QCString trModuleIndex()
-    { return Decode("Register modulov"); }
-
-    /*! This is used in LaTeX as the title of the chapter with the
-     * class hierarchy.
-     */
-    virtual QCString trHierarchicalIndex()
-    { return Decode("Register hierarchie tried"); }
-
-    /*! This is used in LaTeX as the title of the chapter with the
-     * annotated compound index.
-     */
-    virtual QCString trCompoundIndex()
-    {
-      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-      {
-        return Decode("Register dátových štruktúr");
-      }
-      else
-      {
-        return Decode("Register tried");
-      }
-    }
-
-    /*! This is used in LaTeX as the title of the chapter with the
-     * list of all files.
-     */
-    virtual QCString trFileIndex()
-    { return Decode("Register súborov"); }
-
-    /*! This is used in LaTeX as the title of the chapter containing
-     *  the documentation of all groups.
-     */
-    virtual QCString trModuleDocumentation()
-    { return Decode("Dokumentácia modulov"); }
-
-    /*! This is used in LaTeX as the title of the chapter containing
-     *  the documentation of all classes, structs and unions.
-     */
-    virtual QCString trClassDocumentation()
-    { return Decode("Dokumentácia tried"); }
-
-    /*! This is used in LaTeX as the title of the chapter containing
-     *  the documentation of all files.
-     */
-    virtual QCString trFileDocumentation()
-    { return Decode("Dokumentácia súborov"); }
-
-    /*! This is used in LaTeX as the title of the chapter containing
-     *  the documentation of all examples.
-     */
-    virtual QCString trExampleDocumentation()
-    { return Decode("Dokumentácia príkladov"); }
-
-    /*! This is used in LaTeX as the title of the chapter containing
-     *  the documentation of all related pages.
-     */
-    virtual QCString trPageDocumentation()
-    { return Decode("Dokumentácia súvisiacich stránok"); }
-
-    /*! This is used in LaTeX as the title of the document */
-    virtual QCString trReferenceManual()
-    { return Decode("Referenčná príručka"); }
-
-    /*! This is used in the documentation of a file as a header before the
-     *  list of defines
-     */
-    virtual QCString trDefines()
-    { return Decode("Definícia makier"); }
-
-    /*! This is used in the documentation of a file as a header before the
-     *  list of function prototypes
-     */
-    virtual QCString trFuncProtos()
-    { return Decode("Prototypy"); }
-
-    /*! This is used in the documentation of a file as a header before the
-     *  list of typedefs
-     */
-    virtual QCString trTypedefs()
-    { return Decode("Definícia typov"); }
-
-    /*! This is used in the documentation of a file as a header before the
-     *  list of enumerations
-     */
-    virtual QCString trEnumerations()
-    { return Decode("Enumerácie"); }
-
-    /*! This is used in the documentation of a file as a header before the
-     *  list of (global) functions
-     */
-    virtual QCString trFunctions()
-    { return Decode("Funkcie"); }
-
-    /*! This is used in the documentation of a file as a header before the
-     *  list of (global) variables
-     */
-    virtual QCString trVariables()
-    { return Decode("Premenné"); }
-
-    /*! This is used in the documentation of a file as a header before the
-     *  list of (global) variables
-     */
-    virtual QCString trEnumerationValues()
-    { return Decode("Hodnoty enumerácií"); }
-
-    /*! This is used in man pages as the author section. */
-    virtual QCString trAuthor()
-    { return Decode("Autor"); }
-
-    /*! This is used in the documentation of a file before the list of
-     *  documentation blocks for defines
-     */
-    virtual QCString trDefineDocumentation()
-    { return Decode("Dokumentácia k definíciám makier"); }
-
-    /*! This is used in the documentation of a file/namespace before the list
-     *  of documentation blocks for function prototypes
-     */
-    virtual QCString trFunctionPrototypeDocumentation()
-    { return Decode("Dokumentácia prototypov"); }
-
-    /*! This is used in the documentation of a file/namespace before the list
-     *  of documentation blocks for typedefs
-     */
-    virtual QCString trTypedefDocumentation()
-    { return Decode("Dokumentácia definícií typov"); }
-
-    /*! This is used in the documentation of a file/namespace before the list
-     *  of documentation blocks for enumeration types
-     */
-    virtual QCString trEnumerationTypeDocumentation()
-    { return Decode("Dokumentácia enumeračných typov"); }
-
-    /*! This is used in the documentation of a file/namespace before the list
-     *  of documentation blocks for enumeration values
-     */
-    virtual QCString trEnumerationValueDocumentation()
-    { return Decode("Dokumentácia enumeračných hodnôt"); }
-
-    /*! This is used in the documentation of a file/namespace before the list
-     *  of documentation blocks for functions
-     */
-    virtual QCString trFunctionDocumentation()
-    { return Decode("Dokumentácia funkcií"); }
-
-    /*! This is used in the documentation of a file/namespace before the list
-     *  of documentation blocks for variables
-     */
-    virtual QCString trVariableDocumentation()
-    { return Decode("Dokumentácia premenných"); }
-
-    /*! This is used in the documentation of a file/namespace/group before
-     *  the list of links to documented compounds
-     */
-    virtual QCString trCompounds()
-    {
-      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-      {
-        return Decode("Dátové štruktúry");
-      }
-      else
-      {
-        return Decode("Triedy");
-      }
-    }
-
-    /*! This is used in the documentation of a group before the list of
-     *  links to documented files
-     */
-    virtual QCString trFiles()
-    { return Decode("Súbory"); }
-
-    /*! This is used in the standard footer of each page and indicates when
-     *  the page was generated
-     */
-    virtual QCString trGeneratedAt(const char *date,const char *projName)
-    {
-      QCString result=(QCString)"Generované "+date;
-      if (projName) result+=(QCString)" pre projekt "+projName;
-      result+=(QCString)" programom";
-      return Decode(result);
-    }
-    /*! This is part of the sentence used in the standard footer of each page.
-     */
-    virtual QCString trWrittenBy()
-    {
-      return Decode(" -- autor ");
-    }
-
-    /*! this text is put before a class diagram */
-    virtual QCString trClassDiagram(const char *clName)
-    {
-      return Decode((QCString)"Diagram dedičnosti pre triedu "+clName);
-    }
-
-    /*! this text is generated when the \\internal command is used. */
-    virtual QCString trForInternalUseOnly()
-    { return Decode("Iba pre interné použitie."); }
-
-    /*! this text is generated when the \\reimp command is used. */
-    virtual QCString trReimplementedForInternalReasons()
-    { return Decode("Reimplementované z interných dôvodov; "
-                    "aplikačné rozhranie zachované."); }
-
-    /*! this text is generated when the \\warning command is used. */
-    virtual QCString trWarning()
-    { return Decode("Pozor"); }
-
-    /*! this text is generated when the \\bug command is used. */
-    virtual QCString trBugsAndLimitations()
-    { return Decode("Chyby a obmedzenia"); }
-
-    /*! this text is generated when the \\version command is used. */
-    virtual QCString trVersion()
-    { return Decode("Verzia"); }
-
-    /*! this text is generated when the \\date command is used. */
-    virtual QCString trDate()
-    { return Decode("Dátum"); }
-
-    /*! this text is generated when the \\author command is used. */
-    virtual QCString trAuthors()
-    { return Decode("Autor/autori"); }
-
-    /*! this text is generated when the \\return command is used. */
-    virtual QCString trReturns()
-    { return Decode("Návratová hodnota"); }
-
-    /*! this text is generated when the \\sa command is used. */
-    virtual QCString trSeeAlso()
-    { return Decode("Viz tiež"); }
-
-    /*! this text is generated when the \\param command is used. */
-    virtual QCString trParameters()
-    { return Decode("Parametre"); }
-
-    /*! this text is generated when the \\exception command is used. */
-    virtual QCString trExceptions()
-    { return Decode("Výnimky"); }
-
-    /*! this text is used in the title page of a LaTeX document. */
-    virtual QCString trGeneratedBy()
-    { return Decode("Generované programom"); }
-
-    // new since 0.49-990307
-
-    /*! used as the title of page containing all the index of all namespaces. */
-    virtual QCString trNamespaceList()
-    { return Decode("Zoznam priestorov mien"); }
-
-    /*! used as an introduction to the namespace list */
-    virtual QCString trNamespaceListDescription(bool extractAll)
-    {
-      QCString result="Tu nájdete zoznam všetkých ";
-      if (!extractAll) result+="dokumentovaných ";
-      result+="priestorov mien so stručným popisom:";
-      return Decode(result);
-    }
-
-    /*! used in the class documentation as a header before the list of all
-     *  friends of a class
-     */
-    virtual QCString trFriends()
-    { return Decode("Priatelia (friends)"); }
+	}
+
+	// --- Language translation methods -------------------
+
+	/*! used in the compound documentation before a list of related functions. */
+	virtual QCString trRelatedFunctions()
+	{ return Decode("Súvisiace funkcie"); }
+
+	/*! subscript for the related functions. */
+	virtual QCString trRelatedSubscript()
+	{ return Decode("(Uvedené funkcie niesú členskými funkciami.)"); }
+
+	/*! header that is put before the detailed description of files, classes and namespaces. */
+	virtual QCString trDetailedDescription()
+	{ return Decode("Detailný popis"); }
+
+	/*! header that is put before the list of typedefs. */
+	virtual QCString trMemberTypedefDocumentation()
+	{ return Decode("Dokumentácia k členským typom"); }
+
+	/*! header that is put before the list of enumerations. */
+	virtual QCString trMemberEnumerationDocumentation()
+	{ return Decode("Dokumentácia k členským enumeráciám"); }
+
+	/*! header that is put before the list of member functions. */
+	virtual QCString trMemberFunctionDocumentation()
+	{ return Decode("Dokumentácia k metódam"); }
+
+	/*! header that is put before the list of member attributes. */
+	virtual QCString trMemberDataDocumentation()
+	{
+	  if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+	  {
+		return Decode("Dokumentácia k položkám");
+	  }
+	  else
+	  {
+		return Decode("Dokumentácia k dátovým členom");
+	  }
+	}
+
+	/*! this is the text of a link put after brief descriptions. */
+	virtual QCString trMore()
+	{ return Decode("..."); }
+
+	/*! put in the class documentation */
+	virtual QCString trListOfAllMembers()
+	{ return Decode("Zoznam všetkých členov."); }
+
+	/*! used as the title of the "list of all members" page of a class */
+	virtual QCString trMemberList()
+	{ return Decode("Zoznam členov triedy"); }
+
+	/*! this is the first part of a sentence that is followed by a class name */
+	virtual QCString trThisIsTheListOfAllMembers()
+	{ return Decode("Tu nájdete úplný zoznam členov triedy "); }
+
+	/*! this is the remainder of the sentence after the class name */
+	virtual QCString trIncludingInheritedMembers()
+	{ return Decode(", vrátane všetkých zdedených členov."); }
+
+	/*! this is put at the author sections at the bottom of man pages.
+	 *	parameter s is name of the project name.
+	 */
+	virtual QCString trGeneratedAutomatically(const char *s)
+	{ QCString result="Generované automaticky programom Doxygen "
+					  "zo zdrojových textov";
+	  if (s) result+=(QCString)" projektu "+s;
+	  result+=".";
+	  return Decode(result);
+	}
+
+	/*! put after an enum name in the list of all members */
+	virtual QCString trEnumName()
+	{ return Decode("meno enumerácie"); }
+
+	/*! put after an enum value in the list of all members */
+	virtual QCString trEnumValue()
+	{ return Decode("hodnota enumerácie"); }
+
+	/*! put after an undocumented member in the list of all members */
+	virtual QCString trDefinedIn()
+	{ return Decode("definovaný v"); }
+
+	// quick reference sections
+
+	/*! This is put above each page as a link to the list of all groups of
+	 *	compounds or files (see the \\group command).
+	 */
+	virtual QCString trModules()
+	{ return Decode("Moduly"); }
+
+	/*! This is put above each page as a link to the class hierarchy */
+	virtual QCString trClassHierarchy()
+	{ return Decode("Hierarchia tried"); }
+
+	/*! This is put above each page as a link to the list of annotated classes */
+	virtual QCString trCompoundList()
+	{
+	  if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+	  {
+		return Decode("Dátové štruktúry");
+	  }
+	  else
+	  {
+		return Decode("Zoznam tried");
+	  }
+	}
+
+	/*! This is put above each page as a link to the list of documented files */
+	virtual QCString trFileList()
+	{ return Decode("Zoznam súborov"); }
+
+	/*! This is put above each page as a link to the list of all verbatim headers */
+	virtual QCString trHeaderFiles()
+	{ return Decode("Zoznam hlavičkových súborov"); }
+
+	/*! This is put above each page as a link to all members of compounds. */
+	virtual QCString trCompoundMembers()
+	{
+	  if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+	  {
+		return Decode("Dátové položky");
+	  }
+	  else
+	  {
+		return Decode("Zoznam členov tried");
+	  }
+	}
+
+	/*! This is put above each page as a link to all members of files. */
+	virtual QCString trFileMembers()
+	{
+	  if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+	  {
+		return Decode("Globálne symboly");
+	  }
+	  else
+	  {
+		return Decode("Symboly v súboroch");
+	  }
+	}
+
+	/*! This is put above each page as a link to all related pages. */
+	virtual QCString trRelatedPages()
+	{ return Decode("Ostatné stránky"); }
+
+	/*! This is put above each page as a link to all examples. */
+	virtual QCString trExamples()
+	{ return Decode("Príklady"); }
+
+	/*! This is put above each page as a link to the search engine. */
+	virtual QCString trSearch()
+	{ return Decode("Hľadať"); }
+
+	/*! This is an introduction to the class hierarchy. */
+	virtual QCString trClassHierarchyDescription()
+	{ return Decode("Tu nájdete zoznam, vyjadrujúci vzťah dedičnosti tried. "
+			 "Je zoradený približne (ale nie úplne) podľa abecedy:");
+	}
+
+	/*! This is an introduction to the list with all files. */
+	virtual QCString trFileListDescription(bool extractAll)
+	{
+	  QCString result="Tu nájdete zoznam všetkých ";
+	  if (!extractAll) result+="dokumentovaných ";
+	  result+="súborov so stručnými popismi:";
+	  return Decode(result);
+	}
+
+	/*! This is an introduction to the annotated compound list. */
+	virtual QCString trCompoundListDescription()
+	{
+	  if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+	  {
+		return Decode("Nasledujúci zoznam obsahuje identifikáciu dátových "
+					  "štruktúr a ich stručné popisy:");
+	  }
+	  else
+	  {
+		return Decode("Nasledujúci zoznam obsahuje predovšetkým identifikáciu "
+					  "tried, ale nachádzajú sa tu i ďalšie netriviálne prvky, "
+					  "ako sú štruktúry (struct), uniony (union) a rozhrania "
+					  "(interface). V zozname sú uvedené ich stručné "
+					  "popisy:");
+	  }
+	}
+
+	/*! This is an introduction to the page with all class members. */
+	virtual QCString trCompoundMembersDescription(bool extractAll)
+	{
+	  QCString result= "Tu nájdete zoznam všetkých ";
+	  if (!extractAll)
+	  {
+		result += "dokumentovaných ";
+	  }
+
+	  if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+	  {
+		result += "položiek štruktúr (struct) a unionov (union) ";
+	  }
+	  else
+	  {
+		result += "členov tried ";
+	  }
+
+	  result += "s odkazmi na ";
+
+	  if (extractAll)
+	  {
+		if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+		{
+		  result += "dokumentáciu štruktúr/unionov, ku ktorým prislúchajú:";
+		}
+		else
+		{
+		  result += "dokumentáciu tried, ku ktorým prislúchajú:";
+		}
+	  }
+	  else
+	  {
+		if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+		{
+		  result+="štruktúry/uniony, ku ktorým prislúchajú:";
+		}
+		else
+		{
+		  result+="triedy, ku ktorým prislúchajú:";
+		}
+	  }
+
+	  return Decode(result);
+	}
+
+	/*! This is an introduction to the page with all file members. */
+	virtual QCString trFileMembersDescription(bool extractAll)
+	{
+	  QCString result="Tu nájdete zoznam všetkých ";
+	  if (!extractAll) result+="dokumentovaných ";
+
+	  if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+	  {
+		result+="funkcií, premenných, makier, enumerácií a definícií typov (typedef) "
+				"s odkazmi na ";
+	  }
+	  else
+	  {
+		result+="symbolov, ktoré sú definované na úrovni svojich súborov. "
+				"Pre každý symbol je uvedený odkaz na ";
+	  }
+
+	  if (extractAll)
+		result+="súbory, ku ktorým prislúchajú:";
+	  else
+		result+="dokumentáciu:";
+
+	  return Decode(result);
+	}
+
+	/*! This is an introduction to the page with the list of all header files. */
+	virtual QCString trHeaderFilesDescription()
+	{ return Decode("Tu nájdete hlavičkové súbory, ktoré tvoria "
+			 "aplikačné programové rozhranie (API):"); }
+
+	/*! This is an introduction to the page with the list of all examples */
+	virtual QCString trExamplesDescription()
+	{ return Decode("Tu nájdete zoznam všetkých príkladov:"); }
+
+	/*! This is an introduction to the page with the list of related pages */
+	virtual QCString trRelatedPagesDescription()
+	{ return Decode("Nasledujúci zoznam odkazuje na ďalšie stránky projektu, "
+					"ktoré majú charakter usporiadaných zoznamov informácií, "
+					"pozbieraných z rôznych miest v zdrojových súboroch:"); }
+
+	/*! This is an introduction to the page with the list of class/file groups */
+	virtual QCString trModulesDescription()
+	{ return Decode("Tu nájdete zoznam všetkých modulov:"); }
+
+	/*! This sentences is used in the annotated class/file lists if no brief
+	 * description is given.
+	 */
+	virtual QCString trNoDescriptionAvailable()
+	{ return Decode("Popis nieje k dispozícii"); }
+
+	// index titles (the project name is prepended for these)
+
+
+	/*! This is used in HTML as the title of index.html. */
+	virtual QCString trDocumentation()
+	{ return Decode("Dokumentácia"); }
+
+	/*! This is used in LaTeX as the title of the chapter with the
+	 * index of all groups.
+	 */
+	virtual QCString trModuleIndex()
+	{ return Decode("Register modulov"); }
+
+	/*! This is used in LaTeX as the title of the chapter with the
+	 * class hierarchy.
+	 */
+	virtual QCString trHierarchicalIndex()
+	{ return Decode("Register hierarchie tried"); }
+
+	/*! This is used in LaTeX as the title of the chapter with the
+	 * annotated compound index.
+	 */
+	virtual QCString trCompoundIndex()
+	{
+	  if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+	  {
+		return Decode("Register dátových štruktúr");
+	  }
+	  else
+	  {
+		return Decode("Register tried");
+	  }
+	}
+
+	/*! This is used in LaTeX as the title of the chapter with the
+	 * list of all files.
+	 */
+	virtual QCString trFileIndex()
+	{ return Decode("Register súborov"); }
+
+	/*! This is used in LaTeX as the title of the chapter containing
+	 *	the documentation of all groups.
+	 */
+	virtual QCString trModuleDocumentation()
+	{ return Decode("Dokumentácia modulov"); }
+
+	/*! This is used in LaTeX as the title of the chapter containing
+	 *	the documentation of all classes, structs and unions.
+	 */
+	virtual QCString trClassDocumentation()
+	{ return Decode("Dokumentácia tried"); }
+
+	/*! This is used in LaTeX as the title of the chapter containing
+	 *	the documentation of all files.
+	 */
+	virtual QCString trFileDocumentation()
+	{ return Decode("Dokumentácia súborov"); }
+
+	/*! This is used in LaTeX as the title of the chapter containing
+	 *	the documentation of all examples.
+	 */
+	virtual QCString trExampleDocumentation()
+	{ return Decode("Dokumentácia príkladov"); }
+
+	/*! This is used in LaTeX as the title of the chapter containing
+	 *	the documentation of all related pages.
+	 */
+	virtual QCString trPageDocumentation()
+	{ return Decode("Dokumentácia súvisiacich stránok"); }
+
+	/*! This is used in LaTeX as the title of the document */
+	virtual QCString trReferenceManual()
+	{ return Decode("Referenčná príručka"); }
+
+	/*! This is used in the documentation of a file as a header before the
+	 *	list of defines
+	 */
+	virtual QCString trDefines()
+	{ return Decode("Definícia makier"); }
+
+	/*! This is used in the documentation of a file as a header before the
+	 *	list of function prototypes
+	 */
+	virtual QCString trFuncProtos()
+	{ return Decode("Prototypy"); }
+
+	/*! This is used in the documentation of a file as a header before the
+	 *	list of typedefs
+	 */
+	virtual QCString trTypedefs()
+	{ return Decode("Definícia typov"); }
+
+	/*! This is used in the documentation of a file as a header before the
+	 *	list of enumerations
+	 */
+	virtual QCString trEnumerations()
+	{ return Decode("Enumerácie"); }
+
+	/*! This is used in the documentation of a file as a header before the
+	 *	list of (global) functions
+	 */
+	virtual QCString trFunctions()
+	{ return Decode("Funkcie"); }
+
+	/*! This is used in the documentation of a file as a header before the
+	 *	list of (global) variables
+	 */
+	virtual QCString trVariables()
+	{ return Decode("Premenné"); }
+
+	/*! This is used in the documentation of a file as a header before the
+	 *	list of (global) variables
+	 */
+	virtual QCString trEnumerationValues()
+	{ return Decode("Hodnoty enumerácií"); }
+
+	/*! This is used in the documentation of a file before the list of
+	 *	documentation blocks for defines
+	 */
+	virtual QCString trDefineDocumentation()
+	{ return Decode("Dokumentácia k definíciám makier"); }
+
+	/*! This is used in the documentation of a file/namespace before the list
+	 *	of documentation blocks for function prototypes
+	 */
+	virtual QCString trFunctionPrototypeDocumentation()
+	{ return Decode("Dokumentácia prototypov"); }
+
+	/*! This is used in the documentation of a file/namespace before the list
+	 *	of documentation blocks for typedefs
+	 */
+	virtual QCString trTypedefDocumentation()
+	{ return Decode("Dokumentácia definícií typov"); }
+
+	/*! This is used in the documentation of a file/namespace before the list
+	 *	of documentation blocks for enumeration types
+	 */
+	virtual QCString trEnumerationTypeDocumentation()
+	{ return Decode("Dokumentácia enumeračných typov"); }
+
+	/*! This is used in the documentation of a file/namespace before the list
+	 *	of documentation blocks for enumeration values
+	 */
+	virtual QCString trEnumerationValueDocumentation()
+	{ return Decode("Dokumentácia enumeračných hodnôt"); }
+
+	/*! This is used in the documentation of a file/namespace before the list
+	 *	of documentation blocks for functions
+	 */
+	virtual QCString trFunctionDocumentation()
+	{ return Decode("Dokumentácia funkcií"); }
+
+	/*! This is used in the documentation of a file/namespace before the list
+	 *	of documentation blocks for variables
+	 */
+	virtual QCString trVariableDocumentation()
+	{ return Decode("Dokumentácia premenných"); }
+
+	/*! This is used in the documentation of a file/namespace/group before
+	 *	the list of links to documented compounds
+	 */
+	virtual QCString trCompounds()
+	{
+	  if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+	  {
+		return Decode("Dátové štruktúry");
+	  }
+	  else
+	  {
+		return Decode("Triedy");
+	  }
+	}
+
+	/*! This is used in the standard footer of each page and indicates when
+	 *	the page was generated
+	 */
+	virtual QCString trGeneratedAt(const char *date,const char *projName)
+	{
+	  QCString result=(QCString)"Generované "+date;
+	  if (projName) result+=(QCString)" pre projekt "+projName;
+	  result+=(QCString)" programom";
+	  return Decode(result);
+	}
+
+	/*! This is part of the sentence used in the standard footer of each page.
+	 */
+	virtual QCString trWrittenBy()
+	{
+	  return Decode(" -- autor ");
+	}
+
+	/*! this text is put before a class diagram */
+	virtual QCString trClassDiagram(const char *clName)
+	{
+	  return Decode((QCString)"Diagram dedičnosti pre triedu "+clName);
+	}
+
+	/*! this text is generated when the \\internal command is used. */
+	virtual QCString trForInternalUseOnly()
+	{ return Decode("Iba pre interné použitie."); }
+
+	/*! this text is generated when the \\reimp command is used. */
+	virtual QCString trReimplementedForInternalReasons()
+	{ return Decode("Reimplementované z interných dôvodov; "
+					"aplikačné rozhranie zachované."); }
+
+	/*! this text is generated when the \\warning command is used. */
+	virtual QCString trWarning()
+	{ return Decode("Pozor"); }
+
+	/*! this text is generated when the \\bug command is used. */
+	virtual QCString trBugsAndLimitations()
+	{ return Decode("Chyby a obmedzenia"); }
+
+	/*! this text is generated when the \\version command is used. */
+	virtual QCString trVersion()
+	{ return Decode("Verzia"); }
+
+	/*! this text is generated when the \\date command is used. */
+	virtual QCString trDate()
+	{ return Decode("Dátum"); }
+
+	/*! this text is generated when the \\return command is used. */
+	virtual QCString trReturns()
+	{ return Decode("Návratová hodnota"); }
+
+	/*! this text is generated when the \\sa command is used. */
+	virtual QCString trSeeAlso()
+	{ return Decode("Viz tiež"); }
+
+	/*! this text is generated when the \\param command is used. */
+	virtual QCString trParameters()
+	{ return Decode("Parametre"); }
+
+	/*! this text is generated when the \\exception command is used. */
+	virtual QCString trExceptions()
+	{ return Decode("Výnimky"); }
+
+	/*! this text is used in the title page of a LaTeX document. */
+	virtual QCString trGeneratedBy()
+	{ return Decode("Generované programom"); }
+
+	// new since 0.49-990307
+
+	/*! used as the title of page containing all the index of all namespaces. */
+	virtual QCString trNamespaceList()
+	{ return Decode("Zoznam priestorov mien"); }
+
+	/*! used as an introduction to the namespace list */
+	virtual QCString trNamespaceListDescription(bool extractAll)
+	{
+	  QCString result="Tu nájdete zoznam všetkých ";
+	  if (!extractAll) result+="dokumentovaných ";
+	  result+="priestorov mien so stručným popisom:";
+	  return Decode(result);
+	}
+
+	/*! used in the class documentation as a header before the list of all
+	 *	friends of a class
+	 */
+	virtual QCString trFriends()
+	{ return Decode("Priatelia (friends)"); }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990405
 //////////////////////////////////////////////////////////////////////////
 
-    /*! used in the class documentation as a header before the list of all
-     * related classes
-     */
-    virtual QCString trRelatedFunctionDocumentation()
-    { return Decode("Dokumentácia k priateľom (friends)"); }
+	/*! used in the class documentation as a header before the list of all
+	 * related classes
+	 */
+	virtual QCString trRelatedFunctionDocumentation()
+	{ return Decode("Dokumentácia k priateľom (friends)"); }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990425
 //////////////////////////////////////////////////////////////////////////
 
-    /*! used as the title of the HTML page of a class/struct/union */
-    virtual QCString trCompoundReference(const char *clName,
-                                    ClassDef::CompoundType compType,
-                                    bool isTemplate)
-    {
-      QCString result("Dokumentácia ");
-      if (isTemplate) result+="šablóny ";
-      switch(compType)
-      {
-        case ClassDef::Class:      result+="triedy "; break;
-        case ClassDef::Struct:     result+="štruktúry "; break;
-        case ClassDef::Union:      result+="unionu "; break;
-        case ClassDef::Interface:  result+="rozhrania "; break;
-        case ClassDef::Exception:  result+="výnimky "; break;
-      }
-      result+=clName;
-      return Decode(result);
-    }
-
-    /*! used as the title of the HTML page of a file */
-    virtual QCString trFileReference(const char *fileName)
-    {
-      QCString result("Dokumentácia súboru ");
-      result+=fileName;
-      return Decode(result);
-    }
-
-    /*! used as the title of the HTML page of a namespace */
-    virtual QCString trNamespaceReference(const char *namespaceName)
-    {
-      QCString result("Dokumentácia priestoru mien ");
-      result+=namespaceName;
-      return Decode(result);
-    }
-
-    /* these are for the member sections of a class, struct or union */
-    virtual QCString trPublicMembers()
-    { return Decode("Verejné metódy"); }
-    virtual QCString trPublicSlots()
-    { return Decode("Verejné sloty"); }
-    virtual QCString trSignals()
-    { return Decode("Signály"); }
-    virtual QCString trStaticPublicMembers()
-    { return Decode("Statické verejné metódy"); }
-    virtual QCString trProtectedMembers()
-    { return Decode("Chránené metódy"); }
-    virtual QCString trProtectedSlots()
-    { return Decode("Chránené sloty"); }
-    virtual QCString trStaticProtectedMembers()
-    { return Decode("Statické chránené metódy"); }
-    virtual QCString trPrivateMembers()
-    { return Decode("Privátne metódy"); }
-    virtual QCString trPrivateSlots()
-    { return Decode("Privátne sloty"); }
-    virtual QCString trStaticPrivateMembers()
-    { return Decode("Statické privátne metódy"); }
-
-    /*! this function is used to produce a comma-separated list of items.
-     *  use generateMarker(i) to indicate where item i should be put.
-     */
-    virtual QCString trWriteList(int numEntries)
-    {
-      QCString result;
-      int i;
-      // the inherits list contain `numEntries' classes
-      for (i=0;i<numEntries;i++)
-      {
-        // use generateMarker to generate placeholders for the class links!
-        result+=generateMarker(i); // generate marker for entry i in the list
-                                   // (order is left to right)
-
-        if (i!=numEntries-1)  // not the last entry, so we need a separator
-        {
-          if (i<numEntries-2) // not the fore last entry
-            result+=", ";
-          else                // the fore last entry
-            result+=" a ";
-        }
-      }
-      return Decode(result);
-    }
-
-    /*! used in class documentation to produce a list of base classes,
-     *  if class diagrams are disabled.
-     */
-    virtual QCString trInheritsList(int numEntries)
-    {
-      QCString result("Dedí od ");
-      result += (numEntries == 1) ? "bázovej triedy " : "bázových tried ";
-      result += trWriteList(numEntries)+".";
-      return Decode(result);
-    }
-
-    /*! used in class documentation to produce a list of super classes,
-     *  if class diagrams are disabled.
-     */
-    virtual QCString trInheritedByList(int numEntries)
-    {
-      QCString result("Zdedená ");
-      result += (numEntries == 1) ? "triedou " : "triedami ";
-      result += trWriteList(numEntries)+".";
-      return Decode(result);
-    }
-
-    /*! used in member documentation blocks to produce a list of
-     *  members that are hidden by this one.
-     */
-    virtual QCString trReimplementedFromList(int numEntries)
-    {
-      QCString result("Reimplementuje ");
-      result += (numEntries == 1) ? "metódu triedy " : "metódy tried ";
-      result += trWriteList(numEntries)+".";
-      return Decode(result);
-    }
-
-    /*! used in member documentation blocks to produce a list of
-     *  all member that overwrite the implementation of this member.
-     */
-    virtual QCString trReimplementedInList(int numEntries)
-    {
-      QCString result("Reimplementované ");
-      result += (numEntries == 1) ? "triedou " : "triedami ";
-      result += trWriteList(numEntries)+".";
-      return Decode(result);
-    }
-
-    /*! This is put above each page as a link to all members of namespaces. */
-    virtual QCString trNamespaceMembers()
-    { return Decode("Symboly v priestoroch mien"); }
-
-    /*! This is an introduction to the page with all namespace members */
-    virtual QCString trNamespaceMemberDescription(bool extractAll)
-    {
-      QCString result="Tu nájdete zoznam všetkých ";
-      if (!extractAll) result+="dokumentovaných ";
-      result+="symbolov, ktoré sú definované vo svojich priestoroch mien. "
-              "U každého je uvedený odkaz na ";
-      if (extractAll)
-        result+="dokumentáciu príslušného priestoru mien:";
-      else
-        result+="príslušný priestor mien:";
-      return Decode(result);
-    }
-    /*! This is used in LaTeX as the title of the chapter with the
-     *  index of all namespaces.
-     */
-    virtual QCString trNamespaceIndex()
-    { return Decode("Register priestorov mien"); }
-
-    /*! This is used in LaTeX as the title of the chapter containing
-     *  the documentation of all namespaces.
-     */
-    virtual QCString trNamespaceDocumentation()
-    { return Decode("Dokumentácia priestorov mien"); }
+	/*! used as the title of the HTML page of a class/struct/union */
+	virtual QCString trCompoundReference(const char *clName,
+									ClassDef::CompoundType compType,
+									bool isTemplate)
+	{
+	  QCString result("Dokumentácia ");
+	  if (isTemplate) result+="šablóny ";
+	  switch(compType)
+	  {
+		case ClassDef::Class:	   result+="triedy "; break;
+		case ClassDef::Struct:	   result+="štruktúry "; break;
+		case ClassDef::Union:	   result+="unionu "; break;
+		case ClassDef::Interface:  result+="rozhrania "; break;
+		case ClassDef::Exception:  result+="výnimky "; break;
+	  }
+	  result+=clName;
+	  return Decode(result);
+	}
+
+	/*! used as the title of the HTML page of a file */
+	virtual QCString trFileReference(const char *fileName)
+	{
+	  QCString result("Dokumentácia súboru ");
+	  result+=fileName;
+	  return Decode(result);
+	}
+
+	/*! used as the title of the HTML page of a namespace */
+	virtual QCString trNamespaceReference(const char *namespaceName)
+	{
+	  QCString result("Dokumentácia priestoru mien ");
+	  result+=namespaceName;
+	  return Decode(result);
+	}
+
+	/* these are for the member sections of a class, struct or union */
+	virtual QCString trPublicMembers()
+	{ return Decode("Verejné metódy"); }
+	virtual QCString trPublicSlots()
+	{ return Decode("Verejné sloty"); }
+	virtual QCString trSignals()
+	{ return Decode("Signály"); }
+	virtual QCString trStaticPublicMembers()
+	{ return Decode("Statické verejné metódy"); }
+	virtual QCString trProtectedMembers()
+	{ return Decode("Chránené metódy"); }
+	virtual QCString trProtectedSlots()
+	{ return Decode("Chránené sloty"); }
+	virtual QCString trStaticProtectedMembers()
+	{ return Decode("Statické chránené metódy"); }
+	virtual QCString trPrivateMembers()
+	{ return Decode("Privátne metódy"); }
+	virtual QCString trPrivateSlots()
+	{ return Decode("Privátne sloty"); }
+	virtual QCString trStaticPrivateMembers()
+	{ return Decode("Statické privátne metódy"); }
+
+	/*! this function is used to produce a comma-separated list of items.
+	 *	use generateMarker(i) to indicate where item i should be put.
+	 */
+	virtual QCString trWriteList(int numEntries)
+	{
+	  QCString result;
+	  int i;
+	  // the inherits list contain `numEntries' classes
+	  for (i=0;i<numEntries;i++)
+	  {
+		// use generateMarker to generate placeholders for the class links!
+		result+=generateMarker(i); // generate marker for entry i in the list
+								   // (order is left to right)
+
+		if (i!=numEntries-1)  // not the last entry, so we need a separator
+		{
+		  if (i<numEntries-2) // not the fore last entry
+			result+=", ";
+		  else				  // the fore last entry
+			result+=" a ";
+		}
+	  }
+	  return Decode(result);
+	}
+
+	/*! used in class documentation to produce a list of base classes,
+	 *	if class diagrams are disabled.
+	 */
+	virtual QCString trInheritsList(int numEntries)
+	{
+	  QCString result("Dedí od ");
+	  result += (numEntries == 1) ? "bázovej triedy " : "bázových tried ";
+	  result += trWriteList(numEntries)+".";
+	  return Decode(result);
+	}
+
+	/*! used in class documentation to produce a list of super classes,
+	 *	if class diagrams are disabled.
+	 */
+	virtual QCString trInheritedByList(int numEntries)
+	{
+	  QCString result("Zdedená ");
+	  result += (numEntries == 1) ? "triedou " : "triedami ";
+	  result += trWriteList(numEntries)+".";
+	  return Decode(result);
+	}
+
+	/*! used in member documentation blocks to produce a list of
+	 *	members that are hidden by this one.
+	 */
+	virtual QCString trReimplementedFromList(int numEntries)
+	{
+	  QCString result("Reimplementuje ");
+	  result += (numEntries == 1) ? "metódu triedy " : "metódy tried ";
+	  result += trWriteList(numEntries)+".";
+	  return Decode(result);
+	}
+
+	/*! used in member documentation blocks to produce a list of
+	 *	all member that overwrite the implementation of this member.
+	 */
+	virtual QCString trReimplementedInList(int numEntries)
+	{
+	  QCString result("Reimplementované ");
+	  result += (numEntries == 1) ? "triedou " : "triedami ";
+	  result += trWriteList(numEntries)+".";
+	  return Decode(result);
+	}
+
+	/*! This is put above each page as a link to all members of namespaces. */
+	virtual QCString trNamespaceMembers()
+	{ return Decode("Symboly v priestoroch mien"); }
+
+	/*! This is an introduction to the page with all namespace members */
+	virtual QCString trNamespaceMemberDescription(bool extractAll)
+	{
+	  QCString result="Tu nájdete zoznam všetkých ";
+	  if (!extractAll) result+="dokumentovaných ";
+	  result+="symbolov, ktoré sú definované vo svojich priestoroch mien. "
+			  "U každého je uvedený odkaz na ";
+	  if (extractAll)
+		result+="dokumentáciu príslušného priestoru mien:";
+	  else
+		result+="príslušný priestor mien:";
+	  return Decode(result);
+	}
+	/*! This is used in LaTeX as the title of the chapter with the
+	 *	index of all namespaces.
+	 */
+	virtual QCString trNamespaceIndex()
+	{ return Decode("Register priestorov mien"); }
+
+	/*! This is used in LaTeX as the title of the chapter containing
+	 *	the documentation of all namespaces.
+	 */
+	virtual QCString trNamespaceDocumentation()
+	{ return Decode("Dokumentácia priestorov mien"); }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990522
 //////////////////////////////////////////////////////////////////////////
 
-    /*! This is used in the documentation before the list of all
-     *  namespaces in a file.
-     */
-    virtual QCString trNamespaces()
-    { return Decode("Priestory mien"); }
+	/*! This is used in the documentation before the list of all
+	 *	namespaces in a file.
+	 */
+	virtual QCString trNamespaces()
+	{ return Decode("Priestory mien"); }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990728
 //////////////////////////////////////////////////////////////////////////
 
-    /*! This is put at the bottom of a class documentation page and is
-     *  followed by a list of files that were used to generate the page.
-     */
-    virtual QCString trGeneratedFromFiles(ClassDef::CompoundType compType,
-        bool single)
-    { // here s is one of " Class", " Struct" or " Union"
-      // single is true implies a single file
-      QCString result=(QCString)"Dokumentácia pre ";
-      switch(compType)
-      {
-        case ClassDef::Class:      result+="túto triedu"; break;
-        case ClassDef::Struct:     result+="túto štruktúru (struct)"; break;
-        case ClassDef::Union:      result+="tento union"; break;
-        case ClassDef::Interface:  result+="toto rozhranie"; break;
-        case ClassDef::Exception:  result+="túto výnimku"; break;
-      }
-      result+=" bola generovaná z ";
-      if (single) result+="nasledujúceho súboru:";
-      else        result+="nasledujúcich súborov:";
-      return Decode(result);
-    }
-
-    /*! This is in the (quick) index as a link to the alphabetical compound
-     * list.
-     */
-    virtual QCString trAlphabeticalList()
-    { return Decode("Register tried"); }
+	/*! This is put at the bottom of a class documentation page and is
+	 *	followed by a list of files that were used to generate the page.
+	 */
+	virtual QCString trGeneratedFromFiles(ClassDef::CompoundType compType,
+		bool single)
+	{ // here s is one of " Class", " Struct" or " Union"
+	  // single is true implies a single file
+	  QCString result=(QCString)"Dokumentácia pre ";
+	  switch(compType)
+	  {
+		case ClassDef::Class:	   result+="túto triedu"; break;
+		case ClassDef::Struct:	   result+="túto štruktúru (struct)"; break;
+		case ClassDef::Union:	   result+="tento union"; break;
+		case ClassDef::Interface:  result+="toto rozhranie"; break;
+		case ClassDef::Exception:  result+="túto výnimku"; break;
+	  }
+	  result+=" bola generovaná z ";
+	  if (single) result+="nasledujúceho súboru:";
+	  else		  result+="nasledujúcich súborov:";
+	  return Decode(result);
+	}
+
+	/*! This is in the (quick) index as a link to the alphabetical compound
+	 * list.
+	 */
+	virtual QCString trAlphabeticalList()
+	{ return Decode("Register tried"); }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-990901
 //////////////////////////////////////////////////////////////////////////
 
-    /*! This is used as the heading text for the retval command. */
-    virtual QCString trReturnValues()
-    { return Decode("Návratové hodnoty"); }
+	/*! This is used as the heading text for the retval command. */
+	virtual QCString trReturnValues()
+	{ return Decode("Návratové hodnoty"); }
 
-    /*! This is in the (quick) index as a link to the main page (index.html)
-     */
-    virtual QCString trMainPage()
-    { return Decode("Hlavná stránka"); }
+	/*! This is in the (quick) index as a link to the main page (index.html)
+	 */
+	virtual QCString trMainPage()
+	{ return Decode("Hlavná stránka"); }
 
-    /*! This is used in references to page that are put in the LaTeX
-     *  documentation. It should be an abbreviation of the word page.
-     */
-    virtual QCString trPageAbbreviation()
-    { return Decode("s."); }
+	/*! This is used in references to page that are put in the LaTeX
+	 *	documentation. It should be an abbreviation of the word page.
+	 */
+	virtual QCString trPageAbbreviation()
+	{ return Decode("s."); }
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-991003
 //////////////////////////////////////////////////////////////////////////
 
-    virtual QCString trSources()
-    {
-      return Decode("Zdroje");
-    }
-    virtual QCString trDefinedAtLineInSourceFile()
-    {
-      return Decode("Definícia je uvedená na riadku @0 v súbore @1.");
-    }
-    virtual QCString trDefinedInSourceFile()
-    {
-      return Decode("Definícia v súbore @0.");
-    }
+	virtual QCString trSources()
+	{
+	  return Decode("Zdroje");
+	}
+	virtual QCString trDefinedAtLineInSourceFile()
+	{
+	  return Decode("Definícia je uvedená na riadku @0 v súbore @1.");
+	}
+	virtual QCString trDefinedInSourceFile()
+	{
+	  return Decode("Definícia v súbore @0.");
+	}
 
 //////////////////////////////////////////////////////////////////////////
 // new since 0.49-991205
 //////////////////////////////////////////////////////////////////////////
 
-    virtual QCString trDeprecated()
-    {
-      return Decode("Zastaralé");
-    }
+	virtual QCString trDeprecated()
+	{
+	  return Decode("Zastaralé");
+	}
 
 //////////////////////////////////////////////////////////////////////////
 // new since 1.0.0
 //////////////////////////////////////////////////////////////////////////
 
-    /*! this text is put before a collaboration diagram */
-    virtual QCString trCollaborationDiagram(const char *clName)
-    {
-      return Decode((QCString)"Diagram tried pre "+clName+":");
-    }
-    /*! this text is put before an include dependency graph */
-    virtual QCString trInclDepGraph(const char *fName)
-    {
-      return Decode((QCString)"Graf závislostí na vkladaných súboroch "
-                    "pre "+fName+":");
-    }
-    /*! header that is put before the list of constructor/destructors. */
-    virtual QCString trConstructorDocumentation()
-    {
-      return Decode("Dokumentácia konštruktoru a deštruktoru");
-    }
-    /*! Used in the file documentation to point to the corresponding sources. */
-    virtual QCString trGotoSourceCode()
-    {
-      return Decode("Zobraziť zdrojový text tohoto súboru.");
-    }
-    /*! Used in the file sources to point to the corresponding documentation. */
-    virtual QCString trGotoDocumentation()
-    {
-      return Decode("Zobraziť dokumentáciu tohoto súboru.");
-    }
-    /*! Text for the \\pre command */
-    virtual QCString trPrecondition()
-    {
-      return Decode("Prepodmienka");
-    }
-    /*! Text for the \\post command */
-    virtual QCString trPostcondition()
-    {
-      return Decode("Postpodmienka");
-    }
-    /*! Text for the \\invariant command */
-    virtual QCString trInvariant()
-    {
-      return Decode("Invariant");
-    }
-    /*! Text shown before a multi-line variable/enum initialization */
-    virtual QCString trInitialValue()
-    {
-      return Decode("Inicializátor:");
-    }
-    /*! Text used the source code in the file index */
-    virtual QCString trCode()
-    {
-      return Decode("zdrojový text");
-    }
-    virtual QCString trGraphicalHierarchy()
-    {
-      return Decode("Grafické zobrazenie hierarchie tried");
-    }
-    virtual QCString trGotoGraphicalHierarchy()
-    {
-      return Decode("Zobraziť grafickú podobu hierarchie tried");
-    }
-    virtual QCString trGotoTextualHierarchy()
-    {
-      return Decode("Zobraziť textovú podobu hierarchie tried");
-    }
-    virtual QCString trPageIndex()
-    {
-      return Decode("Register stránok");
-    }
+	/*! this text is put before a collaboration diagram */
+	virtual QCString trCollaborationDiagram(const char *clName)
+	{
+	  return Decode((QCString)"Diagram tried pre "+clName+":");
+	}
+	/*! this text is put before an include dependency graph */
+	virtual QCString trInclDepGraph(const char *fName)
+	{
+	  return Decode((QCString)"Graf závislostí na vkladaných súboroch "
+					"pre "+fName+":");
+	}
+	/*! header that is put before the list of constructor/destructors. */
+	virtual QCString trConstructorDocumentation()
+	{
+	  return Decode("Dokumentácia konštruktoru a deštruktoru");
+	}
+	/*! Used in the file documentation to point to the corresponding sources. */
+	virtual QCString trGotoSourceCode()
+	{
+	  return Decode("Zobraziť zdrojový text tohoto súboru.");
+	}
+	/*! Used in the file sources to point to the corresponding documentation. */
+	virtual QCString trGotoDocumentation()
+	{
+	  return Decode("Zobraziť dokumentáciu tohoto súboru.");
+	}
+	/*! Text for the \\pre command */
+	virtual QCString trPrecondition()
+	{
+	  return Decode("Prepodmienka");
+	}
+	/*! Text for the \\post command */
+	virtual QCString trPostcondition()
+	{
+	  return Decode("Postpodmienka");
+	}
+	/*! Text for the \\invariant command */
+	virtual QCString trInvariant()
+	{
+	  return Decode("Invariant");
+	}
+	/*! Text shown before a multi-line variable/enum initialization */
+	virtual QCString trInitialValue()
+	{
+	  return Decode("Inicializátor:");
+	}
+	/*! Text used the source code in the file index */
+	virtual QCString trCode()
+	{
+	  return Decode("zdrojový text");
+	}
+	virtual QCString trGraphicalHierarchy()
+	{
+	  return Decode("Grafické zobrazenie hierarchie tried");
+	}
+	virtual QCString trGotoGraphicalHierarchy()
+	{
+	  return Decode("Zobraziť grafickú podobu hierarchie tried");
+	}
+	virtual QCString trGotoTextualHierarchy()
+	{
+	  return Decode("Zobraziť textovú podobu hierarchie tried");
+	}
+	virtual QCString trPageIndex()
+	{
+	  return Decode("Register stránok");
+	}
 
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.0
 //////////////////////////////////////////////////////////////////////////
 
-    virtual QCString trNote()
-    {
-      return Decode("Poznámka");
-    }
-    virtual QCString trPublicTypes()
-    {
-      return Decode("Verejné typy");
-    }
-    virtual QCString trPublicAttribs()
-    {
-      if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
-      {
-        return Decode("Dátové položky");
-      }
-      else
-      {
-        return Decode("Verejné atribúty");
-      }
-    }
-    virtual QCString trStaticPublicAttribs()
-    {
-      return Decode("Statické verejné atribúty");
-    }
-    virtual QCString trProtectedTypes()
-    {
-      return Decode("Chránené typy");
-    }
-    virtual QCString trProtectedAttribs()
-    {
-      return Decode("Chránené atribúty");
-    }
-    virtual QCString trStaticProtectedAttribs()
-    {
-      return Decode("Statické chránené atribúty");
-    }
-    virtual QCString trPrivateTypes()
-    {
-      return Decode("Privátne typy");
-    }
-    virtual QCString trPrivateAttribs()
-    {
-      return Decode("Privátne atribúty");
-    }
-    virtual QCString trStaticPrivateAttribs()
-    {
-      return Decode("Statické privátne atribúty");
-    }
+	virtual QCString trNote()
+	{
+	  return Decode("Poznámka");
+	}
+	virtual QCString trPublicTypes()
+	{
+	  return Decode("Verejné typy");
+	}
+	virtual QCString trPublicAttribs()
+	{
+	  if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+	  {
+		return Decode("Dátové položky");
+	  }
+	  else
+	  {
+		return Decode("Verejné atribúty");
+	  }
+	}
+	virtual QCString trStaticPublicAttribs()
+	{
+	  return Decode("Statické verejné atribúty");
+	}
+	virtual QCString trProtectedTypes()
+	{
+	  return Decode("Chránené typy");
+	}
+	virtual QCString trProtectedAttribs()
+	{
+	  return Decode("Chránené atribúty");
+	}
+	virtual QCString trStaticProtectedAttribs()
+	{
+	  return Decode("Statické chránené atribúty");
+	}
+	virtual QCString trPrivateTypes()
+	{
+	  return Decode("Privátne typy");
+	}
+	virtual QCString trPrivateAttribs()
+	{
+	  return Decode("Privátne atribúty");
+	}
+	virtual QCString trStaticPrivateAttribs()
+	{
+	  return Decode("Statické privátne atribúty");
+	}
 
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.3
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as a marker that is put before a todo item */
-    virtual QCString trTodo()
-    {
-      return Decode("Plánované úpravy");
-    }
-    /*! Used as the header of the todo list */
-    virtual QCString trTodoList()
-    {
-      return Decode("Zoznam plánovaných úprav");
-    }
+	/*! Used as a marker that is put before a todo item */
+	virtual QCString trTodo()
+	{
+	  return Decode("Plánované úpravy");
+	}
+	/*! Used as the header of the todo list */
+	virtual QCString trTodoList()
+	{
+	  return Decode("Zoznam plánovaných úprav");
+	}
 
 //////////////////////////////////////////////////////////////////////////
 // new since 1.1.4
 //////////////////////////////////////////////////////////////////////////
 
-    virtual QCString trReferencedBy()
-    {
-      return Decode("Používa sa v");
-    }
-    virtual QCString trRemarks()
-    {
-      return Decode("Poznámky"); // ??? not checked in a context
-    }
-    virtual QCString trAttention()
-    {
-      return Decode("Upozornenie"); // ??? not checked in a context
-    }
-    virtual QCString trInclByDepGraph()
-    {
-      return Decode("Nasledujúci graf ukazuje, ktoré súbory priamo alebo "
-             "nepriamo vkladajú tento súbor:");
-    }
-    virtual QCString trSince()
-    {
-      return Decode("Od"); // ??? not checked in a context
-    }
+	virtual QCString trReferencedBy()
+	{
+	  return Decode("Používa sa v");
+	}
+	virtual QCString trRemarks()
+	{
+	  return Decode("Poznámky"); // ??? not checked in a context
+	}
+	virtual QCString trAttention()
+	{
+	  return Decode("Upozornenie"); // ??? not checked in a context
+	}
+	virtual QCString trInclByDepGraph()
+	{
+	  return Decode("Nasledujúci graf ukazuje, ktoré súbory priamo alebo "
+			 "nepriamo vkladajú tento súbor:");
+	}
+	virtual QCString trSince()
+	{
+	  return Decode("Od"); // ??? not checked in a context
+	}
 
 ////////////////////////////////////////////////////////////////////////////
 // new since 1.1.5
 //////////////////////////////////////////////////////////////////////////
 
-    /*! title of the graph legend page */
-    virtual QCString trLegendTitle()
-    {
-      return Decode("Vysvetlivky ku grafu");
-    }
-    /*! page explaining how the dot graph's should be interpreted */
-    virtual QCString trLegendDocs()
-    {
-      QCString result(
-        "Tu nájdete vysvetlenie, ako majú byť interpretované grafy, "
-        "ktoré boli generované programom doxygen.<p>\n"
-        "Uvažujte nasledujúci príklad:\n"
-        "\\code\n"
-        "/*! Neviditelná trieda, ktorá sa v grafe nezobrazuje, pretože "
-        "došlo k orezaniu grafu. */\n"
-        "class Invisible { };\n\n"
-        "/*! Trieda, u ktorej došlo k orezaniu grafu. Vzťah dedičnosti "
-        "je skrytý. */\n"
-        "class Truncated : public Invisible { };\n\n"
-        "/* Trieda, ktorá nieje dokumentovaná komentármi programu doxygen. */\n"
-        "class Undocumented { };\n\n"
-        "/*! Odvodená trieda s verejným (public) dedením bázovej triedy. */\n"
-        "class PublicBase : public Truncated { };\n\n"
-        "/*! Odvodená trieda s chráneným (protected) dedením bázovej triedy. */\n"
-        "class ProtectedBase { };\n\n"
-        "/*! Odvodená trieda s privátnym dedením bázovej triedy. */\n"
-        "class PrivateBase { };\n\n"
-        "/*! Trieda, ktorá je využívaná triedou Inherited. */\n"
-        "class Used { };\n\n"
-        "/*! Odvodená trieda, ktorá rôznym spôsobom dedí od viacerých bázových "
-        "tried. */\n"
-        "class Inherited : public PublicBase,\n"
-        "                  protected ProtectedBase,\n"
-        "                  private PrivateBase,\n"
-        "                  public Undocumented\n"
-        "{\n"
-        "  private:\n"
-        "    Used *m_usedClass;\n"
-        "};\n"
-        "\\endcode\n"
-        "Pokiaľ je položka \\c MAX_DOT_GRAPH_HEIGHT konfiguračného súboru "
-        "nastavená na hodnotu 200, bude vygenerovaný nasledujúci graf:"
-        "<p><center><img src=\"graph_legend.gif\"></center>\n"
-        "<p>\n"
-        "Bloky (tj. uzly) v uvedenom grafe majú nasledujúci význam:\n"
-        "<ul>\n"
-        "<li>Čierne vyplnený obdĺžnik reprezentuje štruktúru alebo triedu, "
-            "pre ktorú bol graf generovaný.\n"
-        "<li>Obdĺžnik s čiernym obrysom označuje dokumentovanú "
-            "štruktúru alebo triedu.\n"
-        "<li>Obdĺžnik so šedým obrysom označuje nedokumentovanú "
-            "štruktúru alebo triedu.\n"
-        "<li>Obdĺžnik s červeným obrysom označuje dokumentovanú "
-            "štruktúru alebo triedu, pre ktorú\n"
-            "niesú zobrazené všetky vzťahy dedičnosti alebo obsiahnutia. "
-            "Graf je orezaný v prípade, kedy ho\n"
-            "nieje možné umiestniť do vymedzených hraníc.\n"
-        "</ul>\n"
-        "Šípky (tj. hrany grafu) majú nasledujúcí význam:\n"
-        "<ul>\n"
-        "<li>Tmavo modrá šípka sa používa pre označenie vzťahu verejnej "
-            "dedičnosti medzi dvoma triedami.\n"
-        "<li>Tmavo zelená šípka označuje vzťah chránenej dedičnosti "
-            "(protected).\n"
-        "<li>Tmavo červená šípka označuje vzťah privátnej dedičnosti.\n"
-        "<li>Purpurová šípka kreslená čiarkovane sa používa v prípade, "
-            "ak je trieda obsiahnutá v inej triede,\n"
-            "alebo ak je používaná inou triedou. Je označená identifikátorom "
-            "jednej alebo viacerých premenných (objektov), cez ktoré\n"
-            "je trieda alebo štruktúra zprístupnena.\n"
-        "</ul>\n");
-
-        return Decode(result);
-    }
-    /*! text for the link to the legend page */
-    virtual QCString trLegend()
-    {
-      return Decode("vysvetlivky");
-    }
+	/*! title of the graph legend page */
+	virtual QCString trLegendTitle()
+	{
+	  return Decode("Vysvetlivky ku grafu");
+	}
+	/*! page explaining how the dot graph's should be interpreted */
+	virtual QCString trLegendDocs()
+	{
+	  QCString result(
+		"Tu nájdete vysvetlenie, ako majú byť interpretované grafy, "
+		"ktoré boli generované programom doxygen.<p>\n"
+		"Uvažujte nasledujúci príklad:\n"
+		"\\code\n"
+		"/*! Neviditelná trieda, ktorá sa v grafe nezobrazuje, pretože "
+		"došlo k orezaniu grafu. */\n"
+		"class Invisible { };\n\n"
+		"/*! Trieda, u ktorej došlo k orezaniu grafu. Vzťah dedičnosti "
+		"je skrytý. */\n"
+		"class Truncated : public Invisible { };\n\n"
+		"/* Trieda, ktorá nieje dokumentovaná komentármi programu doxygen. */\n"
+		"class Undocumented { };\n\n"
+		"/*! Odvodená trieda s verejným (public) dedením bázovej triedy. */\n"
+		"class PublicBase : public Truncated { };\n\n"
+		"/*! Odvodená trieda s chráneným (protected) dedením bázovej triedy. */\n"
+		"class ProtectedBase { };\n\n"
+		"/*! Odvodená trieda s privátnym dedením bázovej triedy. */\n"
+		"class PrivateBase { };\n\n"
+		"/*! Trieda, ktorá je využívaná triedou Inherited. */\n"
+		"class Used { };\n\n"
+		"/*! Odvodená trieda, ktorá rôznym spôsobom dedí od viacerých bázových "
+		"tried. */\n"
+		"class Inherited : public PublicBase,\n"
+		"				   protected ProtectedBase,\n"
+		"				   private PrivateBase,\n"
+		"				   public Undocumented\n"
+		"{\n"
+		"  private:\n"
+		"	 Used *m_usedClass;\n"
+		"};\n"
+		"\\endcode\n"
+		"Pokiaľ je položka \\c MAX_DOT_GRAPH_HEIGHT konfiguračného súboru "
+		"nastavená na hodnotu 200, bude vygenerovaný nasledujúci graf:"
+		"<p><center><img src=\"graph_legend.gif\"></center>\n"
+		"<p>\n"
+		"Bloky (tj. uzly) v uvedenom grafe majú nasledujúci význam:\n"
+		"<ul>\n"
+		"<li>Čierne vyplnený obdĺžnik reprezentuje štruktúru alebo triedu, "
+			"pre ktorú bol graf generovaný.\n"
+		"<li>Obdĺžnik s čiernym obrysom označuje dokumentovanú "
+			"štruktúru alebo triedu.\n"
+		"<li>Obdĺžnik so šedým obrysom označuje nedokumentovanú "
+			"štruktúru alebo triedu.\n"
+		"<li>Obdĺžnik s červeným obrysom označuje dokumentovanú "
+			"štruktúru alebo triedu, pre ktorú\n"
+			"niesú zobrazené všetky vzťahy dedičnosti alebo obsiahnutia. "
+			"Graf je orezaný v prípade, kedy ho\n"
+			"nieje možné umiestniť do vymedzených hraníc.\n"
+		"</ul>\n"
+		"Šípky (tj. hrany grafu) majú nasledujúcí význam:\n"
+		"<ul>\n"
+		"<li>Tmavo modrá šípka sa používa pre označenie vzťahu verejnej "
+			"dedičnosti medzi dvoma triedami.\n"
+		"<li>Tmavo zelená šípka označuje vzťah chránenej dedičnosti "
+			"(protected).\n"
+		"<li>Tmavo červená šípka označuje vzťah privátnej dedičnosti.\n"
+		"<li>Purpurová šípka kreslená čiarkovane sa používa v prípade, "
+			"ak je trieda obsiahnutá v inej triede,\n"
+			"alebo ak je používaná inou triedou. Je označená identifikátorom "
+			"jednej alebo viacerých premenných (objektov), cez ktoré\n"
+			"je trieda alebo štruktúra zprístupnena.\n"
+		"</ul>\n");
+
+		return Decode(result);
+	}
+	/*! text for the link to the legend page */
+	virtual QCString trLegend()
+	{
+	  return Decode("vysvetlivky");
+	}
 
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.0
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as a marker that is put before a test item */
-    virtual QCString trTest()
-    {
-      return Decode("Test");
-    }
+	/*! Used as a marker that is put before a test item */
+	virtual QCString trTest()
+	{
+	  return Decode("Test");
+	}
 
-    /*! Used as the header of the test list */
-    virtual QCString trTestList()
-    {
-      return Decode("Zoznam testov");
-    }
+	/*! Used as the header of the test list */
+	virtual QCString trTestList()
+	{
+	  return Decode("Zoznam testov");
+	}
 
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.1
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as a section header for KDE-2 IDL methods */
-    virtual QCString trDCOPMethods()
-    {
-      return Decode("Metódy DCOP");
-    }
+	/*! Used as a section header for KDE-2 IDL methods */
+	virtual QCString trDCOPMethods()
+	{
+	  return Decode("Metódy DCOP");
+	}
 
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.2
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as a section header for IDL properties */
-    virtual QCString trProperties()
-    {
-      return Decode("Vlastnosti");
-    }
-    /*! Used as a section header for IDL property documentation */
-    virtual QCString trPropertyDocumentation()
-    {
-      return Decode("Dokumentácia k vlastnosti");
-    }
+	/*! Used as a section header for IDL properties */
+	virtual QCString trProperties()
+	{
+	  return Decode("Vlastnosti");
+	}
+	/*! Used as a section header for IDL property documentation */
+	virtual QCString trPropertyDocumentation()
+	{
+	  return Decode("Dokumentácia k vlastnosti");
+	}
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.4
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used for Java interfaces in the summary section of Java packages */
-    virtual QCString trInterfaces()
-    {
-      return Decode("Rozhranie");
-    }
-    /*! Used for Java classes in the summary section of Java packages */
-    virtual QCString trClasses()
-    {
-      return Decode("Triedy");
-    }
-    /*! Used as the title of a Java package */
-    virtual QCString trPackage(const char *name)
-    {
-      return Decode((QCString)"Balík "+name);
-    }
-    /*! Title of the package index page */
-    virtual QCString trPackageList()
-    {
-      return Decode("Zoznam balíkov");
-    }
-    /*! The description of the package index page */
-    virtual QCString trPackageListDescription()
-    {
-      return Decode("Tu nájdete zoznam balíkov so stručným popisom "
-                    "(pokiaľ bol uvedený):");
-    }
-    /*! The link name in the Quick links header for each page */
-    virtual QCString trPackages()
-    {
-      return Decode("Balíky");
-    }
-    /*! Used as a chapter title for Latex & RTF output */
-    virtual QCString trPackageDocumentation()
-    {
-      return Decode("Dokumentácia balíku");
-    }
-    /*! Text shown before a multi-line define */
-    virtual QCString trDefineValue()
-    {
-      return Decode("Hodnota:");
-    }
+	/*! Used for Java interfaces in the summary section of Java packages */
+	virtual QCString trInterfaces()
+	{
+	  return Decode("Rozhranie");
+	}
+	/*! Used for Java classes in the summary section of Java packages */
+	virtual QCString trClasses()
+	{
+	  return Decode("Triedy");
+	}
+	/*! Used as the title of a Java package */
+	virtual QCString trPackage(const char *name)
+	{
+	  return Decode((QCString)"Balík "+name);
+	}
+	/*! Title of the package index page */
+	virtual QCString trPackageList()
+	{
+	  return Decode("Zoznam balíkov");
+	}
+	/*! The description of the package index page */
+	virtual QCString trPackageListDescription()
+	{
+	  return Decode("Tu nájdete zoznam balíkov so stručným popisom "
+					"(pokiaľ bol uvedený):");
+	}
+	/*! The link name in the Quick links header for each page */
+	virtual QCString trPackages()
+	{
+	  return Decode("Balíky");
+	}
+	/*! Used as a chapter title for Latex & RTF output */
+	virtual QCString trPackageDocumentation()
+	{
+	  return Decode("Dokumentácia balíku");
+	}
+	/*! Text shown before a multi-line define */
+	virtual QCString trDefineValue()
+	{
+	  return Decode("Hodnota:");
+	}
 
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.5
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as a marker that is put before a \\bug item */
-    virtual QCString trBug()
-    {
-      return Decode("Chyba");
-    }
-    /*! Used as the header of the bug list */
-    virtual QCString trBugList()
-    {
-      return Decode("Zoznam chýb");
-    }
+	/*! Used as a marker that is put before a \\bug item */
+	virtual QCString trBug()
+	{
+	  return Decode("Chyba");
+	}
+	/*! Used as the header of the bug list */
+	virtual QCString trBugList()
+	{
+	  return Decode("Zoznam chýb");
+	}
 
 //////////////////////////////////////////////////////////////////////////
 // new since 1.2.6-20010422
 //////////////////////////////////////////////////////////////////////////
 
-    /*! Used as ansicpg for RTF file */
-    virtual QCString trRTFansicp()
-    {
-      return "1250";
-    }
-
-    /*! Used as ansicpg for RTF fcharset */
-    virtual QCString trRTFCharSet()
-    {
-      return "0"; //???
-    }
-
-    /*! Used as header RTF general index */
-    virtual QCString trRTFGeneralIndex()
-    {
-      return "Index"; //???
-    }
-
-    /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names
-     *  of the category.
-     */
-    virtual QCString trClass(bool first_capital, bool singular)
-    {
-      QCString result((first_capital ? "Tried" : "tried"));
-      result+=(singular ? "a" : "y");
-      return Decode(result);
-    }
-
-    /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names
-     *  of the category.
-     */
-    virtual QCString trFile(bool first_capital, bool singular)
-    {
-      QCString result((first_capital ? "Súbor" : "súbor"));
-      if (!singular)  result+="y";
-      return Decode(result);
-    }
-
-    /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names
-     *  of the category.
-     */
-    virtual QCString trNamespace(bool first_capital, bool singular)
-    {
-      QCString result((first_capital ? "Priestor" : "priestor"));
-      if (!singular)  result+="y";
-      result+=" mien";
-      return Decode(result);
-    }
-
-    /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names
-     *  of the category.
-     */
-    virtual QCString trGroup(bool first_capital, bool singular)
-    {
-      QCString result((first_capital ? "Skupin" : "skupin"));
-      result+=(singular ? "a" : "y");
-      return Decode(result);
-    }
-
-    /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names
-     *  of the category.
-     */
-    virtual QCString trPage(bool first_capital, bool singular)
-    {
-      QCString result((first_capital ? "Stránk" : "stránk"));
-      result+=(singular ? "a" : "y");
-      return Decode(result);
-    }
-
-    /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names
-     *  of the category.
-     */
-    virtual QCString trMember(bool first_capital, bool singular)
-    {
-      QCString result((first_capital ? "Člen" : "člen"));
-      if (!singular)  result+="y";
-      return Decode(result);
-    }
-
-    /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names
-     *  of the category.
-     */
-    virtual QCString trField(bool first_capital, bool singular)
-    {
-      QCString result((first_capital ? "Položk" : "položk"));
-      result+=(singular ? "a" : "y");
-      return Decode(result);
-    }
-
-    /*! This is used for translation of the word that will possibly
-     *  be followed by a single name or by a list of names
-     *  of the category.
-     */
-    virtual QCString trGlobal(bool first_capital, bool singular)
-    {
-      QCString result((first_capital ? "Globáln" : "globáln"));
-      result+=(singular ? "y" : "e");
-      return result;
-    }
+	/*! Used as ansicpg for RTF file */
+	virtual QCString trRTFansicp()
+	{
+	  return "1250";
+	}
+
+	/*! Used as ansicpg for RTF fcharset */
+	virtual QCString trRTFCharSet()
+	{
+	  return "0"; //???
+	}
+
+	/*! Used as header RTF general index */
+	virtual QCString trRTFGeneralIndex()
+	{
+	  return "Index"; //???
+	}
+
+	/*! This is used for translation of the word that will possibly
+	 *	be followed by a single name or by a list of names
+	 *	of the category.
+	 */
+	virtual QCString trClass(bool first_capital, bool singular)
+	{
+	  QCString result((first_capital ? "Tried" : "tried"));
+	  result+=(singular ? "a" : "y");
+	  return Decode(result);
+	}
+
+	/*! This is used for translation of the word that will possibly
+	 *	be followed by a single name or by a list of names
+	 *	of the category.
+	 */
+	virtual QCString trFile(bool first_capital, bool singular)
+	{
+	  QCString result((first_capital ? "Súbor" : "súbor"));
+	  if (!singular)  result+="y";
+	  return Decode(result);
+	}
+
+	/*! This is used for translation of the word that will possibly
+	 *	be followed by a single name or by a list of names
+	 *	of the category.
+	 */
+	virtual QCString trNamespace(bool first_capital, bool singular)
+	{
+	  QCString result((first_capital ? "Priestor" : "priestor"));
+	  if (!singular)  result+="y";
+	  result+=" mien";
+	  return Decode(result);
+	}
+
+	/*! This is used for translation of the word that will possibly
+	 *	be followed by a single name or by a list of names
+	 *	of the category.
+	 */
+	virtual QCString trGroup(bool first_capital, bool singular)
+	{
+	  QCString result((first_capital ? "Skupin" : "skupin"));
+	  result+=(singular ? "a" : "y");
+	  return Decode(result);
+	}
+
+	/*! This is used for translation of the word that will possibly
+	 *	be followed by a single name or by a list of names
+	 *	of the category.
+	 */
+	virtual QCString trPage(bool first_capital, bool singular)
+	{
+	  QCString result((first_capital ? "Stránk" : "stránk"));
+	  result+=(singular ? "a" : "y");
+	  return Decode(result);
+	}
+
+	/*! This is used for translation of the word that will possibly
+	 *	be followed by a single name or by a list of names
+	 *	of the category.
+	 */
+	virtual QCString trMember(bool first_capital, bool singular)
+	{
+	  QCString result((first_capital ? "Člen" : "člen"));
+	  if (!singular)  result+="y";
+	  return Decode(result);
+	}
+
+	/*! This is used for translation of the word that will possibly
+	 *	be followed by a single name or by a list of names
+	 *	of the category.
+	 */
+	virtual QCString trField(bool first_capital, bool singular)
+	{
+	  QCString result((first_capital ? "Položk" : "položk"));
+	  result+=(singular ? "a" : "y");
+	  return Decode(result);
+	}
+
+	/*! This is used for translation of the word that will possibly
+	 *	be followed by a single name or by a list of names
+	 *	of the category.
+	 */
+	virtual QCString trGlobal(bool first_capital, bool singular)
+	{
+	  QCString result((first_capital ? "Globáln" : "globáln"));
+	  result+=(singular ? "y" : "e");
+	  return result;
+	}
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.7
+//////////////////////////////////////////////////////////////////////////
+
+	/*! This text is generated when the \\author command is used and
+	 *	for the author section in man pages. */
+	virtual QCString trAuthor(bool first_capital, bool singular)
+	{
+	  QCString result((first_capital ? "Auto" : "auto"));
+	  result += (singular) ? "r" : "ri";
+	  return result;
+	}
 };
 
 #endif // TRANSLATOR_SK_H
diff --git a/src/util.cpp b/src/util.cpp
index 96944ff..cbc64d6 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -266,7 +266,7 @@ QCString stripAnonymousNamespaceScope(const QCString &s)
   while ((i=getScopeFragment(s,p,&l))!=-1)
   {
     //printf("Scope fragment %s\n",s.mid(i,l).data());
-    if (Doxygen::namespaceDict[s.left(i+l)]!=0)
+    if (Doxygen::namespaceSDict[s.left(i+l)]!=0)
     {
       if (s.at(i)!='@')
       {
@@ -438,11 +438,11 @@ NamespaceDef *getResolvedNamespace(const char *name)
     {
       warn_cont("Warning: possible recursive namespace alias detected for %s!\n",name);
     }
-    return Doxygen::namespaceDict[subst->data()];
+    return Doxygen::namespaceSDict[subst->data()];
   }
   else
   {
-    return Doxygen::namespaceDict[name];
+    return Doxygen::namespaceSDict[name];
   }
 }
 
@@ -1208,7 +1208,7 @@ static void trimNamespaceScope(QCString &t1,QCString &t2,const QCString &nsName)
         QCString fullScope=nsName.left(so);
         if (!fullScope.isEmpty() && !scope.isEmpty()) fullScope+="::";
         fullScope+=scope;
-        if (!fullScope.isEmpty() && Doxygen::namespaceDict[fullScope]!=0) // scope is a namespace
+        if (!fullScope.isEmpty() && Doxygen::namespaceSDict[fullScope]!=0) // scope is a namespace
         {
           t1 = t1.right(t1.length()-i1-2);
           return;
@@ -1234,7 +1234,7 @@ static void trimNamespaceScope(QCString &t1,QCString &t2,const QCString &nsName)
         QCString fullScope=nsName.left(so);
         if (!fullScope.isEmpty() && !scope.isEmpty()) fullScope+="::";
         fullScope+=scope;
-        if (!fullScope.isEmpty() && Doxygen::namespaceDict[fullScope]!=0) // scope is a namespace
+        if (!fullScope.isEmpty() && Doxygen::namespaceSDict[fullScope]!=0) // scope is a namespace
         {
           t2 = t2.right(t2.length()-i2-2);
           return;
@@ -2174,7 +2174,7 @@ bool getDefs(const QCString &scName,const QCString &memberName,
         namespaceName=mScope.copy();
       }
       if (!namespaceName.isEmpty() && 
-          (fnd=Doxygen::namespaceDict[namespaceName]) &&
+          (fnd=Doxygen::namespaceSDict[namespaceName]) &&
           fnd->isLinkable()
          )
       {
@@ -2363,7 +2363,7 @@ bool getScopeDefs(const char *docScope,const char *scope,
     {
       return TRUE; // class link written => quit 
     }
-    else if ((nd=Doxygen::namespaceDict[fullName]) && nd->isLinkable())
+    else if ((nd=Doxygen::namespaceSDict[fullName]) && nd->isLinkable())
     {
       return TRUE; // namespace link written => quit 
     }
diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
index f5f66ac..9ff6199 100644
--- a/src/xmlgen.cpp
+++ b/src/xmlgen.cpp
@@ -942,6 +942,9 @@ void generateXMLForMember(MemberDef *md,QTextStream &t,Definition *def)
   t << "        <detaileddescription>" << endl;
   writeXMLDocBlock(t,md->getDefFileName(),md->getDefLine(),scopeName,md->name(),md->documentation());
   t << "        </detaileddescription>" << endl;
+  t << "        <location file=\"" 
+    << md->getDefFileName() << "\" line=\"" 
+    << md->getDefLine() << "\"/>" << endl;
   t << "      </memberdef>" << endl;
 }
 
@@ -1094,26 +1097,59 @@ void generateXMLForClass(ClassDef *cd,QTextStream &t)
     collaborationGraph.writeXML(t);
     t << "    </collaborationgraph>" << endl;
   }
+  t << "      <location file=\"" 
+    << cd->getDefFileName() << "\" line=\"" 
+    << cd->getDefLine() << "\"/>" << endl;
   t << "  </compounddef>" << endl;
 }
 
-void generateXMLFileSection(FileDef *fd,QTextStream &t,MemberList *ml,const char *kind)
+void generateXMLSection(Definition *d,QTextStream &t,MemberList *ml,const char *kind)
 {
   if (ml->count()>0)
   {
     t << "      <sectiondef kind=\"" << kind << "\">" << endl;
-    //t << "          <memberlist>" << endl;
     MemberListIterator mli(*ml);
     MemberDef *md;
     for (mli.toFirst();(md=mli.current());++mli)
     {
-      generateXMLForMember(md,t,fd);
+      generateXMLForMember(md,t,d);
     }
-    //t << "          </memberlist>" << endl;
     t << "      </sectiondef>" << endl;
   }
 }
 
+void generateXMLForNamespace(NamespaceDef *nd,QTextStream &t)
+{
+  if (nd->isReference()) return; // skip external references
+  t << "  <compounddef id=\"" 
+    << nd->getOutputFileBase() << "\" kind=\"namespace\">" << endl;
+  t << "    <compoundname>";
+  writeXMLString(t,nd->name());
+  t << "</compoundname>" << endl;
+  int numMembers = nd->decDefineMembers.count()+nd->decProtoMembers.count()+
+                   nd->decTypedefMembers.count()+nd->decEnumMembers.count()+
+                   nd->decFuncMembers.count()+nd->decVarMembers.count();
+  if (numMembers>0)
+  {
+    generateXMLSection(nd,t,&nd->decDefineMembers,"define");
+    generateXMLSection(nd,t,&nd->decProtoMembers,"prototype");
+    generateXMLSection(nd,t,&nd->decTypedefMembers,"typedef");
+    generateXMLSection(nd,t,&nd->decEnumMembers,"enum");
+    generateXMLSection(nd,t,&nd->decFuncMembers,"func");
+    generateXMLSection(nd,t,&nd->decVarMembers,"var");
+  }
+  t << "    <briefdescription>" << endl;
+  writeXMLDocBlock(t,nd->getDefFileName(),nd->getDefLine(),0,0,nd->briefDescription());
+  t << "    </briefdescription>" << endl;
+  t << "    <detaileddescription>" << endl;
+  writeXMLDocBlock(t,nd->getDefFileName(),nd->getDefLine(),0,0,nd->documentation());
+  t << "    </detaileddescription>" << endl;
+  t << "    <location file=\"" 
+    << nd->getDefFileName() << "\" line=\"" 
+    << nd->getDefLine() << "\"/>" << endl;
+  t << "  </compounddef>" << endl;
+}
+
 void generateXMLForFile(FileDef *fd,QTextStream &t)
 {
   if (fd->isReference()) return; // skip external references
@@ -1127,14 +1163,12 @@ void generateXMLForFile(FileDef *fd,QTextStream &t)
                    fd->decFuncMembers.count()+fd->decVarMembers.count();
   if (numMembers>0)
   {
-    //t << "      <sectionlist>" << endl;
-    generateXMLFileSection(fd,t,&fd->decDefineMembers,"define");
-    generateXMLFileSection(fd,t,&fd->decProtoMembers,"prototype");
-    generateXMLFileSection(fd,t,&fd->decTypedefMembers,"typedef");
-    generateXMLFileSection(fd,t,&fd->decEnumMembers,"enum");
-    generateXMLFileSection(fd,t,&fd->decFuncMembers,"func");
-    generateXMLFileSection(fd,t,&fd->decVarMembers,"var");
-    //t << "      </sectionlist>" << endl;
+    generateXMLSection(fd,t,&fd->decDefineMembers,"define");
+    generateXMLSection(fd,t,&fd->decProtoMembers,"prototype");
+    generateXMLSection(fd,t,&fd->decTypedefMembers,"typedef");
+    generateXMLSection(fd,t,&fd->decEnumMembers,"enum");
+    generateXMLSection(fd,t,&fd->decFuncMembers,"func");
+    generateXMLSection(fd,t,&fd->decVarMembers,"var");
   }
   t << "    <briefdescription>" << endl;
   writeXMLDocBlock(t,fd->getDefFileName(),fd->getDefLine(),0,0,fd->briefDescription());
@@ -1145,6 +1179,9 @@ void generateXMLForFile(FileDef *fd,QTextStream &t)
   t << "    <sourcecode>" << endl;
   writeXMLCodeBlock(t,fd);
   t << "    </sourcecode>" << endl;
+  t << "    <location file=\"" 
+    << fd->getDefFileName() << "\" line=\"" 
+    << fd->getDefLine() << "\"/>" << endl;
   t << "  </compounddef>" << endl;
 }