Module:Ups and downs notation - Revision history

ArrowHead294 at 13:23, 1 June 2025

2025-06-01T13:23:28Z

← Older revision		Revision as of 13:23, 1 June 2025
Line 3:		Line 3:
	local ET = require("Module:ET")		local ET = require("Module:ET")
	local utils = require("Module:Utils")		local utils = require("Module:Utils")
			local yesno = require("Module:Yesno")

	-- Returns a table of note names		-- Returns a table of note names
Line 179:		Line 180:
	function p.ups_and_downs_note_name(frame)		function p.ups_and_downs_note_name(frame)
	local et = ET.parse(frame.args["tuning"]) or ET.parse("12edo")		local et = ET.parse(frame.args["tuning"]) or ET.parse("12edo")
			local debugg = yesno(frame.args["debug"])
	local fifth = tonumber(frame.args["fifth"])		local fifth = tonumber(frame.args["fifth"])
	local step = tonumber(frame.args["step"])		local step = tonumber(frame.args["step"])
	~~return~~ table.concat(p.get_note_names_table(et, fifth)[step], ", "):sub(0, -1)		local result = table.concat(p.get_note_names_table(et, fifth)[step], ", "):sub(0, -1)

			if debugg == true then
			result = "<syntaxhighlight lang=\"wikitext\">" .. result .. "</syntaxhighlight>"
			end

			return frame:preprocess(result)
	end		end

	return p		return p

ArrowHead294 at 18:24, 19 May 2025

2025-05-19T18:24:30Z

← Older revision		Revision as of 18:24, 19 May 2025
Line 1:		Line 1:
			local p = {}

	local ET = require("Module:ET")		local ET = require("Module:ET")
	local utils = require("Module:Utils")		local utils = require("Module:Utils")
	~~local p = {}~~

	-- Returns a table of note names		-- Returns a table of note names

Sintel: cleanup and formatting

2024-12-23T15:06:41Z

cleanup and formatting

← Older revision		Revision as of 15:06, 23 December 2024
Line 21:		Line 21:
	-- }		-- }

	function ~~roundDown~~(x)		local function round(x)
	return x>=0 and math.ceil(x-0.5) or math.floor(x+0.5) ~~-- round 1.5 down to 1~~		-- rounds half-integers towards 0.
			return x >= 0 and math.ceil(x - 0.5) or math.floor(x + 0.5)
	end		end

Line 68:		Line 69:
	else		else
	local num_double_sharps = 0		local num_double_sharps = 0
	local num_sharps = ~~roundDown~~((i - last_diatonic_note) / chroma)		local num_sharps = round((i - last_diatonic_note) / chroma)
	if num_sharps > 1 then		if num_sharps > 1 then
	num_double_sharps = math.floor(num_sharps / 2)		num_double_sharps = math.floor(num_sharps / 2)
Line 89:		Line 90:
	table.insert(		table.insert(
	note_names[i],		note_names[i],
	"v<sup>" .. num_downs .. "</sup>" .. last_diatonic_names[j]		"v<sup>"
	.. string.rep("♯", num_sharps) .. string.rep("𝄪", num_double_sharps)		.. num_downs
			.. "</sup>"
			.. last_diatonic_names[j]
			.. string.rep("♯", num_sharps)
			.. string.rep("𝄪", num_double_sharps)
	)		)
	elseif num_downs > 0 then		elseif num_downs > 0 then
	table.insert(		table.insert(
	note_names[i],		note_names[i],
	string.rep("v", num_downs) .. last_diatonic_names[j]		string.rep("v", num_downs)
	.. string.rep("♯", num_sharps) .. string.rep("𝄪", num_double_sharps)		.. last_diatonic_names[j]
			.. string.rep("♯", num_sharps)
			.. string.rep("𝄪", num_double_sharps)
	)		)
	elseif num_ups >= 3 then		elseif num_ups >= 3 then
Line 128:		Line 135:
	last_diatonic_note = i		last_diatonic_note = i
	else		else
	local num_flats = ~~roundDown~~((last_diatonic_note - i) / chroma)		local num_flats = round((last_diatonic_note - i) / chroma)
	local num_downs = (last_diatonic_note - i) % chroma		local num_downs = (last_diatonic_note - i) % chroma
	local num_ups = 0		local num_ups = 0

TallKite: works!

2024-12-23T07:04:17Z

works!

← Older revision		Revision as of 07:04, 23 December 2024
Line 90:		Line 90:
	note_names[i],		note_names[i],
	"v<sup>" .. num_downs .. "</sup>" .. last_diatonic_names[j]		"v<sup>" .. num_downs .. "</sup>" .. last_diatonic_names[j]
	.. string.rep("♯", num_sharps) .. string.rep("𝄪", num_double_sharps) )		.. string.rep("♯", num_sharps) .. string.rep("𝄪", num_double_sharps)
			)
	elseif num_downs > 0 then		elseif num_downs > 0 then
	table.insert(		table.insert(

TallKite: one more time...

2024-12-23T07:01:08Z

one more time...

← Older revision		Revision as of 07:01, 23 December 2024
Line 21:		Line 21:
	-- }		-- }

	function ~~round~~(x)		function roundDown(x)
	return x>=0 and math.~~floor~~(x+0.5) or math.~~ceil~~(x-0.5)		return x>=0 and math.ceil(x-0.5) or math.floor(x+0.5) -- round 1.5 down to 1
	end		end

Line 67:		Line 67:
	last_diatonic_note = i		last_diatonic_note = i
	else		else
	local num_double_sharps = 0 ~~-- was math.floor((i - last_diatonic_note) / (2 * chroma))~~		local num_double_sharps = 0
	local num_sharps = ~~round~~((i - last_diatonic_note) / chroma)		local num_sharps = roundDown((i - last_diatonic_note) / chroma)
	if num_sharps > 1 then		if num_sharps > 1 then
	num_double_sharps = math.floor(num_sharps / 2)		num_double_sharps = math.floor(num_sharps / 2)
Line 127:		Line 127:
	last_diatonic_note = i		last_diatonic_note = i
	else		else
	local num_flats = ~~round~~((last_diatonic_note - i) / chroma)		local num_flats = roundDown((last_diatonic_note - i) / chroma)
	local num_downs = (last_diatonic_note - i) % chroma		local num_downs = (last_diatonic_note - i) % chroma
	local num_ups = 0		local num_ups = 0

TallKite: should work...

2024-12-23T06:50:05Z

should work...

← Older revision		Revision as of 06:50, 23 December 2024
Line 67:		Line 67:
	last_diatonic_note = i		last_diatonic_note = i
	else		else
	local num_double_sharps = math.floor((i - last_diatonic_note) / (2 * chroma))		local num_double_sharps = 0 -- was math.floor((i - last_diatonic_note) / (2 * chroma))
	local num_sharps = ~~math.floor~~((i - last_diatonic_note) / chroma) % 2		local num_sharps = round((i - last_diatonic_note) / chroma)
			if num_sharps > 1 then
			num_double_sharps = math.floor(num_sharps / 2)
			num_sharps = num_sharps % 2
			end
	local num_ups = (i - last_diatonic_note) % chroma		local num_ups = (i - last_diatonic_note) % chroma
			local num_downs = 0
	if chroma == 0 then		if chroma == 0 then
	num_double_sharps = 0		num_double_sharps = 0
	num_sharps = 0		num_sharps = 0
	num_ups = (i - last_diatonic_note)		num_ups = (i - last_diatonic_note)
			end
			if num_ups > chroma / 2 then
			num_downs = chroma - num_ups
			num_ups = 0
	end		end
	local last_diatonic_names = note_names[last_diatonic_note]		local last_diatonic_names = note_names[last_diatonic_note]
	for j = 1, #last_diatonic_names do		for j = 1, #last_diatonic_names do
	if num_ups >= 3 then		if num_downs >= 3 then
			table.insert(
			note_names[i],
			"v<sup>" .. num_downs .. "</sup>" .. last_diatonic_names[j]
			.. string.rep("♯", num_sharps) .. string.rep("𝄪", num_double_sharps) )
			elseif num_downs > 0 then
			table.insert(
			note_names[i],
			string.rep("v", num_downs) .. last_diatonic_names[j]
			.. string.rep("♯", num_sharps) .. string.rep("𝄪", num_double_sharps)
			)
			elseif num_ups >= 3 then
	table.insert(		table.insert(
	note_names[i],		note_names[i],

TallKite: debugging...

2024-12-23T06:38:27Z

debugging...

← Older revision		Revision as of 06:38, 23 December 2024
Line 125:		Line 125:
	"^<sup>" .. num_ups .. "</sup>" .. last_diatonic_names[j] .. string.rep("♭", num_flats)		"^<sup>" .. num_ups .. "</sup>" .. last_diatonic_names[j] .. string.rep("♭", num_flats)
	)		)
	~~end~~		elseif num_ups > 0 then
	if num_ups > 0 then
	table.insert(		table.insert(
	note_names[i],		note_names[i],
	string.rep("^", num_ups) .. last_diatonic_names[j] .. string.rep("♭", num_flats)		string.rep("^", num_ups) .. last_diatonic_names[j] .. string.rep("♭", num_flats)
	)		)
	~~end~~		elseif num_downs >= 3 then
	if num_downs >= 3 then
	table.insert(		table.insert(
	note_names[i],		note_names[i],

TallKite: debugging...

2024-12-23T06:35:28Z

debugging...

← Older revision		Revision as of 06:35, 23 December 2024
Line 20:		Line 20:
	-- [12] = {"D"}		-- [12] = {"D"}
	-- }		-- }

			function round(x)
			return x>=0 and math.floor(x+0.5) or math.ceil(x-0.5)
			end

	function p.get_note_names_table(et, fifth)		function p.get_note_names_table(et, fifth)
Line 103:		Line 107:
	last_diatonic_note = i		last_diatonic_note = i
	else		else
	local num_flats = ~~math.floor~~((last_diatonic_note - i) / chroma)		local num_flats = round((last_diatonic_note - i) / chroma)
	local num_downs = (last_diatonic_note - i) % chroma		local num_downs = (last_diatonic_note - i) % chroma
			local num_ups = 0
	if chroma == 0 then		if chroma == 0 then
	num_flats = 0		num_flats = 0
	num_downs = (last_diatonic_note - i)		num_downs = (last_diatonic_note - i)
			end
			if num_downs > chroma / 2 then
			num_ups = chroma - num_downs
			num_downs = 0
	end		end
	local last_diatonic_names = note_names[last_diatonic_note]		local last_diatonic_names = note_names[last_diatonic_note]
	for j = 1, #last_diatonic_names do		for j = 1, #last_diatonic_names do
			if num_ups >= 3 then
			table.insert(
			note_names[i],
			"^<sup>" .. num_ups .. "</sup>" .. last_diatonic_names[j] .. string.rep("♭", num_flats)
			)
			end
			if num_ups > 0 then
			table.insert(
			note_names[i],
			string.rep("^", num_ups) .. last_diatonic_names[j] .. string.rep("♭", num_flats)
			)
			end
	if num_downs >= 3 then		if num_downs >= 3 then
	table.insert(		table.insert(

TallKite: Undo revision 172565 by TallKite (talk)

2024-12-23T06:28:35Z

Undo revision 172565 by TallKite (talk)

← Older revision		Revision as of 06:28, 23 December 2024
Line 20:		Line 20:
	-- [12] = {"D"}		-- [12] = {"D"}
	-- }		-- }

	~~function round(x)~~
	~~return x>=0 and math.floor(x+0.5) or math.ceil(x-0.5)~~
	~~end~~

	function p.get_note_names_table(et, fifth)		function p.get_note_names_table(et, fifth)
Line 67:		Line 63:
	last_diatonic_note = i		last_diatonic_note = i
	else		else
	local num_double_sharps = ~~round~~((i - last_diatonic_note) / (2 * chroma))		local num_double_sharps = math.floor((i - last_diatonic_note) / (2 * chroma))
	local num_sharps = ~~round~~((i - last_diatonic_note) / chroma) % 2		local num_sharps = math.floor((i - last_diatonic_note) / chroma) % 2
	local num_ups = (i - last_diatonic_note) % chroma		local num_ups = (i - last_diatonic_note) % chroma
	if chroma == 0 then		if chroma == 0 then
Line 107:		Line 103:
	last_diatonic_note = i		last_diatonic_note = i
	else		else
	local num_flats = ~~round~~((last_diatonic_note - i) / chroma)		local num_flats = math.floor((last_diatonic_note - i) / chroma)
	local num_downs = (last_diatonic_note - i) % chroma		local num_downs = (last_diatonic_note - i) % chroma
	if chroma == 0 then		if chroma == 0 then

TallKite: Undo revision 172567 by TallKite (talk)

2024-12-23T06:27:53Z

Undo revision 172567 by TallKite (talk)

← Older revision		Revision as of 06:27, 23 December 2024
Line 69:		Line 69:
	local num_double_sharps = round((i - last_diatonic_note) / (2 * chroma))		local num_double_sharps = round((i - last_diatonic_note) / (2 * chroma))
	local num_sharps = round((i - last_diatonic_note) / chroma) % 2		local num_sharps = round((i - last_diatonic_note) / chroma) % 2
	local num_ups = (i - last_diatonic_note ~~+ (chroma / 2)~~) % chroma ~~- (chroma / 2)~~		local num_ups = (i - last_diatonic_note) % chroma
	if chroma == 0 then		if chroma == 0 then
	num_double_sharps = 0		num_double_sharps = 0
Line 108:		Line 108:
	else		else
	local num_flats = round((last_diatonic_note - i) / chroma)		local num_flats = round((last_diatonic_note - i) / chroma)
	local num_downs = (last_diatonic_note - i ~~+ (chroma / 2)~~) % chroma ~~- (chroma / 2)~~		local num_downs = (last_diatonic_note - i) % chroma
	if chroma == 0 then		if chroma == 0 then
	num_flats = 0		num_flats = 0