Merge branch 'albert-github-feature/issue_11279'

Author: doxygen

src/latexdocvisitor.cpp

@@ -1228,9 +1228,9 @@ void LatexDocVisitor::operator()(const DocHtmlDescData &dd)
   decIndentLevel();
 }
 
-static bool tableIsNested(const DocNodeVariant *n)
+bool LatexDocVisitor::isTableNested(const DocNodeVariant *n) const
 {
-  bool isNested=FALSE;
+  bool isNested=m_lcg.usedTableLevel()>0;
   while (n && !isNested)
   {
     isNested = holds_one_of_alternatives<DocHtmlTable,DocParamSect>(*n);
@@ -1239,28 +1239,28 @@ static bool tableIsNested(const DocNodeVariant *n)
   return isNested;
 }
 
-static void writeStartTableCommand(TextStream &t,const DocNodeVariant *n,size_t cols)
+void LatexDocVisitor::writeStartTableCommand(const DocNodeVariant *n,size_t cols)
 {
-  if (tableIsNested(n))
+  if (isTableNested(n))
   {
-    t << "{\\begin{tabularx}{\\linewidth}{|*{" << cols << "}{>{\\raggedright\\arraybackslash}X|}}";
+    m_t << "{\\begin{tabularx}{\\linewidth}{|*{" << cols << "}{>{\\raggedright\\arraybackslash}X|}}";
   }
   else
   {
-    t << "\\tabulinesep=1mm\n\\begin{longtabu}spread 0pt [c]{*{" << cols << "}{|X[-1]}|}\n";
+    m_t << "\\tabulinesep=1mm\n\\begin{longtabu}spread 0pt [c]{*{" << cols << "}{|X[-1]}|}\n";
   }
   //return isNested ? "TabularNC" : "TabularC";
 }
 
-static void writeEndTableCommand(TextStream &t,const DocNodeVariant *n)
+void LatexDocVisitor::writeEndTableCommand(const DocNodeVariant *n)
 {
-  if (tableIsNested(n))
+  if (isTableNested(n))
   {
-    t << "\\end{tabularx}}\n";
+    m_t << "\\end{tabularx}}\n";
   }
   else
   {
-    t << "\\end{longtabu}\n";
+    m_t << "\\end{longtabu}\n";
   }
   //return isNested ? "TabularNC" : "TabularC";
 }
@@ -1281,7 +1281,7 @@ void LatexDocVisitor::operator()(const DocHtmlTable &t)
     m_t << "\n";
   }
 
-  writeStartTableCommand(m_t,t.parent(),t.numColumns());
+  writeStartTableCommand(t.parent(),t.numColumns());
 
   if (c)
   {
@@ -1302,14 +1302,14 @@ void LatexDocVisitor::operator()(const DocHtmlTable &t)
   if (firstRow && firstRow->isHeading())
   {
     setFirstRow(TRUE);
-    if (!tableIsNested(t.parent()))
+    if (!isTableNested(t.parent()))
     {
       std::visit(*this,*t.firstRow());
     }
     setFirstRow(FALSE);
   }
   visitChildren(t);
-  writeEndTableCommand(m_t,t.parent());
+  writeEndTableCommand(t.parent());
   popTableState();
 }
 
@@ -1381,7 +1381,7 @@ void LatexDocVisitor::operator()(const DocHtmlRow &row)
   m_t << "\n";
 
   const DocNodeVariant *n = ::parent(row.parent());
-  if (row.isHeading() && row.rowIndex()==1 && !tableIsNested(n))
+  if (row.isHeading() && row.rowIndex()==1 && !isTableNested(n))
   {
     if (firstRow())
     {

src/latexdocvisitor.h

@@ -266,5 +266,9 @@ class LatexDocVisitor : public DocVisitor
       return !m_tableStateStack.empty();
     }
 
+    bool isTableNested(const DocNodeVariant *n) const;
+    void writeStartTableCommand(const DocNodeVariant *n,size_t cols);
+    void writeEndTableCommand(const DocNodeVariant *n);
+
 };
 #endif