head_music 8.1.1 → 8.2.1

data/lib/head_music/instruments/instrument_families.yml

@@ -14,6 +14,12 @@ bagpipe:
     - wind
     - woodwind
   orchestra_section_key: woodwind
+bass_drum:
+  classification_keys:
+    - percussion
+    - membranophone
+    - unpitched
+  orchestra_section_key: percussion
 bassoon:
   classification_keys:
     - aerophone
@@ -34,13 +40,22 @@ clavichord:
   classification_keys:
     - chordophone
     - keyboard
-    - percussion
     - string
   orchestra_section_key: keyboard
+celesta:
+  classification_keys:
+    - idiophone
+    - keyboard
+    - percussion
+    - struck
+    - metal
+    - pitched
+  orchestra_section_key: percussion
 cornet:
   classification_keys:
     - aerophone
     - brass
+    - valve
     - wind
   orchestra_section_key: brass
 cymbal:
@@ -57,6 +72,7 @@ double_bass:
   classification_keys:
     - bowed
     - chordophone
+    - unfretted
     - string
   orchestra_section_key: string
 flute:
@@ -86,6 +102,7 @@ guitar:
   classification_keys:
     - chordophone
     - plucked
+    - fretted
     - string
   orchestra_section_key: string
 harmonica:
@@ -105,13 +122,13 @@ harpsichord:
   classification_keys:
     - chordophone
     - keyboard
-    - percussion
     - string
   orchestra_section_key: keyboard
 horn:
   classification_keys:
     - aerophone
     - brass
+    - valve
     - wind
   orchestra_section_key: brass
 kettledrum:
@@ -124,12 +141,14 @@ lute:
   classification_keys:
     - chordophone
     - plucked
+    - fretted
     - string
   orchestra_section_key: string
 mandolin:
   classification_keys:
     - chordophone
     - plucked
+    - fretted
     - string
   orchestra_section_key: string
 marimba:
@@ -141,6 +160,7 @@ marimba:
     - wood
     - mallet
     - pitched
+    - resonator
   orchestra_section_key: percussion
 oboe:
   classification_keys:
@@ -172,6 +192,7 @@ saxhorn:
   classification_keys:
     - aerophone
     - brass
+    - valve
     - wind
   orchestra_section_key: brass
 saxophone:
@@ -186,6 +207,7 @@ sitar:
   classification_keys:
     - chordophone
     - plucked
+    - fretted
     - string
   orchestra_section_key: string
 snare_drum:
@@ -213,6 +235,13 @@ tabla:
     - membranophone
     - pitched
   orchestra_section_key: percussion
+tambourine:
+  classification_keys:
+    - percussion
+    - membranophone
+    - idiophone
+    - unpitched
+  orchestra_section_key: percussion
 theremin:
   classification_keys:
     - electronic
@@ -226,18 +255,21 @@ trumpet:
   classification_keys:
     - aerophone
     - brass
+    - valve
     - wind
   orchestra_section_key: brass
 tuba:
   classification_keys:
     - aerophone
     - brass
+    - valve
     - wind
   orchestra_section_key: brass
 ukulele:
   classification_keys:
     - chordophone
     - plucked
+    - fretted
     - string
   orchestra_section_key: string
 vibraphone:
@@ -249,11 +281,13 @@ vibraphone:
     - mallet
     - metal
     - pitched
+    - resonator
   orchestra_section_key: percussion
 violin:
   classification_keys:
     - bowed
     - chordophone
+    - unfretted
     - string
   orchestra_section_key: string
 voice:

data/lib/head_music/instruments/instruments.yml

@@ -116,6 +116,8 @@ bass_clarinet:
   range_categories:
     - bass
 bass_drum:
+  alias_name_keys:
+    - kick_drum
   classification_keys:
     - percussion
     - membranophone
@@ -486,6 +488,7 @@ euphonium:
     - aerophone
     - brass
     - wind
+  family_key: tuba
   variants:
     default:
       staff_schemes:

data/lib/head_music/instruments/variant.rb

@@ -10,7 +10,7 @@ class HeadMusic::Instruments::Variant
   end
 
   def pitch_designation
-    return unless attributes["pitch_designation"].to_s != ""
+    return if attributes["pitch_designation"].to_s == ""
 
     @pitch_designation ||=
       HeadMusic::Rudiment::Spelling.get(attributes["pitch_designation"])

data/lib/head_music/locales/de.yml

@@ -62,6 +62,7 @@ de:
       drum: Trommel
       edge_blown_aerophone: Kantenangeblasenes Aerophon
       electronic: Elektronisch
+      electronic_keyboard: elektronisches Keyboard
       idiophone: Idiophon
       keyboard: Tastatur
       keyboard_instrument: Tasteninstrument
@@ -71,6 +72,7 @@ de:
       mezzo_soprano_voice: Mezzosopran
       percussion: Schlagzeug
       percussion_instrument: Schlaginstrument
+      pitched: gestimmt
       plucked: Zupfinstrument
       plucked_instrument: Zupfinstrument
       reed: Rohrblatt
@@ -80,6 +82,7 @@ de:
       stringed_instrument: Saiteninstrument
       strings: Saiten
       struck: Geschlagen
+      unpitched: ungestimmt
       voice: Stimme
       wind: Blas
       wind_instrument: Blasinstrument
@@ -148,6 +151,7 @@ de:
       crotales: Crotales
       cymbal: Becken
       descant: Diskant
+      didgeridoo: Didgeridoo
       double_bass: Kontrabass
       double_contrabass_recorder: Doppelkontrabassblockflöte
       english_horn: Englischhorn
@@ -165,6 +169,7 @@ de:
       guitar: Gitarre
       hammered_dulcimer: Hackbrett
       harp: Harfe
+      harmonica: Mundharmonika
       harpsichord: Cembalo
       hautbois_d_amour: Liebeshoboe
       hi-hat: Hi-Hat
@@ -180,6 +185,7 @@ de:
       mezzo_soprano: Mezzosopran
       mezzo_soprano_voice: Mezzosopran
       military_drum: Militärtrommel
+      mouth_organ: Mundharmonika
       natural_horn: Waldhorn
       oboe: Oboe
       oboe_d_amore: Liebesoboe
@@ -200,6 +206,7 @@ de:
       ride_cymbal: Ride-Becken
       saxophone: Saxophon
       side_drum: Kleine Trommel
+      sitar: Sitar
       snare_drum: Leinentrommel
       sopranino_clarinet: Sopraninoklarinette
       sopranino_recorder: Sopraninoblockflöte
@@ -213,6 +220,8 @@ de:
       soprano_voice: Sopran
       soprillo: Sopranissimo
       sousaphone: Sousaphon
+      steel_drum: Steelpan
+      steelpan: Steelpan
       string_bass: Kontrabass
       sub_bass_recorder: Subbassblockflöte
       sub_contrabass_recorder: Subkontrabassblockflöte
@@ -220,6 +229,7 @@ de:
       subcontrabass_saxophone: Subkontrabasssaxophon
       suspended_cymbal: Hängebecken
       synthesizer: Synthesizer
+      tabla: Tabla
       tabor: Tamburin
       tambourine: Tamburin
       tam_tam: Tamtam
@@ -231,6 +241,7 @@ de:
       tenor_trombone: Tenorposaune
       tenor_tuba: Tenortuba
       tenor_voice: Tenor
+      theremin: Theremin
       timpani: Pauken
       timpanum: Pauke
       tom_drum: Tom-Tom
@@ -240,6 +251,15 @@ de:
       trombone: Posaune
       trumpet: Trompete
       tuba: Tuba
+      ukulele: Ukulele
+      alto_ukulele: Alt-Ukulele
+      baritone_ukulele: Bariton-Ukulele
+      bass_ukulele: Bass-Ukulele
+      concert_ukulele: Konzert-Ukulele
+      piccolo_ukulele: Piccolo-Ukulele
+      pocket_ukulele: Pocket-Ukulele
+      soprano_ukulele: Sopran-Ukulele
+      tenor_ukulele: Tenor-Ukulele
       tubular_bells: Rohrenglocke
       vibes: Vibraphon
       vibraphone: Vibraphon

data/lib/head_music/locales/es.yml

@@ -62,6 +62,7 @@ es:
       drum: tambor
       edge_blown_aerophone: aerófono de bisel
       electronic: electrónico
+      electronic_keyboard: teclado electrónico
       idiophone: idiófono
       keyboard: teclado
       keyboard_instrument: instrumento de teclado
@@ -71,6 +72,7 @@ es:
       mezzo_soprano_voice: voz de mezzosoprano
       percussion: percusión
       percussion_instrument: instrumento de percusión
+      pitched: afinado
       plucked: punteado
       plucked_instrument: instrumento pulsado
       reed: lengüeta
@@ -80,6 +82,7 @@ es:
       stringed_instrument: instrumento de cuerda
       strings: cuerdas
       struck: percutido
+      unpitched: no afinado
       voice: voz
       wind: viento
       wind_instrument: instrumento de viento
@@ -144,6 +147,7 @@ es:
       crotales: crótalos
       cymbal: cimbalos
       descant: flauta dulce soprano
+      didgeridoo: didgeridoo
       double_bass: contrabajo
       double_contrabass_recorder: flauta dulce subcontrabajo
       english_horn: corno inglés
@@ -162,6 +166,7 @@ es:
       guitar: guitarra
       hammered_dulcimer: salterio
       harp: arpa
+      harmonica: armónica
       harpsichord: clavecín
       hautbois_d_amour: oboe de amor
       hi-hat: charles
@@ -177,6 +182,7 @@ es:
       mezzo_soprano: mezzosoprano
       mezzo_soprano_voice: voz de mezzosoprano
       military_drum: tambor militar
+      mouth_organ: armónica
       natural_horn: trompa natural
       oboe: oboe
       oboe_d_amore: oboe de amor
@@ -211,6 +217,8 @@ es:
       soprano_voice: voz de soprano
       soprillo: soprillo
       sousaphone: sousafón
+      steel_drum: steelpan
+      steelpan: steelpan
       string_bass: contrabajo de cuerdas
       sub_bass_recorder: flauta dulce subbajo
       sub_contrabass_recorder: flauta dulce subcontrabajo
@@ -218,6 +226,7 @@ es:
       subcontrabass_saxophone: saxofón subcontrabajo
       suspended_cymbal: platillo suspendido
       synthesizer: sintetizador
+      tabla: tabla
       tabor: tamboril
       tam_tam: tam-tam
       tambourine: pandereta
@@ -229,6 +238,7 @@ es:
       tenor_trombone: trombón tenor
       tenor_tuba: tuba tenor
       tenor_voice: voz de tenor
+      theremin: theremín
       timpani: tímpanos
       timpanum: tímpano
       tom_drum: tom
@@ -239,6 +249,15 @@ es:
       trumpet: trompeta
       tuba: tuba
       tubular_bells: campanas tubulares
+      ukulele: ukelele
+      alto_ukulele: ukelele alto
+      baritone_ukulele: ukelele barítono
+      bass_ukulele: ukelele bajo
+      concert_ukulele: ukelele concierto
+      piccolo_ukulele: ukelele piccolo
+      pocket_ukulele: ukelele de bolsillo
+      soprano_ukulele: ukelele soprano
+      tenor_ukulele: ukelele tenor
       vibes: vibráfono
       vibraphone: vibráfono
       viola: viola

data/lib/head_music/locales/fr.yml

@@ -62,6 +62,7 @@ fr:
       drum: tambour
       edge_blown_aerophone: aérophone à embouchure latérale
       electronic: électronique
+      electronic_keyboard: clavier électronique
       idiophone: idiophone
       keyboard: clavier
       keyboard_instrument: instrument à clavier
@@ -71,6 +72,7 @@ fr:
       mezzo_soprano_voice: voix de mezzo-soprano
       percussion: percussion
       percussion_instrument: instrument à percussion
+      pitched: accordé
       plucked: pincé
       plucked_instrument: instrument à cordes pincées
       reed: anche
@@ -80,6 +82,7 @@ fr:
       stringed_instrument: instrument à cordes
       strings: cordes
       struck: frappé
+      unpitched: non accordé
       voice: voix
       wind: vent
       wind_instrument: instrument à vent
@@ -151,6 +154,7 @@ fr:
       crotales: crotales
       cymbal: cymbale
       descant: dessus
+      didgeridoo: didgeridoo
       double_bass: contrebasse
       double_contrabass_recorder: flûte à bec double-contrebasse
       english_horn: cor anglais
@@ -169,6 +173,7 @@ fr:
       guitar: guitare
       hammered_dulcimer: tympanon
       harp: harpe
+      harmonica: harmonica
       harpsichord: clavecin
       hautbois_d_amour: hautbois d'amour
       hi-hat: charleston
@@ -184,6 +189,7 @@ fr:
       mezzo_soprano: mezzo-soprano
       mezzo_soprano_voice: voix de mezzo-soprano
       military_drum: tambour militaire
+      mouth_organ: harmonica
       natural_horn: cor naturel
       oboe: hautbois
       oboe_d_amore: hautbois d'amore
@@ -217,6 +223,8 @@ fr:
       soprano_voice: voix de soprano
       soprillo: soprillo
       sousaphone: soubassophone
+      steel_drum: steelpan
+      steelpan: steelpan
       string_bass: contrebasse à cordes
       sub_bass_recorder: flûte à bec sub-basse
       sub_contrabass_recorder: flûte à bec sub-contrebasse
@@ -224,6 +232,7 @@ fr:
       subcontrabass_saxophone: saxophone subcontrabasse
       suspended_cymbal: cymbale suspendue
       synthesizer: synthétiseur
+      tabla: tabla
       tabor: tambour
       tam_tam: tam-tam
       tambourine: tambourin
@@ -235,6 +244,7 @@ fr:
       tenor_trombone: trombone ténor
       tenor_tuba: tuba ténor
       tenor_voice: voix de ténor
+      theremin: thérémine
       timpani: timbales
       timpanum: timbale
       tom_drum: tom
@@ -245,6 +255,15 @@ fr:
       trumpet: trompette
       tuba: tuba
       tubular_bells: cloches tubulaires
+      ukulele: ukulélé
+      alto_ukulele: ukulélé alto
+      baritone_ukulele: ukulélé baryton
+      bass_ukulele: ukulélé basse
+      concert_ukulele: ukulélé concert
+      piccolo_ukulele: ukulélé piccolo
+      pocket_ukulele: ukulélé de poche
+      soprano_ukulele: ukulélé soprano
+      tenor_ukulele: ukulélé ténor
       vibes: vibraphone
       vibraphone: vibraphone
       viola: alto

data/lib/head_music/locales/it.yml

@@ -62,6 +62,7 @@ it:
       drum: tamburo
       edge_blown_aerophone: aerofono a imboccatura laterale
       electronic: elettronico
+      electronic_keyboard: tastiera elettronica
       idiophone: idiofono
       keyboard: tastiera
       keyboard_instrument: strumento a tastiera
@@ -71,6 +72,7 @@ it:
       mezzo_soprano_voice: voce di mezzo-soprano
       percussion: percussione
       percussion_instrument: strumento a percussione
+      pitched: intonato
       plucked: pizzicato
       plucked_instrument: strumento a pizzico
       reed: ad ancia
@@ -80,6 +82,7 @@ it:
       stringed_instrument: strumento a corde
       strings: corde
       struck: percosso
+      unpitched: non intonato
       voice: voce
       wind: fiato
       wind_instrument: strumento a fiato
@@ -146,6 +149,7 @@ it:
       crotales: crotales
       cymbal: piatto
       descant: soprano
+      didgeridoo: didgeridoo
       double_bass: contrabbasso
       double_contrabass_recorder: doppio flauto dolce contrabbasso
       english_horn: corno inglese
@@ -158,11 +162,13 @@ it:
       french_horn: corno francese
       garklein_recorder: garklein
       glockenspiel: glockenspiel
+      gong: gong
       great_bass_recorder: flauto dolce gran basso
       great_highland_bagpipe: cornamusa scozzese
       guitar: chitarra
       hammered_dulcimer: salterio martellato
       harp: arpa
+      harmonica: armonica
       harpsichord: clavicembalo
       hautbois_d_amour: oboe d'amore
       hi-hat: hi-hat
@@ -178,6 +184,7 @@ it:
       mezzo: mezzosoprano
       mezzo_soprano_voice: mezzosoprano
       military_drum: tamburo militare
+      mouth_organ: armonica a bocca
       natural_horn: corno naturale
       oboe: oboe
       oboe_d_amore: oboe d'amore
@@ -209,6 +216,8 @@ it:
       soprano_voice: soprano
       soprillo: soprillo
       sousaphone: sousafono
+      steel_drum: steelpan
+      steelpan: steelpan
       string_bass: contrabbasso a corde
       sub_bass_recorder: flauto dolce sub-basso
       sub_contrabass_recorder: flauto dolce controcontrabbasso
@@ -216,6 +225,7 @@ it:
       subcontrabass_saxophone: sassofono subcontrabbasso
       suspended_cymbal: piatto sospeso
       synthesizer: sintetizzatore
+      tabla: tabla
       tabor: tamburo
       tam_tam: tam-tam
       tambourine: tamburello
@@ -227,6 +237,7 @@ it:
       tenor_trombone: trombone tenore
       tenor_tuba: tuba tenore
       tenor_voice: tenore
+      theremin: theremin
       timpani: timpani
       timpanum: timpano
       tom_drum: tamburo tom
@@ -237,6 +248,15 @@ it:
       trumpet: tromba
       tuba: tuba
       tubular_bells: campane tubolari
+      ukulele: ukulele
+      alto_ukulele: ukulele contralto
+      baritone_ukulele: ukulele baritono
+      bass_ukulele: ukulele basso
+      concert_ukulele: ukulele concerto
+      piccolo_ukulele: ukulele piccolo
+      pocket_ukulele: ukulele tascabile
+      soprano_ukulele: ukulele soprano
+      tenor_ukulele: ukulele tenore
       vibes: vibrafono
       vibraphone: vibrafono
       viola: viola

data/lib/head_music/locales/ru.yml

@@ -1,13 +1,13 @@
 ru:
   head_music:
     chromatic_intervals:
-      perfect_unison: чистая унисон
+      perfect_unison: чистый унисон
       minor_second: малая секунда
       major_second: большая секунда
       minor_third: малая терция
       major_third: большая терция
       perfect_fourth: чистая кварта
-      tritone: триоль
+      tritone: тритон
       perfect_fifth: чистая квинта
       minor_sixth: малая секста
       major_sixth: большая секста
@@ -24,6 +24,7 @@ ru:
       drum: барабан
       edge_blown_aerophone: флейта с боковым продувом
       electronic: электронный
+      electronic_keyboard: электронная клавиатура
       idiophone: идиофон
       keyboard: клавишные
       keyboard_instrument: клавишный инструмент
@@ -33,6 +34,7 @@ ru:
       mezzo_soprano_voice: меццо-сопрано
       percussion: ударные
       percussion_instrument: ударный инструмент
+      pitched: звуковысотный
       plucked: щипковые
       plucked_instrument: щипковый инструмент
       reed: тростниковый
@@ -42,6 +44,7 @@ ru:
       stringed_instrument: струнный инструмент
       strings: струны
       struck: ударный
+      unpitched: безвысотный
       voice: голос
       wind: духовые
       wind_instrument: духовой инструмент
@@ -92,6 +95,7 @@ ru:
       crotales: кроталы
       cymbal: тарелки
       descant: дискант
+      didgeridoo: диджериду
       double_bass: контрабас
       double_contrabass_recorder: двойная контрабасовая флейта
       english_horn: английский рожок
@@ -110,6 +114,7 @@ ru:
       guitar: гитара
       hammered_dulcimer: цимбалы
       harp: арфа
+      harmonica: губная гармоника
       harpsichord: клавесин
       hautbois_d_amour: гобой д'амур
       hi-hat: хай-хет
@@ -124,6 +129,7 @@ ru:
       mezzo_soprano: меццо-сопрано
       mezzo_soprano_voice: голос меццо-сопрано
       military_drum: военный барабан
+      mouth_organ: губная гармоника
       natural_horn: натуральный рог
       oboe: гобой
       oboe_d_amore: гобой д'амур
@@ -157,6 +163,8 @@ ru:
       soprano_voice: сопрано
       soprillo: соприлло
       sousaphone: сузафон
+      steel_drum: стилпан
+      steelpan: стилпан
       string_bass: струнный бас
       sub_bass_recorder: суб-басовая флейта
       sub_contrabass_recorder: суб-контрабасовая флейта
@@ -164,6 +172,7 @@ ru:
       subcontrabass_saxophone: субконтрабас-саксофон
       suspended_cymbal: подвесная тарелка
       synthesizer: синтезатор
+      tabla: табла
       tabor: табор
       tam_tam: там-там
       tambourine: бубен
@@ -175,6 +184,7 @@ ru:
       tenor_trombone: теноровый тромбон
       tenor_tuba: теноровая туба
       tenor_voice: тенор
+      theremin: терменвокс
       timpani: тимпаны
       timpanum: тимпан
       tom_drum: том
@@ -185,6 +195,15 @@ ru:
       trumpet: труба
       tuba: туба
       tubular_bells: трубчатые колокола
+      ukulele: укулеле
+      alto_ukulele: альтовая укулеле
+      baritone_ukulele: баритон-укулеле
+      bass_ukulele: бас-укулеле
+      concert_ukulele: концертная укулеле
+      piccolo_ukulele: пикколо-укулеле
+      pocket_ukulele: карманная укулеле
+      soprano_ukulele: укулеле-сопрано
+      tenor_ukulele: теноровая укулеле
       vibes: вибрафон
       vibraphone: вибрафон
       viola: альт

data/lib/head_music/rudiment/solmization.rb

@@ -52,7 +52,7 @@ class HeadMusic::Rudiment::Solmization
     aliases = []
     I18n.config.available_locales.each do |locale|
       translation = I18n.translate("head_music.rudiments.solfege", locale: locale, default: nil)
-      aliases << translation if translation && translation != 'solfege'
+      aliases << translation if translation && translation != "solfege"
     end
     aliases.compact.uniq
   end

data/lib/head_music/style/annotation.rb

@@ -35,8 +35,8 @@ class HeadMusic::Style::Annotation
     fitness == 1
   end
 
-  def notes?
-    first_note
+  def has_notes?
+    !!first_note
   end
 
   def start_position
@@ -54,11 +54,11 @@ class HeadMusic::Style::Annotation
   protected
 
   def first_note
-    notes&.first
+    notes.first()
   end
 
   def last_note
-    notes&.last
+    notes.last()
   end
 
   def voices

data/lib/head_music/style/guidelines/consonant_climax.rb

@@ -16,12 +16,12 @@ class HeadMusic::Style::Guidelines::ConsonantClimax < HeadMusic::Style::Annotati
   end
 
   def adherent_high_pitch?
-    notes? && highest_pitch_consonant_with_tonic? &&
+    has_notes? && highest_pitch_consonant_with_tonic? &&
       (highest_pitch_appears_once? || highest_pitch_appears_twice_with_step_between?)
   end
 
   def adherent_low_pitch?
-    notes? &&
+    has_notes? &&
       lowest_pitch_consonant_with_tonic? &&
       (lowest_pitch_appears_once? || lowest_pitch_appears_twice_with_step_between?)
   end

data/lib/head_music/version.rb

@@ -1,3 +1,3 @@
 module HeadMusic
-  VERSION = "8.1.1"
+  VERSION = "8.2.1"
 end