From 15ca899b61e6de31e6187bce9e4914c1808356ed Mon Sep 17 00:00:00 2001
From: scottaohara <scottaohara@gmail.com>
Date: Wed, 18 Aug 2021 18:54:49 -0400
Subject: [PATCH] cut down rowspan/colspan rules for now

closes #338

further updates for these attributes and other table related rules need to be tracked in  #258
---
 index.html                          | 20 ++++++++++++++------
 results/implementation-results.html |  8 ++++----
 tests/colspan-test.html             | 26 ++++++--------------------
 tests/rowspan-test.html             | 21 ++-------------------
 4 files changed, 26 insertions(+), 49 deletions(-)

diff --git a/index.html b/index.html
index 4aa8f1b5..ba9bcecc 100644
--- a/index.html
+++ b/index.html
@@ -3107,14 +3107,18 @@ <h3 id="docconformance-attr">
                   Use the `colspan` attribute on any element that is
                   allowed the `colspan` attribute in HTML.
                 </p>
+                <!--
+                  Removing per issue #338
+                  Revised rules to be re-added
                 <p>
-                  Authors MAY use the `aria-colspan` attribute on any element that is allowed the `colspan` attribute in HTML, or any element with a WAI-ARIA role which allows the <a data-cite="wai-aria-1.1#aria-colspan">`aria-colspan` attribute</a>.
+                  Authors MAY use the <a data-cite="wai-aria-1.1#aria-colspan">`aria-colspan`</a> attribute on any element with an explicit WAI-ARIA role which allows the `aria-colspan` attribute.
                 </p>
+                -->
                 <p>
-                  Authors SHOULD NOT use the `aria-colspan` attribute on any element which also has a `colspan` attribute.
+                  Authors SHOULD NOT use the `aria-colspan` attribute on any element which allows the `colspan` attribute. Use the `colspan` attribute instead.
                 </p>
                 <p>
-                  Authors MUST NOT use `aria-colspan` on any element which also has a `colspan` attribute, and the values of each attribute do not match.
+                  Authors MUST NOT use `aria-colspan` on any element which also has a `colspan` attribute and the values of each attribute do not match.
                 </p>
               </td>
             </tr>
@@ -3131,14 +3135,18 @@ <h3 id="docconformance-attr">
                   Use the `rowspan` attribute on any element that is
                   allowed the `rowspan` attribute in HTML.
                 </p>
+                <!--
+                  Removing per issue #338
+                  Revised rules to be re-added
                 <p>
-                  Authors MAY use the `aria-rowspan` attribute on any element that is allowed the `rowspan` attribute in HTML, or any element with a WAI-ARIA role which allows the <a data-cite="wai-aria-1.1#aria-rowspan">`aria-rowspan` attribute</a>.
+                  Authors MAY use the <a data-cite="wai-aria-1.1#aria-rowspan">`aria-rowspan`</a> attribute on any element with an explicit WAI-ARIA role which allows the `aria-rowspan` attribute.
                 </p>
+                -->
                 <p>
-                  Authors SHOULD NOT use the `aria-rowspan` attribute on any element which also has a `rowspan` attribute.
+                  Authors SHOULD NOT use the `aria-rowspan` attribute on any element which allows the `rowspan` attribute. Use the `rowspan` attribute instead.
                 </p>
                 <p>
-                  Authors MUST NOT use `aria-rowspan` on any element which also has a `rowspan` attribute, and the values of each attribute do not match.
+                  Authors MUST NOT use `aria-rowspan` on any element which also has a `rowspan` attribute and the values of each attribute do not match.
                 </p>
               </td>
             </tr>
diff --git a/results/implementation-results.html b/results/implementation-results.html
index b3e519b7..e7cdff17 100644
--- a/results/implementation-results.html
+++ b/results/implementation-results.html
@@ -3696,12 +3696,12 @@ <h2>Conformance Checker Rule Implementations</h2>
             Use the <code>colspan</code> attribute on any element that is
             allowed the <code>colspan</code> attribute in HTML.
           </p>
-          <p>
+          <!-- <p>
             Authors <em class="rfc2119">MAY</em> use the <code>aria-colspan</code> attribute on any element that is allowed the <code>colspan</code> attribute in HTML, or any element with a WAI-<abbr title="Accessible Rich Internet Applications">ARIA</abbr> role which allows the <code>aria-colspan</code> attribute.
           </p>
           <p>
             Authors <em class="rfc2119">SHOULD NOT</em> use the <code>aria-colspan</code> attribute on any element which also has a <code>colspan</code> attribute.
-          </p>
+          </p> -->
           <p>
             Authors <em class="rfc2119">MUST NOT</em> use <code>aria-colspan</code> on any element which also has a <code>colspan</code> attribute, and the values of each attribute do not match.
           </p>
@@ -3724,12 +3724,12 @@ <h2>Conformance Checker Rule Implementations</h2>
             Use the <code>rowspan</code> attribute on any element that is
             allowed the <code>rowspan</code> attribute in HTML.
           </p>
-          <p>
+          <!-- <p>
             Authors <em class="rfc2119">MAY</em> use the <code>aria-rowspan</code> attribute on any element that is allowed the <code>rowspan</code> attribute in HTML, or any element with a WAI-<abbr title="Accessible Rich Internet Applications">ARIA</abbr> role which allows the <code>aria-rowspan</code> attribute.
           </p>
           <p>
             Authors <em class="rfc2119">SHOULD NOT</em> use the <code>aria-rowspan</code> attribute on any element which also has a <code>rowspan</code> attribute.
-          </p>
+          </p> -->
           <p>
             Authors <em class="rfc2119">MUST NOT</em> use <code>aria-rowspan</code> on any element which also has a <code>rowspan</code> attribute, and the values of each attribute do not match.
           </p>
diff --git a/tests/colspan-test.html b/tests/colspan-test.html
index 9d0d234c..a0428e81 100644
--- a/tests/colspan-test.html
+++ b/tests/colspan-test.html
@@ -46,7 +46,7 @@
 
 	<header>
 	<h1>ARIA in HTML - test cases for <code>aria-colspan</code></h1>
-	<p>last updated 27 February 2021</p>
+	<p>last updated 18 August 2021</p>
 	<p>
 		<a href="https://html.spec.whatwg.org/multipage/tables.html#attributes-common-to-td-and-th-elements"><code>colspan</code></a> is allowed on <code>td</code> and <code>th</code> elements
 	</p>
@@ -57,24 +57,7 @@ <h2>Tests:</h2>
 		<div class="flex">
 			<div class="widgetDemo">
 				<h3>Test 1</h3>
-				<p>Authors MAY use the <code>aria-colspan</code> attribute on any element that is allowed the <code>colspan</code> attribute in HTML, or any element with a WAI-ARIA role which allows the <code>aria-colspan</code> attribute. </p>
-
-				<p>The first <code>th</code> and <code>td</code> each have an <code>aria-colspan="1"</code></p>
-
-				<div class="testcase">
-					<table>
-						<thead>
-							<tr><th aria-colspan="1">header 1</th><th>header 2</th></tr>
-						</thead>
-						<tr>
-							<td aria-colspan="1">Cell 1</td>
-							<td>Cell 2</td>
-						</tr>
-					</table>
-				</div>
-
-				<p><strong>Expected result:</strong>
-				<br> no warning/error</p>
+				Edit: removed test.
 			</div>
 
 			<div class="widgetDemo">
@@ -86,7 +69,10 @@ <h3>Test 2</h3>
 				<div class="testcase">
 					<table>
 						<thead>
-							<tr><th aria-colspan="1" colspan="1">header 1</th><th>header 2</th></tr>
+							<tr>
+								<th aria-colspan="1" colspan="1">header 1</th>
+								<th>header 2</th>
+							</tr>
 						</thead>
 						<tr>
 							<td aria-colspan="1" colspan="1">Cell 1</td>
diff --git a/tests/rowspan-test.html b/tests/rowspan-test.html
index be111e5c..5a5d883f 100644
--- a/tests/rowspan-test.html
+++ b/tests/rowspan-test.html
@@ -46,7 +46,7 @@
 
 	<header>
 	<h1>ARIA in HTML - test cases for <code>aria-rowspan</code></h1>
-	<p>last updated 27 February 2021</p>
+	<p>last updated 18 August 2021</p>
 	<p>
 		<a href="https://html.spec.whatwg.org/multipage/tables.html#attributes-common-to-td-and-th-elements"><code>rowspan</code></a> is allowed on <code>td</code> and <code>th</code> elements
 	</p>
@@ -57,24 +57,7 @@ <h2>Tests:</h2>
 		<div class="flex">
 			<div class="widgetDemo">
 				<h3>Test 1</h3>
-				<p>Authors MAY use the <code>aria-rowspan</code> attribute on any element that is allowed the <code>rowspan</code> attribute in HTML, or any element with a WAI-ARIA role which allows the <code>aria-rowspan</code> attribute. </p>
-
-				<p>The first <code>th</code> and <code>td</code> each have an <code>aria-rowspan="1"</code></p>
-
-				<div class="testcase">
-					<table>
-						<thead>
-							<tr><th aria-rowspan="1">header 1</th><th>header 2</th></tr>
-						</thead>
-						<tr>
-							<td aria-rowspan="1">Cell 1</td>
-							<td>Cell 2</td>
-						</tr>
-					</table>
-				</div>
-
-				<p><strong>Expected result:</strong>
-				<br> no warning/error</p>
+				Edit: removed test.
 			</div>
 
 			<div class="widgetDemo">