2026年4月2日 (木) 17:29にFurcht968による

2026-04-02T17:29:22Z

← 古い版		2026年4月2日 (木) 17:29時点における版
99行目:		99行目:
	local result = {}		local result = {}
	table.insert(result, '{\| class="wikitable center-all"')		table.insert(result, '{\| class="wikitable center-all"')
	table.insert(result, '\|+ style="font-size: 105%; white-space: nowrap;" \| ' .. mos_as_string .. '~~の音階一覧と調律スペクトル~~')		table.insert(result, '\|+ style="font-size: 105%; white-space: nowrap;" \| ' .. mos_as_string .. 'の調律スペクトル')
	table.insert(result, '\|-')		table.insert(result, '\|-')
	table.insert(result, string.format('! rowspan="2" colspan="%d" \| ジェネレーター<sup><abbr title="In steps of %s.">(%s)</abbr></sup>', deepest + 1, et_suffix, et_suffix))		table.insert(result, string.format('! rowspan="2" colspan="%d" \| ジェネレーター<sup><abbr title="In steps of %s.">(%s)</abbr></sup>', deepest + 1, et_suffix, et_suffix))

2026年4月2日 (木) 13:19にFurcht968による

2026-04-02T13:19:40Z

← 古い版		2026年4月2日 (木) 13:19時点における版
106行目:		106行目:
	table.insert(result, string.format('! rowspan="2" \| %s', comments_header_text))		table.insert(result, string.format('! rowspan="2" \| %s', comments_header_text))
	table.insert(result, '\|-')		table.insert(result, '\|-')
	table.insert(result, '! <abbr title="Chroma-positive generator">明</abbr>')		table.insert(result, '! <abbr title="Chroma-positive generator">上方</abbr>')
	table.insert(result, '! <abbr title="Chroma-negative generator">暗</abbr>')		table.insert(result, '! <abbr title="Chroma-negative generator">下方</abbr>')
	table.insert(result, '! 全音半音比(L:s)')		table.insert(result, '! 全音半音比(L:s)')
	table.insert(result, '! 広さ')		table.insert(result, '! 広さ')

2026年4月1日 (水) 19:15にFurcht968による

2026-04-01T19:15:31Z

← 古い版		2026年4月1日 (水) 19:15時点における版
101行目:		101行目:
	table.insert(result, '\|+ style="font-size: 105%; white-space: nowrap;" \| ' .. mos_as_string .. 'の音階一覧と調律スペクトル')		table.insert(result, '\|+ style="font-size: 105%; white-space: nowrap;" \| ' .. mos_as_string .. 'の音階一覧と調律スペクトル')
	table.insert(result, '\|-')		table.insert(result, '\|-')
	table.insert(result, string.format('! rowspan="2" colspan="%d" \| ~~Generator~~<sup><abbr title="In steps of %s.">(%s)</abbr></sup>', deepest + 1, et_suffix, et_suffix))		table.insert(result, string.format('! rowspan="2" colspan="%d" \| ジェネレーター<sup><abbr title="In steps of %s.">(%s)</abbr></sup>', deepest + 1, et_suffix, et_suffix))
	table.insert(result, '! colspan="2" \| セント')		table.insert(result, '! colspan="2" \| セント')
	table.insert(result, '! colspan="2" \| 比率 ')		table.insert(result, '! colspan="2" \| 比率 ')

2026年4月1日 (水) 18:47にFurcht968による

2026-04-01T18:47:50Z

← 古い版		2026年4月1日 (水) 18:47時点における版
84行目:		84行目:

	-- Produce table header for the comments		-- Produce table header for the comments
	local comments_header_text = "~~Comments~~"		local comments_header_text = "備考"
	if small_steps == 1 then		if small_steps == 1 then
	comments_header_text = comments_header_text .. "<sup><abbr title=\"Every tuning produces a proper scale.\">(always proper)</abbr></sup>"		comments_header_text = comments_header_text .. "<sup><abbr title=\"Every tuning produces a proper scale.\">(always proper)</abbr></sup>"

Furcht968: ページの作成:「local mos = require("Module:MOS") local mediants = require("Module:Mediants") local tip = require("Module:Template input parse") local utils = require("Module:Utils") local yesno = require("Module:yesno") local getArgs = require("Module:Arguments").getArgs local p = {} -- TODO: -- - Add back old option from previous scale tree: toggle staggering of ratios. -- - (Low priority): Force-add comments that lie outside searched depth. If such -- ratios…」

2026-04-01T18:29:19Z

ページの作成:「local mos = require("Module:MOS") local mediants = require("Module:Mediants") local tip = require("Module:Template input parse") local utils = require("Module:Utils") local yesno = require("Module:yesno") local getArgs = require("Module:Arguments").getArgs local p = {} -- TODO: -- - Add back old option from previous scale tree: toggle staggering of ratios. -- - (Low priority): Force-add comments that lie outside searched depth. If such -- ratios…」

新規ページ

local mos = require("Module:MOS")
local mediants = require("Module:Mediants")
local tip = require("Module:Template input parse")
local utils = require("Module:Utils")
local yesno = require("Module:yesno")
local getArgs = require("Module:Arguments").getArgs

local p = {}

-- TODO:
-- - Add back old option from previous scale tree: toggle staggering of ratios.
-- - (Low priority): Force-add comments that lie outside searched depth. If such
-- ratios are added, they're added in either the last column or their own
-- column appended after the last one. (to be determined)

-- Split comments into in-range and out-of-range comments.
-- Iterate through the comments and determine whether the key for a comment is
-- in the table of step ratios. If so, add the corresponding key-value pair into
-- the table of in-comments; if not, add to the table of out-comments.
function p.preprocess_comments(comments, step_ratios, depths)
local in_comments = {}
local out_comments = {}
local out_ratios = {}

for key, value in pairs(comments) do
local key_found_in_step_ratios = utils.table_contains(step_ratios, key, function(key, ratio)
return key == string.format("%s/%s", ratio[1], ratio[2]) end
)

if key_found_in_step_ratios then
in_comments[key] = value
else
out_comments[key] = value
table.insert(out_ratios, tip.parse_numeric_pair(key, "/", true))
end
end
mediants.sort_ratios(out_ratios)

return in_comments, out_comments, out_ratios
end

-- Re-re-rewrite of tuning spectrum
function p._mos_tuning_spectrum(args)
-- Find default ratios, if nothing was entered
local default_ratios, default_depths
local default_depth = 5
default_ratios, default_depths = mediants.find_mediants({{1,1}, {1,0}}, default_depth)

-- Extract info from args
local input_mos = args["Input MOS" ] or mos.new(5, 2)
local comments = args["Comments" ] or {}
local step_ratios = args["Step Ratios"] or default_ratios
local depths = args["Depths" ] or default_depths

-- Find the deepest searched depth at which ratios were found
local deepest = mediants.deepest_depth(depths)

-- Find mos info
local equave = input_mos.equave
local large_steps = input_mos.nL -- Large steps in mos
local small_steps = input_mos.ns -- Small steps in mos
local periods = mos.period_count(input_mos) -- Number of periods
local et_suffix = mos.et_suffix(input_mos) -- Mos's ET suffix (edo, edt, edf, ed-p/q, etc)

-- Default comments for TAMNAMS-named step ratios
local default_comments = {}
local mos_as_string = mos.as_string(input_mos)
default_comments["1/1"] = string.format("'''Equalized %s'''", mos_as_string)
default_comments["4/3"] = string.format("'''Supersoft %s'''", mos_as_string)
default_comments["3/2"] = string.format("'''Soft %s'''" , mos_as_string)
default_comments["5/3"] = string.format("'''Semisoft %s'''" , mos_as_string)
default_comments["2/1"] = string.format("'''Basic %s'''" , mos_as_string)
default_comments["5/2"] = string.format("'''Semihard %s'''" , mos_as_string)
default_comments["3/1"] = string.format("'''Hard %s'''" , mos_as_string)
default_comments["4/1"] = string.format("'''Superhard %s'''", mos_as_string)
default_comments["1/0"] = string.format("'''Collapsed %s'''", mos_as_string)

-- Append boundary of proper scales to basic comment, if applicable
-- Monosmall mosses and knL ns mosses are always proper, but all other mosses
-- are proper if the step ratio is within the soft-of-basic range
if periods < small_steps then
default_comments["2/1"] = default_comments["2/1"] .. " (これより小さい方が望ましい) "
end

-- Produce table header for the comments
local comments_header_text = "Comments"
if small_steps == 1 then
comments_header_text = comments_header_text .. "<abbr title=\"Every tuning produces a proper scale.\">(always proper)</abbr>"
elseif small_steps == periods and periods > 1 then
comments_header_text = comments_header_text .. "<abbr title=\"Every true-mos tuning produces a proper scale.\">(always proper)</abbr>"
end

-- Table headers
-- There are 6 columns:
-- - Steps of ED
-- - Bright and dark gens in cents
-- - Step ratio and hardness
-- - Comments
local result = {}
table.insert(result, '{| class="wikitable center-all"')
table.insert(result, '|+ style="font-size: 105%; white-space: nowrap;" | ' .. mos_as_string .. 'の音階一覧と調律スペクトル')
table.insert(result, '|-')
table.insert(result, string.format('! rowspan="2" colspan="%d" | Generator<abbr title="In steps of %s.">(%s)</abbr>', deepest + 1, et_suffix, et_suffix))
table.insert(result, '! colspan="2" | セント')
table.insert(result, '! colspan="2" | 比率 ')
table.insert(result, string.format('! rowspan="2" | %s', comments_header_text))
table.insert(result, '|-')
table.insert(result, '! <abbr title="Chroma-positive generator">明</abbr>')
table.insert(result, '! <abbr title="Chroma-negative generator">暗</abbr>')
table.insert(result, '! 全音半音比(L:s)')
table.insert(result, '! 広さ')

-- Rounding is done using string.format, to 3 decimal places (%.3f)

-- Create each row of the table
for i = 1, #step_ratios do
-- Simplify step ratio before using it
local step_ratio = mediants.simplify_ratio(step_ratios[i])

-- Produce current ET as a string
local et_as_string = mos.et_string(input_mos, step_ratio)

-- Calculate the bright gen and cent value
local bright_generator_steps = mos.bright_gen_to_et_steps (input_mos, step_ratio)
local bright_generator_cents = mos.bright_gen_to_cents (input_mos, step_ratio)
local bright_generator_string = mos.bright_gen_to_et_string(input_mos, step_ratio, "")

-- Calculate dark generator step count and cent value
local dark_generator_steps = mos.dark_gen_to_et_steps(input_mos, step_ratio)
local dark_generator_cents = mos.dark_gen_to_cents (input_mos, step_ratio)

-- New row
table.insert(result, "|-")

-- Cells for bright generator, as steps in et
-- Bright gen cell is accompanied by cells to the left and right.
-- The variable current_depth is the number of left cells; the number of
-- right cells is deepest minus current_depth.
local current_depth = depths[i]
local num_right_cells = deepest - current_depth
for i = 1, current_depth do
table.insert(result, "|")
end
table.insert(result, string.format("| [[%s|%s]]", et_as_string, bright_generator_string))
for i = 1, num_right_cells do
table.insert(result, "|")
end

-- Cells for generators in cents
table.insert(result, string.format("| %.3f", bright_generator_cents))
table.insert(result, string.format("| %.3f", dark_generator_cents ))

-- Cell for step ratio
table.insert(result, string.format("| %d:%d", step_ratio[1], step_ratio[2]))

-- Cell for hardness, with divide-by-zero check
local hardness = ""
if step_ratio[2] == 0 then
hardness = "→ ∞"
else
hardness = string.format("%.3f", step_ratio[1] / step_ratio[2])
end
table.insert(result, string.format("| %s", hardness))

-- Cell for comment
-- Default comments are on their own line before custom comments
local key = step_ratio[1] .. "/" .. step_ratio[2] -- The step ratio is (literally and figuratively) the key to add comments!
local comment = ""
local default_comment = default_comments[key] or ""
local custom_comment = comments[key] or ""
if default_comment == "" then
comment = custom_comment
else
comment = default_comment .. " " .. custom_comment
end
table.insert(result, string.format("| style=\"text-align: left;\" | %s", comment))

end

table.insert(result, "|}")
return table.concat(result, "\n")
end

-- Wrapper function; to be called by template; preprocesses args
-- Unprocessed args:
-- - Scale Signature (textual scalesig)
-- - Depth (how deep to search for mediants)
-- - Int Limit (if present, overrides depth-based search for int-limit search)
-- - X/Y (comments for individual step ratios)
-- - First/Last Step Ratio (initial ratios for mediant search; default is
-- 1/1 and 1/0 respectively)
-- Processed args:
-- - Input MOS (processed from textual scalesig)
-- - Step Ratios (table of step ratios found)
-- - Depths (table of how deep each step ratio was found at)
-- - Comments (step ratio comments placed in their own table)
function p.mos_tuning_spectrum(frame)
local args = getArgs(frame)

-- Parse scalesig as input mos, then remove scalesig
local input_mos = mos.parse(args["Scale Signature"])
args["Input MOS"] = input_mos
args["Scale Signature"] = nil

-- Parse initial ratios
local initial_ratios_unparsed = args["Initial Ratios"]
local initial_ratios = {}
if initial_ratios_unparsed ~= nil then
-- Parse initial ratios, then sort by ascending
initial_ratios = tip.parse_numeric_pairs(initial_ratios_unparsed, ";", "/", true)
mediants.sort_ratios(initial_ratios)
else
-- If no initial ratios were passed in, default to 1/1 and 1/0
initial_ratios = {{1,1}, {1,0}}
end

-- Then generate mediants and depths
-- If using depth-based search, parse the depth, then remove it from args
-- If using int-limit search, parse the int limit, then remove it from args,
-- and remove depth in case it was present.
local step_ratios, depths
local use_int_limit = args["Int Limit"] ~= nil
if use_int_limit then
-- Int-limit search; parse int-limit
local int_limit = tonumber(args["Int Limit"])
args["Int Limit"] = nil

-- Find ratios and depths found
step_ratios, depths = mediants.find_mediants_by_int_limit(initial_ratios, int_limit)
else
-- Depth-based search; parse depth
local depth = tonumber(args["Depth"]) or 5

-- Find ratios and depths found
step_ratios, depths = mediants.find_mediants(initial_ratios, depth)
end
args["Depth" ] = nil
args["Step Ratios"] = step_ratios
args["Depths" ] = depths

-- Transfer comments from args to comments
local comments = {}
for i = 1, #step_ratios do
local key = step_ratios[i][1] .. "/" .. step_ratios[i][2]
if args[key] ~= nil then
comments[key] = args[key]
args[key] = nil
end
end
args["Comments"] = comments

-- Parse debug option
local debugg = yesno(args["debug"])

-- Output
local result = p._mos_tuning_spectrum(args)
if debugg == true then
result = "<syntaxhighlight lang=\"wikitext\">" .. result .. "</syntaxhighlight>"
end

return frame:preprocess(result)
end

function p.tester()
--local args = {}
--return p._mos_tuning_spectrum(args)

local comments = {
["5/4"] = "aaa",
["2/1"] = "bbb"
}

local step_ratios = {
{1,1},
{5,4},
{4,3}
}

local in_comments = {}
local out_comments = {}
in_comments, out_comments, out_ratios = p.preprocess_comments(comments, step_ratios)

local args = {}
--return out_comments
return p._mos_tuning_spectrum(args)
end

return p

モジュール:MOS tuning spectrum - 版の履歴

2026年4月2日 (木) 17:29にFurcht968による

2026年4月2日 (木) 13:19にFurcht968による

2026年4月1日 (水) 19:15にFurcht968による

2026年4月1日 (水) 18:47にFurcht968による