head_music 6.0.1 → 7.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (25) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop.yml +3 -0
  3. data/lib/head_music/consonance.rb +1 -1
  4. data/lib/head_music/content/composition.rb +3 -2
  5. data/lib/head_music/content/position.rb +0 -4
  6. data/lib/head_music/data/instruments.yml +118 -127
  7. data/lib/head_music/diatonic_interval/category.rb +24 -0
  8. data/lib/head_music/diatonic_interval/naming.rb +73 -0
  9. data/lib/head_music/diatonic_interval/parser.rb +47 -0
  10. data/lib/head_music/diatonic_interval/semitones.rb +36 -0
  11. data/lib/head_music/diatonic_interval/size.rb +50 -0
  12. data/lib/head_music/diatonic_interval.rb +1 -229
  13. data/lib/head_music/instrument/staff_scheme.rb +3 -3
  14. data/lib/head_music/instrument/{pitch_variant.rb → variant.rb} +6 -6
  15. data/lib/head_music/instrument.rb +9 -9
  16. data/lib/head_music/key_signature/enharmonic_equivalence.rb +2 -6
  17. data/lib/head_music/key_signature.rb +0 -1
  18. data/lib/head_music/locales/en.yml +1 -14
  19. data/lib/head_music/named.rb +0 -4
  20. data/lib/head_music/scale_degree.rb +9 -4
  21. data/lib/head_music/style/guidelines/notes_same_length.rb +0 -4
  22. data/lib/head_music/style/mark.rb +1 -4
  23. data/lib/head_music/version.rb +1 -1
  24. data/lib/head_music.rb +6 -1
  25. metadata +8 -3
data/lib/head_music/data/instruments.yml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  accordion:
3
3
  family_key: accordion
4
- pitch_variants:
4
+ variants:
5
5
  default:
6
6
  staff_schemes:
7
7
  default:
@@ -9,9 +9,9 @@ accordion:
9
9
  - clef: bass_clef
10
10
  alto_clarinet:
11
11
  family_key: clarinet
12
- pitch_variants:
12
+ variants:
13
13
  default:
14
- fundamental_pitch_spelling: Eb
14
+ pitch_designation: Eb
15
15
  staff_schemes:
16
16
  default:
17
17
  - clef: treble_clef
@@ -20,9 +20,9 @@ alto_clarinet:
20
20
  - alto
21
21
  alto_flute:
22
22
  family_key: flute
23
- pitch_variants:
23
+ variants:
24
24
  default:
25
- fundamental_pitch_spelling: G
25
+ pitch_designation: G
26
26
  staff_schemes:
27
27
  default:
28
28
  - clef: treble_clef
@@ -34,7 +34,7 @@ alto_voice:
34
34
  - contralto
35
35
  - alto
36
36
  family_key: voice
37
- pitch_variants:
37
+ variants:
38
38
  default:
39
39
  staff_schemes:
40
40
  default:
@@ -46,7 +46,7 @@ arpeggione:
46
46
  - bowed
47
47
  - chordophone
48
48
  - string
49
- pitch_variants:
49
+ variants:
50
50
  default:
51
51
  staff_schemes:
52
52
  default:
@@ -58,7 +58,7 @@ great_highland_bagpipe:
58
58
  - bagpipe
59
59
  - bagpipes
60
60
  family_key: bagpipe
61
- pitch_variants:
61
+ variants:
62
62
  default:
63
63
  staff_schemes:
64
64
  default:
@@ -70,7 +70,7 @@ banjo:
70
70
  - chordophone
71
71
  - string
72
72
  orchestra_section_key: string
73
- pitch_variants:
73
+ variants:
74
74
  default:
75
75
  staff_schemes:
76
76
  default:
@@ -78,9 +78,9 @@ banjo:
78
78
  sounding_transposition: -12
79
79
  baritone_horn:
80
80
  family_key: saxhorn
81
- pitch_variants:
81
+ variants:
82
82
  default:
83
- fundamental_pitch_spelling: Bb
83
+ pitch_designation: Bb
84
84
  staff_schemes:
85
85
  default:
86
86
  - clef: bass_clef
@@ -92,7 +92,7 @@ baritone_horn:
92
92
  - baritone
93
93
  baritone_voice:
94
94
  family_key: voice
95
- pitch_variants:
95
+ variants:
96
96
  default:
97
97
  staff_schemes:
98
98
  default:
@@ -101,9 +101,9 @@ baritone_voice:
101
101
  - baritone
102
102
  bass_clarinet:
103
103
  family_key: clarinet
104
- pitch_variants:
104
+ variants:
105
105
  default:
106
- fundamental_pitch_spelling: Bb
106
+ pitch_designation: Bb
107
107
  staff_schemes:
108
108
  default:
109
109
  - clef: treble_clef
@@ -120,7 +120,7 @@ bass_drum:
120
120
  classification_keys:
121
121
  - percussion
122
122
  - membranophone
123
- pitch_variants:
123
+ variants:
124
124
  default:
125
125
  staff_schemes:
126
126
  default:
@@ -128,7 +128,7 @@ bass_drum:
128
128
  orchestra_section_key: percussion
129
129
  bass_guitar:
130
130
  family_key: guitar
131
- pitch_variants:
131
+ variants:
132
132
  default:
133
133
  staff_schemes:
134
134
  default:
@@ -138,7 +138,7 @@ bass_oboe:
138
138
  alias_name_keys:
139
139
  - baritone_oboe
140
140
  family_key: oboe
141
- pitch_variants:
141
+ variants:
142
142
  default:
143
143
  staff_schemes:
144
144
  default:
@@ -149,44 +149,44 @@ bass_oboe:
149
149
  - bass
150
150
  bass_trombone:
151
151
  family_key: trombone
152
- pitch_variants:
152
+ variants:
153
153
  default:
154
- fundamental_pitch_spelling: Bb
154
+ pitch_designation: Bb
155
155
  staff_schemes:
156
156
  default:
157
157
  - clef: bass_clef
158
158
  sounding_transposition: 0
159
159
  bass_trumpet:
160
160
  family_key: trumpet
161
- pitch_variants:
161
+ variants:
162
162
  default:
163
- fundamental_pitch_spelling: Bb
163
+ pitch_designation: Bb
164
164
  staff_schemes:
165
165
  default:
166
166
  - clef: treble_clef
167
167
  sounding_transposition: -14
168
168
  in_c:
169
- fundamental_pitch_spelling: C
169
+ pitch_designation: C
170
170
  staff_schemes:
171
171
  default:
172
172
  - clef: treble_clef
173
173
  sounding_transposition: -12
174
174
  in_e_flat:
175
- fundamental_pitch_spelling: Eb
175
+ pitch_designation: Eb
176
176
  staff_schemes:
177
177
  default:
178
178
  - clef: treble_clef
179
179
  sounding_transposition: -9
180
180
  bass_tuba:
181
181
  family_key: tuba
182
- pitch_variants:
182
+ variants:
183
183
  default:
184
- fundamental_pitch_spelling: F
184
+ pitch_designation: F
185
185
  staff_schemes:
186
186
  default:
187
187
  - clef: bass_clef
188
188
  in_e_flat:
189
- fundamental_pitch_spelling: Eb
189
+ pitch_designation: Eb
190
190
  staff_schemes:
191
191
  default:
192
192
  - clef: bass_clef
@@ -197,7 +197,7 @@ bass_tuba:
197
197
  - bass
198
198
  bass_voice:
199
199
  family_key: voice
200
- pitch_variants:
200
+ variants:
201
201
  default:
202
202
  staff_schemes:
203
203
  default:
@@ -206,32 +206,32 @@ bass_voice:
206
206
  - bass
207
207
  basset_horn:
208
208
  family_key: clarinet
209
- pitch_variants:
209
+ variants:
210
210
  default:
211
- fundamental_pitch_spelling: F
211
+ pitch_designation: F
212
212
  staff_schemes:
213
213
  default:
214
214
  - clef: treble_clef
215
215
  sounding_transposition: -7
216
216
  bassoon:
217
217
  family_key: bassoon
218
- pitch_variants:
218
+ variants:
219
219
  default:
220
- fundamental_pitch_spelling: F
220
+ pitch_designation: F
221
221
  staff_schemes:
222
222
  default:
223
223
  - clef: bass_clef
224
224
  bugle:
225
225
  family_key: trumpet
226
- pitch_variants:
226
+ variants:
227
227
  default:
228
- fundamental_pitch_spelling: G
228
+ pitch_designation: G
229
229
  staff_schemes:
230
230
  default:
231
231
  - clef: treble_clef
232
232
  sounding_transposition: -5
233
233
  in_b_flat:
234
- fundamental_pitch_spelling: Bb
234
+ pitch_designation: Bb
235
235
  staff_schemes:
236
236
  default:
237
237
  - clef: treble_clef
@@ -240,7 +240,7 @@ castanets:
240
240
  classification_keys:
241
241
  - percussion
242
242
  - idiophone
243
- pitch_variants:
243
+ variants:
244
244
  default:
245
245
  staff_schemes:
246
246
  default:
@@ -251,7 +251,7 @@ celesta:
251
251
  - keyboard
252
252
  - percussion
253
253
  - idiophone
254
- pitch_variants:
254
+ variants:
255
255
  default:
256
256
  staff_schemes:
257
257
  default:
@@ -264,7 +264,7 @@ cello:
264
264
  alias_name_keys:
265
265
  - violoncello
266
266
  family_key: violin
267
- pitch_variants:
267
+ variants:
268
268
  default:
269
269
  staff_schemes:
270
270
  default:
@@ -276,7 +276,7 @@ chimes:
276
276
  classification_keys:
277
277
  - percussion
278
278
  - idiophone
279
- pitch_variants:
279
+ variants:
280
280
  default:
281
281
  staff_schemes:
282
282
  default:
@@ -288,7 +288,7 @@ cimbalom:
288
288
  - string
289
289
  - struck
290
290
  - plucked
291
- pitch_variants:
291
+ variants:
292
292
  default:
293
293
  staff_schemes:
294
294
  default:
@@ -299,27 +299,27 @@ clarinet:
299
299
  alias_name_keys:
300
300
  - soprano_clarinet
301
301
  family_key: clarinet
302
- pitch_variants:
302
+ variants:
303
303
  default:
304
- fundamental_pitch_spelling: Bb
304
+ pitch_designation: Bb
305
305
  staff_schemes:
306
306
  default:
307
307
  - clef: treble_clef
308
308
  sounding_transposition: -2
309
309
  in_a:
310
- fundamental_pitch_spelling: A
310
+ pitch_designation: A
311
311
  staff_schemes:
312
312
  default:
313
313
  - clef: treble_clef
314
314
  sounding_transposition: -3
315
315
  in_c:
316
- fundamental_pitch_spelling: C
316
+ pitch_designation: C
317
317
  staff_schemes:
318
318
  default:
319
319
  - clef: treble_clef
320
320
  sounding_transposition: 0
321
321
  in_d:
322
- fundamental_pitch_spelling: D
322
+ pitch_designation: D
323
323
  alias_name_keys:
324
324
  - sopranino_clarinet
325
325
  staff_schemes:
@@ -329,20 +329,20 @@ clarinet:
329
329
  in_e_flat:
330
330
  alias_name_keys:
331
331
  - sopranino_clarinet
332
- fundamental_pitch_spelling: Eb
332
+ pitch_designation: Eb
333
333
  staff_schemes:
334
334
  default:
335
335
  - clef: treble_clef
336
336
  sounding_transposition: 3
337
337
  clash_cymbals:
338
338
  family_key: cymbal
339
- pitch_variants:
339
+ variants:
340
340
  default:
341
341
  staff_schemes:
342
342
  default:
343
343
  - clef: neutral_clef
344
344
  clavichord:
345
- pitch_variants:
345
+ variants:
346
346
  default:
347
347
  staff_schemes:
348
348
  default:
@@ -352,16 +352,16 @@ clavichord:
352
352
  name_key: left_hand
353
353
  contrabass_clarinet:
354
354
  family_key: clarinet
355
- pitch_variants:
355
+ variants:
356
356
  default:
357
- fundamental_pitch_spelling: Bb
357
+ pitch_designation: Bb
358
358
  staff_schemes:
359
359
  default:
360
360
  - clef: treble_clef
361
361
  sounding_transposition: -26
362
362
  contrabassoon:
363
363
  family_key: bassoon
364
- pitch_variants:
364
+ variants:
365
365
  default:
366
366
  staff_schemes:
367
367
  default:
@@ -371,7 +371,7 @@ cor_anglais:
371
371
  alias_name_keys:
372
372
  - english_horn
373
373
  family_key: oboe
374
- pitch_variants:
374
+ variants:
375
375
  default:
376
376
  staff_schemes:
377
377
  default:
@@ -379,16 +379,16 @@ cor_anglais:
379
379
  sounding_transposition: -7
380
380
  cornet:
381
381
  family_key: cornet
382
- pitch_variants:
382
+ variants:
383
383
  default:
384
- fundamental_pitch_spelling: Bb
384
+ pitch_designation: Bb
385
385
  staff_schemes:
386
386
  default:
387
387
  - clef: treble_clef
388
388
  sounding_transposition: -2
389
389
  countertenor_voice:
390
390
  family_key: voice
391
- pitch_variants:
391
+ variants:
392
392
  default:
393
393
  staff_schemes:
394
394
  default:
@@ -399,7 +399,7 @@ cowbell:
399
399
  classification_keys:
400
400
  - percussion
401
401
  - idiophone
402
- pitch_variants:
402
+ variants:
403
403
  default:
404
404
  staff_schemes:
405
405
  default:
@@ -409,7 +409,7 @@ crotales:
409
409
  classification_keys:
410
410
  - percussion
411
411
  - idiophone
412
- pitch_variants:
412
+ variants:
413
413
  default:
414
414
  staff_schemes:
415
415
  default:
@@ -417,7 +417,7 @@ crotales:
417
417
  orchestra_section_key: percussion
418
418
  cymbal:
419
419
  family_key: cymbal
420
- pitch_variants:
420
+ variants:
421
421
  default:
422
422
  staff_schemes:
423
423
  default:
@@ -426,7 +426,7 @@ double_bass:
426
426
  alias_name_keys:
427
427
  - contrabass
428
428
  - string_bass
429
- pitch_variants:
429
+ variants:
430
430
  default:
431
431
  staff_schemes:
432
432
  default:
@@ -439,7 +439,7 @@ euphonium:
439
439
  - aerophone
440
440
  - brass
441
441
  - wind
442
- pitch_variants:
442
+ variants:
443
443
  default:
444
444
  staff_schemes:
445
445
  default:
@@ -453,16 +453,16 @@ euphonium:
453
453
  orchestra_section_key: brass
454
454
  flugelhorn:
455
455
  family_key: saxhorn
456
- pitch_variants:
456
+ variants:
457
457
  default:
458
- fundamental_pitch_spelling: Bb
458
+ pitch_designation: Bb
459
459
  staff_schemes:
460
460
  default:
461
461
  - clef: treble_clef
462
462
  sounding_transposition: -2
463
463
  flute:
464
464
  family_key: flute
465
- pitch_variants:
465
+ variants:
466
466
  default:
467
467
  staff_schemes:
468
468
  default:
@@ -471,9 +471,9 @@ french_horn:
471
471
  alias_name_keys:
472
472
  - horn
473
473
  family_key: horn
474
- pitch_variants:
474
+ variants:
475
475
  default:
476
- fundamental_pitch_spelling: F
476
+ pitch_designation: F
477
477
  staff_schemes:
478
478
  default:
479
479
  - clef: treble_clef
@@ -487,14 +487,14 @@ glockenspiel:
487
487
  - bells
488
488
  - carillon
489
489
  family_key: glockenspiel
490
- pitch_variants:
490
+ variants:
491
491
  default:
492
492
  staff_schemes:
493
493
  default:
494
494
  - clef: treble_clef
495
495
  guitar:
496
496
  family_key: guitar
497
- pitch_variants:
497
+ variants:
498
498
  default:
499
499
  staff_schemes:
500
500
  default:
@@ -505,7 +505,7 @@ hammered_dulcimer:
505
505
  - percussion
506
506
  - chordophone
507
507
  - string
508
- pitch_variants:
508
+ variants:
509
509
  default:
510
510
  staff_schemes:
511
511
  default:
@@ -513,14 +513,14 @@ hammered_dulcimer:
513
513
  orchestra_section_key: percussion
514
514
  harp:
515
515
  family_key: harp
516
- pitch_variants:
516
+ variants:
517
517
  default:
518
518
  staff_schemes:
519
519
  default:
520
520
  - clef: treble_clef
521
521
  - clef: bass_clef
522
522
  harpsichord:
523
- pitch_variants:
523
+ variants:
524
524
  default:
525
525
  staff_schemes:
526
526
  default:
@@ -530,7 +530,7 @@ harpsichord:
530
530
  name_key: left_hand
531
531
  lute:
532
532
  family_key: lute
533
- pitch_variants:
533
+ variants:
534
534
  default:
535
535
  staff_schemes:
536
536
  default:
@@ -540,7 +540,7 @@ lute:
540
540
  - clef: treble_clef
541
541
  mandolin:
542
542
  family_key: mandolin
543
- pitch_variants:
543
+ variants:
544
544
  default:
545
545
  staff_schemes:
546
546
  default:
@@ -550,7 +550,7 @@ maracas:
550
550
  - percussion
551
551
  - shaken
552
552
  - idiophone
553
- pitch_variants:
553
+ variants:
554
554
  default:
555
555
  staff_schemes:
556
556
  default:
@@ -558,7 +558,7 @@ maracas:
558
558
  orchestra_section_key: percussion
559
559
  marimba:
560
560
  family_key: marimba
561
- pitch_variants:
561
+ variants:
562
562
  default:
563
563
  staff_schemes:
564
564
  default:
@@ -568,7 +568,7 @@ mezzo_soprano_voice:
568
568
  alias_name_keys:
569
569
  - mezzo_soprano
570
570
  family_key: voice
571
- pitch_variants:
571
+ variants:
572
572
  default:
573
573
  staff_schemes:
574
574
  default:
@@ -577,14 +577,14 @@ mezzo_soprano_voice:
577
577
  - mezzo_soprano
578
578
  natural_horn:
579
579
  family_key: horn
580
- pitch_variants:
580
+ variants:
581
581
  default:
582
582
  staff_schemes:
583
583
  default:
584
584
  - clef: treble_clef
585
585
  oboe:
586
586
  family_key: oboe
587
- pitch_variants:
587
+ variants:
588
588
  default:
589
589
  staff_schemes:
590
590
  default:
@@ -593,7 +593,7 @@ oboe_d_amore:
593
593
  alias_name_keys:
594
594
  - hautbois_d_amour
595
595
  family_key: oboe
596
- pitch_variants:
596
+ variants:
597
597
  default:
598
598
  staff_schemes:
599
599
  default:
@@ -603,7 +603,7 @@ organ:
603
603
  alias_name_keys:
604
604
  - pipe_organ
605
605
  family_key: organ
606
- pitch_variants:
606
+ variants:
607
607
  default:
608
608
  staff_schemes:
609
609
  default:
@@ -623,7 +623,7 @@ piano:
623
623
  - pianoforte
624
624
  - fortepiano
625
625
  family_key: piano
626
- pitch_variants:
626
+ variants:
627
627
  default:
628
628
  staff_schemes:
629
629
  default:
@@ -633,9 +633,9 @@ piano:
633
633
  name_key: left_hand
634
634
  piccolo_clarinet:
635
635
  family_key: clarinet
636
- pitch_variants:
636
+ variants:
637
637
  default:
638
- fundamental_pitch_spelling: Ab
638
+ pitch_designation: Ab
639
639
  staff_schemes:
640
640
  default:
641
641
  - clef: treble_clef
@@ -644,7 +644,7 @@ piccolo_flute:
644
644
  alias_name_keys:
645
645
  - piccolo
646
646
  family_key: flute
647
- pitch_variants:
647
+ variants:
648
648
  default:
649
649
  staff_schemes:
650
650
  default:
@@ -652,15 +652,15 @@ piccolo_flute:
652
652
  sounding_transposition: 12
653
653
  piccolo_trumpet:
654
654
  family_key: trumpet
655
- pitch_variants:
655
+ variants:
656
656
  default:
657
- fundamental_pitch_spelling: Bb
657
+ pitch_designation: Bb
658
658
  staff_schemes:
659
659
  default:
660
660
  - clef: treble_clef
661
661
  sounding_transposition: 10
662
662
  alternate_leadpipe:
663
- fundamental_pitch_spelling: A
663
+ pitch_designation: A
664
664
  staff_schemes:
665
665
  default:
666
666
  - clef: treble_clef
@@ -669,14 +669,14 @@ piccolo_trumpet:
669
669
  - piccolo
670
670
  recorder:
671
671
  family_key: recorder
672
- pitch_variants:
672
+ variants:
673
673
  default:
674
674
  staff_schemes:
675
675
  default:
676
676
  - clef: treble_clef
677
677
  saxophone:
678
678
  family_key: saxophone
679
- pitch_variants:
679
+ variants:
680
680
  default:
681
681
  staff_schemes:
682
682
  default:
@@ -688,7 +688,7 @@ snare_drum:
688
688
  - military_drum
689
689
  - field_drum
690
690
  family_key: snare_drum
691
- pitch_variants:
691
+ variants:
692
692
  default:
693
693
  staff_schemes:
694
694
  default:
@@ -697,7 +697,7 @@ soprano_voice:
697
697
  alias_name_keys:
698
698
  - soprano
699
699
  family_key: voice
700
- pitch_variants:
700
+ variants:
701
701
  default:
702
702
  staff_schemes:
703
703
  default:
@@ -706,23 +706,23 @@ soprano_voice:
706
706
  - soprano
707
707
  sousaphone:
708
708
  family_key: tuba
709
- pitch_variants:
709
+ variants:
710
710
  default:
711
- fundamental_pitch_spelling: Bb
711
+ pitch_designation: Bb
712
712
  staff_schemes:
713
713
  default:
714
714
  - clef: bass_clef
715
715
  transposition: 0
716
716
  suspended_cymbal:
717
717
  family_key: cymbal
718
- pitch_variants:
718
+ variants:
719
719
  default:
720
720
  staff_schemes:
721
721
  default:
722
722
  - clef: neutral_clef
723
723
  synthesizer:
724
724
  family_key: synthesizer
725
- pitch_variants:
725
+ variants:
726
726
  default:
727
727
  staff_schemes:
728
728
  default:
@@ -735,7 +735,7 @@ tam_tam:
735
735
  - tamtam
736
736
  - gong
737
737
  family_key: gong
738
- pitch_variants:
738
+ variants:
739
739
  default:
740
740
  staff_schemes:
741
741
  default:
@@ -746,7 +746,7 @@ tambourine:
746
746
  - shaken
747
747
  - idiophone
748
748
  - membranophone
749
- pitch_variants:
749
+ variants:
750
750
  default:
751
751
  staff_schemes:
752
752
  default:
@@ -754,7 +754,7 @@ tambourine:
754
754
  orchestra_section_key: percussion
755
755
  temple_blocks:
756
756
  family_key: woodblock
757
- pitch_variants:
757
+ variants:
758
758
  default:
759
759
  staff_schemes:
760
760
  default:
@@ -764,7 +764,7 @@ tenor_drum:
764
764
  - percussion
765
765
  - struck
766
766
  - membranophone
767
- pitch_variants:
767
+ variants:
768
768
  default:
769
769
  staff_schemes:
770
770
  default:
@@ -772,7 +772,7 @@ tenor_drum:
772
772
  orchestra_section_key: percussion
773
773
  tenor_voice:
774
774
  family_key: voice
775
- pitch_variants:
775
+ variants:
776
776
  default:
777
777
  staff_schemes:
778
778
  default:
@@ -791,7 +791,7 @@ timpani:
791
791
  - kettledrum
792
792
  - timpanum
793
793
  family_key: kettledrum
794
- pitch_variants:
794
+ variants:
795
795
  default:
796
796
  staff_schemes:
797
797
  default:
@@ -801,7 +801,7 @@ triangle:
801
801
  - percussion
802
802
  - struck
803
803
  - idiophone
804
- pitch_variants:
804
+ variants:
805
805
  default:
806
806
  staff_schemes:
807
807
  default:
@@ -811,44 +811,35 @@ trombone:
811
811
  alias_name_keys:
812
812
  - tenor_trombone
813
813
  family_key: trombone
814
- pitch_variants:
814
+ variants:
815
815
  default:
816
- fundamental_pitch_spelling: Bb
816
+ pitch_designation: Bb
817
817
  staff_schemes:
818
818
  default:
819
819
  - clef: bass_clef
820
820
  trumpet:
821
821
  family_key: trumpet
822
- pitch_variants:
822
+ variants:
823
823
  default:
824
- fundamental_pitch_spelling: Bb
824
+ pitch_designation: Bb
825
825
  staff_schemes:
826
826
  default:
827
827
  - clef: treble_clef
828
828
  sounding_transposition: -2
829
- trumpet_in_c:
830
- family_key: trumpet
831
- pitch_variants:
832
- default:
833
- fundamental_pitch_spelling: C
829
+ in_c:
830
+ pitch_designation: C
834
831
  staff_schemes:
835
832
  default:
836
833
  - clef: treble_clef
837
834
  sounding_transposition: 0
838
- trumpet_in_d:
839
- family_key: trumpet
840
- pitch_variants:
841
- default:
842
- fundamental_pitch_spelling: D
835
+ in_d:
836
+ pitch_designation: D
843
837
  staff_schemes:
844
838
  default:
845
839
  - clef: treble_clef
846
840
  sounding_transposition: 2
847
- trumpet_in_e_flat:
848
- family_key: trumpet
849
- pitch_variants:
850
- default:
851
- fundamental_pitch_spelling: Eb
841
+ in_e_flat:
842
+ pitch_designation: Eb
852
843
  staff_schemes:
853
844
  default:
854
845
  - clef: treble_clef
@@ -857,9 +848,9 @@ tuba:
857
848
  alias_name_keys:
858
849
  - contrabass_tuba
859
850
  family_key: tuba
860
- pitch_variants:
851
+ variants:
861
852
  default:
862
- fundamental_pitch_spelling: Bb
853
+ pitch_designation: Bb
863
854
  staff_schemes:
864
855
  default:
865
856
  - clef: bass_clef
@@ -867,7 +858,7 @@ tuba:
867
858
  - clef: treble_clef
868
859
  sounding_transposition: -26
869
860
  in_c:
870
- fundamental_pitch_spelling: C
861
+ pitch_designation: C
871
862
  staff_schemes:
872
863
  default:
873
864
  - clef: bass_clef
@@ -875,14 +866,14 @@ vibraphone:
875
866
  alias_name_keys:
876
867
  - vibes
877
868
  family_key: vibraphone
878
- pitch_variants:
869
+ variants:
879
870
  default:
880
871
  staff_schemes:
881
872
  default:
882
873
  - clef: treble_clef
883
874
  viola:
884
875
  family_key: violin
885
- pitch_variants:
876
+ variants:
886
877
  default:
887
878
  staff_schemes:
888
879
  default:
@@ -891,21 +882,21 @@ violin:
891
882
  alias_name_keys:
892
883
  - fiddle
893
884
  family_key: violin
894
- pitch_variants:
885
+ variants:
895
886
  default:
896
887
  staff_schemes:
897
888
  default:
898
889
  - clef: treble_clef
899
890
  woodblock:
900
891
  family_key: woodblock
901
- pitch_variants:
892
+ variants:
902
893
  default:
903
894
  staff_schemes:
904
895
  default:
905
896
  - clef: neutral_clef
906
897
  xylophone:
907
898
  family_key: xylophone
908
- pitch_variants:
899
+ variants:
909
900
  default:
910
901
  staff_schemes:
911
902
  default: