diff --git a/.github/workflows/deploy_maven_central.yml b/.github/workflows/deploy_maven_central.yml index 25a12fe..c8f3501 100644 --- a/.github/workflows/deploy_maven_central.yml +++ b/.github/workflows/deploy_maven_central.yml @@ -13,7 +13,7 @@ on: branches: - main pull_request: - types: [opened, synchronize] + types: [opened, synchronize, edited] branches: - main workflow_dispatch: diff --git a/generate/src/jvmMain/kotlin/_Tag_generate.kt b/generate/src/jvmMain/kotlin/_Tag_generate.kt index c9df43b..77f7459 100644 --- a/generate/src/jvmMain/kotlin/_Tag_generate.kt +++ b/generate/src/jvmMain/kotlin/_Tag_generate.kt @@ -2,20 +2,17 @@ import generator.DslGenerator import generator.IntegrationGenerator import generator.NativeGenerator import generator.TagGenerator -import generator.UnionGenerator import java.io.File fun main() { // 出力先ディレクトリ val outputDir = "../renlin/src/commonMain/kotlin/net/kigawa/renlin/tag" val categoryOutputDir = "../renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category" - val categoryUnionOutputDir = "$categoryOutputDir/native" val categoryIntegrationOutputDir = "$categoryOutputDir/integration" val categoryDslOutputDir = "$categoryOutputDir/dsl" val categoryNativeOutputDir = "$categoryOutputDir/native" File(outputDir).mkdirs() File(categoryOutputDir).mkdirs() - File(categoryUnionOutputDir).mkdirs() File(categoryIntegrationOutputDir).mkdirs() File(categoryDslOutputDir).mkdirs() File(categoryNativeOutputDir).mkdirs() @@ -23,9 +20,6 @@ fun main() { val tagGenerator = TagGenerator(outputDir).also { it.generate() } - val unionGenerator = UnionGenerator(categoryUnionOutputDir).also { - it.generate() - } val integrationGenerator = IntegrationGenerator(categoryIntegrationOutputDir).also { it.generate() } @@ -33,11 +27,10 @@ fun main() { it.generate() } val nativeGenerator = NativeGenerator(categoryNativeOutputDir).also { - it.generate(unionGenerator.nativeCategories) + it.generate(integrationGenerator.nativeCategories) } println("タグのコード生成が完了しました。") - println("生成されたUnionクラス: ${unionGenerator.processedUnions.size}") println("生成されたIntegrationクラス: ${integrationGenerator.processedIntegrations.size}") println("生成されたDSLクラス: ${dslGenerator.processedDsls.size}") } \ No newline at end of file diff --git a/generate/src/jvmMain/kotlin/generator/IntegrationGenerator.kt b/generate/src/jvmMain/kotlin/generator/IntegrationGenerator.kt index 2caaf0f..01ad084 100644 --- a/generate/src/jvmMain/kotlin/generator/IntegrationGenerator.kt +++ b/generate/src/jvmMain/kotlin/generator/IntegrationGenerator.kt @@ -7,36 +7,66 @@ class IntegrationGenerator( val categoryIntegrationOutputDir: String, ) { val processedIntegrations = mutableSetOf() + val nativeCategories = mutableMapOf>() fun generate() { - // Integrationクラスの生成 + // First collect all possible integrations + val allIntegrations = mutableMapOf>() + tagCategories - .map { it.allowedCategories } + .map { it.tagCategories } .filter { it.categories.size > 1 } - .forEach { allowedCategories -> - val integrationName = allowedCategories.connectedStr("Integration") + .toSet() + .forEach { tagCategories -> + val integrationName = tagCategories.connectedStr("Integration") if (!processedIntegrations.contains(integrationName)) { processedIntegrations.add(integrationName) - val categories = allowedCategories.categories + allIntegrations[integrationName] = tagCategories.categories.toSet() - val fileContent = """ + tagCategories.categories.forEach { + nativeCategories.getOrPut(it) { mutableSetOf() }.add(integrationName) + } + } + } + + // Generate each integration with inheritance from subset integrations + allIntegrations.forEach { (integrationName, categories) -> + // Find other integrations that are subsets of this integration + val subsetIntegrations = allIntegrations.filter { (otherName, otherCategories) -> + otherName != integrationName && + otherCategories.isNotEmpty() && + otherCategories.all { it in categories } && + otherCategories.size < categories.size + }.keys + + // Generate imports for categories and subset integrations + val categoryImports = categories.map { category -> + "import net.kigawa.renlin.w3c.category.native.$category" + } + + val integrationImports = subsetIntegrations.map { subsetIntegration -> + "import net.kigawa.renlin.w3c.category.integration.$subsetIntegration" + } + + val allImports = (categoryImports + integrationImports).joinToString("\n ") + + // Generate inheritance list including categories and subset integrations + val inheritance = (categories + subsetIntegrations + "ContentCategory").joinToString(", ") + + val fileContent = """ package net.kigawa.renlin.w3c.category.integration import net.kigawa.renlin.w3c.category.ContentCategory - ${ - categories.joinToString("\n ") - { "import net.kigawa.renlin.w3c.category.native.$it" } - } + $allImports /** * Integration of ${categories.joinToString(", ")} */ - interface $integrationName : ${(categories + "ContentCategory").joinToString(", ")} + interface $integrationName: $inheritance """.trimIndent() - val file = File("$categoryIntegrationOutputDir/${integrationName}.kt") - file.writeText(fileContent) - println("Generated integration: ${integrationName}.kt") - } - } + val file = File("$categoryIntegrationOutputDir/${integrationName}.kt") + file.writeText(fileContent) + println("Generated integration: ${integrationName}.kt") + } } } \ No newline at end of file diff --git a/generate/src/jvmMain/kotlin/generator/NativeGenerator.kt b/generate/src/jvmMain/kotlin/generator/NativeGenerator.kt index bcdfc23..f862afc 100644 --- a/generate/src/jvmMain/kotlin/generator/NativeGenerator.kt +++ b/generate/src/jvmMain/kotlin/generator/NativeGenerator.kt @@ -13,7 +13,7 @@ class NativeGenerator(val categoryNativeOutputDir: String) { allParentCategories.putAll(tagInfo.allowedCategories.parentCategories) } - // Unionクラスの生成 + // Integrationクラスの生成 categories.forEach { (name, deps) -> val categoryName = name @@ -33,7 +33,7 @@ class NativeGenerator(val categoryNativeOutputDir: String) { import net.kigawa.renlin.w3c.category.ContentCategory /** - * Union to ${deps.joinToString(", ")} + * Integration to ${deps.joinToString(", ")} * ${if (parentCategory != null) "Parent: $parentCategory" else ""} */ interface $categoryName : $interfaces diff --git a/generate/src/jvmMain/kotlin/generator/TagGenerator.kt b/generate/src/jvmMain/kotlin/generator/TagGenerator.kt index 459b718..f918ff5 100644 --- a/generate/src/jvmMain/kotlin/generator/TagGenerator.kt +++ b/generate/src/jvmMain/kotlin/generator/TagGenerator.kt @@ -10,24 +10,36 @@ class TagGenerator( // 各タグのクラスを生成 tagCategories.forEach { tagInfo -> - val fileContent = """ - package net.kigawa.renlin.tag + val imports = mutableSetOf() - import net.kigawa.renlin.w3c.category.native.${tagInfo.tagCategories.connectedStr("Union")} - ${ - if (tagInfo.allowedCategories.categories.size > 1) + if (tagInfo.tagCategories.categories.size > 1) + imports.add( + "import net.kigawa.renlin.w3c.category.integration.${ + tagInfo.tagCategories.connectedStr( + "Integration" + ) + }" + ) + 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") }" - else if ( - tagInfo.allowedCategories.categories.isNotEmpty() && - tagInfo.tagCategories.connectedStr("Union") != - tagInfo.allowedCategories.connectedStr("Integration") - ) "import net.kigawa.renlin.w3c.category.native.${ - tagInfo.allowedCategories.connectedStr("Integration") + ) + else if ( + tagInfo.allowedCategories.categories.isNotEmpty() && + tagInfo.tagCategories.connectedStr("Integration") != + tagInfo.allowedCategories.connectedStr("Integration") + ) imports.add( + "import net.kigawa.renlin.w3c.category.native.${ + tagInfo.allowedCategories.connectedStr() }" - else "" - } + ) + val fileContent = """ + package net.kigawa.renlin.tag + + ${imports.distinct().joinToString("\n ")} import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -49,7 +61,7 @@ class TagGenerator( StatedDsl<${tagInfo.allowedCategories.connectedStr("Integration")}>${ if (tagInfo.allowedCategories.categories.isEmpty()) "" else ",\n ${tagInfo.allowedCategories.connectedStr()}" + - "Dsl<${tagInfo.allowedCategories.connectedStr("Integration")}>" + "Dsl<${tagInfo.allowedCategories.connectedStr("Integration")}>" } { override fun applyElement(element: TagNode): ()->Unit { return {} @@ -58,7 +70,7 @@ class TagGenerator( val ${tagInfo.escapement} = TagComponent1(${tagInfo.className}, ::${tagInfo.className}Dsl) - object ${tagInfo.className} : Tag<${tagInfo.tagCategories.connectedStr("Union")}> { + object ${tagInfo.className} : Tag<${tagInfo.tagCategories.connectedStr("Integration")}> { override val name: String get() = "${tagInfo.name}" } diff --git a/generate/src/jvmMain/kotlin/generator/UnionGenerator.kt b/generate/src/jvmMain/kotlin/generator/UnionGenerator.kt deleted file mode 100644 index 67d344f..0000000 --- a/generate/src/jvmMain/kotlin/generator/UnionGenerator.kt +++ /dev/null @@ -1,45 +0,0 @@ -package generator - -import tagCategories -import java.io.File - -class UnionGenerator( - val categoryUnionOutputDir: String, -) { - val processedUnions = mutableSetOf() - val nativeCategories = mutableMapOf>() - fun generate() { - // Unionクラスの生成 - tagCategories - .map { it.tagCategories } - .filter { it.categories.size > 1 } - .toSet() - .forEach { tagCategories -> - val unionName = tagCategories.connectedStr("Union") - if (!processedUnions.contains(unionName)) { - processedUnions.add(unionName) - - tagCategories.categories.forEach { - nativeCategories.getOrPut(it) { mutableSetOf() }.add(unionName) - } - - val categories = tagCategories.categories - - val fileContent = """ - package net.kigawa.renlin.w3c.category.native - - import net.kigawa.renlin.w3c.category.ContentCategory - - /** - * Union of ${categories.joinToString(", ")} - */ - sealed interface $unionName: ContentCategory - """.trimIndent() - - val file = File("$categoryUnionOutputDir/${unionName}.kt") - file.writeText(fileContent) - println("Generated union: ${unionName}.kt") - } - } - } -} \ No newline at end of file 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 68a50e8..cbda285 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/A.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/A.kt @@ -1,6 +1,5 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowInteractivePalpablePhrasingUnion import net.kigawa.renlin.w3c.category.integration.FlowInteractivePalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl @@ -26,7 +25,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 4aec318..9226fe0 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Abbr.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Abbr.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 ee36f25..555abfb 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Address.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Address.kt @@ -1,6 +1,5 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl @@ -26,7 +25,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 2add4ab..f4b2eb4 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Area.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Area.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 df9a081..112a112 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Article.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Article.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpableSectioningUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpableSectioningIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 008993c..4ec20a4 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Aside.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Aside.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpableSectioningUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpableSectioningIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 00e3bf8..554d2ba 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Audio.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Audio.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.EmbeddedFlowInteractivePalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowInteractivePalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 d1ba020..f67ec4b 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/B.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/B.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 79a371c..27e63b3 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Base.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Base.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 ced490d..d57ba05 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Bdi.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Bdi.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 6a6002f..27a44a4 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Bdo.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Bdo.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 63be846..d5e6625 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Blockquote.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Blockquote.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 3a48201..05a826a 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Body.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Body.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 0d1d430..1c7a24f 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Br.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Br.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 6cc9373..2c4765a 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Button.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Button.kt @@ -1,6 +1,5 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowFormAssociatedInteractivePalpablePhrasingUnion import net.kigawa.renlin.w3c.category.integration.FlowFormAssociatedInteractivePalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl @@ -26,7 +25,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 27e39f6..7fc911c 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Canvas.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Canvas.kt @@ -1,6 +1,5 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.EmbeddedFlowPalpablePhrasingUnion import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl @@ -26,7 +25,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 a775bc5..3ff4fba 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Caption.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Caption.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 26d85e2..292fe86 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Cite.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Cite.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 e288862..a90e93e 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Code.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Code.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 4cc6e6c..e1f1015 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Col.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Col.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 fef34f1..ff6086d 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Colgroup.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Colgroup.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 4097b37..6d51909 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Data.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Data.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 ae7d456..0eca1da 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Datalist.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Datalist.kt @@ -1,6 +1,5 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPhrasingUnion import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl @@ -26,7 +25,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 c9931be..8dbc3dd 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dd.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dd.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 fddb61f..57b9555 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Del.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Del.kt @@ -1,6 +1,5 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl @@ -26,7 +25,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 bf3080f..d801ea7 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Details.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Details.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowInteractivePalpableUnion - +import net.kigawa.renlin.w3c.category.integration.FlowInteractivePalpableIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 352545f..a9c5fdf 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dfn.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dfn.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 8712545..456f2e5 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dialog.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dialog.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 cd8bc2f..f08278a 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Div.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Div.kt @@ -1,7 +1,7 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion -import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration +import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration + import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -26,7 +26,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 2400c6f..32ed6c1 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dl.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dl.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 d526fee..015cec6 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dt.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Dt.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 6158f84..0cb20d1 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Em.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Em.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 d87d905..b10c405 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Embed.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Embed.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.EmbeddedFlowInteractivePalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowInteractivePalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 05a3549..c599d73 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Fencedframe.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Fencedframe.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 af0281b..2f80a49 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Fieldset.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Fieldset.kt @@ -1,6 +1,5 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.AutocapitalizeInheritingFormFlowFormAssociatedPalpableUnion import net.kigawa.renlin.w3c.category.integration.AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl @@ -26,7 +25,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 4adc6c0..c1e4d0a 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Figcaption.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Figcaption.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 2eadb3a..b41d2a0 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Figure.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Figure.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 512090d..a176485 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Footer.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Footer.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 e15e3d4..d64c7e0 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Form.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Form.kt @@ -1,6 +1,5 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl @@ -26,7 +25,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 5517eb9..d570c14 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H1.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H1.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowHeadingPalpableUnion - +import net.kigawa.renlin.w3c.category.integration.FlowHeadingPalpableIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 c478fae..bf6ebaf 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H2.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H2.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowHeadingPalpableUnion - +import net.kigawa.renlin.w3c.category.integration.FlowHeadingPalpableIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 c6d5dd8..bdbc6d2 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H3.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H3.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowHeadingPalpableUnion - +import net.kigawa.renlin.w3c.category.integration.FlowHeadingPalpableIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 262848d..29c2650 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H4.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H4.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowHeadingPalpableUnion - +import net.kigawa.renlin.w3c.category.integration.FlowHeadingPalpableIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 0ef919c..0996b15 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H5.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H5.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowHeadingPalpableUnion - +import net.kigawa.renlin.w3c.category.integration.FlowHeadingPalpableIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 9edf0e9..0cbdb14 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H6.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/H6.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowHeadingPalpableUnion - +import net.kigawa.renlin.w3c.category.integration.FlowHeadingPalpableIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 63a307c..68cec77 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Head.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Head.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 ef3d9df..7b1893d 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Header.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Header.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 bafb654..c135058 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Hgroup.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Hgroup.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowHeadingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowHeadingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 10e8f76..f17ee1a 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Hr.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Hr.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 44cae37..5256ff4 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Html.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Html.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 92e41c5..c1394bd 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/I.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/I.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 f2a4d67..397b52e 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Iframe.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Iframe.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.EmbeddedFlowInteractivePalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowInteractivePalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 53d8e19..e25c6f8 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Img.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Img.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.EmbeddedFlowFormAssociatedInteractivePalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 8a94e06..feebf4e 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Input.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Input.kt @@ -1,6 +1,5 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowFormAssociatedInteractivePalpablePhrasingUnion import net.kigawa.renlin.w3c.category.integration.FlowFormAssociatedInteractivePalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl @@ -26,7 +25,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 0dc35e2..fe3927d 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ins.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ins.kt @@ -1,6 +1,5 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl @@ -26,7 +25,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 912595f..492fde9 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Kbd.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Kbd.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 3552f92..fb3f9a0 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Label.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Label.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowInteractivePalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowInteractivePalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 c37362e..ad8fb78 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Legend.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Legend.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 0047ab1..308ea30 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Li.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Li.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 0bcc7b4..cdf1d04 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Link.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Link.kt @@ -1,6 +1,5 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowMetadataPhrasingUnion import net.kigawa.renlin.w3c.category.integration.FlowMetadataPhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl @@ -26,7 +25,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 da853a2..de3c815 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Main.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Main.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 cc6fbff..fd608e3 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Map.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Map.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 4ec0d05..5de1ccf 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Mark.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Mark.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 b94cefe..2dcb568 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Math.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Math.kt @@ -1,6 +1,5 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.EmbeddedFlowPalpablePhrasingUnion import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl @@ -26,7 +25,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 766110c..1fea4a0 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Menu.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Menu.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 11dd5c8..436a296 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Meta.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Meta.kt @@ -1,6 +1,5 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowMetadataPhrasingUnion import net.kigawa.renlin.w3c.category.integration.FlowMetadataPhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl @@ -26,7 +25,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 b96a076..1e35cdc 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Meter.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Meter.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 76248e7..9db050a 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Nav.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Nav.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpableSectioningUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpableSectioningIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 716f186..7e9db33 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Noscript.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Noscript.kt @@ -1,6 +1,5 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowMetadataPhrasingUnion import net.kigawa.renlin.w3c.category.integration.FlowMetadataPhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl @@ -26,7 +25,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 8e76925..2100997 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Object.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Object.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.EmbeddedFlowFormAssociatedInteractivePalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 6c5f19e..ae3ca3d 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ol.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ol.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 e324458..8826695 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Optgroup.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Optgroup.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 aa1e41b..47083f0 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Option.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Option.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 75c9b97..3ee0270 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Output.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Output.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowFormAssociatedPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowFormAssociatedPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 79f7422..62ed194 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/P.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/P.kt @@ -1,7 +1,7 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion -import net.kigawa.renlin.w3c.category.native.PhrasingContent +import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration + 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 @@ -26,7 +26,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 0831fdb..229e166 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Picture.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Picture.kt @@ -1,6 +1,5 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.EmbeddedFlowPalpablePhrasingUnion import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl @@ -26,7 +25,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 1e7c6b6..8899452 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Pre.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Pre.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 5ffb992..731a67f 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Progress.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Progress.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 2315f45..1030d2c 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Q.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Q.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 29e0895..f78f3e6 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Rp.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Rp.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 f8ff6e3..2b02f84 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Rt.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Rt.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 6b61afe..e85bb27 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ruby.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ruby.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 0375170..241d276 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/S.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/S.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 c429aa6..8eb8a72 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Samp.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Samp.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 ff5159b..4673126 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Script.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Script.kt @@ -1,6 +1,5 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowMetadataPhrasingScriptSupportingUnion import net.kigawa.renlin.w3c.category.integration.FlowMetadataPhrasingScriptSupportingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl @@ -26,7 +25,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 b7fb732..18f662e 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Search.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Search.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 2f708b7..48c566e 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Section.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Section.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpableSectioningUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpableSectioningIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 665ec00..9629038 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Select.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Select.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowFormAssociatedInteractivePalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowFormAssociatedInteractivePalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 177403e..fc6bb16 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Selectedcontent.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Selectedcontent.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 07948d5..47ebf96 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Slot.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Slot.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 a6b90e7..184c786 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Small.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Small.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 9f1435e..14326e3 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Source.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Source.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 b2c5d66..8706606 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Span.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Span.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 6a15a86..4290eb8 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Strong.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Strong.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 06ef7d8..a1bcd94 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Style.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Style.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 fd0f077..3144a76 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Sub.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Sub.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 8c77db2..dbf0eb4 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Summary.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Summary.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 d90561c..96a6c37 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Sup.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Sup.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 4ce490a..4551a81 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Svg.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Svg.kt @@ -1,6 +1,5 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.EmbeddedFlowPalpablePhrasingUnion import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl @@ -26,7 +25,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 d35e06f..419cd20 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Table.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Table.kt @@ -1,6 +1,5 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl @@ -26,7 +25,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 f10f348..c90d530 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tbody.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tbody.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 3796a56..dc1ce3f 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Td.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Td.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 4760bf2..b22bbe8 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Template.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Template.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowMetadataPhrasingScriptSupportingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowMetadataPhrasingScriptSupportingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 5968cb4..14777e1 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Textarea.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Textarea.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowFormAssociatedInteractivePalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowFormAssociatedInteractivePalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 f850ea2..e94d083 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tfoot.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tfoot.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 2aeefcd..92dd3b1 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Th.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Th.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 b82d135..d96805f 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Thead.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Thead.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 96499cf..d789755 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Time.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Time.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 75f5d79..a20921c 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Title.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Title.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 54dde06..7727939 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tr.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Tr.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 7667c2e..e4f4a97 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Track.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Track.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag 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 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 2d240f8..d831cd6 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/U.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/U.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 7407e25..6013538 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ul.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Ul.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpableUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 8dec553..29c47fe 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Var.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Var.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 914d5e1..4b80ce8 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Video.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Video.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.EmbeddedFlowInteractivePalpablePhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowInteractivePalpablePhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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 4b90e57..1862644 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Wbr.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/tag/Wbr.kt @@ -1,7 +1,6 @@ package net.kigawa.renlin.tag -import net.kigawa.renlin.w3c.category.native.FlowPhrasingUnion - +import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration import net.kigawa.renlin.dsl.DslBase import net.kigawa.renlin.dsl.StatedDsl import net.kigawa.renlin.component.TagComponent1 @@ -24,7 +23,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/integration/AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration.kt index eb59e24..3c4fce3 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration.kt @@ -2,11 +2,12 @@ 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.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.FlowPalpableIntegration /** * Integration of FlowContent, PalpableContent, FormAssociatedContent, AutocapitalizeInheritingFormContent */ -interface AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration : FlowContent, PalpableContent, FormAssociatedContent, AutocapitalizeInheritingFormContent, ContentCategory \ No newline at end of file +interface AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration: FlowContent, PalpableContent, FormAssociatedContent, AutocapitalizeInheritingFormContent, FlowPalpableIntegration, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration.kt new file mode 100644 index 0000000..8eea290 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration.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.FormAssociatedContent + import net.kigawa.renlin.w3c.category.native.InteractiveContent + import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration + import net.kigawa.renlin.w3c.category.integration.FlowInteractivePalpablePhrasingIntegration + import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration + import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration + import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowInteractivePalpablePhrasingIntegration + import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowPalpablePhrasingIntegration + import net.kigawa.renlin.w3c.category.integration.FlowFormAssociatedInteractivePalpablePhrasingIntegration + import net.kigawa.renlin.w3c.category.integration.FlowFormAssociatedPalpablePhrasingIntegration + import net.kigawa.renlin.w3c.category.integration.FlowInteractivePalpableIntegration + +/** + * Integration of FlowContent, PhrasingContent, EmbeddedContent, PalpableContent, FormAssociatedContent, InteractiveContent + */ +interface EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration: FlowContent, PhrasingContent, EmbeddedContent, PalpableContent, FormAssociatedContent, InteractiveContent, FlowPalpableIntegration, FlowInteractivePalpablePhrasingIntegration, FlowPalpablePhrasingIntegration, FlowPhrasingIntegration, EmbeddedFlowInteractivePalpablePhrasingIntegration, EmbeddedFlowPalpablePhrasingIntegration, FlowFormAssociatedInteractivePalpablePhrasingIntegration, FlowFormAssociatedPalpablePhrasingIntegration, FlowInteractivePalpableIntegration, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/EmbeddedFlowInteractivePalpablePhrasingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/EmbeddedFlowInteractivePalpablePhrasingIntegration.kt new file mode 100644 index 0000000..248e237 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/EmbeddedFlowInteractivePalpablePhrasingIntegration.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.native.InteractiveContent + import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration + import net.kigawa.renlin.w3c.category.integration.FlowInteractivePalpablePhrasingIntegration + import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration + import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration + import net.kigawa.renlin.w3c.category.integration.EmbeddedFlowPalpablePhrasingIntegration + import net.kigawa.renlin.w3c.category.integration.FlowInteractivePalpableIntegration + +/** + * Integration of FlowContent, PhrasingContent, EmbeddedContent, PalpableContent, InteractiveContent + */ +interface EmbeddedFlowInteractivePalpablePhrasingIntegration: FlowContent, PhrasingContent, EmbeddedContent, PalpableContent, InteractiveContent, FlowPalpableIntegration, FlowInteractivePalpablePhrasingIntegration, FlowPalpablePhrasingIntegration, FlowPhrasingIntegration, EmbeddedFlowPalpablePhrasingIntegration, FlowInteractivePalpableIntegration, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/EmbeddedFlowPalpablePhrasingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/EmbeddedFlowPalpablePhrasingIntegration.kt index 6a18a93..a2eca2b 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/EmbeddedFlowPalpablePhrasingIntegration.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/EmbeddedFlowPalpablePhrasingIntegration.kt @@ -2,11 +2,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.PhrasingContent -import net.kigawa.renlin.w3c.category.native.EmbeddedContent -import net.kigawa.renlin.w3c.category.native.PalpableContent + 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.FlowPalpableIntegration + import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration + import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration /** * Integration of FlowContent, PhrasingContent, EmbeddedContent, PalpableContent */ -interface EmbeddedFlowPalpablePhrasingIntegration : FlowContent, PhrasingContent, EmbeddedContent, PalpableContent, ContentCategory \ No newline at end of file +interface EmbeddedFlowPalpablePhrasingIntegration: FlowContent, PhrasingContent, EmbeddedContent, PalpableContent, FlowPalpableIntegration, FlowPalpablePhrasingIntegration, FlowPhrasingIntegration, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowFormAssociatedInteractivePalpablePhrasingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowFormAssociatedInteractivePalpablePhrasingIntegration.kt index ef056b1..2950bbf 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowFormAssociatedInteractivePalpablePhrasingIntegration.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowFormAssociatedInteractivePalpablePhrasingIntegration.kt @@ -2,12 +2,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.InteractiveContent -import net.kigawa.renlin.w3c.category.native.PalpableContent -import net.kigawa.renlin.w3c.category.native.FormAssociatedContent + 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.FlowPalpableIntegration + import net.kigawa.renlin.w3c.category.integration.FlowInteractivePalpablePhrasingIntegration + import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration + import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration + import net.kigawa.renlin.w3c.category.integration.FlowFormAssociatedPalpablePhrasingIntegration + import net.kigawa.renlin.w3c.category.integration.FlowInteractivePalpableIntegration /** * Integration of FlowContent, PhrasingContent, InteractiveContent, PalpableContent, FormAssociatedContent */ -interface FlowFormAssociatedInteractivePalpablePhrasingIntegration : FlowContent, PhrasingContent, InteractiveContent, PalpableContent, FormAssociatedContent, ContentCategory \ No newline at end of file +interface FlowFormAssociatedInteractivePalpablePhrasingIntegration: FlowContent, PhrasingContent, InteractiveContent, PalpableContent, FormAssociatedContent, FlowPalpableIntegration, FlowInteractivePalpablePhrasingIntegration, FlowPalpablePhrasingIntegration, FlowPhrasingIntegration, FlowFormAssociatedPalpablePhrasingIntegration, FlowInteractivePalpableIntegration, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowFormAssociatedPalpablePhrasingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowFormAssociatedPalpablePhrasingIntegration.kt new file mode 100644 index 0000000..986350d --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowFormAssociatedPalpablePhrasingIntegration.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.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.FlowPalpableIntegration + import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration + import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration + +/** + * Integration of FlowContent, PhrasingContent, PalpableContent, FormAssociatedContent + */ +interface FlowFormAssociatedPalpablePhrasingIntegration: FlowContent, PhrasingContent, PalpableContent, FormAssociatedContent, FlowPalpableIntegration, FlowPalpablePhrasingIntegration, FlowPhrasingIntegration, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowHeadingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowHeadingIntegration.kt new file mode 100644 index 0000000..a7e0199 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowHeadingIntegration.kt @@ -0,0 +1,10 @@ +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 + +/** + * Integration of FlowContent, HeadingContent + */ +interface FlowHeadingIntegration: FlowContent, HeadingContent, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowHeadingPalpableIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowHeadingPalpableIntegration.kt new file mode 100644 index 0000000..e5f99cc --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowHeadingPalpableIntegration.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.HeadingContent + import net.kigawa.renlin.w3c.category.native.PalpableContent + import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration + import net.kigawa.renlin.w3c.category.integration.FlowHeadingIntegration + +/** + * Integration of FlowContent, HeadingContent, PalpableContent + */ +interface FlowHeadingPalpableIntegration: FlowContent, HeadingContent, PalpableContent, FlowPalpableIntegration, FlowHeadingIntegration, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowInteractivePalpableIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowInteractivePalpableIntegration.kt new file mode 100644 index 0000000..d754abc --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowInteractivePalpableIntegration.kt @@ -0,0 +1,12 @@ +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.FlowPalpableIntegration + +/** + * Integration of FlowContent, InteractiveContent, PalpableContent + */ +interface FlowInteractivePalpableIntegration: FlowContent, InteractiveContent, PalpableContent, FlowPalpableIntegration, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowInteractivePalpablePhrasingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowInteractivePalpablePhrasingIntegration.kt index 64c6311..d53fb65 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowInteractivePalpablePhrasingIntegration.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowInteractivePalpablePhrasingIntegration.kt @@ -2,11 +2,15 @@ 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.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.FlowPalpableIntegration + import net.kigawa.renlin.w3c.category.integration.FlowPalpablePhrasingIntegration + import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration + import net.kigawa.renlin.w3c.category.integration.FlowInteractivePalpableIntegration /** * Integration of FlowContent, PhrasingContent, PalpableContent, InteractiveContent */ -interface FlowInteractivePalpablePhrasingIntegration : FlowContent, PhrasingContent, PalpableContent, InteractiveContent, ContentCategory \ No newline at end of file +interface FlowInteractivePalpablePhrasingIntegration: FlowContent, PhrasingContent, PalpableContent, InteractiveContent, FlowPalpableIntegration, FlowPalpablePhrasingIntegration, FlowPhrasingIntegration, FlowInteractivePalpableIntegration, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowMetadataPhrasingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowMetadataPhrasingIntegration.kt index a161aec..949423f 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowMetadataPhrasingIntegration.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowMetadataPhrasingIntegration.kt @@ -2,10 +2,11 @@ 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.FlowContent + import net.kigawa.renlin.w3c.category.native.PhrasingContent + import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration /** * Integration of MetadataContent, FlowContent, PhrasingContent */ -interface FlowMetadataPhrasingIntegration : MetadataContent, FlowContent, PhrasingContent, ContentCategory \ No newline at end of file +interface FlowMetadataPhrasingIntegration: MetadataContent, FlowContent, PhrasingContent, FlowPhrasingIntegration, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowMetadataPhrasingScriptSupportingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowMetadataPhrasingScriptSupportingIntegration.kt index b3bb4c2..997d59e 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowMetadataPhrasingScriptSupportingIntegration.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowMetadataPhrasingScriptSupportingIntegration.kt @@ -2,11 +2,13 @@ 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.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.FlowMetadataPhrasingIntegration + import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration /** * Integration of MetadataContent, FlowContent, PhrasingContent, ScriptSupportingContent */ -interface FlowMetadataPhrasingScriptSupportingIntegration : MetadataContent, FlowContent, PhrasingContent, ScriptSupportingContent, ContentCategory \ No newline at end of file +interface FlowMetadataPhrasingScriptSupportingIntegration: MetadataContent, FlowContent, PhrasingContent, ScriptSupportingContent, FlowMetadataPhrasingIntegration, FlowPhrasingIntegration, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPalpableIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPalpableIntegration.kt index 6402179..66531d6 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPalpableIntegration.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPalpableIntegration.kt @@ -2,9 +2,9 @@ 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.PalpableContent /** * Integration of FlowContent, PalpableContent */ -interface FlowPalpableIntegration : FlowContent, PalpableContent, ContentCategory \ No newline at end of file +interface FlowPalpableIntegration: FlowContent, PalpableContent, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPalpablePhrasingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPalpablePhrasingIntegration.kt index 896ea70..667a554 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPalpablePhrasingIntegration.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPalpablePhrasingIntegration.kt @@ -2,10 +2,12 @@ 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.PhrasingContent + import net.kigawa.renlin.w3c.category.native.PhrasingContent + import net.kigawa.renlin.w3c.category.native.PalpableContent + import net.kigawa.renlin.w3c.category.integration.FlowPalpableIntegration + import net.kigawa.renlin.w3c.category.integration.FlowPhrasingIntegration /** - * Integration of FlowContent, PalpableContent, PhrasingContent + * Integration of FlowContent, PhrasingContent, PalpableContent */ -interface FlowPalpablePhrasingIntegration : FlowContent, PalpableContent, PhrasingContent, ContentCategory \ No newline at end of file +interface FlowPalpablePhrasingIntegration: FlowContent, PhrasingContent, PalpableContent, FlowPalpableIntegration, FlowPhrasingIntegration, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPalpableSectioningIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPalpableSectioningIntegration.kt new file mode 100644 index 0000000..f355769 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPalpableSectioningIntegration.kt @@ -0,0 +1,12 @@ +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.FlowPalpableIntegration + +/** + * Integration of FlowContent, SectioningContent, PalpableContent + */ +interface FlowPalpableSectioningIntegration: FlowContent, SectioningContent, PalpableContent, FlowPalpableIntegration, ContentCategory \ No newline at end of file diff --git a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPhrasingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPhrasingIntegration.kt index bb39113..1911552 100644 --- a/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPhrasingIntegration.kt +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/integration/FlowPhrasingIntegration.kt @@ -2,9 +2,9 @@ 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.PhrasingContent /** * Integration of FlowContent, PhrasingContent */ -interface FlowPhrasingIntegration : FlowContent, PhrasingContent, ContentCategory \ No newline at end of file +interface FlowPhrasingIntegration: FlowContent, PhrasingContent, 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 eb43b32..2c4dea9 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 @@ -3,7 +3,7 @@ package net.kigawa.renlin.w3c.category.native import net.kigawa.renlin.w3c.category.ContentCategory /** - * Union to AutocapitalizeInheritingFormFlowFormAssociatedPalpableUnion + * Integration to AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration * */ -interface AutocapitalizeInheritingFormContent : AutocapitalizeInheritingFormFlowFormAssociatedPalpableUnion, ContentCategory \ No newline at end of file +interface AutocapitalizeInheritingFormContent : AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration, ContentCategory \ 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 new file mode 100644 index 0000000..2c12055 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration.kt @@ -0,0 +1,8 @@ +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/EmbeddedContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedContent.kt index 79d046d..6dea7c4 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 @@ -3,7 +3,7 @@ package net.kigawa.renlin.w3c.category.native import net.kigawa.renlin.w3c.category.ContentCategory /** - * Union to EmbeddedFlowInteractivePalpablePhrasingUnion, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingUnion, EmbeddedFlowPalpablePhrasingUnion + * Integration to EmbeddedFlowInteractivePalpablePhrasingIntegration, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration, EmbeddedFlowPalpablePhrasingIntegration * Parent: PhrasingContent */ -interface EmbeddedContent : EmbeddedFlowInteractivePalpablePhrasingUnion, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingUnion, EmbeddedFlowPalpablePhrasingUnion, ContentCategory, PhrasingContent \ No newline at end of file +interface EmbeddedContent : EmbeddedFlowInteractivePalpablePhrasingIntegration, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration, EmbeddedFlowPalpablePhrasingIntegration, ContentCategory, PhrasingContent \ 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 new file mode 100644 index 0000000..96cbd6a --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration.kt @@ -0,0 +1,8 @@ +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/EmbeddedFlowInteractivePalpablePhrasingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowInteractivePalpablePhrasingIntegration.kt new file mode 100644 index 0000000..27cdfa9 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowInteractivePalpablePhrasingIntegration.kt @@ -0,0 +1,8 @@ +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/EmbeddedFlowPalpablePhrasingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowPalpablePhrasingIntegration.kt new file mode 100644 index 0000000..dd2036a --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/EmbeddedFlowPalpablePhrasingIntegration.kt @@ -0,0 +1,8 @@ +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/FlowContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowContent.kt index 4fbb363..1782062 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 @@ -3,7 +3,7 @@ package net.kigawa.renlin.w3c.category.native import net.kigawa.renlin.w3c.category.ContentCategory /** - * Union to FlowMetadataPhrasingUnion, FlowPalpableUnion, FlowPalpableSectioningUnion, FlowHeadingPalpableUnion, FlowHeadingUnion, FlowInteractivePalpablePhrasingUnion, FlowPalpablePhrasingUnion, FlowPhrasingUnion, EmbeddedFlowInteractivePalpablePhrasingUnion, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingUnion, EmbeddedFlowPalpablePhrasingUnion, FlowMetadataPhrasingScriptSupportingUnion, FlowFormAssociatedInteractivePalpablePhrasingUnion, AutocapitalizeInheritingFormFlowFormAssociatedPalpableUnion, FlowFormAssociatedPalpablePhrasingUnion, FlowInteractivePalpableUnion + * Integration to FlowMetadataPhrasingIntegration, FlowPalpableIntegration, FlowPalpableSectioningIntegration, FlowHeadingPalpableIntegration, FlowHeadingIntegration, FlowInteractivePalpablePhrasingIntegration, FlowPalpablePhrasingIntegration, FlowPhrasingIntegration, EmbeddedFlowInteractivePalpablePhrasingIntegration, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration, EmbeddedFlowPalpablePhrasingIntegration, FlowMetadataPhrasingScriptSupportingIntegration, FlowFormAssociatedInteractivePalpablePhrasingIntegration, AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration, FlowFormAssociatedPalpablePhrasingIntegration, FlowInteractivePalpableIntegration * Parent: EventTarget */ -interface FlowContent : FlowMetadataPhrasingUnion, FlowPalpableUnion, FlowPalpableSectioningUnion, FlowHeadingPalpableUnion, FlowHeadingUnion, FlowInteractivePalpablePhrasingUnion, FlowPalpablePhrasingUnion, FlowPhrasingUnion, EmbeddedFlowInteractivePalpablePhrasingUnion, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingUnion, EmbeddedFlowPalpablePhrasingUnion, FlowMetadataPhrasingScriptSupportingUnion, FlowFormAssociatedInteractivePalpablePhrasingUnion, AutocapitalizeInheritingFormFlowFormAssociatedPalpableUnion, FlowFormAssociatedPalpablePhrasingUnion, FlowInteractivePalpableUnion, ContentCategory, EventTarget \ No newline at end of file +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 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 new file mode 100644 index 0000000..52572da --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowFormAssociatedInteractivePalpablePhrasingIntegration.kt @@ -0,0 +1,8 @@ +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/FlowFormAssociatedPalpablePhrasingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowFormAssociatedPalpablePhrasingIntegration.kt new file mode 100644 index 0000000..a438c21 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowFormAssociatedPalpablePhrasingIntegration.kt @@ -0,0 +1,8 @@ +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/FlowHeadingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowHeadingIntegration.kt new file mode 100644 index 0000000..5404487 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowHeadingIntegration.kt @@ -0,0 +1,8 @@ +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 new file mode 100644 index 0000000..0fb502c --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowHeadingPalpableIntegration.kt @@ -0,0 +1,8 @@ +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/FlowInteractivePalpableIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowInteractivePalpableIntegration.kt new file mode 100644 index 0000000..3cc75ba --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowInteractivePalpableIntegration.kt @@ -0,0 +1,8 @@ +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 new file mode 100644 index 0000000..bcef49f --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowInteractivePalpablePhrasingIntegration.kt @@ -0,0 +1,8 @@ +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/FlowMetadataPhrasingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetadataPhrasingIntegration.kt new file mode 100644 index 0000000..4e72419 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetadataPhrasingIntegration.kt @@ -0,0 +1,8 @@ +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 new file mode 100644 index 0000000..dc3fed0 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowMetadataPhrasingScriptSupportingIntegration.kt @@ -0,0 +1,8 @@ +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/FlowPalpableIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableIntegration.kt new file mode 100644 index 0000000..30f3dcb --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableIntegration.kt @@ -0,0 +1,8 @@ +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 new file mode 100644 index 0000000..7ec33d8 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpablePhrasingIntegration.kt @@ -0,0 +1,8 @@ +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/FlowPalpableSectioningIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableSectioningIntegration.kt new file mode 100644 index 0000000..ca2756b --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPalpableSectioningIntegration.kt @@ -0,0 +1,8 @@ +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/FlowPhrasingIntegration.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPhrasingIntegration.kt new file mode 100644 index 0000000..2142d87 --- /dev/null +++ b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FlowPhrasingIntegration.kt @@ -0,0 +1,8 @@ +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/FormAssociatedContent.kt b/renlin/src/commonMain/kotlin/net/kigawa/renlin/w3c/category/native/FormAssociatedContent.kt index c4076ee..140c494 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 @@ -3,7 +3,7 @@ package net.kigawa.renlin.w3c.category.native import net.kigawa.renlin.w3c.category.ContentCategory /** - * Union to EmbeddedFlowFormAssociatedInteractivePalpablePhrasingUnion, FlowFormAssociatedInteractivePalpablePhrasingUnion, AutocapitalizeInheritingFormFlowFormAssociatedPalpableUnion, FlowFormAssociatedPalpablePhrasingUnion + * Integration to EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration, FlowFormAssociatedInteractivePalpablePhrasingIntegration, AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration, FlowFormAssociatedPalpablePhrasingIntegration * */ -interface FormAssociatedContent : EmbeddedFlowFormAssociatedInteractivePalpablePhrasingUnion, FlowFormAssociatedInteractivePalpablePhrasingUnion, AutocapitalizeInheritingFormFlowFormAssociatedPalpableUnion, FlowFormAssociatedPalpablePhrasingUnion, ContentCategory \ No newline at end of file +interface FormAssociatedContent : EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration, FlowFormAssociatedInteractivePalpablePhrasingIntegration, AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration, FlowFormAssociatedPalpablePhrasingIntegration, 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 5fae78e..31a6072 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 @@ -3,7 +3,7 @@ package net.kigawa.renlin.w3c.category.native import net.kigawa.renlin.w3c.category.ContentCategory /** - * Union to FlowHeadingPalpableUnion, FlowHeadingUnion + * Integration to FlowHeadingPalpableIntegration, FlowHeadingIntegration * Parent: FlowContent */ -interface HeadingContent : FlowHeadingPalpableUnion, FlowHeadingUnion, ContentCategory, FlowContent \ No newline at end of file +interface HeadingContent : FlowHeadingPalpableIntegration, FlowHeadingIntegration, ContentCategory, FlowContent \ 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 9a01690..39e3710 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 @@ -3,7 +3,7 @@ package net.kigawa.renlin.w3c.category.native import net.kigawa.renlin.w3c.category.ContentCategory /** - * Union to FlowInteractivePalpablePhrasingUnion, EmbeddedFlowInteractivePalpablePhrasingUnion, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingUnion, FlowFormAssociatedInteractivePalpablePhrasingUnion, FlowInteractivePalpableUnion + * Integration to FlowInteractivePalpablePhrasingIntegration, EmbeddedFlowInteractivePalpablePhrasingIntegration, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration, FlowFormAssociatedInteractivePalpablePhrasingIntegration, FlowInteractivePalpableIntegration * Parent: PhrasingContent */ -interface InteractiveContent : FlowInteractivePalpablePhrasingUnion, EmbeddedFlowInteractivePalpablePhrasingUnion, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingUnion, FlowFormAssociatedInteractivePalpablePhrasingUnion, FlowInteractivePalpableUnion, ContentCategory, PhrasingContent \ No newline at end of file +interface InteractiveContent : FlowInteractivePalpablePhrasingIntegration, EmbeddedFlowInteractivePalpablePhrasingIntegration, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration, FlowFormAssociatedInteractivePalpablePhrasingIntegration, FlowInteractivePalpableIntegration, ContentCategory, PhrasingContent \ 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 507d66b..d864a8d 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 @@ -3,7 +3,7 @@ package net.kigawa.renlin.w3c.category.native import net.kigawa.renlin.w3c.category.ContentCategory /** - * Union to FlowMetadataPhrasingUnion, FlowMetadataPhrasingScriptSupportingUnion + * Integration to FlowMetadataPhrasingIntegration, FlowMetadataPhrasingScriptSupportingIntegration * */ -interface MetadataContent : FlowMetadataPhrasingUnion, FlowMetadataPhrasingScriptSupportingUnion, ContentCategory \ No newline at end of file +interface MetadataContent : FlowMetadataPhrasingIntegration, FlowMetadataPhrasingScriptSupportingIntegration, 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 a1b817e..a6fca78 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 @@ -3,7 +3,7 @@ package net.kigawa.renlin.w3c.category.native import net.kigawa.renlin.w3c.category.ContentCategory /** - * Union to FlowPalpableUnion, FlowPalpableSectioningUnion, FlowHeadingPalpableUnion, FlowInteractivePalpablePhrasingUnion, FlowPalpablePhrasingUnion, EmbeddedFlowInteractivePalpablePhrasingUnion, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingUnion, EmbeddedFlowPalpablePhrasingUnion, FlowFormAssociatedInteractivePalpablePhrasingUnion, AutocapitalizeInheritingFormFlowFormAssociatedPalpableUnion, FlowFormAssociatedPalpablePhrasingUnion, FlowInteractivePalpableUnion + * Integration to FlowPalpableIntegration, FlowPalpableSectioningIntegration, FlowHeadingPalpableIntegration, FlowInteractivePalpablePhrasingIntegration, FlowPalpablePhrasingIntegration, EmbeddedFlowInteractivePalpablePhrasingIntegration, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration, EmbeddedFlowPalpablePhrasingIntegration, FlowFormAssociatedInteractivePalpablePhrasingIntegration, AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration, FlowFormAssociatedPalpablePhrasingIntegration, FlowInteractivePalpableIntegration * */ -interface PalpableContent : FlowPalpableUnion, FlowPalpableSectioningUnion, FlowHeadingPalpableUnion, FlowInteractivePalpablePhrasingUnion, FlowPalpablePhrasingUnion, EmbeddedFlowInteractivePalpablePhrasingUnion, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingUnion, EmbeddedFlowPalpablePhrasingUnion, FlowFormAssociatedInteractivePalpablePhrasingUnion, AutocapitalizeInheritingFormFlowFormAssociatedPalpableUnion, FlowFormAssociatedPalpablePhrasingUnion, FlowInteractivePalpableUnion, ContentCategory \ No newline at end of file +interface PalpableContent : FlowPalpableIntegration, FlowPalpableSectioningIntegration, FlowHeadingPalpableIntegration, FlowInteractivePalpablePhrasingIntegration, FlowPalpablePhrasingIntegration, EmbeddedFlowInteractivePalpablePhrasingIntegration, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration, EmbeddedFlowPalpablePhrasingIntegration, FlowFormAssociatedInteractivePalpablePhrasingIntegration, AutocapitalizeInheritingFormFlowFormAssociatedPalpableIntegration, FlowFormAssociatedPalpablePhrasingIntegration, FlowInteractivePalpableIntegration, ContentCategory \ 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 f0e474a..32c4134 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 @@ -3,7 +3,7 @@ package net.kigawa.renlin.w3c.category.native import net.kigawa.renlin.w3c.category.ContentCategory /** - * Union to FlowMetadataPhrasingUnion, FlowInteractivePalpablePhrasingUnion, FlowPalpablePhrasingUnion, FlowPhrasingUnion, EmbeddedFlowInteractivePalpablePhrasingUnion, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingUnion, EmbeddedFlowPalpablePhrasingUnion, FlowMetadataPhrasingScriptSupportingUnion, FlowFormAssociatedInteractivePalpablePhrasingUnion, FlowFormAssociatedPalpablePhrasingUnion + * Integration to FlowMetadataPhrasingIntegration, FlowInteractivePalpablePhrasingIntegration, FlowPalpablePhrasingIntegration, FlowPhrasingIntegration, EmbeddedFlowInteractivePalpablePhrasingIntegration, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration, EmbeddedFlowPalpablePhrasingIntegration, FlowMetadataPhrasingScriptSupportingIntegration, FlowFormAssociatedInteractivePalpablePhrasingIntegration, FlowFormAssociatedPalpablePhrasingIntegration * Parent: FlowContent */ -interface PhrasingContent : FlowMetadataPhrasingUnion, FlowInteractivePalpablePhrasingUnion, FlowPalpablePhrasingUnion, FlowPhrasingUnion, EmbeddedFlowInteractivePalpablePhrasingUnion, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingUnion, EmbeddedFlowPalpablePhrasingUnion, FlowMetadataPhrasingScriptSupportingUnion, FlowFormAssociatedInteractivePalpablePhrasingUnion, FlowFormAssociatedPalpablePhrasingUnion, ContentCategory, FlowContent \ No newline at end of file +interface PhrasingContent : FlowMetadataPhrasingIntegration, FlowInteractivePalpablePhrasingIntegration, FlowPalpablePhrasingIntegration, FlowPhrasingIntegration, EmbeddedFlowInteractivePalpablePhrasingIntegration, EmbeddedFlowFormAssociatedInteractivePalpablePhrasingIntegration, EmbeddedFlowPalpablePhrasingIntegration, FlowMetadataPhrasingScriptSupportingIntegration, FlowFormAssociatedInteractivePalpablePhrasingIntegration, FlowFormAssociatedPalpablePhrasingIntegration, ContentCategory, FlowContent \ 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 69df3d1..0c9581a 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 @@ -3,7 +3,7 @@ package net.kigawa.renlin.w3c.category.native import net.kigawa.renlin.w3c.category.ContentCategory /** - * Union to FlowMetadataPhrasingScriptSupportingUnion + * Integration to FlowMetadataPhrasingScriptSupportingIntegration * */ -interface ScriptSupportingContent : FlowMetadataPhrasingScriptSupportingUnion, ContentCategory \ No newline at end of file +interface ScriptSupportingContent : FlowMetadataPhrasingScriptSupportingIntegration, 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 b8c9400..6924a64 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 @@ -3,7 +3,7 @@ package net.kigawa.renlin.w3c.category.native import net.kigawa.renlin.w3c.category.ContentCategory /** - * Union to FlowPalpableSectioningUnion + * Integration to FlowPalpableSectioningIntegration * Parent: FlowContent */ -interface SectioningContent : FlowPalpableSectioningUnion, ContentCategory, FlowContent \ No newline at end of file +interface SectioningContent : FlowPalpableSectioningIntegration, ContentCategory, FlowContent \ 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..f872c27 100644 --- a/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/SampleComponent.kt +++ b/sample/src/commonMain/kotlin/net/kigawa/renlin/sample/SampleComponent.kt @@ -2,6 +2,7 @@ package net.kigawa.renlin.sample import net.kigawa.renlin.component.component import net.kigawa.renlin.tag.div +import net.kigawa.renlin.tag.p class SampleComponent( val name: String, @@ -13,7 +14,13 @@ class SampleComponent( sub.navigation("navigation") // a sub.display("main-display") + div { + p.invoke { +// div.invoke { +// +// } + } - + } } } \ No newline at end of file