spiffyscore: Changes On Branch 2ae36c6e68331994

Changes In Branch develop Through [2ae36c6e68] Excluding Merge-Ins

This is equivalent to a diff from 689adc054e to 2ae36c6e68

2011-11-01
18:52		Added a sampled double bass, modified the program to respond to an instrument's specified octave check-in: eb81d5f9fd user: brian tags: develop
2011-10-20
20:01		Program no longer cuts out a note from the score each time it adds a new phrase to the score check-in: 2ae36c6e68 user: brian tags: develop
19:56		Program now chooses consistent nodes based on what's specified in the grammar. A couple other bugs are still present. check-in: a9e60898b7 user: brian tags: develop
2011-06-12
20:32		Made some changes to the parser. Don't remember what. Leaf check-in: 87435601e4 user: brian tags: master
20:31		Create new branch named "develop" check-in: 9f4c4666c5 user: brian tags: develop
2011-02-10
23:50		Program generates a render order for the instruments based on their sync order check-in: 689adc054e user: brian@linux-85dd.site tags: master
22:34		Added lexical support for parens instead of quotes for chords, cleaned up the yacc parser, added lex tokens for syncopation check-in: 702d933446 user: brian@linux-85dd.site tags: master

Modified cfg.orc from [9f49be1cae] to [8f705f0ccb].

Modified cfg.py from [e9b556b4f3] to [3a0a8776ca].

Modified parse.py from [3ec57c3fbe] to [2afbfc4534].

Added score.yaml version [29fd4ba47c].

Modified test.sco from [c92bf3908c] to [e27e42951e].

Added tree.py version [29c78902c8].

1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 ~~44 45~~ 46 47 48 49 50 51 52 53 54 55 56 57 58	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62	+ + - + - + - + + - - + + +	#!/usr/bin/env python import tree from ply import lex, yacc class Note(): ~~def __init__(self, value, duration=~~.25~~, octave=8):~~ def __init__(self, value, duration=1, 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=.5, chord_type="major", octave=5):~~ def __init__(self, value, duration=1, chord_type="major", octave=5): self.value = value self.duration = duration self.chord_type = chord_type self.octave = octave def __repr__(self): return "Chord %s %s %s" % (self.value, self.duration, self.chord_type, self.octave) class Rest(): ~~def __init__(self, duration=~~.25~~):~~ def __init__(self, duration=1): self.duration = duration def __repr__(self): return "Rest node %s" % self.duration def parse(score, default_octave=8): # Tokenize (lex) tokens = ( "NOTE_LENGTH", "BASENOTE", "ACCIDENTAL", "REST", "OCTAVE", "CHORD_TYPE", "PAREN", "SYNCOPATE", "NODE", ) t_ignore = " \|" ~~#t_BASENOTE = r"[A-Ga-g]" t_BASENOTE = r"I+V?\|VI\|i+v?\|vi"~~ t_BASENOTE = r"[A-Ga-g]" # t_BASENOTE = r"I+V?\|VI\|i+v?\|vi" t_ACCIDENTAL = r"\^{1,2}\|_{1,2}\|=" t_REST = r"z" t_OCTAVE = r"'+\|,+" t_CHORD_TYPE = r"m\|7\|m7\|0\|o\|\+\|mb5\|sus\|sus4\|maj7\|mmaj7\|7sus4\|dim\|dim7\|7b5\|m7b5\|6\|b6\|m6\|mb6\|46\|maj9\|9\|add9\|7b9\|m9" t_PAREN = "\(\|\)" t_SYNCOPATE = "\+\|-" t_NODE = r"\([a-zA-Z0-9_-]+\)" def t_NOTE_LENGTH(t): r"/?\d+" multiplier = float(t.value.strip("/")) if t.value.startswith("/"): multiplier = 1/multiplier t.value = multiplier
︙
67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87	71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93	+ +	# Parse (yacc) def p_note_list(p): '''score : score note \| score chord \| score rest \| score node ''' p[0] = p[1] + [p[2]] def p_score(p): '''score : note \| chord \| rest \| node ''' p[0] = [p[1]] def p_chord_length(p): ''' chord : chord NOTE_LENGTH '''
︙
137 138 139 140 141 142 143 144 145 146 147 148 149 150	143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163	+ + + + + + +	def p_rest(p): ''' rest : REST \| REST NOTE_LENGTH ''' p[0] = Rest() if len(p) > 2: p[0].duration = p[2] def p_node(p): '''node : NODE ''' p[0] = tree.Tree(p[1].strip("(").strip(")")) def p_error(p): print p raise Exception("Syntax error at '%s' of element type %s" % (p.value, p.type)) yacc.yacc() return yacc.parse(score)







































1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39	+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +	--- chorus: core: rhythm: csound_line: i1 %(time)f %(duration)f 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6 max_duration: 80 sync: timbre octave: 7 sustain: 1 grammars: u: - (I) (ii)/4 (ii)/4 (IV)/2 (V)2 (IV) (ii) x u - (I) (vii) (III) y u - (I) (v) (IV) u u w: (i) (VII)2 (VI)/4 (V)/4 (i)/4 (VII)2 (VI) (V) w u x: (III/2) (VI)/2 (III)/2 (vii)2 (i)2 (V) u y: (I) (vi)2 (IV) (V) y y u timbre: csound_line: i3 %(time)f %(duration)f 2000 %(octave)d.%(note)s 2 3 5 3 max_duration: 80 sync: melody sustain: 1 octave: 6 grammars: u: - I2+ VII2 V2 VI2 I2 IV/2 V/2 III2 u - I2- IV2 V2 IV I V2 III2 II2. u melody: csound_line: i2 %(time)f %(duration)f 7000 %(octave)d.%(note)s 2 max_duration: 80 octave: 8 grammars: u: - I V/2 V/2 V/2 I VII - IV' I IV I VII IV w: III/4 VI/4 II/4 V/4 VI/4 IV/4 VII2 x: I/2 I/2 VI IV/2 V2 z I/2 I/2 VI IV/2 V
































1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32	+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +	import pdb class Tree(): def __init__(self, name): self.nodes = [] self.name = name def traverse_depth_first(self): all_nodes = [] for node in self.nodes: if isinstance(node, Node): all_nodes.append(node) elif isinstance(node, Tree): # pdb.set_trace() all_nodes.extend(node.traverse_depth_first()) return all_nodes def __str__(self): return str(self.__unicode__()) def __unicode__(self): return self.nodes class Node(): def __init__(self, parent, data): self.parent = parent self.data = data def __str__(self): return str(self.__unicode__()) def __unicode__(self): return self.data