Module:MOS intervals: Difference between revisions
Undo previous change (it didn't look right); todo |
Added code to "sort" the min and max |
||
| Line 65: | Line 65: | ||
result = result .. string.format("| %s\n" , tamnams.interval_quality(current_bright_interval, input_mos, "abbrev", "m")) | result = result .. string.format("| %s\n" , tamnams.interval_quality(current_bright_interval, input_mos, "abbrev", "m")) | ||
else | else | ||
-- Calculate the cent values min and max for the current intervals | |||
local sm_min_cents = mos.interval_to_cents(current_dark_interval, input_mos, {1,1}) | local sm_min_cents = mos.interval_to_cents(current_dark_interval, input_mos, {1,1}) | ||
local sm_max_cents = mos.interval_to_cents(current_dark_interval, input_mos, {1,0}) | local sm_max_cents = mos.interval_to_cents(current_dark_interval, input_mos, {1,0}) | ||
local lg_min_cents = mos.interval_to_cents(current_bright_interval, input_mos, {1,1}) | local lg_min_cents = mos.interval_to_cents(current_bright_interval, input_mos, {1,1}) | ||
local lg_max_cents = mos.interval_to_cents(current_bright_interval, input_mos, {1,0}) | local lg_max_cents = mos.interval_to_cents(current_bright_interval, input_mos, {1,0}) | ||
-- Then sort, as the min and max may be swapped | |||
-- This happens if the dark interval has more small steps than large steps | |||
local dark_interval_range = string.format("%.1f¢ to %.1f¢", math.min(sm_min_cents, sm_max_cents), math.max(sm_min_cents, sm_max_cents)) | |||
local bright_interval_range = string.format("%.1f¢ to %.1f¢", math.min(lg_min_cents, lg_max_cents), math.max(lg_min_cents, lg_max_cents)) | |||
result = result .. "|-\n" | result = result .. "|-\n" | ||
| Line 74: | Line 80: | ||
result = result .. string.format("| %s\n" , tamnams.interval_quality(current_dark_interval, input_mos, "sentence-case")) | result = result .. string.format("| %s\n" , tamnams.interval_quality(current_dark_interval, input_mos, "sentence-case")) | ||
result = result .. string.format("| %s\n" , mos.interval_as_string(current_dark_interval)) | result = result .. string.format("| %s\n" , mos.interval_as_string(current_dark_interval)) | ||
result = result .. string.format("| % | result = result .. string.format("| %s\n" , dark_interval_range) | ||
result = result .. string.format("| %s\n" , tamnams.interval_quality(current_dark_interval, input_mos, "abbrev", "m")) | result = result .. string.format("| %s\n" , tamnams.interval_quality(current_dark_interval, input_mos, "abbrev", "m")) | ||
| Line 80: | Line 86: | ||
result = result .. string.format("| %s\n" , tamnams.interval_quality(current_bright_interval, input_mos, "sentence-case")) | result = result .. string.format("| %s\n" , tamnams.interval_quality(current_bright_interval, input_mos, "sentence-case")) | ||
result = result .. string.format("| %s\n" , mos.interval_as_string(current_bright_interval)) | result = result .. string.format("| %s\n" , mos.interval_as_string(current_bright_interval)) | ||
result = result .. string.format("| % | result = result .. string.format("| %s\n" , bright_interval_range) | ||
result = result .. string.format("| %s\n" , tamnams.interval_quality(current_bright_interval, input_mos, "abbrev", "m")) | result = result .. string.format("| %s\n" , tamnams.interval_quality(current_bright_interval, input_mos, "abbrev", "m")) | ||
end | end | ||