Fix bugs in Shapery module

- Fixed 'Shapery/Offsetting': Now works in a more simplified way.
- Moved 'Shapery macros:/Shape without holes' to a Path class function.

Author: klsruan

macros/ILL.Shapery.moon

@@ -1,46 +1,31 @@
 export script_name        = "Shapery"
 export script_description = "Does several types of shape manipulations from the simplest to the most complex"
-export script_version     = "2.6.1"
+export script_version     = "2.6.2"
 export script_author      = "ILLTeam"
 export script_namespace   = "ILL.Shapery"
 
 haveDepCtrl, DependencyControl = pcall require, "l0.DependencyControl"
 
-local depctrl, Clipper, ILL
+local depctrl, ILL
 if haveDepCtrl
 	depctrl = DependencyControl {
 		feed: "https://github.com/TypesettingTools/ILL-Aegisub-Scripts/main/DependencyControl.json",
 		{
-			{
-				"clipper2.clipper2"
-				version: "1.3.2"
-				url: "https://github.com/TypesettingTools/ILL-Aegisub-Scripts/"
-				feed: "https://github.com/TypesettingTools/ILL-Aegisub-Scripts/main/DependencyControl.json"
-			}
 			{
 				"ILL.ILL"
-				version: "1.6.5"
+				version: "1.8.0"
 				url: "https://github.com/TypesettingTools/ILL-Aegisub-Scripts/"
 				feed: "https://github.com/TypesettingTools/ILL-Aegisub-Scripts/main/DependencyControl.json"
 			}
 		}
 	}
-	Clipper, ILL = depctrl\requireModules!
+	ILL = depctrl\requireModules!
 else
-	Clipper = require "clipper2.clipper2"
 	ILL = require "ILL.ILL"
 
 {:Aegi, :Ass, :Config, :Line, :Curve, :Path, :Point, :Util, :Math, :Table, :Util} = ILL
 clipboard = require "aegisub.clipboard"
 
-checkPathClockWise = (path) ->
-	sum = 0
-	for i = 1, #path
-		currPoint = path[i]
-		nextPoint = path[(i % #path) + 1]
-		sum += (nextPoint.x - currPoint.x) * (nextPoint.y + currPoint.y)
-	return sum < 0
-
 interfaces = {
 	config: -> {
 		{class: "label", label: "Expand", x: 0, y: 0}
@@ -61,7 +46,6 @@ interfaces = {
 	offsetting: -> {
 		{class: "label", label: "Stroke Weight", x: 0, y: 0}
 		{class: "floatedit", x: 1, y: 0, name: "strokeWeight", value: 0}
-		{class: "checkbox", x: 1, y: 1, name: "cut", value: false}
 		{class: "label", label: "Corner Style", x: 0, y: 2}
 		{class: "dropdown", items: {"Miter", "Round", "Square"}, x: 1, y: 2, name: "cornerStyle", value: "Round"}
 		{class: "label", label: "Align Stroke", x: 0, y: 3}
@@ -197,26 +181,39 @@ OffsettingDialog = (sub, sel, activeLine) ->
 	if button != "Cancel"
 		cfg = getConfigElements!
 		ass = Ass sub, sel, activeLine, not cfg.saveLines
-		{:strokeWeight, :strokeAlign, :cornerStyle, :miterLimit, :arcPrecision, :cut} = elements
+		{:strokeWeight, :strokeAlign, :cornerStyle, :miterLimit, :arcPrecision} = elements
 		if strokeWeight < 0
 			strokeAlign = "Inside"
 		cornerStyle = cornerStyle\lower!
-		cutsOutside = cut and strokeAlign == "Outside"
 		for l, s, i, n in ass\iterSel!
 			ass\progressLine s, i, n
 			ass\removeLine l, s
 			Line.extend ass, l
 			Line.callBackExpand ass, l, nil, (line) ->
-				path, clip = Path line.shape
-				if cutsOutside
-					clip = path\clone!
+				path = Path line.shape
+				clip = path\clone!
+
+				line.tags\insert {{"bord", 0}}
+
+				if strokeAlign == "Outside"
+					line.shape = path\export!
+					ass\insertLine line, s
+
 				switch strokeAlign
 					when "Outside" then path\offset strokeWeight, cornerStyle, "polygon", miterLimit, arcPrecision
 					when "Center"  then path\offset strokeWeight, cornerStyle, "joined", miterLimit, arcPrecision
 					when "Inside"  then path\offset -math.abs(strokeWeight), cornerStyle, "polygon", miterLimit, arcPrecision
-				if cutsOutside
-					path\difference clip
+
+				if strokeAlign == "Center" or strokeAlign == "Inside"
+					line.shape = clip\difference(path)\export!
+					ass\insertLine line, s
+
+				if strokeAlign == "Outside"
+					line.shape = path\difference(clip)\export!
+
+				line.tags\insert {{"bord", 0}}, {{"c", line.data.color3}}
 				line.shape = path\export!
+
 				ass\insertLine line, s
 		return ass\getNewSelection!
 
@@ -596,13 +593,7 @@ ShaperyMacrosDialog = (macro) ->
 						ass\warning s, "Expected a shape"
 				when "Shape without holes"
 					if l.isShape
-						newShape = Path!
-						shapePath = Path l.shape
-						shapePathFlattened = Path(shapePath)\flatten!
-						for j = 1, #shapePath.path
-							if checkPathClockWise shapePathFlattened.path[j]
-								table.insert newShape.path, shapePath.path[j]
-						l.shape = newShape\export!
+						l.shape = Path(l.shape)\withoutHoles!\export!
 						ass\setLine l, s
 					else
 						ass\warning s, "Expected a shape"

modules/ILL/ILL.moon

@@ -1,4 +1,4 @@
-module_version = "1.7.9"
+module_version = "1.8.0"
 
 haveDepCtrl, DependencyControl = pcall require, "l0.DependencyControl"
 

modules/ILL/ILL/Ass/Shape/Curve.moon

@@ -96,7 +96,10 @@ class Curve
 		c.y = -1 * mt * mu2 * y1 + mu * (3 * tu - t - 2 * u) * y2 + u * (-3 * tu + 2 * t + u) * y3 + t * u2 * y4
 		d.x = -mu3 * x1 + 3 * u * mu2 * x2 - 3 * u2 * mu * x3 + u3 * x4
 		d.y = -mu3 * y1 + 3 * u * mu2 * y2 - 3 * u2 * mu * y3 + u3 * y4
-		return Curve a, b, c, d
+		curve = Curve a, b, c, d
+		tanT, pT, tT = @getNormalized t
+		tanU, pU, tU = @getNormalized u
+		return curve, {t: {tangent: tanT, point: pT, time: tT}, u: {tangent: tanU, point: pU, time: tU}}
 
 	-- gets the cubic coefficient of the bezier segment
 	getCoefficient: =>

modules/ILL/ILL/Ass/Shape/Path.moon

@@ -62,12 +62,13 @@ class Path
 
 	-- Remove holes from Path
 	withoutHoles: =>
+		newPath = Path!
 		clone = @clone!
 		clone\flatten!
 		for j = 1, #clone.path
-			unless checkPathClockWise clone.path[j]
-				remove @path, j
-		return @
+			if checkPathClockWise clone.path[j]
+				insert newPath.path, @path[j]
+		@update newPath
 
 	-- Maps all points on the Path
 	map: (fn) =>
@@ -416,13 +417,13 @@ class Path
 
 	-- Gets the normalized tangent on the Path given a time
 	getNormalized: (t = 0.5, returnPath) =>
-		sumLength, length, newPath, tan, p, u = 0, t * @getLength!, Path!, nil, nil, nil
+		sumLength, length, newPath, data = 0, t * @getLength!, Path!, nil
 		@callBackPath (id, seg, k) ->
 			segmentLen = seg\getLength!
 			if newPath.path[k] == nil
 				newPath.path[k] = {seg.a}
 			if sumLength + segmentLen > length
-				spt = seg\splitAtInterval (length - sumLength) / segmentLen, 1
+				spt, data = seg\splitAtInterval (length - sumLength) / segmentLen, 1
 				if id == "l"
 					insert newPath.path[k], spt.b
 				else
@@ -439,7 +440,7 @@ class Path
 			sumLength += segmentLen
 		if returnPath
 			return newPath
-		return tan, p, u, newPath
+		return data.t.tangent, data.t.point, data.t.time, newPath
 
 	-- Get the Path by giving a interval
 	getNormalizedInterval: (u, v) =>

modules/ILL/ILL/Ass/Shape/Segment.moon

@@ -45,7 +45,10 @@ class Segment
 		{:a, :b} = @
 		p1 = a\lerp b, t
 		p2 = a\lerp b, u
-		return Segment p1, p2
+		segment = Segment p1, p2
+		tanT, pT, tT = @getNormalized t
+		tanU, pU, tU = @getNormalized u
+		return segment, {t: {tangent: tanT, point: pT, time: tT}, u: {tangent: tanU, point: pU, time: tU}}
 
 	-- gets the normalized tangent given a time on a segment
 	getNormalized: (t, inverse) =>