Module:MOS genchain: Difference between revisions

← Older edit

@@ Line 1: / Line 1: @@
 local mos = require("Module:MOS")
-local tip = require("Module:Template input parse")
 local tamnams = require("Module:TAMNAMS")
 local yesno = require("Module:Yesno")
 local p = {}
+-- TODO
+-- - Cell coloring
+-- - Mosprefix and mosabbrev entering
+-- - Collapse option
 -- Global variables for cell colors
@@ Line 16: / Line 20: @@
 p.cell_color_small_size      = "#FCE4D6"
 p.cell_color_sm_altered_size = "#F8CBAD"
 function p.preprocess_genchain(input_mos)
 	local input_mos = input_mos or mos.new(5,2)
-	local num_gens = 2 * mos.period_step_count(input_mos) - 2
+	local num_gens = (2 * (input_mos.nL + input_mos.nL + input_mos.ns))/mos.period_count(input_mos) - 2
 	local bright_gen = mos.bright_gen(input_mos)
-	local gens = mos.interval_mul(bright_gen, -num_gens/2)
+	local gens = mos.interval_mul(bright_gen, math.floor(num_gens/2))
-	local genchain = { mos.equave_reduce(gens, input_mos) }
+	bright_gen = mos.interval_mul(bright_gen, -1)
+	local genchain = { mos.period_reduce(gens, input_mos) }
 	for i = 1, num_gens do
 		gens = mos.interval_add(gens, bright_gen)
-		table.insert(genchain, mos.equave_reduce(gens, input_mos))
+		table.insert(genchain, mos.period_reduce(gens, input_mos))
 	end
 	return genchain
 end
-function p._mos_genchain(input_mos)
+function p._mos_genchain(input_mos, mos_prefix, mos_abbrev, is_collapsed)
 	local input_mos = input_mos or mos.new(5,2)
+	local mos_prefix = mos_prefix or "mos"
+	local mos_abbrev = mos_abbrev or "m"
+	local is_collapsed = is_collapsed == true
 	local num_gens = mos.period_step_count(input_mos)
 	local genchain = p.preprocess_genchain(input_mos)
+	local period_count = mos.period_count(input_mos)
+	local scale_sig = mos.as_string(input_mos)
 	-- Begin table
-	local result = "{| class=\"wikitable center-all\"\n"
+	local result = "{| class=\"wikitable center-1 center-3 mw-collapsible" .. (is_collapsed and " mw-collapsed\"\n" or "\"\n")
-		.. "|-\n"
-	-- Generators header cell
+	-- Table caption
-	result = result .. "! Number of bright gens\n"
+	result = result .. "|+ style=\"font-size: 105%; white-space: nowrap;\" | " .. string.format("Generator chain of %s\n", scale_sig)
+	-- Headers for each period
+	result = result .. "|-\n"
+	    .. "! Bright gens"
+	for i = 1, period_count do
+		result = result
+		.. " !! Scale degree"
+		.. " !! Abbrev."
+	end
+	result = result .. "\n"
-	-- Add a row for the generator counts
+	-- Add a row for each scale degree, plus their period-shifted counterparts
 	for i = 1, #genchain do
-		result = result .. string.format("%s %s", (i == 1 and "|" or " ||"), i - num_gens)
+		result = result .. "|-\n"
-	end
-	result = result .. "\n"
+		-- Number of generators
+		local num_gens = math.ceil(#genchain / 2) - i
+		result = result .. string.format("| %s", string.gsub(num_gens, "-", "&minus;"))
-	-- Add a row for each period's genchain
+		-- Scale degree (full name) and abbrev
-	local period_count = mos.period_count(input_mos)
+		for j = 1, period_count do
-	if period_count == 1 then
+			-- If the scale degree corresponds to the root, say it's both the
-		result = result .. "! Degree quality\n"
+			-- root and the degree one period up.
-		for i = 1, #genchain do
+			-- If the scale degree is reached by a negative number of gens, then
-			result = result .. string.format("%s %s", (i == 1 and "|" or " ||"), tamnams.degree_quality(genchain[i], input_mos, "abbrev"))
+			-- say it's the degree one period up instead.
-		end
+			local period_interval = mos.period(input_mos)
-	else
+			local current_interval = mos.interval_add(genchain[i], mos.interval_mul(period_interval, j - 1))
-		for i = 1, period_count do
+			local period_raised_interval = mos.interval_add(current_interval, period_interval)
-			--wip
+			if num_gens == 0 then
+				result = result
+					.. string.format(" || %s<br />%s || %s<br />%s",
+						tamnams.degree_quality(current_interval, input_mos, "sentence-case", mos_prefix),
+						tamnams.degree_quality(period_raised_interval, input_mos, "sentence-case", mos_prefix),
+						tamnams.degree_quality(current_interval, input_mos, "abbrev" , mos_abbrev),
+						tamnams.degree_quality(period_raised_interval, input_mos, "abbrev", mos_abbrev))
+			elseif num_gens < 0 and mos.interval_step_count(current_interval) % mos.period_step_count(input_mos) == 0 then
+				result = result
+					.. string.format(" || %s || %s",
+						tamnams.degree_quality(period_raised_interval, input_mos, "sentence-case", mos_prefix),
+					    tamnams.degree_quality(period_raised_interval, input_mos, "abbrev", mos_abbrev))
+			else
+				result = result
+					.. string.format(" || %s || %s",
+						tamnams.degree_quality(current_interval, input_mos, "sentence-case", mos_prefix),
+						tamnams.degree_quality(current_interval, input_mos, "abbrev", mos_abbrev))
+			end
 		end
+		-- End of row
+		result = result
+			.. "\n"
 	end
+	result = result .. "|}"
-	result = "Stacking a generator of MOS-INTERVAL from the root produces the following scale degrees. A chain of NOTECOUNT consecutive scale degrees produces one of the modes of SCALESIG, and expanding it to DAUGHTER-NOTECOUNT produces the modes of DAUGHTER-SCALES.\n"
+	return result
-		.. result
+end
+function p.mos_genchain(frame)
+	local scalesig = frame.args["Scale Signature"]
+	local mos_prefix = frame.args["MOS Prefix"]
+	local mos_abbrev = frame.args["MOS Abbrev"]
+	local collapsed  = yesno(frame.args["Collapsed"])
+	local debugg = yesno(frame.args["debug"])
+	-- Parse scalesig
+	local input_mos = mos.parse(scalesig)
-	return result
+	-- Verify name/prefix/abbrev
+	mos_prefix = tamnams.verify_prefix(input_mos, mos_prefix)
+	mos_abbrev = tamnams.verify_abbrev(input_mos, mos_abbrev)
+	local result = p._mos_genchain(input_mos, mos_prefix, mos_abbrev, collapsed)
+	-- Debugger option
+	if debugg == true then
+		result = "<syntaxhighlight lang=\"wikitext\">" .. result .. "</syntaxhighlight>"
+	end
+	return frame:preprocess(result)
 end
 return p