RubyGems - head_music - Versions diffs - 6.0.1 → 7.0.1 - Mend

head_music 6.0.1 → 7.0.1

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 (27) hide show

checksums.yaml +4 -4
data/.rubocop.yml +3 -0
data/lib/head_music/consonance.rb +1 -1
data/lib/head_music/content/composition.rb +3 -2
data/lib/head_music/content/position.rb +0 -4
data/lib/head_music/data/instrument_families.yml +1 -0
data/lib/head_music/data/instruments.yml +411 -132
data/lib/head_music/diatonic_interval/category.rb +24 -0
data/lib/head_music/diatonic_interval/naming.rb +73 -0
data/lib/head_music/diatonic_interval/parser.rb +47 -0
data/lib/head_music/diatonic_interval/semitones.rb +36 -0
data/lib/head_music/diatonic_interval/size.rb +50 -0
data/lib/head_music/diatonic_interval.rb +1 -229
data/lib/head_music/instrument/staff_scheme.rb +3 -3
data/lib/head_music/instrument/{pitch_variant.rb → variant.rb} +6 -6
data/lib/head_music/instrument.rb +9 -9
data/lib/head_music/key_signature/enharmonic_equivalence.rb +2 -6
data/lib/head_music/key_signature.rb +0 -1
data/lib/head_music/locales/en.yml +77 -17
data/lib/head_music/locales/fr.yml +0 -1
data/lib/head_music/named.rb +0 -4
data/lib/head_music/scale_degree.rb +9 -4
data/lib/head_music/style/guidelines/notes_same_length.rb +0 -4
data/lib/head_music/style/mark.rb +1 -4
data/lib/head_music/version.rb +1 -1
data/lib/head_music.rb +6 -1
metadata +8 -3

data/lib/head_music/data/instruments.yml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 accordion:
   family_key: accordion
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -9,9 +9,9 @@ accordion:
           - clef: bass_clef
 alto_clarinet:
   family_key: clarinet
-  pitch_variants:
+  variants:
     default:
-      fundamental_pitch_spelling: Eb
+      pitch_designation: Eb
       staff_schemes:
         default:
           - clef: treble_clef
@@ -20,9 +20,9 @@ alto_clarinet:
     - alto
 alto_flute:
   family_key: flute
-  pitch_variants:
+  variants:
     default:
-      fundamental_pitch_spelling: G
+      pitch_designation: G
       staff_schemes:
         default:
           - clef: treble_clef
@@ -34,7 +34,7 @@ alto_voice:
     - contralto
     - alto
   family_key: voice
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -46,7 +46,7 @@ arpeggione:
     - bowed
     - chordophone
     - string
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -58,7 +58,7 @@ great_highland_bagpipe:
     - bagpipe
     - bagpipes
   family_key: bagpipe
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -70,7 +70,7 @@ banjo:
     - chordophone
     - string
   orchestra_section_key: string
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -78,9 +78,9 @@ banjo:
             sounding_transposition: -12
 baritone_horn:
   family_key: saxhorn
-  pitch_variants:
+  variants:
     default:
-      fundamental_pitch_spelling: Bb
+      pitch_designation: Bb
       staff_schemes:
         default:
           - clef: bass_clef
@@ -92,7 +92,7 @@ baritone_horn:
     - baritone
 baritone_voice:
   family_key: voice
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -101,9 +101,9 @@ baritone_voice:
     - baritone
 bass_clarinet:
   family_key: clarinet
-  pitch_variants:
+  variants:
     default:
-      fundamental_pitch_spelling: Bb
+      pitch_designation: Bb
       staff_schemes:
         default:
           - clef: treble_clef
@@ -120,25 +120,29 @@ bass_drum:
   classification_keys:
     - percussion
     - membranophone
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
           - clef: neutral_clef
   orchestra_section_key: percussion
+  range_categories:
+    - bass
 bass_guitar:
   family_key: guitar
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
           - clef: bass_clef
             sounding_transposition: -12
+  range_categories:
+    - bass
 bass_oboe:
   alias_name_keys:
     - baritone_oboe
   family_key: oboe
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -149,44 +153,49 @@ bass_oboe:
     - bass
 bass_trombone:
   family_key: trombone
-  pitch_variants:
+  variants:
     default:
-      fundamental_pitch_spelling: Bb
+      pitch_designation: Bb
       staff_schemes:
         default:
           - clef: bass_clef
             sounding_transposition: 0
+  range_categories:
+    - bass
 bass_trumpet:
   family_key: trumpet
-  pitch_variants:
+  variants:
     default:
-      fundamental_pitch_spelling: Bb
+      pitch_designation: Bb
       staff_schemes:
         default:
           - clef: treble_clef
             sounding_transposition: -14
     in_c:
-      fundamental_pitch_spelling: C
+      pitch_designation: C
       staff_schemes:
         default:
           - clef: treble_clef
             sounding_transposition: -12
     in_e_flat:
-      fundamental_pitch_spelling: Eb
+      pitch_designation: Eb
       staff_schemes:
         default:
           - clef: treble_clef
             sounding_transposition: -9
+  range_categories:
+    - baritone
+    - bass
 bass_tuba:
   family_key: tuba
-  pitch_variants:
+  variants:
     default:
-      fundamental_pitch_spelling: F
+      pitch_designation: F
       staff_schemes:
         default:
           - clef: bass_clef
     in_e_flat:
-      fundamental_pitch_spelling: Eb
+      pitch_designation: Eb
       staff_schemes:
         default:
           - clef: bass_clef
@@ -197,7 +206,7 @@ bass_tuba:
     - bass
 bass_voice:
   family_key: voice
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -206,41 +215,52 @@ bass_voice:
     - bass
 basset_horn:
   family_key: clarinet
-  pitch_variants:
+  variants:
     default:
-      fundamental_pitch_spelling: F
+      pitch_designation: F
       staff_schemes:
         default:
           - clef: treble_clef
             sounding_transposition: -7
 bassoon:
   family_key: bassoon
-  pitch_variants:
+  variants:
     default:
-      fundamental_pitch_spelling: F
+      pitch_designation: F
       staff_schemes:
         default:
           - clef: bass_clef
+  range_categories:
+    - bass
 bugle:
   family_key: trumpet
-  pitch_variants:
+  variants:
     default:
-      fundamental_pitch_spelling: G
+      pitch_designation: G
       staff_schemes:
         default:
           - clef: treble_clef
             sounding_transposition: -5
     in_b_flat:
-      fundamental_pitch_spelling: Bb
+      pitch_designation: Bb
       staff_schemes:
         default:
           - clef: treble_clef
             sounding_transposition: -2
+    in_c:
+      pitch_designation: C
+      staff_schemes:
+        default:
+          - clef: treble_clef
+            sounding_transposition: 0
+  range_categories:
+    - soprano
+    - alto
 castanets:
   classification_keys:
     - percussion
     - idiophone
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -251,7 +271,7 @@ celesta:
     - keyboard
     - percussion
     - idiophone
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -264,11 +284,13 @@ cello:
   alias_name_keys:
     - violoncello
   family_key: violin
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
           - clef: bass_clef
+  range_categories:
+    - tenor
 chimes:
   alias_name_keys:
     - tubular_bells
@@ -276,7 +298,7 @@ chimes:
   classification_keys:
     - percussion
     - idiophone
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -288,7 +310,7 @@ cimbalom:
     - string
     - struck
     - plucked
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -299,27 +321,27 @@ clarinet:
   alias_name_keys:
     - soprano_clarinet
   family_key: clarinet
-  pitch_variants:
+  variants:
     default:
-      fundamental_pitch_spelling: Bb
+      pitch_designation: Bb
       staff_schemes:
         default:
           - clef: treble_clef
             sounding_transposition: -2
     in_a:
-      fundamental_pitch_spelling: A
+      pitch_designation: A
       staff_schemes:
         default:
           - clef: treble_clef
             sounding_transposition: -3
     in_c:
-      fundamental_pitch_spelling: C
+      pitch_designation: C
       staff_schemes:
         default:
           - clef: treble_clef
             sounding_transposition: 0
     in_d:
-      fundamental_pitch_spelling: D
+      pitch_designation: D
       alias_name_keys:
         - sopranino_clarinet
       staff_schemes:
@@ -329,20 +351,28 @@ clarinet:
     in_e_flat:
       alias_name_keys:
         - sopranino_clarinet
-      fundamental_pitch_spelling: Eb
+      pitch_designation: Eb
       staff_schemes:
         default:
           - clef: treble_clef
             sounding_transposition: 3
+  range_categories:
+    - soprano
+    - sopranino
 clash_cymbals:
+  alias_name_keys:
+    - concert_cymbals
+    - orchestral_cymbals
+    - crash_cymbals
   family_key: cymbal
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
           - clef: neutral_clef
 clavichord:
-  pitch_variants:
+  family_key: clavichord
+  variants:
     default:
       staff_schemes:
         default:
@@ -352,54 +382,62 @@ clavichord:
             name_key: left_hand
 contrabass_clarinet:
   family_key: clarinet
-  pitch_variants:
+  variants:
     default:
-      fundamental_pitch_spelling: Bb
+      pitch_designation: Bb
       staff_schemes:
         default:
           - clef: treble_clef
             sounding_transposition: -26
+  range_categories:
+    - contrabass
 contrabassoon:
   family_key: bassoon
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
           - clef: bass_clef
             sounding_transposition: -12
+  range_categories:
+    - contrabass
 cor_anglais:
   alias_name_keys:
     - english_horn
   family_key: oboe
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
           - clef: treble_clef
             sounding_transposition: -7
+  range_categories:
+    - alto
 cornet:
   family_key: cornet
-  pitch_variants:
+  variants:
     default:
-      fundamental_pitch_spelling: Bb
+      pitch_designation: Bb
       staff_schemes:
         default:
           - clef: treble_clef
             sounding_transposition: -2
+  range_categories:
+    - soprano
 countertenor_voice:
   family_key: voice
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
           - clef: treble_clef
   range_categories:
-    - alto
+    - countertenor
 cowbell:
   classification_keys:
     - percussion
     - idiophone
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -409,7 +447,7 @@ crotales:
   classification_keys:
     - percussion
     - idiophone
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -417,7 +455,7 @@ crotales:
   orchestra_section_key: percussion
 cymbal:
   family_key: cymbal
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -426,12 +464,16 @@ double_bass:
   alias_name_keys:
     - contrabass
     - string_bass
-  pitch_variants:
+  family_key: double_bass
+  variants:
     default:
       staff_schemes:
         default:
           - clef: bass_clef
             sounding_transposition: -12
+  range_categories:
+    - bass
+    - contrabass
 euphonium:
   alias_name_keys:
     - tenor_tuba
@@ -439,7 +481,7 @@ euphonium:
     - aerophone
     - brass
     - wind
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -451,29 +493,36 @@ euphonium:
           - clef: treble_clef
             sounding_transposition: -14
   orchestra_section_key: brass
+  range_categories:
+    - baritone
 flugelhorn:
   family_key: saxhorn
-  pitch_variants:
+  variants:
     default:
-      fundamental_pitch_spelling: Bb
+      pitch_designation: Bb
       staff_schemes:
         default:
           - clef: treble_clef
             sounding_transposition: -2
+  range_categories:
+    - soprano
+    - alto
 flute:
   family_key: flute
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
           - clef: treble_clef
+  range_categories:
+    - soprano
 french_horn:
   alias_name_keys:
     - horn
   family_key: horn
-  pitch_variants:
+  variants:
     default:
-      fundamental_pitch_spelling: F
+      pitch_designation: F
       staff_schemes:
         default:
           - clef: treble_clef
@@ -481,20 +530,23 @@ french_horn:
         bass_clef:
           - clef: bass_clef
             sounding_transposition: 5
+  range_categories:
+    - alto
+    - tenor
 glockenspiel:
   alias_name_keys:
     - concert_bells
     - bells
     - carillon
   family_key: glockenspiel
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
           - clef: treble_clef
 guitar:
   family_key: guitar
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -505,7 +557,7 @@ hammered_dulcimer:
     - percussion
     - chordophone
     - string
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -513,14 +565,15 @@ hammered_dulcimer:
   orchestra_section_key: percussion
 harp:
   family_key: harp
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
           - clef: treble_clef
           - clef: bass_clef
 harpsichord:
-  pitch_variants:
+  family_key: harpsichord
+  variants:
     default:
       staff_schemes:
         default:
@@ -530,7 +583,7 @@ harpsichord:
             name_key: left_hand
 lute:
   family_key: lute
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -540,7 +593,7 @@ lute:
           - clef: treble_clef
 mandolin:
   family_key: mandolin
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -550,7 +603,7 @@ maracas:
     - percussion
     - shaken
     - idiophone
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -558,7 +611,7 @@ maracas:
   orchestra_section_key: percussion
 marimba:
   family_key: marimba
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -568,7 +621,7 @@ mezzo_soprano_voice:
   alias_name_keys:
     - mezzo_soprano
   family_key: voice
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -577,33 +630,40 @@ mezzo_soprano_voice:
     - mezzo_soprano
 natural_horn:
   family_key: horn
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
           - clef: treble_clef
+  range_categories:
+    - alto
+    - tenor
 oboe:
   family_key: oboe
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
           - clef: treble_clef
+  range_categories:
+    - soprano
 oboe_d_amore:
   alias_name_keys:
     - hautbois_d_amour
   family_key: oboe
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
           - clef: treble_clef
             sounding_transposition: -3
+  range_categories:
+    - alto
 organ:
   alias_name_keys:
     - pipe_organ
   family_key: organ
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -623,7 +683,7 @@ piano:
     - pianoforte
     - fortepiano
   family_key: piano
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -633,54 +693,278 @@ piano:
             name_key: left_hand
 piccolo_clarinet:
   family_key: clarinet
-  pitch_variants:
+  variants:
     default:
-      fundamental_pitch_spelling: Ab
+      pitch_designation: Ab
       staff_schemes:
         default:
           - clef: treble_clef
             sounding_transposition: 8
+  range_categories:
+    - piccolo
 piccolo_flute:
   alias_name_keys:
     - piccolo
   family_key: flute
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
           - clef: treble_clef
             sounding_transposition: 12
+  range_categories:
+    - piccolo
 piccolo_trumpet:
   family_key: trumpet
-  pitch_variants:
+  variants:
     default:
-      fundamental_pitch_spelling: Bb
+      pitch_designation: Bb
       staff_schemes:
         default:
           - clef: treble_clef
             sounding_transposition: 10
     alternate_leadpipe:
-      fundamental_pitch_spelling: A
+      pitch_designation: A
       staff_schemes:
         default:
           - clef: treble_clef
             sounding_transposition: 9
   range_categories:
     - piccolo
+garklein_recorder:
+  alias_name_keys:
+    - sopranissimo_recorder
+    - piccolo_recorder
+  family_key: recorder
+  variants:
+    default:
+      pitch_designation: C6
+      staff_schemes:
+        default:
+          - clef: treble_clef
+            sounding_transposition: 24
+  range_categories:
+    - piccolo
+sopranino_recorder:
+  family_key: recorder
+  variants:
+    default:
+      pitch_designation: F5
+      staff_schemes:
+        default:
+          - clef: treble_clef
+            sounding_transposition: 12
+  range_categories:
+    - sopranino
 recorder:
+  alias_name_keys:
+    - soprano_recorder
+    - descant
+  family_key: recorder
+  variants:
+    default:
+      pitch_designation: C5
+      staff_schemes:
+        default:
+          - clef: treble_clef
+            sounding_transposition: 12
+  range_categories:
+    - soprano
+alto_recorder:
+  alias_name_keys:
+    - treble_recorder
+  family_key: recorder
+  variants:
+    default:
+      pitch_designation: F4
+      staff_schemes:
+        default:
+          - clef: treble_clef
+  range_categories:
+    - alto
+tenor_recorder:
+  family_key: recorder
+  variants:
+    default:
+      pitch_designation: C4
+      staff_schemes:
+        default:
+          - clef: treble_clef
+  range_categories:
+    - tenor
+bass_recorder:
+  alias_name_keys:
+    - basset_recorder
+  family_key: recorder
+  variants:
+    default:
+      pitch_designation: F3
+      staff_schemes:
+        default:
+          - clef: bass_clef
+            sounding_transposition: 12
+  range_categories:
+    - baritone
+    - bass
+great_bass_recorder:
+  alias_name_keys:
+    - quart_bass_recorder
+  family_key: recorder
+  variants:
+    default:
+      pitch_designation: C3
+      staff_schemes:
+        default:
+          - clef: bass_clef
+            sounding_transposition: 12
+  range_categories:
+    - bass
+contrabass_recorder:
+  alias_name_keys:
+    - great_bass_recorder
+    - sub_bass_recorder
+  family_key: recorder
+  variants:
+    default:
+      pitch_designation: F2
+      staff_schemes:
+        default:
+          - clef: bass_clef
+            sounding_transposition: 0
+  range_categories:
+    - bass
+    - contrabass
+sub_great_bass_recorder:
+  alias_name_keys:
+    - contra_great_bass_recorder
+    - contrabass_recorder
+  family_key: recorder
+  variants:
+    default:
+      pitch_designation: C2
+      staff_schemes:
+        default:
+          - clef: bass_clef
+            sounding_transposition: 0
+  range_categories:
+    - contrabass
+sub_contrabass_recorder:
+  alias_name_keys:
+    - double_contrabass_recorder
+    - octocontrabass_recorder
   family_key: recorder
-  pitch_variants:
+  variants:
     default:
+      pitch_designation: F1
+      staff_schemes:
+        default:
+          - clef: bass_clef
+            sounding_transposition: -12
+  range_categories:
+    - contrabass
+    - subcontrabass
+soprillo:
+  alias_name_keys:
+    - piccolo_saxophone
+    - sopranissimo_saxophone
+  family_key: saxophone
+  variants:
+    default:
+      pitch_designation: Bb
       staff_schemes:
         default:
           - clef: treble_clef
-saxophone:
+            sounding_transposition: 10
+  range_categories:
+    - piccolo
+sopranino_saxophone:
   family_key: saxophone
-  pitch_variants:
+  variants:
     default:
+      pitch_designation: Eb
       staff_schemes:
         default:
           - clef: treble_clef
+            sounding_transposition: 3
+  range_categories:
+    - sopranino
+soprano_saxophone:
+  family_key: saxophone
+  variants:
+    default:
+      pitch_designation: Bb
+      staff_schemes:
+        default:
+          - clef: treble_clef
+            sounding_transposition: -2
+  range_categories:
+    - soprano
+alto_saxophone:
+  family_key: saxophone
+  variants:
+    default:
+      pitch_designation: Eb
+      staff_schemes:
+        default:
+          - clef: treble_clef
+            sounding_transposition: -9
+  range_categories:
+    - alto
+tenor_saxophone:
+  family_key: saxophone
+  variants:
+    default:
+      pitch_designation: Bb
+      staff_schemes:
+        default:
+          - clef: treble_clef
+            sounding_transposition: -14
+  range_categories:
+    - tenor
+baritone_saxophone:
+  family_key: saxophone
+  variants:
+    default:
+      pitch_designation: Eb
+      staff_schemes:
+        default:
+          - clef: treble_clef
+            sounding_transposition: -21
+  range_categories:
+    - baritone
+bass_saxophone:
+  family_key: saxophone
+  variants:
+    default:
+      pitch_designation: Bb
+      staff_schemes:
+        default:
+          - clef: treble_clef
+            sounding_transposition: -26
+  range_categories:
+    - bass
+contrabass_saxophone:
+  family_key: saxophone
+  variants:
+    default:
+      pitch_designation: Eb
+      staff_schemes:
+        default:
+          - clef: treble_clef
+            sounding_transposition: -33
+  range_categories:
+    - contrabass
+subcontrabass_saxophone:
+  family_key: saxophone
+  variants:
+    default:
+      pitch_designation: Bb
+      staff_schemes:
+        default:
+          - clef: treble_clef
+            sounding_transposition: -38
+  range_categories:
+    - subcontrabass
 snare_drum:
   alias_name_keys:
     - side_drum
@@ -688,7 +972,7 @@ snare_drum:
     - military_drum
     - field_drum
   family_key: snare_drum
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -697,7 +981,7 @@ soprano_voice:
   alias_name_keys:
     - soprano
   family_key: voice
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -706,23 +990,25 @@ soprano_voice:
     - soprano
 sousaphone:
   family_key: tuba
-  pitch_variants:
+  variants:
     default:
-      fundamental_pitch_spelling: Bb
+      pitch_designation: Bb
       staff_schemes:
         default:
           - clef: bass_clef
-  transposition: 0
+            sounding_transposition: 0
+  range_categories:
+    - bass
 suspended_cymbal:
   family_key: cymbal
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
           - clef: neutral_clef
 synthesizer:
   family_key: synthesizer
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -732,10 +1018,9 @@ synthesizer:
             name_key: left_hand
 tam_tam:
   alias_name_keys:
-    - tamtam
     - gong
   family_key: gong
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -746,7 +1031,7 @@ tambourine:
     - shaken
     - idiophone
     - membranophone
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -754,7 +1039,7 @@ tambourine:
   orchestra_section_key: percussion
 temple_blocks:
   family_key: woodblock
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -764,7 +1049,7 @@ tenor_drum:
     - percussion
     - struck
     - membranophone
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -772,7 +1057,7 @@ tenor_drum:
   orchestra_section_key: percussion
 tenor_voice:
   family_key: voice
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -791,17 +1076,20 @@ timpani:
     - kettledrum
     - timpanum
   family_key: kettledrum
-  pitch_variants:
+  orchestra_section_key: percussion
+  variants:
     default:
       staff_schemes:
         default:
           - clef: neutral_clef
+  range_categories:
+    - bass
 triangle:
   classification_keys:
     - percussion
     - struck
     - idiophone
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -811,44 +1099,35 @@ trombone:
   alias_name_keys:
     - tenor_trombone
   family_key: trombone
-  pitch_variants:
+  variants:
     default:
-      fundamental_pitch_spelling: Bb
+      pitch_designation: Bb
       staff_schemes:
         default:
           - clef: bass_clef
 trumpet:
   family_key: trumpet
-  pitch_variants:
+  variants:
     default:
-      fundamental_pitch_spelling: Bb
+      pitch_designation: Bb
       staff_schemes:
         default:
           - clef: treble_clef
             sounding_transposition: -2
-trumpet_in_c:
-  family_key: trumpet
-  pitch_variants:
-    default:
-      fundamental_pitch_spelling: C
+    in_c:
+      pitch_designation: C
       staff_schemes:
         default:
           - clef: treble_clef
             sounding_transposition: 0
-trumpet_in_d:
-  family_key: trumpet
-  pitch_variants:
-    default:
-      fundamental_pitch_spelling: D
+    in_d:
+      pitch_designation: D
       staff_schemes:
         default:
           - clef: treble_clef
             sounding_transposition: 2
-trumpet_in_e_flat:
-  family_key: trumpet
-  pitch_variants:
-    default:
-      fundamental_pitch_spelling: Eb
+    in_e_flat:
+      pitch_designation: Eb
       staff_schemes:
         default:
           - clef: treble_clef
@@ -857,9 +1136,9 @@ tuba:
   alias_name_keys:
     - contrabass_tuba
   family_key: tuba
-  pitch_variants:
+  variants:
     default:
-      fundamental_pitch_spelling: Bb
+      pitch_designation: Bb
       staff_schemes:
         default:
           - clef: bass_clef
@@ -867,7 +1146,7 @@ tuba:
           - clef: treble_clef
             sounding_transposition: -26
     in_c:
-      fundamental_pitch_spelling: C
+      pitch_designation: C
       staff_schemes:
         default:
           - clef: bass_clef
@@ -875,14 +1154,14 @@ vibraphone:
   alias_name_keys:
     - vibes
   family_key: vibraphone
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
           - clef: treble_clef
 viola:
   family_key: violin
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
@@ -891,22 +1170,22 @@ violin:
   alias_name_keys:
     - fiddle
   family_key: violin
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
           - clef: treble_clef
 woodblock:
   family_key: woodblock
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
           - clef: neutral_clef
 xylophone:
   family_key: xylophone
-  pitch_variants:
+  variants:
     default:
       staff_schemes:
         default:
-          - clef: treble_clef
+          - clef: treble_clef