Module:Infobox MOS: Difference between revisions

Ganaram inukshuk (talk | contribs)
mNo edit summary
Ganaram inukshuk (talk | contribs)
Drop use of ET template, as ET-to-string functions are now in Module:MOS
Line 2: Line 2:
local rat = require("Module:Rational")
local rat = require("Module:Rational")
local mos = require("Module:MOS")
local mos = require("Module:MOS")
local et = require("Module:ET")
local xp = require("Module:Xenpaper")
local xp = require("Module:Xenpaper")
local ib = require("Module:Infobox")
local ib = require("Module:Infobox")
Line 117: Line 116:
period_as_string = equave_as_string
period_as_string = equave_as_string
else
else
local ed = et.new(number_of_periods, input_mos.equave)
period_as_string = mos.reduced_period_to_et_steps_as_string(input_mos, "")
period_as_string = et.backslash_display(ed, 1)
end
end
local period_in_cents = equave_in_cents / number_of_periods
local period_in_cents = equave_in_cents / number_of_periods
Line 151: Line 149:
local dark_gen  = mos.dark_gen  (input_mos)
local dark_gen  = mos.dark_gen  (input_mos)
local equalized_ed = et.new(input_mos.nL + input_mos.ns, input_mos.equave, "")
local equalized_ed = mos.mos_to_et_as_string(input_mos, {1, 1}, "")
local collapsed_ed = et.new(input_mos.nL, input_mos.equave, "")
local collapsed_ed = mos.mos_to_et_as_string(input_mos, {1, 0}, "")
local bright_min_in_steps = et.backslash_display(equalized_ed, bright_gen["L"] + bright_gen["s"])
local bright_min_in_steps = mos.bright_gen_to_et_steps_as_string(input_mos, {1, 1}, "")
local bright_max_in_steps = et.backslash_display(collapsed_ed, bright_gen["L"])
local bright_max_in_steps = mos.bright_gen_to_et_steps_as_string(input_mos, {1, 0}, "")
local dark_min_in_steps = et.backslash_display(collapsed_ed, dark_gen["L"])
local dark_min_in_steps   = mos.dark_gen_to_et_steps_as_string  (input_mos, {1, 0}, "")
local dark_max_in_steps = et.backslash_display(equalized_ed, dark_gen["L"] + dark_gen["s"])
local dark_max_in_steps   = mos.dark_gen_to_et_steps_as_string  (input_mos, {1, 1}, "")
local bright_min_in_cents = mos.bright_gen_to_cents(input_mos, {1, 1})
local bright_min_in_cents = mos.bright_gen_to_cents(input_mos, {1, 1})
Line 372: Line 370:
local step_ratio = step_ratios[i]
local step_ratio = step_ratios[i]
local ed = mos.mos_to_et(input_mos, step_ratio)
local ed_as_string = mos.mos_to_et_as_string(input_mos, step_ratio)
local ed_as_string = et.as_string(ed)
local gen_in_steps = mos.bright_gen_to_et_steps(input_mos, step_ratio) .. "\\" .. ed.size
local gen_in_steps = mos.bright_gen_to_et_steps_as_string(input_mos, step_ratio, "")
local gen_in_cents = mos.bright_gen_to_cents(input_mos, step_ratio)
local gen_in_cents = mos.bright_gen_to_cents(input_mos, step_ratio)