←︎ mzk :: 60160fb


1
commit 60160fbb00f7dbcb34a3b17d6152a9957e77d069
2
Author: acidvegas <acid.vegas@acid.vegas>
3
Date:   Thu Jul 25 01:06:44 2019 -0400
4
5
    updated intervals with tritone
6
---
7
 mzk/constants.py | 31 +++++++++++++++----------------
8
 1 file changed, 15 insertions(+), 16 deletions(-)
9
10
diff --git a/mzk/constants.py b/mzk/constants.py
11
index 670489d..05d59f2 100644
12
--- a/mzk/constants.py
13
+++ b/mzk/constants.py
14
@@ -35,24 +35,23 @@ colors = {
15
 }
16
 
17
 intervals = {
18
-	'unison'           : {'semitones':0,  'short_name':'P1' },
19
-	'minor_second'     : {'semitones':1,  'short_name':'m2' },
20
-	'major_second'     : {'semitones':2,  'short_name':'M2' },
21
-	'minor_third'      : {'semitones':3,  'short_name':'m3' },
22
-	'major_third'      : {'semitones':4,  'short_name':'M3' },
23
-	'perfect_fourth'   : {'semitones':5,  'short_name':'P4' },
24
-	'augmented_fourth' : {'semitones':6,  'short_name':'+4' },
25
-	'diminished_fifth' : {'semitones':6,  'short_name':'d5' },
26
-	'perfect_fifth'    : {'semitones':7,  'short_name':'P5' },
27
-	'minor_sixth'      : {'semitones':8,  'short_name':'m6' },
28
-	'major_sixth'      : {'semitones':9,  'short_name':'M6' },
29
-	'minor_seventh'    : {'semitones':10, 'short_name':'m7' },
30
-	'major_seventh'    : {'semitones':11, 'short_name':'M7' },
31
-	'perfect_octave'   : {'semitones':12, 'short_name':'8va'}
32
+	'perfect_unison' : {'semitones':0,  'short_name':'P1'},
33
+	'minor_second'   : {'semitones':1,  'short_name':'m2'},
34
+	'major_second'   : {'semitones':2,  'short_name':'M2'},
35
+	'minor_third'    : {'semitones':3,  'short_name':'m3'},
36
+	'major_third'    : {'semitones':4,  'short_name':'M3'},
37
+	'perfect_fourth' : {'semitones':5,  'short_name':'P4'},
38
+	'tritone'        : {'semitones':6,  'short_name':'TT'}, # diminished fifth / augmented fourt
39
+	'perfect_fifth'  : {'semitones':7,  'short_name':'P5'},
40
+	'minor_sixth'    : {'semitones':8,  'short_name':'m6'},
41
+	'major_sixth'    : {'semitones':9,  'short_name':'M6'},
42
+	'minor_seventh'  : {'semitones':10, 'short_name':'m7'},
43
+	'major_seventh'  : {'semitones':11, 'short_name':'M7'},
44
+	'perfect_octave' : {'semitones':12, 'short_name':'P8'}
45
 }
46
 
47
-notes         = ('A', 'A#', 'B',   'C',  'C#', 'D',  'D#',  'E',    'F',  'F#', 'G',  'G#'     )
48
-numerals      = ('I', 'II', 'III', 'IV', 'V',  'VI', 'VII', 'VIII', 'IX', 'X',  'XI', 'XII'    )
49
+notes         = ('A', 'A#', 'B',   'C',  'C#', 'D',  'D#',  'E',    'F',  'F#', 'G',  'G#')
50
+numerals      = ('I', 'II', 'III', 'IV', 'V',  'VI', 'VII', 'VIII', 'IX', 'X',  'XI', 'XII')
51
 scale_degrees = ('tonic','supertonic','mediant','subdominant','dominant''submediant','subtonic')
52
 
53
 scales = {