@@ -2,20 +2,20 @@ import tree from ply import lex, yacc class Note(): - def __init__(self, value, duration=1 octave=8): + def __init__(self, value, duration=.25, octave=8): self.value = value self.duration = duration self.octave = octave self.accidental = None def __repr__(self): return "Note %s %s %s" % (self.value, self.duration, self.octave) class Chord(): - def __init__(self, value, duration=1, chord_type="major", octave=5): + def __init__(self, value, duration=.25, chord_type="major", octave=5): self.value = value self.duration = duration self.chord_type = chord_type self.octave = octave def __repr__(self): @@ -110,11 +110,11 @@ def p_chord_length(p): ''' chord : chord NOTE_LENGTH ''' new_note = p[1] - new_note.duration = p[2] + new_note.duration = 4*p[2] p[0] = new_note def p_chord(p): '''chord : QUOTE pitch QUOTE @@ -150,11 +150,11 @@ ''' rest : REST | REST NOTE_LENGTH ''' p[0] = Rest() if len(p) > 2: - p[0].duration = p[2] + p[0].duration = 4*p[2] def p_node(p): '''node : NODE ''' p[0] = tree.Tree(p[1].strip("(").strip(")"))