From e587cedac2b73aeadb0fc29a511e8ff2dd5659e6 Mon Sep 17 00:00:00 2001
From: Tiem Song <tiem@google.com>
Date: Wed, 6 May 2020 13:24:47 -0700
Subject: Remove deprecated devsite-heading tag

Bug: 154722067
Test: ./gradlew :core:test
Change-Id: Id330fb0fb802c91020b345ed6aa50e3a39707e3a
---
 core/src/main/kotlin/Formats/DacHtmlFormat.kt      | 26 +++-------------------
 .../format/dac/deprecation/dac-as-java/Bar.html    | 12 ++--------
 .../dac/deprecation/dac-as-java/DeprecatedBar.html |  6 +----
 .../dac/deprecation/dac-as-java/DeprecatedFoo.html |  6 +----
 .../format/dac/deprecation/dac-as-java/Foo.html    | 12 ++--------
 core/testdata/format/dac/deprecation/dac/Bar.html  | 12 ++--------
 .../format/dac/deprecation/dac/DeprecatedBar.html  |  6 +----
 .../format/dac/deprecation/dac/DeprecatedFoo.html  |  6 +----
 core/testdata/format/dac/deprecation/dac/Foo.html  | 12 ++--------
 .../dac/inheritedMethods/dac-as-java/Child.html    | 12 ++--------
 .../dac/inheritedMethods/dac-as-java/Parent.html   | 12 ++--------
 .../format/dac/inheritedMethods/dac/Child.html     | 18 +++------------
 .../format/dac/inheritedMethods/dac/Parent.html    | 12 ++--------
 .../format/dac/javaClassLinks/dac-as-java/Bar.html | 12 ++--------
 .../format/dac/javaClassLinks/dac-as-java/Foo.html |  6 +----
 .../format/dac/javaClassLinks/dac/Bar.html         | 12 ++--------
 .../format/dac/javaClassLinks/dac/Foo.html         |  6 +----
 .../dac/javaConstructor/dac-as-java/Foo.html       |  6 +----
 .../format/dac/javaConstructor/dac/Foo.html        |  6 +----
 .../javaDefaultConstructor/dac-as-java/Foo.html    |  6 +----
 .../format/dac/javaDefaultConstructor/dac/Foo.html |  6 +----
 .../javaMethodVisibilities/dac-as-java/Foo.html    | 24 ++++----------------
 .../format/dac/javaMethodVisibilities/dac/Foo.html | 24 ++++----------------
 .../format/dac/javaSeeTag/dac-as-java/Bar.html     |  6 +----
 .../format/dac/javaSeeTag/dac-as-java/Foo.html     | 12 ++--------
 core/testdata/format/dac/javaSeeTag/dac/Bar.html   |  6 +----
 core/testdata/format/dac/javaSeeTag/dac/Foo.html   | 12 ++--------
 27 files changed, 48 insertions(+), 248 deletions(-)

(limited to 'core')

diff --git a/core/src/main/kotlin/Formats/DacHtmlFormat.kt b/core/src/main/kotlin/Formats/DacHtmlFormat.kt
index b767c7d6f..7038a7fbe 100644
--- a/core/src/main/kotlin/Formats/DacHtmlFormat.kt
+++ b/core/src/main/kotlin/Formats/DacHtmlFormat.kt
@@ -9,7 +9,6 @@ import org.jetbrains.dokka.Kotlin.ParameterInfoNode
 import org.jetbrains.dokka.Utilities.firstSentence
 import java.lang.Math.max
 import java.net.URI
-import java.util.Collections.emptyMap
 import kotlin.reflect.KClass
 
 /**
@@ -481,7 +480,7 @@ class DevsiteLayoutHtmlFormatOutputBuilder(
             id = summaryId
             tbody {
                 if (headerAsRow) {
-                    developerHeading(header, summaryId)
+                    developerHeading(header)
                 }
                 nodes.forEach { node ->
                     row(node)
@@ -919,25 +918,11 @@ class DevsiteLayoutHtmlFormatOutputBuilder(
     }
 }
 
-fun TBODY.developerHeading(
-    header: String,
-    summaryId: String? = null
-) {
+fun TBODY.developerHeading(header: String) {
     tr {
         th {
             attributes["colSpan"] = "2"
-            dheading {
-                attributes["ds-is"] = "heading"
-                attributes["text"] = header
-                attributes["id"] = summaryId ?: header.replace("\\s".toRegex(), "-").toLowerCase()
-                attributes["level"] = "h3"
-                attributes["toc"] = ""
-                attributes["class"] = ""
-                h3 {
-                    attributes["is-upgraded"] = ""
-                    +header
-                }
-            }
+            +header
         }
     }
 }
@@ -961,8 +946,3 @@ class DacAsJavaFormatDescriptor : JavaLayoutHtmlFormatDescriptorBase(), DefaultA
     override val packageListServiceClass: KClass<out PackageListService> = JavaLayoutHtmlPackageListService::class
     override val outputBuilderFactoryClass: KClass<out JavaLayoutHtmlFormatOutputBuilderFactory> = DevsiteLayoutHtmlFormatOutputBuilderFactoryImpl::class
 }
-
-fun FlowOrPhrasingContent.dheading(block : DHEADING.() -> Unit = {}) : Unit = DHEADING(consumer).visit(block)
-
-class DHEADING(consumer: TagConsumer<*>) :
-    HTMLTag("devsite-heading", consumer, emptyMap(), inlineTag = false, emptyTag = false), HtmlBlockTag
diff --git a/core/testdata/format/dac/deprecation/dac-as-java/Bar.html b/core/testdata/format/dac/deprecation/dac-as-java/Bar.html
index 483929564..d77fa9e64 100644
--- a/core/testdata/format/dac/deprecation/dac-as-java/Bar.html
+++ b/core/testdata/format/dac/deprecation/dac-as-java/Bar.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
@@ -34,11 +30,7 @@
     <table class="responsive" id="pubmethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public methods</th>
         </tr>
         <tr>
           <td><span class="keyword">final</span> <a href="DeprecatedBar.html#"><span class="identifier">DeprecatedBar</span></a></td>
diff --git a/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedBar.html b/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedBar.html
index 71da6a1e8..56283f6e5 100644
--- a/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedBar.html
+++ b/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedBar.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
diff --git a/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedFoo.html b/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedFoo.html
index 8cf0c575d..e7e2fecb0 100644
--- a/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedFoo.html
+++ b/core/testdata/format/dac/deprecation/dac-as-java/DeprecatedFoo.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
diff --git a/core/testdata/format/dac/deprecation/dac-as-java/Foo.html b/core/testdata/format/dac/deprecation/dac-as-java/Foo.html
index b07ac3cc9..c898800da 100644
--- a/core/testdata/format/dac/deprecation/dac-as-java/Foo.html
+++ b/core/testdata/format/dac/deprecation/dac-as-java/Foo.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
@@ -34,11 +30,7 @@
     <table class="responsive" id="pubmethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public methods</th>
         </tr>
         <tr>
           <td><span class="keyword">static</span> <a href="DeprecatedFoo.html#"><span class="identifier">DeprecatedFoo</span></a></td>
diff --git a/core/testdata/format/dac/deprecation/dac/Bar.html b/core/testdata/format/dac/deprecation/dac/Bar.html
index 8b3e6c3fc..f20112e16 100644
--- a/core/testdata/format/dac/deprecation/dac/Bar.html
+++ b/core/testdata/format/dac/deprecation/dac/Bar.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
@@ -34,11 +30,7 @@
     <table class="responsive" id="pubmethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public methods</th>
         </tr>
         <tr>
           <td><a href="DeprecatedBar.html#"><span class="identifier">DeprecatedBar</span></a></td>
diff --git a/core/testdata/format/dac/deprecation/dac/DeprecatedBar.html b/core/testdata/format/dac/deprecation/dac/DeprecatedBar.html
index 09758f061..15be9a06e 100644
--- a/core/testdata/format/dac/deprecation/dac/DeprecatedBar.html
+++ b/core/testdata/format/dac/deprecation/dac/DeprecatedBar.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
diff --git a/core/testdata/format/dac/deprecation/dac/DeprecatedFoo.html b/core/testdata/format/dac/deprecation/dac/DeprecatedFoo.html
index 16974894f..610c46b60 100644
--- a/core/testdata/format/dac/deprecation/dac/DeprecatedFoo.html
+++ b/core/testdata/format/dac/deprecation/dac/DeprecatedFoo.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
diff --git a/core/testdata/format/dac/deprecation/dac/Foo.html b/core/testdata/format/dac/deprecation/dac/Foo.html
index 7dcc84289..76c0760a0 100644
--- a/core/testdata/format/dac/deprecation/dac/Foo.html
+++ b/core/testdata/format/dac/deprecation/dac/Foo.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
@@ -34,11 +30,7 @@
     <table class="responsive" id="pubmethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public methods</th>
         </tr>
         <tr>
           <td><span class="keyword">open</span> <span class="keyword">static</span> <a href="DeprecatedFoo.html#"><span class="identifier">DeprecatedFoo</span></a><span class="symbol">!</span></td>
diff --git a/core/testdata/format/dac/inheritedMethods/dac-as-java/Child.html b/core/testdata/format/dac/inheritedMethods/dac-as-java/Child.html
index a66d0bf6c..67a58125a 100644
--- a/core/testdata/format/dac/inheritedMethods/dac-as-java/Child.html
+++ b/core/testdata/format/dac/inheritedMethods/dac-as-java/Child.html
@@ -21,11 +21,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
@@ -38,11 +34,7 @@
     <table class="responsive" id="pubmethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public methods</th>
         </tr>
         <tr>
           <td><span class="identifier">void</span></td>
diff --git a/core/testdata/format/dac/inheritedMethods/dac-as-java/Parent.html b/core/testdata/format/dac/inheritedMethods/dac-as-java/Parent.html
index 4efddeb30..dd305f7f8 100644
--- a/core/testdata/format/dac/inheritedMethods/dac-as-java/Parent.html
+++ b/core/testdata/format/dac/inheritedMethods/dac-as-java/Parent.html
@@ -38,11 +38,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
@@ -55,11 +51,7 @@
     <table class="responsive" id="pubmethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public methods</th>
         </tr>
         <tr>
           <td><span class="identifier">void</span></td>
diff --git a/core/testdata/format/dac/inheritedMethods/dac/Child.html b/core/testdata/format/dac/inheritedMethods/dac/Child.html
index 5da7f475d..dff52afbe 100644
--- a/core/testdata/format/dac/inheritedMethods/dac/Child.html
+++ b/core/testdata/format/dac/inheritedMethods/dac/Child.html
@@ -21,11 +21,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
@@ -38,11 +34,7 @@
     <table class="responsive" id="pubmethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public methods</th>
         </tr>
         <tr>
           <td><span class="keyword">open</span> <span class="identifier">Unit</span></td>
@@ -63,11 +55,7 @@
     <table class="responsive" id="inhmethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Inherited functions" id="inherited-functions" level="h3" toc="" class="">
-              <h3 is-upgraded="">Inherited functions</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Inherited functions</th>
         </tr>
         <tr class="api apilevel-">
           <td colSpan="2">
diff --git a/core/testdata/format/dac/inheritedMethods/dac/Parent.html b/core/testdata/format/dac/inheritedMethods/dac/Parent.html
index 0023368f0..ff9048b96 100644
--- a/core/testdata/format/dac/inheritedMethods/dac/Parent.html
+++ b/core/testdata/format/dac/inheritedMethods/dac/Parent.html
@@ -38,11 +38,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
@@ -55,11 +51,7 @@
     <table class="responsive" id="pubmethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public methods</th>
         </tr>
         <tr>
           <td><span class="keyword">open</span> <span class="identifier">Unit</span></td>
diff --git a/core/testdata/format/dac/javaClassLinks/dac-as-java/Bar.html b/core/testdata/format/dac/javaClassLinks/dac-as-java/Bar.html
index 3d247edb8..cbabc2920 100644
--- a/core/testdata/format/dac/javaClassLinks/dac-as-java/Bar.html
+++ b/core/testdata/format/dac/javaClassLinks/dac-as-java/Bar.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
@@ -34,11 +30,7 @@
     <table class="responsive" id="pubmethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public methods</th>
         </tr>
         <tr>
           <td><a href="Foo.html#"><span class="identifier">Foo</span></a></td>
diff --git a/core/testdata/format/dac/javaClassLinks/dac-as-java/Foo.html b/core/testdata/format/dac/javaClassLinks/dac-as-java/Foo.html
index 5717ecf6b..0ae4d255b 100644
--- a/core/testdata/format/dac/javaClassLinks/dac-as-java/Foo.html
+++ b/core/testdata/format/dac/javaClassLinks/dac-as-java/Foo.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
diff --git a/core/testdata/format/dac/javaClassLinks/dac/Bar.html b/core/testdata/format/dac/javaClassLinks/dac/Bar.html
index 0c0c36714..87f2c3adf 100644
--- a/core/testdata/format/dac/javaClassLinks/dac/Bar.html
+++ b/core/testdata/format/dac/javaClassLinks/dac/Bar.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
@@ -34,11 +30,7 @@
     <table class="responsive" id="pubmethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public methods</th>
         </tr>
         <tr>
           <td><span class="keyword">open</span> <a href="Foo.html#"><span class="identifier">Foo</span></a><span class="symbol">!</span></td>
diff --git a/core/testdata/format/dac/javaClassLinks/dac/Foo.html b/core/testdata/format/dac/javaClassLinks/dac/Foo.html
index dc7637b6a..51ba0204c 100644
--- a/core/testdata/format/dac/javaClassLinks/dac/Foo.html
+++ b/core/testdata/format/dac/javaClassLinks/dac/Foo.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
diff --git a/core/testdata/format/dac/javaConstructor/dac-as-java/Foo.html b/core/testdata/format/dac/javaConstructor/dac-as-java/Foo.html
index 5717ecf6b..0ae4d255b 100644
--- a/core/testdata/format/dac/javaConstructor/dac-as-java/Foo.html
+++ b/core/testdata/format/dac/javaConstructor/dac-as-java/Foo.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
diff --git a/core/testdata/format/dac/javaConstructor/dac/Foo.html b/core/testdata/format/dac/javaConstructor/dac/Foo.html
index dc7637b6a..51ba0204c 100644
--- a/core/testdata/format/dac/javaConstructor/dac/Foo.html
+++ b/core/testdata/format/dac/javaConstructor/dac/Foo.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
diff --git a/core/testdata/format/dac/javaDefaultConstructor/dac-as-java/Foo.html b/core/testdata/format/dac/javaDefaultConstructor/dac-as-java/Foo.html
index 5717ecf6b..0ae4d255b 100644
--- a/core/testdata/format/dac/javaDefaultConstructor/dac-as-java/Foo.html
+++ b/core/testdata/format/dac/javaDefaultConstructor/dac-as-java/Foo.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
diff --git a/core/testdata/format/dac/javaDefaultConstructor/dac/Foo.html b/core/testdata/format/dac/javaDefaultConstructor/dac/Foo.html
index dc7637b6a..51ba0204c 100644
--- a/core/testdata/format/dac/javaDefaultConstructor/dac/Foo.html
+++ b/core/testdata/format/dac/javaDefaultConstructor/dac/Foo.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
diff --git a/core/testdata/format/dac/javaMethodVisibilities/dac-as-java/Foo.html b/core/testdata/format/dac/javaMethodVisibilities/dac-as-java/Foo.html
index 7f494c467..1ed04c547 100644
--- a/core/testdata/format/dac/javaMethodVisibilities/dac-as-java/Foo.html
+++ b/core/testdata/format/dac/javaMethodVisibilities/dac-as-java/Foo.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
@@ -34,11 +30,7 @@
     <table class="responsive" id="pubmethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public methods</th>
         </tr>
         <tr>
           <td><span class="identifier">void</span></td>
@@ -52,11 +44,7 @@
     <table class="responsive" id="promethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Protected methods" id="promethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Protected methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Protected methods</th>
         </tr>
         <tr>
           <td><span class="identifier">void</span></td>
@@ -70,11 +58,7 @@
     <table class="responsive" id="primethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Private methods" id="primethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Private methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Private methods</th>
         </tr>
         <tr>
           <td><span class="identifier">void</span></td>
diff --git a/core/testdata/format/dac/javaMethodVisibilities/dac/Foo.html b/core/testdata/format/dac/javaMethodVisibilities/dac/Foo.html
index 3f1e45107..0bcdcae90 100644
--- a/core/testdata/format/dac/javaMethodVisibilities/dac/Foo.html
+++ b/core/testdata/format/dac/javaMethodVisibilities/dac/Foo.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
@@ -34,11 +30,7 @@
     <table class="responsive" id="pubmethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public methods</th>
         </tr>
         <tr>
           <td><span class="keyword">open</span> <span class="identifier">Unit</span></td>
@@ -52,11 +44,7 @@
     <table class="responsive" id="promethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Protected methods" id="promethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Protected methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Protected methods</th>
         </tr>
         <tr>
           <td><span class="keyword">open</span> <span class="identifier">Unit</span></td>
@@ -70,11 +58,7 @@
     <table class="responsive" id="primethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Private methods" id="primethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Private methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Private methods</th>
         </tr>
         <tr>
           <td><span class="keyword">open</span> <span class="identifier">Unit</span></td>
diff --git a/core/testdata/format/dac/javaSeeTag/dac-as-java/Bar.html b/core/testdata/format/dac/javaSeeTag/dac-as-java/Bar.html
index 663d14727..6b4d75f4a 100644
--- a/core/testdata/format/dac/javaSeeTag/dac-as-java/Bar.html
+++ b/core/testdata/format/dac/javaSeeTag/dac-as-java/Bar.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
diff --git a/core/testdata/format/dac/javaSeeTag/dac-as-java/Foo.html b/core/testdata/format/dac/javaSeeTag/dac-as-java/Foo.html
index 6a6b5045c..b9f23dc59 100644
--- a/core/testdata/format/dac/javaSeeTag/dac-as-java/Foo.html
+++ b/core/testdata/format/dac/javaSeeTag/dac-as-java/Foo.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
@@ -34,11 +30,7 @@
     <table class="responsive" id="pubmethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public methods</th>
         </tr>
         <tr>
           <td><span class="identifier">void</span></td>
diff --git a/core/testdata/format/dac/javaSeeTag/dac/Bar.html b/core/testdata/format/dac/javaSeeTag/dac/Bar.html
index c49e6d808..10a5f59ed 100644
--- a/core/testdata/format/dac/javaSeeTag/dac/Bar.html
+++ b/core/testdata/format/dac/javaSeeTag/dac/Bar.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
diff --git a/core/testdata/format/dac/javaSeeTag/dac/Foo.html b/core/testdata/format/dac/javaSeeTag/dac/Foo.html
index 14a913c99..7ca410c06 100644
--- a/core/testdata/format/dac/javaSeeTag/dac/Foo.html
+++ b/core/testdata/format/dac/javaSeeTag/dac/Foo.html
@@ -17,11 +17,7 @@
     <table class="responsive" id="pubctors">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public constructors" id="pubctors" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public constructors</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public constructors</th>
         </tr>
         <tr>
           <td>
@@ -34,11 +30,7 @@
     <table class="responsive" id="pubmethods">
       <tbody>
         <tr>
-          <th colSpan="2">
-            <devsite-heading ds-is="heading" text="Public methods" id="pubmethods" level="h3" toc="" class="">
-              <h3 is-upgraded="">Public methods</h3>
-            </devsite-heading>
-          </th>
+          <th colSpan="2">Public methods</th>
         </tr>
         <tr>
           <td><span class="keyword">open</span> <span class="identifier">Unit</span></td>
-- 
cgit v1.2.3