Skip to content

Commit 36fa6b5

Browse files
omsuneriomsuneri
authored
FIXES ISSUE #4018 More default EDOs for temperament (#4022)
By these changes user can experience some of the most common Equal temperaments Equal 5EDO Equal 7EDO Equal 19EDO Equal 31EDO
1 parent 5301ee9 commit 36fa6b5

File tree

1 file changed

+181
-0
lines changed

1 file changed

+181
-0
lines changed

‎js/utils/musicutils.js‎

Lines changed: 181 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1555,6 +1555,10 @@ const OSCTYPES = [
15551555
*/
15561556
const INITIALTEMPERAMENTS = [
15571557
[_("Equal (12EDO)"), "equal", "equal"],
1558+
[_("Equal (5EDO)"), "equal5", "equal5"],
1559+
[_("Equal (7EDO)"), "equal7", "equal7"],
1560+
[_("Equal (19EDO)"), "equal19", "equal19"],
1561+
[_("Equal (31EDO)"), "equal31", "equal31"],
15581562
[_("5-limit Just Intonation"), "just intonation", "just intonation"],
15591563
[_("Pythagorean (3-limit JI)"), "Pythagorean", "Pythagorean"],
15601564
[_("Meantone") + " (1/3)", "1/3 comma meantone", "meantone (1/3)"],
@@ -1567,6 +1571,10 @@ const INITIALTEMPERAMENTS = [
15671571
*/
15681572
let TEMPERAMENTS = [
15691573
[_("Equal (12EDO)"), "equal", "equal"],
1574+
[_("Equal (5EDO)"), "equal5", "equal5"],
1575+
[_("Equal (7EDO)"), "equal7", "equal7"],
1576+
[_("Equal (19EDO)"), "equal19", "equal19"],
1577+
[_("Equal (31EDO)"), "equal31", "equal31"],
15701578
[_("5-limit Just Intonation"), "just intonation", "just intonation"],
15711579
[_("Pythagorean (3-limit JI)"), "Pythagorean", "Pythagorean"],
15721580
[_("Meantone") + " (1/3)", "1/3 comma meantone", "meantone (1/3)"],
@@ -1580,6 +1588,10 @@ let TEMPERAMENTS = [
15801588
*/
15811589
const PreDefinedTemperaments = {
15821590
"equal": true,
1591+
"equal5": true,
1592+
"equal7": true,
1593+
"equal19": true,
1594+
"equal31": true,
15831595
"just intonation": true,
15841596
"Pythagorean": true,
15851597
"1/3 comma meantone": true,
@@ -1631,6 +1643,175 @@ const TEMPERAMENT = {
16311643
"perfect 8"
16321644
]
16331645
},
1646+
"equal5":{
1647+
// Equal 5EDO temperament: 5 Equal Divisions of the Octave
1648+
"perfect 1": Math.pow(2, 0 / 5),//Unison
1649+
"minor 2": Math.pow(2, 1 / 5),
1650+
"augmented 1": Math.pow(2, 1 / 5),
1651+
"major 2": Math.pow(2, 2 / 5),
1652+
"augmented 2": Math.pow(2, 2 / 5),
1653+
"minor 3": Math.pow(2, 2/ 5),
1654+
"major 3": Math.pow(2, 3 / 5),
1655+
"augmented 3": Math.pow(2, 3 / 5),
1656+
"diminished 4": Math.pow(2, 3 / 5),
1657+
"perfect 4": Math.pow(2, 3 / 5),
1658+
"augmented 4": Math.pow(2, 4 / 5),
1659+
"diminished 5": Math.pow(2, 4 / 5),
1660+
"perfect 5": Math.pow(2, 5 / 5),
1661+
"augmented 5": Math.pow(2, 5 / 5),
1662+
"minor 6": Math.pow(2, 5 / 5),
1663+
"major 6": Math.pow(2, 5 / 5),
1664+
"augmented 6": Math.pow(2, 5 / 5),
1665+
"minor 7": Math.pow(2, 5 / 5),
1666+
"major 7": Math.pow(2, 5 / 5),
1667+
"augmented 7": Math.pow(2, 5 / 5),
1668+
"diminished 8": Math.pow(2, 5 / 5),
1669+
"perfect 8": Math.pow(2, 5 / 5),
1670+
"pitchNumber": 5,
1671+
"interval": [
1672+
"perfect 1",
1673+
"minor 2",
1674+
"major 2",
1675+
"major 3",
1676+
"augmented 4",
1677+
"perfect 5"
1678+
1679+
]
1680+
},
1681+
"equal7":{
1682+
// Equal 7EDO Temperament: 7 Equal Divisions of the Octave
1683+
"perfect 1": Math.pow(2, 0 / 7),//Unison
1684+
"minor 2": Math.pow(2, 1 / 7),
1685+
"augmented 1": Math.pow(2, 1 / 7),
1686+
"major 2": Math.pow(2, 2 / 7),
1687+
"augmented 2": Math.pow(2, 2 / 7),
1688+
"minor 3": Math.pow(2, 3 / 7),
1689+
"major 3": Math.pow(2, 3 / 7),
1690+
"augmented 3": Math.pow(2, 4 / 7),
1691+
"diminished 4": Math.pow(2, 4 / 7),
1692+
"perfect 4": Math.pow(2, 4 / 7),
1693+
"augmented 4": Math.pow(2, 5 / 7),
1694+
"diminished 5": Math.pow(2, 4 / 7),
1695+
"perfect 5": Math.pow(2, 5 / 7),
1696+
"augmented 5": Math.pow(2, 6 / 7),
1697+
"minor 6": Math.pow(2, 5 / 7),
1698+
"major 6": Math.pow(2, 6 / 7),
1699+
"augmented 6": Math.pow(2, 7 / 7),
1700+
"minor 7": Math.pow(2, 6 / 7),
1701+
"major 7": Math.pow(2, 6 / 7),
1702+
"augmented 7": Math.pow(2, 7 / 7),// wraps around
1703+
"diminished 8": Math.pow(2, 7 / 7),
1704+
"perfect 8": Math.pow(2, 7 / 7),
1705+
"pitchNumber": 7,
1706+
"interval": [
1707+
"perfect 1",
1708+
"minor 2",
1709+
"major 2",
1710+
"major 3",
1711+
"perfect 4",
1712+
"perfect 5",
1713+
"major 6",
1714+
"perfect 8"
1715+
]
1716+
},
1717+
"equal19":{
1718+
// Equal 19EDO Temperament: 19 Equal Divisions of the Octave
1719+
"perfect 1": Math.pow(2, 0 / 19),
1720+
"minor 2": Math.pow(2, 2 / 19),
1721+
"augmented 1": Math.pow(2, 1 / 19),
1722+
"major 2": Math.pow(2, 3 / 19),
1723+
"augmented 2": Math.pow(2, 4 / 19),
1724+
"minor 3": Math.pow(2, 5 / 19),
1725+
"major 3": Math.pow(2, 6 / 19),
1726+
"augmented 3": Math.pow(2, 7 / 19),
1727+
"diminished 4": Math.pow(2, 7 / 19),
1728+
"perfect 4": Math.pow(2, 8 / 19),
1729+
"augmented 4": Math.pow(2, 9 / 19),
1730+
"diminished 5": Math.pow(2, 9 / 19),
1731+
"perfect 5": Math.pow(2, 10 / 19),
1732+
"augmented 5": Math.pow(2, 11 / 19),
1733+
"minor 6": Math.pow(2, 12 / 19),
1734+
"major 6": Math.pow(2, 13 / 19),
1735+
"augmented 6": Math.pow(2, 14 / 19),
1736+
"minor 7": Math.pow(2, 15 / 19),
1737+
"major 7": Math.pow(2, 16 / 19),
1738+
"augmented 7": Math.pow(2, 17 / 19),
1739+
"diminished 8": Math.pow(2, 18 / 19),
1740+
"perfect 8": Math.pow(2, 19 / 19),
1741+
"pitchNumber": 19,
1742+
"interval": [
1743+
"perfect 1",
1744+
"augmented 1",
1745+
"minor 2",
1746+
"major 2",
1747+
"augmented 2",
1748+
"minor 3",
1749+
"major 3",
1750+
"augmented 3",
1751+
"perfect 4",
1752+
"augmented 4",
1753+
"perfect 5",
1754+
"augmented 5",
1755+
"minor 6",
1756+
"major 6",
1757+
"augmented 6",
1758+
"minor 7",
1759+
"major 7",
1760+
"augmented 7",
1761+
"diminished 8",
1762+
"perfect 8",
1763+
]
1764+
},
1765+
"equal31":{
1766+
// Equal 31EDO Temperament: 31 Equal Divisions of the Octave
1767+
"perfect 1": Math.pow(2, 0 / 31),
1768+
"minor 2": Math.pow(2, 3 / 31),
1769+
"augmented 1": Math.pow(2, 2 / 31),
1770+
"major 2": Math.pow(2, 5 / 31),
1771+
"augmented 2": Math.pow(2, 6 / 31),
1772+
"minor 3": Math.pow(2, 8 / 31),
1773+
"major 3": Math.pow(2, 10 / 31),
1774+
"augmented 3": Math.pow(2, 11 / 31),
1775+
"diminished 4": Math.pow(2, 12 / 31),
1776+
"perfect 4": Math.pow(2, 13 / 31),
1777+
"augmented 4": Math.pow(2, 15 / 31),
1778+
"diminished 5": Math.pow(2, 16 / 31),
1779+
"perfect 5": Math.pow(2, 18 / 31),
1780+
"augmented 5":Math.pow(2, 19 / 31),
1781+
"minor 6": Math.pow(2, 21 / 31),
1782+
"major 6": Math.pow(2, 23 / 31),
1783+
"augmented 6": Math.pow(2, 24 / 31),
1784+
"minor 7": Math.pow(2, 26 / 31),
1785+
"major 7": Math.pow(2, 28 / 31),
1786+
"augmented 7": Math.pow(2, 29 / 31),
1787+
"diminished 8": Math.pow(2, 30 / 31),
1788+
"perfect 8": Math.pow(2, 31 / 31),
1789+
"pitchNumber": 21,
1790+
"interval": [
1791+
"perfect 1",
1792+
"augmented 1",
1793+
"minor 2",
1794+
"major 2",
1795+
"augmented 2",
1796+
"minor 3",
1797+
"major 3",
1798+
"augmented 3",
1799+
"diminished 4",
1800+
"perfect 4",
1801+
"augmented 4",
1802+
"diminished 5",
1803+
"perfect 5",
1804+
"augmented 5",
1805+
"minor 6",
1806+
"major 6",
1807+
"augmented 6",
1808+
"minor 7",
1809+
"major 7",
1810+
"augmented 7",
1811+
"diminished 8",
1812+
"perfect 8"
1813+
]
1814+
},
16341815
"just intonation": {
16351816
"perfect 1": 1 / 1,
16361817
"minor 2": 16 / 15,

0 commit comments

Comments
 (0)