From bc430fcba6709d24ff9c1bbec6d07d36482f8eb2 Mon Sep 17 00:00:00 2001 From: Lanius Trolling Date: Thu, 7 Mar 2024 07:48:39 -0500 Subject: [PATCH] Move KSVG to JS externals subproject --- .../src/jsMain}/kotlin/com/github/nwillc/ksvg/HtmlUtils.kt | 0 .../src/jsMain}/kotlin/com/github/nwillc/ksvg/RenderMode.kt | 0 .../com/github/nwillc/ksvg/attributes/AttributeProperty.kt | 0 .../com/github/nwillc/ksvg/attributes/AttributeType.kt | 6 +++--- .../com/github/nwillc/ksvg/attributes/HasAttributes.kt | 0 .../com/github/nwillc/ksvg/attributes/HasAttributesImpl.kt | 0 .../kotlin/com/github/nwillc/ksvg/attributes/HasClipPath.kt | 0 .../com/github/nwillc/ksvg/attributes/HasClipPathImpl.kt | 0 .../com/github/nwillc/ksvg/attributes/HasDimensions.kt | 0 .../com/github/nwillc/ksvg/attributes/HasDimensionsImpl.kt | 0 .../kotlin/com/github/nwillc/ksvg/attributes/HasFill.kt | 0 .../kotlin/com/github/nwillc/ksvg/attributes/HasFillImpl.kt | 0 .../kotlin/com/github/nwillc/ksvg/attributes/HasOrigin.kt | 0 .../com/github/nwillc/ksvg/attributes/HasOriginImpl.kt | 0 .../kotlin/com/github/nwillc/ksvg/attributes/HasStroke.kt | 0 .../com/github/nwillc/ksvg/attributes/HasStrokeImpl.kt | 0 .../src/jsMain}/kotlin/com/github/nwillc/ksvg/elements/A.kt | 0 .../kotlin/com/github/nwillc/ksvg/elements/CIRCLE.kt | 0 .../kotlin/com/github/nwillc/ksvg/elements/CLIPPATH.kt | 0 .../kotlin/com/github/nwillc/ksvg/elements/Container.kt | 0 .../jsMain}/kotlin/com/github/nwillc/ksvg/elements/DEFS.kt | 0 .../kotlin/com/github/nwillc/ksvg/elements/Element.kt | 0 .../src/jsMain}/kotlin/com/github/nwillc/ksvg/elements/G.kt | 0 .../jsMain}/kotlin/com/github/nwillc/ksvg/elements/IMAGE.kt | 0 .../jsMain}/kotlin/com/github/nwillc/ksvg/elements/LINE.kt | 0 .../jsMain}/kotlin/com/github/nwillc/ksvg/elements/PATH.kt | 0 .../kotlin/com/github/nwillc/ksvg/elements/POLYGON.kt | 0 .../jsMain}/kotlin/com/github/nwillc/ksvg/elements/RECT.kt | 0 .../kotlin/com/github/nwillc/ksvg/elements/Region.kt | 0 .../jsMain}/kotlin/com/github/nwillc/ksvg/elements/STYLE.kt | 0 .../jsMain}/kotlin/com/github/nwillc/ksvg/elements/SVG.kt | 0 .../kotlin/com/github/nwillc/ksvg/elements/SvgTagMarker.kt | 0 .../jsMain}/kotlin/com/github/nwillc/ksvg/elements/TEXT.kt | 0 .../jsMain}/kotlin/com/github/nwillc/ksvg/elements/TITLE.kt | 0 .../jsMain}/kotlin/com/github/nwillc/ksvg/elements/USE.kt | 0 35 files changed, 3 insertions(+), 3 deletions(-) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/HtmlUtils.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/RenderMode.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/attributes/AttributeProperty.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/attributes/AttributeType.kt (95%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/attributes/HasAttributes.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/attributes/HasAttributesImpl.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/attributes/HasClipPath.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/attributes/HasClipPathImpl.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/attributes/HasDimensions.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/attributes/HasDimensionsImpl.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/attributes/HasFill.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/attributes/HasFillImpl.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/attributes/HasOrigin.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/attributes/HasOriginImpl.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/attributes/HasStroke.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/attributes/HasStrokeImpl.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/elements/A.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/elements/CIRCLE.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/elements/CLIPPATH.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/elements/Container.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/elements/DEFS.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/elements/Element.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/elements/G.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/elements/IMAGE.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/elements/LINE.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/elements/PATH.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/elements/POLYGON.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/elements/RECT.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/elements/Region.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/elements/STYLE.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/elements/SVG.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/elements/SvgTagMarker.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/elements/TEXT.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/elements/TITLE.kt (100%) rename {src/mapMain => externals/src/jsMain}/kotlin/com/github/nwillc/ksvg/elements/USE.kt (100%) diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/HtmlUtils.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/HtmlUtils.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/HtmlUtils.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/HtmlUtils.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/RenderMode.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/RenderMode.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/RenderMode.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/RenderMode.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/AttributeProperty.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/AttributeProperty.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/AttributeProperty.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/AttributeProperty.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/AttributeType.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/AttributeType.kt similarity index 95% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/AttributeType.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/AttributeType.kt index d9f135e..2b7670d 100644 --- a/src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/AttributeType.kt +++ b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/AttributeType.kt @@ -128,9 +128,9 @@ enum class AttributeType { private companion object { private val number = Regex("[+-]?[0-9]*.?[0-9]+") private val separator = Regex("\\s*,?\\s+") - private const val lengthUnits = "em|rem|ex|px|in|cm|mm|pt|pc" - private val length = Regex("$number($lengthUnits)?") - private val lengthPercent = Regex("$number($lengthUnits|%)?") + private const val LENGTH_UNITS = "em|rem|ex|px|in|cm|mm|pt|pc" + private val length = Regex("$number($LENGTH_UNITS)?") + private val lengthPercent = Regex("$number($LENGTH_UNITS|%)?") private val numberList = Regex("($number($separator)?)+") private val fillRule = Regex("nonzero|evenodd") private val strokeLinecap = Regex("butt|round|square") diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/HasAttributes.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/HasAttributes.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/HasAttributes.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/HasAttributes.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/HasAttributesImpl.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/HasAttributesImpl.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/HasAttributesImpl.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/HasAttributesImpl.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/HasClipPath.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/HasClipPath.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/HasClipPath.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/HasClipPath.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/HasClipPathImpl.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/HasClipPathImpl.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/HasClipPathImpl.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/HasClipPathImpl.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/HasDimensions.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/HasDimensions.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/HasDimensions.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/HasDimensions.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/HasDimensionsImpl.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/HasDimensionsImpl.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/HasDimensionsImpl.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/HasDimensionsImpl.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/HasFill.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/HasFill.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/HasFill.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/HasFill.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/HasFillImpl.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/HasFillImpl.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/HasFillImpl.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/HasFillImpl.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/HasOrigin.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/HasOrigin.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/HasOrigin.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/HasOrigin.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/HasOriginImpl.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/HasOriginImpl.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/HasOriginImpl.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/HasOriginImpl.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/HasStroke.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/HasStroke.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/HasStroke.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/HasStroke.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/HasStrokeImpl.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/HasStrokeImpl.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/attributes/HasStrokeImpl.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/attributes/HasStrokeImpl.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/elements/A.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/A.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/elements/A.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/A.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/elements/CIRCLE.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/CIRCLE.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/elements/CIRCLE.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/CIRCLE.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/elements/CLIPPATH.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/CLIPPATH.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/elements/CLIPPATH.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/CLIPPATH.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/elements/Container.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/Container.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/elements/Container.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/Container.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/elements/DEFS.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/DEFS.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/elements/DEFS.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/DEFS.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/elements/Element.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/Element.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/elements/Element.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/Element.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/elements/G.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/G.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/elements/G.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/G.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/elements/IMAGE.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/IMAGE.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/elements/IMAGE.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/IMAGE.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/elements/LINE.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/LINE.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/elements/LINE.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/LINE.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/elements/PATH.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/PATH.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/elements/PATH.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/PATH.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/elements/POLYGON.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/POLYGON.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/elements/POLYGON.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/POLYGON.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/elements/RECT.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/RECT.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/elements/RECT.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/RECT.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/elements/Region.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/Region.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/elements/Region.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/Region.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/elements/STYLE.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/STYLE.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/elements/STYLE.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/STYLE.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/elements/SVG.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/SVG.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/elements/SVG.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/SVG.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/elements/SvgTagMarker.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/SvgTagMarker.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/elements/SvgTagMarker.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/SvgTagMarker.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/elements/TEXT.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/TEXT.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/elements/TEXT.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/TEXT.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/elements/TITLE.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/TITLE.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/elements/TITLE.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/TITLE.kt diff --git a/src/mapMain/kotlin/com/github/nwillc/ksvg/elements/USE.kt b/externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/USE.kt similarity index 100% rename from src/mapMain/kotlin/com/github/nwillc/ksvg/elements/USE.kt rename to externals/src/jsMain/kotlin/com/github/nwillc/ksvg/elements/USE.kt -- 2.25.1