Module:MOS in EDO: Difference between revisions
Added simplified step visualization |
m rename |
||
| (40 intermediate revisions by 2 users not shown) | |||
| Line 1: | Line 1: | ||
local p = {} | local p = {} | ||
local mos = require("Module:MOS") | |||
local step_vis = require("Module:Step vis") | |||
local tamnams = require("Module:TAMNAMS") | |||
local utils = require("Module:Utils") | |||
local yesno = require("Module:Yesno") | |||
-- Global variables for cell colors | -- Global variables for cell colors | ||
-- Dark blue for large steps, light blue for small steps | -- Dark blue for large steps, light blue for small steps | ||
-- For mosses that are reversed (starts with s and ends with L), use orange instead | -- For mosses that are reversed (starts with s and ends with L), use orange instead | ||
p.cell_color_none = " | p.cell_color_none = "" -- For cells that don't have a color (default cell color applies) | ||
p.cell_color_perfect_size = " | p.cell_color_perfect_size = "" -- Only applies for steps of an edo | ||
p.cell_color_large = "BDD7EE" | p.cell_color_large = "#BDD7EE" | ||
p.cell_color_small = "DDEBF7" | p.cell_color_small = "#DDEBF7" | ||
p.cell_color_lg_rev = "F8CBAD" | p.cell_color_lg_rev = "#F8CBAD" | ||
p.cell_color_sm_rev = "FCE4D6" | p.cell_color_sm_rev = "#FCE4D6" | ||
-- Helper function | -- Helper function | ||
| Line 60: | Line 64: | ||
end | end | ||
return string.format("%iL %is", large_step_count, small_step_count) | return string.format("%iL %is", large_step_count, small_step_count) | ||
end | end | ||
| Line 150: | Line 154: | ||
return next_step_array | return next_step_array | ||
end | end | ||
| Line 226: | Line 191: | ||
-- Create table, starting with headers | -- Create table, starting with headers | ||
local result = | local result = "{| class=\"wikitable center-all\"\n" | ||
.. "|+ style=\"font-size: 105%; white-space: nowrap;\" | " .. string.format("Generators %i\\%i and %i\\%i\n", gen_in_edosteps, edo, comp_in_edosteps, edo) | |||
.. "|-\n" | |||
.. string.format("! colspan=\"%i\" | Steps\n", edo) | |||
.. "! MOS (name)\n" | |||
.. "! Step ratio\n" | |||
if show_temperament then | if show_temperament then | ||
result = result .. string.format( | result = result .. string.format("! Temperament\n") | ||
end | end | ||
| Line 249: | Line 214: | ||
-- Add the step sizes | -- Add the step sizes | ||
result = result .. | result = result .. "|-\n" | ||
for i = 1, #current_scale do | for i = 1, #current_scale do | ||
local current_step = current_scale[i] | local current_step = current_scale[i] | ||
| Line 273: | Line 238: | ||
if current_step == 1 then | if current_step == 1 then | ||
if large_step_size == small_step_size then | if large_step_size == small_step_size then | ||
result = result .. | result = result .. "| 1\n" | ||
else | else | ||
result = result .. string.format( | result = result .. string.format("| style=\"background-color: %s;\" | 1\n", cell_color) | ||
end | end | ||
else | else | ||
if cell_color == p.cell_color_none then | if cell_color == p.cell_color_none then | ||
result = result .. string.format( | result = result .. string.format("| colspan=\"%i\" | %i\n", current_step, current_step) | ||
else | else | ||
result = result .. string.format( | result = result .. string.format("| style=\"background-color: %s\" colspan=\"%i\" | %i\n", cell_color, current_step, current_step) | ||
end | end | ||
end | end | ||
| Line 291: | Line 256: | ||
-- Get the tamnams name, if there is one | -- Get the tamnams name, if there is one | ||
-- Don't show tamnams names for mosses with 5 notes or fewer (to keep the table from being cluttered) | -- Don't show tamnams names for mosses with 5 notes or fewer (to keep the table from being cluttered) | ||
local tamnams_name = | local tamnams_name = tamnams.lookup_name(scale_sig) | ||
local current_step_count = #current_scale | local current_step_count = #current_scale | ||
| Line 319: | Line 284: | ||
end | end | ||
result = result .. | result = result .. "|}" | ||
return result | return result | ||
| Line 327: | Line 292: | ||
-- Instead of a "rectangular horogram", use the same type of visualization shown | -- Instead of a "rectangular horogram", use the same type of visualization shown | ||
-- on the diasem page | -- on the diasem page | ||
function p.mos_in_edo_simplified(edo, gen_in_edosteps, number_of_periods, temperament) | function p.mos_in_edo_simplified(edo, gen_in_edosteps, number_of_periods, generation_limit, temperament) | ||
local edo = edo or 24 | local edo = edo or 24 | ||
local gen_in_edosteps = gen_in_edosteps or 14 | local gen_in_edosteps = gen_in_edosteps or 14 | ||
local number_of_periods = number_of_periods or 1 | local number_of_periods = number_of_periods or 1 | ||
local generation_limit = generation_limit or edo - 1 | |||
local temperament = temperament --or "meantone" | local temperament = temperament --or "meantone" | ||
| Line 340: | Line 306: | ||
period_in_edosteps = edo / number_of_periods | period_in_edosteps = edo / number_of_periods | ||
verified_number_of_periods = number_of_periods | verified_number_of_periods = number_of_periods | ||
end | |||
-- Check whether the generation limit is valid | |||
-- If it's -1, then show all generations (period_in_edosteps-1) | |||
if generation_limit == -1 then | |||
generation_limit = period_in_edosteps - 1 | |||
end | end | ||
| Line 360: | Line 332: | ||
-- Create table, starting with headers | -- Create table, starting with headers | ||
local result = | local result = "{| class=\"wikitable center-all\"\n" | ||
.. "|+ style=\"font-size: 105%; white-space: nowrap;\" | " .. string.format("Generators %i\\%i and %i\\%i\n", gen_in_edosteps, edo, comp_in_edosteps, edo) | |||
.. "|-\n" | |||
.. "! Step visualization\n" | |||
.. "! MOS (name)\n" -- Scale sig (and name) | |||
.. "! Step sizes\n" -- Step sizes | |||
.. "! Step ratio\n" -- Step ratio | |||
if show_temperament then | if show_temperament then | ||
result = result .. | result = result .. "! Temperament\n" -- Temperament, if given | ||
end | end | ||
-- Add the step pattern for successive mosses until the pattern becomes that for an edo | -- Add the step pattern for successive mosses until the pattern becomes that for an edo | ||
while current_scale ~= nil and starting_mos_valid do | local generation_count = 1 | ||
while current_scale ~= nil and starting_mos_valid and generation_count <= generation_limit do | |||
-- Calculate current step ratio | -- Calculate current step ratio | ||
-- Use this to determine which cell colors to use | -- Use this to determine which cell colors to use | ||
| Line 379: | Line 353: | ||
local small_step_size = current_step_sizes["s"] | local small_step_size = current_step_sizes["s"] | ||
-- | -- New row | ||
result = result .. "|-\n" | |||
-- Add the step visualization | -- Add the step visualization | ||
local step_vis | local sv = step_vis._step_vis(current_scale) | ||
result = result .. string.format( | result = result .. string.format("| %s\n", sv) | ||
-- Add the scale sig | -- Add the scale sig | ||
-- Also add tamnams name if there is one | |||
local scale_sig = p.mos_step_pattern_to_scale_sig(current_scale) | local scale_sig = p.mos_step_pattern_to_scale_sig(current_scale) | ||
local tamnams_name = tamnams.lookup_name(scale_sig) | |||
local tamnams_name = | |||
local current_step_count = #current_scale | local current_step_count = #current_scale | ||
if large_step_size == small_step_size then | |||
if | |||
result = result .. string.format("| [[%iedo]]\n", edo / step_ratio_gcd) | result = result .. string.format("| [[%iedo]]\n", edo / step_ratio_gcd) | ||
elseif tamnams_name ~= nil and current_step_count > 5 then | elseif tamnams_name ~= nil and current_step_count > 5 then | ||
| Line 407: | Line 373: | ||
end | end | ||
-- Add the step | -- Add the step sizes | ||
result = result .. string.format("| % | result = result .. string.format("| %i, %i\n", current_step_sizes["L"], current_step_sizes["s"]) | ||
-- Add step ratio | |||
local reduced_large_step_size = large_step_size / step_ratio_gcd | |||
local reduced_small_step_size = small_step_size / step_ratio_gcd | |||
result = result .. string.format("| %s:%s\n", reduced_large_step_size, reduced_small_step_size) | |||
-- Add the temperament name, if there is one | -- Add the temperament name, if there is one | ||
| Line 418: | Line 389: | ||
-- Produce the next scale in the sequence | -- Produce the next scale in the sequence | ||
current_scale = p.calculate_next_mos_step_pattern(current_scale) | current_scale = p.calculate_next_mos_step_pattern(current_scale) | ||
-- Increment the generation (row) count | |||
generation_count = generation_count + 1 | |||
end | end | ||
result = result .. | result = result .. "|}" | ||
return result | return result | ||
| Line 427: | Line 401: | ||
-- Function to be called by a template | -- Function to be called by a template | ||
function p.mos_in_edo_frame(frame) | function p.mos_in_edo_frame(frame) | ||
local edo = tonumber(frame.args["EDO"]) | local edo = tonumber(frame.args["EDO"]) | ||
local gen_in_edosteps = tonumber(frame.args["Generator"]) | local gen_in_edosteps = tonumber(frame.args["Generator"]) | ||
local temperament = frame.args["Temperament"] | local temperament = frame.args["Temperament"] | ||
local number_of_periods = tonumber(frame.args[" | local number_of_periods = tonumber(frame.args["Periods"]) | ||
local generation_limit = tonumber(frame.args["Generation Limit"]) | |||
local debugg = yesno(frame.args["debug"]) | |||
local result = p.mos_in_edo_simplified(edo, gen_in_edosteps, number_of_periods, generation_limit, temperament) | |||
-- Debugger option | |||
if | if debugg == true then | ||
result = | result = "<syntaxhighlight lang=\"wikitext\">" .. result .. "</syntaxhighlight>" | ||
end | end | ||
return result | return frame:preprocess(result) | ||
end | end | ||
return p | return p | ||