lib/head_music/clef.rb in head_music-0.20.0 vs lib/head_music/clef.rb in head_music-0.22.0

@@ -5,21 +5,21 @@
   include HeadMusic::NamedRudiment
 
   CLEFS = [
     { pitch: 'G4', line: 2, names: ['treble', 'G-clef'], modern: true },
     { pitch: 'G4', line: 1, names: ['French', 'French violin'] },
-    { pitch: 'G3', line: 2, names: ['choral tenor', 'tenor'], modern: true },
+    { pitch: 'G3', line: 2, names: ['choral tenor', 'tenor', 'tenor G-clef'], modern: true },
 
     { pitch: 'F3', line: 3, names: ['baritone'] },
     { pitch: 'F3', line: 4, names: ['bass', 'F-clef'], modern: true },
     { pitch: 'F3', line: 5, names: ['sub-bass'] },
 
     { pitch: 'C4', line: 1, names: ['soprano'] },
     { pitch: 'C4', line: 2, names: ['mezzo-soprano'] },
     { pitch: 'C4', line: 3, names: ['alto', 'viola', 'counter-tenor', 'countertenor', 'C-clef'], modern: true },
-    { pitch: 'C4', line: 4, names: ['tenor'], modern: true },
-    { pitch: 'C4', line: 5, names: ['baritone'] },
+    { pitch: 'C4', line: 4, names: ['tenor', 'tenor C-clef'], modern: true },
+    { pitch: 'C4', line: 5, names: ['baritone', 'baritone C-clef'] },
 
     { pitch: nil, line: 3, names: %w[neutral percussion] },
   ].freeze
 
   def self.get(name)
@@ -31,29 +31,34 @@
   def initialize(name)
     @name = name.to_s
     clef_data = CLEFS.detect { |clef| clef[:names].map(&:downcase).include?(name.downcase) }
     @pitch = HeadMusic::Pitch.get(clef_data[:pitch])
     @line = clef_data[:line]
+    @modern = clef_data[:modern]
   end
 
   def clef_type
     "#{pitch.letter_name}-clef"
   end
 
-  def line_pitch(line_number)
+  def pitch_for_line(line_number)
     @line_pitches ||= {}
     @line_pitches[line_number] ||= begin
       steps = (line_number - line) * 2
       pitch.natural_steps(steps)
     end
   end
 
-  def space_pitch(space_number)
+  def pitch_for_space(space_number)
     @space_pitches ||= {}
     @space_pitches[space_number] ||= begin
       steps = (space_number - line) * 2 + 1
       pitch.natural_steps(steps)
     end
+  end
+
+  def modern?
+    @modern
   end
 
   def ==(other)
     to_s == other.to_s
   end