Module:Diatonic interval tuning: Difference between revisions

← Older edit

@@ Line 5: / Line 5: @@
 function p.diatune(frame)
-	local fifthspan = tonumber(frame.args["fifthspan"])
+	local fifthspan = frame.args["fifthspan"]
-	local fifth1 = (4/7)*1200
+	local fifth1 = (4/7) * 1200
-	local fifth2 = (15/26)*1200
+	local fifth2 = (15/26) * 1200
-	local fifth3 = (11/19)*1200
+	local fifth3 = (11/19) * 1200
-	local fifth4 = (18/31)*1200
+	local fifth4 = (18/31) * 1200
-	local fifth5 = (7/12)*1200
+	local fifth5 = (7/12) * 1200
-	local fifth6 = (17/29)*1200
+	local fifth6 = (17/29) * 1200
-	local fifth7 = (10/17)*1200
+	local fifth7 = (10/17) * 1200
-	local fifth8 = (13/22)*1200
+	local fifth8 = (13/22) * 1200
-	local fifth9 = (3/5)*1200
+	local fifth9 = (3/5) * 1200
-	local tuning1 = fifth1*fifthspan % 1200
+	local tuning1 = math.floor((fifth1 * fifthspan % 1200) + 0.5)
-	local tuning2 = fifth2*fifthspan % 1200
+	local tuning2 = math.floor((fifth2 * fifthspan % 1200) + 0.5)
-	local tuning3 = fifth3*fifthspan % 1200
+	local tuning3 = math.floor((fifth3 * fifthspan % 1200) + 0.5)
-	local tuning4 = fifth4*fifthspan % 1200
+	local tuning4 = math.floor((fifth4 * fifthspan % 1200) + 0.5)
-	local tuning5 = fifth5*fifthspan % 1200
+	local tuning5 = math.floor((fifth5 * fifthspan % 1200) + 0.5)
-	local tuning6 = fifth6*fifthspan % 1200
+	local tuning6 =  math.floor((fifth6 * fifthspan % 1200) + 0.5)
-	local tuning7 = fifth7*fifthspan % 1200
+	local tuning7 =  math.floor((fifth7 * fifthspan % 1200) + 0.5)
-	local tuning8 = fifth8*fifthspan % 1200
+	local tuning8 =  math.floor((fifth8 * fifthspan % 1200) + 0.5)
-	local tuning9 = fifth9*fifthspan % 1200
+	local tuning9 = math.floor((fifth9 * fifthspan % 1200) + 0.5)
-	local out = '{| class="wikitable"|-!Tuning!Step ratio!Edo!Cents|-|Equalized|1:1|[[7edo|7]]|' .. tuning1
+	local result = '{| class="wikitable"\n'
-	.. 'c|-|Supersoft|4:3|[[26edo|26]]|' .. tuning2
+		.. '|-\n'
-	.. 'c|-|Soft|3:2|[[19edo|19]]|' .. tuning3
+		.. '! Tuning\n'
-	.. 'c|-|Semisoft|5:3|[[31edo|31]]|' .. tuning4
+		.. '! Step ratio\n'
-	.. 'c|-|Basic|2:1|[[12edo|12]]|' .. tuning5
+		.. '! EDO\n'
-	.. 'c|-|Semihard|5:2|[[29edo|29]]|' .. tuning6
+		.. '! Cents\n'
-	.. 'c|-|Hard|3:1|[[17edo|17]]|' .. tuning7
+		.. '|-\n'
-	.. 'c|-|Superhard|4:1|[[22edo|22]]|' .. tuning8
+		.. '| Equalized\n'
-	.. 'c|-|Equalized|1:0|[[5edo|5]]|' .. tuning9 .. '|}'
+		.. '| 1:1\n'
-	return frame:preprocess(out)
+		.. '| [[7edo|7]] \n'
+		.. string.format('| %s{{c}}\n', tuning1)
+		.. '|-\n'
+		.. '| Supersoft\n'
+		.. '| 4:3\n'
+		.. '| [[26edo|26]]\n'
+		.. string.format('| %s{{c}}\n', tuning2)
+		.. '|-\n'
+		.. '| Soft\n'
+		.. '| 3:2\n'
+		.. '| [[19edo|19]]\n'
+		.. string.format('| %s{{c}}\n', tuning3)
+		.. '|-\n'
+		.. '| Semisoft\n'
+		.. '| 5:3\n'
+		.. '| [[31edo|31]]\n'
+		.. string.format('| %s{{c}}\n', tuning4)
+		.. '|-\n'
+		.. '| Basic\n'
+		.. '| 2:1\n'
+		.. '| [[12edo|12]]\n'
+		.. string.format('| %s{{c}}\n', tuning5)
+		.. '|-\n'
+		.. '| Semihard\n'
+		.. '| 5:2\n'
+		.. '| [[29edo|29]]\n'
+		.. string.format('| %s{{c}}\n', tuning6)
+		.. '|-\n'
+		.. '| Hard\n'
+		.. '| 3:1\n'
+		.. '| [[17edo|17]]\n'
+		.. string.format('| %s{{c}}\n', tuning7)
+		.. '|-\n'
+		.. '| Superhard\n'
+		.. '| 4:1\n'
+		.. '| [[22edo|22]]\n'
+		.. string.format('| %s{{c}}\n', tuning8)
+		.. '|-\n'
+		.. '| Collapsed\n'
+		.. '| 1:0\n'
+		.. '| [[5edo|5]]\n'
+		.. string.format('| %s{{c}}\n', tuning9)
+		.. '|}'
+	local debugg = yesno(frame.args["debug"])
+	return frame:preprocess(debugg == true and "<syntaxhighlight lang=\"wikitext\">" .. result .. "</syntaxhighlight>" or result)
 end
 return p