Module:Infobox interval region: Difference between revisions

← Older edit

@@ Line 20: / Line 20: @@
 	local centslowerStrict = frame.args["centsLower"]
 	local centsupperStrict = frame.args["centsUpper"]
+	local subregions = frame.args["subregions"]
+	local superregions = frame.args["superregions"]
+	local prevRegion = frame.args["prevRegion"]
+	local nextRegion = frame.args["nextRegion"]
 	local equave = frame.args["equave"]
 	local ji3 = frame.args["ji3"]
@@ Line 26: / Line 30: @@
 	local ji11 = frame.args["ji11"]
 	local ji13 = frame.args["ji13"]
-	local ji = load("return" .. frame.args["ji"])
+	local jiPre = frame.args["ji"]
+	local ji = {}
+	for note in jiPre:gmatch("%d*/%d*") do
+		 table.insert(ji, rat.parse(note))
+	end
 	local jihigh = frame.args["jiHigh"]
 	local moses = frame.args["MOSes"]
@@ Line 32: / Line 41: @@
 	local data = {}
-			table.insert(data, {
+	table.insert(data, {
-			"Name",
+		"Name",
-			name
+		name
-		})
+	})
 	if centslower == nil or centslower == "" then
@@ Line 48: / Line 54: @@
 		table.insert(data, {
 			"Lower bound",
-			centslower .. "¢ - " .. centslowerStrict .. "¢"
+			centslower .. "¢ – " .. centslowerStrict .. "¢"
 		})
 	end
@@ Line 60: / Line 66: @@
 		table.insert(data, {
 			"Upper bound",
-			centsupperStrict .. "¢ - " .. centsupper .. "¢"
+			centsupperStrict .. "¢ – " .. centsupper .. "¢"
 		})
 	end
+			if moses ~= nil and moses ~= "" then
+		table.insert(data, {
+			"Generated [[MOS]]es",
+			moses
+		})
+		end
 			table.insert(data, {
-			string.format("<div style=\"margin-top: 0.6em;\"><b>%s</b></div>", "[[JI]] intervals")
+			string.format("<div style=\"margin-top: 0.6em;\"><b>%s</b></div>", "Example [[JI]] intervals")
 		})
 	local jidata = ""
+	local q = 0
-			for k,v in pairs(ji) do
+	for k, v in pairs(ji) do
-				jidata = jidata .. "<br> [[" .. v .. "]] (" .. rat.cents(rat.parse(v)) .. "¢)"
+		if q == 1 then
+			jidata = jidata .. "<br>"
+		end
+		jidata = jidata .. "[[" .. rat.as_ratio(v) .. "]] (" .. math.floor(rat.cents(v)*10 + 0.5)/10 .. "¢)"
+		q = 1
 	end
+	table.insert(data, {
+		"Intervals",
+		jidata
+	})
+	table.insert(data, {
+		string.format("<div style=\"margin-top: 0.6em;\"><b>%s</b></div>", "Related regions")
+	})
+	if complement ~= nil and complement ~= "" then
 		table.insert(data, {
-			string.format("<div style=\"margin-top: 0.6em;\"><b>%s</b></div>", "Scale info")
+			"[[Complement]]",
-		})
+			complement
-		if moses ~= nil and moses ~= "" then
-		table.insert(data, {
-			"[[MOS]]es",
-			moses
 		})
-		end
+	end
-			if equave ~= nil and equave ~= "" then
+	if subregions ~= nil and subregions ~= "" then
 		table.insert(data, {
-			"[[Equave]]",
+			"Subregions",
-			"[[" .. equave .. "]]"
+			subregions
 		})
-		else
+	end
+	if superregions ~= nil and superregions ~= "" then
 		table.insert(data, {
-			"[[Equave]]",
+			"Superregion(s)",
-			"[[2/1]]"
+			superregions
 		})
-		end
+	end
-	local result = infobox.build(
+	local args = {
-  		"Interval&nbsp;region",
+		["Adjacent Links"] = { "←&nbsp;"..(prevRegion or ""), (nextRegion or "").."&nbsp;→" },
-		data
+		["Title"] = "Interval&nbsp;region",
-	)
+		["Rows"] = data,
+	}
+	local result = infobox._infobox(args)
 	return frame:preprocess(debugg == true and "<pre>" .. result .. "</pre>" or result)