Reverted tags backend to just joining table cells with "|" (was for a while prefixing each cell with "|"), changed norm rules Ruby to use split() function instead of complicated regular expression that wasn't robust. Added test case for single char table cells (would have failed before).

Signed-off-by: James Ball <[email protected]>

Author: james-ball-qualcomm

converters/tags.rb

@@ -144,8 +144,8 @@ def node_text_content(node)
                 cell.content.join("\n")
               end
             end
-            # Prefix cells with "|"
-          end.map { |s| '|' + s }.join
+            # Separate cells with "|"
+          end.join("|")
           # Separate rows by newlines.
         end.join("\n")
         # Separate table sections by ===.

tests/norm-rule/expected/test-norm-rules.adoc

@@ -89,15 +89,15 @@ It's got 2 lines.
 
 .1+| table1
 | ===
-|WITH anchor
-|WITHOUT anchor
+WITH anchor
+WITHOUT anchor
 === a| link:test.html#norm:table:anchors-in-cells:entire-table[norm:table:anchors-in-cells:entire-table]
 
 .1+| table2
-| |Header 1|Header 2
+| Header 1|Header 2
 ===
-|Cell in column 1, row 1|Cell in column 2, row 1
-|Cell in column 1, row 2|Cell in column 2, row 2
+Cell in column 1, row 1|Cell in column 2, row 1
+Cell in column 1, row 2|Cell in column 2, row 2
 === a| link:test.html#norm:table:no-anchors-in-cells:entire-table[norm:table:no-anchors-in-cells:entire-table]
 
 .1+| table3
@@ -107,21 +107,28 @@ It's got 2 lines.
 | ABC DEF a| link:test.html#norm:table:anchors-in-cells:entire-table-not-tagged:cell[norm:table:anchors-in-cells:entire-table-not-tagged:cell]
 
 .1+| table5
-| |Name|Color
+| Name|Color
 ===
-|Roses|Red
-|Violets|Blue
-|Name1|Color1
-|Name2|Color2
-|Name3|Color3
-|Name4|Color4
-|Name5|Color5
-|Name6|Color6
-|Name7|Color7
-|Name8|Color8
-|Name9|Color9
+Roses|Red
+Violets|Blue
+Name1|Color1
+Name2|Color2
+Name3|Color3
+Name4|Color4
+Name5|Color5
+Name6|Color6
+Name7|Color7
+Name8|Color8
+Name9|Color9
 ... a| link:test.html#norm:table:many-rows[norm:table:many-rows]
 
+.1+| table6
+| X1|X2
+===
+A|B
+C|D
+=== a| link:test.html#norm:table:single-char-cells[norm:table:single-char-cells]
+
 .1+| unordered1
 | Item A
 Item B

tests/norm-rule/expected/test-norm-rules.html

@@ -278,6 +278,11 @@ <h3>my-chapter_name</h3>
               <td><table><thead><tr><th>Name</th><th>Color</th></tr></thead><tbody><tr><td>Roses</td><td>Red</td></tr><tr><td>Violets</td><td>Blue</td></tr><tr><td>Name1</td><td>Color1</td></tr><tr><td>Name2</td><td>Color2</td></tr><tr><td>Name3</td><td>Color3</td></tr><tr><td>Name4</td><td>Color4</td></tr><tr><td>Name5</td><td>Color5</td></tr><tr><td>Name6</td><td>Color6</td></tr><tr><td>Name7</td><td>Color7</td></tr><tr><td>Name8</td><td>Color8</td></tr><tr><td>Name9</td><td>Color9</td></tr><tr><td>Name10</td><td>Color10</td></tr><tr><td>...</td><td>...</td></tr></tbody></table></td>
               <td><a href="test.html#norm:table:many-rows">norm:table:many-rows</a></td>
             </tr>
+            <tr>
+              <td rowspan=1 id="table6">table6</td>
+              <td><table><thead><tr><th>X1</th><th>X2</th></tr></thead><tbody><tr><td>A</td><td>B</td></tr><tr><td>C</td><td>D</td></tr></tbody></table></td>
+              <td><a href="test.html#norm:table:single-char-cells">norm:table:single-char-cells</a></td>
+            </tr>
             <tr>
               <td rowspan=1 id="unordered1">unordered1</td>
               <td>Item A<br>Item B<br>Item C</td>

tests/norm-rule/expected/test-norm-rules.json

@@ -333,7 +333,7 @@
       "tags": [
         {
           "name": "norm:table:anchors-in-cells:entire-table",
-          "text": "===\n|WITH anchor\n|WITHOUT anchor\n===",
+          "text": "===\nWITH anchor\nWITHOUT anchor\n===",
           "tag_filename": "/build/test-norm-tags.json",
           "stds_doc_url": "test.html"
         }
@@ -346,7 +346,7 @@
       "tags": [
         {
           "name": "norm:table:no-anchors-in-cells:entire-table",
-          "text": "|Header 1|Header 2\n===\n|Cell in column 1, row 1|Cell in column 2, row 1\n|Cell in column 1, row 2|Cell in column 2, row 2\n===",
+          "text": "Header 1|Header 2\n===\nCell in column 1, row 1|Cell in column 2, row 1\nCell in column 1, row 2|Cell in column 2, row 2\n===",
           "tag_filename": "/build/test-norm-tags.json",
           "stds_doc_url": "test.html"
         }
@@ -385,7 +385,20 @@
       "tags": [
         {
           "name": "norm:table:many-rows",
-          "text": "|Name|Color\n===\n|Roses|Red\n|Violets|Blue\n|Name1|Color1\n|Name2|Color2\n|Name3|Color3\n|Name4|Color4\n|Name5|Color5\n|Name6|Color6\n|Name7|Color7\n|Name8|Color8\n|Name9|Color9\n|Name10|Color10\n|Name11|Color11\n|Name12|Color12\n|Name13|Color13\n|Name14|Color14\n===",
+          "text": "Name|Color\n===\nRoses|Red\nViolets|Blue\nName1|Color1\nName2|Color2\nName3|Color3\nName4|Color4\nName5|Color5\nName6|Color6\nName7|Color7\nName8|Color8\nName9|Color9\nName10|Color10\nName11|Color11\nName12|Color12\nName13|Color13\nName14|Color14\n===",
+          "tag_filename": "/build/test-norm-tags.json",
+          "stds_doc_url": "test.html"
+        }
+      ]
+    },
+    {
+      "name": "table6",
+      "def_filename": "tests/norm-rule/test.yaml",
+      "chapter_name": "my-chapter_name",
+      "tags": [
+        {
+          "name": "norm:table:single-char-cells",
+          "text": "X1|X2\n===\nA|B\nC|D\n===",
           "tag_filename": "/build/test-norm-tags.json",
           "stds_doc_url": "test.html"
         }

tests/norm-rule/expected/test-norm-rules.xlsx

@@ -24,11 +24,12 @@
     "norm:hyperlink4": "DEF <<non-norm-anchor,custom text>> GHI",
     "norm:hyperlink5": "GHI <<norm:superscript>> and <<norm:subscript>> JKL",
     "norm:hyperlink6": "JKL <<norm:superscript,hello>> and <<norm:subscript,goodbye>> MNO",
-    "norm:table:no-anchors-in-cells:entire-table": "|Header 1|Header 2\n===\n|Cell in column 1, row 1|Cell in column 2, row 1\n|Cell in column 1, row 2|Cell in column 2, row 2\n===",
+    "norm:table:no-anchors-in-cells:entire-table": "Header 1|Header 2\n===\nCell in column 1, row 1|Cell in column 2, row 1\nCell in column 1, row 2|Cell in column 2, row 2\n===",
     "norm:table:anchors-in-cells:entire-table-tagged:cell": "WITH anchor",
-    "norm:table:anchors-in-cells:entire-table": "===\n|WITH anchor\n|WITHOUT anchor\n===",
+    "norm:table:anchors-in-cells:entire-table": "===\nWITH anchor\nWITHOUT anchor\n===",
     "norm:table:anchors-in-cells:entire-table-not-tagged:cell": "ABC DEF",
-    "norm:table:many-rows": "|Name|Color\n===\n|Roses|Red\n|Violets|Blue\n|Name1|Color1\n|Name2|Color2\n|Name3|Color3\n|Name4|Color4\n|Name5|Color5\n|Name6|Color6\n|Name7|Color7\n|Name8|Color8\n|Name9|Color9\n|Name10|Color10\n|Name11|Color11\n|Name12|Color12\n|Name13|Color13\n|Name14|Color14\n===",
+    "norm:table:many-rows": "Name|Color\n===\nRoses|Red\nViolets|Blue\nName1|Color1\nName2|Color2\nName3|Color3\nName4|Color4\nName5|Color5\nName6|Color6\nName7|Color7\nName8|Color8\nName9|Color9\nName10|Color10\nName11|Color11\nName12|Color12\nName13|Color13\nName14|Color14\n===",
+    "norm:table:single-char-cells": "X1|X2\n===\nA|B\nC|D\n===",
     "norm:unordered-list:no-anchors-in-items:entire-list": "Item A\nItem B\nItem C",
     "norm:unordered-list:anchors-in-items:item1": "Item 1",
     "norm:unordered-list:anchors-in-items:item2": "Item 2",
@@ -112,7 +113,8 @@
               "norm:table:anchors-in-cells:entire-table-tagged:cell",
               "norm:table:anchors-in-cells:entire-table",
               "norm:table:anchors-in-cells:entire-table-not-tagged:cell",
-              "norm:table:many-rows"
+              "norm:table:many-rows",
+              "norm:table:single-char-cells"
             ]
           }
         ],

tests/norm-rule/expected/test-norm-tags.json

@@ -104,7 +104,7 @@ Here's some text that isn't normative but the normatively tagged text has an exi
 
 === Chapter 2 - Table Tagging
 
-// FAILS - Want tagged text to be "ENTIRE TABLE"
+// PASSES
 [[norm:table:no-anchors-in-cells:entire-table]]
 [cols="1,1"]
 |===
@@ -114,11 +114,11 @@ Here's some text that isn't normative but the normatively tagged text has an exi
 |Cell in column 1, row 2 |Cell in column 2, row 2
 |===
 
-// FAILS - Want tagged text to be "ENTIRE TABLE"
+// PASSES
 [[norm:table:anchors-in-cells:entire-table]]
 |===
 
-// FAILS - Want tagged text to be "WITH anchor"
+// PASSES
 | [#norm:table:anchors-in-cells:entire-table-tagged:cell]#WITH anchor#
 | WITHOUT anchor
 |===
@@ -127,11 +127,11 @@ Here's some text that isn't normative but the normatively tagged text has an exi
 
 // PASSES - Handles adoc formatted cell
 a| Cell is adoc
-// FAILS - Want tagged text to be "ABC DEF"
+// PASSES
 | [#norm:table:anchors-in-cells:entire-table-not-tagged:cell]#ABC DEF#
 |===
 
-// PASSES - Want tagged text to be "ENTIRE TABLE"
+// PASSES
 [[norm:table:many-rows]]
 [cols="1,1"]
 |===
@@ -155,6 +155,14 @@ a| Cell is adoc
 |Name14|Color14
 |===
 
+[[norm:table:single-char-cells]]
+|===
+|X1|X2
+
+| A|B
+|C| D
+|===
+
 == Chapter 3 - Tagging Unordered Lists
 
 // PASSES - Tag includes all list items

tests/norm-rule/test.adoc

@@ -80,6 +80,8 @@ normative_rule_definitions:
     tag: "norm:table:anchors-in-cells:entire-table-not-tagged:cell"
   - name: table5
     tag: "norm:table:many-rows"
+  - name: table6
+    tag: "norm:table:single-char-cells"
 
   # Unordered lists
   - name: unordered1

tests/norm-rule/test.yaml

@@ -1208,26 +1208,19 @@ def convert_tags_tables_to_html(text)
 end
 
 # Return array of table columns from one row/header of a table.
-def extract_tags_table_cells(text)
-  raise ArgumentError, "Expected String for text but was passed a #{text}.class" unless text.is_a?(String)
+# Returns empty array if row is nil or the empty string.
+def extract_tags_table_cells(row)
+  raise ArgumentError, "Expected String for row but was passed a #{row}.class" unless row.is_a?(String)
 
-  # This pattern matches strings that:
-  #   - Start with a non-pipe, non-whitespace character
-  #   - Then contain zero or more non-pipe characters (can include internal spaces)
-  #   - End with a non-pipe, non-whitespace character
-  #
-  # All leading/trailing whitespace is removed.
-  #
+  return [] if row.nil? || row.empty?
+
+  # Split row fields with pipe symbol.
   # Examples:
-  #   "| H1 | H2".scan(/[^|\s][^|]*[^|\s]/)
-  #   => ["H1", "H2"]
-  #
-  #   "| ABC | DEF GHI |".scan(/[^|\s][^|]*[^|\s]/)
-  #   => ["ABC", "DEF GHI"]  # Note: internal space preserved
-  #
-  #   "|  Name  |  Value  |".scan(/[^|\s][^|]*[^|\s]/)
-  #   => ["Name", "Value"]  # Leading/trailing spaces removed
-  text.scan(/[^|\s][^|]*[^|\s]/)
+  #   "H1 | H2" => ["H1", "H2"]
+  #   "|" => ["", ""]
+  #   "|A|B" => ["", "A", "B"]
+  #   "||C" => ["", "", "C"]
+  row.split('|', -1).map(&:strip)
 end
 
 # Cleanup the tag text to be suitably displayed.