Module:Infobox chord: Difference between revisions

← Older edit

@@ Line 1: / Line 1: @@
 local p = {}
+local consistency = require("Module:Chord consistency")
+local infobox = require("Module:Infobox")
 local rat = require("Module:Rational")
 local utils = require("Module:Utils")
-local infobox = require("Module:Infobox")
+local yesno = require("Module:Yesno")
 function p.infobox_chord(frame)
-	local debug_mode = utils.value_provided(frame.args["debug"])
+	local debug_mode = yesno(frame.args["debug"])
 	local page_name = frame:preprocess("{{PAGENAME}}")
@@ Line 14: / Line 15: @@
 	local cats = ""
-	local name = frame.args["Name"]
+	local color_names = {}
-	if utils.value_provided(name) then
+	if utils.value_provided(frame.args["ColorName"]) then
-		local caption = "Name"
+		color_name = frame.args["ColorName"]
-		if name:match(",") then
+		-- search for ", " not "," because many chord names contain commas, e.g. Cz,y6
-			caption = "Names"
+		for name in (color_name .. ", "):gmatch("(.-), ") do
-			-- removing manual line breaks
+			table.insert(color_names, name)
-			local matches
-			name, matches = name:gsub("<br/?>", "")
-			if matches > 0 then
-				cats = cats .. "[[Category:Todo:remove manual line breaks]]"
-			end
-			-- removing whitespaces after commas
-			name = name:gsub(",%s+", ",")
-			-- placing line breaks after commas
-			name = name:gsub(",", ",<br/>")
 		end
-		table.insert(infobox_data, {
+	else
-			caption,
+		cats = cats .. "[[Category:Todo:add color name]]"
-			name,
-		})
 	end
@@ Line 178: / Line 168: @@
 			genus_product = genus_product * (prime ^ exponent)
 		end
+		-- consistent edos
+		local distance = tonumber(frame.args["Distance"])
+		if distance == nil then
+			if #harmonics >= 5 then
+				distance = 1.5
+			elseif #harmonics >= 3 then
+				distance = 2.0
+			else
+				distance = 3.0
+			end
+		end
+		local consistent_edos = consistency.consistent_edos(harmonics, distance, 'edo', 4)
 		-- compute tag to add for category sort order: as many "#" as the number of digits in the first harmonic
@@ Line 200: / Line 203: @@
 		table.insert(infobox_data, {"Step intervals", table.concat(step_interval_links, ", ")})
 		table.insert(infobox_data, {"Step cents", table.concat(step_cents, ", ")})
+		-- TODO: category goes here.
+		if table.getn(color_names) > 0 then
+			local label = "Color name"
+			if table.getn(color_names) > 1 then
+				label = "Color names"
+			end
+			table.insert(infobox_data, {"[[Color notation|" .. label .. "]]", table.concat(color_names, "<br />")})
+		end
 		if prime_limit < 96 then
@@ Line 224: / Line 237: @@
 		table.insert(infobox_data, {"[[Otonal odd limit]]", otonal_odd_limit})
 		table.insert(infobox_data, {"[[Utonal odd limit]]", utonal_odd_limit})
+		if consistent_edos ~= "" then
+			table.insert(infobox_data, {"[[Consistency|Consistent edos]] (''d'' &ge; " .. distance .. ")", "<span style=\"font-size: 75%;\">" .. consistent_edos .. "</span>"})
+			table.insert(infobox_data, {"<div style=\"font-size: 75%; text-align: right; white-space: nowrap;\">[[Module:Chord consistency/doc|* 2 &le; ''d'' &lt; 4; ** 4 &le; ''d'' &lt; 8; *** 8 &le; ''d'' &lt; 16; &hellip;]]</div>"})
+		else
+			table.insert(infobox_data, {"[[Consistency|Consistent edos]] (''d'' &ge; " .. distance .. ")", "<small>not exist in the range up to 72</small>"})
+		end
 	end
@@ Line 233: / Line 253: @@
 	end
-	local s = infobox.build("<u>Chord information</u>", infobox_data)
+	local result = infobox.build("<u>Chord information</u>", infobox_data)
 	if not debug_mode then
-		s = s .. cats
+		result = result .. cats
 	end
-	return s
+	return frame:preprocess(result)
 end
 return p