Module:Interval table: Difference between revisions

Line 4:

local rat = require('Module:Rational')

local ET = require('Module:ET')

~~local newline = string.char(10)~~

function p.interval_table(frame)

local tuning = frame.args['tuning']

Line 17:

Line 15:

local dual_sharp_fifth = ET.approximate(et, 3/2, 1)

wikitext = wikitext .. '!Steps' ~~.. newline~~

wikitext = wikitext .. '!Steps\n'

wikitext = wikitext .. '!Cents' ~~.. newline~~

wikitext = wikitext .. '!Cents\n'

if rat.eq(et.equave, 2) then

if dual_fifth then

wikitext = wikitext .. '![[Ups and downs notation]] (dual flat fifth ' .. dual_flat_fifth .. '\\' .. et.size .. ')' ~~.. newline~~

wikitext = wikitext .. '![[Ups and downs notation]] (dual flat fifth ' .. dual_flat_fifth .. '\\' .. et.size .. ')\n'

wikitext = wikitext .. '![[Ups and downs notation]] (dual sharp fifth ' .. dual_sharp_fifth .. '\\' .. et.size .. ')' ~~.. newline~~

wikitext = wikitext .. '![[Ups and downs notation]] (dual sharp fifth ' .. dual_sharp_fifth .. '\\' .. et.size .. ')\n'

else

wikitext = wikitext .. '![[Ups and downs notation]]' ~~.. newline~~

wikitext = wikitext .. '![[Ups and downs notation]]\n'

end

Line 34:

Line 32:

if rat.eq(et.equave, 2) then

if dual_fifth then

wikitext = wikitext .. '|{{UDnote|tuning=' .. ET.as_string(et) .. '|step=' .. i .. '|fifth=' .. dual_flat_fifth .. '}} \n'

wikitext = wikitext .. '|{{UDnote|tuning=' .. ET.as_string(et) .. '|step=' .. i .. '|fifth=' .. dual_flat_fifth .. '}}\n'

wikitext = wikitext .. '|{{UDnote|tuning=' .. ET.as_string(et) .. '|step=' .. i .. '|fifth=' .. dual_sharp_fifth .. '}} \n'

wikitext = wikitext .. '|{{UDnote|tuning=' .. ET.as_string(et) .. '|step=' .. i .. '|fifth=' .. dual_sharp_fifth .. '}}\n'

else

wikitext = wikitext .. '|{{UDnote|tuning=' .. ET.as_string(et) .. '|step=' .. i .. '}}\n'

@@ Line 4: / Line 4: @@
 local rat = require('Module:Rational')
 local ET = require('Module:ET')
-local newline = string.char(10)
 function p.interval_table(frame)
 	local tuning = frame.args['tuning']
@@ Line 17: / Line 15: @@
 	local dual_sharp_fifth = ET.approximate(et, 3/2, 1)
-	wikitext = wikitext .. '!Steps' .. newline
+	wikitext = wikitext .. '!Steps\n'
-	wikitext = wikitext .. '!Cents' .. newline
+	wikitext = wikitext .. '!Cents\n'
 	if rat.eq(et.equave, 2) then
 		if dual_fifth then
-			wikitext = wikitext .. '![[Ups and downs notation]] (dual flat fifth ' .. dual_flat_fifth  .. '\\' .. et.size .. ')' .. newline
+			wikitext = wikitext .. '![[Ups and downs notation]] (dual flat fifth ' .. dual_flat_fifth  .. '\\' .. et.size .. ')\n'
-			wikitext = wikitext .. '![[Ups and downs notation]] (dual sharp fifth ' .. dual_sharp_fifth .. '\\' .. et.size .. ')' .. newline
+			wikitext = wikitext .. '![[Ups and downs notation]] (dual sharp fifth ' .. dual_sharp_fifth .. '\\' .. et.size .. ')\n'
 		else
-			wikitext = wikitext .. '![[Ups and downs notation]]' .. newline
+			wikitext = wikitext .. '![[Ups and downs notation]]\n'
 		end
 	end
@@ Line 34: / Line 32: @@
 		if rat.eq(et.equave, 2) then
 			if dual_fifth then
-				wikitext = wikitext .. '|{{UDnote|tuning=' .. ET.as_string(et) .. '|step=' .. i .. '|fifth=' .. dual_flat_fifth .. '}} \n'
+				wikitext = wikitext .. '|{{UDnote|tuning=' .. ET.as_string(et) .. '|step=' .. i .. '|fifth=' .. dual_flat_fifth .. '}}\n'
-				wikitext = wikitext .. '|{{UDnote|tuning=' .. ET.as_string(et) .. '|step=' .. i .. '|fifth=' .. dual_sharp_fifth .. '}} \n'
+				wikitext = wikitext .. '|{{UDnote|tuning=' .. ET.as_string(et) .. '|step=' .. i .. '|fifth=' .. dual_sharp_fifth .. '}}\n'
 			else
 				wikitext = wikitext .. '|{{UDnote|tuning=' .. ET.as_string(et) .. '|step=' .. i .. '}}\n'