From be3b608da629122fc7cd2f7d40e3b2460c39a60f Mon Sep 17 00:00:00 2001 From: kigawa Date: Fri, 15 Aug 2025 00:43:15 +0900 Subject: [PATCH 1/5] refactor: replace `Union` with `Integration` types, clean up unused imports, and adjust `SampleComponent` structure --- ...mbeddedFlowInteractivePalpablePhrasingUnionContent.kt | 9 --------- .../native/EmbeddedFlowPalpablePhrasingUnionContent.kt | 9 --------- .../renlin/w3c/category/native/FlowContentUnion.kt | 8 -------- .../w3c/category/native/FlowContentUnionContent.kt | 9 --------- ...mAssociatedInteractivePalpablePhrasingUnionContent.kt | 9 --------- .../FlowFormAssociatedPalpablePhrasingUnionContent.kt | 9 --------- .../category/native/FlowHeadingPalpableUnionContent.kt | 9 --------- .../w3c/category/native/FlowHeadingUnionContent.kt | 9 --------- .../FlowInteractivePalpablePhrasingUnionContent.kt | 9 --------- .../native/FlowInteractivePalpableUnionContent.kt | 9 --------- .../FlowMetadataPhrasingScriptSupportingUnionContent.kt | 9 --------- .../category/native/FlowMetadataPhrasingUnionContent.kt | 9 --------- .../category/native/FlowPalpablePhrasingUnionContent.kt | 9 --------- .../native/FlowPalpableSectioningUnionContent.kt | 9 --------- .../w3c/category/native/FlowPalpableUnionContent.kt | 9 --------- .../w3c/category/native/FlowPhrasingUnionContent.kt | 9 --------- .../renlin/w3c/category/native/MetadataContentUnion.kt | 8 -------- .../w3c/category/native/MetadataContentUnionContent.kt | 9 --------- 18 files changed, 160 deletions(-) delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowInteractivePalpablePhrasingUnionContent.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowPalpablePhrasingUnionContent.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowContentUnion.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowContentUnionContent.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowFormAssociatedInteractivePalpablePhrasingUnionContent.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowFormAssociatedPalpablePhrasingUnionContent.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowHeadingPalpableUnionContent.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowHeadingUnionContent.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowInteractivePalpablePhrasingUnionContent.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowInteractivePalpableUnionContent.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetadataPhrasingScriptSupportingUnionContent.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetadataPhrasingUnionContent.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpablePhrasingUnionContent.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableSectioningUnionContent.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableUnionContent.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPhrasingUnionContent.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MetadataContentUnion.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MetadataContentUnionContent.kt diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowInteractivePalpablePhrasingUnionContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowInteractivePalpablePhrasingUnionContent.kt deleted file mode 100644 index a88c95f..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowInteractivePalpablePhrasingUnionContent.kt +++ /dev/null @@ -1,9 +0,0 @@ -package net.kigawa.renlin.w3c.category.union - -import net.kigawa.renlin.w3c.category.ContentCategory - - -/** - * Union to - */ -interface EmbeddedFlowInteractivePalpablePhrasingUnionContent : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowPalpablePhrasingUnionContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowPalpablePhrasingUnionContent.kt deleted file mode 100644 index 887ad00..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowPalpablePhrasingUnionContent.kt +++ /dev/null @@ -1,9 +0,0 @@ -package net.kigawa.renlin.w3c.category.union - -import net.kigawa.renlin.w3c.category.ContentCategory - - -/** - * Union to - */ -interface EmbeddedFlowPalpablePhrasingUnionContent : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowContentUnion.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowContentUnion.kt deleted file mode 100644 index ea5aec5..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowContentUnion.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.union - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Union of FlowContent - */ -sealed interface FlowContentUnion: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowContentUnionContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowContentUnionContent.kt deleted file mode 100644 index ae72421..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowContentUnionContent.kt +++ /dev/null @@ -1,9 +0,0 @@ -package net.kigawa.renlin.w3c.category.union - -import net.kigawa.renlin.w3c.category.ContentCategory - - -/** - * Union to - */ -interface FlowContentUnionContent : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowFormAssociatedInteractivePalpablePhrasingUnionContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowFormAssociatedInteractivePalpablePhrasingUnionContent.kt deleted file mode 100644 index b5c4294..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowFormAssociatedInteractivePalpablePhrasingUnionContent.kt +++ /dev/null @@ -1,9 +0,0 @@ -package net.kigawa.renlin.w3c.category.union - -import net.kigawa.renlin.w3c.category.ContentCategory - - -/** - * Union to - */ -interface FlowFormAssociatedInteractivePalpablePhrasingUnionContent : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowFormAssociatedPalpablePhrasingUnionContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowFormAssociatedPalpablePhrasingUnionContent.kt deleted file mode 100644 index 38be87d..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowFormAssociatedPalpablePhrasingUnionContent.kt +++ /dev/null @@ -1,9 +0,0 @@ -package net.kigawa.renlin.w3c.category.union - -import net.kigawa.renlin.w3c.category.ContentCategory - - -/** - * Union to - */ -interface FlowFormAssociatedPalpablePhrasingUnionContent : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowHeadingPalpableUnionContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowHeadingPalpableUnionContent.kt deleted file mode 100644 index 0c36a3b..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowHeadingPalpableUnionContent.kt +++ /dev/null @@ -1,9 +0,0 @@ -package net.kigawa.renlin.w3c.category.union - -import net.kigawa.renlin.w3c.category.ContentCategory - - -/** - * Union to - */ -interface FlowHeadingPalpableUnionContent : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowHeadingUnionContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowHeadingUnionContent.kt deleted file mode 100644 index 7ba0d4f..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowHeadingUnionContent.kt +++ /dev/null @@ -1,9 +0,0 @@ -package net.kigawa.renlin.w3c.category.union - -import net.kigawa.renlin.w3c.category.ContentCategory - - -/** - * Union to - */ -interface FlowHeadingUnionContent : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowInteractivePalpablePhrasingUnionContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowInteractivePalpablePhrasingUnionContent.kt deleted file mode 100644 index 766b71a..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowInteractivePalpablePhrasingUnionContent.kt +++ /dev/null @@ -1,9 +0,0 @@ -package net.kigawa.renlin.w3c.category.union - -import net.kigawa.renlin.w3c.category.ContentCategory - - -/** - * Union to - */ -interface FlowInteractivePalpablePhrasingUnionContent : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowInteractivePalpableUnionContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowInteractivePalpableUnionContent.kt deleted file mode 100644 index b5a8f7a..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowInteractivePalpableUnionContent.kt +++ /dev/null @@ -1,9 +0,0 @@ -package net.kigawa.renlin.w3c.category.union - -import net.kigawa.renlin.w3c.category.ContentCategory - - -/** - * Union to - */ -interface FlowInteractivePalpableUnionContent : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetadataPhrasingScriptSupportingUnionContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetadataPhrasingScriptSupportingUnionContent.kt deleted file mode 100644 index 7c65f3c..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetadataPhrasingScriptSupportingUnionContent.kt +++ /dev/null @@ -1,9 +0,0 @@ -package net.kigawa.renlin.w3c.category.union - -import net.kigawa.renlin.w3c.category.ContentCategory - - -/** - * Union to - */ -interface FlowMetadataPhrasingScriptSupportingUnionContent : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetadataPhrasingUnionContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetadataPhrasingUnionContent.kt deleted file mode 100644 index 0b85678..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetadataPhrasingUnionContent.kt +++ /dev/null @@ -1,9 +0,0 @@ -package net.kigawa.renlin.w3c.category.union - -import net.kigawa.renlin.w3c.category.ContentCategory - - -/** - * Union to - */ -interface FlowMetadataPhrasingUnionContent : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpablePhrasingUnionContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpablePhrasingUnionContent.kt deleted file mode 100644 index 9f3d91a..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpablePhrasingUnionContent.kt +++ /dev/null @@ -1,9 +0,0 @@ -package net.kigawa.renlin.w3c.category.union - -import net.kigawa.renlin.w3c.category.ContentCategory - - -/** - * Union to - */ -interface FlowPalpablePhrasingUnionContent : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableSectioningUnionContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableSectioningUnionContent.kt deleted file mode 100644 index 7e18ce5..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableSectioningUnionContent.kt +++ /dev/null @@ -1,9 +0,0 @@ -package net.kigawa.renlin.w3c.category.union - -import net.kigawa.renlin.w3c.category.ContentCategory - - -/** - * Union to - */ -interface FlowPalpableSectioningUnionContent : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableUnionContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableUnionContent.kt deleted file mode 100644 index 654a55d..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableUnionContent.kt +++ /dev/null @@ -1,9 +0,0 @@ -package net.kigawa.renlin.w3c.category.union - -import net.kigawa.renlin.w3c.category.ContentCategory - - -/** - * Union to - */ -interface FlowPalpableUnionContent : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPhrasingUnionContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPhrasingUnionContent.kt deleted file mode 100644 index 8ae905b..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPhrasingUnionContent.kt +++ /dev/null @@ -1,9 +0,0 @@ -package net.kigawa.renlin.w3c.category.union - -import net.kigawa.renlin.w3c.category.ContentCategory - - -/** - * Union to - */ -interface FlowPhrasingUnionContent : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MetadataContentUnion.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MetadataContentUnion.kt deleted file mode 100644 index d750309..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MetadataContentUnion.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.union - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Union of MetadataContent - */ -sealed interface MetadataContentUnion: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MetadataContentUnionContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MetadataContentUnionContent.kt deleted file mode 100644 index 4134782..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MetadataContentUnionContent.kt +++ /dev/null @@ -1,9 +0,0 @@ -package net.kigawa.renlin.w3c.category.union - -import net.kigawa.renlin.w3c.category.ContentCategory - - -/** - * Union to - */ -interface MetadataContentUnionContent : ContentCategory \ No newline at end of file From 4f90fa6057a5ce48fbe2bc4e7d996af23d30920d Mon Sep 17 00:00:00 2001 From: kigawa Date: Fri, 15 Aug 2025 03:00:26 +0900 Subject: [PATCH 2/5] refactor: refine `componentInternal` functions, add `argComponent` for multi-argument DSL support, and implement `href` attribute --- .../net/kigawa/renlin/component/Func.kt | 266 ++++++++++-------- .../net/kigawa/renlin/state/DslStateData.kt | 2 + .../kigawa/renlin/w3c/attribute/attribute.kt | 39 +++ .../kigawa/renlin/w3c/attribute/value/Href.kt | 5 + .../renlin/w3c/element/TagNodeCommon.kt | 6 + .../renlin/w3c/element/DomTagElement.kt | 12 + .../kigawa/renlin/sample/SampleComponent.kt | 11 +- .../kotlin/net/kigawa/renlin/sample/Sub.kt | 8 +- 8 files changed, 222 insertions(+), 127 deletions(-) create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/attribute/attribute.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/attribute/value/Href.kt diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/Func.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/Func.kt index 61a960f..03b17f5 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/Func.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/Func.kt @@ -11,153 +11,175 @@ import kotlin.uuid.ExperimentalUuidApi import kotlin.uuid.Uuid fun KClass.component( - block: StatedDsl.() -> Unit, -) = net.kigawa.renlin.component.component(block) + block: StatedDsl.() -> Unit, +) = net.kigawa.renlin.component.componentInternal(block) fun > Component.component( - block: StatedDsl.() -> Unit, -) = net.kigawa.renlin.component.component(block) + block: StatedDsl.() -> Unit, +) = net.kigawa.renlin.component.componentInternal(block) -fun component( - block: StatedDsl.() -> Unit, + +fun , ARG1> Component.argComponent( + block: StatedDsl.(ARG1) -> Unit, +) = componentInternal(block) + +fun , ARG1, ARG2> Component.argComponent( + block: StatedDsl.(ARG1, ARG2) -> Unit, +) = componentInternal(block) + +fun , ARG1, ARG2, ARG3> Component.argComponent( + block: StatedDsl.(ARG1, ARG2, ARG3) -> Unit, +) = componentInternal(block) + +fun , ARG1, ARG2, ARG3, ARG4> Component.argComponent( + block: StatedDsl.(ARG1, ARG2, ARG3, ARG4) -> Unit, +) = componentInternal(block) + + +private fun componentInternal( + block: StatedDsl.() -> Unit, ): Component0, in CONTENT_CATEGORY> { - println("component start $block") - return object: Component0, CONTENT_CATEGORY> { - override fun render( - parentDsl: StatedDsl, - key: String?, - ) { - println("component") - @OptIn(ExperimentalUuidApi::class) - val nonNullKey = key ?: Uuid.random().toString() - val state = parentDsl.dslState.getOrCreateSubDslState(nonNullKey, this) - // Create a concrete implementation of DslBase instead of using delegation - val newDsl = object: DslBase(state) { - override fun applyElement(element: TagNode): () -> Unit { - return parentDsl.applyElement(element) + println("component start $block") + return object: Component0, CONTENT_CATEGORY> { + override fun render( + parentDsl: StatedDsl, + key: String?, + ) { + println("component") + @OptIn(ExperimentalUuidApi::class) + val nonNullKey = key ?: Uuid.random().toString() + val state = parentDsl.dslState.getOrCreateSubDslState(nonNullKey, this) + // Create a concrete implementation of DslBase instead of using delegation + val newDsl = object: DslBase(state) { + override fun applyElement(element: TagNode): () -> Unit { + return parentDsl.applyElement(element) + } + } + println("component newDsl") + newDsl.block() + println("component end") + parentDsl.registerSubDsl( + RegisteredDslData( + newDsl, + this, + { render(parentDsl, key) }, + nonNullKey + ) + ) } - } - println("component newDsl") - newDsl.block() - println("component end") - parentDsl.registerSubDsl( - RegisteredDslData( - newDsl, - this, - { render(parentDsl, key) }, - nonNullKey - ) - ) } - } } -fun component( - block: StatedDsl.(ARG1) -> Unit, +private fun componentInternal( + block: StatedDsl.(ARG1) -> Unit, ): Component1, CONTENT_CATEGORY, ARG1> { - return object: Component1, CONTENT_CATEGORY, ARG1> { - override fun render(parentDsl: StatedDsl, arg1: ARG1, key: String?) { - @OptIn(ExperimentalUuidApi::class) - val nonNullKey = key ?: Uuid.random().toString() - val state = parentDsl.dslState.getOrCreateSubDslState(nonNullKey, this) - // Create a concrete implementation of DslBase instead of using delegation - val newDsl = object: DslBase(state) { - override fun applyElement(element: TagNode): () -> Unit { - return parentDsl.applyElement(element) + return object: Component1, CONTENT_CATEGORY, ARG1> { + override fun render(parentDsl: StatedDsl, arg1: ARG1, key: String?) { + @OptIn(ExperimentalUuidApi::class) + val nonNullKey = key ?: Uuid.random().toString() + val state = parentDsl.dslState.getOrCreateSubDslState(nonNullKey, this) + // Create a concrete implementation of DslBase instead of using delegation + val newDsl = object: DslBase(state) { + override fun applyElement(element: TagNode): () -> Unit { + return parentDsl.applyElement(element) + } + } + newDsl.block(arg1) + parentDsl.registerSubDsl( + RegisteredDslData( + newDsl, + this, + { render(parentDsl, arg1, key) }, + nonNullKey + ) + ) } - } - newDsl.block(arg1) - parentDsl.registerSubDsl( - RegisteredDslData( - newDsl, - this, - { render(parentDsl, arg1, key) }, - nonNullKey - ) - ) } - } } -fun component( - block: StatedDsl.(ARG1, ARG2) -> Unit, +private fun componentInternal( + block: StatedDsl.(ARG1, ARG2) -> Unit, ): Component2, CONTENT_CATEGORY, ARG1, ARG2> { - return object: Component2, CONTENT_CATEGORY, ARG1, ARG2> { - override fun render(parentDsl: StatedDsl, arg1: ARG1, arg2: ARG2, key: String?) { - @OptIn(ExperimentalUuidApi::class) - val nonNullKey = key ?: Uuid.random().toString() - val state = parentDsl.dslState.getOrCreateSubDslState(nonNullKey, this) - // Create a concrete implementation of DslBase instead of using delegation - val newDsl = object: DslBase(state) { - override fun applyElement(element: TagNode): () -> Unit { - return parentDsl.applyElement(element) + return object: Component2, CONTENT_CATEGORY, ARG1, ARG2> { + override fun render(parentDsl: StatedDsl, arg1: ARG1, arg2: ARG2, key: String?) { + @OptIn(ExperimentalUuidApi::class) + val nonNullKey = key ?: Uuid.random().toString() + val state = parentDsl.dslState.getOrCreateSubDslState(nonNullKey, this) + // Create a concrete implementation of DslBase instead of using delegation + val newDsl = object: DslBase(state) { + override fun applyElement(element: TagNode): () -> Unit { + return parentDsl.applyElement(element) + } + } + newDsl.block(arg1, arg2) + parentDsl.registerSubDsl( + RegisteredDslData( + newDsl, + this, + { render(parentDsl, arg1, arg2, key) }, + nonNullKey + ) + ) } - } - newDsl.block(arg1, arg2) - parentDsl.registerSubDsl( - RegisteredDslData( - newDsl, - this, - { render(parentDsl, arg1, arg2, key) }, - nonNullKey - ) - ) } - } } -fun component( - block: StatedDsl.(ARG1, ARG2, ARG3) -> Unit, +private fun componentInternal( + block: StatedDsl.(ARG1, ARG2, ARG3) -> Unit, ): Component3, CONTENT_CATEGORY, ARG1, ARG2, ARG3> { - return object: Component3, CONTENT_CATEGORY, ARG1, ARG2, ARG3> { - override fun render(parentDsl: StatedDsl, arg1: ARG1, arg2: ARG2, arg3: ARG3, key: String?) { - @OptIn(ExperimentalUuidApi::class) - val nonNullKey = key ?: Uuid.random().toString() - val state = parentDsl.dslState.getOrCreateSubDslState(nonNullKey, this) - // Create a concrete implementation of DslBase instead of using delegation - val newDsl = object: DslBase(state) { - override fun applyElement(element: TagNode): () -> Unit { - return parentDsl.applyElement(element) + return object: Component3, CONTENT_CATEGORY, ARG1, ARG2, ARG3> { + override fun render( + parentDsl: StatedDsl, arg1: ARG1, arg2: ARG2, arg3: ARG3, key: String?, + ) { + @OptIn(ExperimentalUuidApi::class) + val nonNullKey = key ?: Uuid.random().toString() + val state = parentDsl.dslState.getOrCreateSubDslState(nonNullKey, this) + // Create a concrete implementation of DslBase instead of using delegation + val newDsl = object: DslBase(state) { + override fun applyElement(element: TagNode): () -> Unit { + return parentDsl.applyElement(element) + } + } + newDsl.block(arg1, arg2, arg3) + parentDsl.registerSubDsl( + RegisteredDslData( + newDsl, + this, + { render(parentDsl, arg1, arg2, arg3, key) }, + nonNullKey + ) + ) } - } - newDsl.block(arg1, arg2, arg3) - parentDsl.registerSubDsl( - RegisteredDslData( - newDsl, - this, - { render(parentDsl, arg1, arg2, arg3, key) }, - nonNullKey - ) - ) } - } } -fun component( - block: StatedDsl.(ARG1, ARG2, ARG3, ARG4) -> Unit, +private fun componentInternal( + block: StatedDsl.(ARG1, ARG2, ARG3, ARG4) -> Unit, ): Component4, CONTENT_CATEGORY, ARG1, ARG2, ARG3, ARG4> { - return object: Component4, CONTENT_CATEGORY, ARG1, ARG2, ARG3, ARG4> { - override fun render(parentDsl: StatedDsl, arg1: ARG1, arg2: ARG2, arg3: ARG3, arg4: ARG4, key: String?) { - @OptIn(ExperimentalUuidApi::class) - val nonNullKey = key ?: Uuid.random().toString() - val state = parentDsl.dslState.getOrCreateSubDslState(nonNullKey, this) - // Create a concrete implementation of DslBase instead of using delegation - val newDsl = object: DslBase(state) { - override fun applyElement(element: TagNode): () -> Unit { - return parentDsl.applyElement(element) + return object: Component4, CONTENT_CATEGORY, ARG1, ARG2, ARG3, ARG4> { + override fun render( + parentDsl: StatedDsl, arg1: ARG1, arg2: ARG2, arg3: ARG3, arg4: ARG4, key: String?, + ) { + @OptIn(ExperimentalUuidApi::class) + val nonNullKey = key ?: Uuid.random().toString() + val state = parentDsl.dslState.getOrCreateSubDslState(nonNullKey, this) + // Create a concrete implementation of DslBase instead of using delegation + val newDsl = object: DslBase(state) { + override fun applyElement(element: TagNode): () -> Unit { + return parentDsl.applyElement(element) + } + } + newDsl.block(arg1, arg2, arg3, arg4) + parentDsl.registerSubDsl( + RegisteredDslData( + newDsl, + this, + { render(parentDsl, arg1, arg2, arg3, arg4, key) }, + nonNullKey + ) + ) } - } - newDsl.block(arg1, arg2, arg3, arg4) - parentDsl.registerSubDsl( - RegisteredDslData( - newDsl, - this, - { render(parentDsl, arg1, arg2, arg3, arg4, key) }, - nonNullKey - ) - ) } - } } diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/state/DslStateData.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/state/DslStateData.kt index 8d348f4..e64684f 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/state/DslStateData.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/state/DslStateData.kt @@ -23,6 +23,8 @@ data class DslStateData( val key: String, /** クリックイベントのハンドラー */ var onClick: ((WebPointerEvent) -> Unit)? = null, + /** href属性の値 */ + var href: String? = null, /** * 追加データのリスト * diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/attribute/attribute.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/attribute/attribute.kt new file mode 100644 index 0000000..ee0b250 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/attribute/attribute.kt @@ -0,0 +1,39 @@ +package net.kigawa.renlin.w3c.attribute + +import net.kigawa.renlin.tag.ADsl +import net.kigawa.renlin.tag.LinkDsl +import net.kigawa.renlin.tag.BaseDsl +import net.kigawa.renlin.tag.AreaDsl +import net.kigawa.renlin.w3c.attribute.value.Href + +var ADsl.href: Href + get() { + return Href(dslStateData?.href ?: "") + } + set(value) { + dslStateData?.href = value.url + } + +var LinkDsl.href: Href + get() { + return Href(dslStateData?.href ?: "") + } + set(value) { + dslStateData?.href = value.url + } + +var BaseDsl.href: Href + get() { + return Href(dslStateData?.href ?: "") + } + set(value) { + dslStateData?.href = value.url + } + +var AreaDsl.href: Href + get() { + return Href(dslStateData?.href ?: "") + } + set(value) { + dslStateData?.href = value.url + } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/attribute/value/Href.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/attribute/value/Href.kt new file mode 100644 index 0000000..1234534 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/attribute/value/Href.kt @@ -0,0 +1,5 @@ +package net.kigawa.renlin.w3c.attribute.value + +class Href(val url: String = "") { + override fun toString(): String = url +} \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/element/TagNodeCommon.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/element/TagNodeCommon.kt index 020bd95..8249d01 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/element/TagNodeCommon.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/element/TagNodeCommon.kt @@ -19,10 +19,16 @@ interface TagNodeCommon { prevData?.getAdditionalData>(this::class) ?.forEach { removeEventListener(it) } if (dslStateData == null) return + + // Handle href attribute + dslStateData.href?.let { setAttribute("href", it) } + listOfNotNull( dslStateData.onClick?.let { addEventListener(EventNames.click, it) } ).let { dslStateData.setAdditionalData(this::class, it) } } fun setClassName(className: String) + fun setAttribute(name: String, value: String) + fun getAttribute(name: String): String? } \ No newline at end of file diff --git a/renlin/src/jsMain/kotlin/net/kigawa/renlin/w3c/element/DomTagElement.kt b/renlin/src/jsMain/kotlin/net/kigawa/renlin/w3c/element/DomTagElement.kt index d8b8304..15c9e67 100644 --- a/renlin/src/jsMain/kotlin/net/kigawa/renlin/w3c/element/DomTagElement.kt +++ b/renlin/src/jsMain/kotlin/net/kigawa/renlin/w3c/element/DomTagElement.kt @@ -70,4 +70,16 @@ class DomTagElement( node.className = newClasses.joinToString(" ") } } + + override fun setAttribute(name: String, value: String) { + if (node is Element) { + node.setAttribute(name, value) + } + } + + override fun getAttribute(name: String): String? { + return if (node is Element) { + node.getAttribute(name) + } else null + } } \ No newline at end of file diff --git a/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/SampleComponent.kt b/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/SampleComponent.kt index 2a01d26..46d31b7 100644 --- a/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/SampleComponent.kt +++ b/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/SampleComponent.kt @@ -1,7 +1,9 @@ package net.kigawa.renlin.sample import net.kigawa.renlin.component.component +import net.kigawa.renlin.tag.a import net.kigawa.renlin.tag.div +import net.kigawa.renlin.tag.p class SampleComponent( val name: String, @@ -12,7 +14,14 @@ class SampleComponent( val root = div.component { sub.navigation("navigation") // a - sub.display("main-display") + sub.display("main-display") { + div { + a { + } + } + p {} + a {} + } } diff --git a/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/Sub.kt b/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/Sub.kt index 28e8d25..f075b8c 100644 --- a/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/Sub.kt +++ b/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/Sub.kt @@ -2,26 +2,26 @@ package net.kigawa.renlin.sample import net.kigawa.hakate.api.HakateInitializer import net.kigawa.hakate.api.state.MutableState +import net.kigawa.renlin.component.argComponent import net.kigawa.renlin.component.component import net.kigawa.renlin.css.* +import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.tag.div import net.kigawa.renlin.tag.fragment import net.kigawa.renlin.tag.p -import net.kigawa.renlin.tag.style -import net.kigawa.renlin.tag.text import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.w3c.category.native.PhrasingContent import net.kigawa.renlin.w3c.category.t -import net.kigawa.renlin.w3c.event.tag.onClick class Sub { val state: MutableState = HakateInitializer().newStateDispatcher().newState("state 0") private var isMenuOpen = false - val display = div.component { + val display = div.argComponent { block: StatedDsl.() -> Unit -> div("hero-section") { + block() t("Renlin") css { fontSize = 48.px From 2756da9c692f40ec8881a6964789d89fb61db70b Mon Sep 17 00:00:00 2001 From: kigawa Date: Fri, 15 Aug 2025 03:03:19 +0900 Subject: [PATCH 3/5] add: type-safe HTML attribute handling via `DslStateData` and update JavaScript rendering with `DomTagElement` --- CLAUDE.md | 42 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/CLAUDE.md b/CLAUDE.md index 51c08d3..a586724 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -20,9 +20,10 @@ RenlinはHTML UIを型安全なDSLアプローチで構築するためのKotlin - **ステート管理**: `StateDispatcher`を介したリアクティブステートハンドリングのためのHakateライブラリとの統合 - **CSS管理**: 自動クラス生成と疑似クラスサポートを持つプラットフォーム固有のCSSマネージャー - **コンテンツカテゴリ**: W3C準拠のコンテンツモデル強制(FlowContent、PhrasingContentなど) +- **属性システム**: `DslStateData`を通じた型安全な HTML 属性管理(href、onClick など) ### プラットフォームターゲット -- **JavaScript**: DOM操作によるブラウザベースレンダリング +- **JavaScript**: DOM操作によるブラウザベースレンダリング(`DomTagElement` 経由) - **JVM**: サーバーサイドHTML生成機能 ## 開発コマンド @@ -73,14 +74,47 @@ JSアプリケーションは`Entrypoint(domElement).render(component, dispatche ### コンテンツ型安全性 DSLはW3Cコンテンツカテゴリをコンパイル時に強制します - FlowContentはPhrasingContentを含むことができますが、その逆はできません。 +### 属性とイベント管理 +- **DslStateData パターン**: 属性(href など)とイベントハンドラー(onClick など)は`DslStateData`を通じて管理されます +- **型安全な属性**: `Href`クラスなどのvalue objectsを使用して属性値を型安全に扱います +- **自動DOM同期**: `TagNodeCommon.setDslStateData`が属性とイベントの DOM への同期を自動的に行います + +## アーキテクチャの理解 + +### レイヤー構造 +1. **Component レイヤー**: `Component` - 最上位のコンポーネント抽象化 +2. **DSL レイヤー**: `DslBase` - HTML構造構築とライフサイクル管理 +3. **State レイヤー**: `DslState` / `DslStateData` - 状態管理と属性/イベント管理 +4. **Platform レイヤー**: `TagNode` implementations - プラットフォーム固有のレンダリング + +### W3C カテゴリシステム +- `w3c/category/native/` - W3C HTML仕様に基づくコンテンツカテゴリ型定義 +- `w3c/category/dsl/` - 各カテゴリ用のDSLインターフェース +- `w3c/category/integration/` - カテゴリ間の統合型定義 +- コンパイル時にHTMLコンテンツモデルの制約を強制 + ## 理解するための重要ファイル - `renlin/src/commonMain/kotlin/net/kigawa/renlin/component/Component.kt` - コアコンポーネントインターフェース -- `renlin/src/commonMain/kotlin/net/kigawa/renlin/dsl/Dsl.kt` - DSL基盤 -- `renlin/src/commonMain/kotlin/net/kigawa/renlin/css/CssManager.kt` - CSS管理システム +- `renlin/src/commonMain/kotlin/net/kigawa/renlin/dsl/DslBase.kt` - DSL基底クラスと核心機能 +- `renlin/src/commonMain/kotlin/net/kigawa/renlin/state/DslStateData.kt` - 状態データと属性管理 +- `renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/element/TagNodeCommon.kt` - プラットフォーム間共通のDOM抽象化 +- `renlin/src/jsMain/kotlin/net/kigawa/renlin/w3c/element/DomTagElement.kt` - ブラウザ用DOM実装 - `renlin/src/jsMain/kotlin/net/kigawa/renlin/Entrypoint.kt` - ブラウザエントリーポイント - `sample/src/jsMain/kotlin/net/kigawa/renlin/sample/Main.kt` - 使用例 ## ステート管理統合 -ライブラリはステート管理にHakateが必要です。コンポーネントは`MutableState`を通じてリアクティブステートにアクセスし、`useValue()`を介して再レンダリングをトリガーします。ステートの変更は自動的にコンポーネントツリー全体に伝播されます。 \ No newline at end of file +ライブラリはステート管理にHakateが必要です。コンポーネントは`MutableState`を通じてリアクティブステートにアクセスし、`useValue()`を介して再レンダリングをトリガーします。ステートの変更は自動的にコンポーネントツリー全体に伝播されます。 + +## 拡張とカスタマイズ + +### 新しい属性の追加 +1. `DslStateData`にプロパティを追加 +2. `TagNodeCommon.setDslStateData`で属性をDOMに適用するロジックを追加 +3. 対象DSLクラス用の拡張プロパティを`w3c/attribute/`に作成 + +### 新しいHTMLタグの追加 +1. `generate/`モジュールのコード生成を使用するか、手動でタグクラスを作成 +2. 適切なW3Cコンテンツカテゴリに従ってDSLクラスを実装 +3. プラットフォーム固有の実装が必要な場合は、各プラットフォームモジュールで対応 \ No newline at end of file From eab91a7eeee402a0fd9639796447b582bb3d556a Mon Sep 17 00:00:00 2001 From: kigawa Date: Fri, 15 Aug 2025 19:28:48 +0900 Subject: [PATCH 4/5] refactor: streamline `native` content categories, removing redundancies and introducing specific category interfaces --- generate/build.gradle.kts | 8 ++ generate/src/jvmMain/kotlin/_Tag_generate.kt | 2 +- .../jvmMain/kotlin/generator/DslGenerator.kt | 6 +- .../kotlin/generator/IntegrationGenerator.kt | 28 ++++- .../kotlin/generator/NativeGenerator.kt | 96 +++++++++++--- .../jvmMain/kotlin/generator/TagGenerator.kt | 20 +-- generate/src/jvmMain/kotlin/tagCategories.kt | 10 +- .../kigawa/renlin/component/TagComponent1.kt | 2 +- .../kotlin/net/kigawa/renlin/dsl/StatedDsl.kt | 91 +++++++------- .../kotlin/net/kigawa/renlin/tag/A.kt | 12 +- .../kotlin/net/kigawa/renlin/tag/Abbr.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Address.kt | 12 +- .../kotlin/net/kigawa/renlin/tag/Area.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Article.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Aside.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Audio.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/B.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Base.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Bdi.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Bdo.kt | 6 +- .../net/kigawa/renlin/tag/Blockquote.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Body.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Br.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Button.kt | 12 +- .../kotlin/net/kigawa/renlin/tag/Canvas.kt | 12 +- .../kotlin/net/kigawa/renlin/tag/Caption.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Cite.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Code.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Col.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Colgroup.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Data.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Datalist.kt | 12 +- .../kotlin/net/kigawa/renlin/tag/Dd.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Del.kt | 12 +- .../kotlin/net/kigawa/renlin/tag/Details.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Dfn.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Dialog.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Div.kt | 14 ++- .../kotlin/net/kigawa/renlin/tag/Dl.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Dt.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Em.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Embed.kt | 6 +- .../net/kigawa/renlin/tag/Fencedframe.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Fieldset.kt | 12 +- .../net/kigawa/renlin/tag/Figcaption.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Figure.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Footer.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Form.kt | 12 +- .../kotlin/net/kigawa/renlin/tag/H1.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/H2.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/H3.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/H4.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/H5.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/H6.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Head.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Header.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Hgroup.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Hr.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Html.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/I.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Iframe.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Img.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Input.kt | 12 +- .../kotlin/net/kigawa/renlin/tag/Ins.kt | 12 +- .../kotlin/net/kigawa/renlin/tag/Kbd.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Label.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Legend.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Li.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Link.kt | 12 +- .../kotlin/net/kigawa/renlin/tag/Main.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Map.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Mark.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Math.kt | 12 +- .../kotlin/net/kigawa/renlin/tag/Menu.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Meta.kt | 12 +- .../kotlin/net/kigawa/renlin/tag/Meter.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Nav.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Noscript.kt | 12 +- .../kotlin/net/kigawa/renlin/tag/Object.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Ol.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Optgroup.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Option.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Output.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/P.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Picture.kt | 12 +- .../kotlin/net/kigawa/renlin/tag/Pre.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Progress.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Q.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Rp.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Rt.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Ruby.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/S.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Samp.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Script.kt | 12 +- .../kotlin/net/kigawa/renlin/tag/Search.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Section.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Select.kt | 6 +- .../net/kigawa/renlin/tag/Selectedcontent.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Slot.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Small.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Source.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Span.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Strong.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Style.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Sub.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Summary.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Sup.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Svg.kt | 12 +- .../kotlin/net/kigawa/renlin/tag/Table.kt | 12 +- .../kotlin/net/kigawa/renlin/tag/Tbody.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Td.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Template.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Textarea.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Tfoot.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Th.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Thead.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Time.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Title.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Tr.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/Track.kt | 4 +- .../kotlin/net/kigawa/renlin/tag/U.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Ul.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Var.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Video.kt | 6 +- .../kotlin/net/kigawa/renlin/tag/Wbr.kt | 6 +- ...ritingFormFlowFormAssociatedPalpableDsl.kt | 4 +- .../dsl/EmbeddedFlowPalpablePhrasingDsl.kt | 4 +- ...ssociatedInteractivePalpablePhrasingDsl.kt | 4 +- .../dsl/FlowInteractivePalpablePhrasingDsl.kt | 4 +- .../category/dsl/FlowMetadataPhrasingDsl.kt | 4 +- ...FlowMetadataPhrasingScriptSupportingDsl.kt | 4 +- .../w3c/category/dsl/FlowPalpableDsl.kt | 4 +- .../category/dsl/FlowPalpablePhrasingDsl.kt | 4 +- .../w3c/category/dsl/FlowPhrasingDsl.kt | 4 +- ...nheritingFormFlowFormAssociatedPalpable.kt | 14 +++ ...rmAssociatedInteractivePalpablePhrasing.kt | 25 ++++ ...EmbeddedFlowInteractivePalpablePhrasing.kt | 23 ++++ .../EmbeddedFlowPalpablePhrasing.kt | 19 +++ ...rmAssociatedInteractivePalpablePhrasing.kt | 23 ++++ .../FlowFormAssociatedPalpablePhrasing.kt | 16 +++ .../w3c/category/integration/FlowHeading.kt | 11 ++ .../integration/FlowHeadingPalpable.kt | 19 +++ .../integration/FlowInteractivePalpable.kt | 13 ++ .../FlowInteractivePalpablePhrasing.kt | 18 +++ .../integration/FlowMetadataPhrasing.kt | 15 +++ .../FlowMetadataPhrasingScriptSupporting.kt | 16 +++ .../w3c/category/integration/FlowPalpable.kt | 25 ++++ .../integration/FlowPalpablePhrasing.kt | 42 +++++++ .../integration/FlowPalpableSectioning.kt | 16 +++ .../w3c/category/integration/FlowPhrasing.kt | 17 +++ .../renlin/w3c/category/native/ACategory.kt | 8 ++ .../w3c/category/native/AbbrCategory.kt | 8 ++ .../w3c/category/native/AddressCategory.kt | 8 ++ .../w3c/category/native/AreaCategory.kt | 8 ++ .../w3c/category/native/ArticleCategory.kt | 8 ++ .../w3c/category/native/AsideCategory.kt | 8 ++ .../w3c/category/native/AudioCategory.kt | 8 ++ .../AutocapitalizeInheritingFormContent.kt | 5 +- ...rmFlowFormAssociatedPalpableIntegration.kt | 8 -- ...tingFormFlowFormAssociatedPalpableUnion.kt | 8 -- .../renlin/w3c/category/native/BCategory.kt | 8 ++ .../w3c/category/native/BaseCategory.kt | 8 ++ .../renlin/w3c/category/native/BdiCategory.kt | 8 ++ .../renlin/w3c/category/native/BdoCategory.kt | 8 ++ .../w3c/category/native/BlockquoteCategory.kt | 8 ++ .../w3c/category/native/BodyCategory.kt | 8 ++ .../renlin/w3c/category/native/BrCategory.kt | 8 ++ .../w3c/category/native/ButtonCategory.kt | 8 ++ .../w3c/category/native/CanvasCategory.kt | 8 ++ .../w3c/category/native/CaptionCategory.kt | 8 ++ .../w3c/category/native/CiteCategory.kt | 8 ++ .../w3c/category/native/CodeCategory.kt | 8 ++ .../renlin/w3c/category/native/ColCategory.kt | 8 ++ .../w3c/category/native/ColgroupCategory.kt | 8 ++ .../w3c/category/native/DataCategory.kt | 8 ++ .../w3c/category/native/DatalistCategory.kt | 8 ++ .../renlin/w3c/category/native/DdCategory.kt | 8 ++ .../renlin/w3c/category/native/DelCategory.kt | 8 ++ .../w3c/category/native/DetailsCategory.kt | 8 ++ .../renlin/w3c/category/native/DfnCategory.kt | 8 ++ .../w3c/category/native/DialogCategory.kt | 8 ++ .../kigawa/renlin/w3c/category/native/Div.kt | 3 + .../renlin/w3c/category/native/DivCategory.kt | 8 ++ .../renlin/w3c/category/native/DlCategory.kt | 8 ++ .../renlin/w3c/category/native/DtCategory.kt | 8 ++ .../renlin/w3c/category/native/EmCategory.kt | 8 ++ .../w3c/category/native/EmbedCategory.kt | 8 ++ .../w3c/category/native/EmbeddedContent.kt | 14 ++- ...dInteractivePalpablePhrasingIntegration.kt | 8 -- ...ociatedInteractivePalpablePhrasingUnion.kt | 8 -- ...wInteractivePalpablePhrasingIntegration.kt | 8 -- ...dedFlowInteractivePalpablePhrasingUnion.kt | 8 -- ...EmbeddedFlowPalpablePhrasingIntegration.kt | 8 -- .../EmbeddedFlowPalpablePhrasingUnion.kt | 8 -- .../category/native/FencedframeCategory.kt | 8 ++ .../w3c/category/native/FieldsetCategory.kt | 8 ++ .../w3c/category/native/FigcaptionCategory.kt | 8 ++ .../w3c/category/native/FigureCategory.kt | 8 ++ .../renlin/w3c/category/native/FlowContent.kt | 119 +++++++++++++++++- ...dInteractivePalpablePhrasingIntegration.kt | 8 -- ...ociatedInteractivePalpablePhrasingUnion.kt | 8 -- ...rmAssociatedPalpablePhrasingIntegration.kt | 8 -- ...FlowFormAssociatedPalpablePhrasingUnion.kt | 8 -- .../category/native/FlowHeadingIntegration.kt | 8 -- .../native/FlowHeadingPalpableIntegration.kt | 8 -- .../native/FlowHeadingPalpableUnion.kt | 8 -- .../w3c/category/native/FlowHeadingUnion.kt | 8 -- .../FlowInteractivePalpableIntegration.kt | 8 -- ...wInteractivePalpablePhrasingIntegration.kt | 8 -- .../FlowInteractivePalpablePhrasingUnion.kt | 8 -- .../native/FlowInteractivePalpableUnion.kt | 8 -- .../native/FlowMetadataPhrasingIntegration.kt | 8 -- ...dataPhrasingScriptSupportingIntegration.kt | 8 -- ...owMetadataPhrasingScriptSupportingUnion.kt | 8 -- .../native/FlowMetadataPhrasingUnion.kt | 8 -- .../native/FlowPalpableIntegration.kt | 8 -- .../native/FlowPalpablePhrasingIntegration.kt | 8 -- .../native/FlowPalpablePhrasingUnion.kt | 8 -- .../FlowPalpableSectioningIntegration.kt | 8 -- .../native/FlowPalpableSectioningUnion.kt | 8 -- .../w3c/category/native/FlowPalpableUnion.kt | 8 -- .../native/FlowPhrasingIntegration.kt | 8 -- .../w3c/category/native/FlowPhrasingUnion.kt | 8 -- .../w3c/category/native/FooterCategory.kt | 8 ++ .../category/native/FormAssociatedContent.kt | 12 +- .../w3c/category/native/FormCategory.kt | 8 ++ .../renlin/w3c/category/native/H1Category.kt | 8 ++ .../renlin/w3c/category/native/H2Category.kt | 8 ++ .../renlin/w3c/category/native/H3Category.kt | 8 ++ .../renlin/w3c/category/native/H4Category.kt | 8 ++ .../renlin/w3c/category/native/H5Category.kt | 8 ++ .../renlin/w3c/category/native/H6Category.kt | 8 ++ .../w3c/category/native/HeadCategory.kt | 8 ++ .../w3c/category/native/HeaderCategory.kt | 8 ++ .../w3c/category/native/HeadingContent.kt | 11 +- .../w3c/category/native/HgroupCategory.kt | 8 ++ .../renlin/w3c/category/native/HrCategory.kt | 8 ++ .../w3c/category/native/HtmlCategory.kt | 8 ++ .../renlin/w3c/category/native/ICategory.kt | 8 ++ .../w3c/category/native/IframeCategory.kt | 8 ++ .../renlin/w3c/category/native/ImgCategory.kt | 8 ++ .../w3c/category/native/InputCategory.kt | 8 ++ .../renlin/w3c/category/native/InsCategory.kt | 8 ++ .../w3c/category/native/InteractiveContent.kt | 17 ++- .../renlin/w3c/category/native/KbdCategory.kt | 8 ++ .../w3c/category/native/LabelCategory.kt | 8 ++ .../w3c/category/native/LegendCategory.kt | 8 ++ .../renlin/w3c/category/native/LiCategory.kt | 8 ++ .../w3c/category/native/LinkCategory.kt | 8 ++ .../w3c/category/native/MainCategory.kt | 8 ++ .../renlin/w3c/category/native/MapCategory.kt | 8 ++ .../w3c/category/native/MarkCategory.kt | 8 ++ .../w3c/category/native/MathCategory.kt | 8 ++ .../w3c/category/native/MenuCategory.kt | 8 ++ .../w3c/category/native/MetaCategory.kt | 8 ++ .../w3c/category/native/MetadataContent.kt | 12 +- .../w3c/category/native/MeterCategory.kt | 8 ++ .../renlin/w3c/category/native/NavCategory.kt | 8 ++ .../w3c/category/native/NoscriptCategory.kt | 8 ++ .../w3c/category/native/ObjectCategory.kt | 8 ++ .../renlin/w3c/category/native/OlCategory.kt | 8 ++ .../w3c/category/native/OptgroupCategory.kt | 8 ++ .../w3c/category/native/OptionCategory.kt | 8 ++ .../w3c/category/native/OutputCategory.kt | 8 ++ .../kigawa/renlin/w3c/category/native/P.kt | 3 + .../renlin/w3c/category/native/PCategory.kt | 8 ++ .../w3c/category/native/PalpableContent.kt | 77 +++++++++++- .../w3c/category/native/PhrasingContent.kt | 64 +++++++++- .../w3c/category/native/PictureCategory.kt | 8 ++ .../renlin/w3c/category/native/PreCategory.kt | 8 ++ .../w3c/category/native/ProgressCategory.kt | 8 ++ .../renlin/w3c/category/native/QCategory.kt | 8 ++ .../renlin/w3c/category/native/RpCategory.kt | 8 ++ .../renlin/w3c/category/native/RtCategory.kt | 8 ++ .../w3c/category/native/RubyCategory.kt | 8 ++ .../renlin/w3c/category/native/SCategory.kt | 8 ++ .../w3c/category/native/SampCategory.kt | 8 ++ .../w3c/category/native/ScriptCategory.kt | 8 ++ .../native/ScriptSupportingContent.kt | 6 +- .../w3c/category/native/SearchCategory.kt | 8 ++ .../w3c/category/native/SectionCategory.kt | 8 ++ .../w3c/category/native/SectioningContent.kt | 8 +- .../w3c/category/native/SelectCategory.kt | 8 ++ .../native/SelectedcontentCategory.kt | 8 ++ .../w3c/category/native/SlotCategory.kt | 8 ++ .../w3c/category/native/SmallCategory.kt | 8 ++ .../w3c/category/native/SourceCategory.kt | 8 ++ .../w3c/category/native/SpanCategory.kt | 8 ++ .../w3c/category/native/StrongCategory.kt | 8 ++ .../w3c/category/native/StyleCategory.kt | 8 ++ .../renlin/w3c/category/native/SubCategory.kt | 8 ++ .../w3c/category/native/SummaryCategory.kt | 8 ++ .../renlin/w3c/category/native/SupCategory.kt | 8 ++ .../renlin/w3c/category/native/SvgCategory.kt | 8 ++ .../w3c/category/native/TableCategory.kt | 8 ++ .../w3c/category/native/TbodyCategory.kt | 8 ++ .../renlin/w3c/category/native/TdCategory.kt | 8 ++ .../w3c/category/native/TemplateCategory.kt | 8 ++ .../w3c/category/native/TextareaCategory.kt | 8 ++ .../w3c/category/native/TfootCategory.kt | 8 ++ .../renlin/w3c/category/native/ThCategory.kt | 8 ++ .../w3c/category/native/TheadCategory.kt | 8 ++ .../w3c/category/native/TimeCategory.kt | 8 ++ .../w3c/category/native/TitleCategory.kt | 8 ++ .../renlin/w3c/category/native/TrCategory.kt | 8 ++ .../w3c/category/native/TrackCategory.kt | 8 ++ .../renlin/w3c/category/native/UCategory.kt | 8 ++ .../renlin/w3c/category/native/UlCategory.kt | 8 ++ .../renlin/w3c/category/native/VarCategory.kt | 8 ++ .../w3c/category/native/VideoCategory.kt | 8 ++ .../renlin/w3c/category/native/WbrCategory.kt | 8 ++ .../kigawa/renlin/sample/SampleComponent.kt | 6 +- .../kotlin/net/kigawa/renlin/sample/Sub.kt | 2 + 313 files changed, 2256 insertions(+), 650 deletions(-) create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/AutocapitalizeInheritingFormFlowFormAssociatedPalpable.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/EmbeddedFlowFormAssociatedInteractivePalpablePhrasing.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/EmbeddedFlowInteractivePalpablePhrasing.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/EmbeddedFlowPalpablePhrasing.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowFormAssociatedInteractivePalpablePhrasing.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowFormAssociatedPalpablePhrasing.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowHeading.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowHeadingPalpable.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowInteractivePalpable.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowInteractivePalpablePhrasing.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowMetadataPhrasing.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowMetadataPhrasingScriptSupporting.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPalpable.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPalpablePhrasing.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPalpableSectioning.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPhrasing.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ACategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AbbrCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AddressCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AreaCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ArticleCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AsideCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AudioCategory.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AutocapitalizeInheritingFormFlowFormAssociatedPalpableUnion.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BaseCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BdiCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BdoCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BlockquoteCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BodyCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BrCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ButtonCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/CanvasCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/CaptionCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/CiteCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/CodeCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ColCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ColgroupCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DataCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DatalistCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DdCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DelCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DetailsCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DfnCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DialogCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/Div.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DivCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DlCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DtCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbedCategory.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowFormAssociatedInteractivePalpablePhrasingUnion.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowInteractivePalpablePhrasingIntegration.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowInteractivePalpablePhrasingUnion.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowPalpablePhrasingIntegration.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowPalpablePhrasingUnion.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FencedframeCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FieldsetCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FigcaptionCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FigureCategory.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowFormAssociatedInteractivePalpablePhrasingIntegration.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowFormAssociatedInteractivePalpablePhrasingUnion.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowFormAssociatedPalpablePhrasingIntegration.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowFormAssociatedPalpablePhrasingUnion.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowHeadingIntegration.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowHeadingPalpableIntegration.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowHeadingPalpableUnion.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowHeadingUnion.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowInteractivePalpableIntegration.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowInteractivePalpablePhrasingIntegration.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowInteractivePalpablePhrasingUnion.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowInteractivePalpableUnion.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetadataPhrasingIntegration.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetadataPhrasingScriptSupportingIntegration.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetadataPhrasingScriptSupportingUnion.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetadataPhrasingUnion.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableIntegration.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpablePhrasingIntegration.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpablePhrasingUnion.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableSectioningIntegration.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableSectioningUnion.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableUnion.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPhrasingIntegration.kt delete mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPhrasingUnion.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FooterCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FormCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/H1Category.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/H2Category.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/H3Category.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/H4Category.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/H5Category.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/H6Category.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HeadCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HeaderCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HgroupCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HrCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HtmlCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ICategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/IframeCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ImgCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/InputCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/InsCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/KbdCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/LabelCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/LegendCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/LiCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/LinkCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MainCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MapCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MarkCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MathCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MenuCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MetaCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MeterCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/NavCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/NoscriptCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ObjectCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/OlCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/OptgroupCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/OptionCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/OutputCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/P.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/PCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/PictureCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/PreCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ProgressCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/QCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/RpCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/RtCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/RubyCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SampCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ScriptCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SearchCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SectionCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SelectCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SelectedcontentCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SlotCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SmallCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SourceCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SpanCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/StrongCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/StyleCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SubCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SummaryCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SupCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SvgCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TableCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TbodyCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TdCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TemplateCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TextareaCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TfootCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ThCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TheadCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TimeCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TitleCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TrCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TrackCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/UCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/UlCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/VarCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/VideoCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/WbrCategory.kt diff --git a/generate/build.gradle.kts b/generate/build.gradle.kts index 90a7dc4..8aeaadc 100644 --- a/generate/build.gradle.kts +++ b/generate/build.gradle.kts @@ -26,3 +26,11 @@ kotlin { } } + +tasks.register("runGenerator") { + group = "application" + description = "Run the code generator" + dependsOn("jvmMainClasses") + classpath = kotlin.targets["jvm"].compilations["main"].output.allOutputs + kotlin.targets["jvm"].compilations["main"].runtimeDependencyFiles + mainClass.set("_Tag_generateKt") +} diff --git a/generate/src/jvmMain/kotlin/_Tag_generate.kt b/generate/src/jvmMain/kotlin/_Tag_generate.kt index 77f7459..ba4056c 100644 --- a/generate/src/jvmMain/kotlin/_Tag_generate.kt +++ b/generate/src/jvmMain/kotlin/_Tag_generate.kt @@ -27,7 +27,7 @@ fun main() { it.generate() } val nativeGenerator = NativeGenerator(categoryNativeOutputDir).also { - it.generate(integrationGenerator.nativeCategories) + it.generate() } println("タグのコード生成が完了しました。") diff --git a/generate/src/jvmMain/kotlin/generator/DslGenerator.kt b/generate/src/jvmMain/kotlin/generator/DslGenerator.kt index 3cef961..991509f 100644 --- a/generate/src/jvmMain/kotlin/generator/DslGenerator.kt +++ b/generate/src/jvmMain/kotlin/generator/DslGenerator.kt @@ -29,10 +29,10 @@ class DslGenerator( ${ if (allowedCategories.categories.size > 1) "import net.kigawa.renlin.w3c.category.integration.${ - allowedCategories.connectedStr("Integration") + allowedCategories.connectedStr() }" else "import net.kigawa.renlin.w3c.category.native.${ - allowedCategories.connectedStr("Integration") + allowedCategories.connectedStr() }" } @@ -40,7 +40,7 @@ class DslGenerator( /** * DSL for ${categories.joinToString(", ")} */ - interface ${dslName}${ + interface ${dslName}${ if (categories.size <= 1) "" else (categories.filter { it.trim() != dslName.trim() } .joinToString(separator = ",", prefix = ":") diff --git a/generate/src/jvmMain/kotlin/generator/IntegrationGenerator.kt b/generate/src/jvmMain/kotlin/generator/IntegrationGenerator.kt index 01ad084..68132a1 100644 --- a/generate/src/jvmMain/kotlin/generator/IntegrationGenerator.kt +++ b/generate/src/jvmMain/kotlin/generator/IntegrationGenerator.kt @@ -17,7 +17,7 @@ class IntegrationGenerator( .filter { it.categories.size > 1 } .toSet() .forEach { tagCategories -> - val integrationName = tagCategories.connectedStr("Integration") + val integrationName = tagCategories.connectedStr() if (!processedIntegrations.contains(integrationName)) { processedIntegrations.add(integrationName) allIntegrations[integrationName] = tagCategories.categories.toSet() @@ -28,8 +28,20 @@ class IntegrationGenerator( } } - // Generate each integration with inheritance from subset integrations + // タグのCategoryインターフェースを生成対象に含める + val tagCategoryMap = mutableMapOf>() + tagCategories.forEach { tagInfo -> + val tagCategoryName = "${tagInfo.className}Category" + tagCategoryMap[tagCategoryName] = setOf(tagInfo.tagCategories.connectedStr()) + } + + // Generate each integration with inheritance from tag categories allIntegrations.forEach { (integrationName, categories) -> + // Find tag categories that match this integration + val matchingTagCategories = tagCategoryMap.filter { (_, integrationSet) -> + integrationSet.contains(integrationName) + }.keys + // Find other integrations that are subsets of this integration val subsetIntegrations = allIntegrations.filter { (otherName, otherCategories) -> otherName != integrationName && @@ -38,7 +50,7 @@ class IntegrationGenerator( otherCategories.size < categories.size }.keys - // Generate imports for categories and subset integrations + // Generate imports for categories, subset integrations, and tag categories val categoryImports = categories.map { category -> "import net.kigawa.renlin.w3c.category.native.$category" } @@ -47,10 +59,14 @@ class IntegrationGenerator( "import net.kigawa.renlin.w3c.category.integration.$subsetIntegration" } - val allImports = (categoryImports + integrationImports).joinToString("\n ") + val tagCategoryImports = matchingTagCategories.map { tagCategory -> + "import net.kigawa.renlin.w3c.category.native.$tagCategory" + } + + val allImports = (categoryImports + integrationImports + tagCategoryImports).joinToString("\n ") - // Generate inheritance list including categories and subset integrations - val inheritance = (categories + subsetIntegrations + "ContentCategory").joinToString(", ") + // Generate inheritance list including categories, subset integrations, and tag categories + val inheritance = (categories + subsetIntegrations + matchingTagCategories + "ContentCategory").joinToString(", ") val fileContent = """ package net.kigawa.renlin.w3c.category.integration diff --git a/generate/src/jvmMain/kotlin/generator/NativeGenerator.kt b/generate/src/jvmMain/kotlin/generator/NativeGenerator.kt index f862afc..9979271 100644 --- a/generate/src/jvmMain/kotlin/generator/NativeGenerator.kt +++ b/generate/src/jvmMain/kotlin/generator/NativeGenerator.kt @@ -5,39 +5,97 @@ import tagCategories import categoryParents class NativeGenerator(val categoryNativeOutputDir: String) { - fun generate(categories: Map>) { + fun generate() { + // 使用されているすべてのネイティブカテゴリを収集 + val usedNativeCategories = mutableSetOf() + tagCategories.forEach { tagInfo -> + usedNativeCategories.addAll(tagInfo.tagCategories.categories) + usedNativeCategories.addAll(tagInfo.allowedCategories.categories) + // 各タグ専用のCategoryインターフェースも追加 + usedNativeCategories.add("${tagInfo.className}Category") + } + // 親カテゴリーの情報を収集 val allParentCategories = categoryParents.toMutableMap() tagCategories.forEach { tagInfo -> allParentCategories.putAll(tagInfo.tagCategories.parentCategories) allParentCategories.putAll(tagInfo.allowedCategories.parentCategories) + // 各タグ専用のCategoryの親カテゴリーを設定(ContentCategoryのみ継承) + allParentCategories["${tagInfo.className}Category"] = "" + } + + // FlowContent, PhrasingContentなどが継承すべきタグカテゴリを設定 + val categoryToTagCategories = mutableMapOf>() + tagCategories.forEach { tagInfo -> + tagInfo.tagCategories.categories.forEach { category -> + categoryToTagCategories.getOrPut(category) { mutableSetOf() }.add("${tagInfo.className}Category") + } } - // Integrationクラスの生成 - categories.forEach { (name, deps) -> - val categoryName = name - + // ネイティブカテゴリの生成 + usedNativeCategories.forEach { categoryName -> // 親カテゴリーを取得 - val parentCategory = allParentCategories[name] + val parentCategory = allParentCategories[categoryName] // 継承するインターフェースのリスト - val interfaces = if (parentCategory != null) { - (deps + "ContentCategory" + parentCategory).joinToString(", ") - } else { - (deps + "ContentCategory").joinToString(", ") + val interfaces = when { + parentCategory == null -> "ContentCategory" + parentCategory.isEmpty() -> "" // P, Divの場合は継承なし + else -> "ContentCategory, $parentCategory" } - val fileContent = """ - package net.kigawa.renlin.w3c.category.native + val fileContent = when { + parentCategory?.isEmpty() == true && !categoryName.endsWith("Category") -> { + // P, Divの場合は基本インターフェースのみ + """ + package net.kigawa.renlin.w3c.category.native + + interface $categoryName + """.trimIndent() + } + categoryName.endsWith("Category") -> { + // タグ専用カテゴリはContentCategoryのみ継承 + """ + package net.kigawa.renlin.w3c.category.native + + import net.kigawa.renlin.w3c.category.ContentCategory - import net.kigawa.renlin.w3c.category.ContentCategory + /** + * ${categoryName} represents elements that are part of the ${categoryName.replace("Category", "").lowercase()} content category. + */ + interface $categoryName : ContentCategory + """.trimIndent() + } + else -> { + // 標準カテゴリ(FlowContent、PhrasingContentなど)の場合、関連するタグカテゴリを継承 + val tagCategoriesToInherit = categoryToTagCategories[categoryName] ?: emptySet() + val tagCategoryImports = tagCategoriesToInherit.map { "import net.kigawa.renlin.w3c.category.native.$it" } + val allTagCategoriesInheritance = if (tagCategoriesToInherit.isNotEmpty()) { + tagCategoriesToInherit.joinToString(", ") + } else { + "" + } + + val finalInterfaces = if (allTagCategoriesInheritance.isNotEmpty()) { + if (interfaces.isNotEmpty()) "$interfaces, $allTagCategoriesInheritance" else allTagCategoriesInheritance + } else { + interfaces + } + + """ + package net.kigawa.renlin.w3c.category.native - /** - * Integration to ${deps.joinToString(", ")} - * ${if (parentCategory != null) "Parent: $parentCategory" else ""} - */ - interface $categoryName : $interfaces - """.trimIndent() + import net.kigawa.renlin.w3c.category.ContentCategory + ${tagCategoryImports.joinToString("\n ")} + + /** + * ${categoryName} represents elements that are part of the ${categoryName.replace("Content", "").lowercase()} content category. + * ${if (parentCategory != null && parentCategory.isNotEmpty()) "Parent: $parentCategory" else ""} + */ + interface $categoryName : $finalInterfaces + """.trimIndent() + } + } val file = File("$categoryNativeOutputDir/${categoryName}.kt") file.writeText(fileContent) diff --git a/generate/src/jvmMain/kotlin/generator/TagGenerator.kt b/generate/src/jvmMain/kotlin/generator/TagGenerator.kt index f918ff5..ae8a9e7 100644 --- a/generate/src/jvmMain/kotlin/generator/TagGenerator.kt +++ b/generate/src/jvmMain/kotlin/generator/TagGenerator.kt @@ -15,22 +15,20 @@ class TagGenerator( if (tagInfo.tagCategories.categories.size > 1) imports.add( "import net.kigawa.renlin.w3c.category.integration.${ - tagInfo.tagCategories.connectedStr( - "Integration" - ) + tagInfo.tagCategories.connectedStr() }" ) else imports.add("import net.kigawa.renlin.w3c.category.native.${tagInfo.tagCategories.connectedStr()}") if (tagInfo.allowedCategories.categories.size > 1) imports.add( "import net.kigawa.renlin.w3c.category.integration.${ - tagInfo.allowedCategories.connectedStr("Integration") + tagInfo.allowedCategories.connectedStr() }" ) else if ( tagInfo.allowedCategories.categories.isNotEmpty() && - tagInfo.tagCategories.connectedStr("Integration") != - tagInfo.allowedCategories.connectedStr("Integration") + tagInfo.tagCategories.connectedStr() != + tagInfo.allowedCategories.connectedStr() ) imports.add( "import net.kigawa.renlin.w3c.category.native.${ tagInfo.allowedCategories.connectedStr() @@ -43,8 +41,10 @@ class TagGenerator( import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 + import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState + import net.kigawa.renlin.w3c.category.native.${tagInfo.className}Category ${ if (tagInfo.allowedCategories.categories.isEmpty()) "import net.kigawa.renlin.w3c.category.ContentCategory" @@ -57,11 +57,11 @@ class TagGenerator( * model.Categories: ${tagInfo.tagCategories.categories.joinToString(", ")} */ class ${tagInfo.className}Dsl(dslState: DslState): - DslBase<${tagInfo.allowedCategories.connectedStr("Integration")}>(dslState), - StatedDsl<${tagInfo.allowedCategories.connectedStr("Integration")}>${ + DslBase<${tagInfo.allowedCategories.connectedStr()}>(dslState), + StatedDsl<${tagInfo.allowedCategories.connectedStr()}>${ if (tagInfo.allowedCategories.categories.isEmpty()) "" else ",\n ${tagInfo.allowedCategories.connectedStr()}" + - "Dsl<${tagInfo.allowedCategories.connectedStr("Integration")}>" + "Dsl<${tagInfo.allowedCategories.connectedStr()}>" } { override fun applyElement(element: TagNode): ()->Unit { return {} @@ -70,7 +70,7 @@ class TagGenerator( val ${tagInfo.escapement} = TagComponent1(${tagInfo.className}, ::${tagInfo.className}Dsl) - object ${tagInfo.className} : Tag<${tagInfo.tagCategories.connectedStr("Integration")}> { + object ${tagInfo.className} : Tag<${tagInfo.className}Category> { override val name: String get() = "${tagInfo.name}" } diff --git a/generate/src/jvmMain/kotlin/tagCategories.kt b/generate/src/jvmMain/kotlin/tagCategories.kt index ced2319..79bef8a 100644 --- a/generate/src/jvmMain/kotlin/tagCategories.kt +++ b/generate/src/jvmMain/kotlin/tagCategories.kt @@ -4,12 +4,13 @@ import model.TagInfo // カテゴリーの親子関係を定義 val categoryParents = mapOf( - "PhrasingContent" to "FlowContent", + "PhrasingContent" to "P", + "FlowContent" to "P, Div", + "FlowPhrasing" to "FlowContent, PhrasingContent", "HeadingContent" to "FlowContent", "SectioningContent" to "FlowContent", "EmbeddedContent" to "PhrasingContent", "InteractiveContent" to "PhrasingContent", - "FlowContent" to "EventTarget", "MetaDataContent" to "FlowContent", "PhrasingPhrasingContent" to "PhrasingContent", "FlowPhrasingContent" to "FlowContent", @@ -19,10 +20,15 @@ val categoryParents = mapOf( "SectioningRoot" to "Any", "SectioningHeadings" to "HeadingContent", "FlowSectioningContent" to "FlowContent", + "P" to "", + "Div" to "", ) // 元のコードの並び順を維持するためのタグリスト val tagCategories = setOf( + // Base interfaces + TagInfo("P", TagCategories("P"), AllowedCategories()), + TagInfo("Div", TagCategories("Div"), AllowedCategories()), // Main root TagInfo("html", TagCategories("FlowContent"), AllowedCategories("FlowContent")), diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/TagComponent1.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/TagComponent1.kt index 877e7ad..679ce7f 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/TagComponent1.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/component/TagComponent1.kt @@ -8,7 +8,7 @@ import net.kigawa.renlin.w3c.category.ContentCategory class TagComponent1, CONTENT_CATEGORY: ContentCategory, DSL: StatedDsl<*>>( override val tag: TAG, private val newDslFunc: (DslState) -> DSL, -): TagComponent, StructuredComponent { +): TagComponent< TAG>, StructuredComponent { override fun newDsl(dslState: DslState): DSL { return newDslFunc(dslState) } diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/dsl/StatedDsl.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/dsl/StatedDsl.kt index d2b5a3e..2083785 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/dsl/StatedDsl.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/dsl/StatedDsl.kt @@ -1,12 +1,7 @@ package net.kigawa.renlin.dsl import net.kigawa.hakate.api.state.State -import net.kigawa.renlin.component.Component0 -import net.kigawa.renlin.component.Component1 -import net.kigawa.renlin.component.Component2 -import net.kigawa.renlin.component.Component3 -import net.kigawa.renlin.component.Component4 -import net.kigawa.renlin.component.StructuredComponent +import net.kigawa.renlin.component.* import net.kigawa.renlin.state.DslState import net.kigawa.renlin.tag.Fragment import net.kigawa.renlin.tag.Tag @@ -30,41 +25,41 @@ import net.kigawa.renlin.w3c.element.TagNode * * @param CONTENT_CATEGORY このDSLが生成できるHTMLコンテンツのカテゴリ */ -interface StatedDsl: Dsl { - /** - * 現在のDSLに関連付けられた状態。 - * この状態はDSLの動作と描画を制御します。 - */ - val dslState: DslState +interface StatedDsl< CONTENT_CATEGORY: ContentCategory>: Dsl { + /** + * 現在のDSLに関連付けられた状態。 + * この状態はDSLの動作と描画を制御します。 + */ + val dslState: DslState - /** - * サブDSLを現在のDSLに登録します。 - * - * @param registeredDslData 登録するDSLのデータ - */ - fun registerSubDsl(registeredDslData: RegisteredDslData) + /** + * サブDSLを現在のDSLに登録します。 + * + * @param registeredDslData 登録するDSLのデータ + */ + fun registerSubDsl(registeredDslData: RegisteredDslData) - /** - * 指定された状態をDSLにマウントします。 - * これにより、DSLの状態が更新され、関連するサブDSLも更新されます。 - * - * @param state マウントする状態 - * @param registeredDslData 関連するDSLデータ - */ - fun applyToDslState(state: DslState, registeredDslData: RegisteredDslData) + /** + * 指定された状態をDSLにマウントします。 + * これにより、DSLの状態が更新され、関連するサブDSLも更新されます。 + * + * @param state マウントする状態 + * @param registeredDslData 関連するDSLデータ + */ + fun applyToDslState(state: DslState, registeredDslData: RegisteredDslData) - /** - * 指定された要素をDSLに適用します。 - * - * @param element 適用するHTML要素 - * @return 要素の適用を取り消すための関数 - */ - fun applyElement(element: TagNode): () -> Unit + /** + * 指定された要素をDSLに適用します。 + * + * @param element 適用するHTML要素 + * @return 要素の適用を取り消すための関数 + */ + fun applyElement(element: TagNode): () -> Unit - operator fun > Component0.invoke( - key: String? = null, - ) = this.render(this@StatedDsl, key) + operator fun > Component0.invoke( + key: String? = null, + ) = this.render(this@StatedDsl, key) /** * コンポーネントを呼び出し、レンダリングするための演算子オーバーロード。 @@ -125,17 +120,17 @@ interface StatedDsl: Dsl { } - /** - * フラグメントコンポーネント。 - * これは、複数の要素をグループ化するためのコンテナとして機能します。 - */ - val fragment: StructuredComponent, CONTENT_CATEGORY, out StatedDsl> - get() = Fragment.create() + /** + * フラグメントコンポーネント。 + * これは、複数の要素をグループ化するためのコンテナとして機能します。 + */ + val fragment: StructuredComponent, CONTENT_CATEGORY, out StatedDsl> + get() = Fragment.create() - /** - * 状態の現在の値を取得し、この状態をDSLの状態セットに追加します。 - * - * @return 状態の現在の値 - */ - fun State.useValue(): T + /** + * 状態の現在の値を取得し、この状態をDSLの状態セットに追加します。 + * + * @return 状態の現在の値 + */ + fun State.useValue(): T } diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/A.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/A.kt index cbda285..21af3ba 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/A.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/A.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowInteractivePalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowInteractivePalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.ACategory import net.kigawa.renlin.w3c.category.dsl.FlowInteractivePalpablePhrasingDsl @@ -15,9 +17,9 @@ import net.kigawa.renlin.w3c.category.dsl.FlowInteractivePalpablePhrasingDsl * model.Categories: FlowContent, PhrasingContent, PalpableContent, InteractiveContent */ class ADsl(dslState: DslState): - DslBase(dslState), - StatedDsl, - FlowInteractivePalpablePhrasingDsl { + DslBase(dslState), + StatedDsl, + FlowInteractivePalpablePhrasingDsl { override fun applyElement(element: TagNode): ()->Unit { return {} } @@ -25,7 +27,7 @@ class ADsl(dslState: DslState): val a = TagComponent1(A, ::ADsl) -object A : Tag { +object A : Tag { override val name: String get() = "a" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Abbr.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Abbr.kt index 9226fe0..a077b7d 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Abbr.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Abbr.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.AbbrCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class AbbrDsl(dslState: DslState): val abbr = TagComponent1(Abbr, ::AbbrDsl) -object Abbr : Tag { +object Abbr : Tag { override val name: String get() = "abbr" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Address.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Address.kt index 555abfb..291ba74 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Address.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Address.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpable import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.AddressCategory import net.kigawa.renlin.w3c.category.dsl.FlowPalpableDsl @@ -15,9 +17,9 @@ import net.kigawa.renlin.w3c.category.dsl.FlowPalpableDsl * model.Categories: FlowContent, PalpableContent */ class AddressDsl(dslState: DslState): - DslBase(dslState), - StatedDsl, - FlowPalpableDsl { + DslBase(dslState), + StatedDsl, + FlowPalpableDsl { override fun applyElement(element: TagNode): ()->Unit { return {} } @@ -25,7 +27,7 @@ class AddressDsl(dslState: DslState): val address = TagComponent1(Address, ::AddressDsl) -object Address : Tag { +object Address : Tag { override val name: String get() = "address" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Area.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Area.kt index f4b2eb4..8382802 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Area.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Area.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.AreaCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class AreaDsl(dslState: DslState): val area = TagComponent1(Area, ::AreaDsl) -object Area : Tag { +object Area : Tag { override val name: String get() = "area" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Article.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Article.kt index 112a112..3b4d978 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Article.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Article.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpableSectioningIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpableSectioning import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.ArticleCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class ArticleDsl(dslState: DslState): val article = TagComponent1(Article, ::ArticleDsl) -object Article : Tag { +object Article : Tag { override val name: String get() = "article" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Aside.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Aside.kt index 4ec20a4..ff086ec 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Aside.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Aside.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpableSectioningIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpableSectioning import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.AsideCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class AsideDsl(dslState: DslState): val aside = TagComponent1(Aside, ::AsideDsl) -object Aside : Tag { +object Aside : Tag { override val name: String get() = "aside" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Audio.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Audio.kt index 554d2ba..84ff762 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Audio.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Audio.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowInteractivePalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowInteractivePalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.AudioCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class AudioDsl(dslState: DslState): val audio = TagComponent1(Audio, ::AudioDsl) -object Audio : Tag { +object Audio : Tag { override val name: String get() = "audio" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/B.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/B.kt index f67ec4b..1d0f3e4 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/B.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/B.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.BCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class BDsl(dslState: DslState): val b = TagComponent1(B, ::BDsl) -object B : Tag { +object B : Tag { override val name: String get() = "b" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Base.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Base.kt index 27e63b3..7ba33d7 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Base.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Base.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.MetadataContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.BaseCategory import net.kigawa.renlin.w3c.category.dsl.MetadataContentDsl @@ -25,7 +27,7 @@ class BaseDsl(dslState: DslState): val base = TagComponent1(Base, ::BaseDsl) -object Base : Tag { +object Base : Tag { override val name: String get() = "base" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Bdi.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Bdi.kt index d57ba05..2dd9245 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Bdi.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Bdi.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.BdiCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class BdiDsl(dslState: DslState): val bdi = TagComponent1(Bdi, ::BdiDsl) -object Bdi : Tag { +object Bdi : Tag { override val name: String get() = "bdi" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Bdo.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Bdo.kt index 27a44a4..f52f213 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Bdo.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Bdo.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.BdoCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class BdoDsl(dslState: DslState): val bdo = TagComponent1(Bdo, ::BdoDsl) -object Bdo : Tag { +object Bdo : Tag { override val name: String get() = "bdo" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Blockquote.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Blockquote.kt index d5e6625..c2f04e5 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Blockquote.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Blockquote.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpable import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.BlockquoteCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class BlockquoteDsl(dslState: DslState): val blockquote = TagComponent1(Blockquote, ::BlockquoteDsl) -object Blockquote : Tag { +object Blockquote : Tag { override val name: String get() = "blockquote" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Body.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Body.kt index 05a826a..eabbc09 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Body.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Body.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.BodyCategory import net.kigawa.renlin.w3c.category.dsl.FlowContentDsl @@ -25,7 +27,7 @@ class BodyDsl(dslState: DslState): val body = TagComponent1(Body, ::BodyDsl) -object Body : Tag { +object Body : Tag { override val name: String get() = "body" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Br.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Br.kt index 1c7a24f..bd88f75 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Br.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Br.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.BrCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class BrDsl(dslState: DslState): val br = TagComponent1(Br, ::BrDsl) -object Br : Tag { +object Br : Tag { override val name: String get() = "br" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Button.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Button.kt index 2c4765a..fa42091 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Button.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Button.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowFormAssociatedInteractivePalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowFormAssociatedInteractivePalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.ButtonCategory import net.kigawa.renlin.w3c.category.dsl.FlowFormAssociatedInteractivePalpablePhrasingDsl @@ -15,9 +17,9 @@ import net.kigawa.renlin.w3c.category.dsl.FlowFormAssociatedInteractivePalpableP * model.Categories: FlowContent, PhrasingContent, InteractiveContent, PalpableContent, FormAssociatedContent */ class ButtonDsl(dslState: DslState): - DslBase(dslState), - StatedDsl, - FlowFormAssociatedInteractivePalpablePhrasingDsl { + DslBase(dslState), + StatedDsl, + FlowFormAssociatedInteractivePalpablePhrasingDsl { override fun applyElement(element: TagNode): ()->Unit { return {} } @@ -25,7 +27,7 @@ class ButtonDsl(dslState: DslState): val button = TagComponent1(Button, ::ButtonDsl) -object Button : Tag { +object Button : Tag { override val name: String get() = "button" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Canvas.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Canvas.kt index 7fc911c..9ad58be 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Canvas.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Canvas.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.CanvasCategory import net.kigawa.renlin.w3c.category.dsl.EmbeddedFlowPalpablePhrasingDsl @@ -15,9 +17,9 @@ import net.kigawa.renlin.w3c.category.dsl.EmbeddedFlowPalpablePhrasingDsl * model.Categories: FlowContent, PhrasingContent, EmbeddedContent, PalpableContent */ class CanvasDsl(dslState: DslState): - DslBase(dslState), - StatedDsl, - EmbeddedFlowPalpablePhrasingDsl { + DslBase(dslState), + StatedDsl, + EmbeddedFlowPalpablePhrasingDsl { override fun applyElement(element: TagNode): ()->Unit { return {} } @@ -25,7 +27,7 @@ class CanvasDsl(dslState: DslState): val canvas = TagComponent1(Canvas, ::CanvasDsl) -object Canvas : Tag { +object Canvas : Tag { override val name: String get() = "canvas" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Caption.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Caption.kt index 3ff4fba..938e3ba 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Caption.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Caption.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.CaptionCategory import net.kigawa.renlin.w3c.category.dsl.FlowContentDsl @@ -25,7 +27,7 @@ class CaptionDsl(dslState: DslState): val caption = TagComponent1(Caption, ::CaptionDsl) -object Caption : Tag { +object Caption : Tag { override val name: String get() = "caption" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Cite.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Cite.kt index 292fe86..957a8a3 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Cite.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Cite.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.CiteCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class CiteDsl(dslState: DslState): val cite = TagComponent1(Cite, ::CiteDsl) -object Cite : Tag { +object Cite : Tag { override val name: String get() = "cite" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Code.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Code.kt index a90e93e..612e2f0 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Code.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Code.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.CodeCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class CodeDsl(dslState: DslState): val code = TagComponent1(Code, ::CodeDsl) -object Code : Tag { +object Code : Tag { override val name: String get() = "code" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Col.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Col.kt index e1f1015..a74c954 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Col.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Col.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.ColCategory import net.kigawa.renlin.w3c.category.dsl.FlowContentDsl @@ -25,7 +27,7 @@ class ColDsl(dslState: DslState): val col = TagComponent1(Col, ::ColDsl) -object Col : Tag { +object Col : Tag { override val name: String get() = "col" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Colgroup.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Colgroup.kt index ff6086d..e0d4197 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Colgroup.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Colgroup.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.ColgroupCategory import net.kigawa.renlin.w3c.category.dsl.FlowContentDsl @@ -25,7 +27,7 @@ class ColgroupDsl(dslState: DslState): val colgroup = TagComponent1(Colgroup, ::ColgroupDsl) -object Colgroup : Tag { +object Colgroup : Tag { override val name: String get() = "colgroup" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Data.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Data.kt index 6d51909..25b5cc0 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Data.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Data.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.DataCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class DataDsl(dslState: DslState): val data = TagComponent1(Data, ::DataDsl) -object Data : Tag { +object Data : Tag { override val name: String get() = "data" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Datalist.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Datalist.kt index 0eca1da..5767fa6 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Datalist.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Datalist.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.DatalistCategory import net.kigawa.renlin.w3c.category.dsl.FlowPhrasingDsl @@ -15,9 +17,9 @@ import net.kigawa.renlin.w3c.category.dsl.FlowPhrasingDsl * model.Categories: FlowContent, PhrasingContent */ class DatalistDsl(dslState: DslState): - DslBase(dslState), - StatedDsl, - FlowPhrasingDsl { + DslBase(dslState), + StatedDsl, + FlowPhrasingDsl { override fun applyElement(element: TagNode): ()->Unit { return {} } @@ -25,7 +27,7 @@ class DatalistDsl(dslState: DslState): val datalist = TagComponent1(Datalist, ::DatalistDsl) -object Datalist : Tag { +object Datalist : Tag { override val name: String get() = "datalist" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dd.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dd.kt index 8dbc3dd..5271b48 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dd.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dd.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.DdCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class DdDsl(dslState: DslState): val dd = TagComponent1(Dd, ::DdDsl) -object Dd : Tag { +object Dd : Tag { override val name: String get() = "dd" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Del.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Del.kt index 57b9555..30ac68e 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Del.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Del.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.DelCategory import net.kigawa.renlin.w3c.category.dsl.FlowPalpablePhrasingDsl @@ -15,9 +17,9 @@ import net.kigawa.renlin.w3c.category.dsl.FlowPalpablePhrasingDsl * model.Categories: FlowContent, PhrasingContent, PalpableContent */ class DelDsl(dslState: DslState): - DslBase(dslState), - StatedDsl, - FlowPalpablePhrasingDsl { + DslBase(dslState), + StatedDsl, + FlowPalpablePhrasingDsl { override fun applyElement(element: TagNode): ()->Unit { return {} } @@ -25,7 +27,7 @@ class DelDsl(dslState: DslState): val del = TagComponent1(Del, ::DelDsl) -object Del : Tag { +object Del : Tag { override val name: String get() = "del" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Details.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Details.kt index d801ea7..1e84fef 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Details.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Details.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowInteractivePalpableIntegration +import net.kigawa.renlin.w3c.category.integration.FlowInteractivePalpable import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.DetailsCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class DetailsDsl(dslState: DslState): val details = TagComponent1(Details, ::DetailsDsl) -object Details : Tag { +object Details : Tag { override val name: String get() = "details" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dfn.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dfn.kt index a9c5fdf..ff9abb3 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dfn.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dfn.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.DfnCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class DfnDsl(dslState: DslState): val dfn = TagComponent1(Dfn, ::DfnDsl) -object Dfn : Tag { +object Dfn : Tag { override val name: String get() = "dfn" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dialog.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dialog.kt index 456f2e5..2a47151 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dialog.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dialog.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.DialogCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class DialogDsl(dslState: DslState): val dialog = TagComponent1(Dialog, ::DialogDsl) -object Dialog : Tag { +object Dialog : Tag { override val name: String get() = "dialog" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Div.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Div.kt index f08278a..04b5998 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Div.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Div.kt @@ -1,12 +1,14 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration - import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpable + import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.DivCategory import net.kigawa.renlin.w3c.category.dsl.FlowPalpablePhrasingDsl @@ -16,9 +18,9 @@ import net.kigawa.renlin.w3c.category.dsl.FlowPalpablePhrasingDsl * model.Categories: FlowContent, PalpableContent */ class DivDsl(dslState: DslState): - DslBase(dslState), - StatedDsl, - FlowPalpablePhrasingDsl { + DslBase(dslState), + StatedDsl, + FlowPalpablePhrasingDsl { override fun applyElement(element: TagNode): ()->Unit { return {} } @@ -26,7 +28,7 @@ class DivDsl(dslState: DslState): val div = TagComponent1(Div, ::DivDsl) -object Div : Tag { +object Div : Tag { override val name: String get() = "div" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dl.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dl.kt index 32ed6c1..87d148f 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dl.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dl.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpable import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.DlCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class DlDsl(dslState: DslState): val dl = TagComponent1(Dl, ::DlDsl) -object Dl : Tag { +object Dl : Tag { override val name: String get() = "dl" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dt.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dt.kt index 015cec6..6775f50 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dt.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dt.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.DtCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class DtDsl(dslState: DslState): val dt = TagComponent1(Dt, ::DtDsl) -object Dt : Tag { +object Dt : Tag { override val name: String get() = "dt" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Em.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Em.kt index 0cb20d1..a43dbe9 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Em.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Em.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.EmCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class EmDsl(dslState: DslState): val em = TagComponent1(Em, ::EmDsl) -object Em : Tag { +object Em : Tag { override val name: String get() = "em" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Embed.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Embed.kt index b10c405..0177488 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Embed.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Embed.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowInteractivePalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowInteractivePalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.EmbedCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class EmbedDsl(dslState: DslState): val embed = TagComponent1(Embed, ::EmbedDsl) -object Embed : Tag { +object Embed : Tag { override val name: String get() = "embed" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Fencedframe.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Fencedframe.kt index c599d73..f20eb35 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Fencedframe.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Fencedframe.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.FencedframeCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class FencedframeDsl(dslState: DslState): val fencedframe = TagComponent1(Fencedframe, ::FencedframeDsl) -object Fencedframe : Tag { +object Fencedframe : Tag { override val name: String get() = "fencedframe" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Fieldset.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Fieldset.kt index 2f80a49..c8cca91 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Fieldset.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Fieldset.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration +import net.kigawa.renlin.w3c.category.integration.AutocapitalizeInheritingFormFlowFormAssociatedPalpable import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.FieldsetCategory import net.kigawa.renlin.w3c.category.dsl.AutocapitalizeInheritingFormFlowFormAssociatedPalpableDsl @@ -15,9 +17,9 @@ import net.kigawa.renlin.w3c.category.dsl.AutocapitalizeInheritingFormFlowFormAs * model.Categories: FlowContent, PalpableContent, FormAssociatedContent, AutocapitalizeInheritingFormContent */ class FieldsetDsl(dslState: DslState): - DslBase(dslState), - StatedDsl, - AutocapitalizeInheritingFormFlowFormAssociatedPalpableDsl { + DslBase(dslState), + StatedDsl, + AutocapitalizeInheritingFormFlowFormAssociatedPalpableDsl { override fun applyElement(element: TagNode): ()->Unit { return {} } @@ -25,7 +27,7 @@ class FieldsetDsl(dslState: DslState): val fieldset = TagComponent1(Fieldset, ::FieldsetDsl) -object Fieldset : Tag { +object Fieldset : Tag { override val name: String get() = "fieldset" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Figcaption.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Figcaption.kt index c1e4d0a..faecfd6 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Figcaption.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Figcaption.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.FigcaptionCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class FigcaptionDsl(dslState: DslState): val figcaption = TagComponent1(Figcaption, ::FigcaptionDsl) -object Figcaption : Tag { +object Figcaption : Tag { override val name: String get() = "figcaption" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Figure.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Figure.kt index b41d2a0..cdf63db 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Figure.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Figure.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpable import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.FigureCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class FigureDsl(dslState: DslState): val figure = TagComponent1(Figure, ::FigureDsl) -object Figure : Tag { +object Figure : Tag { override val name: String get() = "figure" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Footer.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Footer.kt index a176485..518115b 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Footer.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Footer.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpable import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.FooterCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class FooterDsl(dslState: DslState): val footer = TagComponent1(Footer, ::FooterDsl) -object Footer : Tag { +object Footer : Tag { override val name: String get() = "footer" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Form.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Form.kt index d64c7e0..fbc78e9 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Form.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Form.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpable import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.FormCategory import net.kigawa.renlin.w3c.category.dsl.FlowPalpableDsl @@ -15,9 +17,9 @@ import net.kigawa.renlin.w3c.category.dsl.FlowPalpableDsl * model.Categories: FlowContent, PalpableContent */ class FormDsl(dslState: DslState): - DslBase(dslState), - StatedDsl, - FlowPalpableDsl { + DslBase(dslState), + StatedDsl, + FlowPalpableDsl { override fun applyElement(element: TagNode): ()->Unit { return {} } @@ -25,7 +27,7 @@ class FormDsl(dslState: DslState): val form = TagComponent1(Form, ::FormDsl) -object Form : Tag { +object Form : Tag { override val name: String get() = "form" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H1.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H1.kt index d570c14..575ee16 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H1.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H1.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowHeadingPalpableIntegration +import net.kigawa.renlin.w3c.category.integration.FlowHeadingPalpable import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.H1Category import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class H1Dsl(dslState: DslState): val h1 = TagComponent1(H1, ::H1Dsl) -object H1 : Tag { +object H1 : Tag { override val name: String get() = "h1" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H2.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H2.kt index bf6ebaf..c4baf41 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H2.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H2.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowHeadingPalpableIntegration +import net.kigawa.renlin.w3c.category.integration.FlowHeadingPalpable import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.H2Category import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class H2Dsl(dslState: DslState): val h2 = TagComponent1(H2, ::H2Dsl) -object H2 : Tag { +object H2 : Tag { override val name: String get() = "h2" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H3.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H3.kt index bdbc6d2..fe3b8d2 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H3.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H3.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowHeadingPalpableIntegration +import net.kigawa.renlin.w3c.category.integration.FlowHeadingPalpable import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.H3Category import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class H3Dsl(dslState: DslState): val h3 = TagComponent1(H3, ::H3Dsl) -object H3 : Tag { +object H3 : Tag { override val name: String get() = "h3" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H4.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H4.kt index 29c2650..0e8b771 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H4.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H4.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowHeadingPalpableIntegration +import net.kigawa.renlin.w3c.category.integration.FlowHeadingPalpable import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.H4Category import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class H4Dsl(dslState: DslState): val h4 = TagComponent1(H4, ::H4Dsl) -object H4 : Tag { +object H4 : Tag { override val name: String get() = "h4" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H5.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H5.kt index 0996b15..c7ad101 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H5.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H5.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowHeadingPalpableIntegration +import net.kigawa.renlin.w3c.category.integration.FlowHeadingPalpable import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.H5Category import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class H5Dsl(dslState: DslState): val h5 = TagComponent1(H5, ::H5Dsl) -object H5 : Tag { +object H5 : Tag { override val name: String get() = "h5" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H6.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H6.kt index 0cbdb14..471f8f9 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H6.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H6.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowHeadingPalpableIntegration +import net.kigawa.renlin.w3c.category.integration.FlowHeadingPalpable import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.H6Category import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class H6Dsl(dslState: DslState): val h6 = TagComponent1(H6, ::H6Dsl) -object H6 : Tag { +object H6 : Tag { override val name: String get() = "h6" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Head.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Head.kt index 68cec77..6453e4b 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Head.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Head.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.HeadCategory import net.kigawa.renlin.w3c.category.dsl.FlowContentDsl @@ -25,7 +27,7 @@ class HeadDsl(dslState: DslState): val head = TagComponent1(Head, ::HeadDsl) -object Head : Tag { +object Head : Tag { override val name: String get() = "head" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Header.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Header.kt index 7b1893d..dd808b4 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Header.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Header.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpable import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.HeaderCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class HeaderDsl(dslState: DslState): val header = TagComponent1(Header, ::HeaderDsl) -object Header : Tag { +object Header : Tag { override val name: String get() = "header" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Hgroup.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Hgroup.kt index c135058..ee5e058 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Hgroup.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Hgroup.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowHeadingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowHeading import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.HgroupCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class HgroupDsl(dslState: DslState): val hgroup = TagComponent1(Hgroup, ::HgroupDsl) -object Hgroup : Tag { +object Hgroup : Tag { override val name: String get() = "hgroup" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Hr.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Hr.kt index f17ee1a..ca594b0 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Hr.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Hr.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.HrCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class HrDsl(dslState: DslState): val hr = TagComponent1(Hr, ::HrDsl) -object Hr : Tag { +object Hr : Tag { override val name: String get() = "hr" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Html.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Html.kt index 5256ff4..19734ca 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Html.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Html.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.HtmlCategory import net.kigawa.renlin.w3c.category.dsl.FlowContentDsl @@ -25,7 +27,7 @@ class HtmlDsl(dslState: DslState): val html = TagComponent1(Html, ::HtmlDsl) -object Html : Tag { +object Html : Tag { override val name: String get() = "html" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/I.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/I.kt index c1394bd..0f7a1ec 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/I.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/I.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.ICategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class IDsl(dslState: DslState): val i = TagComponent1(I, ::IDsl) -object I : Tag { +object I : Tag { override val name: String get() = "i" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Iframe.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Iframe.kt index 397b52e..ee038b2 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Iframe.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Iframe.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowInteractivePalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowInteractivePalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.IframeCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class IframeDsl(dslState: DslState): val iframe = TagComponent1(Iframe, ::IframeDsl) -object Iframe : Tag { +object Iframe : Tag { override val name: String get() = "iframe" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Img.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Img.kt index e25c6f8..7a028b0 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Img.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Img.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowFormAssociatedInteractivePalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.ImgCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class ImgDsl(dslState: DslState): val img = TagComponent1(Img, ::ImgDsl) -object Img : Tag { +object Img : Tag { override val name: String get() = "img" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Input.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Input.kt index feebf4e..442e57f 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Input.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Input.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowFormAssociatedInteractivePalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowFormAssociatedInteractivePalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.InputCategory import net.kigawa.renlin.w3c.category.dsl.FlowFormAssociatedInteractivePalpablePhrasingDsl @@ -15,9 +17,9 @@ import net.kigawa.renlin.w3c.category.dsl.FlowFormAssociatedInteractivePalpableP * model.Categories: FlowContent, PhrasingContent, PalpableContent, InteractiveContent, FormAssociatedContent */ class InputDsl(dslState: DslState): - DslBase(dslState), - StatedDsl, - FlowFormAssociatedInteractivePalpablePhrasingDsl { + DslBase(dslState), + StatedDsl, + FlowFormAssociatedInteractivePalpablePhrasingDsl { override fun applyElement(element: TagNode): ()->Unit { return {} } @@ -25,7 +27,7 @@ class InputDsl(dslState: DslState): val input = TagComponent1(Input, ::InputDsl) -object Input : Tag { +object Input : Tag { override val name: String get() = "input" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ins.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ins.kt index fe3927d..6de7eeb 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ins.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ins.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.InsCategory import net.kigawa.renlin.w3c.category.dsl.FlowPalpablePhrasingDsl @@ -15,9 +17,9 @@ import net.kigawa.renlin.w3c.category.dsl.FlowPalpablePhrasingDsl * model.Categories: FlowContent, PhrasingContent, PalpableContent */ class InsDsl(dslState: DslState): - DslBase(dslState), - StatedDsl, - FlowPalpablePhrasingDsl { + DslBase(dslState), + StatedDsl, + FlowPalpablePhrasingDsl { override fun applyElement(element: TagNode): ()->Unit { return {} } @@ -25,7 +27,7 @@ class InsDsl(dslState: DslState): val ins = TagComponent1(Ins, ::InsDsl) -object Ins : Tag { +object Ins : Tag { override val name: String get() = "ins" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Kbd.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Kbd.kt index 492fde9..6514c07 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Kbd.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Kbd.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.KbdCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class KbdDsl(dslState: DslState): val kbd = TagComponent1(Kbd, ::KbdDsl) -object Kbd : Tag { +object Kbd : Tag { override val name: String get() = "kbd" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Label.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Label.kt index fb3f9a0..64c6cf8 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Label.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Label.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowInteractivePalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowInteractivePalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.LabelCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class LabelDsl(dslState: DslState): val label = TagComponent1(Label, ::LabelDsl) -object Label : Tag { +object Label : Tag { override val name: String get() = "label" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Legend.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Legend.kt index ad8fb78..c229963 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Legend.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Legend.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.LegendCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class LegendDsl(dslState: DslState): val legend = TagComponent1(Legend, ::LegendDsl) -object Legend : Tag { +object Legend : Tag { override val name: String get() = "legend" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Li.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Li.kt index 308ea30..9e74541 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Li.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Li.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.LiCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class LiDsl(dslState: DslState): val li = TagComponent1(Li, ::LiDsl) -object Li : Tag { +object Li : Tag { override val name: String get() = "li" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Link.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Link.kt index cdf1d04..1410fd7 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Link.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Link.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowMetadataPhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowMetadataPhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.LinkCategory import net.kigawa.renlin.w3c.category.dsl.FlowMetadataPhrasingDsl @@ -15,9 +17,9 @@ import net.kigawa.renlin.w3c.category.dsl.FlowMetadataPhrasingDsl * model.Categories: MetadataContent, FlowContent, PhrasingContent */ class LinkDsl(dslState: DslState): - DslBase(dslState), - StatedDsl, - FlowMetadataPhrasingDsl { + DslBase(dslState), + StatedDsl, + FlowMetadataPhrasingDsl { override fun applyElement(element: TagNode): ()->Unit { return {} } @@ -25,7 +27,7 @@ class LinkDsl(dslState: DslState): val link = TagComponent1(Link, ::LinkDsl) -object Link : Tag { +object Link : Tag { override val name: String get() = "link" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Main.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Main.kt index de3c815..49688c9 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Main.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Main.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpable import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.MainCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class MainDsl(dslState: DslState): val main = TagComponent1(Main, ::MainDsl) -object Main : Tag { +object Main : Tag { override val name: String get() = "main" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Map.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Map.kt index fd608e3..28898eb 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Map.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Map.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.MapCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class MapDsl(dslState: DslState): val map = TagComponent1(Map, ::MapDsl) -object Map : Tag { +object Map : Tag { override val name: String get() = "map" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Mark.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Mark.kt index 5de1ccf..4041b29 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Mark.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Mark.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.MarkCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class MarkDsl(dslState: DslState): val mark = TagComponent1(Mark, ::MarkDsl) -object Mark : Tag { +object Mark : Tag { override val name: String get() = "mark" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Math.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Math.kt index 2dcb568..7bd6029 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Math.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Math.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.MathCategory import net.kigawa.renlin.w3c.category.dsl.EmbeddedFlowPalpablePhrasingDsl @@ -15,9 +17,9 @@ import net.kigawa.renlin.w3c.category.dsl.EmbeddedFlowPalpablePhrasingDsl * model.Categories: FlowContent, PhrasingContent, EmbeddedContent, PalpableContent */ class MathDsl(dslState: DslState): - DslBase(dslState), - StatedDsl, - EmbeddedFlowPalpablePhrasingDsl { + DslBase(dslState), + StatedDsl, + EmbeddedFlowPalpablePhrasingDsl { override fun applyElement(element: TagNode): ()->Unit { return {} } @@ -25,7 +27,7 @@ class MathDsl(dslState: DslState): val math = TagComponent1(Math, ::MathDsl) -object Math : Tag { +object Math : Tag { override val name: String get() = "math" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Menu.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Menu.kt index 1fea4a0..6dc6f6b 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Menu.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Menu.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.MenuCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class MenuDsl(dslState: DslState): val menu = TagComponent1(Menu, ::MenuDsl) -object Menu : Tag { +object Menu : Tag { override val name: String get() = "menu" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Meta.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Meta.kt index 436a296..a7f21cf 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Meta.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Meta.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowMetadataPhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowMetadataPhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.MetaCategory import net.kigawa.renlin.w3c.category.dsl.FlowMetadataPhrasingDsl @@ -15,9 +17,9 @@ import net.kigawa.renlin.w3c.category.dsl.FlowMetadataPhrasingDsl * model.Categories: MetadataContent, FlowContent, PhrasingContent */ class MetaDsl(dslState: DslState): - DslBase(dslState), - StatedDsl, - FlowMetadataPhrasingDsl { + DslBase(dslState), + StatedDsl, + FlowMetadataPhrasingDsl { override fun applyElement(element: TagNode): ()->Unit { return {} } @@ -25,7 +27,7 @@ class MetaDsl(dslState: DslState): val meta = TagComponent1(Meta, ::MetaDsl) -object Meta : Tag { +object Meta : Tag { override val name: String get() = "meta" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Meter.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Meter.kt index 1e35cdc..6b15da7 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Meter.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Meter.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.MeterCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class MeterDsl(dslState: DslState): val meter = TagComponent1(Meter, ::MeterDsl) -object Meter : Tag { +object Meter : Tag { override val name: String get() = "meter" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Nav.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Nav.kt index 9db050a..ce44ae0 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Nav.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Nav.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpableSectioningIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpableSectioning import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.NavCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class NavDsl(dslState: DslState): val nav = TagComponent1(Nav, ::NavDsl) -object Nav : Tag { +object Nav : Tag { override val name: String get() = "nav" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Noscript.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Noscript.kt index 7e9db33..018811b 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Noscript.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Noscript.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowMetadataPhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowMetadataPhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.NoscriptCategory import net.kigawa.renlin.w3c.category.dsl.FlowMetadataPhrasingDsl @@ -15,9 +17,9 @@ import net.kigawa.renlin.w3c.category.dsl.FlowMetadataPhrasingDsl * model.Categories: MetadataContent, FlowContent, PhrasingContent */ class NoscriptDsl(dslState: DslState): - DslBase(dslState), - StatedDsl, - FlowMetadataPhrasingDsl { + DslBase(dslState), + StatedDsl, + FlowMetadataPhrasingDsl { override fun applyElement(element: TagNode): ()->Unit { return {} } @@ -25,7 +27,7 @@ class NoscriptDsl(dslState: DslState): val noscript = TagComponent1(Noscript, ::NoscriptDsl) -object Noscript : Tag { +object Noscript : Tag { override val name: String get() = "noscript" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Object.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Object.kt index 2100997..3ba07a2 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Object.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Object.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowFormAssociatedInteractivePalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.ObjectCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class ObjectDsl(dslState: DslState): val `object` = TagComponent1(Object, ::ObjectDsl) -object Object : Tag { +object Object : Tag { override val name: String get() = "object" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ol.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ol.kt index ae3ca3d..80a6e4c 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ol.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ol.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpable import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.OlCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class OlDsl(dslState: DslState): val ol = TagComponent1(Ol, ::OlDsl) -object Ol : Tag { +object Ol : Tag { override val name: String get() = "ol" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Optgroup.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Optgroup.kt index 8826695..7d28532 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Optgroup.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Optgroup.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.OptgroupCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class OptgroupDsl(dslState: DslState): val optgroup = TagComponent1(Optgroup, ::OptgroupDsl) -object Optgroup : Tag { +object Optgroup : Tag { override val name: String get() = "optgroup" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Option.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Option.kt index 47083f0..2f3a32a 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Option.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Option.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.OptionCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class OptionDsl(dslState: DslState): val option = TagComponent1(Option, ::OptionDsl) -object Option : Tag { +object Option : Tag { override val name: String get() = "option" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Output.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Output.kt index 3ee0270..e285c3f 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Output.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Output.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowFormAssociatedPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowFormAssociatedPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.OutputCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class OutputDsl(dslState: DslState): val output = TagComponent1(Output, ::OutputDsl) -object Output : Tag { +object Output : Tag { override val name: String get() = "output" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/P.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/P.kt index 62ed194..8cdab62 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/P.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/P.kt @@ -1,12 +1,14 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpable import net.kigawa.renlin.w3c.category.native.PhrasingContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.PCategory import net.kigawa.renlin.w3c.category.dsl.PhrasingContentDsl @@ -26,7 +28,7 @@ class PDsl(dslState: DslState): val p = TagComponent1(P, ::PDsl) -object P : Tag { +object P : Tag { override val name: String get() = "p" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Picture.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Picture.kt index 229e166..8cdec7d 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Picture.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Picture.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.PictureCategory import net.kigawa.renlin.w3c.category.dsl.EmbeddedFlowPalpablePhrasingDsl @@ -15,9 +17,9 @@ import net.kigawa.renlin.w3c.category.dsl.EmbeddedFlowPalpablePhrasingDsl * model.Categories: FlowContent, PhrasingContent, EmbeddedContent, PalpableContent */ class PictureDsl(dslState: DslState): - DslBase(dslState), - StatedDsl, - EmbeddedFlowPalpablePhrasingDsl { + DslBase(dslState), + StatedDsl, + EmbeddedFlowPalpablePhrasingDsl { override fun applyElement(element: TagNode): ()->Unit { return {} } @@ -25,7 +27,7 @@ class PictureDsl(dslState: DslState): val picture = TagComponent1(Picture, ::PictureDsl) -object Picture : Tag { +object Picture : Tag { override val name: String get() = "picture" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Pre.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Pre.kt index 8899452..56e04d5 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Pre.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Pre.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpable import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.PreCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class PreDsl(dslState: DslState): val pre = TagComponent1(Pre, ::PreDsl) -object Pre : Tag { +object Pre : Tag { override val name: String get() = "pre" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Progress.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Progress.kt index 731a67f..b58249e 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Progress.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Progress.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.ProgressCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class ProgressDsl(dslState: DslState): val progress = TagComponent1(Progress, ::ProgressDsl) -object Progress : Tag { +object Progress : Tag { override val name: String get() = "progress" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Q.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Q.kt index 1030d2c..1faf7bf 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Q.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Q.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.QCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class QDsl(dslState: DslState): val q = TagComponent1(Q, ::QDsl) -object Q : Tag { +object Q : Tag { override val name: String get() = "q" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Rp.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Rp.kt index f78f3e6..743c956 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Rp.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Rp.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.RpCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class RpDsl(dslState: DslState): val rp = TagComponent1(Rp, ::RpDsl) -object Rp : Tag { +object Rp : Tag { override val name: String get() = "rp" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Rt.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Rt.kt index 2b02f84..892c0f1 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Rt.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Rt.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.RtCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class RtDsl(dslState: DslState): val rt = TagComponent1(Rt, ::RtDsl) -object Rt : Tag { +object Rt : Tag { override val name: String get() = "rt" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ruby.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ruby.kt index e85bb27..d4e8ccf 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ruby.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ruby.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.RubyCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class RubyDsl(dslState: DslState): val ruby = TagComponent1(Ruby, ::RubyDsl) -object Ruby : Tag { +object Ruby : Tag { override val name: String get() = "ruby" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/S.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/S.kt index 241d276..00849fa 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/S.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/S.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.SCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class SDsl(dslState: DslState): val s = TagComponent1(S, ::SDsl) -object S : Tag { +object S : Tag { override val name: String get() = "s" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Samp.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Samp.kt index 8eb8a72..f061e7f 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Samp.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Samp.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.SampCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class SampDsl(dslState: DslState): val samp = TagComponent1(Samp, ::SampDsl) -object Samp : Tag { +object Samp : Tag { override val name: String get() = "samp" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Script.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Script.kt index 4673126..ae25c44 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Script.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Script.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowMetadataPhrasingScriptSupportingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowMetadataPhrasingScriptSupporting import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.ScriptCategory import net.kigawa.renlin.w3c.category.dsl.FlowMetadataPhrasingScriptSupportingDsl @@ -15,9 +17,9 @@ import net.kigawa.renlin.w3c.category.dsl.FlowMetadataPhrasingScriptSupportingDs * model.Categories: MetadataContent, FlowContent, PhrasingContent, ScriptSupportingContent */ class ScriptDsl(dslState: DslState): - DslBase(dslState), - StatedDsl, - FlowMetadataPhrasingScriptSupportingDsl { + DslBase(dslState), + StatedDsl, + FlowMetadataPhrasingScriptSupportingDsl { override fun applyElement(element: TagNode): ()->Unit { return {} } @@ -25,7 +27,7 @@ class ScriptDsl(dslState: DslState): val script = TagComponent1(Script, ::ScriptDsl) -object Script : Tag { +object Script : Tag { override val name: String get() = "script" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Search.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Search.kt index 18f662e..d597ec6 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Search.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Search.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpable import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.SearchCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class SearchDsl(dslState: DslState): val search = TagComponent1(Search, ::SearchDsl) -object Search : Tag { +object Search : Tag { override val name: String get() = "search" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Section.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Section.kt index 48c566e..3961cd8 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Section.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Section.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpableSectioningIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpableSectioning import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.SectionCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class SectionDsl(dslState: DslState): val section = TagComponent1(Section, ::SectionDsl) -object Section : Tag { +object Section : Tag { override val name: String get() = "section" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Select.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Select.kt index 9629038..059f5f2 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Select.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Select.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowFormAssociatedInteractivePalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowFormAssociatedInteractivePalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.SelectCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class SelectDsl(dslState: DslState): val select = TagComponent1(Select, ::SelectDsl) -object Select : Tag { +object Select : Tag { override val name: String get() = "select" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Selectedcontent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Selectedcontent.kt index fc6bb16..ac3888a 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Selectedcontent.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Selectedcontent.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.SelectedcontentCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class SelectedcontentDsl(dslState: DslState): val selectedcontent = TagComponent1(Selectedcontent, ::SelectedcontentDsl) -object Selectedcontent : Tag { +object Selectedcontent : Tag { override val name: String get() = "selectedcontent" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Slot.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Slot.kt index 47ebf96..de608c6 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Slot.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Slot.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.SlotCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class SlotDsl(dslState: DslState): val slot = TagComponent1(Slot, ::SlotDsl) -object Slot : Tag { +object Slot : Tag { override val name: String get() = "slot" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Small.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Small.kt index 184c786..67117b9 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Small.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Small.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.SmallCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class SmallDsl(dslState: DslState): val small = TagComponent1(Small, ::SmallDsl) -object Small : Tag { +object Small : Tag { override val name: String get() = "small" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Source.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Source.kt index 14326e3..5392600 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Source.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Source.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.SourceCategory import net.kigawa.renlin.w3c.category.dsl.FlowContentDsl @@ -25,7 +27,7 @@ class SourceDsl(dslState: DslState): val source = TagComponent1(Source, ::SourceDsl) -object Source : Tag { +object Source : Tag { override val name: String get() = "source" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Span.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Span.kt index 8706606..2a3cef9 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Span.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Span.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.SpanCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class SpanDsl(dslState: DslState): val span = TagComponent1(Span, ::SpanDsl) -object Span : Tag { +object Span : Tag { override val name: String get() = "span" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Strong.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Strong.kt index 4290eb8..e1ed528 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Strong.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Strong.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.StrongCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class StrongDsl(dslState: DslState): val strong = TagComponent1(Strong, ::StrongDsl) -object Strong : Tag { +object Strong : Tag { override val name: String get() = "strong" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Style.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Style.kt index a1bcd94..a4e13c0 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Style.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Style.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.MetadataContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.StyleCategory import net.kigawa.renlin.w3c.category.dsl.MetadataContentDsl @@ -25,7 +27,7 @@ class StyleDsl(dslState: DslState): val style = TagComponent1(Style, ::StyleDsl) -object Style : Tag { +object Style : Tag { override val name: String get() = "style" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Sub.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Sub.kt index 3144a76..a3a77f0 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Sub.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Sub.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.SubCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class SubDsl(dslState: DslState): val sub = TagComponent1(Sub, ::SubDsl) -object Sub : Tag { +object Sub : Tag { override val name: String get() = "sub" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Summary.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Summary.kt index dbf0eb4..87250a6 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Summary.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Summary.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.SummaryCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class SummaryDsl(dslState: DslState): val summary = TagComponent1(Summary, ::SummaryDsl) -object Summary : Tag { +object Summary : Tag { override val name: String get() = "summary" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Sup.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Sup.kt index 96a6c37..2b404d6 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Sup.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Sup.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.SupCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class SupDsl(dslState: DslState): val sup = TagComponent1(Sup, ::SupDsl) -object Sup : Tag { +object Sup : Tag { override val name: String get() = "sup" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Svg.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Svg.kt index 4551a81..3f80092 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Svg.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Svg.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.SvgCategory import net.kigawa.renlin.w3c.category.dsl.EmbeddedFlowPalpablePhrasingDsl @@ -15,9 +17,9 @@ import net.kigawa.renlin.w3c.category.dsl.EmbeddedFlowPalpablePhrasingDsl * model.Categories: FlowContent, PhrasingContent, EmbeddedContent, PalpableContent */ class SvgDsl(dslState: DslState): - DslBase(dslState), - StatedDsl, - EmbeddedFlowPalpablePhrasingDsl { + DslBase(dslState), + StatedDsl, + EmbeddedFlowPalpablePhrasingDsl { override fun applyElement(element: TagNode): ()->Unit { return {} } @@ -25,7 +27,7 @@ class SvgDsl(dslState: DslState): val svg = TagComponent1(Svg, ::SvgDsl) -object Svg : Tag { +object Svg : Tag { override val name: String get() = "svg" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Table.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Table.kt index 419cd20..780cce0 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Table.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Table.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpable import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.TableCategory import net.kigawa.renlin.w3c.category.dsl.FlowPalpableDsl @@ -15,9 +17,9 @@ import net.kigawa.renlin.w3c.category.dsl.FlowPalpableDsl * model.Categories: FlowContent, PalpableContent */ class TableDsl(dslState: DslState): - DslBase(dslState), - StatedDsl, - FlowPalpableDsl { + DslBase(dslState), + StatedDsl, + FlowPalpableDsl { override fun applyElement(element: TagNode): ()->Unit { return {} } @@ -25,7 +27,7 @@ class TableDsl(dslState: DslState): val table = TagComponent1(Table, ::TableDsl) -object Table : Tag { +object Table : Tag { override val name: String get() = "table" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tbody.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tbody.kt index c90d530..4566280 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tbody.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tbody.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.TbodyCategory import net.kigawa.renlin.w3c.category.dsl.FlowContentDsl @@ -25,7 +27,7 @@ class TbodyDsl(dslState: DslState): val tbody = TagComponent1(Tbody, ::TbodyDsl) -object Tbody : Tag { +object Tbody : Tag { override val name: String get() = "tbody" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Td.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Td.kt index dc1ce3f..e7e974b 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Td.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Td.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.TdCategory import net.kigawa.renlin.w3c.category.dsl.FlowContentDsl @@ -25,7 +27,7 @@ class TdDsl(dslState: DslState): val td = TagComponent1(Td, ::TdDsl) -object Td : Tag { +object Td : Tag { override val name: String get() = "td" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Template.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Template.kt index b22bbe8..1c9733f 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Template.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Template.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowMetadataPhrasingScriptSupportingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowMetadataPhrasingScriptSupporting import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.TemplateCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class TemplateDsl(dslState: DslState): val template = TagComponent1(Template, ::TemplateDsl) -object Template : Tag { +object Template : Tag { override val name: String get() = "template" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Textarea.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Textarea.kt index 14777e1..f341074 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Textarea.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Textarea.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowFormAssociatedInteractivePalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowFormAssociatedInteractivePalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.TextareaCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class TextareaDsl(dslState: DslState): val textarea = TagComponent1(Textarea, ::TextareaDsl) -object Textarea : Tag { +object Textarea : Tag { override val name: String get() = "textarea" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tfoot.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tfoot.kt index e94d083..f0dfdf4 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tfoot.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tfoot.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.TfootCategory import net.kigawa.renlin.w3c.category.dsl.FlowContentDsl @@ -25,7 +27,7 @@ class TfootDsl(dslState: DslState): val tfoot = TagComponent1(Tfoot, ::TfootDsl) -object Tfoot : Tag { +object Tfoot : Tag { override val name: String get() = "tfoot" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Th.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Th.kt index 92dd3b1..1a8fe4b 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Th.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Th.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.ThCategory import net.kigawa.renlin.w3c.category.dsl.FlowContentDsl @@ -25,7 +27,7 @@ class ThDsl(dslState: DslState): val th = TagComponent1(Th, ::ThDsl) -object Th : Tag { +object Th : Tag { override val name: String get() = "th" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Thead.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Thead.kt index d96805f..dafd56c 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Thead.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Thead.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.TheadCategory import net.kigawa.renlin.w3c.category.dsl.FlowContentDsl @@ -25,7 +27,7 @@ class TheadDsl(dslState: DslState): val thead = TagComponent1(Thead, ::TheadDsl) -object Thead : Tag { +object Thead : Tag { override val name: String get() = "thead" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Time.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Time.kt index d789755..91a9030 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Time.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Time.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.TimeCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class TimeDsl(dslState: DslState): val time = TagComponent1(Time, ::TimeDsl) -object Time : Tag { +object Time : Tag { override val name: String get() = "time" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Title.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Title.kt index a20921c..0d0f666 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Title.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Title.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.MetadataContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.TitleCategory import net.kigawa.renlin.w3c.category.dsl.MetadataContentDsl @@ -25,7 +27,7 @@ class TitleDsl(dslState: DslState): val title = TagComponent1(Title, ::TitleDsl) -object Title : Tag { +object Title : Tag { override val name: String get() = "title" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tr.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tr.kt index 7727939..6d4fa37 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tr.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tr.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.TrCategory import net.kigawa.renlin.w3c.category.dsl.FlowContentDsl @@ -25,7 +27,7 @@ class TrDsl(dslState: DslState): val tr = TagComponent1(Tr, ::TrDsl) -object Tr : Tag { +object Tr : Tag { override val name: String get() = "tr" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Track.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Track.kt index e4f4a97..00714b1 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Track.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Track.kt @@ -4,8 +4,10 @@ import net.kigawa.renlin.w3c.category.native.FlowContent import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.TrackCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class TrackDsl(dslState: DslState): val track = TagComponent1(Track, ::TrackDsl) -object Track : Tag { +object Track : Tag { override val name: String get() = "track" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/U.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/U.kt index d831cd6..d8be666 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/U.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/U.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.UCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class UDsl(dslState: DslState): val u = TagComponent1(U, ::UDsl) -object U : Tag { +object U : Tag { override val name: String get() = "u" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ul.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ul.kt index 6013538..db849b6 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ul.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ul.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpable import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.UlCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class UlDsl(dslState: DslState): val ul = TagComponent1(Ul, ::UlDsl) -object Ul : Tag { +object Ul : Tag { override val name: String get() = "ul" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Var.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Var.kt index 29c47fe..086aebc 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Var.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Var.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.VarCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class VarDsl(dslState: DslState): val `var` = TagComponent1(Var, ::VarDsl) -object Var : Tag { +object Var : Tag { override val name: String get() = "var" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Video.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Video.kt index 4b80ce8..3464e5d 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Video.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Video.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowInteractivePalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowInteractivePalpablePhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.VideoCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class VideoDsl(dslState: DslState): val video = TagComponent1(Video, ::VideoDsl) -object Video : Tag { +object Video : Tag { override val name: String get() = "video" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Wbr.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Wbr.kt index 1862644..83874a1 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Wbr.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Wbr.kt @@ -1,11 +1,13 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPhrasing import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 +import net.kigawa.renlin.component.Component import net.kigawa.renlin.w3c.element.TagNode import net.kigawa.renlin.state.DslState +import net.kigawa.renlin.w3c.category.native.WbrCategory import net.kigawa.renlin.w3c.category.ContentCategory /** @@ -23,7 +25,7 @@ class WbrDsl(dslState: DslState): val wbr = TagComponent1(Wbr, ::WbrDsl) -object Wbr : Tag { +object Wbr : Tag { override val name: String get() = "wbr" } \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/AutocapitalizeInheritingFormFlowFormAssociatedPalpableDsl.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/AutocapitalizeInheritingFormFlowFormAssociatedPalpableDsl.kt index dd03f13..905b2ef 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/AutocapitalizeInheritingFormFlowFormAssociatedPalpableDsl.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/AutocapitalizeInheritingFormFlowFormAssociatedPalpableDsl.kt @@ -1,13 +1,13 @@ package net.kigawa.renlin.w3c.category.dsl -import net.kigawa.renlin.w3c.category.integration.AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration +import net.kigawa.renlin.w3c.category.integration.AutocapitalizeInheritingFormFlowFormAssociatedPalpable /** * DSL for FlowContent, PalpableContent, FormAssociatedContent, AutocapitalizeInheritingFormContent */ -interface AutocapitalizeInheritingFormFlowFormAssociatedPalpableDsl: +interface AutocapitalizeInheritingFormFlowFormAssociatedPalpableDsl: FlowContentDsl, PalpableContentDsl, FormAssociatedContentDsl, diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/EmbeddedFlowPalpablePhrasingDsl.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/EmbeddedFlowPalpablePhrasingDsl.kt index 60c4d73..d88c32e 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/EmbeddedFlowPalpablePhrasingDsl.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/EmbeddedFlowPalpablePhrasingDsl.kt @@ -1,13 +1,13 @@ package net.kigawa.renlin.w3c.category.dsl -import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowPalpablePhrasing /** * DSL for FlowContent, PhrasingContent, EmbeddedContent, PalpableContent */ -interface EmbeddedFlowPalpablePhrasingDsl: +interface EmbeddedFlowPalpablePhrasingDsl: FlowContentDsl, PhrasingContentDsl, EmbeddedContentDsl, diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowFormAssociatedInteractivePalpablePhrasingDsl.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowFormAssociatedInteractivePalpablePhrasingDsl.kt index 4ccf61b..5479706 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowFormAssociatedInteractivePalpablePhrasingDsl.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowFormAssociatedInteractivePalpablePhrasingDsl.kt @@ -1,13 +1,13 @@ package net.kigawa.renlin.w3c.category.dsl -import net.kigawa.renlin.w3c.category.integration.FlowFormAssociatedInteractivePalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowFormAssociatedInteractivePalpablePhrasing /** * DSL for FlowContent, PhrasingContent, InteractiveContent, PalpableContent, FormAssociatedContent */ -interface FlowFormAssociatedInteractivePalpablePhrasingDsl: +interface FlowFormAssociatedInteractivePalpablePhrasingDsl: FlowContentDsl, PhrasingContentDsl, InteractiveContentDsl, diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowInteractivePalpablePhrasingDsl.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowInteractivePalpablePhrasingDsl.kt index aa917b5..4183131 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowInteractivePalpablePhrasingDsl.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowInteractivePalpablePhrasingDsl.kt @@ -1,13 +1,13 @@ package net.kigawa.renlin.w3c.category.dsl -import net.kigawa.renlin.w3c.category.integration.FlowInteractivePalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowInteractivePalpablePhrasing /** * DSL for FlowContent, PhrasingContent, PalpableContent, InteractiveContent */ -interface FlowInteractivePalpablePhrasingDsl: +interface FlowInteractivePalpablePhrasingDsl: FlowContentDsl, PhrasingContentDsl, PalpableContentDsl, diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowMetadataPhrasingDsl.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowMetadataPhrasingDsl.kt index 606cefc..61eb3b3 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowMetadataPhrasingDsl.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowMetadataPhrasingDsl.kt @@ -1,13 +1,13 @@ package net.kigawa.renlin.w3c.category.dsl -import net.kigawa.renlin.w3c.category.integration.FlowMetadataPhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowMetadataPhrasing /** * DSL for MetadataContent, FlowContent, PhrasingContent */ -interface FlowMetadataPhrasingDsl: +interface FlowMetadataPhrasingDsl: MetadataContentDsl, FlowContentDsl, PhrasingContentDsl \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowMetadataPhrasingScriptSupportingDsl.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowMetadataPhrasingScriptSupportingDsl.kt index 0a03bce..3b0061d 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowMetadataPhrasingScriptSupportingDsl.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowMetadataPhrasingScriptSupportingDsl.kt @@ -1,13 +1,13 @@ package net.kigawa.renlin.w3c.category.dsl -import net.kigawa.renlin.w3c.category.integration.FlowMetadataPhrasingScriptSupportingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowMetadataPhrasingScriptSupporting /** * DSL for MetadataContent, FlowContent, PhrasingContent, ScriptSupportingContent */ -interface FlowMetadataPhrasingScriptSupportingDsl: +interface FlowMetadataPhrasingScriptSupportingDsl: MetadataContentDsl, FlowContentDsl, PhrasingContentDsl, diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowPalpableDsl.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowPalpableDsl.kt index afa34fc..5dd3772 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowPalpableDsl.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowPalpableDsl.kt @@ -1,12 +1,12 @@ package net.kigawa.renlin.w3c.category.dsl -import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpable /** * DSL for FlowContent, PalpableContent */ -interface FlowPalpableDsl: +interface FlowPalpableDsl: FlowContentDsl, PalpableContentDsl \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowPalpablePhrasingDsl.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowPalpablePhrasingDsl.kt index 6837c26..8905cc9 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowPalpablePhrasingDsl.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowPalpablePhrasingDsl.kt @@ -1,13 +1,13 @@ package net.kigawa.renlin.w3c.category.dsl -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing /** * DSL for FlowContent, PalpableContent, PhrasingContent */ -interface FlowPalpablePhrasingDsl: +interface FlowPalpablePhrasingDsl: FlowContentDsl, PalpableContentDsl, PhrasingContentDsl \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowPhrasingDsl.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowPhrasingDsl.kt index 5867915..ff9dddf 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowPhrasingDsl.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/dsl/FlowPhrasingDsl.kt @@ -1,12 +1,12 @@ package net.kigawa.renlin.w3c.category.dsl -import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPhrasing /** * DSL for FlowContent, PhrasingContent */ -interface FlowPhrasingDsl: +interface FlowPhrasingDsl: FlowContentDsl, PhrasingContentDsl \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/AutocapitalizeInheritingFormFlowFormAssociatedPalpable.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/AutocapitalizeInheritingFormFlowFormAssociatedPalpable.kt new file mode 100644 index 0000000..86007f9 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/AutocapitalizeInheritingFormFlowFormAssociatedPalpable.kt @@ -0,0 +1,14 @@ +package net.kigawa.renlin.w3c.category.integration + +import net.kigawa.renlin.w3c.category.ContentCategory +import net.kigawa.renlin.w3c.category.native.FlowContent + import net.kigawa.renlin.w3c.category.native.PalpableContent + import net.kigawa.renlin.w3c.category.native.FormAssociatedContent + import net.kigawa.renlin.w3c.category.native.AutocapitalizeInheritingFormContent + import net.kigawa.renlin.w3c.category.integration.FlowPalpable + import net.kigawa.renlin.w3c.category.native.FieldsetCategory + +/** + * Integration of FlowContent, PalpableContent, FormAssociatedContent, AutocapitalizeInheritingFormContent + */ +interface AutocapitalizeInheritingFormFlowFormAssociatedPalpable: FlowContent, PalpableContent, FormAssociatedContent, AutocapitalizeInheritingFormContent, FlowPalpable, FieldsetCategory, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/EmbeddedFlowFormAssociatedInteractivePalpablePhrasing.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/EmbeddedFlowFormAssociatedInteractivePalpablePhrasing.kt new file mode 100644 index 0000000..c92eb79 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/EmbeddedFlowFormAssociatedInteractivePalpablePhrasing.kt @@ -0,0 +1,25 @@ +package net.kigawa.renlin.w3c.category.integration + +import net.kigawa.renlin.w3c.category.ContentCategory +import net.kigawa.renlin.w3c.category.native.FlowContent + import net.kigawa.renlin.w3c.category.native.PhrasingContent + import net.kigawa.renlin.w3c.category.native.EmbeddedContent + import net.kigawa.renlin.w3c.category.native.PalpableContent + import net.kigawa.renlin.w3c.category.native.FormAssociatedContent + import net.kigawa.renlin.w3c.category.native.InteractiveContent + import net.kigawa.renlin.w3c.category.integration.FlowPalpable + import net.kigawa.renlin.w3c.category.integration.FlowInteractivePalpablePhrasing + import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing + import net.kigawa.renlin.w3c.category.integration.FlowPhrasing + import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowInteractivePalpablePhrasing + import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowPalpablePhrasing + import net.kigawa.renlin.w3c.category.integration.FlowFormAssociatedInteractivePalpablePhrasing + import net.kigawa.renlin.w3c.category.integration.FlowFormAssociatedPalpablePhrasing + import net.kigawa.renlin.w3c.category.integration.FlowInteractivePalpable + import net.kigawa.renlin.w3c.category.native.ImgCategory + import net.kigawa.renlin.w3c.category.native.ObjectCategory + +/** + * Integration of FlowContent, PhrasingContent, EmbeddedContent, PalpableContent, FormAssociatedContent, InteractiveContent + */ +interface EmbeddedFlowFormAssociatedInteractivePalpablePhrasing: FlowContent, PhrasingContent, EmbeddedContent, PalpableContent, FormAssociatedContent, InteractiveContent, FlowPalpable, FlowInteractivePalpablePhrasing, FlowPalpablePhrasing, FlowPhrasing, EmbeddedFlowInteractivePalpablePhrasing, EmbeddedFlowPalpablePhrasing, FlowFormAssociatedInteractivePalpablePhrasing, FlowFormAssociatedPalpablePhrasing, FlowInteractivePalpable, ImgCategory, ObjectCategory, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/EmbeddedFlowInteractivePalpablePhrasing.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/EmbeddedFlowInteractivePalpablePhrasing.kt new file mode 100644 index 0000000..db13124 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/EmbeddedFlowInteractivePalpablePhrasing.kt @@ -0,0 +1,23 @@ +package net.kigawa.renlin.w3c.category.integration + +import net.kigawa.renlin.w3c.category.ContentCategory +import net.kigawa.renlin.w3c.category.native.FlowContent + import net.kigawa.renlin.w3c.category.native.PhrasingContent + import net.kigawa.renlin.w3c.category.native.EmbeddedContent + import net.kigawa.renlin.w3c.category.native.PalpableContent + import net.kigawa.renlin.w3c.category.native.InteractiveContent + import net.kigawa.renlin.w3c.category.integration.FlowPalpable + import net.kigawa.renlin.w3c.category.integration.FlowInteractivePalpablePhrasing + import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing + import net.kigawa.renlin.w3c.category.integration.FlowPhrasing + import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowPalpablePhrasing + import net.kigawa.renlin.w3c.category.integration.FlowInteractivePalpable + import net.kigawa.renlin.w3c.category.native.AudioCategory + import net.kigawa.renlin.w3c.category.native.VideoCategory + import net.kigawa.renlin.w3c.category.native.EmbedCategory + import net.kigawa.renlin.w3c.category.native.IframeCategory + +/** + * Integration of FlowContent, PhrasingContent, EmbeddedContent, PalpableContent, InteractiveContent + */ +interface EmbeddedFlowInteractivePalpablePhrasing: FlowContent, PhrasingContent, EmbeddedContent, PalpableContent, InteractiveContent, FlowPalpable, FlowInteractivePalpablePhrasing, FlowPalpablePhrasing, FlowPhrasing, EmbeddedFlowPalpablePhrasing, FlowInteractivePalpable, AudioCategory, VideoCategory, EmbedCategory, IframeCategory, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/EmbeddedFlowPalpablePhrasing.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/EmbeddedFlowPalpablePhrasing.kt new file mode 100644 index 0000000..48a8c2c --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/EmbeddedFlowPalpablePhrasing.kt @@ -0,0 +1,19 @@ +package net.kigawa.renlin.w3c.category.integration + +import net.kigawa.renlin.w3c.category.ContentCategory +import net.kigawa.renlin.w3c.category.native.FlowContent + import net.kigawa.renlin.w3c.category.native.PhrasingContent + import net.kigawa.renlin.w3c.category.native.EmbeddedContent + import net.kigawa.renlin.w3c.category.native.PalpableContent + import net.kigawa.renlin.w3c.category.integration.FlowPalpable + import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing + import net.kigawa.renlin.w3c.category.integration.FlowPhrasing + import net.kigawa.renlin.w3c.category.native.PictureCategory + import net.kigawa.renlin.w3c.category.native.SvgCategory + import net.kigawa.renlin.w3c.category.native.MathCategory + import net.kigawa.renlin.w3c.category.native.CanvasCategory + +/** + * Integration of FlowContent, PhrasingContent, EmbeddedContent, PalpableContent + */ +interface EmbeddedFlowPalpablePhrasing: FlowContent, PhrasingContent, EmbeddedContent, PalpableContent, FlowPalpable, FlowPalpablePhrasing, FlowPhrasing, PictureCategory, SvgCategory, MathCategory, CanvasCategory, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowFormAssociatedInteractivePalpablePhrasing.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowFormAssociatedInteractivePalpablePhrasing.kt new file mode 100644 index 0000000..ef49dc9 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowFormAssociatedInteractivePalpablePhrasing.kt @@ -0,0 +1,23 @@ +package net.kigawa.renlin.w3c.category.integration + +import net.kigawa.renlin.w3c.category.ContentCategory +import net.kigawa.renlin.w3c.category.native.FlowContent + import net.kigawa.renlin.w3c.category.native.PhrasingContent + import net.kigawa.renlin.w3c.category.native.InteractiveContent + import net.kigawa.renlin.w3c.category.native.PalpableContent + import net.kigawa.renlin.w3c.category.native.FormAssociatedContent + import net.kigawa.renlin.w3c.category.integration.FlowPalpable + import net.kigawa.renlin.w3c.category.integration.FlowInteractivePalpablePhrasing + import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing + import net.kigawa.renlin.w3c.category.integration.FlowPhrasing + import net.kigawa.renlin.w3c.category.integration.FlowFormAssociatedPalpablePhrasing + import net.kigawa.renlin.w3c.category.integration.FlowInteractivePalpable + import net.kigawa.renlin.w3c.category.native.ButtonCategory + import net.kigawa.renlin.w3c.category.native.InputCategory + import net.kigawa.renlin.w3c.category.native.SelectCategory + import net.kigawa.renlin.w3c.category.native.TextareaCategory + +/** + * Integration of FlowContent, PhrasingContent, InteractiveContent, PalpableContent, FormAssociatedContent + */ +interface FlowFormAssociatedInteractivePalpablePhrasing: FlowContent, PhrasingContent, InteractiveContent, PalpableContent, FormAssociatedContent, FlowPalpable, FlowInteractivePalpablePhrasing, FlowPalpablePhrasing, FlowPhrasing, FlowFormAssociatedPalpablePhrasing, FlowInteractivePalpable, ButtonCategory, InputCategory, SelectCategory, TextareaCategory, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowFormAssociatedPalpablePhrasing.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowFormAssociatedPalpablePhrasing.kt new file mode 100644 index 0000000..6432042 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowFormAssociatedPalpablePhrasing.kt @@ -0,0 +1,16 @@ +package net.kigawa.renlin.w3c.category.integration + +import net.kigawa.renlin.w3c.category.ContentCategory +import net.kigawa.renlin.w3c.category.native.FlowContent + import net.kigawa.renlin.w3c.category.native.PhrasingContent + import net.kigawa.renlin.w3c.category.native.PalpableContent + import net.kigawa.renlin.w3c.category.native.FormAssociatedContent + import net.kigawa.renlin.w3c.category.integration.FlowPalpable + import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing + import net.kigawa.renlin.w3c.category.integration.FlowPhrasing + import net.kigawa.renlin.w3c.category.native.OutputCategory + +/** + * Integration of FlowContent, PhrasingContent, PalpableContent, FormAssociatedContent + */ +interface FlowFormAssociatedPalpablePhrasing: FlowContent, PhrasingContent, PalpableContent, FormAssociatedContent, FlowPalpable, FlowPalpablePhrasing, FlowPhrasing, OutputCategory, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowHeading.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowHeading.kt new file mode 100644 index 0000000..55f8d47 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowHeading.kt @@ -0,0 +1,11 @@ +package net.kigawa.renlin.w3c.category.integration + +import net.kigawa.renlin.w3c.category.ContentCategory +import net.kigawa.renlin.w3c.category.native.FlowContent + import net.kigawa.renlin.w3c.category.native.HeadingContent + import net.kigawa.renlin.w3c.category.native.HgroupCategory + +/** + * Integration of FlowContent, HeadingContent + */ +interface FlowHeading: FlowContent, HeadingContent, HgroupCategory, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowHeadingPalpable.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowHeadingPalpable.kt new file mode 100644 index 0000000..d4fe37f --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowHeadingPalpable.kt @@ -0,0 +1,19 @@ +package net.kigawa.renlin.w3c.category.integration + +import net.kigawa.renlin.w3c.category.ContentCategory +import net.kigawa.renlin.w3c.category.native.FlowContent + import net.kigawa.renlin.w3c.category.native.HeadingContent + import net.kigawa.renlin.w3c.category.native.PalpableContent + import net.kigawa.renlin.w3c.category.integration.FlowPalpable + import net.kigawa.renlin.w3c.category.integration.FlowHeading + import net.kigawa.renlin.w3c.category.native.H1Category + import net.kigawa.renlin.w3c.category.native.H2Category + import net.kigawa.renlin.w3c.category.native.H3Category + import net.kigawa.renlin.w3c.category.native.H4Category + import net.kigawa.renlin.w3c.category.native.H5Category + import net.kigawa.renlin.w3c.category.native.H6Category + +/** + * Integration of FlowContent, HeadingContent, PalpableContent + */ +interface FlowHeadingPalpable: FlowContent, HeadingContent, PalpableContent, FlowPalpable, FlowHeading, H1Category, H2Category, H3Category, H4Category, H5Category, H6Category, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowInteractivePalpable.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowInteractivePalpable.kt new file mode 100644 index 0000000..6f23626 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowInteractivePalpable.kt @@ -0,0 +1,13 @@ +package net.kigawa.renlin.w3c.category.integration + +import net.kigawa.renlin.w3c.category.ContentCategory +import net.kigawa.renlin.w3c.category.native.FlowContent + import net.kigawa.renlin.w3c.category.native.InteractiveContent + import net.kigawa.renlin.w3c.category.native.PalpableContent + import net.kigawa.renlin.w3c.category.integration.FlowPalpable + import net.kigawa.renlin.w3c.category.native.DetailsCategory + +/** + * Integration of FlowContent, InteractiveContent, PalpableContent + */ +interface FlowInteractivePalpable: FlowContent, InteractiveContent, PalpableContent, FlowPalpable, DetailsCategory, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowInteractivePalpablePhrasing.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowInteractivePalpablePhrasing.kt new file mode 100644 index 0000000..c139bde --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowInteractivePalpablePhrasing.kt @@ -0,0 +1,18 @@ +package net.kigawa.renlin.w3c.category.integration + +import net.kigawa.renlin.w3c.category.ContentCategory +import net.kigawa.renlin.w3c.category.native.FlowContent + import net.kigawa.renlin.w3c.category.native.PhrasingContent + import net.kigawa.renlin.w3c.category.native.PalpableContent + import net.kigawa.renlin.w3c.category.native.InteractiveContent + import net.kigawa.renlin.w3c.category.integration.FlowPalpable + import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasing + import net.kigawa.renlin.w3c.category.integration.FlowPhrasing + import net.kigawa.renlin.w3c.category.integration.FlowInteractivePalpable + import net.kigawa.renlin.w3c.category.native.ACategory + import net.kigawa.renlin.w3c.category.native.LabelCategory + +/** + * Integration of FlowContent, PhrasingContent, PalpableContent, InteractiveContent + */ +interface FlowInteractivePalpablePhrasing: FlowContent, PhrasingContent, PalpableContent, InteractiveContent, FlowPalpable, FlowPalpablePhrasing, FlowPhrasing, FlowInteractivePalpable, ACategory, LabelCategory, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowMetadataPhrasing.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowMetadataPhrasing.kt new file mode 100644 index 0000000..fcb1440 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowMetadataPhrasing.kt @@ -0,0 +1,15 @@ +package net.kigawa.renlin.w3c.category.integration + +import net.kigawa.renlin.w3c.category.ContentCategory +import net.kigawa.renlin.w3c.category.native.MetadataContent + import net.kigawa.renlin.w3c.category.native.FlowContent + import net.kigawa.renlin.w3c.category.native.PhrasingContent + import net.kigawa.renlin.w3c.category.integration.FlowPhrasing + import net.kigawa.renlin.w3c.category.native.LinkCategory + import net.kigawa.renlin.w3c.category.native.MetaCategory + import net.kigawa.renlin.w3c.category.native.NoscriptCategory + +/** + * Integration of MetadataContent, FlowContent, PhrasingContent + */ +interface FlowMetadataPhrasing: MetadataContent, FlowContent, PhrasingContent, FlowPhrasing, LinkCategory, MetaCategory, NoscriptCategory, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowMetadataPhrasingScriptSupporting.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowMetadataPhrasingScriptSupporting.kt new file mode 100644 index 0000000..fa4cfcc --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowMetadataPhrasingScriptSupporting.kt @@ -0,0 +1,16 @@ +package net.kigawa.renlin.w3c.category.integration + +import net.kigawa.renlin.w3c.category.ContentCategory +import net.kigawa.renlin.w3c.category.native.MetadataContent + import net.kigawa.renlin.w3c.category.native.FlowContent + import net.kigawa.renlin.w3c.category.native.PhrasingContent + import net.kigawa.renlin.w3c.category.native.ScriptSupportingContent + import net.kigawa.renlin.w3c.category.integration.FlowMetadataPhrasing + import net.kigawa.renlin.w3c.category.integration.FlowPhrasing + import net.kigawa.renlin.w3c.category.native.ScriptCategory + import net.kigawa.renlin.w3c.category.native.TemplateCategory + +/** + * Integration of MetadataContent, FlowContent, PhrasingContent, ScriptSupportingContent + */ +interface FlowMetadataPhrasingScriptSupporting: MetadataContent, FlowContent, PhrasingContent, ScriptSupportingContent, FlowMetadataPhrasing, FlowPhrasing, ScriptCategory, TemplateCategory, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPalpable.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPalpable.kt new file mode 100644 index 0000000..671fe0f --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPalpable.kt @@ -0,0 +1,25 @@ +package net.kigawa.renlin.w3c.category.integration + +import net.kigawa.renlin.w3c.category.ContentCategory +import net.kigawa.renlin.w3c.category.native.FlowContent + import net.kigawa.renlin.w3c.category.native.PalpableContent + import net.kigawa.renlin.w3c.category.native.PCategory + import net.kigawa.renlin.w3c.category.native.DivCategory + import net.kigawa.renlin.w3c.category.native.AddressCategory + import net.kigawa.renlin.w3c.category.native.FooterCategory + import net.kigawa.renlin.w3c.category.native.HeaderCategory + import net.kigawa.renlin.w3c.category.native.MainCategory + import net.kigawa.renlin.w3c.category.native.SearchCategory + import net.kigawa.renlin.w3c.category.native.BlockquoteCategory + import net.kigawa.renlin.w3c.category.native.DlCategory + import net.kigawa.renlin.w3c.category.native.FigureCategory + import net.kigawa.renlin.w3c.category.native.OlCategory + import net.kigawa.renlin.w3c.category.native.PreCategory + import net.kigawa.renlin.w3c.category.native.UlCategory + import net.kigawa.renlin.w3c.category.native.TableCategory + import net.kigawa.renlin.w3c.category.native.FormCategory + +/** + * Integration of FlowContent, PalpableContent + */ +interface FlowPalpable: FlowContent, PalpableContent, PCategory, DivCategory, AddressCategory, FooterCategory, HeaderCategory, MainCategory, SearchCategory, BlockquoteCategory, DlCategory, FigureCategory, OlCategory, PreCategory, UlCategory, TableCategory, FormCategory, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPalpablePhrasing.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPalpablePhrasing.kt new file mode 100644 index 0000000..c661b5b --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPalpablePhrasing.kt @@ -0,0 +1,42 @@ +package net.kigawa.renlin.w3c.category.integration + +import net.kigawa.renlin.w3c.category.ContentCategory +import net.kigawa.renlin.w3c.category.native.FlowContent + import net.kigawa.renlin.w3c.category.native.PhrasingContent + import net.kigawa.renlin.w3c.category.native.PalpableContent + import net.kigawa.renlin.w3c.category.integration.FlowPalpable + import net.kigawa.renlin.w3c.category.integration.FlowPhrasing + import net.kigawa.renlin.w3c.category.native.AbbrCategory + import net.kigawa.renlin.w3c.category.native.BCategory + import net.kigawa.renlin.w3c.category.native.BdiCategory + import net.kigawa.renlin.w3c.category.native.BdoCategory + import net.kigawa.renlin.w3c.category.native.CiteCategory + import net.kigawa.renlin.w3c.category.native.CodeCategory + import net.kigawa.renlin.w3c.category.native.DataCategory + import net.kigawa.renlin.w3c.category.native.DfnCategory + import net.kigawa.renlin.w3c.category.native.EmCategory + import net.kigawa.renlin.w3c.category.native.ICategory + import net.kigawa.renlin.w3c.category.native.KbdCategory + import net.kigawa.renlin.w3c.category.native.MarkCategory + import net.kigawa.renlin.w3c.category.native.QCategory + import net.kigawa.renlin.w3c.category.native.RubyCategory + import net.kigawa.renlin.w3c.category.native.SCategory + import net.kigawa.renlin.w3c.category.native.SampCategory + import net.kigawa.renlin.w3c.category.native.SmallCategory + import net.kigawa.renlin.w3c.category.native.SpanCategory + import net.kigawa.renlin.w3c.category.native.StrongCategory + import net.kigawa.renlin.w3c.category.native.SubCategory + import net.kigawa.renlin.w3c.category.native.SupCategory + import net.kigawa.renlin.w3c.category.native.TimeCategory + import net.kigawa.renlin.w3c.category.native.UCategory + import net.kigawa.renlin.w3c.category.native.VarCategory + import net.kigawa.renlin.w3c.category.native.MapCategory + import net.kigawa.renlin.w3c.category.native.DelCategory + import net.kigawa.renlin.w3c.category.native.InsCategory + import net.kigawa.renlin.w3c.category.native.MeterCategory + import net.kigawa.renlin.w3c.category.native.ProgressCategory + +/** + * Integration of FlowContent, PhrasingContent, PalpableContent + */ +interface FlowPalpablePhrasing: FlowContent, PhrasingContent, PalpableContent, FlowPalpable, FlowPhrasing, AbbrCategory, BCategory, BdiCategory, BdoCategory, CiteCategory, CodeCategory, DataCategory, DfnCategory, EmCategory, ICategory, KbdCategory, MarkCategory, QCategory, RubyCategory, SCategory, SampCategory, SmallCategory, SpanCategory, StrongCategory, SubCategory, SupCategory, TimeCategory, UCategory, VarCategory, MapCategory, DelCategory, InsCategory, MeterCategory, ProgressCategory, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPalpableSectioning.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPalpableSectioning.kt new file mode 100644 index 0000000..c748262 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPalpableSectioning.kt @@ -0,0 +1,16 @@ +package net.kigawa.renlin.w3c.category.integration + +import net.kigawa.renlin.w3c.category.ContentCategory +import net.kigawa.renlin.w3c.category.native.FlowContent + import net.kigawa.renlin.w3c.category.native.SectioningContent + import net.kigawa.renlin.w3c.category.native.PalpableContent + import net.kigawa.renlin.w3c.category.integration.FlowPalpable + import net.kigawa.renlin.w3c.category.native.ArticleCategory + import net.kigawa.renlin.w3c.category.native.AsideCategory + import net.kigawa.renlin.w3c.category.native.NavCategory + import net.kigawa.renlin.w3c.category.native.SectionCategory + +/** + * Integration of FlowContent, SectioningContent, PalpableContent + */ +interface FlowPalpableSectioning: FlowContent, SectioningContent, PalpableContent, FlowPalpable, ArticleCategory, AsideCategory, NavCategory, SectionCategory, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPhrasing.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPhrasing.kt new file mode 100644 index 0000000..ecfd425 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPhrasing.kt @@ -0,0 +1,17 @@ +package net.kigawa.renlin.w3c.category.integration + +import net.kigawa.renlin.w3c.category.ContentCategory +import net.kigawa.renlin.w3c.category.native.FlowContent + import net.kigawa.renlin.w3c.category.native.PhrasingContent + import net.kigawa.renlin.w3c.category.native.BrCategory + import net.kigawa.renlin.w3c.category.native.RpCategory + import net.kigawa.renlin.w3c.category.native.RtCategory + import net.kigawa.renlin.w3c.category.native.WbrCategory + import net.kigawa.renlin.w3c.category.native.AreaCategory + import net.kigawa.renlin.w3c.category.native.DatalistCategory + import net.kigawa.renlin.w3c.category.native.SlotCategory + +/** + * Integration of FlowContent, PhrasingContent + */ +interface FlowPhrasing: FlowContent, PhrasingContent, BrCategory, RpCategory, RtCategory, WbrCategory, AreaCategory, DatalistCategory, SlotCategory, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ACategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ACategory.kt new file mode 100644 index 0000000..91bce31 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ACategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * ACategory represents elements that are part of the a content category. + */ +interface ACategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AbbrCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AbbrCategory.kt new file mode 100644 index 0000000..cd230c1 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AbbrCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * AbbrCategory represents elements that are part of the abbr content category. + */ +interface AbbrCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AddressCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AddressCategory.kt new file mode 100644 index 0000000..2670d20 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AddressCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * AddressCategory represents elements that are part of the address content category. + */ +interface AddressCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AreaCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AreaCategory.kt new file mode 100644 index 0000000..f62e704 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AreaCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * AreaCategory represents elements that are part of the area content category. + */ +interface AreaCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ArticleCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ArticleCategory.kt new file mode 100644 index 0000000..c252ac8 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ArticleCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * ArticleCategory represents elements that are part of the article content category. + */ +interface ArticleCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AsideCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AsideCategory.kt new file mode 100644 index 0000000..21a48fc --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AsideCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * AsideCategory represents elements that are part of the aside content category. + */ +interface AsideCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AudioCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AudioCategory.kt new file mode 100644 index 0000000..9d2a11f --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AudioCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * AudioCategory represents elements that are part of the audio content category. + */ +interface AudioCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AutocapitalizeInheritingFormContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AutocapitalizeInheritingFormContent.kt index 2c4dea9..95d5dbb 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AutocapitalizeInheritingFormContent.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AutocapitalizeInheritingFormContent.kt @@ -1,9 +1,10 @@ package net.kigawa.renlin.w3c.category.native import net.kigawa.renlin.w3c.category.ContentCategory +import net.kigawa.renlin.w3c.category.native.FieldsetCategory /** - * Integration to AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration + * AutocapitalizeInheritingFormContent represents elements that are part of the autocapitalizeinheritingform content category. * */ -interface AutocapitalizeInheritingFormContent : AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration, ContentCategory \ No newline at end of file +interface AutocapitalizeInheritingFormContent : ContentCategory, FieldsetCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration.kt deleted file mode 100644 index 2c12055..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Integration of FlowContent, PalpableContent, FormAssociatedContent, AutocapitalizeInheritingFormContent - */ -sealed interface AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AutocapitalizeInheritingFormFlowFormAssociatedPalpableUnion.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AutocapitalizeInheritingFormFlowFormAssociatedPalpableUnion.kt deleted file mode 100644 index f1a0863..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AutocapitalizeInheritingFormFlowFormAssociatedPalpableUnion.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Union of FlowContent, PalpableContent, FormAssociatedContent, AutocapitalizeInheritingFormContent - */ -sealed interface AutocapitalizeInheritingFormFlowFormAssociatedPalpableUnion: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BCategory.kt new file mode 100644 index 0000000..b778413 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * BCategory represents elements that are part of the b content category. + */ +interface BCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BaseCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BaseCategory.kt new file mode 100644 index 0000000..fa1e3c6 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BaseCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * BaseCategory represents elements that are part of the base content category. + */ +interface BaseCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BdiCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BdiCategory.kt new file mode 100644 index 0000000..40a3589 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BdiCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * BdiCategory represents elements that are part of the bdi content category. + */ +interface BdiCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BdoCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BdoCategory.kt new file mode 100644 index 0000000..4926227 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BdoCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * BdoCategory represents elements that are part of the bdo content category. + */ +interface BdoCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BlockquoteCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BlockquoteCategory.kt new file mode 100644 index 0000000..db8118b --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BlockquoteCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * BlockquoteCategory represents elements that are part of the blockquote content category. + */ +interface BlockquoteCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BodyCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BodyCategory.kt new file mode 100644 index 0000000..8b4f3ed --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BodyCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * BodyCategory represents elements that are part of the body content category. + */ +interface BodyCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BrCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BrCategory.kt new file mode 100644 index 0000000..f16b125 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/BrCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * BrCategory represents elements that are part of the br content category. + */ +interface BrCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ButtonCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ButtonCategory.kt new file mode 100644 index 0000000..628d0bd --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ButtonCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * ButtonCategory represents elements that are part of the button content category. + */ +interface ButtonCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/CanvasCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/CanvasCategory.kt new file mode 100644 index 0000000..9bf7e8e --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/CanvasCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * CanvasCategory represents elements that are part of the canvas content category. + */ +interface CanvasCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/CaptionCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/CaptionCategory.kt new file mode 100644 index 0000000..922fb93 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/CaptionCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * CaptionCategory represents elements that are part of the caption content category. + */ +interface CaptionCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/CiteCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/CiteCategory.kt new file mode 100644 index 0000000..2c866c5 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/CiteCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * CiteCategory represents elements that are part of the cite content category. + */ +interface CiteCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/CodeCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/CodeCategory.kt new file mode 100644 index 0000000..aa19803 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/CodeCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * CodeCategory represents elements that are part of the code content category. + */ +interface CodeCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ColCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ColCategory.kt new file mode 100644 index 0000000..7acc132 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ColCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * ColCategory represents elements that are part of the col content category. + */ +interface ColCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ColgroupCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ColgroupCategory.kt new file mode 100644 index 0000000..ea644c2 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ColgroupCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * ColgroupCategory represents elements that are part of the colgroup content category. + */ +interface ColgroupCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DataCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DataCategory.kt new file mode 100644 index 0000000..7bb98bf --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DataCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * DataCategory represents elements that are part of the data content category. + */ +interface DataCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DatalistCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DatalistCategory.kt new file mode 100644 index 0000000..0c342c6 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DatalistCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * DatalistCategory represents elements that are part of the datalist content category. + */ +interface DatalistCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DdCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DdCategory.kt new file mode 100644 index 0000000..093bafa --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DdCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * DdCategory represents elements that are part of the dd content category. + */ +interface DdCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DelCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DelCategory.kt new file mode 100644 index 0000000..4412189 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DelCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * DelCategory represents elements that are part of the del content category. + */ +interface DelCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DetailsCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DetailsCategory.kt new file mode 100644 index 0000000..19c2153 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DetailsCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * DetailsCategory represents elements that are part of the details content category. + */ +interface DetailsCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DfnCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DfnCategory.kt new file mode 100644 index 0000000..8bdde8e --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DfnCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * DfnCategory represents elements that are part of the dfn content category. + */ +interface DfnCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DialogCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DialogCategory.kt new file mode 100644 index 0000000..fb2110a --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DialogCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * DialogCategory represents elements that are part of the dialog content category. + */ +interface DialogCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/Div.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/Div.kt new file mode 100644 index 0000000..a10b605 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/Div.kt @@ -0,0 +1,3 @@ +package net.kigawa.renlin.w3c.category.native + +interface Div \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DivCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DivCategory.kt new file mode 100644 index 0000000..886144d --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DivCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * DivCategory represents elements that are part of the div content category. + */ +interface DivCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DlCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DlCategory.kt new file mode 100644 index 0000000..6a4b5fc --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DlCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * DlCategory represents elements that are part of the dl content category. + */ +interface DlCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DtCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DtCategory.kt new file mode 100644 index 0000000..51eeefb --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/DtCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * DtCategory represents elements that are part of the dt content category. + */ +interface DtCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmCategory.kt new file mode 100644 index 0000000..b79a91a --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * EmCategory represents elements that are part of the em content category. + */ +interface EmCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbedCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbedCategory.kt new file mode 100644 index 0000000..e7fd882 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbedCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * EmbedCategory represents elements that are part of the embed content category. + */ +interface EmbedCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedContent.kt index 6dea7c4..e65a898 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedContent.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedContent.kt @@ -1,9 +1,19 @@ package net.kigawa.renlin.w3c.category.native import net.kigawa.renlin.w3c.category.ContentCategory +import net.kigawa.renlin.w3c.category.native.AudioCategory +import net.kigawa.renlin.w3c.category.native.ImgCategory +import net.kigawa.renlin.w3c.category.native.VideoCategory +import net.kigawa.renlin.w3c.category.native.EmbedCategory +import net.kigawa.renlin.w3c.category.native.IframeCategory +import net.kigawa.renlin.w3c.category.native.ObjectCategory +import net.kigawa.renlin.w3c.category.native.PictureCategory +import net.kigawa.renlin.w3c.category.native.SvgCategory +import net.kigawa.renlin.w3c.category.native.MathCategory +import net.kigawa.renlin.w3c.category.native.CanvasCategory /** - * Integration to EmbeddedFlowInteractivePalpablePhrasingIntegration, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration, EmbeddedFlowPalpablePhrasingIntegration + * EmbeddedContent represents elements that are part of the embedded content category. * Parent: PhrasingContent */ -interface EmbeddedContent : EmbeddedFlowInteractivePalpablePhrasingIntegration, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration, EmbeddedFlowPalpablePhrasingIntegration, ContentCategory, PhrasingContent \ No newline at end of file +interface EmbeddedContent : ContentCategory, PhrasingContent, AudioCategory, ImgCategory, VideoCategory, EmbedCategory, IframeCategory, ObjectCategory, PictureCategory, SvgCategory, MathCategory, CanvasCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration.kt deleted file mode 100644 index 96cbd6a..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Integration of FlowContent, PhrasingContent, EmbeddedContent, PalpableContent, FormAssociatedContent, InteractiveContent - */ -sealed interface EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowFormAssociatedInteractivePalpablePhrasingUnion.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowFormAssociatedInteractivePalpablePhrasingUnion.kt deleted file mode 100644 index 0ca75c0..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowFormAssociatedInteractivePalpablePhrasingUnion.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Union of FlowContent, PhrasingContent, EmbeddedContent, PalpableContent, FormAssociatedContent, InteractiveContent - */ -sealed interface EmbeddedFlowFormAssociatedInteractivePalpablePhrasingUnion: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowInteractivePalpablePhrasingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowInteractivePalpablePhrasingIntegration.kt deleted file mode 100644 index 27cdfa9..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowInteractivePalpablePhrasingIntegration.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Integration of FlowContent, PhrasingContent, EmbeddedContent, PalpableContent, InteractiveContent - */ -sealed interface EmbeddedFlowInteractivePalpablePhrasingIntegration: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowInteractivePalpablePhrasingUnion.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowInteractivePalpablePhrasingUnion.kt deleted file mode 100644 index 13d912b..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowInteractivePalpablePhrasingUnion.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Union of FlowContent, PhrasingContent, EmbeddedContent, PalpableContent, InteractiveContent - */ -sealed interface EmbeddedFlowInteractivePalpablePhrasingUnion: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowPalpablePhrasingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowPalpablePhrasingIntegration.kt deleted file mode 100644 index dd2036a..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowPalpablePhrasingIntegration.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Integration of FlowContent, PhrasingContent, EmbeddedContent, PalpableContent - */ -sealed interface EmbeddedFlowPalpablePhrasingIntegration: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowPalpablePhrasingUnion.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowPalpablePhrasingUnion.kt deleted file mode 100644 index acab45c..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowPalpablePhrasingUnion.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Union of FlowContent, PhrasingContent, EmbeddedContent, PalpableContent - */ -sealed interface EmbeddedFlowPalpablePhrasingUnion: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FencedframeCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FencedframeCategory.kt new file mode 100644 index 0000000..2f2a971 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FencedframeCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * FencedframeCategory represents elements that are part of the fencedframe content category. + */ +interface FencedframeCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FieldsetCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FieldsetCategory.kt new file mode 100644 index 0000000..cc573f4 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FieldsetCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * FieldsetCategory represents elements that are part of the fieldset content category. + */ +interface FieldsetCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FigcaptionCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FigcaptionCategory.kt new file mode 100644 index 0000000..36c6c4b --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FigcaptionCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * FigcaptionCategory represents elements that are part of the figcaption content category. + */ +interface FigcaptionCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FigureCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FigureCategory.kt new file mode 100644 index 0000000..109c852 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FigureCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * FigureCategory represents elements that are part of the figure content category. + */ +interface FigureCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowContent.kt index 1782062..6e61de8 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowContent.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowContent.kt @@ -1,9 +1,122 @@ package net.kigawa.renlin.w3c.category.native import net.kigawa.renlin.w3c.category.ContentCategory +import net.kigawa.renlin.w3c.category.native.HtmlCategory +import net.kigawa.renlin.w3c.category.native.HeadCategory +import net.kigawa.renlin.w3c.category.native.LinkCategory +import net.kigawa.renlin.w3c.category.native.MetaCategory +import net.kigawa.renlin.w3c.category.native.BodyCategory +import net.kigawa.renlin.w3c.category.native.AddressCategory +import net.kigawa.renlin.w3c.category.native.ArticleCategory +import net.kigawa.renlin.w3c.category.native.AsideCategory +import net.kigawa.renlin.w3c.category.native.FooterCategory +import net.kigawa.renlin.w3c.category.native.HeaderCategory +import net.kigawa.renlin.w3c.category.native.H1Category +import net.kigawa.renlin.w3c.category.native.H2Category +import net.kigawa.renlin.w3c.category.native.H3Category +import net.kigawa.renlin.w3c.category.native.H4Category +import net.kigawa.renlin.w3c.category.native.H5Category +import net.kigawa.renlin.w3c.category.native.H6Category +import net.kigawa.renlin.w3c.category.native.HgroupCategory +import net.kigawa.renlin.w3c.category.native.MainCategory +import net.kigawa.renlin.w3c.category.native.NavCategory +import net.kigawa.renlin.w3c.category.native.SectionCategory +import net.kigawa.renlin.w3c.category.native.SearchCategory +import net.kigawa.renlin.w3c.category.native.BlockquoteCategory +import net.kigawa.renlin.w3c.category.native.DdCategory +import net.kigawa.renlin.w3c.category.native.DivCategory +import net.kigawa.renlin.w3c.category.native.DlCategory +import net.kigawa.renlin.w3c.category.native.DtCategory +import net.kigawa.renlin.w3c.category.native.FigcaptionCategory +import net.kigawa.renlin.w3c.category.native.FigureCategory +import net.kigawa.renlin.w3c.category.native.HrCategory +import net.kigawa.renlin.w3c.category.native.LiCategory +import net.kigawa.renlin.w3c.category.native.MenuCategory +import net.kigawa.renlin.w3c.category.native.OlCategory +import net.kigawa.renlin.w3c.category.native.PCategory +import net.kigawa.renlin.w3c.category.native.PreCategory +import net.kigawa.renlin.w3c.category.native.UlCategory +import net.kigawa.renlin.w3c.category.native.ACategory +import net.kigawa.renlin.w3c.category.native.AbbrCategory +import net.kigawa.renlin.w3c.category.native.BCategory +import net.kigawa.renlin.w3c.category.native.BdiCategory +import net.kigawa.renlin.w3c.category.native.BdoCategory +import net.kigawa.renlin.w3c.category.native.BrCategory +import net.kigawa.renlin.w3c.category.native.CiteCategory +import net.kigawa.renlin.w3c.category.native.CodeCategory +import net.kigawa.renlin.w3c.category.native.DataCategory +import net.kigawa.renlin.w3c.category.native.DfnCategory +import net.kigawa.renlin.w3c.category.native.EmCategory +import net.kigawa.renlin.w3c.category.native.ICategory +import net.kigawa.renlin.w3c.category.native.KbdCategory +import net.kigawa.renlin.w3c.category.native.MarkCategory +import net.kigawa.renlin.w3c.category.native.QCategory +import net.kigawa.renlin.w3c.category.native.RpCategory +import net.kigawa.renlin.w3c.category.native.RtCategory +import net.kigawa.renlin.w3c.category.native.RubyCategory +import net.kigawa.renlin.w3c.category.native.SCategory +import net.kigawa.renlin.w3c.category.native.SampCategory +import net.kigawa.renlin.w3c.category.native.SmallCategory +import net.kigawa.renlin.w3c.category.native.SpanCategory +import net.kigawa.renlin.w3c.category.native.StrongCategory +import net.kigawa.renlin.w3c.category.native.SubCategory +import net.kigawa.renlin.w3c.category.native.SupCategory +import net.kigawa.renlin.w3c.category.native.TimeCategory +import net.kigawa.renlin.w3c.category.native.UCategory +import net.kigawa.renlin.w3c.category.native.VarCategory +import net.kigawa.renlin.w3c.category.native.WbrCategory +import net.kigawa.renlin.w3c.category.native.AreaCategory +import net.kigawa.renlin.w3c.category.native.AudioCategory +import net.kigawa.renlin.w3c.category.native.ImgCategory +import net.kigawa.renlin.w3c.category.native.MapCategory +import net.kigawa.renlin.w3c.category.native.TrackCategory +import net.kigawa.renlin.w3c.category.native.VideoCategory +import net.kigawa.renlin.w3c.category.native.EmbedCategory +import net.kigawa.renlin.w3c.category.native.FencedframeCategory +import net.kigawa.renlin.w3c.category.native.IframeCategory +import net.kigawa.renlin.w3c.category.native.ObjectCategory +import net.kigawa.renlin.w3c.category.native.PictureCategory +import net.kigawa.renlin.w3c.category.native.SourceCategory +import net.kigawa.renlin.w3c.category.native.SvgCategory +import net.kigawa.renlin.w3c.category.native.MathCategory +import net.kigawa.renlin.w3c.category.native.CanvasCategory +import net.kigawa.renlin.w3c.category.native.NoscriptCategory +import net.kigawa.renlin.w3c.category.native.ScriptCategory +import net.kigawa.renlin.w3c.category.native.DelCategory +import net.kigawa.renlin.w3c.category.native.InsCategory +import net.kigawa.renlin.w3c.category.native.CaptionCategory +import net.kigawa.renlin.w3c.category.native.ColCategory +import net.kigawa.renlin.w3c.category.native.ColgroupCategory +import net.kigawa.renlin.w3c.category.native.TableCategory +import net.kigawa.renlin.w3c.category.native.TbodyCategory +import net.kigawa.renlin.w3c.category.native.TdCategory +import net.kigawa.renlin.w3c.category.native.TfootCategory +import net.kigawa.renlin.w3c.category.native.ThCategory +import net.kigawa.renlin.w3c.category.native.TheadCategory +import net.kigawa.renlin.w3c.category.native.TrCategory +import net.kigawa.renlin.w3c.category.native.ButtonCategory +import net.kigawa.renlin.w3c.category.native.DatalistCategory +import net.kigawa.renlin.w3c.category.native.FieldsetCategory +import net.kigawa.renlin.w3c.category.native.FormCategory +import net.kigawa.renlin.w3c.category.native.InputCategory +import net.kigawa.renlin.w3c.category.native.LabelCategory +import net.kigawa.renlin.w3c.category.native.LegendCategory +import net.kigawa.renlin.w3c.category.native.MeterCategory +import net.kigawa.renlin.w3c.category.native.OptgroupCategory +import net.kigawa.renlin.w3c.category.native.OptionCategory +import net.kigawa.renlin.w3c.category.native.OutputCategory +import net.kigawa.renlin.w3c.category.native.ProgressCategory +import net.kigawa.renlin.w3c.category.native.SelectCategory +import net.kigawa.renlin.w3c.category.native.SelectedcontentCategory +import net.kigawa.renlin.w3c.category.native.TextareaCategory +import net.kigawa.renlin.w3c.category.native.DetailsCategory +import net.kigawa.renlin.w3c.category.native.DialogCategory +import net.kigawa.renlin.w3c.category.native.SummaryCategory +import net.kigawa.renlin.w3c.category.native.SlotCategory +import net.kigawa.renlin.w3c.category.native.TemplateCategory /** - * Integration to FlowMetadataPhrasingIntegration, FlowPalpableIntegration, FlowPalpableSectioningIntegration, FlowHeadingPalpableIntegration, FlowHeadingIntegration, FlowInteractivePalpablePhrasingIntegration, FlowPalpablePhrasingIntegration, FlowPhrasingIntegration, EmbeddedFlowInteractivePalpablePhrasingIntegration, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration, EmbeddedFlowPalpablePhrasingIntegration, FlowMetadataPhrasingScriptSupportingIntegration, FlowFormAssociatedInteractivePalpablePhrasingIntegration, AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration, FlowFormAssociatedPalpablePhrasingIntegration, FlowInteractivePalpableIntegration - * Parent: EventTarget + * FlowContent represents elements that are part of the flow content category. + * Parent: P, Div */ -interface FlowContent : FlowMetadataPhrasingIntegration, FlowPalpableIntegration, FlowPalpableSectioningIntegration, FlowHeadingPalpableIntegration, FlowHeadingIntegration, FlowInteractivePalpablePhrasingIntegration, FlowPalpablePhrasingIntegration, FlowPhrasingIntegration, EmbeddedFlowInteractivePalpablePhrasingIntegration, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration, EmbeddedFlowPalpablePhrasingIntegration, FlowMetadataPhrasingScriptSupportingIntegration, FlowFormAssociatedInteractivePalpablePhrasingIntegration, AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration, FlowFormAssociatedPalpablePhrasingIntegration, FlowInteractivePalpableIntegration, ContentCategory, EventTarget \ No newline at end of file +interface FlowContent : ContentCategory, P, Div, HtmlCategory, HeadCategory, LinkCategory, MetaCategory, BodyCategory, AddressCategory, ArticleCategory, AsideCategory, FooterCategory, HeaderCategory, H1Category, H2Category, H3Category, H4Category, H5Category, H6Category, HgroupCategory, MainCategory, NavCategory, SectionCategory, SearchCategory, BlockquoteCategory, DdCategory, DivCategory, DlCategory, DtCategory, FigcaptionCategory, FigureCategory, HrCategory, LiCategory, MenuCategory, OlCategory, PCategory, PreCategory, UlCategory, ACategory, AbbrCategory, BCategory, BdiCategory, BdoCategory, BrCategory, CiteCategory, CodeCategory, DataCategory, DfnCategory, EmCategory, ICategory, KbdCategory, MarkCategory, QCategory, RpCategory, RtCategory, RubyCategory, SCategory, SampCategory, SmallCategory, SpanCategory, StrongCategory, SubCategory, SupCategory, TimeCategory, UCategory, VarCategory, WbrCategory, AreaCategory, AudioCategory, ImgCategory, MapCategory, TrackCategory, VideoCategory, EmbedCategory, FencedframeCategory, IframeCategory, ObjectCategory, PictureCategory, SourceCategory, SvgCategory, MathCategory, CanvasCategory, NoscriptCategory, ScriptCategory, DelCategory, InsCategory, CaptionCategory, ColCategory, ColgroupCategory, TableCategory, TbodyCategory, TdCategory, TfootCategory, ThCategory, TheadCategory, TrCategory, ButtonCategory, DatalistCategory, FieldsetCategory, FormCategory, InputCategory, LabelCategory, LegendCategory, MeterCategory, OptgroupCategory, OptionCategory, OutputCategory, ProgressCategory, SelectCategory, SelectedcontentCategory, TextareaCategory, DetailsCategory, DialogCategory, SummaryCategory, SlotCategory, TemplateCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowFormAssociatedInteractivePalpablePhrasingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowFormAssociatedInteractivePalpablePhrasingIntegration.kt deleted file mode 100644 index 52572da..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowFormAssociatedInteractivePalpablePhrasingIntegration.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Integration of FlowContent, PhrasingContent, InteractiveContent, PalpableContent, FormAssociatedContent - */ -sealed interface FlowFormAssociatedInteractivePalpablePhrasingIntegration: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowFormAssociatedInteractivePalpablePhrasingUnion.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowFormAssociatedInteractivePalpablePhrasingUnion.kt deleted file mode 100644 index fb1c858..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowFormAssociatedInteractivePalpablePhrasingUnion.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Union of FlowContent, PhrasingContent, InteractiveContent, PalpableContent, FormAssociatedContent - */ -sealed interface FlowFormAssociatedInteractivePalpablePhrasingUnion: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowFormAssociatedPalpablePhrasingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowFormAssociatedPalpablePhrasingIntegration.kt deleted file mode 100644 index a438c21..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowFormAssociatedPalpablePhrasingIntegration.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Integration of FlowContent, PhrasingContent, PalpableContent, FormAssociatedContent - */ -sealed interface FlowFormAssociatedPalpablePhrasingIntegration: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowFormAssociatedPalpablePhrasingUnion.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowFormAssociatedPalpablePhrasingUnion.kt deleted file mode 100644 index 1c2baa0..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowFormAssociatedPalpablePhrasingUnion.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Union of FlowContent, PhrasingContent, PalpableContent, FormAssociatedContent - */ -sealed interface FlowFormAssociatedPalpablePhrasingUnion: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowHeadingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowHeadingIntegration.kt deleted file mode 100644 index 5404487..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowHeadingIntegration.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Integration of FlowContent, HeadingContent - */ -sealed interface FlowHeadingIntegration: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowHeadingPalpableIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowHeadingPalpableIntegration.kt deleted file mode 100644 index 0fb502c..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowHeadingPalpableIntegration.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Integration of FlowContent, HeadingContent, PalpableContent - */ -sealed interface FlowHeadingPalpableIntegration: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowHeadingPalpableUnion.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowHeadingPalpableUnion.kt deleted file mode 100644 index 36ca270..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowHeadingPalpableUnion.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Union of FlowContent, HeadingContent, PalpableContent - */ -sealed interface FlowHeadingPalpableUnion: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowHeadingUnion.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowHeadingUnion.kt deleted file mode 100644 index bd3db4e..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowHeadingUnion.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Union of FlowContent, HeadingContent - */ -sealed interface FlowHeadingUnion: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowInteractivePalpableIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowInteractivePalpableIntegration.kt deleted file mode 100644 index 3cc75ba..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowInteractivePalpableIntegration.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Integration of FlowContent, InteractiveContent, PalpableContent - */ -sealed interface FlowInteractivePalpableIntegration: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowInteractivePalpablePhrasingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowInteractivePalpablePhrasingIntegration.kt deleted file mode 100644 index bcef49f..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowInteractivePalpablePhrasingIntegration.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Integration of FlowContent, PhrasingContent, PalpableContent, InteractiveContent - */ -sealed interface FlowInteractivePalpablePhrasingIntegration: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowInteractivePalpablePhrasingUnion.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowInteractivePalpablePhrasingUnion.kt deleted file mode 100644 index 7eda9d5..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowInteractivePalpablePhrasingUnion.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Union of FlowContent, PhrasingContent, PalpableContent, InteractiveContent - */ -sealed interface FlowInteractivePalpablePhrasingUnion: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowInteractivePalpableUnion.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowInteractivePalpableUnion.kt deleted file mode 100644 index f9e7795..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowInteractivePalpableUnion.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Union of FlowContent, InteractiveContent, PalpableContent - */ -sealed interface FlowInteractivePalpableUnion: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetadataPhrasingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetadataPhrasingIntegration.kt deleted file mode 100644 index 4e72419..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetadataPhrasingIntegration.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Integration of MetadataContent, FlowContent, PhrasingContent - */ -sealed interface FlowMetadataPhrasingIntegration: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetadataPhrasingScriptSupportingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetadataPhrasingScriptSupportingIntegration.kt deleted file mode 100644 index dc3fed0..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetadataPhrasingScriptSupportingIntegration.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Integration of MetadataContent, FlowContent, PhrasingContent, ScriptSupportingContent - */ -sealed interface FlowMetadataPhrasingScriptSupportingIntegration: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetadataPhrasingScriptSupportingUnion.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetadataPhrasingScriptSupportingUnion.kt deleted file mode 100644 index 562a775..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetadataPhrasingScriptSupportingUnion.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Union of MetadataContent, FlowContent, PhrasingContent, ScriptSupportingContent - */ -sealed interface FlowMetadataPhrasingScriptSupportingUnion: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetadataPhrasingUnion.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetadataPhrasingUnion.kt deleted file mode 100644 index baab805..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetadataPhrasingUnion.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Union of MetadataContent, FlowContent, PhrasingContent - */ -sealed interface FlowMetadataPhrasingUnion: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableIntegration.kt deleted file mode 100644 index 30f3dcb..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableIntegration.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Integration of FlowContent, PalpableContent - */ -sealed interface FlowPalpableIntegration: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpablePhrasingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpablePhrasingIntegration.kt deleted file mode 100644 index 7ec33d8..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpablePhrasingIntegration.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Integration of FlowContent, PhrasingContent, PalpableContent - */ -sealed interface FlowPalpablePhrasingIntegration: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpablePhrasingUnion.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpablePhrasingUnion.kt deleted file mode 100644 index 3b6f8ed..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpablePhrasingUnion.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Union of FlowContent, PhrasingContent, PalpableContent - */ -sealed interface FlowPalpablePhrasingUnion: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableSectioningIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableSectioningIntegration.kt deleted file mode 100644 index ca2756b..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableSectioningIntegration.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Integration of FlowContent, SectioningContent, PalpableContent - */ -sealed interface FlowPalpableSectioningIntegration: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableSectioningUnion.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableSectioningUnion.kt deleted file mode 100644 index 99c24c6..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableSectioningUnion.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Union of FlowContent, SectioningContent, PalpableContent - */ -sealed interface FlowPalpableSectioningUnion: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableUnion.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableUnion.kt deleted file mode 100644 index e8b19ce..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableUnion.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Union of FlowContent, PalpableContent - */ -sealed interface FlowPalpableUnion: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPhrasingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPhrasingIntegration.kt deleted file mode 100644 index 2142d87..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPhrasingIntegration.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Integration of FlowContent, PhrasingContent - */ -sealed interface FlowPhrasingIntegration: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPhrasingUnion.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPhrasingUnion.kt deleted file mode 100644 index 58120f8..0000000 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPhrasingUnion.kt +++ /dev/null @@ -1,8 +0,0 @@ -package net.kigawa.renlin.w3c.category.native - -import net.kigawa.renlin.w3c.category.ContentCategory - -/** - * Union of FlowContent, PhrasingContent - */ -sealed interface FlowPhrasingUnion: ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FooterCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FooterCategory.kt new file mode 100644 index 0000000..002b36a --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FooterCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * FooterCategory represents elements that are part of the footer content category. + */ +interface FooterCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FormAssociatedContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FormAssociatedContent.kt index 140c494..76897c4 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FormAssociatedContent.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FormAssociatedContent.kt @@ -1,9 +1,17 @@ package net.kigawa.renlin.w3c.category.native import net.kigawa.renlin.w3c.category.ContentCategory +import net.kigawa.renlin.w3c.category.native.ImgCategory +import net.kigawa.renlin.w3c.category.native.ObjectCategory +import net.kigawa.renlin.w3c.category.native.ButtonCategory +import net.kigawa.renlin.w3c.category.native.FieldsetCategory +import net.kigawa.renlin.w3c.category.native.InputCategory +import net.kigawa.renlin.w3c.category.native.OutputCategory +import net.kigawa.renlin.w3c.category.native.SelectCategory +import net.kigawa.renlin.w3c.category.native.TextareaCategory /** - * Integration to EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration, FlowFormAssociatedInteractivePalpablePhrasingIntegration, AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration, FlowFormAssociatedPalpablePhrasingIntegration + * FormAssociatedContent represents elements that are part of the formassociated content category. * */ -interface FormAssociatedContent : EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration, FlowFormAssociatedInteractivePalpablePhrasingIntegration, AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration, FlowFormAssociatedPalpablePhrasingIntegration, ContentCategory \ No newline at end of file +interface FormAssociatedContent : ContentCategory, ImgCategory, ObjectCategory, ButtonCategory, FieldsetCategory, InputCategory, OutputCategory, SelectCategory, TextareaCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FormCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FormCategory.kt new file mode 100644 index 0000000..a23321c --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FormCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * FormCategory represents elements that are part of the form content category. + */ +interface FormCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/H1Category.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/H1Category.kt new file mode 100644 index 0000000..52dbebf --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/H1Category.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * H1Category represents elements that are part of the h1 content category. + */ +interface H1Category : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/H2Category.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/H2Category.kt new file mode 100644 index 0000000..e13a7eb --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/H2Category.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * H2Category represents elements that are part of the h2 content category. + */ +interface H2Category : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/H3Category.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/H3Category.kt new file mode 100644 index 0000000..6193988 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/H3Category.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * H3Category represents elements that are part of the h3 content category. + */ +interface H3Category : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/H4Category.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/H4Category.kt new file mode 100644 index 0000000..de9ad3c --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/H4Category.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * H4Category represents elements that are part of the h4 content category. + */ +interface H4Category : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/H5Category.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/H5Category.kt new file mode 100644 index 0000000..8eea112 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/H5Category.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * H5Category represents elements that are part of the h5 content category. + */ +interface H5Category : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/H6Category.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/H6Category.kt new file mode 100644 index 0000000..6733e4a --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/H6Category.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * H6Category represents elements that are part of the h6 content category. + */ +interface H6Category : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HeadCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HeadCategory.kt new file mode 100644 index 0000000..74d229a --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HeadCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * HeadCategory represents elements that are part of the head content category. + */ +interface HeadCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HeaderCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HeaderCategory.kt new file mode 100644 index 0000000..0df09ed --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HeaderCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * HeaderCategory represents elements that are part of the header content category. + */ +interface HeaderCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HeadingContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HeadingContent.kt index 31a6072..ef2cb39 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HeadingContent.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HeadingContent.kt @@ -1,9 +1,16 @@ package net.kigawa.renlin.w3c.category.native import net.kigawa.renlin.w3c.category.ContentCategory +import net.kigawa.renlin.w3c.category.native.H1Category +import net.kigawa.renlin.w3c.category.native.H2Category +import net.kigawa.renlin.w3c.category.native.H3Category +import net.kigawa.renlin.w3c.category.native.H4Category +import net.kigawa.renlin.w3c.category.native.H5Category +import net.kigawa.renlin.w3c.category.native.H6Category +import net.kigawa.renlin.w3c.category.native.HgroupCategory /** - * Integration to FlowHeadingPalpableIntegration, FlowHeadingIntegration + * HeadingContent represents elements that are part of the heading content category. * Parent: FlowContent */ -interface HeadingContent : FlowHeadingPalpableIntegration, FlowHeadingIntegration, ContentCategory, FlowContent \ No newline at end of file +interface HeadingContent : ContentCategory, FlowContent, H1Category, H2Category, H3Category, H4Category, H5Category, H6Category, HgroupCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HgroupCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HgroupCategory.kt new file mode 100644 index 0000000..19ef135 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HgroupCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * HgroupCategory represents elements that are part of the hgroup content category. + */ +interface HgroupCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HrCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HrCategory.kt new file mode 100644 index 0000000..7d76fbe --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HrCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * HrCategory represents elements that are part of the hr content category. + */ +interface HrCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HtmlCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HtmlCategory.kt new file mode 100644 index 0000000..b471991 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HtmlCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * HtmlCategory represents elements that are part of the html content category. + */ +interface HtmlCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ICategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ICategory.kt new file mode 100644 index 0000000..13b5947 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ICategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * ICategory represents elements that are part of the i content category. + */ +interface ICategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/IframeCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/IframeCategory.kt new file mode 100644 index 0000000..9a0bba2 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/IframeCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * IframeCategory represents elements that are part of the iframe content category. + */ +interface IframeCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ImgCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ImgCategory.kt new file mode 100644 index 0000000..a304c78 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ImgCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * ImgCategory represents elements that are part of the img content category. + */ +interface ImgCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/InputCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/InputCategory.kt new file mode 100644 index 0000000..75b0f9a --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/InputCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * InputCategory represents elements that are part of the input content category. + */ +interface InputCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/InsCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/InsCategory.kt new file mode 100644 index 0000000..b2dcaa8 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/InsCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * InsCategory represents elements that are part of the ins content category. + */ +interface InsCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/InteractiveContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/InteractiveContent.kt index 39e3710..9a6690d 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/InteractiveContent.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/InteractiveContent.kt @@ -1,9 +1,22 @@ package net.kigawa.renlin.w3c.category.native import net.kigawa.renlin.w3c.category.ContentCategory +import net.kigawa.renlin.w3c.category.native.ACategory +import net.kigawa.renlin.w3c.category.native.AudioCategory +import net.kigawa.renlin.w3c.category.native.ImgCategory +import net.kigawa.renlin.w3c.category.native.VideoCategory +import net.kigawa.renlin.w3c.category.native.EmbedCategory +import net.kigawa.renlin.w3c.category.native.IframeCategory +import net.kigawa.renlin.w3c.category.native.ObjectCategory +import net.kigawa.renlin.w3c.category.native.ButtonCategory +import net.kigawa.renlin.w3c.category.native.InputCategory +import net.kigawa.renlin.w3c.category.native.LabelCategory +import net.kigawa.renlin.w3c.category.native.SelectCategory +import net.kigawa.renlin.w3c.category.native.TextareaCategory +import net.kigawa.renlin.w3c.category.native.DetailsCategory /** - * Integration to FlowInteractivePalpablePhrasingIntegration, EmbeddedFlowInteractivePalpablePhrasingIntegration, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration, FlowFormAssociatedInteractivePalpablePhrasingIntegration, FlowInteractivePalpableIntegration + * InteractiveContent represents elements that are part of the interactive content category. * Parent: PhrasingContent */ -interface InteractiveContent : FlowInteractivePalpablePhrasingIntegration, EmbeddedFlowInteractivePalpablePhrasingIntegration, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration, FlowFormAssociatedInteractivePalpablePhrasingIntegration, FlowInteractivePalpableIntegration, ContentCategory, PhrasingContent \ No newline at end of file +interface InteractiveContent : ContentCategory, PhrasingContent, ACategory, AudioCategory, ImgCategory, VideoCategory, EmbedCategory, IframeCategory, ObjectCategory, ButtonCategory, InputCategory, LabelCategory, SelectCategory, TextareaCategory, DetailsCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/KbdCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/KbdCategory.kt new file mode 100644 index 0000000..35b9457 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/KbdCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * KbdCategory represents elements that are part of the kbd content category. + */ +interface KbdCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/LabelCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/LabelCategory.kt new file mode 100644 index 0000000..a48c4e9 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/LabelCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * LabelCategory represents elements that are part of the label content category. + */ +interface LabelCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/LegendCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/LegendCategory.kt new file mode 100644 index 0000000..428d10a --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/LegendCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * LegendCategory represents elements that are part of the legend content category. + */ +interface LegendCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/LiCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/LiCategory.kt new file mode 100644 index 0000000..33d422f --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/LiCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * LiCategory represents elements that are part of the li content category. + */ +interface LiCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/LinkCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/LinkCategory.kt new file mode 100644 index 0000000..6d33fd6 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/LinkCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * LinkCategory represents elements that are part of the link content category. + */ +interface LinkCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MainCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MainCategory.kt new file mode 100644 index 0000000..43cf7f9 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MainCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * MainCategory represents elements that are part of the main content category. + */ +interface MainCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MapCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MapCategory.kt new file mode 100644 index 0000000..b2c8cd2 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MapCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * MapCategory represents elements that are part of the map content category. + */ +interface MapCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MarkCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MarkCategory.kt new file mode 100644 index 0000000..abd0f8e --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MarkCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * MarkCategory represents elements that are part of the mark content category. + */ +interface MarkCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MathCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MathCategory.kt new file mode 100644 index 0000000..7ea472a --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MathCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * MathCategory represents elements that are part of the math content category. + */ +interface MathCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MenuCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MenuCategory.kt new file mode 100644 index 0000000..df0d509 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MenuCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * MenuCategory represents elements that are part of the menu content category. + */ +interface MenuCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MetaCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MetaCategory.kt new file mode 100644 index 0000000..f3adf96 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MetaCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * MetaCategory represents elements that are part of the meta content category. + */ +interface MetaCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MetadataContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MetadataContent.kt index d864a8d..6c03979 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MetadataContent.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MetadataContent.kt @@ -1,9 +1,17 @@ package net.kigawa.renlin.w3c.category.native import net.kigawa.renlin.w3c.category.ContentCategory +import net.kigawa.renlin.w3c.category.native.BaseCategory +import net.kigawa.renlin.w3c.category.native.LinkCategory +import net.kigawa.renlin.w3c.category.native.MetaCategory +import net.kigawa.renlin.w3c.category.native.StyleCategory +import net.kigawa.renlin.w3c.category.native.TitleCategory +import net.kigawa.renlin.w3c.category.native.NoscriptCategory +import net.kigawa.renlin.w3c.category.native.ScriptCategory +import net.kigawa.renlin.w3c.category.native.TemplateCategory /** - * Integration to FlowMetadataPhrasingIntegration, FlowMetadataPhrasingScriptSupportingIntegration + * MetadataContent represents elements that are part of the metadata content category. * */ -interface MetadataContent : FlowMetadataPhrasingIntegration, FlowMetadataPhrasingScriptSupportingIntegration, ContentCategory \ No newline at end of file +interface MetadataContent : ContentCategory, BaseCategory, LinkCategory, MetaCategory, StyleCategory, TitleCategory, NoscriptCategory, ScriptCategory, TemplateCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MeterCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MeterCategory.kt new file mode 100644 index 0000000..9179f98 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MeterCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * MeterCategory represents elements that are part of the meter content category. + */ +interface MeterCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/NavCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/NavCategory.kt new file mode 100644 index 0000000..54cc2a3 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/NavCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * NavCategory represents elements that are part of the nav content category. + */ +interface NavCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/NoscriptCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/NoscriptCategory.kt new file mode 100644 index 0000000..c0c244e --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/NoscriptCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * NoscriptCategory represents elements that are part of the noscript content category. + */ +interface NoscriptCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ObjectCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ObjectCategory.kt new file mode 100644 index 0000000..ce026b6 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ObjectCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * ObjectCategory represents elements that are part of the object content category. + */ +interface ObjectCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/OlCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/OlCategory.kt new file mode 100644 index 0000000..b611ea5 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/OlCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * OlCategory represents elements that are part of the ol content category. + */ +interface OlCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/OptgroupCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/OptgroupCategory.kt new file mode 100644 index 0000000..e1f9c7c --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/OptgroupCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * OptgroupCategory represents elements that are part of the optgroup content category. + */ +interface OptgroupCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/OptionCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/OptionCategory.kt new file mode 100644 index 0000000..8e4d66d --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/OptionCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * OptionCategory represents elements that are part of the option content category. + */ +interface OptionCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/OutputCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/OutputCategory.kt new file mode 100644 index 0000000..273bfc6 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/OutputCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * OutputCategory represents elements that are part of the output content category. + */ +interface OutputCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/P.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/P.kt new file mode 100644 index 0000000..71207d4 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/P.kt @@ -0,0 +1,3 @@ +package net.kigawa.renlin.w3c.category.native + +interface P \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/PCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/PCategory.kt new file mode 100644 index 0000000..932aa58 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/PCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * PCategory represents elements that are part of the p content category. + */ +interface PCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/PalpableContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/PalpableContent.kt index a6fca78..98536f0 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/PalpableContent.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/PalpableContent.kt @@ -1,9 +1,82 @@ package net.kigawa.renlin.w3c.category.native import net.kigawa.renlin.w3c.category.ContentCategory +import net.kigawa.renlin.w3c.category.native.AddressCategory +import net.kigawa.renlin.w3c.category.native.ArticleCategory +import net.kigawa.renlin.w3c.category.native.AsideCategory +import net.kigawa.renlin.w3c.category.native.FooterCategory +import net.kigawa.renlin.w3c.category.native.HeaderCategory +import net.kigawa.renlin.w3c.category.native.H1Category +import net.kigawa.renlin.w3c.category.native.H2Category +import net.kigawa.renlin.w3c.category.native.H3Category +import net.kigawa.renlin.w3c.category.native.H4Category +import net.kigawa.renlin.w3c.category.native.H5Category +import net.kigawa.renlin.w3c.category.native.H6Category +import net.kigawa.renlin.w3c.category.native.MainCategory +import net.kigawa.renlin.w3c.category.native.NavCategory +import net.kigawa.renlin.w3c.category.native.SectionCategory +import net.kigawa.renlin.w3c.category.native.SearchCategory +import net.kigawa.renlin.w3c.category.native.BlockquoteCategory +import net.kigawa.renlin.w3c.category.native.DivCategory +import net.kigawa.renlin.w3c.category.native.DlCategory +import net.kigawa.renlin.w3c.category.native.FigureCategory +import net.kigawa.renlin.w3c.category.native.OlCategory +import net.kigawa.renlin.w3c.category.native.PCategory +import net.kigawa.renlin.w3c.category.native.PreCategory +import net.kigawa.renlin.w3c.category.native.UlCategory +import net.kigawa.renlin.w3c.category.native.ACategory +import net.kigawa.renlin.w3c.category.native.AbbrCategory +import net.kigawa.renlin.w3c.category.native.BCategory +import net.kigawa.renlin.w3c.category.native.BdiCategory +import net.kigawa.renlin.w3c.category.native.BdoCategory +import net.kigawa.renlin.w3c.category.native.CiteCategory +import net.kigawa.renlin.w3c.category.native.CodeCategory +import net.kigawa.renlin.w3c.category.native.DataCategory +import net.kigawa.renlin.w3c.category.native.DfnCategory +import net.kigawa.renlin.w3c.category.native.EmCategory +import net.kigawa.renlin.w3c.category.native.ICategory +import net.kigawa.renlin.w3c.category.native.KbdCategory +import net.kigawa.renlin.w3c.category.native.MarkCategory +import net.kigawa.renlin.w3c.category.native.QCategory +import net.kigawa.renlin.w3c.category.native.RubyCategory +import net.kigawa.renlin.w3c.category.native.SCategory +import net.kigawa.renlin.w3c.category.native.SampCategory +import net.kigawa.renlin.w3c.category.native.SmallCategory +import net.kigawa.renlin.w3c.category.native.SpanCategory +import net.kigawa.renlin.w3c.category.native.StrongCategory +import net.kigawa.renlin.w3c.category.native.SubCategory +import net.kigawa.renlin.w3c.category.native.SupCategory +import net.kigawa.renlin.w3c.category.native.TimeCategory +import net.kigawa.renlin.w3c.category.native.UCategory +import net.kigawa.renlin.w3c.category.native.VarCategory +import net.kigawa.renlin.w3c.category.native.AudioCategory +import net.kigawa.renlin.w3c.category.native.ImgCategory +import net.kigawa.renlin.w3c.category.native.MapCategory +import net.kigawa.renlin.w3c.category.native.VideoCategory +import net.kigawa.renlin.w3c.category.native.EmbedCategory +import net.kigawa.renlin.w3c.category.native.IframeCategory +import net.kigawa.renlin.w3c.category.native.ObjectCategory +import net.kigawa.renlin.w3c.category.native.PictureCategory +import net.kigawa.renlin.w3c.category.native.SvgCategory +import net.kigawa.renlin.w3c.category.native.MathCategory +import net.kigawa.renlin.w3c.category.native.CanvasCategory +import net.kigawa.renlin.w3c.category.native.DelCategory +import net.kigawa.renlin.w3c.category.native.InsCategory +import net.kigawa.renlin.w3c.category.native.TableCategory +import net.kigawa.renlin.w3c.category.native.ButtonCategory +import net.kigawa.renlin.w3c.category.native.FieldsetCategory +import net.kigawa.renlin.w3c.category.native.FormCategory +import net.kigawa.renlin.w3c.category.native.InputCategory +import net.kigawa.renlin.w3c.category.native.LabelCategory +import net.kigawa.renlin.w3c.category.native.MeterCategory +import net.kigawa.renlin.w3c.category.native.OutputCategory +import net.kigawa.renlin.w3c.category.native.ProgressCategory +import net.kigawa.renlin.w3c.category.native.SelectCategory +import net.kigawa.renlin.w3c.category.native.TextareaCategory +import net.kigawa.renlin.w3c.category.native.DetailsCategory /** - * Integration to FlowPalpableIntegration, FlowPalpableSectioningIntegration, FlowHeadingPalpableIntegration, FlowInteractivePalpablePhrasingIntegration, FlowPalpablePhrasingIntegration, EmbeddedFlowInteractivePalpablePhrasingIntegration, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration, EmbeddedFlowPalpablePhrasingIntegration, FlowFormAssociatedInteractivePalpablePhrasingIntegration, AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration, FlowFormAssociatedPalpablePhrasingIntegration, FlowInteractivePalpableIntegration + * PalpableContent represents elements that are part of the palpable content category. * */ -interface PalpableContent : FlowPalpableIntegration, FlowPalpableSectioningIntegration, FlowHeadingPalpableIntegration, FlowInteractivePalpablePhrasingIntegration, FlowPalpablePhrasingIntegration, EmbeddedFlowInteractivePalpablePhrasingIntegration, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration, EmbeddedFlowPalpablePhrasingIntegration, FlowFormAssociatedInteractivePalpablePhrasingIntegration, AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration, FlowFormAssociatedPalpablePhrasingIntegration, FlowInteractivePalpableIntegration, ContentCategory \ No newline at end of file +interface PalpableContent : ContentCategory, AddressCategory, ArticleCategory, AsideCategory, FooterCategory, HeaderCategory, H1Category, H2Category, H3Category, H4Category, H5Category, H6Category, MainCategory, NavCategory, SectionCategory, SearchCategory, BlockquoteCategory, DivCategory, DlCategory, FigureCategory, OlCategory, PCategory, PreCategory, UlCategory, ACategory, AbbrCategory, BCategory, BdiCategory, BdoCategory, CiteCategory, CodeCategory, DataCategory, DfnCategory, EmCategory, ICategory, KbdCategory, MarkCategory, QCategory, RubyCategory, SCategory, SampCategory, SmallCategory, SpanCategory, StrongCategory, SubCategory, SupCategory, TimeCategory, UCategory, VarCategory, AudioCategory, ImgCategory, MapCategory, VideoCategory, EmbedCategory, IframeCategory, ObjectCategory, PictureCategory, SvgCategory, MathCategory, CanvasCategory, DelCategory, InsCategory, TableCategory, ButtonCategory, FieldsetCategory, FormCategory, InputCategory, LabelCategory, MeterCategory, OutputCategory, ProgressCategory, SelectCategory, TextareaCategory, DetailsCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/PhrasingContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/PhrasingContent.kt index 32c4134..afcbd1a 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/PhrasingContent.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/PhrasingContent.kt @@ -1,9 +1,67 @@ package net.kigawa.renlin.w3c.category.native import net.kigawa.renlin.w3c.category.ContentCategory +import net.kigawa.renlin.w3c.category.native.LinkCategory +import net.kigawa.renlin.w3c.category.native.MetaCategory +import net.kigawa.renlin.w3c.category.native.ACategory +import net.kigawa.renlin.w3c.category.native.AbbrCategory +import net.kigawa.renlin.w3c.category.native.BCategory +import net.kigawa.renlin.w3c.category.native.BdiCategory +import net.kigawa.renlin.w3c.category.native.BdoCategory +import net.kigawa.renlin.w3c.category.native.BrCategory +import net.kigawa.renlin.w3c.category.native.CiteCategory +import net.kigawa.renlin.w3c.category.native.CodeCategory +import net.kigawa.renlin.w3c.category.native.DataCategory +import net.kigawa.renlin.w3c.category.native.DfnCategory +import net.kigawa.renlin.w3c.category.native.EmCategory +import net.kigawa.renlin.w3c.category.native.ICategory +import net.kigawa.renlin.w3c.category.native.KbdCategory +import net.kigawa.renlin.w3c.category.native.MarkCategory +import net.kigawa.renlin.w3c.category.native.QCategory +import net.kigawa.renlin.w3c.category.native.RpCategory +import net.kigawa.renlin.w3c.category.native.RtCategory +import net.kigawa.renlin.w3c.category.native.RubyCategory +import net.kigawa.renlin.w3c.category.native.SCategory +import net.kigawa.renlin.w3c.category.native.SampCategory +import net.kigawa.renlin.w3c.category.native.SmallCategory +import net.kigawa.renlin.w3c.category.native.SpanCategory +import net.kigawa.renlin.w3c.category.native.StrongCategory +import net.kigawa.renlin.w3c.category.native.SubCategory +import net.kigawa.renlin.w3c.category.native.SupCategory +import net.kigawa.renlin.w3c.category.native.TimeCategory +import net.kigawa.renlin.w3c.category.native.UCategory +import net.kigawa.renlin.w3c.category.native.VarCategory +import net.kigawa.renlin.w3c.category.native.WbrCategory +import net.kigawa.renlin.w3c.category.native.AreaCategory +import net.kigawa.renlin.w3c.category.native.AudioCategory +import net.kigawa.renlin.w3c.category.native.ImgCategory +import net.kigawa.renlin.w3c.category.native.MapCategory +import net.kigawa.renlin.w3c.category.native.VideoCategory +import net.kigawa.renlin.w3c.category.native.EmbedCategory +import net.kigawa.renlin.w3c.category.native.IframeCategory +import net.kigawa.renlin.w3c.category.native.ObjectCategory +import net.kigawa.renlin.w3c.category.native.PictureCategory +import net.kigawa.renlin.w3c.category.native.SvgCategory +import net.kigawa.renlin.w3c.category.native.MathCategory +import net.kigawa.renlin.w3c.category.native.CanvasCategory +import net.kigawa.renlin.w3c.category.native.NoscriptCategory +import net.kigawa.renlin.w3c.category.native.ScriptCategory +import net.kigawa.renlin.w3c.category.native.DelCategory +import net.kigawa.renlin.w3c.category.native.InsCategory +import net.kigawa.renlin.w3c.category.native.ButtonCategory +import net.kigawa.renlin.w3c.category.native.DatalistCategory +import net.kigawa.renlin.w3c.category.native.InputCategory +import net.kigawa.renlin.w3c.category.native.LabelCategory +import net.kigawa.renlin.w3c.category.native.MeterCategory +import net.kigawa.renlin.w3c.category.native.OutputCategory +import net.kigawa.renlin.w3c.category.native.ProgressCategory +import net.kigawa.renlin.w3c.category.native.SelectCategory +import net.kigawa.renlin.w3c.category.native.TextareaCategory +import net.kigawa.renlin.w3c.category.native.SlotCategory +import net.kigawa.renlin.w3c.category.native.TemplateCategory /** - * Integration to FlowMetadataPhrasingIntegration, FlowInteractivePalpablePhrasingIntegration, FlowPalpablePhrasingIntegration, FlowPhrasingIntegration, EmbeddedFlowInteractivePalpablePhrasingIntegration, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration, EmbeddedFlowPalpablePhrasingIntegration, FlowMetadataPhrasingScriptSupportingIntegration, FlowFormAssociatedInteractivePalpablePhrasingIntegration, FlowFormAssociatedPalpablePhrasingIntegration - * Parent: FlowContent + * PhrasingContent represents elements that are part of the phrasing content category. + * Parent: P */ -interface PhrasingContent : FlowMetadataPhrasingIntegration, FlowInteractivePalpablePhrasingIntegration, FlowPalpablePhrasingIntegration, FlowPhrasingIntegration, EmbeddedFlowInteractivePalpablePhrasingIntegration, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration, EmbeddedFlowPalpablePhrasingIntegration, FlowMetadataPhrasingScriptSupportingIntegration, FlowFormAssociatedInteractivePalpablePhrasingIntegration, FlowFormAssociatedPalpablePhrasingIntegration, ContentCategory, FlowContent \ No newline at end of file +interface PhrasingContent : ContentCategory, P, LinkCategory, MetaCategory, ACategory, AbbrCategory, BCategory, BdiCategory, BdoCategory, BrCategory, CiteCategory, CodeCategory, DataCategory, DfnCategory, EmCategory, ICategory, KbdCategory, MarkCategory, QCategory, RpCategory, RtCategory, RubyCategory, SCategory, SampCategory, SmallCategory, SpanCategory, StrongCategory, SubCategory, SupCategory, TimeCategory, UCategory, VarCategory, WbrCategory, AreaCategory, AudioCategory, ImgCategory, MapCategory, VideoCategory, EmbedCategory, IframeCategory, ObjectCategory, PictureCategory, SvgCategory, MathCategory, CanvasCategory, NoscriptCategory, ScriptCategory, DelCategory, InsCategory, ButtonCategory, DatalistCategory, InputCategory, LabelCategory, MeterCategory, OutputCategory, ProgressCategory, SelectCategory, TextareaCategory, SlotCategory, TemplateCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/PictureCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/PictureCategory.kt new file mode 100644 index 0000000..2ff38cd --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/PictureCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * PictureCategory represents elements that are part of the picture content category. + */ +interface PictureCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/PreCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/PreCategory.kt new file mode 100644 index 0000000..2d40264 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/PreCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * PreCategory represents elements that are part of the pre content category. + */ +interface PreCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ProgressCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ProgressCategory.kt new file mode 100644 index 0000000..d3fda6f --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ProgressCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * ProgressCategory represents elements that are part of the progress content category. + */ +interface ProgressCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/QCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/QCategory.kt new file mode 100644 index 0000000..da0d31d --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/QCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * QCategory represents elements that are part of the q content category. + */ +interface QCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/RpCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/RpCategory.kt new file mode 100644 index 0000000..136fc23 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/RpCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * RpCategory represents elements that are part of the rp content category. + */ +interface RpCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/RtCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/RtCategory.kt new file mode 100644 index 0000000..27be569 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/RtCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * RtCategory represents elements that are part of the rt content category. + */ +interface RtCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/RubyCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/RubyCategory.kt new file mode 100644 index 0000000..db7da89 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/RubyCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * RubyCategory represents elements that are part of the ruby content category. + */ +interface RubyCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SCategory.kt new file mode 100644 index 0000000..4d8d5ab --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * SCategory represents elements that are part of the s content category. + */ +interface SCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SampCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SampCategory.kt new file mode 100644 index 0000000..f798b20 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SampCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * SampCategory represents elements that are part of the samp content category. + */ +interface SampCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ScriptCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ScriptCategory.kt new file mode 100644 index 0000000..7b283a8 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ScriptCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * ScriptCategory represents elements that are part of the script content category. + */ +interface ScriptCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ScriptSupportingContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ScriptSupportingContent.kt index 0c9581a..7df2eb6 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ScriptSupportingContent.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ScriptSupportingContent.kt @@ -1,9 +1,11 @@ package net.kigawa.renlin.w3c.category.native import net.kigawa.renlin.w3c.category.ContentCategory +import net.kigawa.renlin.w3c.category.native.ScriptCategory +import net.kigawa.renlin.w3c.category.native.TemplateCategory /** - * Integration to FlowMetadataPhrasingScriptSupportingIntegration + * ScriptSupportingContent represents elements that are part of the scriptsupporting content category. * */ -interface ScriptSupportingContent : FlowMetadataPhrasingScriptSupportingIntegration, ContentCategory \ No newline at end of file +interface ScriptSupportingContent : ContentCategory, ScriptCategory, TemplateCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SearchCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SearchCategory.kt new file mode 100644 index 0000000..455401c --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SearchCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * SearchCategory represents elements that are part of the search content category. + */ +interface SearchCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SectionCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SectionCategory.kt new file mode 100644 index 0000000..68b8a95 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SectionCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * SectionCategory represents elements that are part of the section content category. + */ +interface SectionCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SectioningContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SectioningContent.kt index 6924a64..adad6af 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SectioningContent.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SectioningContent.kt @@ -1,9 +1,13 @@ package net.kigawa.renlin.w3c.category.native import net.kigawa.renlin.w3c.category.ContentCategory +import net.kigawa.renlin.w3c.category.native.ArticleCategory +import net.kigawa.renlin.w3c.category.native.AsideCategory +import net.kigawa.renlin.w3c.category.native.NavCategory +import net.kigawa.renlin.w3c.category.native.SectionCategory /** - * Integration to FlowPalpableSectioningIntegration + * SectioningContent represents elements that are part of the sectioning content category. * Parent: FlowContent */ -interface SectioningContent : FlowPalpableSectioningIntegration, ContentCategory, FlowContent \ No newline at end of file +interface SectioningContent : ContentCategory, FlowContent, ArticleCategory, AsideCategory, NavCategory, SectionCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SelectCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SelectCategory.kt new file mode 100644 index 0000000..8f552fa --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SelectCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * SelectCategory represents elements that are part of the select content category. + */ +interface SelectCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SelectedcontentCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SelectedcontentCategory.kt new file mode 100644 index 0000000..6414460 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SelectedcontentCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * SelectedcontentCategory represents elements that are part of the selectedcontent content category. + */ +interface SelectedcontentCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SlotCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SlotCategory.kt new file mode 100644 index 0000000..3d56739 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SlotCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * SlotCategory represents elements that are part of the slot content category. + */ +interface SlotCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SmallCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SmallCategory.kt new file mode 100644 index 0000000..9deb1d0 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SmallCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * SmallCategory represents elements that are part of the small content category. + */ +interface SmallCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SourceCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SourceCategory.kt new file mode 100644 index 0000000..a6996fa --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SourceCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * SourceCategory represents elements that are part of the source content category. + */ +interface SourceCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SpanCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SpanCategory.kt new file mode 100644 index 0000000..2cb8b01 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SpanCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * SpanCategory represents elements that are part of the span content category. + */ +interface SpanCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/StrongCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/StrongCategory.kt new file mode 100644 index 0000000..6389326 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/StrongCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * StrongCategory represents elements that are part of the strong content category. + */ +interface StrongCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/StyleCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/StyleCategory.kt new file mode 100644 index 0000000..1d4ba9b --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/StyleCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * StyleCategory represents elements that are part of the style content category. + */ +interface StyleCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SubCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SubCategory.kt new file mode 100644 index 0000000..e999c8f --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SubCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * SubCategory represents elements that are part of the sub content category. + */ +interface SubCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SummaryCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SummaryCategory.kt new file mode 100644 index 0000000..132c6ab --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SummaryCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * SummaryCategory represents elements that are part of the summary content category. + */ +interface SummaryCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SupCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SupCategory.kt new file mode 100644 index 0000000..2b97bf2 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SupCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * SupCategory represents elements that are part of the sup content category. + */ +interface SupCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SvgCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SvgCategory.kt new file mode 100644 index 0000000..c02ae8b --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SvgCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * SvgCategory represents elements that are part of the svg content category. + */ +interface SvgCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TableCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TableCategory.kt new file mode 100644 index 0000000..02676d0 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TableCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * TableCategory represents elements that are part of the table content category. + */ +interface TableCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TbodyCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TbodyCategory.kt new file mode 100644 index 0000000..3ff69cc --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TbodyCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * TbodyCategory represents elements that are part of the tbody content category. + */ +interface TbodyCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TdCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TdCategory.kt new file mode 100644 index 0000000..d1f7d39 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TdCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * TdCategory represents elements that are part of the td content category. + */ +interface TdCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TemplateCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TemplateCategory.kt new file mode 100644 index 0000000..d8d8d9a --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TemplateCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * TemplateCategory represents elements that are part of the template content category. + */ +interface TemplateCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TextareaCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TextareaCategory.kt new file mode 100644 index 0000000..39a89a6 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TextareaCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * TextareaCategory represents elements that are part of the textarea content category. + */ +interface TextareaCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TfootCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TfootCategory.kt new file mode 100644 index 0000000..43dc542 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TfootCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * TfootCategory represents elements that are part of the tfoot content category. + */ +interface TfootCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ThCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ThCategory.kt new file mode 100644 index 0000000..13a9a8c --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/ThCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * ThCategory represents elements that are part of the th content category. + */ +interface ThCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TheadCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TheadCategory.kt new file mode 100644 index 0000000..38292cb --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TheadCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * TheadCategory represents elements that are part of the thead content category. + */ +interface TheadCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TimeCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TimeCategory.kt new file mode 100644 index 0000000..e02272c --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TimeCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * TimeCategory represents elements that are part of the time content category. + */ +interface TimeCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TitleCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TitleCategory.kt new file mode 100644 index 0000000..674f940 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TitleCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * TitleCategory represents elements that are part of the title content category. + */ +interface TitleCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TrCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TrCategory.kt new file mode 100644 index 0000000..c39d8fc --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TrCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * TrCategory represents elements that are part of the tr content category. + */ +interface TrCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TrackCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TrackCategory.kt new file mode 100644 index 0000000..c4394b5 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/TrackCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * TrackCategory represents elements that are part of the track content category. + */ +interface TrackCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/UCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/UCategory.kt new file mode 100644 index 0000000..331c890 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/UCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * UCategory represents elements that are part of the u content category. + */ +interface UCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/UlCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/UlCategory.kt new file mode 100644 index 0000000..8682031 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/UlCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * UlCategory represents elements that are part of the ul content category. + */ +interface UlCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/VarCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/VarCategory.kt new file mode 100644 index 0000000..d4a6eea --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/VarCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * VarCategory represents elements that are part of the var content category. + */ +interface VarCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/VideoCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/VideoCategory.kt new file mode 100644 index 0000000..7db038a --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/VideoCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * VideoCategory represents elements that are part of the video content category. + */ +interface VideoCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/WbrCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/WbrCategory.kt new file mode 100644 index 0000000..7d19237 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/WbrCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * WbrCategory represents elements that are part of the wbr content category. + */ +interface WbrCategory : ContentCategory \ No newline at end of file diff --git a/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/SampleComponent.kt b/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/SampleComponent.kt index 46d31b7..a678c89 100644 --- a/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/SampleComponent.kt +++ b/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/SampleComponent.kt @@ -19,10 +19,12 @@ class SampleComponent( a { } } - p {} + p { + } a {} } } -} \ No newline at end of file +} + diff --git a/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/Sub.kt b/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/Sub.kt index f075b8c..2b8cdd9 100644 --- a/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/Sub.kt +++ b/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/Sub.kt @@ -6,6 +6,7 @@ import net.kigawa.renlin.component.argComponent import net.kigawa.renlin.component.component import net.kigawa.renlin.css.* import net.kigawa.renlin.dsl.StatedDsl +import net.kigawa.renlin.tag.a import net.kigawa.renlin.tag.div import net.kigawa.renlin.tag.fragment import net.kigawa.renlin.tag.p @@ -21,6 +22,7 @@ class Sub { val display = div.argComponent { block: StatedDsl.() -> Unit -> div("hero-section") { + a {} block() t("Renlin") css { From 8134e910e9f3e960df32c2e7c0c20c69deef643f Mon Sep 17 00:00:00 2001 From: kigawa Date: Sat, 16 Aug 2025 04:14:26 +0900 Subject: [PATCH 5/5] add: introduce various content category interfaces for enhanced type safety and update `NativeGenerator` to include unused categories like `EventTarget` --- .../kotlin/generator/NativeGenerator.kt | 27 +++++++++++++++---- generate/src/jvmMain/kotlin/tagCategories.kt | 3 ++- .../renlin/w3c/category/native/EventTarget.kt | 3 +-- .../category/native/EventTargetCategory.kt | 8 ++++++ .../category/native/FlowMetaDataContent.kt | 10 +++++++ .../w3c/category/native/FlowPhrasing.kt | 10 +++++++ .../category/native/FlowPhrasingContent.kt | 10 +++++++ .../category/native/FlowSectioningContent.kt | 10 +++++++ .../category/native/HeadingPhrasingContent.kt | 10 +++++++ .../native/MetaDataPhrasingContent.kt | 10 +++++++ .../native/PhrasingPhrasingContent.kt | 10 +++++++ .../w3c/category/native/SectioningHeadings.kt | 10 +++++++ .../w3c/category/native/SectioningRoot.kt | 3 +++ .../kigawa/renlin/sample/SampleComponent.kt | 3 ++- 14 files changed, 118 insertions(+), 9 deletions(-) create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EventTargetCategory.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetaDataContent.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPhrasing.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPhrasingContent.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowSectioningContent.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HeadingPhrasingContent.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MetaDataPhrasingContent.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/PhrasingPhrasingContent.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SectioningHeadings.kt create mode 100644 renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SectioningRoot.kt diff --git a/generate/src/jvmMain/kotlin/generator/NativeGenerator.kt b/generate/src/jvmMain/kotlin/generator/NativeGenerator.kt index 9979271..fddd9e0 100644 --- a/generate/src/jvmMain/kotlin/generator/NativeGenerator.kt +++ b/generate/src/jvmMain/kotlin/generator/NativeGenerator.kt @@ -14,6 +14,11 @@ class NativeGenerator(val categoryNativeOutputDir: String) { // 各タグ専用のCategoryインターフェースも追加 usedNativeCategories.add("${tagInfo.className}Category") } + + // categoryParentsで定義されているがタグで使用されていないカテゴリも追加(EventTargetなど) + categoryParents.keys.forEach { categoryName -> + usedNativeCategories.add(categoryName) + } // 親カテゴリーの情報を収集 val allParentCategories = categoryParents.toMutableMap() @@ -46,12 +51,24 @@ class NativeGenerator(val categoryNativeOutputDir: String) { val fileContent = when { parentCategory?.isEmpty() == true && !categoryName.endsWith("Category") -> { - // P, Divの場合は基本インターフェースのみ - """ - package net.kigawa.renlin.w3c.category.native + // P, Div, EventTargetの場合 + if (categoryName == "EventTarget") { + // EventTargetはContentCategoryを継承 + """ + package net.kigawa.renlin.w3c.category.native - interface $categoryName - """.trimIndent() + import net.kigawa.renlin.w3c.category.ContentCategory + + interface $categoryName : ContentCategory + """.trimIndent() + } else { + // P, Divの場合は基本インターフェースのみ + """ + package net.kigawa.renlin.w3c.category.native + + interface $categoryName + """.trimIndent() + } } categoryName.endsWith("Category") -> { // タグ専用カテゴリはContentCategoryのみ継承 diff --git a/generate/src/jvmMain/kotlin/tagCategories.kt b/generate/src/jvmMain/kotlin/tagCategories.kt index 79bef8a..adec76a 100644 --- a/generate/src/jvmMain/kotlin/tagCategories.kt +++ b/generate/src/jvmMain/kotlin/tagCategories.kt @@ -17,11 +17,12 @@ val categoryParents = mapOf( "MetaDataPhrasingContent" to "MetaDataContent", "FlowMetaDataContent" to "FlowContent", "HeadingPhrasingContent" to "HeadingContent", - "SectioningRoot" to "Any", + "SectioningRoot" to "", "SectioningHeadings" to "HeadingContent", "FlowSectioningContent" to "FlowContent", "P" to "", "Div" to "", + "EventTarget" to "", ) // 元のコードの並び順を維持するためのタグリスト diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EventTarget.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EventTarget.kt index 9d92ccd..469ec07 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EventTarget.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EventTarget.kt @@ -2,5 +2,4 @@ package net.kigawa.renlin.w3c.category.native import net.kigawa.renlin.w3c.category.ContentCategory -interface EventTarget: ContentCategory { -} \ No newline at end of file +interface EventTarget : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EventTargetCategory.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EventTargetCategory.kt new file mode 100644 index 0000000..8940fd9 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EventTargetCategory.kt @@ -0,0 +1,8 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + +/** + * EventTargetCategory represents elements that are part of the eventtarget content category. + */ +interface EventTargetCategory : ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetaDataContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetaDataContent.kt new file mode 100644 index 0000000..78544c1 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetaDataContent.kt @@ -0,0 +1,10 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + + +/** + * FlowMetaDataContent represents elements that are part of the flowmetadata content category. + * Parent: FlowContent + */ +interface FlowMetaDataContent : ContentCategory, FlowContent \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPhrasing.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPhrasing.kt new file mode 100644 index 0000000..c6f0b6b --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPhrasing.kt @@ -0,0 +1,10 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + + +/** + * FlowPhrasing represents elements that are part of the flowphrasing content category. + * Parent: FlowContent, PhrasingContent + */ +interface FlowPhrasing : ContentCategory, FlowContent, PhrasingContent \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPhrasingContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPhrasingContent.kt new file mode 100644 index 0000000..d375140 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPhrasingContent.kt @@ -0,0 +1,10 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + + +/** + * FlowPhrasingContent represents elements that are part of the flowphrasing content category. + * Parent: FlowContent + */ +interface FlowPhrasingContent : ContentCategory, FlowContent \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowSectioningContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowSectioningContent.kt new file mode 100644 index 0000000..854ffd5 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowSectioningContent.kt @@ -0,0 +1,10 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + + +/** + * FlowSectioningContent represents elements that are part of the flowsectioning content category. + * Parent: FlowContent + */ +interface FlowSectioningContent : ContentCategory, FlowContent \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HeadingPhrasingContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HeadingPhrasingContent.kt new file mode 100644 index 0000000..97b3ffb --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/HeadingPhrasingContent.kt @@ -0,0 +1,10 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + + +/** + * HeadingPhrasingContent represents elements that are part of the headingphrasing content category. + * Parent: HeadingContent + */ +interface HeadingPhrasingContent : ContentCategory, HeadingContent \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MetaDataPhrasingContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MetaDataPhrasingContent.kt new file mode 100644 index 0000000..ec6f30d --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/MetaDataPhrasingContent.kt @@ -0,0 +1,10 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + + +/** + * MetaDataPhrasingContent represents elements that are part of the metadataphrasing content category. + * Parent: MetaDataContent + */ +interface MetaDataPhrasingContent : ContentCategory, MetaDataContent \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/PhrasingPhrasingContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/PhrasingPhrasingContent.kt new file mode 100644 index 0000000..bf5ef86 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/PhrasingPhrasingContent.kt @@ -0,0 +1,10 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + + +/** + * PhrasingPhrasingContent represents elements that are part of the phrasingphrasing content category. + * Parent: PhrasingContent + */ +interface PhrasingPhrasingContent : ContentCategory, PhrasingContent \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SectioningHeadings.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SectioningHeadings.kt new file mode 100644 index 0000000..e1eb607 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SectioningHeadings.kt @@ -0,0 +1,10 @@ +package net.kigawa.renlin.w3c.category.native + +import net.kigawa.renlin.w3c.category.ContentCategory + + +/** + * SectioningHeadings represents elements that are part of the sectioningheadings content category. + * Parent: HeadingContent + */ +interface SectioningHeadings : ContentCategory, HeadingContent \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SectioningRoot.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SectioningRoot.kt new file mode 100644 index 0000000..c2d72ea --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/SectioningRoot.kt @@ -0,0 +1,3 @@ +package net.kigawa.renlin.w3c.category.native + +interface SectioningRoot \ No newline at end of file diff --git a/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/SampleComponent.kt b/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/SampleComponent.kt index a678c89..8a375b4 100644 --- a/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/SampleComponent.kt +++ b/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/SampleComponent.kt @@ -4,6 +4,7 @@ import net.kigawa.renlin.component.component import net.kigawa.renlin.tag.a import net.kigawa.renlin.tag.div import net.kigawa.renlin.tag.p +import net.kigawa.renlin.w3c.category.t class SampleComponent( val name: String, @@ -13,9 +14,9 @@ class SampleComponent( val root = div.component { sub.navigation("navigation") - // a sub.display("main-display") { div { + t("aaaa") a { } }