Merge pull request doxygen#11690 from albert-github/feature/bug_tblr_header

Improve headings of tables

Author: doxygen

src/docnode.cpp

@@ -2185,13 +2185,19 @@ const DocNodeVariant *DocHtmlTable::caption() const
   return m_caption.get();
 }
 
-const DocNodeVariant *DocHtmlTable::firstRow() const
+size_t DocHtmlTable::numberHeaderRows() const
 {
-  if (!children().empty() && std::holds_alternative<DocHtmlRow>(children().front()))
+  size_t hl = 0;
+  for (auto &rowNode : children())
   {
-    return &children().front();
+    const DocHtmlRow *row = std::get_if<DocHtmlRow>(&rowNode);
+    if (row)
+    {
+      if (!row->isHeading())  break;
+      hl++;
+    }
   }
-  return nullptr;
+  return hl;
 }
 
 Token DocHtmlTable::parse()

src/docnode.h

@@ -1277,7 +1277,7 @@ class DocHtmlTable : public DocCompoundNode
     Token parseXml();
     size_t numColumns() const { return m_numCols; }
     const DocNodeVariant *caption() const;
-    const DocNodeVariant *firstRow() const;
+    size_t numberHeaderRows() const;
 
   private:
     void computeTableGrid();

src/latexdocvisitor.cpp

@@ -1280,7 +1280,6 @@ void LatexDocVisitor::writeStartTableCommand(const DocNodeVariant *n,size_t cols
   {
     m_t << "\n\\begin{DoxyTable}{" << cols << "}";
   }
-  //return isNested ? "TabularNC" : "TabularC";
 }
 
 void LatexDocVisitor::writeEndTableCommand(const DocNodeVariant *n)
@@ -1293,7 +1292,6 @@ void LatexDocVisitor::writeEndTableCommand(const DocNodeVariant *n)
   {
     m_t << "\\end{DoxyTable}\n";
   }
-  //return isNested ? "TabularNC" : "TabularC";
 }
 
 void LatexDocVisitor::operator()(const DocHtmlTable &t)
@@ -1312,7 +1310,6 @@ void LatexDocVisitor::operator()(const DocHtmlTable &t)
     m_t << "\n";
   }
 
-  const DocHtmlRow *firstRow = std::get_if<DocHtmlRow>(t.firstRow());
   writeStartTableCommand(t.parent(),t.numColumns());
   if (!isTableNested(t.parent()))
   {
@@ -1331,18 +1328,9 @@ void LatexDocVisitor::operator()(const DocHtmlTable &t)
     }
     m_t << "}";
   }
-  // write head row
-  m_t << "{";
-  if (firstRow && firstRow->isHeading())
-  {
-    m_t << "1";
-  }
-  else
-  {
-    m_t << "0";
-  }
-  m_t << "}";
-  m_t << "\n";
+
+  // write head row(s)
+  m_t << "{" << t.numberHeaderRows() << "}\n";
 
   setNumCols(t.numColumns());
 
@@ -1467,6 +1455,11 @@ void LatexDocVisitor::operator()(const DocHtmlCell &c)
     setCurrentColumn(currentColumn()+cs-1);
     appendOpt("c="+QCString().setNum(cs));
   }
+  if (c.isHeading())
+  {
+    appendSpec("bg=\\tableheadbgcolor");
+    appendSpec("font=\\bfseries");
+  }
   switch(va) // vertical alignment
   {
     case DocHtmlCell::Top:

src/latexdocvisitor.h

@@ -188,7 +188,6 @@ class LatexDocVisitor : public DocVisitor
       RowSpanList rowSpans;
       size_t numCols = 0;
       size_t currentColumn = 0;
-      bool firstRow = false;
     };
     std::stack<TableState> m_tableStateStack; // needed for nested tables
     RowSpanList m_emptyRowSpanList;
@@ -227,14 +226,6 @@ class LatexDocVisitor : public DocVisitor
     {
       if (!m_tableStateStack.empty()) m_tableStateStack.top().numCols = num;
     }
-    bool firstRow() const
-    {
-      return !m_tableStateStack.empty() ? m_tableStateStack.top().firstRow : FALSE;
-    }
-    void setFirstRow(bool b)
-    {
-      if (!m_tableStateStack.empty()) m_tableStateStack.top().firstRow = b;
-    }
     RowSpanList &rowSpans()
     {
       return !m_tableStateStack.empty() ? m_tableStateStack.top().rowSpans : m_emptyRowSpanList;

templates/latex/doxygen.sty

@@ -393,17 +393,15 @@
 \begin{longtblr}{hlines,vlines,% automatically set horizontal and vertical cell lines
                  measure=vbox,% needed to allow nested lists and tables
                  colspec={*{#1}{X[-1]}},% set column type for all columns
-                 rowhead=#4,% set which row is the header (0=disable, 1=enable)
-                 row{#4}={bg=\tableheadbgcolor,font=\bfseries}}% set header background color and font weight
+                 rowhead=#4} % set which row is the header (0=disable, 1=enable)
 #5
 \end{longtblr}%
 \else% use fixed left aligned columns
 % now render the table for real
 \begin{longtblr}{hlines,vlines,% automatically set horizontal and vertical cell lines
                  measure=vbox,% needed to allow nested lists and tables
                  colspec={*{#1}{l}},% set column type for all columns
-                 rowhead=#4,% set which row is the header (0=disable, 1=enable)
-                 row{#4}={bg=\tableheadbgcolor,font=\bfseries}}% set header background color and font weight
+                 rowhead=#4} % set which row is the header (0=disable, 1=enable)
 #5
 \end{longtblr}%
 \fi%
@@ -419,8 +417,8 @@
 \begin{tblr}{hlines,vlines,% automatically set horizontal and vertical cell lines
              measure=vbox,% needed to allow nested lists and tables
 	     colspec={*{#1}{X[-1]}},% set column type for all columns
-             rowhead=#2,% set which row is the header (0=disable, 1=enable)
-	     row{#2}={bg=\tableheadbgcolor,font=\bfseries}}% set header background color and font weight
+             rowhead=#2% set which row is the header (0=disable, 1=enable)
+            }
 }{% no end marker needed anymore
 \end{tblr}
 }%