Module:MOS modes: Difference between revisions

← Older edit Newer edit →

@@ Line 3: / Line 3: @@
 local utils = require("Module:Utils")
 local tip = require("Module:Template input parse")
+local tamnams = require("Module:TAMNAMS")
 local yesno = require("Module:Yesno")
 local p = {}
@@ Line 74: / Line 75: @@
 		result = result .. "|-\n"
-		-- Add the UDP, formatted as up|dp(p), where u is the number of bright generators going up,
+		-- Add the UDP
-		-- d is the number of bright generators going down, and p is the number of periods
+		result = result .. "| " .. tamnams.udp_as_text(#mos_modes - i - 1, i - 1, periods)
-		-- Omit p if p = 1
-		local gens_down = (i - 1) * periods
-		local gens_up = (#mos_modes - i) * periods
-		local udp_as_text = ""
-		if periods == 1 then
-			udp_as_text = gens_up .. "&#124;" .. gens_down
-		else
-			udp_as_text = gens_up .. "&#124;" .. gens_down .. "(" .. periods .. ")"
-		end
-		result = result .. "| " .. udp_as_text
 		-- Add the mode's rotational order
@@ Line 126: / Line 117: @@
 	local mode_names = nil
 	if scale_sig == "5L 2s" then
-		mode_names_unparsed = "Lydian; Ionian (major); Mixolydian; Dorian; Aeolian (minor); Phrygian; Locrian"
+		mode_names = {
-		mode_names = tip.parse_entries(mode_names_unparsed)
+			"Lydian",
-	else
+			"Ionian (major)",
-		mode_names_unparsed = frame.args["Mode Names"]
+			"Mixolydian",
-		mode_names = tip.parse_entries(mode_names_unparsed)
+			"Dorian",
+			"Aeolian (minor)",
+			"Phrygian",
+			"Locrian"
+		}
+	end
+	-- Get mode names entered
+	if #frame.args["Mode Names"] ~= 0 then
+		mode_names = tip.parse_entries(frame.args["Mode Names"])
 	end