head_music 0.24.2 → 0.26.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 204a1613a88b8c14b7f9441a2a593637dc3a496076abda2621d71f85ffbdf604
4
- data.tar.gz: c9819f9c1983934caad0d58d625fbda15a787148d6e15f7cc92473de8200c2f7
3
+ metadata.gz: 075be1fb94f05c68709ec7a1ea42e7eac644be0dc08bb0b9ff22d2ceddc8434e
4
+ data.tar.gz: 3142cf455d26bcf98d228d11d6593b5fbde19ac1a61bddae4b354bd0ebaf9a12
5
5
  SHA512:
6
- metadata.gz: e7e0fa5267eaa482b16abf497fb7122d6f3ade4c55f9a6ac40c43043dbfbe68a03dc9ae3a8c83262ade571965c0bf997121a9a774aee950e5598097a3fba33dd
7
- data.tar.gz: 6617eabf6992c8bf5ab1a7533d605ca2a54f58873c13fa91e79cc65acbfe925906bd727a100d969fd057a560a1bb64d470eaa18f37a751e5b41f584909b3b007
6
+ metadata.gz: a2ceb87fe6d81f8c2994f81e402979ba72d77834f1fefc3751919530989ae47448cbe4a9ef59009bf88e2325fc520209aff993b5c0368f7c4a4dae6d83398f1f
7
+ data.tar.gz: a6c9cb9952f288f155cc224ab9b26ae9046f9cdbcb870e12b8bd7f4f5477727cfcd9fdda3f8b3a64ab3cdaff019412281cd9ef45e4c3da2b43b16b1258ab81a0
@@ -1,36 +1,145 @@
1
1
  ---
2
- - name_key: alto_flute
3
- - name_key: guitar
2
+ bassoon:
3
+ classifications:
4
+ - aerophone
5
+ - reed
6
+ - double_reed
7
+ - wind
8
+ - woodwind
9
+ family: woodwind
10
+ standard_staves:
11
+ - bass_clef
12
+ cello:
13
+ alias_name_keys:
14
+ - violoncello
15
+ classifications:
16
+ - bowed
17
+ - chordophone
18
+ - string
4
19
  family: string
20
+ standard_staves:
21
+ - bass_clef
22
+ clarinet:
23
+ classifications:
24
+ - aerophone
25
+ - reed
26
+ - single_reed
27
+ - wind
28
+ - woodwind
29
+ family: woodwind
30
+ standard_staves:
31
+ - treble_clef
32
+ double_bass:
5
33
  classifications:
6
- - string
7
- - chordophone
8
- default_clefs:
9
- - treble_clef
10
- - name_key: piano
34
+ - string
35
+ - chordophone
36
+ - bowed
11
37
  family: string
38
+ standard_staves:
39
+ - bass_clef
40
+ flute:
12
41
  classifications:
13
- - string
14
- - chordophone
15
- - keyboard
16
- default_clefs:
17
- - treble_clef
18
- - bass_clef
19
- - name_key: violin
42
+ - aerophone
43
+ - edge-blown aerophone
44
+ - wind
45
+ - woodwind
46
+ family: woodwind
47
+ standard_staves:
48
+ - treble_clef
49
+ french_horn:
20
50
  alias_name_keys:
21
- - fiddle
51
+ - horn
52
+ classifications:
53
+ - aerophone
54
+ - brass
55
+ - wind
56
+ family: brass
57
+ standard_staves:
58
+ - treble_clef
59
+ guitar:
60
+ classifications:
61
+ - chordophone
62
+ - plucked
63
+ - string
22
64
  family: string
65
+ standard_staves:
66
+ - treble_clef
67
+ harp:
68
+ family: string
69
+ classifications:
70
+ - chordophone
71
+ - plucked
72
+ - string
73
+ standard_staves:
74
+ - treble_clef
75
+ - bass_clef
76
+ oboe:
23
77
  classifications:
24
- - string
25
- - chordophone
26
- - bowed
27
- default_clefs:
28
- - treble_clef
29
- - name_key: viola
78
+ - aerophone
79
+ - reed
80
+ - double_reed
81
+ - wind
82
+ - woodwind
83
+ family: woodwind
84
+ standard_staves:
85
+ - treble_clef
86
+ organ:
87
+ classifications:
88
+ - aerophone
89
+ - keyboard
90
+ standard_staves:
91
+ - treble_clef
92
+ - bass_clef
93
+ - bass_clef
94
+ piano:
95
+ classifications:
96
+ - chordophone
97
+ - keyboard
98
+ - percussion
99
+ - string
100
+ family: percussion
101
+ standard_staves:
102
+ - treble_clef
103
+ - bass_clef
104
+ trombone:
105
+ classifications:
106
+ - aerophone
107
+ - brass
108
+ - wind
109
+ family: brass
110
+ standard_staves:
111
+ - bass_clef
112
+ trumpet:
113
+ classifications:
114
+ - aerophone
115
+ - brass
116
+ - wind
117
+ family: brass
118
+ standard_staves:
119
+ - treble_clef
120
+ tuba:
121
+ classifications:
122
+ - aerophone
123
+ - brass
124
+ - wind
125
+ family: brass
126
+ standard_staves:
127
+ - bass_clef
128
+ viola:
30
129
  family: string
31
130
  classifications:
32
- - string
33
- - chordophone
34
- - bowed
35
- default_clefs:
36
- - alto_clef
131
+ - bowed
132
+ - chordophone
133
+ - string
134
+ standard_staves:
135
+ - alto_clef
136
+ violin:
137
+ alias_name_keys:
138
+ - fiddle
139
+ classifications:
140
+ - bowed
141
+ - chordophone
142
+ - string
143
+ family: string
144
+ standard_staves:
145
+ - treble_clef
@@ -6,16 +6,16 @@ class HeadMusic::GrandStaff
6
6
  piano: {
7
7
  instrument: :piano,
8
8
  staves: [
9
- { clef: :treble_clef, instrument: :piano },
10
- { clef: :bass_clef, instrument: :piano },
9
+ { clef: :treble_clef, for: :right_hand },
10
+ { clef: :bass_clef, for: :left_hand },
11
11
  ],
12
12
  },
13
13
  organ: {
14
14
  instrument: :organ,
15
15
  staves: [
16
- { clef: :treble_clef, instrument: :organ },
17
- { clef: :bass_clef, instrument: :organ },
18
- { clef: :bass_clef, instrument: :pedals },
16
+ { clef: :treble_clef, for: :right_hand },
17
+ { clef: :bass_clef, for: :left_hand },
18
+ { clef: :bass_clef, for: :pedals },
19
19
  ],
20
20
  },
21
21
  }.freeze
@@ -42,10 +42,7 @@ class HeadMusic::GrandStaff
42
42
  def staves
43
43
  @staves ||=
44
44
  data[:staves].map do |staff|
45
- HeadMusic::Staff.new(
46
- staff[:clef],
47
- instrument: staff[:instrument] || instrument
48
- )
45
+ HeadMusic::Staff.new(staff[:clef], instrument: instrument)
49
46
  end
50
47
  end
51
48
 
@@ -13,12 +13,22 @@ class HeadMusic::Instrument
13
13
  new(name)
14
14
  end
15
15
 
16
- attr_reader :name_key, :family, :default_clefs
16
+ def self.all
17
+ INSTRUMENTS.map { |key, _data| get(key) }.sort_by(&:name)
18
+ end
19
+
20
+ attr_reader :name_key, :family, :standard_staves, :classifications
17
21
 
18
22
  def ==(other)
19
23
  to_s == other.to_s
20
24
  end
21
25
 
26
+ def translation(locale = :en)
27
+ return name unless name_key
28
+
29
+ I18n.translate(name_key, scope: [:instruments], locale: locale)
30
+ end
31
+
22
32
  private_class_method :new
23
33
 
24
34
  private
@@ -28,33 +38,41 @@ class HeadMusic::Instrument
28
38
  if record
29
39
  initialize_data_from_record(record)
30
40
  else
31
- self.name = name
41
+ self.name = name.to_s
32
42
  end
33
43
  end
34
44
 
35
45
  def record_for_name(name)
36
- key = HeadMusic::Utilities::HashKey.for(name)
37
- record_for_key(key) || record_for_key(key_for_name(name))
46
+ record_for_key(HeadMusic::Utilities::HashKey.for(name)) ||
47
+ record_for_key(key_for_name(name))
38
48
  end
39
49
 
40
50
  def key_for_name(name)
41
- INSTRUMENTS.each do |instrument|
51
+ INSTRUMENTS.each do |key, _data|
42
52
  I18n.config.available_locales.each do |locale|
43
- translation = I18n.t("instruments.#{instrument['name_key']}", locale: locale)
44
- return instrument['name_key'] if translation.downcase == name.downcase
53
+ translation = I18n.t("instruments.#{key}", locale: locale)
54
+ return key if translation.downcase == name.downcase
45
55
  end
46
56
  end
47
57
  nil
48
58
  end
49
59
 
50
60
  def record_for_key(key)
51
- INSTRUMENTS.detect { |instrument| instrument['name_key'] == key }
61
+ INSTRUMENTS.each do |name_key, data|
62
+ return data.merge!('name_key' => name_key) if name_key.to_s == key.to_s
63
+ end
64
+ nil
52
65
  end
53
66
 
54
67
  def initialize_data_from_record(record)
55
- @family = record['family']
56
- @default_clefs = record['default_clefs']
57
68
  @name_key = record['name_key'].to_sym
58
- self.name = I18n.translate(name_key, scope: 'instruments', locale: 'en')
69
+ @family = record['family']
70
+ @standard_staves = record['standard_staves'] || []
71
+ @classifications = record['classifications'] || []
72
+ self.name = I18n.translate(name_key, scope: 'instruments', locale: 'en', default: inferred_name)
73
+ end
74
+
75
+ def inferred_name
76
+ name_key.to_s.gsub(/_/, ' ')
59
77
  end
60
78
  end
@@ -1,7 +1,4 @@
1
1
  de:
2
- rudiments:
3
- clef: Notenschlüssel
4
- consonance: Konsonanz
5
2
  clefs:
6
3
  alto_clef: Altschlüssel
7
4
  baritone_c_clef: Baritonschlüssel
@@ -40,24 +37,86 @@ de:
40
37
  treble_clef: Violinschlüssel
41
38
  viola_clef: Bratschenschlüssel
42
39
  violin_clef: Violinschlüssel
43
- reference_pitches:
44
- chamber_tone: Kammerton
45
- choir_tone: Chorton
40
+ instrument_classifications:
41
+ brass: Blechblas
42
+ brass_instrument: Blechblasinstrument
43
+ drum: Trommel
44
+ keyboard_instrument: Tasteninstrumente
45
+ percussion: Perkussions
46
+ percussion_instrument: Schlaginstrumente
47
+ plucked_instrument: Zupfinstrumente
48
+ strings: Streicher
49
+ stringed_instrument: Saiteninstrument
50
+ wind_instrument: Blasinstrument
51
+ woodwind_instrument: Holzblasinstrument
52
+ instrument_voices:
53
+ alto: Alt
54
+ baritone: Bariton
55
+ bass: Bass
46
56
  instruments:
47
57
  accordian: Akkordeon
48
58
  alto_flute: Altflöte
49
59
  alto_voice: Alt
50
60
  arpeggione: Arpeggione
51
61
  bagpipe: Dudelsack
62
+ baritone_horn: Baritonhorn
52
63
  baritone_voice: Bariton
53
64
  bass_voice: Bass
54
- bass_clarinet: clarinette basse
65
+ bass_clarinet: Bassklarinette
66
+ bass_drum: Grosse Trommel
67
+ bass_trombone: Bass Posaune
68
+ bassoon: Fagott
69
+ castanets: Kastagnetten
70
+ celesta: Celesta
71
+ cello: Cello
72
+ cimbalom: Zymbal
73
+ clarinet: Klarinette
74
+ clavichord: Klavichord
75
+ cornet: Kornett
76
+ cymbal: Becken
77
+ double_bass: Kontrabass
78
+ english_horn: Englischhorn
79
+ euphonium: Euphonium
55
80
  fiddle: Geige
81
+ flugel_horn: Flügelhorn
82
+ flute: Flöte
83
+ french_horn: Horn
84
+ glockenspiel: Glockenspiel
56
85
  guitar: Gitarre
86
+ hammered_dulcimer: Hackbrett
87
+ harp: Harfe
88
+ harpsichord: Cembalo
89
+ horn: Horn
90
+ lute: Laute
91
+ mandolin: Mandoline
92
+ marimba: Marimbaphon
93
+ natural_horn: Waldhorn
94
+ oboe: Oboe
95
+ oboe_d_amore: Liebesoboe
96
+ organ: Orgel
57
97
  piano: Piano
98
+ piccolo: Pikkoloflöte
99
+ recorder: Blockflöte
100
+ saxophone: Saxophon
101
+ snare_drum: Leinentrommel
102
+ tambourine: Tamburin
103
+ tenor_drum: Tenortrommel
104
+ timpani: Pauken
105
+ trombone: Posaune
106
+ trumpet: Trompete
107
+ tuba: Tuba
108
+ tubular_bells: Rohrenglocke
58
109
  viola: Bratsche
110
+ viola_d_amore: Viola d'amore
111
+ viola_da_gamba: Viola da gamba
59
112
  violin: Violine
60
- instrument_voices:
61
- alto: Alt
62
- baritone: Bariton
63
- bass: Bass
113
+ violoncello: Violoncello
114
+ voice: Stimme
115
+ xylophone: Xylophon
116
+ zither: Zither
117
+ reference_pitches:
118
+ chamber_tone: Kammerton
119
+ choir_tone: Chorton
120
+ rudiments:
121
+ clef: Notenschlüssel
122
+ consonance: Konsonanz
@@ -1,38 +1,4 @@
1
1
  en:
2
- rudiments:
3
- chromatic_interval: chromatic interval
4
- circle: circle
5
- clef: clef
6
- consonance: consonance
7
- diatonic_interval: diatonic interval
8
- grand_staff: grand staff
9
- harmonic_interval: harmonic interval
10
- instrument: instrument
11
- interval_cycle: interval cycle
12
- key_signature: key signature
13
- letter_name: letter name
14
- melodic_interval: melodic interval
15
- meter: meter
16
- motion: motion
17
- musical_symbol: musical symbol
18
- octave: octave
19
- pitch: pitch
20
- pitch_class: pitch class
21
- pitch_class_set: pitch class set
22
- pitch_set: pitch set
23
- quality: quality
24
- reference_pitch: reference pitch
25
- rhythm: rhythm
26
- rhythmic_unit: rhythmic unit
27
- scale: scale
28
- scale_degree: scale degree
29
- scale_type: scale type
30
- sign: sign
31
- solmization: solmization
32
- sonority: sonority
33
- spelling: spelling
34
- staff: staff
35
- tuning: tuning
36
2
  clefs:
37
3
  alto_clef: alto clef
38
4
  baritone_c_clef: baritone C-clef
@@ -71,51 +37,74 @@ en:
71
37
  treble_clef: treble clef
72
38
  viola_clef: viola clef
73
39
  violin_clef: treble clef
74
- reference_pitches:
75
- a440: A440
76
- baroque: Baroque pitch
77
- berlin_philharmonic: Berlin Philharmonic
78
- boston_symphony_orchestra: Boston Symphony Orchestra
79
- chamber_tone: chamber tone
80
- choir: choir tone
81
- classical: classical pitch
82
- concert: concert pitch
83
- continental: continental pitch
84
- french: French pitch
85
- haydn: Haydn pitch
86
- high: high pitch
87
- international: international pitch
88
- iso_16: ISO 16
89
- low: low pitch
90
- mozart: Mozart pitch
91
- new_philharmonic: new philharmonic pitch
92
- new_york_philharmonic: New York Philharmonic
93
- old_philharmonic: old philharmonic pitch
94
- philosophical: philosophical pitch
95
- sauveur: Sauveur pitch
96
- scheibler: Scheibler pitch
97
- scientific: scientific pitch
98
- stuttgart: Stuttgart pitch
99
- sydney_symphony_orchestra: Sydney Symphony Orchestra
100
- verdi: Verdi tuning
40
+ instrument_abbreviations:
41
+ accordian:
42
+ - acc
43
+ alto_flute:
44
+ - afl
45
+ alto_voice:
46
+ - alt
47
+ bagpipe:
48
+ - bag
49
+ baritone_voice:
50
+ - bar
51
+ bass_voice:
52
+ - bass
53
+ bass_clarinet:
54
+ - bcl
55
+ instrument_classifications:
56
+ aerophone: aerophone
57
+ bowed: bowed
58
+ brass: brass
59
+ brass_instrument: brass instrument
60
+ double_reed: double-reed
61
+ drum: drum
62
+ keyboard: keyboard
63
+ keyboard_instrument: keyboard instrument
64
+ percussion: percussion
65
+ percussion_instrument: percussion instrument
66
+ plucked_instrument: plucked instrument
67
+ reed: reed
68
+ single_reed: single-reed
69
+ strings: strings
70
+ stringed_instrument: stringed instrument
71
+ wind: wind
72
+ wind_instrument: wind instrument
73
+ woodwind: woodwind
74
+ instrument_voices:
75
+ piccolo: piccolo
76
+ soprano: soprano
77
+ alto: alto
78
+ tenor: tenor
79
+ baritone: baritone
80
+ bass: bass
81
+ contrabass: contrabass
82
+ octobass: octobass
101
83
  instruments:
102
84
  accordian: accordian
103
85
  alto_flute: alto flute
104
86
  alto_voice: alto
105
87
  arpeggione: arpeggione
106
88
  bagpipe: bagpipe
89
+ baritone_horn: baritone horn
107
90
  baritone_voice: baritone
108
91
  bass_clarinet: bass clarinet
109
92
  bass_drum: bass drum
110
93
  bass_guitar: bass guitar
111
94
  bass_oboe: bass oboe
95
+ bass_drum: bass drum
112
96
  bass_trombone: bass trombone
113
97
  bass_tuba: bass tuba
114
98
  bass_voice: bass
115
99
  bassoon: bassoon
116
100
  castanets: castanets
101
+ celesta: celesta
102
+ cello: cello
117
103
  chimes: chimes
104
+ cimbalom: cimbalom
105
+ cowbell: cowbell
118
106
  clarinet: clarinet
107
+ clavichord: clavichord
119
108
  clash_cymbals: clash cymbals
120
109
  cornet: cornet
121
110
  contrabassoon: contrabassoon
@@ -132,17 +121,26 @@ en:
132
121
  french_horn: French horn
133
122
  glockenspiel: glockenspiel
134
123
  guitar: guitar
124
+ hammered_dulcimer: hammered dulcimer
135
125
  harp: harp
136
126
  harpsichord: harpsichord
127
+ horn: horn
128
+ lute: lute
137
129
  mandolin: mandolin
138
130
  maracas: maracas
139
131
  marimba: marimba
140
132
  metal_block: metal block
133
+ natural_horn: natural horn
141
134
  oboe: oboe
135
+ oboe_d_amore: oboe d'amore
136
+ organ: organ
142
137
  piano: piano
143
138
  piccolo: piccolo
144
139
  piccolo_trumpet: piccolo trumpet
140
+ recorder: recorder
141
+ saxophone: saxophone
145
142
  side_drum: side drum
143
+ snare_drum: snare drum
146
144
  suspended_cymbal: suspended cymbal
147
145
  synthesizer: synthesizer
148
146
  tam_tam: tam-tam
@@ -152,47 +150,79 @@ en:
152
150
  tenor_trombone: tenor trombone
153
151
  timpani: timpani
154
152
  triangle: triangle
153
+ trombone: trombone
155
154
  trumpet: trumpet
156
155
  tuba: tuba
157
156
  tubular_bells: tubular bells
158
157
  vibraphone: vibraphone
159
158
  viola: viola
159
+ viola_d_amore: viola d'amore
160
+ viola_da_gamba: viola da gamba
160
161
  violin: violin
161
- violincello: cello
162
+ violoncello: violoncello
163
+ voice: voice
162
164
  woodblock: woodblock
163
165
  xylophone: xylophone
164
- instrument_abbreviations:
165
- accordian:
166
- - acc
167
- alto_flute:
168
- - afl
169
- alto_voice:
170
- - alt
171
- bagpipe:
172
- - bag
173
- baritone_voice:
174
- - bar
175
- bass_voice:
176
- - bass
177
- bass_clarinet:
178
- - bcl
179
- instrument_classifications:
180
- aerophone: aerophone
181
- bowed: bowed
182
- brass: brass
183
- double_reed: double-reed
184
- keyboard: keyboard
185
- percussion: percussion
186
- single_reed: single-reed
187
- string: string
188
- wind: wind
189
- woodwind: woodwind
190
- instrument_voices:
191
- piccolo: piccolo
192
- soprano: soprano
193
- alto: alto
194
- tenor: tenor
195
- baritone: baritone
196
- bass: bass
197
- contrabass: contrabass
198
- octobass: octobass
166
+ zither: zither
167
+ reference_pitches:
168
+ a440: A440
169
+ baroque: Baroque pitch
170
+ berlin_philharmonic: Berlin Philharmonic
171
+ boston_symphony_orchestra: Boston Symphony Orchestra
172
+ chamber_tone: chamber tone
173
+ choir: choir tone
174
+ classical: classical pitch
175
+ concert: concert pitch
176
+ continental: continental pitch
177
+ french: French pitch
178
+ haydn: Haydn pitch
179
+ high: high pitch
180
+ international: international pitch
181
+ iso_16: ISO 16
182
+ low: low pitch
183
+ mozart: Mozart pitch
184
+ new_philharmonic: new philharmonic pitch
185
+ new_york_philharmonic: New York Philharmonic
186
+ old_philharmonic: old philharmonic pitch
187
+ philosophical: philosophical pitch
188
+ sauveur: Sauveur pitch
189
+ scheibler: Scheibler pitch
190
+ scientific: scientific pitch
191
+ stuttgart: Stuttgart pitch
192
+ sydney_symphony_orchestra: Sydney Symphony Orchestra
193
+ verdi: Verdi tuning
194
+ rudiments:
195
+ chromatic_interval: chromatic interval
196
+ circle: circle
197
+ clef: clef
198
+ consonance: consonance
199
+ diatonic_interval: diatonic interval
200
+ grand_staff: grand staff
201
+ harmonic_interval: harmonic interval
202
+ instrument: instrument
203
+ interval_cycle: interval cycle
204
+ key_signature: key signature
205
+ letter_name: letter name
206
+ melodic_interval: melodic interval
207
+ meter: meter
208
+ motion: motion
209
+ musical_symbol: musical symbol
210
+ octave: octave
211
+ pitch: pitch
212
+ pitch_class: pitch class
213
+ pitch_class_set: pitch class set
214
+ pitch_set: pitch set
215
+ quality: quality
216
+ reference_pitch: reference pitch
217
+ rhythm: rhythm
218
+ rhythmic_unit: rhythmic unit
219
+ scale: scale
220
+ scale_degree: scale degree
221
+ scale_type: scale type
222
+ sign: sign
223
+ solmization: solmization
224
+ sonority: sonority
225
+ spelling: spelling
226
+ staff: staff
227
+ tuba: tuba
228
+ tuning: tuning
@@ -1,7 +1,4 @@
1
1
  es:
2
- rudiments:
3
- clef: clave
4
- consonance: consonancia
5
2
  clefs:
6
3
  alto_clef: clave contralto
7
4
  baritone_c_clef: clave de barítono
@@ -40,14 +37,77 @@ es:
40
37
  treble_clef: clave de sol
41
38
  viola_clef: clave de do
42
39
  violin_clef: clave de sol
40
+ instrument_classifications:
41
+ brass: metal
42
+ brass_instrument: instrumento de metal
43
+ drum: tambor
44
+ keyboard_instrument: instrumento de tecla
45
+ percussion: percusión
46
+ percussion_instrument: instrumentos de percusión
47
+ plucked_instrument: instrumentos punteados
48
+ strings: cuerdas
49
+ stringed_instrument: instrumentos de cuerdas
50
+ wind: viento
51
+ wind_instruments: instrumentos de viento
52
+ woodwind_instruments: instrumentos de madera
43
53
  instruments:
44
- accordian: acordeóon
54
+ accordian: acordeón
45
55
  alto_flute: flauta alto
46
56
  alto_voice: contralto
47
57
  bagpipe: gaita
58
+ baritone_horn: bombardino barítono
48
59
  baritone_voice: baritono
60
+ bass_clarinet: clarinete bajo
61
+ bass_drum: bombo
62
+ bass_trombone: trombón bajo
49
63
  bass_voice: bajo
64
+ bassoon: fagot
65
+ castanets: castañuelas
66
+ celesta: celesta
67
+ cello: cello
68
+ clarinet: clarinete
69
+ clavichord: clavicordio
70
+ cornet: corneta
71
+ cymbal: cimbalo
72
+ double_bass: contrabajo
73
+ english_horn: Cuerno inglés
74
+ euphonium: euphonium
75
+ flugel_horn: fliscorno
76
+ flute: flauta
77
+ french_horn: corno
78
+ glockenspiel: campanólogo
50
79
  guitar: guitarra
80
+ hammered_dulcimer: dulcémele
81
+ harp: arpa
82
+ harpsichord: clavecémbalo
83
+ horn: corno
84
+ lute: laúd
85
+ mandolin: mandolina
86
+ marimba: marimba
87
+ natural_horn: trompa natural
88
+ oboe: oboe
89
+ oboe_d_amore: oboe de amor
90
+ organ: órgano
51
91
  piano: piano
92
+ piccolo: flautín
93
+ recorder: flauta recta
94
+ saxophone: saxofón
95
+ snare_drum: tambor afinable
96
+ tambourine: pandereta
97
+ tenor_drum: redoblante
98
+ timpani: timbal
99
+ trombone: trombón
100
+ trumpet: trompeta
101
+ tuba: tuba
102
+ tubular_bells: campanas tubulares
52
103
  viola: viola
104
+ viola_d_amore: viola d'amore
105
+ viola_da_gamba: viola de gamba
53
106
  violin: violín
107
+ violoncello: violoncelo
108
+ voice: voz
109
+ xylophone: xilofón
110
+ zither: cítara
111
+ rudiments:
112
+ clef: clave
113
+ consonance: consonancia
@@ -1,6 +1,4 @@
1
1
  fr:
2
- rudiments:
3
- clef: clé
4
2
  clefs:
5
3
  alto_clef: clé alto
6
4
  baritone_c_clef: clé de baryton
@@ -39,19 +37,88 @@ fr:
39
37
  treble_clef: clé de sol
40
38
  viola_clef: clé d'ut
41
39
  violin_clef: clé de sol
40
+ instrument_classifications:
41
+ brass: cuivres
42
+ brass_instrument: instruments à vent de cuivre
43
+ double_reed: anche double
44
+ drum: tambour
45
+ keyboard_instrument: instrument à clavier
46
+ percussion: percussion
47
+ percussion_instrument: instrument à percussion
48
+ plucked_instrument: instrument à cordes pincées
49
+ reed: anche
50
+ strings: cordes
51
+ stringed_instrument: instrument à cordes
52
+ wind_instrument: instrument à vent
53
+ woodwind: bois
54
+ woodwind_instrument: instrument à vent en bois
55
+ instrument_voices:
56
+ alto: alto
57
+ baritone: baryton
58
+ bass: basse
59
+ contralto: contralto
60
+ countertenor: contre-ténor
61
+ mezzo_soprano: mezzo-soprano
62
+ soprano: soprano
63
+ tenor: ténor
42
64
  instruments:
43
65
  accordian: accordéon
44
66
  alto_flute: flûte alto
45
67
  alto_voice: alto
46
68
  bagpipe: cornemuse
69
+ baritone_horn: corne de baryton
47
70
  baritone_voice: baryton
48
71
  bass_clarinet: clarinette basse
72
+ bass_drum: grosse caisse
73
+ bass_trombone: basse-trombone
49
74
  bass_voice: basse
75
+ bassoon: basson
76
+ castanets: castagnettes
77
+ celesta: célesta
78
+ cello: violoncelle
79
+ cimbalom: cymbalum
80
+ clarinet: clarinette
81
+ clavichord: clavicorde
82
+ cornet: cornet
83
+ cowbell: cloches à vache
84
+ cymbal: cymbale
85
+ double_bass: contrebasse
86
+ english_horn: cor anglais
87
+ euphonium: euphonium
88
+ flute: flûte
89
+ french_horn: cor
90
+ glockenspiel: glockenspiel
91
+ guitar: guitare
92
+ hammered_dulcimer: tympanon
93
+ harp: harpe
94
+ harpsichord: clavecin
95
+ horn: cor
96
+ lute: luth
97
+ mandolin: mandoline
98
+ marimba: marimba
99
+ natural_horn: cor simple
100
+ oboe: hautbois
101
+ oboe_d_amore: hautbois d'amore
102
+ organ: orgue
50
103
  piano: piano
104
+ piccolo: piccolo
105
+ recorder: flûte à bec
106
+ saxophone: saxophone
107
+ snare_drum: caisse claire
108
+ tambourine: tambourin
109
+ tenor_drum: caisse roulante
110
+ timpani: timbales
111
+ trombone: trombone
112
+ trumpet: trompette
113
+ tuba: tuba
114
+ tubular_bells: cloches tubulaires
51
115
  viola: alto
116
+ viola_d_amore: viole d'amour
117
+ viola_da_gamba: viole de gambe
52
118
  violin: violon
53
- instrument_voices:
54
- alto: alto
55
- baritone: baryton
56
- bass: basse
57
- guitar: guitare
119
+ violoncello: violoncelle
120
+ voice: voix
121
+ xylophone: xylophone
122
+ zither: cithare
123
+ rudiments:
124
+ clef: clé
@@ -1,7 +1,4 @@
1
1
  it:
2
- rudiments:
3
- clef: chiave
4
- consonance: consonanza
5
2
  clefs:
6
3
  alto_clef: chiave di contralto
7
4
  baritone_c_clef: chiave di baritono
@@ -40,19 +37,81 @@ it:
40
37
  treble_clef: chiave di violino
41
38
  viola_clef: chiave di viola
42
39
  violin_clef: chiave di violino
40
+ instrument_classifications:
41
+ brass: ottone
42
+ brass_instrument: ottone
43
+ drum: tamburo
44
+ keyboard_instrument: strumenti a tastiera
45
+ percussion: percussione
46
+ percussion_instrument: strumenti a percussione
47
+ plucked_instrument: strumenti a pizzico
48
+ strings: archi
49
+ stringed_instrument: strumenti a corda
50
+ wind: fiato
51
+ wind_instruments: strumenti a fiato
52
+ woodwind_instruments: legno
53
+ instrument_voices:
54
+ alto: contralto
55
+ baritone: baritono
56
+ bass: basso
43
57
  instruments:
44
58
  accordian: fisarmonica
45
59
  alto_flute: flauto contralto
46
60
  alto_voice: contralto
47
61
  bagpipe: cornamusa
62
+ baritone_horn: flicorno baritono
48
63
  baritone_voice: baritono
64
+ bass_clarinet: clarinetto basso
65
+ bass_drum: grancassa
66
+ bass_trombone: trombono basso
49
67
  bass_voice: basso
68
+ bassoon: fagotto
69
+ castanets: castagnette
70
+ celesta: celesta
71
+ cello: violoncello
72
+ clarinet: clarinetto
73
+ clavichord: clavicordo
74
+ cornet: cornetta
75
+ cymbal: piatto
76
+ double_bass: contrabasso
77
+ english_horn: corno inglese
78
+ euphonium: eufonio
79
+ flugel_horn: flicorno
80
+ flute: flauto
81
+ french_horn: corno
82
+ glockenspiel: glockenspiel
50
83
  guitar: chitarra
84
+ hammered_dulcimer: salterio
85
+ harp: arpa
86
+ harpsichord: clavicembalo
87
+ horn: corno
88
+ lute: liuto
89
+ mandolin: mandolino
90
+ marimba: marimba
91
+ natural_horn: corno naturale
92
+ oboe: oboe
93
+ oboe_d_amore: oboe d'amore
51
94
  piccolo: ottavino
95
+ organ: organo
52
96
  piano: piano
97
+ recorder: flauto dolce
98
+ saxophone: sassofono
99
+ snare_drum: tamburo rullante
100
+ tambourine: tamburello
101
+ tenor_drum: cassa rullante
102
+ timpani: timpano
103
+ trombone: trombone
104
+ trumpet: tromba
105
+ tuba: tuba
106
+ tubular_bells: campane tubolari
53
107
  viola: viola
108
+ viola_d_amore: viola d'amore
109
+ viola_da_gamba: viola da gamba
54
110
  violin: violino
55
- instrument_voices:
56
- alto: contralto
57
- baritone: baritono
58
- bass: basso
111
+ violoncello: violoncello
112
+ voice: voce
113
+ xylophone: xilofono
114
+ zither: cetra da tavolo
115
+ rudiments:
116
+ clef: chiave
117
+ consonance: consonanza
@@ -0,0 +1,70 @@
1
+ ru:
2
+ instrument_classifications:
3
+ brass: mednye dukhovye
4
+ brass_instrument: mednye dukhovye instrument
5
+ drum: baraban
6
+ keyboard_instrument: klavishnyi instrument
7
+ percussion: udarnye
8
+ percussion_instrument: udarnye instrument
9
+ plucked_instrument: shchipkovye instrumenty
10
+ reeds: trosti
11
+ strings: struny
12
+ stringed_instrument: strunnye instrument
13
+ wind: dukhovye
14
+ wind_instrument: dukhovye instrument
15
+ woodwind_instrument: dereviannye dukhovye instrumenty
16
+ instruments:
17
+ accordian: akkordeon
18
+ baritone_horn: bariton rog
19
+ baritone_voice: bariton
20
+ bass_clarinet: bass-klarnet
21
+ bass_drum: bol'shoi baraban
22
+ bass_trombone: bas trombon
23
+ bassoon: fagot
24
+ castanets: kastan'ety
25
+ celesta: chelesta
26
+ cello: violonchel'
27
+ clarinet: klarnet
28
+ clavichord: klavikord
29
+ cornet: kornet
30
+ cowbell: caubel
31
+ cymbal: tarelk
32
+ double_bass: kontrabas
33
+ english_horn: angliiskii rozhok
34
+ euphonium: evfonium
35
+ flugel_horn: fliugel'gorn
36
+ flute: fleita
37
+ french_horn: Gorn
38
+ glockenspiel: kolokol'chiki
39
+ guitar: gitara
40
+ hammered_dulcimer: tsimbaly
41
+ harp: arfa
42
+ harpsichord: klavesin
43
+ horn: Gorn
44
+ lute: liutnia
45
+ mandolin: mandolina
46
+ marimba: marimba
47
+ natural_horn: valtorna
48
+ oboe: goboi
49
+ oboe_d_amore: goboi d'amur
50
+ organ: organ
51
+ piano: fortep'iano
52
+ piccolo: pikkolo
53
+ recorder: blokfleita
54
+ saxophone: saksofon
55
+ snare_drum: frantsuzskii baraban
56
+ tambourine: buben
57
+ tenor_drum: tsilindricheskii baraban
58
+ timpani: litavra
59
+ trombone: trombon
60
+ trumpet: truba
61
+ tuba: tuba
62
+ tubular_bells: trubchatye kolokola
63
+ viola: viola
64
+ viola_d_amore: viola d'amur
65
+ viola_da_gamba: viola da gamba
66
+ violin: skripka
67
+ violoncello: violonchel'
68
+ voice: golos
69
+ xylophone: ksilofon
70
+ zither: tsitra
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module HeadMusic
4
- VERSION = '0.24.2'
4
+ VERSION = '0.26.0'
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: head_music
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.24.2
4
+ version: 0.26.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Rob Head
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-08-08 00:00:00.000000000 Z
11
+ date: 2020-08-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
@@ -160,6 +160,7 @@ files:
160
160
  - lib/head_music/locales/es.yml
161
161
  - lib/head_music/locales/fr.yml
162
162
  - lib/head_music/locales/it.yml
163
+ - lib/head_music/locales/ru.yml
163
164
  - lib/head_music/melodic_interval.rb
164
165
  - lib/head_music/meter.rb
165
166
  - lib/head_music/motion.rb