Module:Scale tree: Difference between revisions

Line 85:

-- Table headers

-- There are 8 columns:

-- There are 6 columns:

-- - ED ~~or ET~~

-- - Steps of ED

-- - Bright ~~gen in steps~~ and ~~cents~~

-- - Bright and dark gens in cents

~~-- - Dark gen~~ in ~~steps and~~ cents

-- - Step ratio and hardness

-- - Comments

result = '{| class="wikitable"\n'

result = result .. '|+\n'

result = result .. '! rowspan="2" |ED\n'

result = result .. '! rowspan="2" |Steps of ED\n'

result = result .. '! colspan="2" |~~Bright gen\n'~~

result = result .. '! colspan="2" |Cents\n'

~~result = result .. '! colspan="2" |Dark gen~~\n'

result = result .. '! colspan="2" |Step ratio\n'

result = result .. '! rowspan="2" |Comments\n'

result = result .. '|-\n'

result = result .. '!~~Steps~~\n'

result = result .. '!Bright gen\n'

result = result .. '!~~Cents\n'~~

result = result .. '!Dark gen\n'

~~result = result .. '!Steps\n'~~

~~result = result .. '!Cents~~\n'

result = result .. '!L:s\n'

result = result .. '!Hardness\n'

Line 135:

Line 131:

local l_s = "→ ∞"

if not (step_ratio[1] == 1 and step_ratio[2] == 0) then

l_s = u.~~_round~~(step_ratio[1] / step_ratio[2], 4)

l_s = u._round_dec(step_ratio[1] / step_ratio[2], 3)

end

Line 141:

Line 137:

result = result .. "|-\n"

-- ET

-- Steps in ET

result = result .. "|[[" .. ET.as_string(et) .. "]]\n"

result = result .. "|[[" .. ET.as_string(et) .. "|" .. generator_steps .. ET.backslash_modifier(et) .. "]]\n"

-- Bright generator in ~~steps and~~ cents

-- Bright generator in cents

~~result = result .. "|" .. generator_steps.. "\n"~~

result = result .. "|" .. u._round_dec(math.log(rat.as_float(et.equave)^(generator_steps / et.size))/math.log(2) * 1200, 3) .. "\n"

result = result .. "|" .. u.~~_round~~(math.log(rat.as_float(et.equave)^(generator_steps / et.size))/math.log(2) * 1200, 6) .. "\n"

-- Dark generator in ~~steps and~~ cents

-- Dark generator in cents

~~result = result .. "|" .. dark_generator_steps .. "\n"~~

result = result .. "|" .. u._round_dec(dark_generator_cents, 3) .. "\n" -- Round to 3 places

@@ Line 85: / Line 85: @@
 	-- Table headers
-	-- There are 8 columns:
+	-- There are 6 columns:
-	-- - ED or ET
+	-- - Steps of ED
-	-- - Bright gen in steps and cents
+	-- - Bright and dark gens in cents
-	-- - Dark gen in steps and cents
 	-- - Step ratio and hardness
 	-- - Comments
 	result = '{| class="wikitable"\n'
 	result = result .. '|+\n'
-	result = result .. '! rowspan="2" |ED\n'
+	result = result .. '! rowspan="2" |Steps of ED\n'
-	result = result .. '! colspan="2" |Bright gen\n'
+	result = result .. '! colspan="2" |Cents\n'
-	result = result .. '! colspan="2" |Dark gen\n'
 	result = result .. '! colspan="2" |Step ratio\n'
 	result = result .. '! rowspan="2" |Comments\n'
 	result = result .. '|-\n'
-	result = result .. '!Steps\n'
+	result = result .. '!Bright gen\n'
-	result = result .. '!Cents\n'
+	result = result .. '!Dark gen\n'
-	result = result .. '!Steps\n'
-	result = result .. '!Cents\n'
 	result = result .. '!L:s\n'
 	result = result .. '!Hardness\n'
@@ Line 135: / Line 131: @@
 		local l_s = "&rarr; ∞"
 		if not (step_ratio[1] == 1 and step_ratio[2] == 0)  then
-			l_s =  u._round(step_ratio[1] / step_ratio[2], 4)
+			l_s =  u._round_dec(step_ratio[1] / step_ratio[2], 3)
 		end
@@ Line 141: / Line 137: @@
 		result = result .. "|-\n"
-		-- ET
+		-- Steps in ET
-		result = result .. "|[[" .. ET.as_string(et) .. "]]\n"
+		result = result .. "|[[" .. ET.as_string(et) .. "|" .. generator_steps  .. ET.backslash_modifier(et) .. "]]\n"
-		-- Bright generator in steps and cents
+		-- Bright generator in cents
-		result = result .. "|" .. generator_steps.. "\n"
+		result = result .. "|" .. u._round_dec(math.log(rat.as_float(et.equave)^(generator_steps / et.size))/math.log(2) * 1200, 3) .. "\n"
-		result = result .. "|" .. u._round(math.log(rat.as_float(et.equave)^(generator_steps / et.size))/math.log(2) * 1200, 6) .. "\n"
-		-- Dark generator in steps and cents
+		-- Dark generator in cents
-		result = result .. "|" .. dark_generator_steps .. "\n"
 		result = result .. "|" .. u._round_dec(dark_generator_cents, 3) .. "\n"		-- Round to 3 places