Module:Svara - Revision history

Renamed user ExPsittacine: Add a caption.

2018-10-05T17:52:50Z

Add a caption.

← Previous revision		Revision as of 17:52, 5 October 2018
Line 144:		Line 144:
	local name = 'svara' .. mw.ustring.upper(mw.ustring.sub(value, 0, 1))		local name = 'svara' .. mw.ustring.upper(mw.ustring.sub(value, 0, 1))
	local anno = {foot = 'yes', separator = ' '}		local anno = {foot = 'yes', separator = ' '}

			temp = temp .. '<caption>' .. name .. '</caption>\n'

	for key1, value1 in pairs(input) do		for key1, value1 in pairs(input) do
	temp = temp .. "<tr><td>" .. key1 .. "</td><td>"		temp = temp .. "<tr><td>" .. key1 .. "</td><td>"

Renamed user ExPsittacine: Add status function from the sandbox.

2018-10-05T14:03:56Z

Add status function from the sandbox.

← Previous revision		Revision as of 14:03, 5 October 2018
Line 132:		Line 132:

	return p._main(frame, args)		return p._main(frame, args)
			end

			-- Runs through the entire functionality of this module.
			function p.status(frame)
			local types = {'hindustani', 'carnatic'}
			local output = ''

			for key, value in pairs(types) do
			local temp = "<table class='wikitable'>\n"
			local input = svaraResolve[value]
			local name = 'svara' .. mw.ustring.upper(mw.ustring.sub(value, 0, 1))
			local anno = {foot = 'yes', separator = ' '}
			for key1, value1 in pairs(input) do
			temp = temp .. "<tr><td>" .. key1 .. "</td><td>"
			.. frame:expandTemplate{title = name, args = {key1}} -- add foot='yes' to isolate individual errors.
			.. "</td><td>" .. value1 .. "</td></tr>\n"
			anno[#anno + 1] = key1
			end
			temp = temp .. "</table>\n"

			output = output .. temp
			.. mSep.main(anno) .. "\n\n"
			.. frame:expandTemplate{title = name, args = anno}
			end

			return output
	end		end

Renamed user ExPsittacine: Additional check

2018-10-05T13:55:06Z

Additional check

← Previous revision		Revision as of 13:55, 5 October 2018
Line 94:		Line 94:

	if (abbr) then		if (abbr) then
	if type ~= "western" then		if type ~= "western" and svaraDesc[value] then
	-- Use the abbr tag to add a description; avoid the default dotted		-- Use the abbr tag to add a description; avoid the default dotted
	-- underline style as it messes up the macrons.		-- underline style as it messes up the macrons.

Renamed user ExPsittacine: Comments + clean-up.

2018-10-05T08:53:01Z

Comments + clean-up.

← Previous revision		Revision as of 08:53, 5 October 2018
Line 4:		Line 4:
	local p = {}		local p = {}

			-- Some of the characters used do not render properly on all browsers.
	-- This is still missing most lower and higher octave notes.
	local svaraDesc = mw.loadData('Module:Svara/equivalents')		local svaraDesc = mw.loadData('Module:Svara/equivalents')
	local svaraResolve = mw.loadData('Module:Svara/resolve')		local svaraResolve = mw.loadData('Module:Svara/resolve')

			-- Convert shorthand notation into standard notation.
	function p.resolve(input, type)		function p.resolve(input, type)
	local svaras = svaraResolve[type]		local svaras = svaraResolve[type]
Line 39:		Line 40:
	end		end

			-- Get the equivalent note in other notation standards.
		⚫	-- print(p.getEquivalents({'S', 'R₂', 'G₃', 'M₁', 'P', 'D₂', 'N₃', 'Ṡ'}, 'carnatic'))
	function p.getEquivalents(frame, args, type)		function p.getEquivalents(frame, args, type)
	local output = ''		local output = ''
Line 46:		Line 49:
	local altText = ""		local altText = ""
	local entry		local entry


⚫	-- print(p.getEquivalents({'S', 'R₂', 'G₃', 'M₁', 'P', 'D₂', 'N₃', 'Ṡ'}, 'carnatic'))

	if (type == "carnatic") then		if (type == "carnatic") then
	altType = "hindustani"		altType = "hindustani"
Line 56:		Line 57:
	altText = "Carnatic"		altText = "Carnatic"
	end		end

	for key, value in pairs(args) do		for key, value in pairs(args) do
	output = output .. " " .. key .. "[" .. value .. "]"
	if svaraDesc[value] then		if svaraDesc[value] then
	entry = svaraDesc[value]		entry = svaraDesc[value]
Line 72:		Line 73:
	return output		return output
	end		end


			-- Generates the output.
	function p._main(frame, input, type)		function p._main(frame, input, type)
	local foot = nil		local foot = nil
Line 111:		Line 113:
	end		end

			-- Currently cleans up and returns the input.
	function p.sanitiseArgs(frame, capitalise)		function p.sanitiseArgs(frame, capitalise)
	local args = getArgs(frame)		local args = getArgs(frame)
Line 124:		Line 127:
	end		end

			-- Called by the svara template.
	function p.main(frame)		function p.main(frame)
	local args = p.sanitiseArgs(frame)		local args = p.sanitiseArgs(frame)

Renamed user ExPsittacine: Tabs

2018-10-05T08:47:26Z

Tabs

← Previous revision		Revision as of 08:47, 5 October 2018
Line 13:		Line 13:
	for key, value in pairs(input) do		for key, value in pairs(input) do
	if svaras[value] then		if svaras[value] then
	input[key] = svaras[value];		input[key] = svaras[value];
	end		end
	end		end

	return input		return input
Line 60:		Line 60:
	if svaraDesc[value] then		if svaraDesc[value] then
	entry = svaraDesc[value]		entry = svaraDesc[value]
	alternate[key] = entry[altType];		alternate[key] = entry[altType];
	western[key] = entry["western"];		western[key] = entry["western"];
	end		end
	end		end

Line 98:		Line 98:
	end		end
	end		end
	end		end


	svaras['separator'] = " "		svaras['separator'] = " "
	local output = mSep.main(svaras)		local output = mSep.main(svaras)
Line 108:		Line 108:
	end		end

	return output		return output
	end		end

Line 117:		Line 117:
	if (capitalise) then		if (capitalise) then
	for key, value in pairs(args) do		for key, value in pairs(args) do
	args[key] = mw.ustring.upper(args[key]);		args[key] = mw.ustring.upper(args[key]);
	end		end
	end		end

Renamed user ExPsittacine: Re-enable abbr and foot; Add quotes around group name.

2018-10-05T08:28:15Z

Re-enable abbr and foot; Add quotes around group name.

← Previous revision		Revision as of 08:28, 5 October 2018
Line 88:		Line 88:
	end		end

	abbr = false --temporary
	foot = false --temporary
	for key, value in pairs(input) do		for key, value in pairs(input) do
	svaras[key] = value		svaras[key] = value
Line 107:		Line 105:
	if (foot) then		if (foot) then
	local equivalents = p.getEquivalents(frame, input, type)		local equivalents = p.getEquivalents(frame, input, type)
	output = output .. frame:expandTemplate{title = 'efn', args = {equivalents, group=svara}}		output = output .. frame:expandTemplate{title = 'efn', args = {equivalents, group='svara'}}
	end		end

Renamed user ExPsittacine: Temporarily turn off abbr and foot.

2018-10-05T07:51:59Z

Temporarily turn off abbr and foot.

← Previous revision		Revision as of 07:51, 5 October 2018
Line 88:		Line 88:
	end		end

			abbr = false --temporary
			foot = false --temporary
	for key, value in pairs(input) do		for key, value in pairs(input) do
	svaras[key] = value		svaras[key] = value

Renamed user ExPsittacine: Add example debug strings.

2018-10-03T17:54:20Z

Add example debug strings.

← Previous revision		Revision as of 17:54, 3 October 2018
Line 21:		Line 21:

	-- Called by the svaraC template		-- Called by the svaraC template
			-- print(p.carnatic({'S', 'r1', 'g2', 'm1', 'P', 'd2', 'N3', "S'"}))
	function p.carnatic(frame)		function p.carnatic(frame)
	-- Carnatic notation is case-insensitive. Enable the capitalise option.		-- Carnatic notation is case-insensitive. Enable the capitalise option.
Line 30:		Line 31:

	-- Called by the svaraH template		-- Called by the svaraH template
			-- print(p.hindustani({'S', 'r', 'G', 'm', 'P', 'd', 'N', "S'"}))
	function p.hindustani(frame)		function p.hindustani(frame)
	local input = p.sanitiseArgs(frame)		local input = p.sanitiseArgs(frame)

Renamed user ExPsittacine: Missed a spot.

2018-10-03T17:43:05Z

Missed a spot.

← Previous revision		Revision as of 17:43, 3 October 2018
Line 32:		Line 32:
	function p.hindustani(frame)		function p.hindustani(frame)
	local input = p.sanitiseArgs(frame)		local input = p.sanitiseArgs(frame)
	input = p.~~resolveHindustani~~(input, "hindustani")		input = p.resolve(input, "hindustani")

	return p._main(frame, input, 'hindustani')		return p._main(frame, input, 'hindustani')

Renamed user ExPsittacine: Move tables to an external file and use mw.loadData; Also make abbr optional.

2018-10-03T17:35:21Z

Move tables to an external file and use mw.loadData; Also make abbr optional.

Show changes