From: Vladimír Vondruš <mosra@centrum.cz>
Date: Tue, 12 May 2020 08:31:13 +0000 (+0200)
Subject: documentation/doxygen: support CSS classes on table cells.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=e6166bf3aee773fc38211eb72249e4e1d633f51e;p=blog.git

documentation/doxygen: support CSS classes on table cells.

Finally.
---

diff --git a/documentation/doxygen.py b/documentation/doxygen.py
index 6a31fe90..82641407 100755
--- a/documentation/doxygen.py
+++ b/documentation/doxygen.py
@@ -720,10 +720,11 @@ def parse_desc_internal(state: State, element: ET.Element, immediate_parent: ET.
                         is_header_row = is_header_row and is_header
                         rowspan = ' rowspan="{}"'.format(entry.attrib['rowspan']) if 'rowspan' in entry.attrib else ''
                         colspan = ' colspan="{}"'.format(entry.attrib['colspan']) if 'colspan' in entry.attrib else ''
-                        row_data += '<{0}{2}{3}>{1}</{0}>'.format(
+                        classes = ' class="{}"'.format(entry.attrib['class']) if 'class' in entry.attrib else ''
+                        row_data += '<{0}{2}{3}{4}>{1}</{0}>'.format(
                             'th' if is_header else 'td',
                             parse_desc(state, entry),
-                            rowspan, colspan)
+                            rowspan, colspan, classes)
 
                     # Table head is opened upon encountering first header row
                     # and closed upon encountering first body row (in case it was
diff --git a/documentation/test_doxygen/contents_blocks/doxygen1818.html b/documentation/test_doxygen/contents_blocks/doxygen1818.html
index 10ee48d9..bf053062 100644
--- a/documentation/test_doxygen/contents_blocks/doxygen1818.html
+++ b/documentation/test_doxygen/contents_blocks/doxygen1818.html
@@ -22,7 +22,7 @@
         <h1>
           Doxygen 1.8.18 features
         </h1>
-<p>Tested separately because the CI has only 1.8.17 right now.</p><table class="m-table"><tbody><tr><td colspan="2">Table</td><td rowspan="3">with</td></tr><tr><td>colspan</td><td>and</td></tr><tr><td colspan="2">rowspan</td></tr></tbody></table>
+<p>Tested separately because the CI has only 1.8.17 right now.</p><table class="m-table"><tbody><tr><td colspan="2">Table</td><td rowspan="3">with</td></tr><tr><td class="m-success">classes</td><td>and</td></tr><tr><td colspan="2">col/rowspan</td></tr></tbody></table>
       </div>
     </div>
   </div>
diff --git a/documentation/test_doxygen/contents_blocks/input.dox b/documentation/test_doxygen/contents_blocks/input.dox
index 7b2aaf20..22221770 100644
--- a/documentation/test_doxygen/contents_blocks/input.dox
+++ b/documentation/test_doxygen/contents_blocks/input.dox
@@ -146,11 +146,11 @@ Tested separately because the CI has only 1.8.17 right now.
     <td rowspan="3">with</th>
   </tr>
   <tr>
-    <td>colspan</td>
+    <td class="m-success">classes</td>
     <td>and</td>
   </tr>
   <tr>
-    <td colspan="2">rowspan</td>
+    <td colspan="2">col/rowspan</td>
   </tr>
 </table>