head_music 7.0.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5329e3d4233738556d545c62cf0c721f42f8736aa483f58b80a6812318af0aa7
-  data.tar.gz: 5267548a7f4be05a8a3cbd76354ac1d6cc501475c235b0b5626a725be7f136a1
+  metadata.gz: 389a01e3f1ee98f5fed32a8fc0ade9c62d0ac3b8e19862bceed574939a2fd9c4
+  data.tar.gz: 639b5a1a4626e5aa00344933a2933bb3d9f50af4c23b64a406a348a80e7d4095
 SHA512:
-  metadata.gz: 0d90ef9a5432dc7fe68584f6ecccf7b2441aaaf756f5c19555fed48e8bb1f68a5bf0bf124500189f7f4366d62b0901e8910f07e3ed2a7ba43a47e6dddbf9df61
-  data.tar.gz: c9787b84e779684e2a807ff9af4bdc4bc98a7eafda0512c1d1beb0c0ab9034a7c28b551983ca914f2b6b364ba968b696086762777c3d58682f76577f811daee0
+  metadata.gz: 613ba46bebdb8072897e7512820a2faa89aff68e38f6a4dc5473432279556e6791fd4820a958ee139f9c11637d22d5523c0feee911588b08550b1fb284bd78b4
+  data.tar.gz: e49101f5776171b68725e0004bbe6f4026e46b896f1dedd20c9b02219493f6f7ad57dfbcc84546489595b0db3a8294234f36ed71c37b41adc14ce33f903ff355

data/lib/head_music/content/composition.rb

@@ -58,7 +58,7 @@ class HeadMusic::Content::Composition
   end
 
   def to_s
-    "#{name} — #{voices.count} #{voices.count == 1 ? 'voice' : 'voices'}"
+    "#{name} — #{voices.count} #{(voices.count == 1) ? "voice" : "voices"}"
   end
 
   private

data/lib/head_music/data/instrument_families.yml

@@ -165,6 +165,7 @@ saxophone:
     - single_reed
     - wind
     - woodwind
+  orchestra_section_key: woodwind
 snare_drum:
   classification_keys:
     - percussion

data/lib/head_music/data/instruments.yml

@@ -126,6 +126,8 @@ bass_drum:
         default:
           - clef: neutral_clef
   orchestra_section_key: percussion
+  range_categories:
+    - bass
 bass_guitar:
   family_key: guitar
   variants:
@@ -134,6 +136,8 @@ bass_guitar:
         default:
           - clef: bass_clef
             sounding_transposition: -12
+  range_categories:
+    - bass
 bass_oboe:
   alias_name_keys:
     - baritone_oboe
@@ -156,6 +160,8 @@ bass_trombone:
         default:
           - clef: bass_clef
             sounding_transposition: 0
+  range_categories:
+    - bass
 bass_trumpet:
   family_key: trumpet
   variants:
@@ -177,6 +183,9 @@ bass_trumpet:
         default:
           - clef: treble_clef
             sounding_transposition: -9
+  range_categories:
+    - baritone
+    - bass
 bass_tuba:
   family_key: tuba
   variants:
@@ -221,6 +230,8 @@ bassoon:
       staff_schemes:
         default:
           - clef: bass_clef
+  range_categories:
+    - bass
 bugle:
   family_key: trumpet
   variants:
@@ -236,6 +247,15 @@ bugle:
         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
@@ -269,6 +289,8 @@ cello:
       staff_schemes:
         default:
           - clef: bass_clef
+  range_categories:
+    - tenor
 chimes:
   alias_name_keys:
     - tubular_bells
@@ -334,7 +356,14 @@ clarinet:
         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
   variants:
     default:
@@ -342,6 +371,7 @@ clash_cymbals:
         default:
           - clef: neutral_clef
 clavichord:
+  family_key: clavichord
   variants:
     default:
       staff_schemes:
@@ -359,6 +389,8 @@ contrabass_clarinet:
         default:
           - clef: treble_clef
             sounding_transposition: -26
+  range_categories:
+    - contrabass
 contrabassoon:
   family_key: bassoon
   variants:
@@ -367,6 +399,8 @@ contrabassoon:
         default:
           - clef: bass_clef
             sounding_transposition: -12
+  range_categories:
+    - contrabass
 cor_anglais:
   alias_name_keys:
     - english_horn
@@ -377,6 +411,8 @@ cor_anglais:
         default:
           - clef: treble_clef
             sounding_transposition: -7
+  range_categories:
+    - alto
 cornet:
   family_key: cornet
   variants:
@@ -386,6 +422,8 @@ cornet:
         default:
           - clef: treble_clef
             sounding_transposition: -2
+  range_categories:
+    - soprano
 countertenor_voice:
   family_key: voice
   variants:
@@ -394,7 +432,7 @@ countertenor_voice:
         default:
           - clef: treble_clef
   range_categories:
-    - alto
+    - countertenor
 cowbell:
   classification_keys:
     - percussion
@@ -426,12 +464,16 @@ double_bass:
   alias_name_keys:
     - contrabass
     - string_bass
+  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
@@ -451,6 +493,8 @@ euphonium:
           - clef: treble_clef
             sounding_transposition: -14
   orchestra_section_key: brass
+  range_categories:
+    - baritone
 flugelhorn:
   family_key: saxhorn
   variants:
@@ -460,6 +504,9 @@ flugelhorn:
         default:
           - clef: treble_clef
             sounding_transposition: -2
+  range_categories:
+    - soprano
+    - alto
 flute:
   family_key: flute
   variants:
@@ -467,6 +514,8 @@ flute:
       staff_schemes:
         default:
           - clef: treble_clef
+  range_categories:
+    - soprano
 french_horn:
   alias_name_keys:
     - horn
@@ -481,6 +530,9 @@ french_horn:
         bass_clef:
           - clef: bass_clef
             sounding_transposition: 5
+  range_categories:
+    - alto
+    - tenor
 glockenspiel:
   alias_name_keys:
     - concert_bells
@@ -520,6 +572,7 @@ harp:
           - clef: treble_clef
           - clef: bass_clef
 harpsichord:
+  family_key: harpsichord
   variants:
     default:
       staff_schemes:
@@ -582,6 +635,9 @@ natural_horn:
       staff_schemes:
         default:
           - clef: treble_clef
+  range_categories:
+    - alto
+    - tenor
 oboe:
   family_key: oboe
   variants:
@@ -589,6 +645,8 @@ oboe:
       staff_schemes:
         default:
           - clef: treble_clef
+  range_categories:
+    - soprano
 oboe_d_amore:
   alias_name_keys:
     - hautbois_d_amour
@@ -599,6 +657,8 @@ oboe_d_amore:
         default:
           - clef: treble_clef
             sounding_transposition: -3
+  range_categories:
+    - alto
 organ:
   alias_name_keys:
     - pipe_organ
@@ -640,6 +700,8 @@ piccolo_clarinet:
         default:
           - clef: treble_clef
             sounding_transposition: 8
+  range_categories:
+    - piccolo
 piccolo_flute:
   alias_name_keys:
     - piccolo
@@ -650,6 +712,8 @@ piccolo_flute:
         default:
           - clef: treble_clef
             sounding_transposition: 12
+  range_categories:
+    - piccolo
 piccolo_trumpet:
   family_key: trumpet
   variants:
@@ -667,20 +731,240 @@ piccolo_trumpet:
             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
+  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
+            sounding_transposition: 10
+  range_categories:
+    - piccolo
+sopranino_saxophone:
+  family_key: saxophone
+  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
-saxophone:
+            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
@@ -712,7 +996,9 @@ sousaphone:
       staff_schemes:
         default:
           - clef: bass_clef
-  transposition: 0
+            sounding_transposition: 0
+  range_categories:
+    - bass
 suspended_cymbal:
   family_key: cymbal
   variants:
@@ -732,7 +1018,6 @@ synthesizer:
             name_key: left_hand
 tam_tam:
   alias_name_keys:
-    - tamtam
     - gong
   family_key: gong
   variants:
@@ -791,11 +1076,14 @@ timpani:
     - kettledrum
     - timpanum
   family_key: kettledrum
+  orchestra_section_key: percussion
   variants:
     default:
       staff_schemes:
         default:
           - clef: neutral_clef
+  range_categories:
+    - bass
 triangle:
   classification_keys:
     - percussion
@@ -900,4 +1188,4 @@ xylophone:
     default:
       staff_schemes:
         default:
-          - clef: treble_clef
+          - clef: treble_clef

data/lib/head_music/locales/en.yml

@@ -92,8 +92,8 @@ en:
       shaken: shaken
       single_reed: single-reed
       string: string
-      strings: strings
       stringed_instrument: stringed instrument
+      strings: strings
       struck: struck
       voice: voice
       wind: wind
@@ -103,6 +103,7 @@ en:
     instrument_with_pitch_designation: "%{instrument} in %{pitch_designation}"
     instrument_voices:
       piccolo: piccolo
+      sopranino: sopranino
       soprano: soprano
       mezzo_soprano: mezzo-soprano
       alto: alto
@@ -110,27 +111,37 @@ en:
       baritone: baritone
       bass: bass
       contrabass: contrabass
-      octobass: octobass
+      subcontrabass: subcontrabass
     instruments:
       accordion: accordion
       alto_clarinet: alto clarinet
       alto_flute: alto flute
+      alto_recorder: alto recorder
+      alto_saxophone: alto saxophone
       alto_voice: alto
       arpeggione: arpeggione
       bagpipe: bagpipe
+      bagpipes: bagpipes
       banjo: banjo
       baritone_horn: baritone horn
+      baritone_oboe: baritone oboe
+      baritone_saxophone: baritone saxophone
       baritone_voice: baritone
+      bass: bass
       bass_clarinet: bass clarinet
       bass_drum: bass drum
       bass_guitar: bass guitar
       bass_oboe: bass oboe
+      bass_recorder: bass recorder
+      bass_saxophone: bass saxophone
       bass_trombone: bass trombone
       bass_trumpet: bass trumpet
       bass_tuba: bass tuba
       bass_voice: bass
       basset_horn: basset horn
+      basset_recorder: basset recorder
       bassoon: bassoon
+      bells: bells
       bugle: bugle
       castanets: castanets
       celesta: celesta
@@ -138,63 +149,125 @@ en:
       chimes: chimes
       cimbalom: cimbalom
       clarinet: clarinet
+      clarion: clarion
       clash_cymbals: clash cymbals
       clavichord: clavichord
+      concert_bells: concert bells
+      concert_cymbals: concert cymbals
+      contra_great_bass_recorder: contra-great bass recorder
+      contrabass: contrabass
       contrabass_clarinet: contrabass clarinet
+      contrabass_recorder: contrabass recorder
+      contrabass_saxophone: contrabass saxophone
+      contrabass_tuba: contrabass tuba
       contrabassoon: contrabassoon
+      contralto: contralto
+      contralto_voice: contralto
       cor_anglais: cor anglais
       cornet: cornet
-      cowbell: cowbell
       countertenor_voice: countertenor
+      cowbell: cowbell
+      crash_cymbal: crash cymbal
+      crash_cymbals: crash cymbals
       crotales: crotales
       cymbal: cymbal
+      descant: descant
       double_bass: double bass
+      double_contrabass_recorder: double-contrabass recorder
       english_horn: English horn
       euphonium: euphonium
+      fiddle: fiddle
+      field_drum: field drum
       flugelhorn: flugelhorn
       flute: flute
+      fortepiano: fortepiano
       french_horn: French horn
+      garklein_recorder: garklein recorder
       glockenspiel: glockenspiel
+      gong: gong
+      great_bass_recorder: great bass recorder
       great_highland_bagpipe: great highland bagpipe
       guitar: guitar
       hammered_dulcimer: hammered dulcimer
       harp: harp
       harpsichord: harpsichord
+      hautbois_d_amour: hautbois d'amour
+      hi-hat: hi-hat
       horn: horn
+      kettledrum: kettledrum
+      kick_drum: kick drum
       lute: lute
       mandolin: mandolin
       maracas: maracas
       marimba: marimba
       metal_block: metal block
+      mezzo: mezzo
+      mezzo_soprano: mezzo-soprano
+      mezzo_soprano_voice: mezzo-soprano
+      military_drum: military drum
       natural_horn: natural horn
       oboe: oboe
       oboe_d_amore: oboe d'amore
+      octocontrabass_recorder: octocontrabass recorder
+      orchestral_chimes: orchestral chimes
+      orchestral_cymbals: orchestral cymbals
       organ: organ
       piano: piano
+      pianoforte: pianoforte
       piccolo: piccolo
       piccolo_clarinet: piccolo clarinet
       piccolo_flute: piccolo flute
+      piccolo_recorder: piccolo recorder
+      piccolo_saxophone: piccolo saxophone
       piccolo_trumpet: piccolo trumpet
+      pipe_organ: pipe organ
+      quart_bass_recorder: quart bass recorder
       recorder: recorder
+      ride_cymbal: ride cymbal
       saxophone: saxophone
       side_drum: side drum
       snare_drum: snare drum
+      sopranino_clarinet: sopranino clarinet
+      sopranino_recorder: sopranino recorder
+      sopranino_saxophone: sopranino saxophone
+      sopranissimo_recorder: sopranissimo recorder
+      sopranissimo_saxophone: sopranissimo saxophone
+      soprano: soprano
+      soprano_clarinet: soprano clarinet
+      soprano_recorder: soprano recorder
+      soprano_saxophone: soprano saxophone
       soprano_voice: soprano
+      soprillo: soprillo
       sousaphone: sousaphone
+      string_bass: string bass
+      sub_bass_recorder: sub-bass recorder
+      sub_contrabass_recorder: sub-contrabass recorder
+      sub_great_bass_recorder: sub-great bass recorder
+      subcontrabass_saxophone: subcontrabass saxophone
       suspended_cymbal: suspended cymbal
       synthesizer: synthesizer
+      tabor: tabor
       tam_tam: tam-tam
       tambourine: tambourine
       temple_blocks: temple blocks
+      tenor: tenor
       tenor_drum: tenor drum
+      tenor_recorder: tenor recorder
+      tenor_saxophone: tenor saxophone
       tenor_trombone: tenor trombone
+      tenor_tuba: tenor tuba
       tenor_voice: tenor
       timpani: timpani
+      timpanum: timpanum
+      tom_drum: tom drum
+      tom_tom: tom-tom
+      treble_recorder: treble recorder
       triangle: triangle
       trombone: trombone
       trumpet: trumpet
       tuba: tuba
       tubular_bells: tubular bells
+      vibes: vibes
       vibraphone: vibraphone
       viola: viola
       viola_d_amore: viola d'amore

data/lib/head_music/locales/fr.yml

@@ -57,7 +57,6 @@ fr:
       alto: alto
       baritone: baryton
       bass: basse
-      contralto: contralto
       countertenor: contre-ténor
       mezzo_soprano: mezzo-soprano
       soprano: soprano

data/lib/head_music/version.rb

@@ -1,3 +1,3 @@
 module HeadMusic
-  VERSION = "7.0.0"
+  VERSION = "7.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: head_music
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.1
 platform: ruby
 authors:
 - Rob Head
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-03 00:00:00.000000000 Z
+date: 2024-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport