head_music 0.24.0 → 0.24.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.rubocop.yml +4 -3
- data/head_music.gemspec +3 -2
- data/lib/head_music.rb +14 -0
- data/lib/head_music/chromatic_interval.rb +1 -0
- data/lib/head_music/clef.rb +60 -77
- data/lib/head_music/content/placement.rb +1 -0
- data/lib/head_music/content/position.rb +1 -0
- data/lib/head_music/content/voice.rb +1 -0
- data/lib/head_music/data/clefs.yml +126 -0
- data/lib/head_music/data/instruments.yml +83 -0
- data/lib/head_music/diatonic_interval.rb +1 -0
- data/lib/head_music/grand_staff.rb +8 -6
- data/lib/head_music/instrument.rb +56 -24
- data/lib/head_music/locales/de.yml +63 -0
- data/lib/head_music/locales/en.yml +198 -0
- data/lib/head_music/locales/en_GB.yml +3 -0
- data/lib/head_music/locales/es.yml +53 -0
- data/lib/head_music/locales/fr.yml +57 -0
- data/lib/head_music/locales/it.yml +58 -0
- data/lib/head_music/named.rb +89 -22
- data/lib/head_music/octave.rb +1 -0
- data/lib/head_music/quality.rb +1 -0
- data/lib/head_music/reference_pitch.rb +104 -49
- data/lib/head_music/rhythmic_unit.rb +1 -1
- data/lib/head_music/scale_degree.rb +1 -0
- data/lib/head_music/scale_type.rb +1 -1
- data/lib/head_music/sign.rb +39 -14
- data/lib/head_music/solmization.rb +52 -0
- data/lib/head_music/solmizations.yml +20 -0
- data/lib/head_music/spelling.rb +1 -1
- data/lib/head_music/utilities/hash_key.rb +1 -1
- data/lib/head_music/version.rb +1 -1
- metadata +29 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 32f5c1ba7401ca32fbb3c8f991757e83c64179308507e755fc152a7bc83bb478
|
4
|
+
data.tar.gz: bb5cb90088d2b316e17083c3bab30720f1226b70882a0fc21e2075e14e433bf1
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3dd06274ffffa0fbbd8adbb6340d22b27c6aeecc1ff237800145521b53db6230f25a41b30a862d25282bdcba01cb35b5e6f69390ccdd7492a80dcb84849550dc
|
7
|
+
data.tar.gz: 7e4abe930e7abe9b82a04220dcadff5691d2de531ba792c4d2a506c5f6afef16447288ea9de78ea0a32642f67ca69cb45714d9e121a689c2c44e7d56255de376
|
data/.rubocop.yml
CHANGED
@@ -1,3 +1,7 @@
|
|
1
|
+
AllCops:
|
2
|
+
NewCops: enable
|
3
|
+
TargetRubyVersion: 2.5
|
4
|
+
|
1
5
|
Layout/DotPosition:
|
2
6
|
EnforcedStyle: trailing
|
3
7
|
|
@@ -34,8 +38,5 @@ Style/TrailingCommaInArrayLiteral:
|
|
34
38
|
Style/TrailingCommaInHashLiteral:
|
35
39
|
EnforcedStyleForMultiline: consistent_comma
|
36
40
|
|
37
|
-
AllCops:
|
38
|
-
TargetRubyVersion: 2.4
|
39
|
-
|
40
41
|
Layout/EmptyLineAfterGuardClause:
|
41
42
|
Enabled: false
|
data/head_music.gemspec
CHANGED
@@ -22,10 +22,11 @@ Gem::Specification.new do |spec|
|
|
22
22
|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
|
23
23
|
spec.require_paths = ['lib']
|
24
24
|
|
25
|
-
spec.required_ruby_version = '>= 2.
|
25
|
+
spec.required_ruby_version = '>= 2.5'
|
26
26
|
|
27
|
-
spec.add_runtime_dependency 'activesupport', '
|
27
|
+
spec.add_runtime_dependency 'activesupport', '> 5.0'
|
28
28
|
spec.add_runtime_dependency 'humanize', '~> 1.3'
|
29
|
+
spec.add_runtime_dependency 'i18n', '~> 1.8'
|
29
30
|
|
30
31
|
spec.add_development_dependency 'bundler', '~> 1.13'
|
31
32
|
spec.add_development_dependency 'rake', '>= 12.3.3'
|
data/lib/head_music.rb
CHANGED
@@ -12,6 +12,19 @@ require 'head_music/version'
|
|
12
12
|
require 'active_support/core_ext/module/delegation'
|
13
13
|
require 'active_support/core_ext/string/access'
|
14
14
|
require 'humanize'
|
15
|
+
require 'i18n'
|
16
|
+
require 'i18n/backend/fallbacks'
|
17
|
+
|
18
|
+
I18n::Backend::Simple.include I18n::Backend::Fallbacks
|
19
|
+
I18n.load_path << Dir[File.join(File.dirname(__dir__), 'lib', 'head_music', 'locales', '*.yml')]
|
20
|
+
I18n.config.available_locales = %i[en de fr it es en_US en_GB]
|
21
|
+
I18n.default_locale = :en
|
22
|
+
I18n.fallbacks[:de] = %i[de en_GB en]
|
23
|
+
I18n.fallbacks[:en_US] = %i[en_US en en_GB]
|
24
|
+
I18n.fallbacks[:en_GB] = %i[en_GB en en_US]
|
25
|
+
I18n.fallbacks[:es] = %i[es en]
|
26
|
+
I18n.fallbacks[:fr] = %i[fr en_GB en]
|
27
|
+
I18n.fallbacks[:it] = %i[it en_GB en]
|
15
28
|
|
16
29
|
# utilities
|
17
30
|
require 'head_music/utilities/hash_key'
|
@@ -50,6 +63,7 @@ require 'head_music/scale'
|
|
50
63
|
require 'head_music/scale_degree'
|
51
64
|
require 'head_music/scale_type'
|
52
65
|
require 'head_music/sign'
|
66
|
+
require 'head_music/solmization'
|
53
67
|
require 'head_music/sonority'
|
54
68
|
require 'head_music/spelling'
|
55
69
|
require 'head_music/staff'
|
@@ -6,6 +6,7 @@ class HeadMusic::ChromaticInterval
|
|
6
6
|
|
7
7
|
private_class_method :new
|
8
8
|
|
9
|
+
# TODO: include the Named module
|
9
10
|
NAMES = %w[
|
10
11
|
perfect_unison minor_second major_second minor_third major_third perfect_fourth tritone perfect_fifth
|
11
12
|
minor_sixth major_sixth minor_seventh major_seventh perfect_octave
|
data/lib/head_music/clef.rb
CHANGED
@@ -1,93 +1,23 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
+
require 'yaml'
|
4
|
+
|
3
5
|
# A clef assigns pitches to the lines and spaces of a staff.
|
4
6
|
class HeadMusic::Clef
|
5
7
|
include HeadMusic::Named
|
6
8
|
|
7
|
-
|
8
|
-
{
|
9
|
-
pitch: 'G4', line: 2,
|
10
|
-
names: %w[treble G-clef],
|
11
|
-
modern: true,
|
12
|
-
unicode: '𝄞', html_entity: '𝄞',
|
13
|
-
},
|
14
|
-
{
|
15
|
-
pitch: 'G4', line: 1,
|
16
|
-
names: ['French', 'French violin'],
|
17
|
-
unicode: '𝄞', html_entity: '𝄞',
|
18
|
-
},
|
19
|
-
{
|
20
|
-
pitch: 'G3', line: 2,
|
21
|
-
names: ['choral tenor', 'tenor', 'tenor G-clef'],
|
22
|
-
modern: true,
|
23
|
-
unicode: '𝄠', html_entity: '𝄠',
|
24
|
-
},
|
25
|
-
{
|
26
|
-
pitch: 'F3', line: 3,
|
27
|
-
names: ['baritone'],
|
28
|
-
unicode: '𝄢', html_entity: '𝄢',
|
29
|
-
},
|
30
|
-
{
|
31
|
-
pitch: 'F3', line: 4,
|
32
|
-
names: %w[bass F-clef],
|
33
|
-
modern: true,
|
34
|
-
unicode: '𝄢', html_entity: '𝄢',
|
35
|
-
},
|
36
|
-
{
|
37
|
-
pitch: 'F3', line: 5,
|
38
|
-
names: ['sub-bass'],
|
39
|
-
unicode: '𝄢', html_entity: '𝄢',
|
40
|
-
},
|
41
|
-
{
|
42
|
-
pitch: 'C4', line: 1,
|
43
|
-
names: ['soprano'],
|
44
|
-
unicode: '𝄡', html_entity: '𝄡',
|
45
|
-
},
|
46
|
-
{
|
47
|
-
pitch: 'C4', line: 2,
|
48
|
-
names: ['mezzo-soprano'],
|
49
|
-
unicode: '𝄡', html_entity: '𝄡',
|
50
|
-
},
|
51
|
-
{
|
52
|
-
pitch: 'C4', line: 3,
|
53
|
-
names: %w[alto viola counter-tenor countertenor C-clef],
|
54
|
-
modern: true,
|
55
|
-
unicode: '𝄡', html_entity: '𝄡',
|
56
|
-
},
|
57
|
-
{
|
58
|
-
pitch: 'C4', line: 4,
|
59
|
-
names: ['tenor', 'tenor C-clef'],
|
60
|
-
modern: true,
|
61
|
-
unicode: '𝄡', html_entity: '𝄡',
|
62
|
-
},
|
63
|
-
{
|
64
|
-
pitch: 'C4', line: 5,
|
65
|
-
names: ['baritone', 'baritone C-clef'],
|
66
|
-
unicode: '𝄡', html_entity: '𝄡',
|
67
|
-
},
|
68
|
-
{
|
69
|
-
pitch: nil, line: 3,
|
70
|
-
names: %w[neutral percussion],
|
71
|
-
modern: true,
|
72
|
-
unicode: '𝄥', html_entity: '𝄥',
|
73
|
-
},
|
74
|
-
].freeze
|
9
|
+
RECORDS = YAML.load_file(File.expand_path('data/clefs.yml', __dir__)).freeze
|
75
10
|
|
76
11
|
def self.get(name)
|
77
12
|
get_by_name(name)
|
78
13
|
end
|
79
14
|
|
80
|
-
attr_reader :pitch, :line, :
|
15
|
+
attr_reader :pitch, :line, :musical_symbols
|
81
16
|
|
82
17
|
delegate :ascii, :html_entity, :unicode, to: :musical_symbol
|
83
18
|
|
84
|
-
def
|
85
|
-
|
86
|
-
clef_data = CLEFS.detect { |clef| clef[:names].map(&:downcase).include?(name.downcase) }
|
87
|
-
@pitch = HeadMusic::Pitch.get(clef_data[:pitch])
|
88
|
-
@line = clef_data[:line]
|
89
|
-
@modern = clef_data[:modern]
|
90
|
-
@musical_symbol = HeadMusic::MusicalSymbol.new(clef_data.slice(:ascii, :html_entity, :unicode))
|
19
|
+
def musical_symbol
|
20
|
+
musical_symbols.first
|
91
21
|
end
|
92
22
|
|
93
23
|
def clef_type
|
@@ -115,6 +45,59 @@ class HeadMusic::Clef
|
|
115
45
|
end
|
116
46
|
|
117
47
|
def ==(other)
|
118
|
-
|
48
|
+
HeadMusic::Utilities::HashKey.for(self) == HeadMusic::Utilities::HashKey.for(other)
|
49
|
+
end
|
50
|
+
|
51
|
+
def name(locale_code: Locale::DEFAULT_CODE)
|
52
|
+
I18n.translate(name_key, scope: :clefs, locale: locale_code)
|
53
|
+
end
|
54
|
+
|
55
|
+
private_class_method :new
|
56
|
+
|
57
|
+
private
|
58
|
+
|
59
|
+
def initialize(name)
|
60
|
+
record = record_for_name(name)
|
61
|
+
initialize_data_from_record(record)
|
62
|
+
end
|
63
|
+
|
64
|
+
def record_for_name(name)
|
65
|
+
name = name.to_s.strip
|
66
|
+
key = HeadMusic::Utilities::HashKey.for(name)
|
67
|
+
RECORDS.detect do |record|
|
68
|
+
name_keys = name_keys_from_record(record)
|
69
|
+
name_keys.include?(key) || name_key_translations(name_keys).include?(name)
|
70
|
+
end
|
71
|
+
end
|
72
|
+
|
73
|
+
def name_keys_from_record(record)
|
74
|
+
([record[:name_key]] + [record[:alias_name_keys]]).flatten.compact.uniq.map(&:to_sym)
|
75
|
+
end
|
76
|
+
|
77
|
+
def name_key_translations(name_keys)
|
78
|
+
name_keys.map do |name_key|
|
79
|
+
I18n.config.available_locales.map do |locale_code|
|
80
|
+
I18n.translate(name_key, scope: :clefs, locale: locale_code)
|
81
|
+
end.flatten.uniq.compact
|
82
|
+
end.flatten.uniq.compact
|
83
|
+
end
|
84
|
+
|
85
|
+
def initialize_data_from_record(record)
|
86
|
+
initialize_keys_from_record(record)
|
87
|
+
@pitch = HeadMusic::Pitch.get(record[:pitch])
|
88
|
+
@line = record[:line]
|
89
|
+
@modern = record[:modern]
|
90
|
+
initialize_musical_symbols(record[:symbols])
|
91
|
+
end
|
92
|
+
|
93
|
+
def initialize_keys_from_record(record)
|
94
|
+
@name_key = record[:name_key]
|
95
|
+
@alias_name_keys = [record[:alias_name_keys]].flatten.compact
|
96
|
+
end
|
97
|
+
|
98
|
+
def initialize_musical_symbols(list)
|
99
|
+
@musical_symbols = (list || []).map do |symbol_data|
|
100
|
+
HeadMusic::MusicalSymbol.new(symbol_data.slice(:ascii, :html_entity, :unicode))
|
101
|
+
end
|
119
102
|
end
|
120
103
|
end
|
@@ -0,0 +1,126 @@
|
|
1
|
+
---
|
2
|
+
- :pitch: G4
|
3
|
+
:line: 2
|
4
|
+
:modern: true
|
5
|
+
:name_key: treble_clef
|
6
|
+
:alias_name_keys:
|
7
|
+
- g_clef
|
8
|
+
- second_line_g_clef
|
9
|
+
- violin_clef
|
10
|
+
:symbols:
|
11
|
+
- :unicode: "\U0001D11E"
|
12
|
+
:html_entity: "𝄞"
|
13
|
+
- :pitch: G4
|
14
|
+
:line: 1
|
15
|
+
:name_key: french_violin_clef
|
16
|
+
:alias_name_keys:
|
17
|
+
- french_clef
|
18
|
+
- first_line_g_clef
|
19
|
+
:symbols:
|
20
|
+
- :unicode: "\U0001D11E"
|
21
|
+
:html_entity: "𝄞"
|
22
|
+
- :pitch: G3
|
23
|
+
:line: 2
|
24
|
+
:modern: true
|
25
|
+
:name_key: choral_tenor_clef
|
26
|
+
:alias_name_keys:
|
27
|
+
- tenor_clef
|
28
|
+
- tenor_g_clef
|
29
|
+
:symbols:
|
30
|
+
- :unicode: "\U0001D120"
|
31
|
+
:html_entity: "𝄠"
|
32
|
+
- :pitch: G3
|
33
|
+
:line: 2
|
34
|
+
:name_key: double_treble_clef
|
35
|
+
:symbols:
|
36
|
+
- :unicode: "\U0001D11E\U0001D11E"
|
37
|
+
:html_entity: "𝄞𝄞"
|
38
|
+
- :pitch: F3
|
39
|
+
:line: 3
|
40
|
+
:name_key: baritone_clef
|
41
|
+
:alias_name_keys:
|
42
|
+
- baritone_f_clef
|
43
|
+
- third_line_f_clef
|
44
|
+
:symbols:
|
45
|
+
- :unicode: "\U0001D122"
|
46
|
+
:html_entity: "𝄢"
|
47
|
+
- :pitch: F3
|
48
|
+
:line: 4
|
49
|
+
:modern: true
|
50
|
+
:name_key: bass_clef
|
51
|
+
:alias_name_keys:
|
52
|
+
- f_clef
|
53
|
+
- fourth_line_f_clef
|
54
|
+
:symbols:
|
55
|
+
- :unicode: "\U0001D122"
|
56
|
+
:html_entity: "𝄢"
|
57
|
+
- :pitch: F3
|
58
|
+
:line: 5
|
59
|
+
:name_key: sub_bass_clef
|
60
|
+
:alias_name_keys:
|
61
|
+
- contrabass_clef
|
62
|
+
- fifth_line_f_clef
|
63
|
+
:symbols:
|
64
|
+
- :unicode: "\U0001D122"
|
65
|
+
:html_entity: "𝄢"
|
66
|
+
- :pitch: C4
|
67
|
+
:line: 1
|
68
|
+
:name_key: soprano_clef
|
69
|
+
:alias_name_keys:
|
70
|
+
- first_line_c_clef
|
71
|
+
:symbols:
|
72
|
+
- :unicode: "\U0001D121"
|
73
|
+
:html_entity: "𝄡"
|
74
|
+
- :pitch: C4
|
75
|
+
:line: 2
|
76
|
+
:name_key: mezzo_soprano_clef
|
77
|
+
:alias_name_keys:
|
78
|
+
- second_line_c_clef
|
79
|
+
:symbols:
|
80
|
+
- :unicode: "\U0001D121"
|
81
|
+
:html_entity: "𝄡"
|
82
|
+
- :pitch: C4
|
83
|
+
:line: 3
|
84
|
+
:modern: true
|
85
|
+
:name_key: alto_clef
|
86
|
+
:alias_name_keys:
|
87
|
+
- c_clef
|
88
|
+
- third_line_c_clef
|
89
|
+
- viola_clef
|
90
|
+
- countertenor_clef
|
91
|
+
:symbols:
|
92
|
+
- :unicode: "\U0001D121"
|
93
|
+
:html_entity: "𝄡"
|
94
|
+
- :pitch: C4
|
95
|
+
:line: 4
|
96
|
+
:modern: true
|
97
|
+
:name_key: tenor_clef
|
98
|
+
:alias_name_keys:
|
99
|
+
- tenor_c_clef
|
100
|
+
- fourth_line_c_clef
|
101
|
+
:symbols:
|
102
|
+
- :unicode: "\U0001D121"
|
103
|
+
:html_entity: "𝄡"
|
104
|
+
- :pitch: C4
|
105
|
+
:line: 5
|
106
|
+
:name_key: baritone_c_clef
|
107
|
+
:alias_name_keys:
|
108
|
+
- baritone_clef
|
109
|
+
- fifth_line_c_clef
|
110
|
+
:symbols:
|
111
|
+
- :unicode: "\U0001D121"
|
112
|
+
:html_entity: "𝄡"
|
113
|
+
- :pitch:
|
114
|
+
:line: 3
|
115
|
+
:modern: true
|
116
|
+
:name_key: neutral_clef
|
117
|
+
:alias_name_keys:
|
118
|
+
- percussion_clef
|
119
|
+
- indefinite_pitch_clef
|
120
|
+
- rhythm_clef
|
121
|
+
- drum_clef
|
122
|
+
:symbols:
|
123
|
+
- :unicode: "\U0001D125"
|
124
|
+
:html_entity: "𝄥"
|
125
|
+
- :unicode: "\U0001D126"
|
126
|
+
:html_entity: "𝄦"
|
@@ -0,0 +1,83 @@
|
|
1
|
+
---
|
2
|
+
guitar:
|
3
|
+
family: string
|
4
|
+
classifications:
|
5
|
+
- string
|
6
|
+
- chordophone
|
7
|
+
default_clefs:
|
8
|
+
- treble_clef
|
9
|
+
voice: tenor
|
10
|
+
piano:
|
11
|
+
family: string
|
12
|
+
classifications:
|
13
|
+
- string
|
14
|
+
- chordophone
|
15
|
+
- keyboard
|
16
|
+
default_clefs:
|
17
|
+
- treble_clef
|
18
|
+
- bass_clef
|
19
|
+
violin:
|
20
|
+
family: string
|
21
|
+
alias_name_keys:
|
22
|
+
- fiddle
|
23
|
+
classifications:
|
24
|
+
- string
|
25
|
+
- chordophone
|
26
|
+
- bowed
|
27
|
+
default_clefs:
|
28
|
+
- treble_clef
|
29
|
+
voice: soprano
|
30
|
+
viola:
|
31
|
+
family: string
|
32
|
+
classifications:
|
33
|
+
- string
|
34
|
+
- chordophone
|
35
|
+
- bowed
|
36
|
+
default_clefs:
|
37
|
+
- alto_clef
|
38
|
+
voice: alto
|
39
|
+
cello:
|
40
|
+
family: string
|
41
|
+
classifications:
|
42
|
+
- string
|
43
|
+
- chordophone
|
44
|
+
- bowed
|
45
|
+
default_clefs:
|
46
|
+
- bass_clef
|
47
|
+
voice: tenor
|
48
|
+
double_bass:
|
49
|
+
family: string
|
50
|
+
classifications:
|
51
|
+
- string
|
52
|
+
- chordophone
|
53
|
+
- bowed
|
54
|
+
default_clefs:
|
55
|
+
- bass_clef
|
56
|
+
voice: bass
|
57
|
+
harp:
|
58
|
+
family: string
|
59
|
+
classifications:
|
60
|
+
- string
|
61
|
+
- chordophone
|
62
|
+
- plucked
|
63
|
+
default_clefs:
|
64
|
+
- treble_clef
|
65
|
+
- bass_clef
|
66
|
+
flute:
|
67
|
+
family: woodwind
|
68
|
+
classifications:
|
69
|
+
- woodwind
|
70
|
+
- wind
|
71
|
+
- aerophone
|
72
|
+
- edge-blown aerophone
|
73
|
+
default_clefs:
|
74
|
+
- treble_clef
|
75
|
+
voice: soprano
|
76
|
+
organ:
|
77
|
+
classifications:
|
78
|
+
- aerophone
|
79
|
+
- keyboard
|
80
|
+
default_clefs:
|
81
|
+
- treble_clef
|
82
|
+
- bass_clef
|
83
|
+
- bass_clef
|