Merge branch 'master' of github.com:doxygen/doxygen

Author: doxygen

addon/doxmlparser/doxmlparser/compound.py

@@ -9344,7 +9344,7 @@ class docInternalS5Type(GeneratedsSuper):
     __hash__ = GeneratedsSuper.__hash__
     subclass = None
     superclass = None
-    def __init__(self, para=None, sect5=None, valueOf_=None, mixedclass_=None, content_=None, gds_collector_=None, **kwargs_):
+    def __init__(self, para=None, sect6=None, valueOf_=None, mixedclass_=None, content_=None, gds_collector_=None, **kwargs_):
         self.gds_collector_ = gds_collector_
         self.gds_elementtree_node_ = None
         self.original_tagname_ = None
@@ -9355,11 +9355,11 @@ def __init__(self, para=None, sect5=None, valueOf_=None, mixedclass_=None, conte
         else:
             self.para = para
         self.para_nsprefix_ = None
-        if sect5 is None:
-            self.sect5 = []
+        if sect6 is None:
+            self.sect6 = []
         else:
-            self.sect5 = sect5
-        self.sect5_nsprefix_ = None
+            self.sect6 = sect6
+        self.sect6_nsprefix_ = None
         self.valueOf_ = valueOf_
         if mixedclass_ is None:
             self.mixedclass_ = MixedContainer
@@ -9395,22 +9395,22 @@ def insert_para_at(self, index, value):
         self.para.insert(index, value)
     def replace_para_at(self, index, value):
         self.para[index] = value
-    def get_sect5(self):
-        return self.sect5
-    def set_sect5(self, sect5):
-        self.sect5 = sect5
-    def add_sect5(self, value):
-        self.sect5.append(value)
-    def insert_sect5_at(self, index, value):
-        self.sect5.insert(index, value)
-    def replace_sect5_at(self, index, value):
-        self.sect5[index] = value
+    def get_sect6(self):
+        return self.sect6
+    def set_sect6(self, sect6):
+        self.sect6 = sect6
+    def add_sect6(self, value):
+        self.sect6.append(value)
+    def insert_sect6_at(self, index, value):
+        self.sect6.insert(index, value)
+    def replace_sect6_at(self, index, value):
+        self.sect6[index] = value
     def get_valueOf_(self): return self.valueOf_
     def set_valueOf_(self, valueOf_): self.valueOf_ = valueOf_
     def hasContent_(self):
         if (
             self.para or
-            self.sect5 or
+            self.sect6 or
             (1 if type(self.valueOf_) in [int,float] else self.valueOf_) or
             self.content_
         ):
@@ -9453,9 +9453,9 @@ def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='',
         for para_ in self.para:
             namespaceprefix_ = self.para_nsprefix_ + ':' if (UseCapturedNS_ and self.para_nsprefix_) else ''
             para_.export(outfile, level, namespaceprefix_, namespacedef_='', name_='para', pretty_print=pretty_print)
-        for sect5_ in self.sect5:
-            namespaceprefix_ = self.sect5_nsprefix_ + ':' if (UseCapturedNS_ and self.sect5_nsprefix_) else ''
-            sect5_.export(outfile, level, namespaceprefix_, namespacedef_='', name_='sect5', pretty_print=pretty_print)
+        for sect6_ in self.sect6:
+            namespaceprefix_ = self.sect6_nsprefix_ + ':' if (UseCapturedNS_ and self.sect6_nsprefix_) else ''
+            sect6_.export(outfile, level, namespaceprefix_, namespacedef_='', name_='sect6', pretty_print=pretty_print)
     def build(self, node, gds_collector_=None):
         self.gds_collector_ = gds_collector_
         if SaveElementTreeNode:
@@ -9485,16 +9485,16 @@ def buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_collec
                 self.add_para(obj_.value)
             elif hasattr(self, 'set_para'):
                 self.set_para(obj_.value)
-        elif nodeName_ == 'sect5':
+        elif nodeName_ == 'sect6':
             obj_ = docSect6Type.factory(parent_object_=self)
             obj_.build(child_, gds_collector_=gds_collector_)
             obj_ = self.mixedclass_(MixedContainer.CategoryComplex,
-                MixedContainer.TypeNone, 'sect5', obj_)
+                MixedContainer.TypeNone, 'sect6', obj_)
             self.content_.append(obj_)
-            if hasattr(self, 'add_sect5'):
-                self.add_sect5(obj_.value)
-            elif hasattr(self, 'set_sect5'):
-                self.set_sect5(obj_.value)
+            if hasattr(self, 'add_sect6'):
+                self.add_sect6(obj_.value)
+            elif hasattr(self, 'set_sect6'):
+                self.set_sect6(obj_.value)
         if not fromsubclass_ and child_.tail is not None:
             obj_ = self.mixedclass_(MixedContainer.CategoryText,
                 MixedContainer.TypeNone, '', child_.tail)

templates/latex/doxygen.sty

@@ -45,6 +45,19 @@
       }
   }
 \ExplSyntaxOff
+
+\ExplSyntaxOn
+\dim_new:N \doxytablewidth
+\NewDocumentCommand \doxycalculatetablewidth {}
+  {
+    \cs_set_protected:Nn \__tblr_build_whole:
+      {
+        \__tblr_get_table_width:
+        \dim_gset:Nn \doxytablewidth { \tablewidth }
+      }
+  }
+\ExplSyntaxOff
+
 \RequirePackage{fancyvrb}
 \RequirePackage{tabularx}
 \RequirePackage{multicol}
@@ -414,12 +427,15 @@
     \SetTblrOuter[longtblr]{theme=DoxyTableCaptionTheme,caption={#2},label={#3}}% set table caption and label
   \fi%
 \fi%
-\sbox0{% first render the table in a savebox to calculate the width of the table which will be stored in \wd0
+\begingroup
+\doxycalculatetablewidth
+\sbox0{% first render the table in a savebox to calculate the width of the table which will be stored in \doxytablewidth
 \begin{tblr}{hlines,vlines,measure=vbox,colspec={*{#1}{l}}}%
 #5
 \end{tblr}%
 }% end of sbox0
-\ifdim\wd0>\linewidth% use flexible columns
+\endgroup
+\ifdim\doxytablewidth>\linewidth% use flexible 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
@@ -443,15 +459,33 @@
 % parameters:
 % - #1: number of columns
 % - #2: 1=table has a heading row, 0=no heading row
-\NewDocumentEnvironment{DoxyTableNested}{m m}{%
+\NewDocumentEnvironment{DoxyTableNested}{m m +b}{%
+\begingroup
+\doxycalculatetablewidth
+\sbox0{% first render the table in a savebox to calculate the width of the table which will be stored in \doxytablewidth
+\begin{tblr}{hlines,vlines,measure=vbox,colspec={*{#1}{l}}}%
+#3
+\end{tblr}%
+}% end of sbox0
+\endgroup
+\ifdim\doxytablewidth>\linewidth% use flexible columns
 % now render the table for real
 \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)
-            }
+                 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)
+#3
+\end{tblr}%
+\else% use fixed left aligned columns
+% now render the table for real
+\begin{tblr}{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=#2} % set which row is the header (0=disable, 1=enable)
+#3
+\end{tblr}%
+\fi%
 }{% no end marker needed anymore
-\end{tblr}
 }%
 
 % Defines a parameter table
@@ -462,14 +496,17 @@
 % #4: Body
 \NewDocumentCommand{\DoxyParamTable}{m m +m +m}{%
   \SetTblrOuter[longtblr]{theme=DoxyTableBareTheme,entry=none}% set table caption and label
-  \sbox0{% render table off-screen first to capture its width in \wd0
+  \begingroup
+  \doxycalculatetablewidth
+  \sbox0{% render table off-screen first to capture its width in \doxytablewidth
     \begin{tblr}{measure=vbox,colspec={*{#1}{|l}|}}%
     \SetCell[c=#1]{l} \tf{#3} \\[1ex]%
     \hline%
     #4
     \end{tblr}%
   }%
-  \ifdim\wd0>\linewidth%
+  \endgroup
+  \ifdim\doxytablewidth>\linewidth% use flexible columns
     \edef\DoxyTableColSpec{#2X[-1]}%
   \else%
     \edef\DoxyTableColSpec{#2l}%

templates/xml/compound.xsd

@@ -497,7 +497,7 @@
   <xsd:complexType name="docInternalS5Type" mixed="true">
     <xsd:sequence>
       <xsd:element name="para"  type="docParaType"  minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="sect5" type="docSect6Type" minOccurs="0" maxOccurs="unbounded" />
+      <xsd:element name="sect6" type="docSect6Type" minOccurs="0" maxOccurs="unbounded" />
     </xsd:sequence>
   </xsd:complexType>