Module:Infobox MOS: Difference between revisions

Line 8:

local kbvis = require('Module:Keyboard vis')

local tip = require('Module:Template input parse')

local tamnams = require('Module:TAMNAMS')

-- TODO:

Line 61:

Line 62:

-- the closest tamnams-named ancestor.

local ancestor_mos = mos.find_ancestor(input_mos)

local tamnams_name = ~~mos~~.~~tamnams_name[~~mos.as_string(ancestor_mos)]

local tamnams_name = tamnams.lookup_name(mos.as_string(ancestor_mos))

~~if tamnams_name == "arch(a~~)~~eotonic" then~~

~~tamnams_name = "archaeotonic"~~

~~end~~

if tamnams_name ~= nil then

Line 163:

Line 160:

local bright_gen = mos.bright_gen(input_mos)

local dark_gen = {

local dark_gen = mos.dark_gen (input_mos)

~~['L'] = input_mos~~.~~nL / number_of_periods - bright_gen['L'],~~

~~['s'] =~~ input_mos~~.ns / number_of_periods - bright_gen['s']~~

}

local equalized_ed = et.new(input_mos.nL + input_mos.ns, input_mos.equave, "")

Line 307:

Line 301:

local number_of_periods = utils._gcd(input_mos.nL, input_mos.ns)

local tamnams_name = ~~mos~~.~~tamnams_name[~~scalesig]

local tamnams_name = tamnams.lookup_name (scalesig)

local tamnams_prefix = ~~mos~~.~~tamnams_prefix[~~scalesig]

local tamnams_prefix = tamnams.lookup_prefix(scalesig)

local tamnams_abbrev = ~~mos~~.~~tamnams_abbrev[~~scalesig]

local tamnams_abbrev = tamnams.lookup_abbrev(scalesig)

local is_octave_equivalent = rat.eq(input_mos.equave, 2)

@@ Line 8: / Line 8: @@
 local kbvis = require('Module:Keyboard vis')
 local tip = require('Module:Template input parse')
+local tamnams = require('Module:TAMNAMS')
 -- TODO:
@@ Line 61: / Line 62: @@
 		--   the closest tamnams-named ancestor.
 		local ancestor_mos = mos.find_ancestor(input_mos)
-		local tamnams_name = mos.tamnams_name[mos.as_string(ancestor_mos)]
+		local tamnams_name = tamnams.lookup_name(mos.as_string(ancestor_mos))
-		if tamnams_name == "arch(a)eotonic" then
-			tamnams_name = "archaeotonic"
-		end
 		if tamnams_name ~= nil then
@@ Line 163: / Line 160: @@
 	local bright_gen = mos.bright_gen(input_mos)
-	local dark_gen = {
+	local dark_gen   = mos.dark_gen  (input_mos)
-		['L'] = input_mos.nL / number_of_periods - bright_gen['L'],
-		['s'] = input_mos.ns / number_of_periods - bright_gen['s']
-	}
 	local equalized_ed = et.new(input_mos.nL + input_mos.ns, input_mos.equave, "")
@@ Line 307: / Line 301: @@
 	local number_of_periods = utils._gcd(input_mos.nL, input_mos.ns)
-	local tamnams_name = mos.tamnams_name[scalesig]
+	local tamnams_name   = tamnams.lookup_name  (scalesig)
-	local tamnams_prefix = mos.tamnams_prefix[scalesig]
+	local tamnams_prefix = tamnams.lookup_prefix(scalesig)
-	local tamnams_abbrev = mos.tamnams_abbrev[scalesig]
+	local tamnams_abbrev = tamnams.lookup_abbrev(scalesig)
 	local is_octave_equivalent = rat.eq(input_mos.equave, 2)