Merge pull request #113 from riscv/111-create-asciidoc-with-tables-of-norm-rules

Added adoc output format for norm rules

Author: james-ball-qualcomm

Makefile

@@ -25,29 +25,44 @@ NORM_RULE_EXPECTED_DIR := $(NORM_RULE_TESTS_DIR)/expected
 
 # Ruby scripts being tested.
 TAGS_BACKEND := tags.rb
-CREATE_NORM_RULE_TOOL := create_normative_rules.rb
+CREATE_NORM_RULE_TOOL := $(TOOLS_DIR)/create_normative_rules.rb
+CREATE_NORM_RULE_RUBY := ruby $(CREATE_NORM_RULE_TOOL)
+
+# Stuff for building mock standards document in HTML to have links into it.
+DOCS = "test"
+DOCS_HTML := $(addprefix $(BUILD_DIR)/, $(addsuffix .html, $(DOCS)))
+ENV := LANG=C.utf8
+ASCIIDOCTOR_HTML := $(ENV) asciidoctor
 
 # Input and output file names
+DOC_NORM_TAG_SUFFIX := -norm-tags.json
 MAIN_TEST_ADOC_INPUT_FNAME := test.adoc
+MAIN_TEST_HTML_FNAME := test.html
 DUPLICATE_TEST_ADOC_INPUT_FNAME := duplicate.adoc
-MAIN_NORM_TAGS_OUTPUT_FNAME := test-norm-tags.json
+MAIN_NORM_TAGS_OUTPUT_FNAME := test$(DOC_NORM_TAG_SUFFIX)
 DUPLICATE_NORM_TAGS_OUTPUT_FNAME := duplicate-tags.json
 NORM_RULE_JSON_OUTPUT_FNAME := test-norm-rules.json
 NORM_RULE_XLSX_OUTPUT_FNAME := test-norm-rules.xlsx
+NORM_RULE_ADOC_OUTPUT_FNAME := test-norm-rules.adoc
+NORM_RULE_HTML_OUTPUT_FNAME := test-norm-rules.html
 NORM_RULE_TAGS_NO_RULES_OUTPUT_FNAME := test-norm-rules_tags_no_rules.json
 
 # Built output files
+BUILT_MAIN_TEST_HTML := $(BUILD_DIR)/$(MAIN_TEST_HTML_FNAME)
 BUILT_NORM_TAGS_MAIN := $(BUILD_DIR)/$(MAIN_NORM_TAGS_OUTPUT_FNAME)
 BUILT_NORM_TAGS_DUPLICATE := $(BUILD_DIR)/$(DUPLICATE_NORM_TAGS_OUTPUT_FNAME)
 BUILT_NORM_RULES_JSON := $(BUILD_DIR)/$(NORM_RULE_JSON_OUTPUT_FNAME)
 BUILT_NORM_RULES_XLSX := $(BUILD_DIR)/$(NORM_RULE_XLSX_OUTPUT_FNAME)
+BUILT_NORM_RULES_ADOC := $(BUILD_DIR)/$(NORM_RULE_ADOC_OUTPUT_FNAME)
+BUILT_NORM_RULES_HTML := $(BUILD_DIR)/$(NORM_RULE_HTML_OUTPUT_FNAME)
 BUILT_NORM_RULES_TAGS_NO_RULES := $(BUILD_DIR)/$(NORM_RULE_TAGS_NO_RULES_OUTPUT_FNAME)
 
 # Copies of expected output files.
 # Use make target "update-expected" to update from build dir contents.
 EXPECTED_NORM_TAGS := $(NORM_RULE_EXPECTED_DIR)/$(MAIN_NORM_TAGS_OUTPUT_FNAME)
 EXPECTED_NORM_RULES_JSON := $(NORM_RULE_EXPECTED_DIR)/$(NORM_RULE_JSON_OUTPUT_FNAME)
 EXPECTED_NORM_RULES_XLSX := $(NORM_RULE_EXPECTED_DIR)/$(NORM_RULE_XLSX_OUTPUT_FNAME)
+EXPECTED_NORM_RULES_ADOC := $(NORM_RULE_EXPECTED_DIR)/$(NORM_RULE_ADOC_OUTPUT_FNAME)
 
 # All normative rule definition input YAML files
 NORM_RULE_DEF_FILES := $(wildcard $(NORM_RULE_DEF_DIR)/*.yaml)
@@ -58,6 +73,9 @@ NORM_TAG_FILE_ARGS := $(foreach relative_pname,$(BUILT_NORM_TAGS_MAIN),-t /$(rel
 # Add -d to each normative rule definition filename
 NORM_RULE_DEF_ARGS := $(foreach relative_pname,$(NORM_RULE_DEF_FILES),-d $(relative_pname))
 
+# Provide mapping from an standard's norm tags JSON file to its corresponding HTML file. Used to create links into standard's HTML files.
+NORM_RULE_DOC2HTML_ARGS := $(foreach doc_name,$(DOCS),-tag2html /$(BUILD_DIR)/$(doc_name)$(DOC_NORM_TAG_SUFFIX) $(doc_name).html)
+
 # Docker stuff
 DOCKER_BIN ?= docker
 SKIP_DOCKER ?= $(shell if command -v ${DOCKER_BIN}  >/dev/null 2>&1 ; then echo false; else echo true; fi)
@@ -124,15 +142,17 @@ test: build-tests compare-tests
 
 # Build tests
 .PHONY: build-tests build-test-tags build-test-norm-rules-json build-test-norm-rules-xlsx
-build-tests: build-test-tags build-test-norm-rules-json build-test-norm-rules-xlsx build-test-tags-without-rules
+build-tests: build-test-tags build-test-norm-rules-json build-test-norm-rules-xlsx build-test-norm-rules-adoc build-test-norm-rules-html build-test-tags-without-rules
 build-test-tags: $(BUILT_NORM_TAGS_MAIN) $(BUILT_NORM_TAGS_DUPLICATE)
 build-test-norm-rules-json: $(BUILT_NORM_RULES_JSON)
 build-test-norm-rules-xlsx: $(BUILT_NORM_RULES_XLSX)
+build-test-norm-rules-adoc: $(BUILT_NORM_RULES_ADOC)
+build-test-norm-rules-html: $(BUILT_NORM_RULES_HTML)
 build-test-tags-without-rules: $(BUILT_NORM_RULES_TAGS_NO_RULES)
 
 # Compare tests against expected
 .PHONY: compare-tests
-compare-tests: compare-test-tags compare-test-norm-rules-json
+compare-tests: compare-test-tags compare-test-norm-rules-json compare-test-norm-rules-adoc
 
 compare-test-tags: $(EXPECTED_NORM_TAGS) $(BUILT_NORM_TAGS_MAIN)
 	@echo "CHECKING BUILT TAGS AGAINST EXPECTED TAGS"
@@ -144,9 +164,13 @@ compare-test-norm-rules-json: $(EXPECTED_NORM_RULES_JSON) $(BUILT_NORM_RULES_JSO
 	@echo "CHECKING JSON BUILT NORM RULES AGAINST EXPECTED NORM RULES"
 	diff $(EXPECTED_NORM_RULES_JSON) $(BUILT_NORM_RULES_JSON) && echo "diff PASSED" || (echo "diff FAILED"; exit 1)
 
+compare-test-norm-rules-adoc: $(EXPECTED_NORM_RULES_ADOC) $(BUILT_NORM_RULES_ADOC)
+	@echo "CHECKING ADOC BUILT NORM RULES AGAINST EXPECTED NORM RULES"
+	diff $(EXPECTED_NORM_RULES_ADOC) $(BUILT_NORM_RULES_ADOC) && echo "diff PASSED" || (echo "diff FAILED"; exit 1)
+
 # Update expected files from built files
 .PHONY: update-expected
-update-expected: update-test-tags update-test-norm-rules-json update-test-norm-rules-xlsx
+update-expected: update-test-tags update-test-norm-rules-json update-test-norm-rules-xlsx update-test-norm-rules-adoc
 
 update-test-tags: $(BUILT_NORM_TAGS_MAIN)
 	cp -f $(BUILT_NORM_TAGS_MAIN) $(EXPECTED_NORM_TAGS)
@@ -157,6 +181,9 @@ update-test-norm-rules-json: $(BUILT_NORM_RULES_JSON)
 update-test-norm-rules-xlsx: $(BUILT_NORM_RULES_XLSX)
 	cp -f $(BUILT_NORM_RULES_XLSX) $(EXPECTED_NORM_RULES_XLSX)
 
+update-test-norm-rules-adoc: $(BUILT_NORM_RULES_ADOC)
+	cp -f $(BUILT_NORM_RULES_ADOC) $(EXPECTED_NORM_RULES_ADOC)
+
 # Build normative tags with main adoc input
 $(BUILT_NORM_TAGS_MAIN): $(NORM_RULE_TESTS_DIR)/$(MAIN_TEST_ADOC_INPUT_FNAME) $(CONVERTERS_DIR)/$(TAGS_BACKEND)
 	$(WORKDIR_SETUP)
@@ -175,15 +202,36 @@ $(BUILT_NORM_RULES_JSON): $(BUILT_NORM_TAGS_MAIN) $(NORM_RULE_DEF_FILES)
 	$(WORKDIR_SETUP)
 	cp -f $(BUILT_NORM_TAGS_MAIN) $@.workdir
 	mkdir -p $@.workdir/build
-	$(DOCKER_CMD) $(DOCKER_QUOTE) ruby $(TOOLS_DIR)/$(CREATE_NORM_RULE_TOOL) -w $(NORM_TAG_FILE_ARGS) $(NORM_RULE_DEF_ARGS) $@ $(DOCKER_QUOTE)
+	$(DOCKER_CMD) $(DOCKER_QUOTE) $(CREATE_NORM_RULE_RUBY) -w -j $(NORM_TAG_FILE_ARGS) $(NORM_RULE_DEF_ARGS) $@ $(DOCKER_QUOTE)
 	$(WORKDIR_TEARDOWN)
 
 # Build normative rules with XLSX output format
 $(BUILT_NORM_RULES_XLSX): $(BUILT_NORM_TAGS_MAIN) $(NORM_RULE_DEF_FILES)
 	$(WORKDIR_SETUP)
 	cp -f $(BUILT_NORM_TAGS_MAIN) $@.workdir
 	mkdir -p $@.workdir/build
-	$(DOCKER_CMD) $(DOCKER_QUOTE) ruby $(TOOLS_DIR)/$(CREATE_NORM_RULE_TOOL) -w -x $(NORM_TAG_FILE_ARGS) $(NORM_RULE_DEF_ARGS) $@ $(DOCKER_QUOTE)
+	$(DOCKER_CMD) $(DOCKER_QUOTE) $(CREATE_NORM_RULE_RUBY) -w -x $(NORM_TAG_FILE_ARGS) $(NORM_RULE_DEF_ARGS) $@ $(DOCKER_QUOTE)
+	$(WORKDIR_TEARDOWN)
+
+$(BUILT_NORM_RULES_ADOC): $(BUILT_NORM_TAGS_MAIN) $(NORM_RULE_DEF_FILES)
+	$(WORKDIR_SETUP)
+	cp -f $(BUILT_NORM_TAGS_MAIN) $@.workdir
+	mkdir -p $@.workdir/build
+	$(DOCKER_CMD) $(DOCKER_QUOTE) $(CREATE_NORM_RULE_RUBY) -w -a $(NORM_TAG_FILE_ARGS) $(NORM_RULE_DEF_ARGS) $(NORM_RULE_DOC2HTML_ARGS) $@ $(DOCKER_QUOTE)
+	$(WORKDIR_TEARDOWN)
+
+$(BUILT_NORM_RULES_HTML): $(BUILT_NORM_RULES_ADOC) $(BUILT_MAIN_TEST_HTML)
+	$(WORKDIR_SETUP)
+	mkdir -p $@.workdir/build
+	cp -f $(BUILT_NORM_RULES_ADOC) $@.workdir/build
+	$(DOCKER_CMD) $(DOCKER_QUOTE) $(ASCIIDOCTOR_HTML) $< $(DOCKER_QUOTE)
+	$(WORKDIR_TEARDOWN)
+
+# This is the HTML file that represents the standards doc. THe norm rule HTML links into this HTML.
+$(BUILT_MAIN_TEST_HTML) : $(NORM_RULE_TESTS_DIR)/$(MAIN_TEST_ADOC_INPUT_FNAME)
+	$(WORKDIR_SETUP)
+	mkdir -p $@.workdir/build
+	$(DOCKER_CMD) $(DOCKER_QUOTE) $(ASCIIDOCTOR_HTML) -o $@ $< $(DOCKER_QUOTE)
 	$(WORKDIR_TEARDOWN)
 
 # Build normative rules that should create an error due to tags without norm rules referencing them
@@ -192,7 +240,7 @@ $(BUILT_NORM_RULES_TAGS_NO_RULES): $(BUILT_NORM_TAGS_MAIN) $(NORM_RULE_DEF_FILES
 	$(WORKDIR_SETUP)
 	cp -f $(BUILT_NORM_TAGS_MAIN) $@.workdir
 	mkdir -p $@.workdir/build
-	$(DOCKER_CMD) $(DOCKER_QUOTE) ruby $(TOOLS_DIR)/$(CREATE_NORM_RULE_TOOL) $(NORM_TAG_FILE_ARGS) $(NORM_RULE_DEF_ARGS) $(BUILD_DIR)/bogus || touch $(BUILT_NORM_RULES_TAGS_NO_RULES) $(DOCKER_QUOTE)
+	$(DOCKER_CMD) $(DOCKER_QUOTE) $(CREATE_NORM_RULE_RUBY) $(NORM_TAG_FILE_ARGS) $(NORM_RULE_DEF_ARGS) $(BUILD_DIR)/bogus || touch $(BUILT_NORM_RULES_TAGS_NO_RULES) $(DOCKER_QUOTE)
 	$(WORKDIR_TEARDOWN)
 
 # Update docker image to latest

test-norm-rules-ref.adoc

@@ -0,0 +1,64 @@
+= Normative Rules by Chapter
+
+== my-chapter_name
+
+[cols="20%,80%"]
+|===
+| Rule Name | Rule Information
+
+.2+| inline
+a| Summary: A few words
+a| link:test.html#norm:inline[norm:inline] => inside inline
+
+.2+| paragraph-with-a-really-wide-rule-name
+a| Description: Here's a description.
+It's got 2 lines.
+a| link:test.html#norm:paragraph:no-inline-anchors[norm:paragraph:no-inline-anchors] => Paragraph without inline anchors
+
+.1+| inline-anchors-in-paragraph-entire
+a| link:test.html#norm:paragraph:inline-anchors:entire[norm:paragraph:inline-anchors:entire] => Paragraph with inline anchor and something.
+
+.1+| inline-anchors-in-paragraph-inline-anchor
+a| link:test.html#norm:paragraph:inline-anchors:inline-anchor[norm:paragraph:inline-anchors:inline-anchor] => inline anchor
+
+.1+| formulae
+a| link:test.html#norm:formulae[norm:formulae] => This paragraph looks like a formulae to Excel because it has this < sign in it. Make sure this gets written as a string, not a formulae in the XLSX or else it will create an error in Excel.
+
+.1+| rule_with_newlines
+a| link:test.html#norm:paragraph:tag_with_newlines[norm:paragraph:tag_with_newlines] => Here’s the first line. Here’s the second line.
+
+.1+| table1
+a| link:test.html#norm:table:anchors-in-cells:entire-table[norm:table:anchors-in-cells:entire-table] =>
+!===
+
+!cell with anchor
+!cell without anchor
+!===
+
+.1+| table2
+a| link:test.html#norm:table:no-anchors-in-cells:entire-table[norm:table:no-anchors-in-cells:entire-table] =>
+!===
+! 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
+!===
+
+.1+| unordered1
+a| link:test.html#norm:unordered-list:anchors-in-items:entire-list[norm:unordered-list:anchors-in-items:entire-list] => Item 1
+Item 2
+Item 3
+
+.3+| note_with_2_tags
+a| Description: One line description
+a| link:test.html#norm:admonition:anchors-in-notes:note1[norm:admonition:anchors-in-notes:note1] => Paragraph 1
+a| link:test.html#norm:admonition:anchors-in-notes:note3[norm:admonition:anchors-in-notes:note3] => Paragraph 3
+
+.2+| desc1
+a| link:test.html#norm:description-list:anchors-in-items:item1[norm:description-list:anchors-in-items:item1] => Item 1
+a| link:test.html#norm:description-list:anchors-in-items:item3[norm:description-list:anchors-in-items:item3] => Item 3
+
+.2+| desc2
+a| link:test.html#norm:description-list:anchors-in-items:item1[norm:description-list:anchors-in-items:item1] => Item 1
+a| link:test.html#norm:description-list:anchors-in-items:item3[norm:description-list:anchors-in-items:item3] => Item 3
+|===

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

@@ -0,0 +1,59 @@
+= Normative Rules by Chapter
+
+== my-chapter_name
+
+[cols="20%,80%"]
+|===
+| Rule Name | Rule Information
+
+.2+| inline
+a| Summary: A few words
+a| link:test.html#norm:inline[norm:inline] => inside inline
+
+.2+| paragraph-with-a-really-wide-rule-name
+a| Description: Here's a description.
+It's got 2 lines.
+a| link:test.html#norm:paragraph:no-inline-anchors[norm:paragraph:no-inline-anchors] => Paragraph without inline anchors
+
+.1+| inline-anchors-in-paragraph-entire
+a| link:test.html#norm:paragraph:inline-anchors:entire[norm:paragraph:inline-anchors:entire] => Paragraph with inline anchor and something.
+
+.1+| inline-anchors-in-paragraph-inline-anchor
+a| link:test.html#norm:paragraph:inline-anchors:inline-anchor[norm:paragraph:inline-anchors:inline-anchor] => inline anchor
+
+.1+| formulae
+a| link:test.html#norm:formulae[norm:formulae] => This paragraph looks like a formulae to Excel because it has this < sign in it. Make sure this gets written as a string, not a formulae in the XLSX or else it will create an error in Excel.
+
+.1+| rule_with_newlines
+a| link:test.html#norm:paragraph:tag_with_newlines[norm:paragraph:tag_with_newlines] => Here’s the first line. Here’s the second line.
+
+.1+| table1
+a| link:test.html#norm:table:anchors-in-cells:entire-table[norm:table:anchors-in-cells:entire-table] => ENTIRE TABLE
+
+.1+| table2
+a| link:test.html#norm:table:no-anchors-in-cells:entire-table[norm:table:no-anchors-in-cells:entire-table] => ENTIRE TABLE
+
+.1+| anchors-in-cells1
+a| link:test.html#norm:table:anchors-in-cells:entire-table-tagged:cell[norm:table:anchors-in-cells:entire-table-tagged:cell] => WITH anchor
+
+.1+| anchors-in-cells2
+a| link:test.html#norm:table:anchors-in-cells:entire-table-not-tagged:cell[norm:table:anchors-in-cells:entire-table-not-tagged:cell] => ABC DEF
+
+.1+| unordered1
+a| link:test.html#norm:unordered-list:anchors-in-items:entire-list[norm:unordered-list:anchors-in-items:entire-list] => Item 1
+Item 2
+Item 3
+
+.3+| note_with_2_tags
+a| Description: One line description
+a| link:test.html#norm:admonition:anchors-in-notes:note1[norm:admonition:anchors-in-notes:note1] => Paragraph 1
+a| link:test.html#norm:admonition:anchors-in-notes:note3[norm:admonition:anchors-in-notes:note3] => Paragraph 3
+
+.2+| desc1
+a| link:test.html#norm:description-list:anchors-in-items:item1[norm:description-list:anchors-in-items:item1] => Item 1
+a| link:test.html#norm:description-list:anchors-in-items:item3[norm:description-list:anchors-in-items:item3] => Item 3
+
+.2+| desc2
+a| link:test.html#norm:description-list:anchors-in-items:item1[norm:description-list:anchors-in-items:item1] => Item 1
+a| link:test.html#norm:description-list:anchors-in-items:item3[norm:description-list:anchors-in-items:item3] => Item 3
+|===

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

@@ -86,7 +86,7 @@
       "tags": [
         {
           "name": "norm:table:anchors-in-cells:entire-table",
-          "text": "===\ncell with anchor\ncell without anchor\n===",
+          "text": "===\nWITH anchor\nWITHOUT anchor\n===",
           "tag_filename": "/build/test-norm-tags.json"
         }
       ]
@@ -103,6 +103,30 @@
         }
       ]
     },
+    {
+      "name": "anchors-in-cells1",
+      "def_filename": "tests/norm-rule/test.yaml",
+      "chapter_name": "my-chapter_name",
+      "tags": [
+        {
+          "name": "norm:table:anchors-in-cells:entire-table-tagged:cell",
+          "text": "WITH anchor",
+          "tag_filename": "/build/test-norm-tags.json"
+        }
+      ]
+    },
+    {
+      "name": "anchors-in-cells2",
+      "def_filename": "tests/norm-rule/test.yaml",
+      "chapter_name": "my-chapter_name",
+      "tags": [
+        {
+          "name": "norm:table:anchors-in-cells:entire-table-not-tagged:cell",
+          "text": "ABC DEF",
+          "tag_filename": "/build/test-norm-tags.json"
+        }
+      ]
+    },
     {
       "name": "unordered1",
       "def_filename": "tests/norm-rule/test.yaml",

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

@@ -8,8 +8,9 @@
     "norm:def": "This paragraph has two tags but we only ever get a tag for norm:def.",
     "norm:formulae": "This paragraph looks like a formulae to Excel because it has this < sign in it. Make sure this gets written as a string, not a formulae in the XLSX or else it will create an error in Excel.",
     "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:cell": "cell with anchor",
-    "norm:table:anchors-in-cells:entire-table": "===\ncell with anchor\ncell without anchor\n===",
+    "norm:table:anchors-in-cells:entire-table-tagged:cell": "WITH anchor",
+    "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: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",
@@ -66,8 +67,9 @@
             "children": [],
             "tags": [
               "norm:table:no-anchors-in-cells:entire-table",
-              "norm:table:anchors-in-cells:cell",
-              "norm:table:anchors-in-cells:entire-table"
+              "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"
             ]
           }
         ],

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

@@ -57,7 +57,7 @@ Make sure this gets written as a string, not a formulae in the XLSX or else it w
 
 === Chapter 2 - Table Tagging
 
-// FAILS - Tag includes entire table but has adoc === prefixes/suffixes.
+// FAILS - Want tagged text to be "ENTIRE TABLE"
 [[norm:table:no-anchors-in-cells:entire-table]]
 [cols="1,1"]
 |===
@@ -67,19 +67,21 @@ Make sure this gets written as a string, not a formulae in the XLSX or else it w
 |Cell in column 1, row 2 |Cell in column 2, row 2
 |===
 
-// FAILS - Tag includes entire table but has adoc === prefixes/suffixes.
+// FAILS - Want tagged text to be "ENTIRE TABLE"
 [[norm:table:anchors-in-cells:entire-table]]
 |===
 
-// PASSES
-| [#norm:table:anchors-in-cells:cell]#cell with anchor#
-| cell without anchor
+// FAILS - Want tagged text to be "cell with anchor"
+| [#norm:table:anchors-in-cells:entire-table-tagged:cell]#WITH anchor#
+| WITHOUT anchor
 |===
 
 |===
 
-// PASSES
+// PASSES - Handles adoc formatted cell
 a| Cell is adoc
+// FAILS - Want tagged text to be "ABC DEF"
+| [#norm:table:anchors-in-cells:entire-table-not-tagged:cell]#ABC DEF#
 |===
 
 == Chapter 3 - Tagging Unordered Lists

tests/norm-rule/test.adoc

@@ -29,6 +29,10 @@ normative_rule_definitions:
     tags: ["norm:table:anchors-in-cells:entire-table"]
   - name: table2
     tags: ["norm:table:no-anchors-in-cells:entire-table"]
+  - name: anchors-in-cells1
+    tags: ["norm:table:anchors-in-cells:entire-table-tagged:cell"]
+  - name: anchors-in-cells2
+    tags: ["norm:table:anchors-in-cells:entire-table-not-tagged:cell"]
   - name: unordered1
     tags: ["norm:unordered-list:anchors-in-items:entire-list"]
   - name: note_with_2_tags