head_music 2.0.1 → 3.0.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -0
  3. data/.ruby-version +1 -1
  4. data/Gemfile +1 -1
  5. data/head_music.gemspec +6 -5
  6. data/lib/head_music/data/instruments.yml +101 -101
  7. data/lib/head_music/instrument.rb +8 -8
  8. data/lib/head_music/instrument_family.rb +1 -1
  9. data/lib/head_music/staff.rb +3 -3
  10. data/lib/head_music/version.rb +1 -1
  11. metadata +13 -13
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c2b4bf3672dec05430ee66153014df39ebd585bdfe683d1269d31f32fb2b6c13
4
- data.tar.gz: 4516d7312a57ff182e33620dfb1169761f0d2fe2030979379ecf2412144ca101
3
+ metadata.gz: e24f2d3952bb3322fd0b1407b680057f9582b6846829b461ad8dafdbfc046e0d
4
+ data.tar.gz: 22c5d7cdc649049693165f1d45199232fa45b5edb80db5bfe8a43eaea5f2bb26
5
5
  SHA512:
6
- metadata.gz: 6219c398ddbdf7245fee263e916d299ae518b158883761fb7e89894808fa91142008f66c883007d715625d150806b520cab3e3418d87b955e02d4862c03ad3c8
7
- data.tar.gz: 6c67afe62906e12ea8b4c91e2ef27ed99d41b3c501d2999369ed6cd5df9430c9ac5fec4fa1c33d9d1e4b2399930ca0fadcdac4bcbd4842ec433aa1477aaf824d
6
+ metadata.gz: 54dcd45c4a537408c12f8e2b8ebcf9651d23775203ff7f9eef2240a9f95c37bb43fc8245e9cde782d3987ea925ff172f18a85c8d5cdddf493a42f70ea327c4fc
7
+ data.tar.gz: 826fe8c679a0ff354cd92e9332115953e14388a2027cc764c97ba6cf71d0fc40abefcfb5e4958a82cd76f76b883e6a86131c78cbe10c7cba23f754c3695ed480
data/.gitignore CHANGED
@@ -8,3 +8,4 @@
8
8
  /spec/reports/
9
9
  /tmp/
10
10
  /spec/examples.txt
11
+ *.gem
data/.ruby-version CHANGED
@@ -1 +1 @@
1
- 3.1.4
1
+ 3.2.2
data/Gemfile CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  source "https://rubygems.org"
4
4
 
5
- ruby "3.1.4"
5
+ ruby "3.2.2"
6
6
 
7
7
  # Specify your gem's dependencies in head_music.gemspec
8
8
  gemspec
data/head_music.gemspec CHANGED
@@ -16,19 +16,20 @@ Gem::Specification.new do |spec|
16
16
  spec.license = "MIT"
17
17
 
18
18
  spec.files = `git ls-files -z`.split("\x0").reject do |f|
19
- f.match(%r{^(test|spec|features)/})
19
+ f.match(%r{^(test|spec|features)/}) || f.match(/\.gem$/)
20
20
  end
21
+
21
22
  spec.bindir = "exe"
22
23
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
23
24
  spec.require_paths = ["lib"]
24
25
 
25
- spec.required_ruby_version = ">= 2.5"
26
+ spec.required_ruby_version = ">= 3.0"
26
27
 
27
- spec.add_runtime_dependency "activesupport", "> 5.0"
28
- spec.add_runtime_dependency "humanize", "~> 1.3"
28
+ spec.add_runtime_dependency "activesupport", "~> 7.0"
29
+ spec.add_runtime_dependency "humanize", "~> 2.0"
29
30
  spec.add_runtime_dependency "i18n", "~> 1.8"
30
31
 
31
- spec.add_development_dependency "rake", ">= 12.3.3"
32
+ spec.add_development_dependency "rake", "~> 13.0"
32
33
  spec.add_development_dependency "rspec", "~> 3.0"
33
34
  spec.add_development_dependency "rspec-its", "~> 1.2"
34
35
  end
data/lib/head_music/data/instruments.yml CHANGED
@@ -3,7 +3,7 @@ accordian:
3
3
  family_key: accordion
4
4
  notation:
5
5
  default:
6
- staffs:
6
+ staves:
7
7
  - clef: treble
8
8
  - clef: bass
9
9
  alto_clarinet:
@@ -12,7 +12,7 @@ alto_clarinet:
12
12
  family_key: clarinet
13
13
  notation:
14
14
  default:
15
- staffs:
15
+ staves:
16
16
  - clef: treble
17
17
  transposition: -9
18
18
  alto_flute:
@@ -21,7 +21,7 @@ alto_flute:
21
21
  family_key: flute
22
22
  notation:
23
23
  default:
24
- staffs:
24
+ staves:
25
25
  - clef: treble
26
26
  transposition: -5
27
27
  alto_voice:
@@ -31,7 +31,7 @@ alto_voice:
31
31
  family_key: voice
32
32
  notation:
33
33
  default:
34
- staffs:
34
+ staves:
35
35
  - clef: treble
36
36
  range_category:
37
37
  - alto
@@ -42,7 +42,7 @@ arpeggione:
42
42
  - string
43
43
  notation:
44
44
  default:
45
- staffs:
45
+ staves:
46
46
  - clef: treble
47
47
  transposition: -12
48
48
  orchestra_section: string
@@ -53,7 +53,7 @@ great_highland_bagpipe:
53
53
  family_key: bagpipe
54
54
  notation:
55
55
  default:
56
- staffs:
56
+ staves:
57
57
  - clef: treble
58
58
  transposition: 1
59
59
  banjo:
@@ -64,7 +64,7 @@ banjo:
64
64
  orchestra_section: string
65
65
  notation:
66
66
  default:
67
- staffs:
67
+ staves:
68
68
  - clef: treble
69
69
  transposition: -12
70
70
  baritone_horn:
@@ -73,18 +73,18 @@ baritone_horn:
73
73
  family_key: saxhorn
74
74
  notation:
75
75
  alternates:
76
- - staffs:
76
+ - staves:
77
77
  - clef: treble
78
78
  transposition: -14
79
79
  default:
80
- staffs:
80
+ staves:
81
81
  - clef: bass
82
82
  transposition: 0
83
83
  baritone_voice:
84
84
  family_key: voice
85
85
  notation:
86
86
  default:
87
- staffs:
87
+ staves:
88
88
  - clef: bass
89
89
  range_category:
90
90
  - baritone
@@ -94,11 +94,11 @@ bass_clarinet:
94
94
  family_key: clarinet
95
95
  notation:
96
96
  alternates:
97
- - staffs:
97
+ - staves:
98
98
  - clef: bass
99
99
  transposition: -2
100
100
  default:
101
- staffs:
101
+ staves:
102
102
  - clef: treble
103
103
  transposition: -14
104
104
  bass_drum:
@@ -107,14 +107,14 @@ bass_drum:
107
107
  - membranophone
108
108
  notation:
109
109
  default:
110
- staffs:
110
+ staves:
111
111
  - clef: percussion
112
112
  orchestra_section: percussion
113
113
  bass_guitar:
114
114
  family_key: guitar
115
115
  notation:
116
116
  default:
117
- staffs:
117
+ staves:
118
118
  - clef: bass
119
119
  transposition: -12
120
120
  bass_oboe:
@@ -123,7 +123,7 @@ bass_oboe:
123
123
  family_key: oboe
124
124
  notation:
125
125
  default:
126
- staffs:
126
+ staves:
127
127
  - clef: treble
128
128
  bass_trombone:
129
129
  fundamental_pitch_spelling:
@@ -131,7 +131,7 @@ bass_trombone:
131
131
  family_key: trombone
132
132
  notation:
133
133
  default:
134
- staffs:
134
+ staves:
135
135
  - clef: bass
136
136
  bass_trumpet_in_b_flat:
137
137
  alias_name_keys:
@@ -141,7 +141,7 @@ bass_trumpet_in_b_flat:
141
141
  family_key: trumpet
142
142
  notation:
143
143
  default:
144
- staffs:
144
+ staves:
145
145
  - clef: treble
146
146
  transposition: -14
147
147
  bass_trumpet_in_c:
@@ -152,7 +152,7 @@ bass_trumpet_in_c:
152
152
  family_key: trumpet
153
153
  notation:
154
154
  default:
155
- staffs:
155
+ staves:
156
156
  - clef: treble
157
157
  transposition: -12
158
158
  bass_trumpet_in_e_flat:
@@ -161,7 +161,7 @@ bass_trumpet_in_e_flat:
161
161
  family_key: trumpet
162
162
  notation:
163
163
  default:
164
- staffs:
164
+ staves:
165
165
  - clef: treble
166
166
  transposition: -9
167
167
  bass_tuba_in_e_flat:
@@ -172,7 +172,7 @@ bass_tuba_in_e_flat:
172
172
  family_key: tuba
173
173
  notation:
174
174
  default:
175
- staffs:
175
+ staves:
176
176
  - clef: bass
177
177
  bass_tuba_in_f:
178
178
  alias_name_keys:
@@ -182,13 +182,13 @@ bass_tuba_in_f:
182
182
  family_key: tuba
183
183
  notation:
184
184
  default:
185
- staffs:
185
+ staves:
186
186
  - clef: bass
187
187
  bass_voice:
188
188
  family_key: voice
189
189
  notation:
190
190
  default:
191
- staffs:
191
+ staves:
192
192
  - clef: bass
193
193
  range_category:
194
194
  - bass
@@ -198,7 +198,7 @@ basset_horn:
198
198
  family_key: clarinet
199
199
  notation:
200
200
  default:
201
- staffs:
201
+ staves:
202
202
  - clef: treble
203
203
  transposition: -7
204
204
  bassoon:
@@ -207,7 +207,7 @@ bassoon:
207
207
  family_key: bassoon
208
208
  notation:
209
209
  default:
210
- staffs:
210
+ staves:
211
211
  - clef: bass
212
212
  bugle:
213
213
  fundamental_pitch_spelling:
@@ -215,7 +215,7 @@ bugle:
215
215
  family_key: trumpet
216
216
  notation:
217
217
  default:
218
- staffs:
218
+ staves:
219
219
  - clef: treble
220
220
  transposition: -5
221
221
  bugle_in_b_flat:
@@ -224,7 +224,7 @@ bugle_in_b_flat:
224
224
  family_key: trumpet
225
225
  notation:
226
226
  default:
227
- staffs:
227
+ staves:
228
228
  - clef: treble
229
229
  transposition: -2
230
230
  castanets:
@@ -233,7 +233,7 @@ castanets:
233
233
  - idiophone
234
234
  notation:
235
235
  default:
236
- staffs:
236
+ staves:
237
237
  - clef: percussion
238
238
  orchestra_section: percussion
239
239
  celesta:
@@ -243,7 +243,7 @@ celesta:
243
243
  - idiophone
244
244
  notation:
245
245
  default:
246
- staffs:
246
+ staves:
247
247
  - clef: treble
248
248
  name_key: right_hand
249
249
  - clef: bass
@@ -255,7 +255,7 @@ cello:
255
255
  family_key: violin
256
256
  notation:
257
257
  default:
258
- staffs:
258
+ staves:
259
259
  - clef: bass
260
260
  chimes:
261
261
  alias_name_keys:
@@ -266,7 +266,7 @@ chimes:
266
266
  - idiophone
267
267
  notation:
268
268
  default:
269
- staffs:
269
+ staves:
270
270
  - clef: treble
271
271
  orchestra_section: percussion
272
272
  cimbalom:
@@ -277,7 +277,7 @@ cimbalom:
277
277
  - plucked
278
278
  notation:
279
279
  default:
280
- staffs:
280
+ staves:
281
281
  - clef: treble
282
282
  - clef: bass
283
283
  orchestra_section: string
@@ -289,7 +289,7 @@ clarinet:
289
289
  family_key: clarinet
290
290
  notation:
291
291
  default:
292
- staffs:
292
+ staves:
293
293
  - clef: treble
294
294
  transposition: -2
295
295
  clarinet_in_a:
@@ -300,7 +300,7 @@ clarinet_in_a:
300
300
  family_key: clarinet
301
301
  notation:
302
302
  default:
303
- staffs:
303
+ staves:
304
304
  - clef: treble
305
305
  transposition: -3
306
306
  clarinet_in_c:
@@ -311,7 +311,7 @@ clarinet_in_c:
311
311
  family_key: clarinet
312
312
  notation:
313
313
  default:
314
- staffs:
314
+ staves:
315
315
  - clef: treble
316
316
  transposition: 0
317
317
  clarinet_in_d:
@@ -322,7 +322,7 @@ clarinet_in_d:
322
322
  family_key: clarinet
323
323
  notation:
324
324
  default:
325
- staffs:
325
+ staves:
326
326
  - clef: treble
327
327
  transposition: 2
328
328
  clarinet_in_e_flat:
@@ -333,19 +333,19 @@ clarinet_in_e_flat:
333
333
  family_key: clarinet
334
334
  notation:
335
335
  default:
336
- staffs:
336
+ staves:
337
337
  - clef: treble
338
338
  transposition: 3
339
339
  clash_cymbals:
340
340
  family_key: cymbal
341
341
  notation:
342
342
  default:
343
- staffs:
343
+ staves:
344
344
  - clef: percussion
345
345
  clavichord:
346
346
  notation:
347
347
  default:
348
- staffs:
348
+ staves:
349
349
  - clef: treble
350
350
  name_key: right_hand
351
351
  - clef: bass
@@ -356,14 +356,14 @@ contrabass_clarinet:
356
356
  family_key: clarinet
357
357
  notation:
358
358
  default:
359
- staffs:
359
+ staves:
360
360
  - clef: treble
361
361
  transposition: -26
362
362
  contrabassoon:
363
363
  family_key: bassoon
364
364
  notation:
365
365
  default:
366
- staffs:
366
+ staves:
367
367
  - clef: bass
368
368
  transposition: -12
369
369
  cor_anglais:
@@ -372,7 +372,7 @@ cor_anglais:
372
372
  family_key: oboe
373
373
  notation:
374
374
  default:
375
- staffs:
375
+ staves:
376
376
  - clef: treble
377
377
  transposition: -7
378
378
  cornet:
@@ -381,14 +381,14 @@ cornet:
381
381
  family_key: cornet
382
382
  notation:
383
383
  default:
384
- staffs:
384
+ staves:
385
385
  - clef: treble
386
386
  transposition: -2
387
387
  countertenor_voice:
388
388
  family_key: voice
389
389
  notation:
390
390
  default:
391
- staffs:
391
+ staves:
392
392
  - clef: treble
393
393
  range_category:
394
394
  - alto
@@ -398,7 +398,7 @@ cowbell:
398
398
  - idiophone
399
399
  notation:
400
400
  default:
401
- staffs:
401
+ staves:
402
402
  - clef: percussion
403
403
  orchestra_section: percussion
404
404
  crotales:
@@ -407,14 +407,14 @@ crotales:
407
407
  - idiophone
408
408
  notation:
409
409
  default:
410
- staffs:
410
+ staves:
411
411
  - clef: percussion
412
412
  orchestra_section: percussion
413
413
  cymbal:
414
414
  family_key: cymbal
415
415
  notation:
416
416
  default:
417
- staffs:
417
+ staves:
418
418
  - clef: percussion
419
419
  double_bass:
420
420
  alias_name_keys:
@@ -422,7 +422,7 @@ double_bass:
422
422
  - string_bass
423
423
  notation:
424
424
  default:
425
- staffs:
425
+ staves:
426
426
  - clef: bass
427
427
  transposition: -12
428
428
  euphonium:
@@ -434,11 +434,11 @@ euphonium:
434
434
  - wind
435
435
  notation:
436
436
  alternates:
437
- - staffs:
437
+ - staves:
438
438
  - clef: treble
439
439
  transposition: -14
440
440
  default:
441
- staffs:
441
+ staves:
442
442
  - clef: bass
443
443
  transposition: 0
444
444
  orchestra_section: brass
@@ -448,14 +448,14 @@ flugelhorn:
448
448
  family_key: saxhorn
449
449
  notation:
450
450
  default:
451
- staffs:
451
+ staves:
452
452
  - clef: treble
453
453
  transposition: -2
454
454
  flute:
455
455
  family_key: flute
456
456
  notation:
457
457
  default:
458
- staffs:
458
+ staves:
459
459
  - clef: treble
460
460
  french_horn:
461
461
  alias_name_keys:
@@ -465,11 +465,11 @@ french_horn:
465
465
  family_key: horn
466
466
  notation:
467
467
  alternates:
468
- - staffs:
468
+ - staves:
469
469
  - clef: bass
470
470
  transposition: 5
471
471
  default:
472
- staffs:
472
+ staves:
473
473
  - clef: treble
474
474
  transposition: -7
475
475
  glockenspiel:
@@ -482,7 +482,7 @@ guitar:
482
482
  family_key: guitar
483
483
  notation:
484
484
  default:
485
- staffs:
485
+ staves:
486
486
  - clef: treble
487
487
  transposition: -12
488
488
  hammered_dulcimer:
@@ -492,20 +492,20 @@ hammered_dulcimer:
492
492
  - string
493
493
  notation:
494
494
  default:
495
- staffs:
495
+ staves:
496
496
  - clef: treble
497
497
  orchestra_section: percussion
498
498
  harp:
499
499
  family_key: harp
500
500
  notation:
501
501
  default:
502
- staffs:
502
+ staves:
503
503
  - clef: treble
504
504
  - clef: bass
505
505
  harpsichord:
506
506
  notation:
507
507
  default:
508
- staffs:
508
+ staves:
509
509
  - clef: treble
510
510
  name_key: right_hand
511
511
  - clef: bass
@@ -514,17 +514,17 @@ lute:
514
514
  family_key: lute
515
515
  notation:
516
516
  alternates:
517
- - staffs:
517
+ - staves:
518
518
  - clef: treble
519
519
  default:
520
- staffs:
520
+ staves:
521
521
  - clef: treble
522
522
  - clef: bass
523
523
  mandolin:
524
524
  family_key: mandolin
525
525
  notation:
526
526
  default:
527
- staffs:
527
+ staves:
528
528
  - clef: treble
529
529
  maracas:
530
530
  classification_keys:
@@ -533,14 +533,14 @@ maracas:
533
533
  - idiophone
534
534
  notation:
535
535
  default:
536
- staffs:
536
+ staves:
537
537
  - clef: percussion
538
538
  orchestra_section: percussion
539
539
  marimba:
540
540
  family_key: marimba
541
541
  notation:
542
542
  default:
543
- staffs:
543
+ staves:
544
544
  - clef: treble
545
545
  - clef: bass
546
546
  mezzo_soprano_voice:
@@ -549,7 +549,7 @@ mezzo_soprano_voice:
549
549
  family_key: voice
550
550
  notation:
551
551
  default:
552
- staffs:
552
+ staves:
553
553
  - clef: treble
554
554
  range_category:
555
555
  - mezzo_soprano
@@ -557,13 +557,13 @@ natural_horn:
557
557
  family_key: horn
558
558
  notation:
559
559
  default:
560
- staffs:
560
+ staves:
561
561
  - clef: treble
562
562
  oboe:
563
563
  family_key: oboe
564
564
  notation:
565
565
  default:
566
- staffs:
566
+ staves:
567
567
  - clef: treble
568
568
  oboe_d_amore:
569
569
  alias_name_keys:
@@ -571,7 +571,7 @@ oboe_d_amore:
571
571
  family_key: oboe
572
572
  notation:
573
573
  default:
574
- staffs:
574
+ staves:
575
575
  - clef: treble
576
576
  transposition: -3
577
577
  organ:
@@ -580,13 +580,13 @@ organ:
580
580
  family_key: organ
581
581
  notation:
582
582
  alternates:
583
- - staffs:
583
+ - staves:
584
584
  - clef: treble
585
585
  name_key: right_hand
586
586
  - clef: treble
587
587
  name_key: left_hand
588
588
  default:
589
- staffs:
589
+ staves:
590
590
  - clef: treble
591
591
  name_key: right_hand
592
592
  - clef: bass
@@ -600,7 +600,7 @@ piano:
600
600
  family_key: piano
601
601
  notation:
602
602
  default:
603
- staffs:
603
+ staves:
604
604
  - clef: treble
605
605
  name_key: right_hand
606
606
  - clef: bass
@@ -611,7 +611,7 @@ piccolo_clarinet:
611
611
  family_key: clarinet
612
612
  notation:
613
613
  default:
614
- staffs:
614
+ staves:
615
615
  - clef: treble
616
616
  transposition: 8
617
617
  piccolo_flute:
@@ -620,7 +620,7 @@ piccolo_flute:
620
620
  family_key: flute
621
621
  notation:
622
622
  default:
623
- staffs:
623
+ staves:
624
624
  - clef: treble
625
625
  transposition: 12
626
626
  piccolo_trumpet:
@@ -630,20 +630,20 @@ piccolo_trumpet:
630
630
  family_key: trumpet
631
631
  notation:
632
632
  default:
633
- staffs:
633
+ staves:
634
634
  - clef: treble
635
635
  transposition: 10
636
636
  recorder:
637
637
  family_key: recorder
638
638
  notation:
639
639
  default:
640
- staffs:
640
+ staves:
641
641
  - clef: treble
642
642
  saxophone:
643
643
  family_key: saxophone
644
644
  notation:
645
645
  default:
646
- staffs:
646
+ staves:
647
647
  - clef: treble
648
648
  snare_drum:
649
649
  alias_name_keys:
@@ -654,7 +654,7 @@ snare_drum:
654
654
  family_key: snare_drum
655
655
  notation:
656
656
  default:
657
- staffs:
657
+ staves:
658
658
  - clef: percussion
659
659
  soprano_voice:
660
660
  alias_name_keys:
@@ -662,7 +662,7 @@ soprano_voice:
662
662
  family_key: voice
663
663
  notation:
664
664
  default:
665
- staffs:
665
+ staves:
666
666
  - clef: treble
667
667
  range_category:
668
668
  - soprano
@@ -672,20 +672,20 @@ sousaphone:
672
672
  family_key: tuba
673
673
  notation:
674
674
  default:
675
- staffs:
675
+ staves:
676
676
  - clef: bass
677
677
  transposition: 0
678
678
  suspended_cymbal:
679
679
  family_key: cymbal
680
680
  notation:
681
681
  default:
682
- staffs:
682
+ staves:
683
683
  - clef: percussion
684
684
  synthesizer:
685
685
  family_key: synthesizer
686
686
  notation:
687
687
  default:
688
- staffs:
688
+ staves:
689
689
  - clef: treble
690
690
  name_key: right_hand
691
691
  - clef: bass
@@ -697,7 +697,7 @@ tam_tam:
697
697
  family_key: gong
698
698
  notation:
699
699
  default:
700
- staffs:
700
+ staves:
701
701
  - clef: percussion
702
702
  tambourine:
703
703
  classification_keys:
@@ -707,14 +707,14 @@ tambourine:
707
707
  - membranophone
708
708
  notation:
709
709
  default:
710
- staffs:
710
+ staves:
711
711
  - clef: percussion
712
712
  orchestra_section: percussion
713
713
  temple_blocks:
714
714
  family_key: woodblock
715
715
  notation:
716
716
  default:
717
- staffs:
717
+ staves:
718
718
  - clef: percussion
719
719
  tenor_drum:
720
720
  classification_keys:
@@ -723,22 +723,22 @@ tenor_drum:
723
723
  - membranophone
724
724
  notation:
725
725
  default:
726
- staffs:
726
+ staves:
727
727
  - clef: percussion
728
728
  orchestra_section: percussion
729
729
  tenor_voice:
730
730
  family_key: voice
731
731
  notation:
732
732
  alternates:
733
- - staffs:
733
+ - staves:
734
734
  - clef: bass
735
- - staffs:
735
+ - staves:
736
736
  - clef: treble
737
737
  transposition: -12
738
- - staffs:
738
+ - staves:
739
739
  - clef: tenor
740
740
  default:
741
- staffs:
741
+ staves:
742
742
  - clef: vocal_tenor
743
743
  transposition: -12
744
744
  range_category:
@@ -750,7 +750,7 @@ timpani:
750
750
  family_key: kettledrum
751
751
  notation:
752
752
  default:
753
- staffs:
753
+ staves:
754
754
  - clef: percussion
755
755
  triangle:
756
756
  classification_keys:
@@ -759,7 +759,7 @@ triangle:
759
759
  - idiophone
760
760
  notation:
761
761
  default:
762
- staffs:
762
+ staves:
763
763
  - clef: percussion
764
764
  orchestra_section: percussion
765
765
  trombone:
@@ -770,7 +770,7 @@ trombone:
770
770
  family_key: trombone
771
771
  notation:
772
772
  default:
773
- staffs:
773
+ staves:
774
774
  - clef: bass
775
775
  trumpet:
776
776
  fundamental_pitch_spelling:
@@ -778,7 +778,7 @@ trumpet:
778
778
  family_key: trumpet
779
779
  notation:
780
780
  default:
781
- staffs:
781
+ staves:
782
782
  - clef: treble
783
783
  transposition: -2
784
784
  trumpet_in_c:
@@ -787,7 +787,7 @@ trumpet_in_c:
787
787
  family_key: trumpet
788
788
  notation:
789
789
  default:
790
- staffs:
790
+ staves:
791
791
  - clef: treble
792
792
  transposition: 0
793
793
  trumpet_in_d:
@@ -796,7 +796,7 @@ trumpet_in_d:
796
796
  family_key: trumpet
797
797
  notation:
798
798
  default:
799
- staffs:
799
+ staves:
800
800
  - clef: treble
801
801
  transposition: 2
802
802
  trumpet_in_e_flat:
@@ -805,7 +805,7 @@ trumpet_in_e_flat:
805
805
  family_key: trumpet
806
806
  notation:
807
807
  default:
808
- staffs:
808
+ staves:
809
809
  - clef: treble
810
810
  transposition: 3
811
811
  tuba:
@@ -816,7 +816,7 @@ tuba:
816
816
  family_key: tuba
817
817
  notation:
818
818
  default:
819
- staffs:
819
+ staves:
820
820
  - clef: bass
821
821
  tuba_in_c:
822
822
  alias_name_keys:
@@ -826,7 +826,7 @@ tuba_in_c:
826
826
  family_key: tuba
827
827
  notation:
828
828
  default:
829
- staffs:
829
+ staves:
830
830
  - clef: bass
831
831
  vibraphone:
832
832
  alias_name_keys:
@@ -834,13 +834,13 @@ vibraphone:
834
834
  family_key: vibraphone
835
835
  notation:
836
836
  default:
837
- staffs:
837
+ staves:
838
838
  - clef: treble
839
839
  viola:
840
840
  family_key: violin
841
841
  notation:
842
842
  default:
843
- staffs:
843
+ staves:
844
844
  - clef: alto
845
845
  violin:
846
846
  alias_name_keys:
@@ -848,17 +848,17 @@ violin:
848
848
  family_key: violin
849
849
  notation:
850
850
  default:
851
- staffs:
851
+ staves:
852
852
  - clef: treble
853
853
  woodblock:
854
854
  family_key: woodblock
855
855
  notation:
856
856
  default:
857
- staffs:
857
+ staves:
858
858
  - clef: percussion
859
859
  xylophone:
860
860
  family_key: xylophone
861
861
  notation:
862
862
  default:
863
- staffs:
863
+ staves:
864
864
  - clef: treble
data/lib/head_music/instrument.rb CHANGED
@@ -14,7 +14,7 @@
14
14
  # - [treble, bass] for instruments that use the grand staff
15
15
  # notation:
16
16
  # a hash of default and alternative notation systems,
17
- # each with a staffs key with an array of hashes
17
+ # each with a staff's key with an array of hashes
18
18
  # including clef and transposition (where applicable)
19
19
  # Associations:
20
20
  # family: the family of the instrument (e.g. "saxophone")
@@ -40,7 +40,7 @@ class HeadMusic::Instrument
40
40
  :family_key, :orchestra_section_key,
41
41
  :notation, :classification_keys,
42
42
  :fundamental_pitch_spelling, :transposition,
43
- :default_staffs, :default_clefs
43
+ :default_staves, :default_clefs
44
44
  )
45
45
 
46
46
  def ==(other)
@@ -70,11 +70,11 @@ class HeadMusic::Instrument
70
70
  end
71
71
 
72
72
  def single_staff?
73
- default_staffs.length == 1
73
+ default_staves.length == 1
74
74
  end
75
75
 
76
- def multiple_staffs?
77
- default_staffs.length > 1
76
+ def multiple_staves?
77
+ default_staves.length > 1
78
78
  end
79
79
 
80
80
  def pitched?
@@ -147,9 +147,9 @@ class HeadMusic::Instrument
147
147
  @orchestra_section_key ||= record["orchestra_section_key"]
148
148
  @classification_keys = [@classification_keys, record["classification_keys"]].flatten.compact.uniq
149
149
  @fundamental_pitch_spelling = record["fundamental_pitch_spelling"]
150
- @default_staffs = (record.dig("notation", "default", "staffs") || [])
151
- @default_clefs = @default_staffs.map { |staff| staff["clef"] }
152
- @transposition = @default_staffs&.first&.[]("transposition") || 0
150
+ @default_staves = (record.dig("notation", "default", "staves") || [])
151
+ @default_clefs = @default_staves.map { |staff| staff["clef"] }
152
+ @transposition = @default_staves&.first&.[]("transposition") || 0
153
153
  end
154
154
 
155
155
  def inferred_name
data/lib/head_music/instrument_family.rb CHANGED
@@ -8,7 +8,7 @@ class HeadMusic::InstrumentFamily
8
8
  INSTRUMENT_FAMILIES =
9
9
  YAML.load_file(File.expand_path("data/instrument_families.yml", __dir__)).freeze
10
10
 
11
- attr_reader :name_key, :classification_keys, :orchestra_section_key, :default_staffs
11
+ attr_reader :name_key, :classification_keys, :orchestra_section_key
12
12
  attr_accessor :name
13
13
 
14
14
  def self.get(name)
data/lib/head_music/staff.rb CHANGED
@@ -6,13 +6,13 @@ class HeadMusic::Staff
6
6
 
7
7
  attr_reader :default_clef, :line_count, :instrument
8
8
 
9
- def initialize(default_clef, instrument: nil, line_count: nil)
10
- @default_clef = HeadMusic::Clef.get(default_clef)
9
+ def initialize(default_clef_key, instrument: nil, line_count: nil)
10
+ @default_clef = HeadMusic::Clef.get(default_clef_key)
11
11
  @line_count = line_count || DEFAULT_LINE_COUNT
12
12
  @instrument = HeadMusic::Instrument.get(instrument) if instrument
13
13
  end
14
14
 
15
15
  def clef
16
- default_clef || instrument&.default_staffs&.first
16
+ default_clef || instrument&.default_staves&.first&.clef
17
17
  end
18
18
  end
data/lib/head_music/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module HeadMusic
4
- VERSION = "2.0.1"
4
+ VERSION = "3.0.1"
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: head_music
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.1
4
+ version: 3.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Rob Head
@@ -14,30 +14,30 @@ dependencies:
14
14
  name: activesupport
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ">"
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '5.0'
19
+ version: '7.0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ">"
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: '5.0'
26
+ version: '7.0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: humanize
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: '1.3'
33
+ version: '2.0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: '1.3'
40
+ version: '2.0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: i18n
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
56
56
  name: rake
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ">="
59
+ - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 12.3.3
61
+ version: '13.0'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ">="
66
+ - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 12.3.3
68
+ version: '13.0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rspec
71
71
  requirement: !ruby/object:Gem::Requirement
@@ -228,14 +228,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
228
228
  requirements:
229
229
  - - ">="
230
230
  - !ruby/object:Gem::Version
231
- version: '2.5'
231
+ version: '3.0'
232
232
  required_rubygems_version: !ruby/object:Gem::Requirement
233
233
  requirements:
234
234
  - - ">="
235
235
  - !ruby/object:Gem::Version
236
236
  version: '0'
237
237
  requirements: []
238
- rubygems_version: 3.4.12
238
+ rubygems_version: 3.4.10
239
239
  signing_key:
240
240
  specification_version: 4
241
241
  summary: The rudiments of western music theory.