Module:MOS tunings: Difference between revisions

(3 intermediate revisions by 2 users not shown)

Line 1:

local p = {}

local et = require("Module:ET")

local jira = require("Module:JI ratios")

local mos = require("Module:MOS")

local tamnams = require("Module:TAMNAMS")

local et = require("Module:ET")

local tip = require("Module:Template input parse")

local yesno = require("Module:Yesno")

~~local tip = require("Module:Template input parse")~~

~~local jira = require("Module:JI ratios")~~

~~local p = {}~~

-- Rewritten/simplified module replacement for Module:MOS degrees

Line 180:

Line 181:

end

local et_as_string = et.as_string(mos.~~mos_to_et~~(input_mos, step_ratios[i]))

local et_as_string = et.as_string(mos.as_et(input_mos, step_ratios[i]))

local header_text = string.format("%s<br />[[%s]]", step_ratio_as_text, et_as_string)

result = result .. string.format("! colspan=\"2\" | %s\n", header_text)

Line 327:

Line 328:

--local ji_ratios, footnotes = p.parse_ji_ratios(frame.args["JI Ratios"], input_mos.equave)

local ~~out_str~~ = p._mos_tunings(input_mos, mos_prefix, mos_abbrev, step_ratios, ji_ratios, tolerance, footnotes, is_collapsed)

local result = p._mos_tunings(input_mos, mos_prefix, mos_abbrev, step_ratios, ji_ratios, tolerance, footnotes, is_collapsed)

~~return frame:preprocess(~~debugg == true ~~and~~ "<~~pre~~>" .. ~~out_str~~ .. "</~~pre~~>" ~~or out_str~~)

if debugg == true then

result = "<syntaxhighlight lang=\"wikitext\">" .. result .. "</syntaxhighlight>"

end

return frame:preprocess(result)

end

@@ Line 1: / Line 1: @@
+local p = {}
+local et = require("Module:ET")
+local jira = require("Module:JI ratios")
 local mos = require("Module:MOS")
 local tamnams = require("Module:TAMNAMS")
-local et = require("Module:ET")
+local tip = require("Module:Template input parse")
 local yesno = require("Module:Yesno")
-local tip = require("Module:Template input parse")
-local jira = require("Module:JI ratios")
-local p = {}
 -- Rewritten/simplified module replacement for Module:MOS degrees
@@ Line 180: / Line 181: @@
 		end
-		local et_as_string = et.as_string(mos.mos_to_et(input_mos, step_ratios[i]))
+		local et_as_string = et.as_string(mos.as_et(input_mos, step_ratios[i]))
 		local header_text = string.format("%s<br />[[%s]]", step_ratio_as_text, et_as_string)
 		result = result .. string.format("! colspan=\"2\" | %s\n", header_text)
@@ Line 327: / Line 328: @@
 	--local ji_ratios, footnotes = p.parse_ji_ratios(frame.args["JI Ratios"], input_mos.equave)
-	local out_str = p._mos_tunings(input_mos, mos_prefix, mos_abbrev, step_ratios, ji_ratios, tolerance, footnotes, is_collapsed)
+	local result = p._mos_tunings(input_mos, mos_prefix, mos_abbrev, step_ratios, ji_ratios, tolerance, footnotes, is_collapsed)
-	return frame:preprocess(debugg == true and "<pre>" .. out_str .. "</pre>" or out_str)
+	if debugg == true then
+		result = "<syntaxhighlight lang=\"wikitext\">" .. result .. "</syntaxhighlight>"
+	end
+	return frame:preprocess(result)
 end