Enable in page table of contents for LaTeX

currently the \tableofcontents command is only supported for HTML.
In this patch:
- enable in page table of contents for LaTeX: \tableofcontents['{'[option][,option]*'}']
     where option can be 'HTML, and 'LaTeX'
(side effect: possibility to have options with, nearly, all commands.)

11 files changed, 220 insertions, 165 deletions

diff --git a/src/commentscan.l b/src/commentscan.l
index de31b2e..0db1bf8 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -30,6 +30,7 @@
 #include <qstack.h>
 #include <qregexp.h>
 #include <qfile.h>
+#include <qstringlist.h>
   
 #include "scanner.h"
 #include "entry.h"
@@ -54,81 +55,81 @@
 #define YY_NO_UNISTD_H 1
 
 // forward declarations
-static bool handleBrief(const QCString &);
-static bool handleFn(const QCString &);
-static bool handleDef(const QCString &);
-static bool handleOverload(const QCString &);
-static bool handleEnum(const QCString &);
-static bool handleDefGroup(const QCString &);
-static bool handleAddToGroup(const QCString &);
-static bool handleWeakGroup(const QCString &);
-static bool handleNamespace(const QCString &);
-static bool handlePackage(const QCString &);
-static bool handleClass(const QCString &);
-static bool handleHeaderFile(const QCString &);
-static bool handleProtocol(const QCString &);
-static bool handleCategory(const QCString &);
-static bool handleUnion(const QCString &);
-static bool handleStruct(const QCString &);
-static bool handleInterface(const QCString &);
-static bool handleIdlException(const QCString &);
-static bool handlePage(const QCString &);
-static bool handleMainpage(const QCString &);
-static bool handleFile(const QCString &);
-static bool handleDir(const QCString &);
-static bool handleExample(const QCString &);
-static bool handleDetails(const QCString &);
-static bool handleName(const QCString &);
-static bool handleTodo(const QCString &);
-static bool handleTest(const QCString &);
-static bool handleBug(const QCString &);
-static bool handleSubpage(const QCString &s);
-static bool handleDeprecated(const QCString &);
-static bool handleXRefItem(const QCString &);
-static bool handleRelated(const QCString &);
-static bool handleRelatedAlso(const QCString &);
-static bool handleMemberOf(const QCString &);
-static bool handleRefItem(const QCString &);
-static bool handleSection(const QCString &);
-static bool handleAnchor(const QCString &);
-static bool handleCite(const QCString &);
-static bool handleFormatBlock(const QCString &);
-static bool handleAddIndex(const QCString &);
-static bool handleIf(const QCString &);
-static bool handleIfNot(const QCString &);
-static bool handleElseIf(const QCString &);
-static bool handleElse(const QCString &);
-static bool handleEndIf(const QCString &);
-static bool handleIngroup(const QCString &);
-static bool handleNoSubGrouping(const QCString &);
-static bool handleShowInitializer(const QCString &);
-static bool handleHideInitializer(const QCString &);
-static bool handleCallgraph(const QCString &);
-static bool handleHideCallgraph(const QCString &);
-static bool handleCallergraph(const QCString &);
-static bool handleHideCallergraph(const QCString &);
-static bool handleInternal(const QCString &);
-static bool handleLineBr(const QCString &);
-static bool handleStatic(const QCString &);
-static bool handlePure(const QCString &);
-static bool handlePrivate(const QCString &);
-static bool handlePrivateSection(const QCString &);
-static bool handleProtected(const QCString &);
-static bool handleProtectedSection(const QCString &);
-static bool handlePublic(const QCString &s);
-static bool handlePublicSection(const QCString &s);
-static bool handleToc(const QCString &s);
-static bool handleInherit(const QCString &);
-static bool handleExtends(const QCString &);
-static bool handleCopyDoc(const QCString &);
-static bool handleCopyBrief(const QCString &);
-static bool handleCopyDetails(const QCString &);
-static bool handleParBlock(const QCString &);
-static bool handleEndParBlock(const QCString &);
-static bool handleParam(const QCString &);
-static bool handleRetval(const QCString &);
-
-typedef bool (*DocCmdFunc)(const QCString &name);
+static bool handleBrief(const QCString &, const QCString &);
+static bool handleFn(const QCString &, const QCString &);
+static bool handleDef(const QCString &, const QCString &);
+static bool handleOverload(const QCString &, const QCString &);
+static bool handleEnum(const QCString &, const QCString &);
+static bool handleDefGroup(const QCString &, const QCString &);
+static bool handleAddToGroup(const QCString &, const QCString &);
+static bool handleWeakGroup(const QCString &, const QCString &);
+static bool handleNamespace(const QCString &, const QCString &);
+static bool handlePackage(const QCString &, const QCString &);
+static bool handleClass(const QCString &, const QCString &);
+static bool handleHeaderFile(const QCString &, const QCString &);
+static bool handleProtocol(const QCString &, const QCString &);
+static bool handleCategory(const QCString &, const QCString &);
+static bool handleUnion(const QCString &, const QCString &);
+static bool handleStruct(const QCString &, const QCString &);
+static bool handleInterface(const QCString &, const QCString &);
+static bool handleIdlException(const QCString &, const QCString &);
+static bool handlePage(const QCString &, const QCString &);
+static bool handleMainpage(const QCString &, const QCString &);
+static bool handleFile(const QCString &, const QCString &);
+static bool handleDir(const QCString &, const QCString &);
+static bool handleExample(const QCString &, const QCString &);
+static bool handleDetails(const QCString &, const QCString &);
+static bool handleName(const QCString &, const QCString &);
+static bool handleTodo(const QCString &, const QCString &);
+static bool handleTest(const QCString &, const QCString &);
+static bool handleBug(const QCString &, const QCString &);
+static bool handleSubpage(const QCString &s, const QCString &);
+static bool handleDeprecated(const QCString &, const QCString &);
+static bool handleXRefItem(const QCString &, const QCString &);
+static bool handleRelated(const QCString &, const QCString &);
+static bool handleRelatedAlso(const QCString &, const QCString &);
+static bool handleMemberOf(const QCString &, const QCString &);
+static bool handleRefItem(const QCString &, const QCString &);
+static bool handleSection(const QCString &, const QCString &);
+static bool handleAnchor(const QCString &, const QCString &);
+static bool handleCite(const QCString &, const QCString &);
+static bool handleFormatBlock(const QCString &, const QCString &);
+static bool handleAddIndex(const QCString &, const QCString &);
+static bool handleIf(const QCString &, const QCString &);
+static bool handleIfNot(const QCString &, const QCString &);
+static bool handleElseIf(const QCString &, const QCString &);
+static bool handleElse(const QCString &, const QCString &);
+static bool handleEndIf(const QCString &, const QCString &);
+static bool handleIngroup(const QCString &, const QCString &);
+static bool handleNoSubGrouping(const QCString &, const QCString &);
+static bool handleShowInitializer(const QCString &, const QCString &);
+static bool handleHideInitializer(const QCString &, const QCString &);
+static bool handleCallgraph(const QCString &, const QCString &);
+static bool handleHideCallgraph(const QCString &, const QCString &);
+static bool handleCallergraph(const QCString &, const QCString &);
+static bool handleHideCallergraph(const QCString &, const QCString &);
+static bool handleInternal(const QCString &, const QCString &);
+static bool handleLineBr(const QCString &, const QCString &);
+static bool handleStatic(const QCString &, const QCString &);
+static bool handlePure(const QCString &, const QCString &);
+static bool handlePrivate(const QCString &, const QCString &);
+static bool handlePrivateSection(const QCString &, const QCString &);
+static bool handleProtected(const QCString &, const QCString &);
+static bool handleProtectedSection(const QCString &, const QCString &);
+static bool handlePublic(const QCString &s, const QCString &);
+static bool handlePublicSection(const QCString &s, const QCString &);
+static bool handleToc(const QCString &s, const QCString &);
+static bool handleInherit(const QCString &, const QCString &);
+static bool handleExtends(const QCString &, const QCString &);
+static bool handleCopyDoc(const QCString &, const QCString &);
+static bool handleCopyBrief(const QCString &, const QCString &);
+static bool handleCopyDetails(const QCString &, const QCString &);
+static bool handleParBlock(const QCString &, const QCString &);
+static bool handleEndParBlock(const QCString &, const QCString &);
+static bool handleParam(const QCString &, const QCString &);
+static bool handleRetval(const QCString &, const QCString &);
+
+typedef bool (*DocCmdFunc)(const QCString &name, const QCString &opt);
 
 struct DocCmdMap
 {
@@ -1093,9 +1094,22 @@ RCSTAG    "$"{ID}":"[^\n$]+"$"
                                               );
                                           inInternalDocs = FALSE;
   					}
+<Comment>{B}*{CMD}[a-z_A-Z]+"{"[a-zA-Z_,\. ]*"}"{B}*  |
 <Comment>{B}*{CMD}[a-z_A-Z]+{B}*	{ // potentially interesting command
                                           // the {B}* in the front was added for bug620924
-  					  QCString cmdName = QCString(yytext).stripWhiteSpace().data()+1;
+                                          QCString fullMatch = QCString(yytext);
+                                          int idx = fullMatch.find('{');
+                                          QCString cmdName;
+                                          QCString optName;
+                                          if (idx == -1)
+                                          {
+                                            cmdName = QCString(yytext).stripWhiteSpace().data()+1; // to remove {CMD}
+                                          }
+                                          else
+                                          {
+                                            cmdName = fullMatch.left(idx).stripWhiteSpace().data()+1; // to remove {CMD}
+                                            optName = fullMatch.right(fullMatch.length() - idx).stripWhiteSpace().data();
+                                          }
 					  DocCmdMapper::Cmd *cmdPtr = DocCmdMapper::map(cmdName);
 					  if (cmdPtr) // special action is required
 					  {
@@ -1109,7 +1123,7 @@ RCSTAG    "$"{ID}":"[^\n$]+"$"
 					      setOutput(OutputDoc);
 					    }
                                             //if (i>0) addOutput(QCString(yytext).left(i)); // removed for bug 689341
-					    if (cmdPtr->func && cmdPtr->func(cmdName))
+					    if (cmdPtr->func && cmdPtr->func(cmdName, optName))
 					    {
 					      // implicit split of the comment block into two
 					      // entries. Restart the next block at the start
@@ -2255,14 +2269,14 @@ RCSTAG    "$"{ID}":"[^\n$]+"$"
 
 //----------------------------------------------------------------------------
 
-static bool handleBrief(const QCString &)
+static bool handleBrief(const QCString &, const QCString &)
 {
   //printf("handleBrief\n");
   setOutput(OutputBrief);
   return FALSE;
 }
 
-static bool handleFn(const QCString &)
+static bool handleFn(const QCString &, const QCString &)
 {
   bool stop=makeStructuralIndicator(Entry::MEMBERDOC_SEC);
   functionProto.resize(0);
@@ -2271,7 +2285,7 @@ static bool handleFn(const QCString &)
   return stop;
 }
 
-static bool handleDef(const QCString &)
+static bool handleDef(const QCString &, const QCString &)
 {
   bool stop=makeStructuralIndicator(Entry::DEFINEDOC_SEC);
   functionProto.resize(0);
@@ -2279,21 +2293,21 @@ static bool handleDef(const QCString &)
   return stop;
 }
 
-static bool handleOverload(const QCString &)
+static bool handleOverload(const QCString &, const QCString &)
 {
   functionProto.resize(0);
   BEGIN(OverloadParam);
   return FALSE;
 }
 
-static bool handleEnum(const QCString &)
+static bool handleEnum(const QCString &, const QCString &)
 {
   bool stop=makeStructuralIndicator(Entry::ENUMDOC_SEC);
   BEGIN(EnumDocArg1);
   return stop;
 }
 
-static bool handleDefGroup(const QCString &)
+static bool handleDefGroup(const QCString &, const QCString &)
 {
   bool stop=makeStructuralIndicator(Entry::GROUPDOC_SEC);
   current->groupDocType = Entry::GROUPDOC_NORMAL;
@@ -2301,7 +2315,7 @@ static bool handleDefGroup(const QCString &)
   return stop;
 }
 
-static bool handleAddToGroup(const QCString &)
+static bool handleAddToGroup(const QCString &, const QCString &)
 {
   bool stop=makeStructuralIndicator(Entry::GROUPDOC_SEC);
   current->groupDocType = Entry::GROUPDOC_ADD;
@@ -2309,7 +2323,7 @@ static bool handleAddToGroup(const QCString &)
   return stop;
 }
 
-static bool handleWeakGroup(const QCString &)
+static bool handleWeakGroup(const QCString &, const QCString &)
 {
   bool stop=makeStructuralIndicator(Entry::GROUPDOC_SEC);
   current->groupDocType = Entry::GROUPDOC_WEAK;
@@ -2317,83 +2331,83 @@ static bool handleWeakGroup(const QCString &)
   return stop;
 }
 
-static bool handleNamespace(const QCString &)
+static bool handleNamespace(const QCString &, const QCString &)
 {
   bool stop=makeStructuralIndicator(Entry::NAMESPACEDOC_SEC);
   BEGIN( NameSpaceDocArg1 );
   return stop;
 }
 
-static bool handlePackage(const QCString &)
+static bool handlePackage(const QCString &, const QCString &)
 {
   bool stop=makeStructuralIndicator(Entry::PACKAGEDOC_SEC);
   BEGIN( PackageDocArg1 );
   return stop;
 }
 
-static bool handleClass(const QCString &)
+static bool handleClass(const QCString &, const QCString &)
 {
   bool stop=makeStructuralIndicator(Entry::CLASSDOC_SEC);
   BEGIN( ClassDocArg1 ); 
   return stop;
 }
 
-static bool handleHeaderFile(const QCString &)
+static bool handleHeaderFile(const QCString &, const QCString &)
 {
   BEGIN( ClassDocArg2 );
   return FALSE;
 }
 
-static bool handleProtocol(const QCString &)
+static bool handleProtocol(const QCString &, const QCString &)
 { // Obj-C protocol
   bool stop=makeStructuralIndicator(Entry::PROTOCOLDOC_SEC);
   BEGIN( ClassDocArg1 ); 
   return stop;
 }
 
-static bool handleCategory(const QCString &)
+static bool handleCategory(const QCString &, const QCString &)
 { // Obj-C category
   bool stop=makeStructuralIndicator(Entry::CATEGORYDOC_SEC);
   BEGIN( CategoryDocArg1 ); 
   return stop;
 }
 
-static bool handleUnion(const QCString &)
+static bool handleUnion(const QCString &, const QCString &)
 {
   bool stop=makeStructuralIndicator(Entry::UNIONDOC_SEC);
   BEGIN( ClassDocArg1 ); 
   return stop;
 }
 
-static bool handleStruct(const QCString &)
+static bool handleStruct(const QCString &, const QCString &)
 {
   bool stop=makeStructuralIndicator(Entry::STRUCTDOC_SEC);
   BEGIN( ClassDocArg1 ); 
   return stop;
 }
 
-static bool handleInterface(const QCString &)
+static bool handleInterface(const QCString &, const QCString &)
 {
   bool stop=makeStructuralIndicator(Entry::INTERFACEDOC_SEC);
   BEGIN( ClassDocArg1 ); 
   return stop;
 }
 
-static bool handleIdlException(const QCString &)
+static bool handleIdlException(const QCString &, const QCString &)
 {
   bool stop=makeStructuralIndicator(Entry::EXCEPTIONDOC_SEC);
   BEGIN( ClassDocArg1 ); 
   return stop;
 }
 
-static bool handlePage(const QCString &)
+static bool handlePage(const QCString &, const QCString &)
 {
   bool stop=makeStructuralIndicator(Entry::PAGEDOC_SEC);
   BEGIN( PageDocArg1 );
   return stop;
 }
 
-static bool handleMainpage(const QCString &)
+static bool handleMainpage(const QCString &, const QCString &)
 {
   bool stop=makeStructuralIndicator(Entry::MAINPAGEDOC_SEC);
   if (!stop) 
@@ -2404,7 +2418,7 @@ static bool handleMainpage(const QCString &)
   return stop;
 }
 
-static bool handleFile(const QCString &)
+static bool handleFile(const QCString &, const QCString &)
 {
   bool stop=makeStructuralIndicator(Entry::FILEDOC_SEC);
   if (!stop) 
@@ -2415,7 +2429,7 @@ static bool handleFile(const QCString &)
   return stop;
 }
 
-static bool handleParam(const QCString &)
+static bool handleParam(const QCString &, const QCString &)
 {
   // we need process param and retval arguments to escape leading underscores in case of
   // markdown processing, see bug775493
@@ -2424,14 +2438,14 @@ static bool handleParam(const QCString &)
   return FALSE;
 }
 
-static bool handleRetval(const QCString &)
+static bool handleRetval(const QCString &, const QCString &)
 {
   addOutput("@retval ");
   BEGIN( ParamArg1 );
   return FALSE;
 }
 
-static bool handleDir(const QCString &)
+static bool handleDir(const QCString &, const QCString &)
 {
   bool stop=makeStructuralIndicator(Entry::DIRDOC_SEC);
   if (!stop) current->name = yyFileName;
@@ -2439,7 +2453,7 @@ static bool handleDir(const QCString &)
   return stop;
 }
 
-static bool handleExample(const QCString &)
+static bool handleExample(const QCString &, const QCString &)
 {
   bool stop=makeStructuralIndicator(Entry::EXAMPLE_SEC);
   if (!stop) current->name = yyFileName;
@@ -2447,7 +2461,7 @@ static bool handleExample(const QCString &)
   return stop;
 }
 
-static bool handleDetails(const QCString &)
+static bool handleDetails(const QCString &, const QCString &)
 {
   if (inContext!=OutputBrief)
   {
@@ -2458,7 +2472,7 @@ static bool handleDetails(const QCString &)
   return FALSE;
 }
 
-static bool handleName(const QCString &)
+static bool handleName(const QCString &, const QCString &)
 {
   bool stop=makeStructuralIndicator(Entry::MEMBERGRP_SEC);
   if (!stop)
@@ -2473,7 +2487,7 @@ static bool handleName(const QCString &)
   return stop;
 }
 
-static bool handleTodo(const QCString &)
+static bool handleTodo(const QCString &, const QCString &)
 {
   newXRefKind = XRef_Todo;
   setOutput(OutputXRef);
@@ -2481,7 +2495,7 @@ static bool handleTodo(const QCString &)
   return FALSE;
 }
 
-static bool handleTest(const QCString &)
+static bool handleTest(const QCString &, const QCString &)
 {
   newXRefKind = XRef_Test;
   setOutput(OutputXRef);
@@ -2489,7 +2503,7 @@ static bool handleTest(const QCString &)
   return FALSE;
 }
 
-static bool handleBug(const QCString &)
+static bool handleBug(const QCString &, const QCString &)
 {
   newXRefKind = XRef_Bug;
   setOutput(OutputXRef);
@@ -2497,7 +2511,7 @@ static bool handleBug(const QCString &)
   return FALSE;
 }
 
-static bool handleDeprecated(const QCString &)
+static bool handleDeprecated(const QCString &, const QCString &)
 {
   newXRefKind = XRef_Deprecated;
   setOutput(OutputXRef);
@@ -2505,14 +2519,14 @@ static bool handleDeprecated(const QCString &)
   return FALSE;
 }
 
-static bool handleXRefItem(const QCString &)
+static bool handleXRefItem(const QCString &, const QCString &)
 {
   newXRefKind = XRef_Item;
   BEGIN(XRefItemParam1);
   return FALSE;
 }
 
-static bool handleParBlock(const QCString &)
+static bool handleParBlock(const QCString &, const QCString &)
 {
   if (g_insideParBlock)
   {
@@ -2529,7 +2543,7 @@ static bool handleParBlock(const QCString &)
   return FALSE;
 }
 
-static bool handleEndParBlock(const QCString &)
+static bool handleEndParBlock(const QCString &, const QCString &)
 {
   if (!g_insideParBlock)
   {
@@ -2542,34 +2556,34 @@ static bool handleEndParBlock(const QCString &)
   return FALSE;
 }
 
-static bool handleRelated(const QCString &)
+static bool handleRelated(const QCString &, const QCString &)
 {
   BEGIN(RelatesParam1);
   return FALSE;
 }
 
-static bool handleRelatedAlso(const QCString &)
+static bool handleRelatedAlso(const QCString &, const QCString &)
 {
   current->relatesType = Duplicate;
   BEGIN(RelatesParam1);
   return FALSE;
 }
 
-static bool handleMemberOf(const QCString &)
+static bool handleMemberOf(const QCString &, const QCString &)
 {
   current->relatesType = MemberOf;
   BEGIN(RelatesParam1);
   return FALSE;
 }
 
-static bool handleRefItem(const QCString &)
+static bool handleRefItem(const QCString &, const QCString &)
 {
   addOutput("@refitem ");
   BEGIN(LineParam);
   return FALSE;
 }
 
-static bool handleSection(const QCString &s)
+static bool handleSection(const QCString &s, const QCString &)
 {
   setOutput(OutputDoc);
   addOutput("@"+s+" ");
@@ -2581,7 +2595,7 @@ static bool handleSection(const QCString &s)
   return FALSE;
 }
 
-static bool handleSubpage(const QCString &s)
+static bool handleSubpage(const QCString &s, const QCString &)
 {
   if (current->section!=Entry::EMPTY_SEC && 
       current->section!=Entry::PAGEDOC_SEC &&
@@ -2601,14 +2615,14 @@ static bool handleSubpage(const QCString &s)
   return FALSE;
 }
 
-static bool handleAnchor(const QCString &s)
+static bool handleAnchor(const QCString &s, const QCString &)
 {
   addOutput("@"+s+" ");
   BEGIN(AnchorLabel);
   return FALSE;
 }
 
-static bool handleCite(const QCString &s)
+static bool handleCite(const QCString &s, const QCString &)
 {
   if (!g_spaceBeforeCmd.isEmpty()) 
   {
@@ -2620,24 +2634,24 @@ static bool handleCite(const QCString &s)
   return FALSE;
 }
 
-static bool handleFormatBlock(const QCString &s)
+static bool handleFormatBlock(const QCString &s, const QCString &opt)
 {
-  addOutput("@"+s+" ");
-  //printf("handleFormatBlock(%s)\n",s.data());
+  addOutput("@"+s+" "+opt);
+  //printf("handleFormatBlock(%s) with option(%s)\n",s.data(),opt.data());
   blockName=s;
   g_commentCount=0;
   BEGIN(FormatBlock);
   return FALSE;
 }
 
-static bool handleAddIndex(const QCString &)
+static bool handleAddIndex(const QCString &, const QCString &)
 {
   addOutput("@addindex ");
   BEGIN(LineParam);
   return FALSE;
 }
 
-static bool handleIf(const QCString &)
+static bool handleIf(const QCString &, const QCString &)
 {
   enabledSectionFound=FALSE;
   guardType = Guard_If;
@@ -2646,7 +2660,7 @@ static bool handleIf(const QCString &)
   return FALSE;
 }
 
-static bool handleIfNot(const QCString &)
+static bool handleIfNot(const QCString &, const QCString &)
 {
   enabledSectionFound=FALSE;
   guardType = Guard_IfNot;
@@ -2655,7 +2669,7 @@ static bool handleIfNot(const QCString &)
   return FALSE;
 }
 
-static bool handleElseIf(const QCString &)
+static bool handleElseIf(const QCString &, const QCString &)
 {
   if (guards.isEmpty())
   {
@@ -2670,7 +2684,7 @@ static bool handleElseIf(const QCString &)
   return FALSE;
 }
 
-static bool handleElse(const QCString &)
+static bool handleElse(const QCString &, const QCString &)
 {
   if (guards.isEmpty())
   {
@@ -2684,7 +2698,7 @@ static bool handleElse(const QCString &)
   return FALSE;
 }
 
-static bool handleEndIf(const QCString &)
+static bool handleEndIf(const QCString &, const QCString &)
 {
   if (guards.isEmpty())
   {
@@ -2705,56 +2719,56 @@ static bool handleEndIf(const QCString &)
   return FALSE;
 }
 
-static bool handleIngroup(const QCString &)
+static bool handleIngroup(const QCString &, const QCString &)
 {
   inGroupParamFound=FALSE;
   BEGIN( InGroupParam );
   return FALSE;
 }
 
-static bool handleNoSubGrouping(const QCString &)
+static bool handleNoSubGrouping(const QCString &, const QCString &)
 {
   current->subGrouping = FALSE; 
   return FALSE;
 }
 
-static bool handleShowInitializer(const QCString &)
+static bool handleShowInitializer(const QCString &, const QCString &)
 {
   current->initLines = 100000; // ON
   return FALSE;
 }
 
-static bool handleHideInitializer(const QCString &)
+static bool handleHideInitializer(const QCString &, const QCString &)
 {
   current->initLines = 0; // OFF
   return FALSE;
 }
 
-static bool handleCallgraph(const QCString &)
+static bool handleCallgraph(const QCString &, const QCString &)
 {
   current->callGraph = TRUE; // ON
   return FALSE;
 }
 
-static bool handleHideCallgraph(const QCString &)
+static bool handleHideCallgraph(const QCString &, const QCString &)
 {
   current->callGraph = FALSE; // OFF
   return FALSE;
 }
 
-static bool handleCallergraph(const QCString &)
+static bool handleCallergraph(const QCString &, const QCString &)
 {
   current->callerGraph = TRUE; // ON
   return FALSE;
 }
 
-static bool handleHideCallergraph(const QCString &)
+static bool handleHideCallergraph(const QCString &, const QCString &)
 {
   current->callerGraph = FALSE; // OFF
   return FALSE;
 }
 
-static bool handleInternal(const QCString &)
+static bool handleInternal(const QCString &, const QCString &)
 {
   if (!Config_getBool(INTERNAL_DOCS))
   {
@@ -2776,85 +2790,99 @@ static bool handleInternal(const QCString &)
   return FALSE;
 }
 
-static bool handleLineBr(const QCString &)
+static bool handleLineBr(const QCString &, const QCString &)
 {
   addOutput('\n');
   return FALSE;
 }
 
-static bool handleStatic(const QCString &)
+static bool handleStatic(const QCString &, const QCString &)
 {
   endBrief();
   current->stat = TRUE; 
   return FALSE;
 }
 
-static bool handlePure(const QCString &)
+static bool handlePure(const QCString &, const QCString &)
 {
   endBrief();
   current->virt = Pure; 
   return FALSE;
 }
 
-static bool handlePrivate(const QCString &)
+static bool handlePrivate(const QCString &, const QCString &)
 {
   current->protection = Private;
   return FALSE;
 }
 
-static bool handlePrivateSection(const QCString &)
+static bool handlePrivateSection(const QCString &, const QCString &)
 {
   current->protection = protection = Private;
   return FALSE;
 }
 
-static bool handleProtected(const QCString &)
+static bool handleProtected(const QCString &, const QCString &)
 {
   current->protection = Protected;
   return FALSE;
 }
 
-static bool handleProtectedSection(const QCString &)
+static bool handleProtectedSection(const QCString &, const QCString &)
 {
   current->protection = protection = Protected ;
   return FALSE;
 }
 
-static bool handlePublic(const QCString &)
+static bool handlePublic(const QCString &, const QCString &)
 {
   current->protection = Public;
   return FALSE;
 }
 
-static bool handlePublicSection(const QCString &)
+static bool handlePublicSection(const QCString &, const QCString &)
 {
   current->protection = protection = Public;
   return FALSE;
 }
 
-static bool handleToc(const QCString &)
+static bool handleToc(const QCString &, const QCString &opt)
 {
   if (current->section==Entry::PAGEDOC_SEC || 
       current->section==Entry::MAINPAGEDOC_SEC)
   {
-    current->stat=TRUE;  // we 'abuse' stat to pass whether or the TOC is enabled
+    QString optName = opt.stripWhiteSpace(); // to be sure
+    optName = optName.left(optName.length() - 1).right(optName.length() - 2);
+    QStringList optList=QStringList::split(",",optName,FALSE);
+    QStringList::Iterator it;
+    for ( it = optList.begin(); it != optList.end(); ++it )
+    {
+      QString opt = (*it).stripWhiteSpace().lower();
+      if (!opt.isEmpty())
+      {
+        if (opt == "html") current->localToc |= Definition::Html;
+        else if (opt == "latex") current->localToc |= Definition::Latex;
+        else warn(yyFileName,yyLineNr,"Unknown option specified with \\tableofcontents: `%s'", (*it).stripWhiteSpace().data());
+      }
+    }
+    if (current->localToc == Definition::None) current->localToc |= Definition::Html;
   }
   return FALSE;
 }
 
-static bool handleInherit(const QCString &)
+static bool handleInherit(const QCString &, const QCString &)
 {
   BEGIN(InheritParam);
   return FALSE;
 }
 
-static bool handleExtends(const QCString &)
+static bool handleExtends(const QCString &, const QCString &)
 {
   BEGIN(ExtendsParam);
   return FALSE;
 }
 
-static bool handleCopyBrief(const QCString &)
+static bool handleCopyBrief(const QCString &, const QCString &)
 {
   if (current->brief.isEmpty() && current->doc.isEmpty())
   { // if we don't have a brief or detailed description yet,
@@ -2871,7 +2899,7 @@ static bool handleCopyBrief(const QCString &)
   return FALSE;
 }
 
-static bool handleCopyDetails(const QCString &)
+static bool handleCopyDetails(const QCString &, const QCString &)
 {
   setOutput(OutputDoc);
   if (!g_spaceBeforeCmd.isEmpty()) 
@@ -2883,7 +2911,7 @@ static bool handleCopyDetails(const QCString &)
   return FALSE;
 }
 
-static bool handleCopyDoc(const QCString &)
+static bool handleCopyDoc(const QCString &, const QCString &)
 {
   setOutput(OutputBrief);
   if (!g_spaceBeforeCmd.isEmpty()) 
diff --git a/src/definition.cpp b/src/definition.cpp
index 92baf0c..2f40e56 100644
--- a/src/definition.cpp
+++ b/src/definition.cpp
@@ -1613,10 +1613,12 @@ void Definition::writeNavigationPath(OutputList &ol) const
 }
 
 // TODO: move to htmlgen
-void Definition::writeToc(OutputList &ol)
+void Definition::writeToc(OutputList &ol, int localToc)
 {
   SectionDict *sectionDict = m_impl->sectionDict;
   if (sectionDict==0) return;
+  if (localToc & Definition::Html)
+  {
   ol.pushGeneratorState();
   ol.disableAllBut(OutputGenerator::Html);
   ol.writeString("<div class=\"toc\">");
@@ -1675,6 +1677,15 @@ void Definition::writeToc(OutputList &ol)
   ol.writeString("</ul>\n");
   ol.writeString("</div>\n");
   ol.popGeneratorState();
+  }
+
+  if (localToc & Definition::Latex)
+  {
+  ol.pushGeneratorState();
+  ol.disableAllBut(OutputGenerator::Latex);
+  ol.writeString("\\localtableofcontents\n");
+  ol.popGeneratorState();
+  }
 }
 
 //----------------------------------------------------------------------------------------
diff --git a/src/definition.h b/src/definition.h
index d16c6b9..a2b2983 100644
--- a/src/definition.h
+++ b/src/definition.h
@@ -97,6 +97,11 @@ class Definition : public DefinitionIntf
       virtual ~Cookie() {}
     };
 
+    enum outputLocalTocType {
+	    None          = 0,
+	    Html          = 0x01,
+            Latex         = 0x02
+    };
     /*! Create a new definition */
     Definition(
         const char *defFileName,int defLine,int defColumn,
@@ -346,7 +351,7 @@ class Definition : public DefinitionIntf
     void setLocalName(const QCString name);
 
     void addSectionsToIndex();
-    void writeToc(OutputList &ol);
+    void writeToc(OutputList &ol, int localToc);
 
     void setCookie(Cookie *cookie) { delete m_cookie; m_cookie = cookie; }
     Cookie *cookie() const { return m_cookie; }
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 263b59f..f0140e0 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -605,7 +605,7 @@ static void addRelatedPage(EntryNav *rootNav)
   {
     pd->setBriefDescription(root->brief,root->briefFile,root->briefLine);
     pd->addSectionsToDefinition(root->anchors);
-    pd->setShowToc(root->stat);
+    pd->setShowToc(root->localToc);
     addPageToContext(pd,rootNav);
   }
 }
@@ -8712,7 +8712,7 @@ static void findMainPage(EntryNav *rootNav)
       //setFileNameForSections(root->anchors,"index",Doxygen::mainPage);
       Doxygen::mainPage->setBriefDescription(root->brief,root->briefFile,root->briefLine);
       Doxygen::mainPage->setFileName(indexName);
-      Doxygen::mainPage->setShowToc(root->stat);
+      Doxygen::mainPage->setShowToc(root->localToc);
       addPageToContext(Doxygen::mainPage,rootNav);
 
       SectionInfo *si = Doxygen::sectionDict->find(Doxygen::mainPage->name());
diff --git a/src/entry.cpp b/src/entry.cpp
index 9d15ec8..9ecaf70 100644
--- a/src/entry.cpp
+++ b/src/entry.cpp
@@ -73,6 +73,7 @@ Entry::Entry(const Entry &e)
   spec        = e.spec;
   initLines   = e.initLines;
   stat        = e.stat;
+  localToc    = e.localToc;
   explicitExternal = e.explicitExternal;
   proto       = e.proto;
   subGrouping = e.subGrouping;
@@ -253,6 +254,7 @@ void Entry::reset()
   mtype   = Method;
   virt    = Normal;
   stat    = FALSE;
+  localToc = Definition::None;
   proto   = FALSE;
   explicitExternal = FALSE;
   spec  = 0;
diff --git a/src/entry.h b/src/entry.h
index f1b81ef..c1f8f19 100644
--- a/src/entry.h
+++ b/src/entry.h
@@ -288,6 +288,7 @@ class Entry
     bool        artificial;   //!< Artificially introduced item
     GroupDocType groupDocType;
     QCString    id;           //!< libclang id
+    int         localToc;     //!< types of local TOC, command \tableofcontents
 
 
     static int  num;          //!< counts the total number of entries
diff --git a/src/index.cpp b/src/index.cpp
index 24c0290..e9f5437 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -3885,7 +3885,7 @@ static void writeIndex(OutputList &ol)
     Doxygen::insideMainPage=TRUE;
     if (Doxygen::mainPage->showToc() && Doxygen::mainPage->hasSections())
     {
-      Doxygen::mainPage->writeToc(ol);
+      Doxygen::mainPage->writeToc(ol,Doxygen::mainPage->showToc());
     }
 
     ol.startTextBlock();
diff --git a/src/latexgen.cpp b/src/latexgen.cpp
index 7d72974..cc796b1 100644
--- a/src/latexgen.cpp
+++ b/src/latexgen.cpp
@@ -566,7 +566,9 @@ static void writeDefaultHeaderPart1(FTextStream &t)
        "\\hbadness=750\n"
        "\\setlength{\\emergencystretch}{15pt}\n"
        "\\setlength{\\parindent}{0cm}\n"
-       "\\setlength{\\parskip}{3ex plus 2ex minus 2ex}\n";
+       "\\newcommand{\\doxynormalparskip}{\\setlength{\\parskip}{3ex plus 2ex minus 2ex}}\n"
+       "\\newcommand{\\doxytocparskip}{\\setlength{\\parskip}{1ex plus 0ex minus 0ex}}\n"
+       "\\doxynormalparskip\n";
   // Redefine paragraph/subparagraph environments, using sectsty fonts
   t << "\\makeatletter\n"
        "\\renewcommand{\\paragraph}{%\n"
@@ -694,6 +696,10 @@ static void writeDefaultHeaderPart1(FTextStream &t)
   t << "\\usepackage{caption}\n"
     << "\\captionsetup{labelsep=space,justification=centering,font={bf},singlelinecheck=off,skip=4pt,position=top}\n\n";
 
+  // in page table of contents
+  t << "\\usepackage{etoc}\n"
+       "\\etocsettocstyle{\\doxytocparskip}{\\doxynormalparskip}\n";
+
   // End of preamble, now comes the document contents
   t << "%===== C O N T E N T S =====\n"
        "\n"
diff --git a/src/marshal.cpp b/src/marshal.cpp
index af14978..282cb2a 100644
--- a/src/marshal.cpp
+++ b/src/marshal.cpp
@@ -355,6 +355,7 @@ void marshalEntry(StorageIntf *s,Entry *e)
   marshalUInt64(s,e->spec);
   marshalInt(s,e->initLines);
   marshalBool(s,e->stat);
+  marshalInt(s,e->localToc);
   marshalBool(s,e->explicitExternal);
   marshalBool(s,e->proto);
   marshalBool(s,e->subGrouping);
@@ -737,6 +738,7 @@ Entry * unmarshalEntry(StorageIntf *s)
   e->spec             = unmarshalUInt64(s);
   e->initLines        = unmarshalInt(s);
   e->stat             = unmarshalBool(s);
+  e->localToc         = unmarshalInt(s);
   e->explicitExternal = unmarshalBool(s);
   e->proto            = unmarshalBool(s);
   e->subGrouping      = unmarshalBool(s);
diff --git a/src/pagedef.cpp b/src/pagedef.cpp
index b2b7dc8..c351a3f 100644
--- a/src/pagedef.cpp
+++ b/src/pagedef.cpp
@@ -35,7 +35,7 @@ PageDef::PageDef(const char *f,int l,const char *n,
   m_pageScope = 0;
   m_nestingLevel = 0;
   m_fileName = ::convertNameToFile(n,FALSE,TRUE);
-  m_showToc = FALSE;
+  m_showToc = Definition::None;
 }
 
 PageDef::~PageDef()
@@ -209,7 +209,7 @@ void PageDef::writeDocumentation(OutputList &ol)
 
   if (m_showToc && hasSections())
   {
-    writeToc(ol);
+    writeToc(ol, m_showToc);
   }
 
   writePageDocumentation(ol);
@@ -326,7 +326,7 @@ void PageDef::setNestingLevel(int l)
   m_nestingLevel = l;
 }
 
-void PageDef::setShowToc(bool b)
+void PageDef::setShowToc(int b)
 {
   m_showToc |= b;
 }
diff --git a/src/pagedef.h b/src/pagedef.h
index 41b84cb..2f34c5f 100644
--- a/src/pagedef.h
+++ b/src/pagedef.h
@@ -34,7 +34,7 @@ class PageDef : public Definition
 
     // setters
     void setFileName(const char *name);
-    void setShowToc(bool b);
+    void setShowToc(int b);
 
     // getters
     DefType definitionType() const { return TypePage; }
@@ -59,7 +59,7 @@ class PageDef : public Definition
     bool documentedPage() const;
     bool hasSubPages() const;
     bool hasParentPage() const;
-    bool showToc() const { return m_showToc; }
+    int showToc() const { return m_showToc; }
     void setPageScope(Definition *d){ m_pageScope = d; }
     Definition *getPageScope() const { return m_pageScope; }
     QCString displayName(bool=TRUE) const { return !m_title.isEmpty() ? m_title : Definition::name(); }
@@ -75,7 +75,7 @@ class PageDef : public Definition
     PageSDict *m_subPageDict;                 // list of pages in the group
     Definition *m_pageScope;
     int m_nestingLevel;
-    bool m_showToc;
+    int m_showToc;
 };
 
 class PageSDict : public SDict<PageDef>