RubyGems - head_music - Versions diffs - 8.2.0 → 8.3.0 - Mend

head_music 8.2.0 → 8.3.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 (46) hide show

checksums.yaml +4 -4
data/.github/workflows/ci.yml +1 -1
data/.github/workflows/release.yml +1 -1
data/CHANGELOG.md +14 -0
data/CLAUDE.md +134 -0
data/Gemfile.lock +25 -25
data/Rakefile +2 -2
data/TODO.md +41 -150
data/bin/check_instrument_consistency.rb +86 -0
data/check_instrument_consistency.rb +0 -0
data/head_music.gemspec +1 -1
data/lib/head_music/analysis/diatonic_interval/naming.rb +1 -1
data/lib/head_music/analysis/diatonic_interval.rb +28 -7
data/lib/head_music/analysis/sonority.rb +1 -1
data/lib/head_music/content/staff.rb +13 -3
data/lib/head_music/content/voice.rb +8 -0
data/lib/head_music/instruments/instrument.rb +1 -3
data/lib/head_music/instruments/instrument_families.yml +37 -2
data/lib/head_music/instruments/instruments.yml +352 -367
data/lib/head_music/instruments/variant.rb +1 -1
data/lib/head_music/locales/de.yml +20 -0
data/lib/head_music/locales/en.yml +92 -0
data/lib/head_music/locales/es.yml +19 -0
data/lib/head_music/locales/fr.yml +19 -0
data/lib/head_music/locales/it.yml +20 -0
data/lib/head_music/locales/ru.yml +21 -2
data/lib/head_music/rudiment/rhythmic_unit.rb +93 -26
data/lib/head_music/rudiment/scale_degree.rb +8 -3
data/lib/head_music/rudiment/tuning/just_intonation.rb +85 -0
data/lib/head_music/rudiment/tuning/meantone.rb +87 -0
data/lib/head_music/rudiment/tuning/pythagorean.rb +91 -0
data/lib/head_music/rudiment/tuning.rb +17 -3
data/lib/head_music/style/annotation.rb +6 -6
data/lib/head_music/style/guidelines/consonant_climax.rb +2 -2
data/lib/head_music/style/guidelines/notes_same_length.rb +16 -16
data/lib/head_music/version.rb +1 -1
data/lib/head_music.rb +3 -0
data/user_stories/backlog/band-score-order.md +38 -0
data/user_stories/backlog/chamber-ensemble-score-order.md +33 -0
data/user_stories/backlog/consonance-dissonance-classification.md +57 -0
data/user_stories/backlog/dyad-analysis.md +65 -0
data/user_stories/backlog/orchestral-score-order.md +43 -0
data/user_stories/backlog/pitch-class-set-analysis.md +39 -0
data/user_stories/backlog/pitch-set-classification.md +62 -0
data/user_stories/backlog/sonority-identification.md +47 -0
metadata +18 -4

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

@@ -9,6 +9,8 @@ accordion:
           - clef: bass_clef
 alto_clarinet:
   family_key: clarinet
+  range_categories:
+    - alto
   variants:
     default:
       pitch_designation: Eb
@@ -16,10 +18,10 @@ alto_clarinet:
         default:
           - clef: treble_clef
             sounding_transposition: -9
-  range_categories:
-    - alto
 alto_flute:
   family_key: flute
+  range_categories:
+    - alto
   variants:
     default:
       pitch_designation: G
@@ -27,42 +29,53 @@ alto_flute:
         default:
           - clef: treble_clef
             sounding_transposition: -5
+alto_recorder:
+  alias_name_keys:
+    - treble_recorder
+  family_key: recorder
+  range_categories:
+    - alto
+  variants:
+    default:
+      pitch_designation: F4
+      staff_schemes:
+        default:
+          - clef: treble_clef
+alto_saxophone:
+  family_key: saxophone
   range_categories:
     - alto
+  variants:
+    default:
+      pitch_designation: Eb
+      staff_schemes:
+        default:
+          - clef: treble_clef
+            sounding_transposition: -9
 alto_voice:
   alias_name_keys:
     - contralto
     - alto
   family_key: voice
+  range_categories:
+    - alto
   variants:
     default:
       staff_schemes:
         default:
           - clef: treble_clef
-  range_categories:
-    - alto
 arpeggione:
   classification_keys:
     - bowed
     - chordophone
     - string
-  variants:
-    default:
-      staff_schemes:
-        default:
-          - clef: treble_clef
-            sounding_transposition: -12
   orchestra_section_key: string
-great_highland_bagpipe:
-  alias_name_keys:
-    - bagpipe
-  family_key: bagpipe
   variants:
     default:
       staff_schemes:
         default:
           - clef: treble_clef
-            sounding_transposition: 1
+            sounding_transposition: -12
 banjo:
   classification_keys:
     - plucked
@@ -77,6 +90,8 @@ banjo:
             sounding_transposition: -12
 baritone_horn:
   family_key: saxhorn
+  range_categories:
+    - baritone
   variants:
     default:
       pitch_designation: Bb
@@ -87,19 +102,41 @@ baritone_horn:
         treble:
           - clef: treble_clef
             sounding_transposition: -14
+baritone_saxophone:
+  family_key: saxophone
+  range_categories:
+    - baritone
+  variants:
+    default:
+      pitch_designation: Eb
+      staff_schemes:
+        default:
+          - clef: treble_clef
+            sounding_transposition: -21
+baritone_ukulele:
+  family_key: ukulele
   range_categories:
+    - alto
+    - tenor
     - baritone
+  variants:
+    default:
+      staff_schemes:
+        default:
+          - clef: treble_clef
 baritone_voice:
   family_key: voice
+  range_categories:
+    - baritone
   variants:
     default:
       staff_schemes:
         default:
           - clef: bass_clef
-  range_categories:
-    - baritone
 bass_clarinet:
   family_key: clarinet
+  range_categories:
+    - bass
   variants:
     default:
       pitch_designation: Bb
@@ -113,45 +150,69 @@ bass_clarinet:
         italian_notation:
           - clef: bass_clef
             sounding_transposition: -9
+bass_drum:
+  alias_name_keys:
+    - kick_drum
+  family_key: bass_drum
   range_categories:
     - bass
-bass_drum:
-  classification_keys:
-    - percussion
-    - membranophone
   variants:
     default:
       staff_schemes:
         default:
           - clef: neutral_clef
-  orchestra_section_key: percussion
-  range_categories:
-    - bass
 bass_guitar:
   family_key: guitar
+  range_categories:
+    - bass
   variants:
     default:
       staff_schemes:
         default:
           - clef: bass_clef
             sounding_transposition: -12
-  range_categories:
-    - bass
 bass_oboe:
   alias_name_keys:
     - baritone_oboe
   family_key: oboe
+  range_categories:
+    - baritone
+    - bass
   variants:
     default:
       staff_schemes:
         default:
           - clef: treble_clef
             sounding_transposition: -12
+bass_recorder:
+  alias_name_keys:
+    - basset_recorder
+  family_key: recorder
   range_categories:
     - baritone
     - bass
+  variants:
+    default:
+      pitch_designation: F3
+      staff_schemes:
+        default:
+          - clef: bass_clef
+            sounding_transposition: 12
+bass_saxophone:
+  family_key: saxophone
+  range_categories:
+    - bass
+  variants:
+    default:
+      pitch_designation: Bb
+      staff_schemes:
+        default:
+          - clef: treble_clef
+            sounding_transposition: -26
 bass_trombone:
   family_key: trombone
+  range_categories:
+    - bass
   variants:
     default:
       pitch_designation: Bb
@@ -159,10 +220,11 @@ bass_trombone:
         default:
           - clef: bass_clef
             sounding_transposition: 0
-  range_categories:
-    - bass
 bass_trumpet:
   family_key: trumpet
+  range_categories:
+    - baritone
+    - bass
   variants:
     default:
       pitch_designation: Bb
@@ -182,11 +244,10 @@ bass_trumpet:
         default:
           - clef: treble_clef
             sounding_transposition: -9
-  range_categories:
-    - baritone
-    - bass
 bass_tuba:
   family_key: tuba
+  range_categories:
+    - bass
   variants:
     default:
       pitch_designation: F
@@ -196,22 +257,31 @@ bass_tuba:
     in_e_flat:
       pitch_designation: Eb
       staff_schemes:
-        default:
-          - clef: bass_clef
         british_band:
           - clef: treble_clef
             sounding_transposition: -21
+        default:
+          - clef: bass_clef
+bass_ukulele:
+  family_key: ukulele
   range_categories:
     - bass
-bass_voice:
-  family_key: voice
+    - baritone
+    - tenor
   variants:
     default:
       staff_schemes:
         default:
           - clef: bass_clef
+bass_voice:
+  family_key: voice
   range_categories:
     - bass
+  variants:
+    default:
+      staff_schemes:
+        default:
+          - clef: bass_clef
 basset_horn:
   family_key: clarinet
   variants:
@@ -223,16 +293,19 @@ basset_horn:
             sounding_transposition: -7
 bassoon:
   family_key: bassoon
+  range_categories:
+    - bass
   variants:
     default:
       pitch_designation: F
       staff_schemes:
         default:
           - clef: bass_clef
-  range_categories:
-    - bass
 bugle:
   family_key: trumpet
+  range_categories:
+    - soprano
+    - alto
   variants:
     default:
       pitch_designation: G
@@ -252,24 +325,18 @@ bugle:
         default:
           - clef: treble_clef
             sounding_transposition: 0
-  range_categories:
-    - soprano
-    - alto
 castanets:
   classification_keys:
     - percussion
     - idiophone
+  orchestra_section_key: percussion
   variants:
     default:
       staff_schemes:
         default:
           - clef: neutral_clef
-  orchestra_section_key: percussion
 celesta:
-  classification_keys:
-    - keyboard
-    - percussion
-    - idiophone
+  family_key: celesta
   variants:
     default:
       staff_schemes:
@@ -278,18 +345,17 @@ celesta:
             name_key: right_hand
           - clef: bass_clef
             name_key: left_hand
-  orchestra_section_key: keyboard
 cello:
   alias_name_keys:
     - violoncello
   family_key: violin
+  range_categories:
+    - tenor
   variants:
     default:
       staff_schemes:
         default:
           - clef: bass_clef
-  range_categories:
-    - tenor
 chimes:
   alias_name_keys:
     - tubular_bells
@@ -297,29 +363,32 @@ chimes:
   classification_keys:
     - percussion
     - idiophone
+  orchestra_section_key: percussion
   variants:
     default:
       staff_schemes:
         default:
           - clef: treble_clef
-  orchestra_section_key: percussion
 cimbalom:
   classification_keys:
     - chordophone
     - string
     - struck
     - plucked
+  orchestra_section_key: string
   variants:
     default:
       staff_schemes:
         default:
           - clef: treble_clef
           - clef: bass_clef
-  orchestra_section_key: string
 clarinet:
   alias_name_keys:
     - soprano_clarinet
   family_key: clarinet
+  range_categories:
+    - soprano
+    - sopranino
   variants:
     default:
       pitch_designation: Bb
@@ -340,9 +409,9 @@ clarinet:
           - clef: treble_clef
             sounding_transposition: 0
     in_d:
-      pitch_designation: D
       alias_name_keys:
         - sopranino_clarinet
+      pitch_designation: D
       staff_schemes:
         default:
           - clef: treble_clef
@@ -355,9 +424,6 @@ clarinet:
         default:
           - clef: treble_clef
             sounding_transposition: 3
-  range_categories:
-    - soprano
-    - sopranino
 clash_cymbals:
   alias_name_keys:
     - concert_cymbals
@@ -378,8 +444,22 @@ clavichord:
             name_key: right_hand
           - clef: bass_clef
             name_key: left_hand
+concert_ukulele:
+  alias_name_keys:
+    - alto_ukulele
+  family_key: ukulele
+  range_categories:
+    - soprano
+    - alto
+  variants:
+    default:
+      staff_schemes:
+        default:
+          - clef: treble_clef
 contrabass_clarinet:
   family_key: clarinet
+  range_categories:
+    - contrabass
   variants:
     default:
       pitch_designation: Bb
@@ -387,32 +467,58 @@ contrabass_clarinet:
         default:
           - clef: treble_clef
             sounding_transposition: -26
+contrabass_recorder:
+  alias_name_keys:
+    - great_bass_recorder
+    - sub_bass_recorder
+  family_key: recorder
+  range_categories:
+    - bass
+    - contrabass
+  variants:
+    default:
+      pitch_designation: F2
+      staff_schemes:
+        default:
+          - clef: bass_clef
+            sounding_transposition: 0
+contrabass_saxophone:
+  family_key: saxophone
   range_categories:
     - contrabass
+  variants:
+    default:
+      pitch_designation: Eb
+      staff_schemes:
+        default:
+          - clef: treble_clef
+            sounding_transposition: -33
 contrabassoon:
   family_key: bassoon
+  range_categories:
+    - contrabass
   variants:
     default:
       staff_schemes:
         default:
           - clef: bass_clef
             sounding_transposition: -12
-  range_categories:
-    - contrabass
 cor_anglais:
   alias_name_keys:
     - english_horn
   family_key: oboe
+  range_categories:
+    - alto
   variants:
     default:
       staff_schemes:
         default:
           - clef: treble_clef
             sounding_transposition: -7
-  range_categories:
-    - alto
 cornet:
   family_key: cornet
+  range_categories:
+    - soprano
   variants:
     default:
       pitch_designation: Bb
@@ -420,37 +526,35 @@ cornet:
         default:
           - clef: treble_clef
             sounding_transposition: -2
-  range_categories:
-    - soprano
 countertenor_voice:
   family_key: voice
+  range_categories:
+    - countertenor
   variants:
     default:
       staff_schemes:
         default:
           - clef: treble_clef
-  range_categories:
-    - countertenor
 cowbell:
   classification_keys:
     - percussion
     - idiophone
+  orchestra_section_key: percussion
   variants:
     default:
       staff_schemes:
         default:
           - clef: neutral_clef
-  orchestra_section_key: percussion
 crotales:
   classification_keys:
     - percussion
     - idiophone
+  orchestra_section_key: percussion
   variants:
     default:
       staff_schemes:
         default:
           - clef: neutral_clef
-  orchestra_section_key: percussion
 cymbal:
   family_key: cymbal
   variants:
@@ -470,38 +574,37 @@ double_bass:
     - contrabass
     - string_bass
   family_key: double_bass
+  range_categories:
+    - bass
+    - contrabass
   variants:
     default:
       staff_schemes:
         default:
           - clef: bass_clef
             sounding_transposition: -12
-  range_categories:
-    - bass
-    - contrabass
 euphonium:
   alias_name_keys:
     - tenor_tuba
-  classification_keys:
-    - aerophone
-    - brass
-    - wind
+  family_key: tuba
+  range_categories:
+    - baritone
   variants:
-    default:
-      staff_schemes:
-        default:
-          - clef: bass_clef
-            sounding_transposition: 0
     british_band:
       staff_schemes:
         default:
           - clef: treble_clef
             sounding_transposition: -14
-  orchestra_section_key: brass
-  range_categories:
-    - baritone
+    default:
+      staff_schemes:
+        default:
+          - clef: bass_clef
+            sounding_transposition: 0
 flugelhorn:
   family_key: saxhorn
+  range_categories:
+    - soprano
+    - alto
   variants:
     default:
       pitch_designation: Bb
@@ -509,35 +612,46 @@ flugelhorn:
         default:
           - clef: treble_clef
             sounding_transposition: -2
-  range_categories:
-    - soprano
-    - alto
 flute:
   family_key: flute
-  variants:
+  range_categories:
+    - soprano
+  variants:
     default:
       staff_schemes:
         default:
           - clef: treble_clef
-  range_categories:
-    - soprano
 french_horn:
   alias_name_keys:
     - horn
   family_key: horn
+  range_categories:
+    - alto
+    - tenor
   variants:
     default:
       pitch_designation: F
       staff_schemes:
-        default:
-          - clef: treble_clef
-            sounding_transposition: -7
         bass_clef:
           - clef: bass_clef
             sounding_transposition: 5
+        default:
+          - clef: treble_clef
+            sounding_transposition: -7
+garklein_recorder:
+  alias_name_keys:
+    - sopranissimo_recorder
+    - piccolo_recorder
+  family_key: recorder
   range_categories:
-    - alto
-    - tenor
+    - piccolo
+  variants:
+    default:
+      pitch_designation: C6
+      staff_schemes:
+        default:
+          - clef: treble_clef
+            sounding_transposition: 24
 glockenspiel:
   alias_name_keys:
     - concert_bells
@@ -549,6 +663,29 @@ glockenspiel:
       staff_schemes:
         default:
           - clef: treble_clef
+great_bass_recorder:
+  alias_name_keys:
+    - quart_bass_recorder
+  family_key: recorder
+  range_categories:
+    - bass
+  variants:
+    default:
+      pitch_designation: C3
+      staff_schemes:
+        default:
+          - clef: bass_clef
+            sounding_transposition: 12
+great_highland_bagpipe:
+  alias_name_keys:
+    - bagpipe
+  family_key: bagpipe
+  variants:
+    default:
+      staff_schemes:
+        default:
+          - clef: treble_clef
+            sounding_transposition: 1
 guitar:
   family_key: guitar
   variants:
@@ -562,12 +699,12 @@ hammered_dulcimer:
     - percussion
     - chordophone
     - string
+  orchestra_section_key: percussion
   variants:
     default:
       staff_schemes:
         default:
           - clef: treble_clef
-  orchestra_section_key: percussion
 harmonica:
   alias_name_keys:
     - mouth_organ
@@ -617,12 +754,12 @@ maracas:
     - percussion
     - shaken
     - idiophone
+  orchestra_section_key: percussion
   variants:
     default:
       staff_schemes:
         default:
           - clef: neutral_clef
-  orchestra_section_key: percussion
 marimba:
   family_key: marimba
   variants:
@@ -635,44 +772,44 @@ mezzo_soprano_voice:
   alias_name_keys:
     - mezzo_soprano
   family_key: voice
+  range_categories:
+    - mezzo_soprano
   variants:
     default:
       staff_schemes:
         default:
           - clef: treble_clef
-  range_categories:
-    - mezzo_soprano
 natural_horn:
   family_key: horn
+  range_categories:
+    - alto
+    - tenor
   variants:
     default:
       staff_schemes:
         default:
           - clef: treble_clef
-  range_categories:
-    - alto
-    - tenor
 oboe:
   family_key: oboe
+  range_categories:
+    - soprano
   variants:
     default:
       staff_schemes:
         default:
           - clef: treble_clef
-  range_categories:
-    - soprano
 oboe_d_amore:
   alias_name_keys:
     - hautbois_d_amour
   family_key: oboe
+  range_categories:
+    - alto
   variants:
     default:
       staff_schemes:
         default:
           - clef: treble_clef
             sounding_transposition: -3
-  range_categories:
-    - alto
 organ:
   alias_name_keys:
     - pipe_organ
@@ -707,6 +844,8 @@ piano:
             name_key: left_hand
 piccolo_clarinet:
   family_key: clarinet
+  range_categories:
+    - piccolo
   variants:
     default:
       pitch_designation: Ab
@@ -714,185 +853,96 @@ piccolo_clarinet:
         default:
           - clef: treble_clef
             sounding_transposition: 8
-  range_categories:
-    - piccolo
 piccolo_flute:
   alias_name_keys:
     - piccolo
   family_key: flute
+  range_categories:
+    - piccolo
   variants:
     default:
       staff_schemes:
         default:
           - clef: treble_clef
             sounding_transposition: 12
-  range_categories:
-    - piccolo
 piccolo_trumpet:
   family_key: trumpet
+  range_categories:
+    - piccolo
   variants:
-    default:
-      pitch_designation: Bb
-      staff_schemes:
-        default:
-          - clef: treble_clef
-            sounding_transposition: 10
     alternate_leadpipe:
       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
+      pitch_designation: Bb
       staff_schemes:
         default:
           - clef: treble_clef
-            sounding_transposition: 24
+            sounding_transposition: 10
+pocket_ukulele:
+  alias_name_keys:
+    - sopranino_ukulele
+    - piccolo_ukulele
+  family_key: ukulele
   range_categories:
-    - piccolo
-sopranino_recorder:
-  family_key: recorder
+    - sopranino
+    - soprano
   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
+      pitch_designation: C5
       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
+sitar:
+  family_key: sitar
   variants:
     default:
-      pitch_designation: F2
       staff_schemes:
         default:
-          - clef: bass_clef
-            sounding_transposition: 0
-  range_categories:
-    - bass
-    - contrabass
-sub_great_bass_recorder:
+          - clef: treble_clef
+snare_drum:
   alias_name_keys:
-    - contra_great_bass_recorder
-    - contrabass_recorder
-  family_key: recorder
+    - side_drum
+    - tabor
+    - military_drum
+    - field_drum
+  family_key: snare_drum
   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
+          - clef: neutral_clef
+sopranino_recorder:
   family_key: recorder
-  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
+    - sopranino
   variants:
     default:
-      pitch_designation: Bb
+      pitch_designation: F5
       staff_schemes:
         default:
           - clef: treble_clef
-            sounding_transposition: 10
-  range_categories:
-    - piccolo
+            sounding_transposition: 12
 sopranino_saxophone:
   family_key: saxophone
+  range_categories:
+    - sopranino
   variants:
     default:
       pitch_designation: Eb
@@ -900,10 +950,10 @@ sopranino_saxophone:
         default:
           - clef: treble_clef
             sounding_transposition: 3
-  range_categories:
-    - sopranino
 soprano_saxophone:
   family_key: saxophone
+  range_categories:
+    - soprano
   variants:
     default:
       pitch_designation: Bb
@@ -911,124 +961,91 @@ soprano_saxophone:
         default:
           - clef: treble_clef
             sounding_transposition: -2
+soprano_voice:
+  alias_name_keys:
+    - soprano
+  family_key: voice
   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:
+soprillo:
+  alias_name_keys:
+    - piccolo_saxophone
+    - sopranissimo_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
+    - piccolo
   variants:
     default:
       pitch_designation: Bb
       staff_schemes:
         default:
           - clef: treble_clef
-            sounding_transposition: -26
+            sounding_transposition: 10
+sousaphone:
+  family_key: tuba
   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
-sitar:
-  family_key: sitar
+          - clef: bass_clef
+            sounding_transposition: 0
+steelpan:
+  alias_name_keys:
+    - steel_drum
+  family_key: steelpan
   variants:
     default:
       staff_schemes:
         default:
           - clef: treble_clef
-snare_drum:
+sub_contrabass_recorder:
   alias_name_keys:
-    - side_drum
-    - tabor
-    - military_drum
-    - field_drum
-  family_key: snare_drum
+    - double_contrabass_recorder
+    - octocontrabass_recorder
+  family_key: recorder
+  range_categories:
+    - contrabass
+    - subcontrabass
   variants:
     default:
+      pitch_designation: F1
       staff_schemes:
         default:
-          - clef: neutral_clef
-soprano_voice:
+          - clef: bass_clef
+            sounding_transposition: -12
+sub_great_bass_recorder:
   alias_name_keys:
-    - soprano
-  family_key: voice
-  variants:
-    default:
-      staff_schemes:
-        default:
-          - clef: treble_clef
+    - contra_great_bass_recorder
+    - contrabass_recorder
+  family_key: recorder
   range_categories:
-    - soprano
-sousaphone:
-  family_key: tuba
+    - contrabass
   variants:
     default:
-      pitch_designation: Bb
+      pitch_designation: C2
       staff_schemes:
         default:
           - clef: bass_clef
             sounding_transposition: 0
+subcontrabass_saxophone:
+  family_key: saxophone
   range_categories:
-    - bass
-steelpan:
-  alias_name_keys:
-    - steel_drum
-  family_key: steelpan
+    - subcontrabass
   variants:
     default:
+      pitch_designation: Bb
       staff_schemes:
         default:
           - clef: treble_clef
+            sounding_transposition: -38
 suspended_cymbal:
   family_key: cymbal
   variants:
@@ -1065,17 +1082,12 @@ tam_tam:
         default:
           - clef: neutral_clef
 tambourine:
-  classification_keys:
-    - percussion
-    - shaken
-    - idiophone
-    - membranophone
+  family_key: tambourine
   variants:
     default:
       staff_schemes:
         default:
           - clef: neutral_clef
-  orchestra_section_key: percussion
 temple_blocks:
   family_key: woodblock
   variants:
@@ -1088,28 +1100,58 @@ tenor_drum:
     - percussion
     - struck
     - membranophone
+  orchestra_section_key: percussion
   variants:
     default:
       staff_schemes:
         default:
           - clef: neutral_clef
-  orchestra_section_key: percussion
+tenor_recorder:
+  family_key: recorder
+  range_categories:
+    - tenor
+  variants:
+    default:
+      pitch_designation: C4
+      staff_schemes:
+        default:
+          - clef: treble_clef
+tenor_saxophone:
+  family_key: saxophone
+  range_categories:
+    - tenor
+  variants:
+    default:
+      pitch_designation: Bb
+      staff_schemes:
+        default:
+          - clef: treble_clef
+            sounding_transposition: -14
+tenor_ukulele:
+  family_key: ukulele
+  range_categories:
+    - tenor
+  variants:
+    default:
+      staff_schemes:
+        default:
+          - clef: treble_clef
 tenor_voice:
   family_key: voice
+  range_categories:
+    - tenor
   variants:
     default:
       staff_schemes:
-        default:
-          - clef: vocal_tenor_clef
         bass:
           - clef: bass_clef
+        default:
+          - clef: vocal_tenor_clef
         tenor:
           - clef: tenor_clef
         treble:
           - clef: treble_clef
             sounding_transposition: -12
-  range_categories:
-    - tenor
 theremin:
   family_key: theremin
   variants:
@@ -1122,25 +1164,24 @@ timpani:
     - kettledrum
     - timpanum
   family_key: kettledrum
-  orchestra_section_key: percussion
+  range_categories:
+    - bass
   variants:
     default:
       staff_schemes:
         default:
           - clef: neutral_clef
-  range_categories:
-    - bass
 triangle:
   classification_keys:
     - percussion
     - struck
     - idiophone
+  orchestra_section_key: percussion
   variants:
     default:
       staff_schemes:
         default:
           - clef: neutral_clef
-  orchestra_section_key: percussion
 trombone:
   alias_name_keys:
     - tenor_trombone
@@ -1186,11 +1227,11 @@ tuba:
     default:
       pitch_designation: Bb
       staff_schemes:
-        default:
-          - clef: bass_clef
         british_band:
           - clef: treble_clef
             sounding_transposition: -26
+        default:
+          - clef: bass_clef
     in_c:
       pitch_designation: C
       staff_schemes:
@@ -1200,70 +1241,14 @@ ukulele:
   alias_name_keys:
     - soprano_ukulele
   family_key: ukulele
-  variants:
-    default:
-      staff_schemes:
-        default:
-          - clef: treble_clef
-  range_categories:
-    - soprano
-    - alto
-pocket_ukulele:
-  alias_name_keys:
-    - sopranino_ukulele
-    - piccolo_ukulele
-  family_key: ukulele
-  variants:
-    default:
-      staff_schemes:
-        default:
-          - clef: treble_clef
-  range_categories:
-    - sopranino
-    - soprano
-concert_ukulele:
-  alias_name_keys:
-    - alto_ukulele
-  family_key: ukulele
-  variants:
-    default:
-      staff_schemes:
-        default:
-          - clef: treble_clef
   range_categories:
     - soprano
     - alto
-tenor_ukulele:
-  family_key: ukulele
-  variants:
-    default:
-      staff_schemes:
-        default:
-          - clef: treble_clef
-  range_categories:
-    - tenor
-baritone_ukulele:
-  family_key: ukulele
   variants:
     default:
       staff_schemes:
         default:
           - clef: treble_clef
-  range_categories:
-    - alto
-    - tenor
-    - baritone
-bass_ukulele:
-  family_key: ukulele
-  variants:
-    default:
-      staff_schemes:
-        default:
-          - clef: bass_clef
-  range_categories:
-    - bass
-    - baritone
-    - tenor
 vibraphone:
   alias_name_keys:
     - vibes