Handle blockquotes in first table column (#156)

Signed-off-by: Dave Thaler <[email protected]>
dthaler · Feb 29, 2024 · e8f151d · e8f151d
1 parent a77f280
commit e8f151d
Show file tree

Hide file tree

Showing 3 changed files with 77 additions and 1 deletion.
diff --git a/lib/rst2rfcxml.cpp b/lib/rst2rfcxml.cpp
@@ -681,6 +681,19 @@ rst2rfcxml::output_table_row(ostream& output_stream)
     _table_cell_rst.clear();
 }
 
+bool
+rst2rfcxml::is_cell_blank(string current, int column)
+{
+    size_t start_column = _column_indices[column];
+    size_t end_column = (_column_indices.size() > (column + 1)) ? _column_indices[column + 1] : current.size();
+    for (size_t i = start_column; i < end_column && i < current.size(); i++) {
+        if (!isspace(current[i])) {
+            return false;
+        }
+    }
+    return true;
+}
+
 // Perform table handling.
 // Returns true if a valid table line was processed, false if it's not a table line.
 bool
@@ -746,7 +759,7 @@ rst2rfcxml::handle_table_line(string current, string next, ostream& output_strea
         // Each line of text starts a new row, except when there is a blank cell in the first column.
         // In that case, that line of text is parsed as a continuation line.
         size_t start_column = _column_indices[0];
-        bool new_row = (current.length() > start_column) && !isspace(current[start_column]);
+        bool new_row = (current.length() > start_column) && !is_cell_blank(current, 0);
 
         if (new_row && !_table_cell_rst.empty()) {
             // Output previous row which is now complete.

diff --git a/lib/rst2rfcxml.h b/lib/rst2rfcxml.h
@@ -118,6 +118,8 @@ class rst2rfcxml
     bool
     handle_variable_initializations(std::string line);
     bool
+    is_cell_blank(std::string current, int column);
+    bool
     handle_table_line(std::string current, std::string next, std::ostream& output_stream);
     bool
     handle_title_line(std::string current, std::string next, std::ostream& output_stream);

diff --git a/test/basic_tests.cpp b/test/basic_tests.cpp
@@ -477,6 +477,67 @@ Bar   Another example
 )");
 }
 
+TEST_CASE("table centered", "[basic]")
+{
+    test_rst2rfcxml(
+        R"(
+
+======  =====  ==============================================
+source  value  description
+======  =====  ==============================================
+  K       0    use 32-bit 'imm' value as source operand
+  X       1    use 'src_reg' register value as source operand
+======  =====  ==============================================
+
+)",
+        R"(<table>
+ <thead>
+  <tr>
+   <th>source</th>
+   <th>value</th>
+   <th>description</th>
+  </tr>
+ </thead>
+ <tbody>
+  <tr>
+   <td>
+    <blockquote>
+     K
+    </blockquote>
+   </td>
+   <td>
+    <blockquote>
+     0
+    </blockquote>
+   </td>
+   <td>
+    <t>
+     use 32-bit 'imm' value as source operand
+    </t>
+   </td>
+  </tr>
+  <tr>
+   <td>
+    <blockquote>
+     X
+    </blockquote>
+   </td>
+   <td>
+    <blockquote>
+     1
+    </blockquote>
+   </td>
+   <td>
+    <t>
+     use 'src_reg' register value as source operand
+    </t>
+   </td>
+  </tr>
+ </tbody>
+</table>
+)");
+}
+
 TEST_CASE("table with literal cell", "[basic]")
 {
     test_rst2rfcxml(