music-transcription 0.15.0 → 0.16.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (26) hide show
  1. checksums.yaml +4 -4
  2. data/examples/hip.yml +88 -0
  3. data/examples/missed_connection.yml +34 -0
  4. data/examples/song1.yml +66 -0
  5. data/examples/song2.yml +22 -0
  6. data/lib/music-transcription/model/link.rb +8 -8
  7. data/lib/music-transcription/model/note.rb +1 -1
  8. data/lib/music-transcription/model/pitch.rb +66 -46
  9. data/lib/music-transcription/parsing/articulation_parsing.rb +2 -2
  10. data/lib/music-transcription/parsing/articulation_parsing.treetop +1 -1
  11. data/lib/music-transcription/parsing/link_parsing.rb +2 -2
  12. data/lib/music-transcription/parsing/link_parsing.treetop +1 -1
  13. data/lib/music-transcription/parsing/pitch_node.rb +7 -2
  14. data/lib/music-transcription/parsing/pitch_parsing.rb +103 -8
  15. data/lib/music-transcription/parsing/pitch_parsing.treetop +10 -1
  16. data/lib/music-transcription/version.rb +1 -1
  17. data/spec/model/note_spec.rb +2 -1
  18. data/spec/model/pitch_spec.rb +41 -34
  19. data/spec/parsing/articulation_parsing_spec.rb +1 -1
  20. data/spec/parsing/link_nodes_spec.rb +1 -1
  21. data/spec/parsing/link_parsing_spec.rb +4 -14
  22. data/spec/parsing/note_node_spec.rb +1 -1
  23. data/spec/parsing/note_parsing_spec.rb +6 -6
  24. data/spec/parsing/pitch_node_spec.rb +6 -0
  25. data/spec/parsing/pitch_parsing_spec.rb +5 -14
  26. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2b53782c68a60ec01fd23022b00fa7ee67a76c6c
4
- data.tar.gz: 22433554e9566a3841800f4ab757268160e2b5f1
3
+ metadata.gz: 7c2fc709b232296837b37e177d25e0137463190d
4
+ data.tar.gz: 81a65dbc071f0d8348639ac3d62a1d24f1228cf5
5
5
  SHA512:
6
- metadata.gz: b6fc8591be37735700427c607dac2cc71706287eb704e9179a4077c99a92d6a7f03c70ee3c9ded54115f5f0a54ad444640bc8cb85c206be849a0e32261fdc34c
7
- data.tar.gz: 5c9bc76ed55f0f729fbf0caf384c7aaad4aa0e3f9f72961995d1bb3cf2f78604b0f3ffcc268bacb2f7eae055a63e9736f265e1377f0cbc8ece39bab2af20616a
6
+ metadata.gz: cbce6472afdf023f80b0f96a8b504a07d7d45ad52eb669cb8364c63a088846c6c0abf05b6159bd92d77af5ce7452a8ab2054a8e590ab891ac189aa40e70a48b0
7
+ data.tar.gz: 926ddd4d1255da7023bf38dcbe60c51cf89b03e8cf1abf3383485d2cab6df61df0e79219d304b41af9a2ee3953d5586ab410ab39bb4dfabcbb7c5215c4d9e3fd
data/examples/hip.yml CHANGED
@@ -21,6 +21,8 @@ parts:
21
21
  - !ruby/object:Music::Transcription::Pitch
22
22
  octave: 3
23
23
  semitone: 10
24
+ cent: 0
25
+ total_cents: 4600
24
26
  articulation: :normal
25
27
  accented: false
26
28
  links: {}
@@ -40,6 +42,8 @@ parts:
40
42
  - &1 !ruby/object:Music::Transcription::Pitch
41
43
  octave: 4
42
44
  semitone: 1
45
+ cent: 0
46
+ total_cents: 4900
43
47
  articulation: :normal
44
48
  accented: false
45
49
  links:
@@ -52,6 +56,8 @@ parts:
52
56
  - &2 !ruby/object:Music::Transcription::Pitch
53
57
  octave: 4
54
58
  semitone: 1
59
+ cent: 0
60
+ total_cents: 4900
55
61
  articulation: :normal
56
62
  accented: false
57
63
  links:
@@ -64,6 +70,8 @@ parts:
64
70
  - !ruby/object:Music::Transcription::Pitch
65
71
  octave: 4
66
72
  semitone: 1
73
+ cent: 0
74
+ total_cents: 4900
67
75
  articulation: :normal
68
76
  accented: false
69
77
  links: {}
@@ -75,6 +83,8 @@ parts:
75
83
  - !ruby/object:Music::Transcription::Pitch
76
84
  octave: 4
77
85
  semitone: 3
86
+ cent: 0
87
+ total_cents: 5100
78
88
  articulation: :normal
79
89
  accented: false
80
90
  links: {}
@@ -86,6 +96,8 @@ parts:
86
96
  - !ruby/object:Music::Transcription::Pitch
87
97
  octave: 4
88
98
  semitone: 1
99
+ cent: 0
100
+ total_cents: 4900
89
101
  articulation: :normal
90
102
  accented: false
91
103
  links: {}
@@ -97,6 +109,8 @@ parts:
97
109
  - !ruby/object:Music::Transcription::Pitch
98
110
  octave: 3
99
111
  semitone: 8
112
+ cent: 0
113
+ total_cents: 4400
100
114
  articulation: :normal
101
115
  accented: false
102
116
  links: {}
@@ -108,6 +122,8 @@ parts:
108
122
  - !ruby/object:Music::Transcription::Pitch
109
123
  octave: 4
110
124
  semitone: 1
125
+ cent: 0
126
+ total_cents: 4900
111
127
  articulation: :normal
112
128
  accented: false
113
129
  links: {}
@@ -119,6 +135,8 @@ parts:
119
135
  - !ruby/object:Music::Transcription::Pitch
120
136
  octave: 3
121
137
  semitone: 10
138
+ cent: 0
139
+ total_cents: 4600
122
140
  articulation: :normal
123
141
  accented: false
124
142
  links: {}
@@ -138,6 +156,8 @@ parts:
138
156
  - &3 !ruby/object:Music::Transcription::Pitch
139
157
  octave: 4
140
158
  semitone: 1
159
+ cent: 0
160
+ total_cents: 4900
141
161
  articulation: :normal
142
162
  accented: false
143
163
  links:
@@ -150,6 +170,8 @@ parts:
150
170
  - &4 !ruby/object:Music::Transcription::Pitch
151
171
  octave: 4
152
172
  semitone: 1
173
+ cent: 0
174
+ total_cents: 4900
153
175
  articulation: :normal
154
176
  accented: false
155
177
  links:
@@ -162,6 +184,8 @@ parts:
162
184
  - !ruby/object:Music::Transcription::Pitch
163
185
  octave: 4
164
186
  semitone: 1
187
+ cent: 0
188
+ total_cents: 4900
165
189
  articulation: :slur
166
190
  accented: false
167
191
  links: {}
@@ -173,6 +197,8 @@ parts:
173
197
  - !ruby/object:Music::Transcription::Pitch
174
198
  octave: 4
175
199
  semitone: 0
200
+ cent: 0
201
+ total_cents: 4800
176
202
  articulation: :normal
177
203
  accented: false
178
204
  links: {}
@@ -184,6 +210,8 @@ parts:
184
210
  - !ruby/object:Music::Transcription::Pitch
185
211
  octave: 4
186
212
  semitone: 0
213
+ cent: 0
214
+ total_cents: 4800
187
215
  articulation: :normal
188
216
  accented: false
189
217
  links: {}
@@ -203,12 +231,16 @@ parts:
203
231
  - !ruby/object:Music::Transcription::Pitch
204
232
  octave: 4
205
233
  semitone: 3
234
+ cent: 0
235
+ total_cents: 5100
206
236
  articulation: :normal
207
237
  accented: false
208
238
  links:
209
239
  ? !ruby/object:Music::Transcription::Pitch
210
240
  octave: 4
211
241
  semitone: 3
242
+ cent: 0
243
+ total_cents: 5100
212
244
  : !ruby/object:Music::Transcription::Link::Tie {}
213
245
  - !ruby/object:Music::Transcription::Note
214
246
  duration: !ruby/object:Rational
@@ -218,12 +250,16 @@ parts:
218
250
  - !ruby/object:Music::Transcription::Pitch
219
251
  octave: 4
220
252
  semitone: 3
253
+ cent: 0
254
+ total_cents: 5100
221
255
  articulation: :normal
222
256
  accented: false
223
257
  links:
224
258
  ? !ruby/object:Music::Transcription::Pitch
225
259
  octave: 4
226
260
  semitone: 3
261
+ cent: 0
262
+ total_cents: 5100
227
263
  : !ruby/object:Music::Transcription::Link::Tie {}
228
264
  - !ruby/object:Music::Transcription::Note
229
265
  duration: !ruby/object:Rational
@@ -233,6 +269,8 @@ parts:
233
269
  - !ruby/object:Music::Transcription::Pitch
234
270
  octave: 4
235
271
  semitone: 3
272
+ cent: 0
273
+ total_cents: 5100
236
274
  articulation: :normal
237
275
  accented: false
238
276
  links: {}
@@ -244,6 +282,8 @@ parts:
244
282
  - !ruby/object:Music::Transcription::Pitch
245
283
  octave: 4
246
284
  semitone: 5
285
+ cent: 0
286
+ total_cents: 5300
247
287
  articulation: :normal
248
288
  accented: false
249
289
  links: {}
@@ -255,6 +295,8 @@ parts:
255
295
  - !ruby/object:Music::Transcription::Pitch
256
296
  octave: 4
257
297
  semitone: 3
298
+ cent: 0
299
+ total_cents: 5100
258
300
  articulation: :normal
259
301
  accented: false
260
302
  links: {}
@@ -266,6 +308,8 @@ parts:
266
308
  - !ruby/object:Music::Transcription::Pitch
267
309
  octave: 3
268
310
  semitone: 10
311
+ cent: 0
312
+ total_cents: 4600
269
313
  articulation: :normal
270
314
  accented: false
271
315
  links: {}
@@ -277,6 +321,8 @@ parts:
277
321
  - !ruby/object:Music::Transcription::Pitch
278
322
  octave: 4
279
323
  semitone: 3
324
+ cent: 0
325
+ total_cents: 5100
280
326
  articulation: :normal
281
327
  accented: false
282
328
  links: {}
@@ -288,6 +334,8 @@ parts:
288
334
  - !ruby/object:Music::Transcription::Pitch
289
335
  octave: 4
290
336
  semitone: 0
337
+ cent: 0
338
+ total_cents: 4800
291
339
  articulation: :normal
292
340
  accented: false
293
341
  links: {}
@@ -307,12 +355,16 @@ parts:
307
355
  - !ruby/object:Music::Transcription::Pitch
308
356
  octave: 4
309
357
  semitone: 3
358
+ cent: 0
359
+ total_cents: 5100
310
360
  articulation: :normal
311
361
  accented: false
312
362
  links:
313
363
  ? !ruby/object:Music::Transcription::Pitch
314
364
  octave: 4
315
365
  semitone: 3
366
+ cent: 0
367
+ total_cents: 5100
316
368
  : !ruby/object:Music::Transcription::Link::Tie {}
317
369
  - !ruby/object:Music::Transcription::Note
318
370
  duration: !ruby/object:Rational
@@ -322,12 +374,16 @@ parts:
322
374
  - !ruby/object:Music::Transcription::Pitch
323
375
  octave: 4
324
376
  semitone: 3
377
+ cent: 0
378
+ total_cents: 5100
325
379
  articulation: :normal
326
380
  accented: false
327
381
  links:
328
382
  ? !ruby/object:Music::Transcription::Pitch
329
383
  octave: 4
330
384
  semitone: 3
385
+ cent: 0
386
+ total_cents: 5100
331
387
  : !ruby/object:Music::Transcription::Link::Tie {}
332
388
  - !ruby/object:Music::Transcription::Note
333
389
  duration: !ruby/object:Rational
@@ -337,6 +393,8 @@ parts:
337
393
  - !ruby/object:Music::Transcription::Pitch
338
394
  octave: 4
339
395
  semitone: 3
396
+ cent: 0
397
+ total_cents: 5100
340
398
  articulation: :slur
341
399
  accented: false
342
400
  links: {}
@@ -348,6 +406,8 @@ parts:
348
406
  - !ruby/object:Music::Transcription::Pitch
349
407
  octave: 4
350
408
  semitone: 2
409
+ cent: 0
410
+ total_cents: 5000
351
411
  articulation: :normal
352
412
  accented: false
353
413
  links: {}
@@ -363,6 +423,8 @@ parts:
363
423
  - !ruby/object:Music::Transcription::Pitch
364
424
  octave: 2
365
425
  semitone: 10
426
+ cent: 0
427
+ total_cents: 3400
366
428
  articulation: :normal
367
429
  accented: false
368
430
  links: {}
@@ -382,6 +444,8 @@ parts:
382
444
  - !ruby/object:Music::Transcription::Pitch
383
445
  octave: 2
384
446
  semitone: 8
447
+ cent: 0
448
+ total_cents: 3200
385
449
  articulation: :normal
386
450
  accented: false
387
451
  links: {}
@@ -393,6 +457,8 @@ parts:
393
457
  - !ruby/object:Music::Transcription::Pitch
394
458
  octave: 2
395
459
  semitone: 5
460
+ cent: 0
461
+ total_cents: 2900
396
462
  articulation: :normal
397
463
  accented: false
398
464
  links: {}
@@ -404,6 +470,8 @@ parts:
404
470
  - !ruby/object:Music::Transcription::Pitch
405
471
  octave: 2
406
472
  semitone: 8
473
+ cent: 0
474
+ total_cents: 3200
407
475
  articulation: :normal
408
476
  accented: false
409
477
  links: {}
@@ -415,6 +483,8 @@ parts:
415
483
  - !ruby/object:Music::Transcription::Pitch
416
484
  octave: 2
417
485
  semitone: 10
486
+ cent: 0
487
+ total_cents: 3400
418
488
  articulation: :normal
419
489
  accented: false
420
490
  links: {}
@@ -434,6 +504,8 @@ parts:
434
504
  - !ruby/object:Music::Transcription::Pitch
435
505
  octave: 2
436
506
  semitone: 8
507
+ cent: 0
508
+ total_cents: 3200
437
509
  articulation: :normal
438
510
  accented: false
439
511
  links: {}
@@ -445,6 +517,8 @@ parts:
445
517
  - !ruby/object:Music::Transcription::Pitch
446
518
  octave: 2
447
519
  semitone: 8
520
+ cent: 0
521
+ total_cents: 3200
448
522
  articulation: :normal
449
523
  accented: false
450
524
  links: {}
@@ -456,6 +530,8 @@ parts:
456
530
  - !ruby/object:Music::Transcription::Pitch
457
531
  octave: 3
458
532
  semitone: 0
533
+ cent: 0
534
+ total_cents: 3600
459
535
  articulation: :normal
460
536
  accented: false
461
537
  links: {}
@@ -475,6 +551,8 @@ parts:
475
551
  - !ruby/object:Music::Transcription::Pitch
476
552
  octave: 2
477
553
  semitone: 10
554
+ cent: 0
555
+ total_cents: 3400
478
556
  articulation: :normal
479
557
  accented: false
480
558
  links: {}
@@ -486,6 +564,8 @@ parts:
486
564
  - !ruby/object:Music::Transcription::Pitch
487
565
  octave: 2
488
566
  semitone: 7
567
+ cent: 0
568
+ total_cents: 3100
489
569
  articulation: :normal
490
570
  accented: false
491
571
  links: {}
@@ -497,6 +577,8 @@ parts:
497
577
  - !ruby/object:Music::Transcription::Pitch
498
578
  octave: 2
499
579
  semitone: 10
580
+ cent: 0
581
+ total_cents: 3400
500
582
  articulation: :normal
501
583
  accented: false
502
584
  links: {}
@@ -508,6 +590,8 @@ parts:
508
590
  - !ruby/object:Music::Transcription::Pitch
509
591
  octave: 3
510
592
  semitone: 0
593
+ cent: 0
594
+ total_cents: 3600
511
595
  articulation: :normal
512
596
  accented: false
513
597
  links: {}
@@ -527,6 +611,8 @@ parts:
527
611
  - !ruby/object:Music::Transcription::Pitch
528
612
  octave: 2
529
613
  semitone: 10
614
+ cent: 0
615
+ total_cents: 3400
530
616
  articulation: :normal
531
617
  accented: false
532
618
  links: {}
@@ -538,6 +624,8 @@ parts:
538
624
  - !ruby/object:Music::Transcription::Pitch
539
625
  octave: 2
540
626
  semitone: 10
627
+ cent: 0
628
+ total_cents: 3400
541
629
  articulation: :normal
542
630
  accented: false
543
631
  links: {}
data/examples/missed_connection.yml CHANGED
@@ -21,6 +21,8 @@ parts:
21
21
  - !ruby/object:Music::Transcription::Pitch
22
22
  octave: 2
23
23
  semitone: 3
24
+ cent: 0
25
+ total_cents: 2700
24
26
  articulation: :normal
25
27
  accented: false
26
28
  links: {}
@@ -40,6 +42,8 @@ parts:
40
42
  - !ruby/object:Music::Transcription::Pitch
41
43
  octave: 2
42
44
  semitone: 10
45
+ cent: 0
46
+ total_cents: 3400
43
47
  articulation: :normal
44
48
  accented: false
45
49
  links: {}
@@ -59,6 +63,8 @@ parts:
59
63
  - !ruby/object:Music::Transcription::Pitch
60
64
  octave: 2
61
65
  semitone: 3
66
+ cent: 0
67
+ total_cents: 2700
62
68
  articulation: :normal
63
69
  accented: false
64
70
  links: {}
@@ -78,6 +84,8 @@ parts:
78
84
  - !ruby/object:Music::Transcription::Pitch
79
85
  octave: 2
80
86
  semitone: 11
87
+ cent: 0
88
+ total_cents: 3500
81
89
  articulation: :normal
82
90
  accented: false
83
91
  links: {}
@@ -89,6 +97,8 @@ parts:
89
97
  - !ruby/object:Music::Transcription::Pitch
90
98
  octave: 2
91
99
  semitone: 10
100
+ cent: 0
101
+ total_cents: 3400
92
102
  articulation: :normal
93
103
  accented: false
94
104
  links: {}
@@ -100,6 +110,8 @@ parts:
100
110
  - !ruby/object:Music::Transcription::Pitch
101
111
  octave: 2
102
112
  semitone: 8
113
+ cent: 0
114
+ total_cents: 3200
103
115
  articulation: :normal
104
116
  accented: false
105
117
  links: {}
@@ -111,6 +123,8 @@ parts:
111
123
  - !ruby/object:Music::Transcription::Pitch
112
124
  octave: 2
113
125
  semitone: 10
126
+ cent: 0
127
+ total_cents: 3400
114
128
  articulation: :normal
115
129
  accented: false
116
130
  links: {}
@@ -130,6 +144,8 @@ parts:
130
144
  - &1 !ruby/object:Music::Transcription::Pitch
131
145
  octave: 3
132
146
  semitone: 5
147
+ cent: 0
148
+ total_cents: 4100
133
149
  articulation: :normal
134
150
  accented: false
135
151
  links:
@@ -142,6 +158,8 @@ parts:
142
158
  - !ruby/object:Music::Transcription::Pitch
143
159
  octave: 3
144
160
  semitone: 5
161
+ cent: 0
162
+ total_cents: 4100
145
163
  articulation: :normal
146
164
  accented: false
147
165
  links: {}
@@ -153,6 +171,8 @@ parts:
153
171
  - !ruby/object:Music::Transcription::Pitch
154
172
  octave: 2
155
173
  semitone: 10
174
+ cent: 0
175
+ total_cents: 3400
156
176
  articulation: :normal
157
177
  accented: false
158
178
  links: {}
@@ -172,6 +192,8 @@ parts:
172
192
  - &2 !ruby/object:Music::Transcription::Pitch
173
193
  octave: 3
174
194
  semitone: 5
195
+ cent: 0
196
+ total_cents: 4100
175
197
  articulation: :normal
176
198
  accented: false
177
199
  links:
@@ -184,6 +206,8 @@ parts:
184
206
  - !ruby/object:Music::Transcription::Pitch
185
207
  octave: 3
186
208
  semitone: 5
209
+ cent: 0
210
+ total_cents: 4100
187
211
  articulation: :normal
188
212
  accented: false
189
213
  links: {}
@@ -195,6 +219,8 @@ parts:
195
219
  - !ruby/object:Music::Transcription::Pitch
196
220
  octave: 2
197
221
  semitone: 11
222
+ cent: 0
223
+ total_cents: 3500
198
224
  articulation: :normal
199
225
  accented: false
200
226
  links: {}
@@ -214,6 +240,8 @@ parts:
214
240
  - &3 !ruby/object:Music::Transcription::Pitch
215
241
  octave: 3
216
242
  semitone: 6
243
+ cent: 0
244
+ total_cents: 4200
217
245
  articulation: :normal
218
246
  accented: false
219
247
  links:
@@ -226,6 +254,8 @@ parts:
226
254
  - !ruby/object:Music::Transcription::Pitch
227
255
  octave: 3
228
256
  semitone: 6
257
+ cent: 0
258
+ total_cents: 4200
229
259
  articulation: :normal
230
260
  accented: false
231
261
  links: {}
@@ -245,6 +275,8 @@ parts:
245
275
  - &4 !ruby/object:Music::Transcription::Pitch
246
276
  octave: 3
247
277
  semitone: 6
278
+ cent: 0
279
+ total_cents: 4200
248
280
  articulation: :normal
249
281
  accented: false
250
282
  links:
@@ -257,6 +289,8 @@ parts:
257
289
  - !ruby/object:Music::Transcription::Pitch
258
290
  octave: 3
259
291
  semitone: 6
292
+ cent: 0
293
+ total_cents: 4200
260
294
  articulation: :normal
261
295
  accented: false
262
296
  links: {}