Fix description of samp and add strike tag

Author: MarcinAman

api/kotlinx-html.api

@@ -53,7 +53,7 @@ fun humanizeJoin(parts: Iterable<String>, separator: String): String {
         filteredParts.add(cutPart)
     }
 
-    return filteredParts.joinToString(separator = separator, transform = String::capitalize) + trailingParts.joinToString("", transform = String::capitalize)
+    return filteredParts.joinToString(separator = separator) { it.capitalize() } + trailingParts.joinToString("") { it.capitalize() }
 }
 
 private fun String.replaceMistakesAndUglyWords() : String =

buildSrc/src/main/kotlin/kotlinx/html/generate/humanizer.kt

@@ -317,6 +317,7 @@
 
             <xsd:element ref="var"/>
             <xsd:element ref="video"/>
+            <xsd:element ref="s"/>
 
         </xsd:choice>
     </xsd:group>
@@ -842,6 +843,7 @@
     <xsd:element name="main" type="simplePhrasingContentElement"/>
     <xsd:element name="mark" type="simplePhrasingContentElement"/>
     <xsd:element name="math" type="simplePhrasingContentElement"/>
+    <xsd:element name="s" type="simplePhrasingContentElement"/>
 
     <xsd:element name="progress">
         <xsd:complexType mixed="true">

buildSrc/src/main/resources/html_5.xsd

@@ -545,7 +545,7 @@
 />
 <tag name        = "samp"
      helpref     = "struct/text.html#edef-SAMP"
-     description = "strike-through text style"
+     description = "computer output text style"
      startTag    = "true"
      endTag      = "true"
      empty       = "false"

buildSrc/src/main/resources/htmltable.xml

@@ -530,6 +530,12 @@ inline fun <T, C : TagConsumer<T>> C.ruby(classes : String? = null, crossinline
  * Strike-through text style
  */
 @HtmlTagMarker
+inline fun <T, C : TagConsumer<T>> C.s(classes : String? = null, crossinline block : S.() -> Unit = {}) : T = S(attributesMapOf("class", classes), this).visitAndFinalize(this, block)
+
+/**
+ * Computer output text style
+ */
+@HtmlTagMarker
 inline fun <T, C : TagConsumer<T>> C.samp(classes : String? = null, crossinline block : SAMP.() -> Unit = {}) : T = SAMP(attributesMapOf("class", classes), this).visitAndFinalize(this, block)
 
 @Deprecated("This tag doesn't support content or requires unsafe (try unsafe {})")

src/commonMain/kotlin/generated/gen-consumer-tags.kt

@@ -154,6 +154,12 @@ inline fun FlowContent.u(classes : String? = null, crossinline block : U.() -> U
 @HtmlTagMarker
 inline fun FlowContent.ul(classes : String? = null, crossinline block : UL.() -> Unit = {}) : Unit = UL(attributesMapOf("class", classes), consumer).visit(block)
 
+/**
+ * Strike-through text style
+ */
+@HtmlTagMarker
+inline fun FlowContent.s(classes : String? = null, crossinline block : S.() -> Unit = {}) : Unit = S(attributesMapOf("class", classes), consumer).visit(block)
+
 /**
  * Document base URI
  */

src/commonMain/kotlin/generated/gen-tag-groups.kt

@@ -299,7 +299,7 @@ inline fun FlowOrPhrasingContent.q(classes : String? = null, crossinline block :
 inline fun FlowOrPhrasingContent.ruby(classes : String? = null, crossinline block : RUBY.() -> Unit = {}) : Unit = RUBY(attributesMapOf("class", classes), consumer).visit(block)
 
 /**
- * Strike-through text style
+ * Computer output text style
  */
 @HtmlTagMarker
 inline fun FlowOrPhrasingContent.samp(classes : String? = null, crossinline block : SAMP.() -> Unit = {}) : Unit = SAMP(attributesMapOf("class", classes), consumer).visit(block)

src/commonMain/kotlin/generated/gen-tag-unions.kt

@@ -9,6 +9,17 @@ import kotlinx.html.attributes.*
     This file was generated by module generate
 *******************************************************************************/
 
+@Suppress("unused")
+open class S(initialAttributes : Map<String, String>, override val consumer : TagConsumer<*>) : HTMLTag("s", consumer, initialAttributes, null, false, false), HtmlBlockInlineTag {
+
+}
+val S.asFlowContent : FlowContent
+    get()  = this
+
+val S.asPhrasingContent : PhrasingContent
+    get()  = this
+
+
 @Suppress("unused")
 open class SAMP(initialAttributes : Map<String, String>, override val consumer : TagConsumer<*>) : HTMLTag("samp", consumer, initialAttributes, null, true, false), HtmlBlockInlineTag {
 

src/commonMain/kotlin/generated/gen-tags-s.kt

@@ -531,6 +531,12 @@ public inline fun TagConsumer<HTMLElement>.ruby(classes : String? = null, crossi
  * Strike-through text style
  */
 @HtmlTagMarker
+public inline fun TagConsumer<HTMLElement>.s(classes : String? = null, crossinline block : S.() -> Unit = {}) : HTMLElement = S(attributesMapOf("class", classes), this).visitAndFinalize(this, block)
+
+/**
+ * Computer output text style
+ */
+@HtmlTagMarker
 public inline fun TagConsumer<HTMLElement>.samp(classes : String? = null, crossinline block : SAMP.() -> Unit = {}) : HTMLElement = SAMP(attributesMapOf("class", classes), this).visitAndFinalize(this, block)
 
 @Deprecated("This tag doesn't support content or requires unsafe (try unsafe {})")