Module:MOS tunings: Difference between revisions

Line 264:

-- wrapper function can go by default search params.)

function p.parse_ji_ratios(unparsed, equave_in_cents)

local ~~parsed~~ = nil

local ratios = nil

local ~~return_search_params~~ = ""

local params = nil

if unparsed == "" then

~~parsed~~ = ~~jira.search_by_params(~~{["Int Limit"] = 30, ["Tenney Height"] = 9, ["Prime Limit"] = 13}, equave_in_cents) -- Default search params, given no other params

params = {["Int Limit"] = 30, ["Tenney Height"] = 9, ["Prime Limit"] = 13}

~~return_search_params = "Int Limit: 30; Tenney Height: 9; Prime Limit: 13"~~

ratios = jira.search_by_params(params, equave_in_cents) -- Default search params, given no other params

elseif unparsed == "NONE" then

~~parsed~~ = {}

params = {["Int Limit"] = 30, ["Tenney Height"] = 9, ["Prime Limit"] = 13}

ratios = jira.search_by_params(params, equave_in_cents) -- Default search params, given no other params

elseif string.match(unparsed, "Int Limit:") then

~~local search_params~~ = jira.parse_search_params(unparsed) -- Search params require at the absolute least an int limit, so see if there's "Int Limit"

params = jira.parse_search_params(unparsed) -- Search params require at the absolute least an int limit, so see if there's "Int Limit"

~~parsed~~ = jira.search_by_params(search_params, equave_in_cents)

ratios = jira.search_by_params(search_params, equave_in_cents)

~~return_search_params = unparsed~~

else

~~parsed~~ = jira.parse_ratios(unparsed)

ratios = jira.parse_ratios(unparsed)

end

return ~~parsed~~, ~~return_search_params~~

return ratios, params

end

Line 296:

local ji_ratios, search_params = p.parse_ji_ratios(frame.args["JI Ratios"], equave_in_cents)

local search_params_footnote = jira.search_param_footnotes(search_params)

local search_params_footnote = "<br><small>" .. jira.search_param_footnotes(search_params) .. "</small>"

return p._mos_tunings(input_mos, mos_prefix, mos_abbrev, step_ratios, ji_ratios) .. search_params_footnote

@@ Line 264: / Line 264: @@
 -- wrapper function can go by default search params.)
 function p.parse_ji_ratios(unparsed, equave_in_cents)
-	local parsed = nil
+	local ratios = nil
-	local return_search_params = ""
+	local params = nil
 	if unparsed == "" then
-		parsed = jira.search_by_params({["Int Limit"] = 30, ["Tenney Height"] = 9, ["Prime Limit"] = 13}, equave_in_cents)		-- Default search params, given no other params
+		params = {["Int Limit"] = 30, ["Tenney Height"] = 9, ["Prime Limit"] = 13}
-		return_search_params = "Int Limit: 30; Tenney Height: 9; Prime Limit: 13"
+		ratios = jira.search_by_params(params, equave_in_cents)		-- Default search params, given no other params
 	elseif unparsed == "NONE" then
-		parsed = {}
+		params = {["Int Limit"] = 30, ["Tenney Height"] = 9, ["Prime Limit"] = 13}
+		ratios = jira.search_by_params(params, equave_in_cents)		-- Default search params, given no other params
 	elseif string.match(unparsed, "Int Limit:") then
-		local search_params = jira.parse_search_params(unparsed)	-- Search params require at the absolute least an int limit, so see if there's "Int Limit"
+		params = jira.parse_search_params(unparsed)	-- Search params require at the absolute least an int limit, so see if there's "Int Limit"
-		parsed = jira.search_by_params(search_params, equave_in_cents)
+		ratios = jira.search_by_params(search_params, equave_in_cents)
-		return_search_params = unparsed
 	else
-		parsed = jira.parse_ratios(unparsed)
+		ratios = jira.parse_ratios(unparsed)
 	end
-	return parsed, return_search_params
+	return ratios, params
 end
@@ Line 296: / Line 296: @@
 	local ji_ratios, search_params = p.parse_ji_ratios(frame.args["JI Ratios"], equave_in_cents)
-	local search_params_footnote = jira.search_param_footnotes(search_params)
+	local search_params_footnote = "<br><small>" .. jira.search_param_footnotes(search_params) .. "</small>"
 	return p._mos_tunings(input_mos, mos_prefix, mos_abbrev, step_ratios, ji_ratios) .. search_params_footnote