1 files changed, 27 insertions, 20 deletions

diff --git a/src/docbookgen.cpp b/src/docbookgen.cpp
index 9398f59..09ff14f 100644
--- a/src/docbookgen.cpp
+++ b/src/docbookgen.cpp
@@ -107,6 +107,8 @@ class DocbookSectionMapper : public QIntDict<char>
     insert(MemberListType_decDefineMembers,"define");
     insert(MemberListType_decProtoMembers,"prototype");
     insert(MemberListType_decTypedefMembers,"typedef");
+    insert(MemberListType_decSequenceMembers,"sequence");
+    insert(MemberListType_decDictionaryMembers,"dictionary");
     insert(MemberListType_decEnumMembers,"enum");
     insert(MemberListType_decFuncMembers,"func");
     insert(MemberListType_decVarMembers,"var");
@@ -660,20 +662,22 @@ static void generateDocbookForMember(MemberDef *md,FTextStream &t,Definition *de
   QCString memType;
   switch (md->memberType())
   {
-    case MemberType_Define:      memType="define";    break;
-    case MemberType_Function:    memType="function";  break;
-    case MemberType_Variable:    memType="variable";  break;
-    case MemberType_Typedef:     memType="typedef";   break;
-    case MemberType_Enumeration: memType="enum";      break;
-    case MemberType_EnumValue:   ASSERT(0);           break;
-    case MemberType_Signal:      memType="signal";    break;
-    case MemberType_Slot:        memType="slot";      break;
-    case MemberType_Friend:      memType="friend";    break;
-    case MemberType_DCOP:        memType="dcop";      break;
-    case MemberType_Property:    memType="property";  break;
-    case MemberType_Event:       memType="event";     break;
-    case MemberType_Interface:   memType="interface"; break;
-    case MemberType_Service:     memType="service";   break;
+    case MemberType_Define:      memType="define";     break;
+    case MemberType_Function:    memType="function";   break;
+    case MemberType_Variable:    memType="variable";   break;
+    case MemberType_Typedef:     memType="typedef";    break;
+    case MemberType_Enumeration: memType="enum";       break;
+    case MemberType_EnumValue:   ASSERT(0);            break;
+    case MemberType_Signal:      memType="signal";     break;
+    case MemberType_Slot:        memType="slot";       break;
+    case MemberType_Friend:      memType="friend";     break;
+    case MemberType_DCOP:        memType="dcop";       break;
+    case MemberType_Property:    memType="property";   break;
+    case MemberType_Event:       memType="event";      break;
+    case MemberType_Interface:   memType="interface";  break;
+    case MemberType_Service:     memType="service";    break;
+    case MemberType_Sequence:    memType="sequence";   break;
+    case MemberType_Dictionary:  memType="dictionary"; break;
   }
   QCString scopeName;
   if (md->getClassDef())
@@ -794,7 +798,8 @@ static void generateDocbookForMember(MemberDef *md,FTextStream &t,Definition *de
         }
       }
     }
-    else if (md->memberType()==MemberType_Typedef)
+    else if (md->memberType()==MemberType_Typedef || md->memberType()==MemberType_Sequence ||
+             md->memberType()==MemberType_Dictionary)
     {
       t << "                            <para>" << memType;
       t << " ";
@@ -1115,6 +1120,8 @@ static void generateDocbookSection(Definition *d,FTextStream &t,MemberList *ml,c
     case MemberListType_priMethods:        title=theTranslator->trPrivateMembers();      desctitle="";   break;
 
     case MemberListType_decTypedefMembers: title=theTranslator->trTypedefs();            desctitle=theTranslator->trTypedefDocumentation();           break;
+    case MemberListType_decSequenceMembers:   title=theTranslator->trSequences();           desctitle=theTranslator->trSequenceDocumentation();        break;
+    case MemberListType_decDictionaryMembers: title=theTranslator->trDictionaries();        desctitle=theTranslator->trDictionaryDocumentation();        break;
     case MemberListType_decEnumMembers:    title=theTranslator->trEnumerations();        desctitle=theTranslator->trEnumerationTypeDocumentation();   break;
     case MemberListType_decFuncMembers:    title=theTranslator->trFunctions();           desctitle=theTranslator->trFunctionDocumentation();          break;
     case MemberListType_decVarMembers:     title=theTranslator->trVariables();           desctitle=theTranslator->trVariableDocumentation();          break;
@@ -2688,7 +2695,7 @@ DB_GEN_C2("IndexSections " << is)
         bool found=FALSE;
         for (cli.toFirst();(cd=cli.current()) && !found;++cli)
         {
-          if (cd->isLinkableInProject() && 
+          if (cd->isLinkableInProject() &&
               cd->templateMaster()==0 &&
              !cd->isEmbeddedInOuterScope()
              )
@@ -2699,13 +2706,13 @@ DB_GEN_C2("IndexSections " << is)
         }
         for (;(cd=cli.current());++cli)
         {
-          if (cd->isLinkableInProject() && 
+          if (cd->isLinkableInProject() &&
               cd->templateMaster()==0 &&
              !cd->isEmbeddedInOuterScope()
              )
           {
             t << "    <xi:include href=\"" << cd->getOutputFileBase() << ".xml\" xmlns:xi=\"http://www.w3.org/2001/XInclude\"/>" << endl;
-          } 
+          }
         }
       }
       t << "</chapter>\n";
@@ -2714,7 +2721,7 @@ DB_GEN_C2("IndexSections " << is)
       {
         t << "</title>" << endl;
         bool isFirst=TRUE;
-        FileNameListIterator fnli(*Doxygen::inputNameList); 
+        FileNameListIterator fnli(*Doxygen::inputNameList);
         FileName *fn;
         for (fnli.toFirst();(fn=fnli.current());++fnli)
         {
@@ -2892,7 +2899,7 @@ void DocbookGenerator::startGroupHeader(int extraIndentLevel)
 {
 DB_GEN_C2("m_inLevel " << m_inLevel)
 DB_GEN_C2("extraIndentLevel " << extraIndentLevel)
-  m_firstMember = TRUE; 
+  m_firstMember = TRUE;
   if (m_inSimpleSect[m_levelListItem]) t << "</simplesect>" << endl;
   m_inSimpleSect[m_levelListItem] = FALSE;
   if (m_inLevel != -1) m_inGroup = TRUE;