Module:MOS intervals: Difference between revisions
m params/args were incorrect for some functions |
Allow for using mosprefix/mosabbrev that's entered through the tempalte |
||
| Line 120: | Line 120: | ||
result = result .. "|-\n" | result = result .. "|-\n" | ||
.. string.format("| rowspan=\"2\" | %s-%sstep ", i - 1, mos_prefix) | .. string.format("| rowspan=\"2\" | %s-%sstep ", i - 1, mos_prefix) | ||
.. string.format("|| %s " , tamnams.interval_quality(current_dark_interval, input_mos, "sentence-case")) | .. string.format("|| %s " , tamnams.interval_quality(current_dark_interval, input_mos, "sentence-case", mos_prefix)) | ||
.. string.format("|| %s " , tamnams.interval_quality(current_dark_interval, input_mos, "abbrev", "m")) | .. string.format("|| %s " , tamnams.interval_quality(current_dark_interval, input_mos, "abbrev", "m", mos_abbrev)) | ||
.. string.format("|| %s " , mos.interval_as_string(current_dark_interval)) | .. string.format("|| %s " , mos.interval_as_string(current_dark_interval)) | ||
.. string.format("|| %s " , dark_interval_range) | .. string.format("|| %s " , dark_interval_range) | ||
| Line 127: | Line 127: | ||
.. string.format("|| ~%.4f nats\n" , he_dark_best) | .. string.format("|| ~%.4f nats\n" , he_dark_best) | ||
.. "|-\n" | .. "|-\n" | ||
.. string.format("| %s " , tamnams.interval_quality(current_bright_interval, input_mos, "sentence-case")) | .. string.format("| %s " , tamnams.interval_quality(current_bright_interval, input_mos, "sentence-case", mos_prefix)) | ||
.. string.format("|| %s " , tamnams.interval_quality(current_bright_interval, input_mos, "abbrev", | .. string.format("|| %s " , tamnams.interval_quality(current_bright_interval, input_mos, "abbrev", mos_abbrev)) | ||
.. string.format("|| %s " , mos.interval_as_string(current_bright_interval)) | .. string.format("|| %s " , mos.interval_as_string(current_bright_interval)) | ||
.. string.format("|| %s " , bright_interval_range) | .. string.format("|| %s " , bright_interval_range) | ||
| Line 164: | Line 164: | ||
local period_intervals_as_text = "" | local period_intervals_as_text = "" | ||
if #period_intervals == 2 then | if #period_intervals == 2 then | ||
period_intervals_as_text = string.format("%s and %s", tamnams.interval_quality(period_intervals[1], input_mos), tamnams.interval_quality(period_intervals[2], input_mos)) | period_intervals_as_text = string.format("%s and %s", tamnams.interval_quality(period_intervals[1], input_mos, "none", mos_prefix), tamnams.interval_quality(period_intervals[2], input_mos, "none", mos_prefix)) | ||
else | else | ||
for i = 1, period_count do | for i = 1, period_count do | ||
period_intervals_as_text = period_intervals_as_text | period_intervals_as_text = period_intervals_as_text | ||
.. string.format("%s, ", tamnams.interval_quality(period_intervals[i], input_mos)) | .. string.format("%s, ", tamnams.interval_quality(period_intervals[i], input_mos, "none", mos_prefix)) | ||
end | end | ||
period_intervals_as_text = period_intervals_as_text | period_intervals_as_text = period_intervals_as_text | ||
.. string.format("and %s", tamnams.interval_quality(period_intervals[period_count + 1], input_mos)) | .. string.format("and %s", tamnams.interval_quality(period_intervals[period_count + 1], input_mos, "none", mos_prefix)) | ||
end | end | ||