Update Files

Author: klsruan

macros/ILL.SplitText.moon

@@ -1,6 +1,6 @@
 export script_name        = "ILL - Split Text"
 export script_description = "Splits the text in several ways"
-export script_version     = "2.1.0"
+export script_version     = "2.1.2"
 export script_author      = "ILLTeam"
 export script_namespace   = "ILL.SplitText"
 
@@ -13,7 +13,7 @@ if haveDepCtrl
 		{
 			{
 				"ILL.ILL"
-				version: "1.6.1"
+				version: "1.6.4"
 				url: "https://github.com/TypesettingTools/ILL-Aegisub-Scripts/"
 				feed: "https://raw.githubusercontent.com/TypesettingTools/ILL-Aegisub-Scripts/main/DependencyControl.json"
 			}
@@ -27,17 +27,17 @@ else
 
 main = (mode) ->
     (sub, sel, activeLine) ->
-        ass = Ass sub, sel, activeLine
+        ass = Ass sub, sel, activeLine, false
         for l, s, i, n in ass\iterSel!
             ass\progressLine s, i, n
             unless l.isShape
                 ass\removeLine l, s
-                Line.extend ass, l
+                Line.extend ass, l, false
                 for line in *switch mode
-                        when "chars" then Line.chars ass, l
-                        when "words" then Line.words ass, l
-                        when "breaks" then Line.breaks ass, l
-                        when "tags" then Line.tags ass, l
+                        when "chars" then Line.chars ass, l, true
+                        when "words" then Line.words ass, l, true
+                        when "breaks" then Line.breaks ass, l, true
+                        when "tags" then Line.tags ass, l, true
                     fr = line.data.angle != 0
                     if fr or line.text\existsTagOr "frx", "fry", "frz"
                         line.tags\insert {{"org", line.data.org}, true}

modules/ILL/ILL.moon

@@ -1,4 +1,4 @@
-module_version = "1.6.3"
+module_version = "1.6.4"
 
 haveDepCtrl, DependencyControl = pcall require, "l0.DependencyControl"
 

modules/ILL/ILL/Ass/Line.moon

@@ -27,7 +27,7 @@ class Line
 			l.text\moveToFirstLayer!
 
 		with l
-			.text_stripped = .isShape and .text.textBlocks[1]\gsub("%b{}", "") or .text\stripped!
+			.text_stripped = .text.textBlocks[1]\gsub "%b{}", ""
 			.duration = .end_time - .start_time
 			textIsBlank = Util.isBlank .text_stripped
 
@@ -89,7 +89,8 @@ class Line
 				.postspace = .text_stripped\match("^%s*.-(%s*)$")\len! * .space_width
 
 				-- removes the spaces between the text
-				.text_stripped = .text_stripped\match "^%s*(.-)%s*$"
+				unless textIsBlank
+					.text_stripped = .text_stripped\match "^%s*(.-)%s*$"
 			else
 				-- to make everything more dynamic
 				.shape = .text_stripped
@@ -100,14 +101,15 @@ class Line
 			-- gets the metric values of the text
 			if textIsBlank
 				textExtents = font\getTextExtents " "
+				textMetrics = font\getMetrics!
 				.width = 0
 				.height = textExtents.height
-				.ascent = 0
-				.descent = 0
+				.ascent = textMetrics.ascent
+				.descent = textMetrics.descent
 			else
 				textValue = .isShape and "" or .text_stripped
 				textExtents = font\getTextExtents textValue
-				textMetrics = font\getMetrics textValue
+				textMetrics = font\getMetrics!
 				.width = textExtents.width * video_x_correct_factor
 				.height = textExtents.height
 				.ascent = textMetrics.ascent
@@ -168,7 +170,7 @@ class Line
 					.y = .bottom
 
 	-- gets all the data values from the tags blocks
-	tagsBlocks: (ass, l, noblank = true) ->
+	tagsBlocks: (ass, l, noblank = false) ->
 		data = {width: 0, height: 0, n: 0}
 
 		unless l.data
@@ -188,6 +190,7 @@ class Line
 			line.text_stripped = text
 			line.tags = tags\clean!
 			line.text = Text line.tags\__tostring! .. text
+			line.text.textBlocks[1] = text
 
 			-- support for the \r tag in line processing
 			if reset = line.tags\getTag "r"
@@ -214,6 +217,7 @@ class Line
 
 		-- fixes the positioning of tag blocks in relation to the rendered text
 		for line in *data
+
 			-- sums with the previous space values
 			left += line.prevspace
 
@@ -240,7 +244,7 @@ class Line
 		return noblank and dataNoblank or data
 
 	-- gets all the data values from the line breaks
-	lineBreaks: (ass, l, noblank = true) ->
+	lineBreaks: (ass, l, noblank = false) ->
 		data = {width: 0, height: 0, n: 0}
 
 		unless l.data
@@ -310,7 +314,7 @@ class Line
 		return noblank and dataNoblank or data
 
 	-- adds all possible information to the line
-	extend: (ass, l, noblank) ->
+	extend: (ass, l, noblank = true) ->
 		Line.process ass, l
 		unless l.isShape
 			l.lines = Line.lineBreaks ass, l, noblank
@@ -326,7 +330,7 @@ class Line
 		Line.extend ass, l, noblank
 
 	-- splits the text word by word
-	words: (ass, l) ->
+	words: (ass, l, noblank = false) ->
 		if l.extended
 			words = {n: 0}
 			for i = 1, l.lines.n
@@ -339,7 +343,7 @@ class Line
 					lineTags = lineBreak[j]
 					lineTagsText = lineTags.text_stripped
 					lineTagsTags = lineTags.tags\get!
-					for prevspace, wordText, postspace in lineTagsText\gmatch "(%s*)(%S+)(%s*)"
+					for prevspace, wordText, postspace in lineTagsText\gmatch "(%s*)(.+)(%s*)"
 						word = Table.copy lineTags
 						word.tags = Tags lineTagsTags
 						word.text = Text wordText
@@ -367,6 +371,13 @@ class Line
 						words.n += 1
 						words[words.n] = word
 					left += lineTags.postspace
+			if noblank
+				wordsNoblank = {n: 0}
+				for word in *words
+					unless Util.isBlank word.text_stripped
+						wordsNoblank.n += 1
+						wordsNoblank[wordsNoblank.n] = word
+				return wordsNoblank
 			return words
 		else
 			error "You have to extend the line before you get the words", 2
@@ -428,9 +439,9 @@ class Line
 				lineBreak = Table.copy line[1]
 				newBreakText = ""
 				for i = 1, line.n
-					newBreakTags = line[i].tags
+					newBreakTags = Table.copy line[i].tags
 					if i > 1
-						newBreakTags\clear line.data
+						newBreakTags\difference line[i-1].tags
 					newBreakText ..= newBreakTags\get! .. line[i].text_stripped
 					lineBreak.y = math.max line[i].y, lineBreak.y
 				lineBreak.text = Text newBreakText
@@ -457,8 +468,9 @@ class Line
 			lines = {n: 0}
 			for line in *l.lines
 				for lineTags in *line
-					lines.n += 1
-					lines[lines.n] = Table.copy lineTags
+					unless Util.isBlank lineTags.text_stripped
+						lines.n += 1
+						lines[lines.n] = Table.copy lineTags
 			return lines
 		else
 			error "You have to extend the line before you get the tags", 2

modules/ILL/ILL/Ass/Text/Tags.moon

@@ -185,6 +185,17 @@ class Tags
 		@tags = table.concat [s\__tostring! for s in *newSplit]
 		@close!
 
+	-- performs a difference operation on the tags
+	-- tags A = Tags {\fs20\bord10}
+	-- tags B = Tags {\fs20\bord10\fs100}
+	-- result = {\fs100}
+	difference: (tags) =>
+		for {:name, :value} in *tags\split!
+			if @existsTag name
+				if @getTag(name).value == value
+					@remove name
+		@close!
+
 	-- checks if the tag exists in the tags
 	existsTag: (name) =>
 		if name != "t"

modules/ILL/ILL/Ass/Text/Text.moon

@@ -189,31 +189,12 @@ class Text
 			tagsBlock = tagsBlocks[i]
 			textBlock = textBlocks[i]
 			new ..= tostring(tagsBlock)\gsub("{(.-)\\N}", "\\N{%1}") .. textBlock
-			new = new\gsub "}{", ""
+			-- new = new\gsub "}{", ""
 
 		-- gets the line breaks
 		breaks = Util.splitByPattern new, "\\N"
 		n = #breaks
 
-		-- solves cases where the initial tags are only blanks
-		i = 1
-		while true
-			if breaks[i] and Util.isBlank breaks[i]\gsub "%b{}", ""
-				n -= 1
-				i -= 1
-				table.remove breaks, 1
-			else
-				break
-			i += 1
-
-		-- fixes a bug of extreme masochism
-		if n >= 1
-			breaks[1] = Text(breaks[1])\__tostring!
-			breaks[1] = breaks[1]\gsub "}%s*{", ""
-			if n > 1
-				breaks[n] = Text(breaks[n])\__tostring!
-				breaks[n] = breaks[n]\gsub "}%s*{", ""
-
 		return breaks, n
 
 	__tostring: =>