Adds OctavateEight to the avoidance grobs of the Beam_collision_engraver

diff --git a/lily/beam-collision-engraver.cc b/lily/beam-collision-engraver.cc
index b700dc733d39c1ac25d8905186eb8194582139bb..bcd9c698f0239eccea9539e48704c5f6e68c110e 100644 (file)
--- a/lily/beam-collision-engraver.cc
+++ b/lily/beam-collision-engraver.cc
@@ -34,6 +34,7 @@ protected:
   DECLARE_ACKNOWLEDGER (stem);
   DECLARE_ACKNOWLEDGER (accidental);
   DECLARE_ACKNOWLEDGER (clef);
+  DECLARE_ACKNOWLEDGER (octavate_eight);
   DECLARE_ACKNOWLEDGER (key_signature);
   DECLARE_ACKNOWLEDGER (time_signature);
   DECLARE_ACKNOWLEDGER (beam);
@@ -165,6 +166,12 @@ Beam_collision_engraver::acknowledge_key_signature (Grob_info i)
   covered_grobs_.push_back (i);
 }
 
+void
+Beam_collision_engraver::acknowledge_octavate_eight (Grob_info i)
+{
+  covered_grobs_.push_back (i);
+}
+
 void
 Beam_collision_engraver::acknowledge_time_signature (Grob_info i)
 {
@@ -192,6 +199,7 @@ ADD_ACKNOWLEDGER (Beam_collision_engraver, accidental);
 ADD_ACKNOWLEDGER (Beam_collision_engraver, clef);
 ADD_ACKNOWLEDGER (Beam_collision_engraver, key_signature);
 ADD_ACKNOWLEDGER (Beam_collision_engraver, time_signature);
+ADD_ACKNOWLEDGER (Beam_collision_engraver, octavate_eight);
 ADD_ACKNOWLEDGER (Beam_collision_engraver, flag);
 ADD_ACKNOWLEDGER (Beam_collision_engraver, beam);
 

diff --git a/scm/define-grob-interfaces.scm b/scm/define-grob-interfaces.scm
index 8d9c457037538c4bddd95e8d44ecaad4ee1c6105..eb76e96e0b53e76bccc60a281543bb0013700f09 100644 (file)
--- a/scm/define-grob-interfaces.scm
+++ b/scm/define-grob-interfaces.scm
@@ -215,6 +215,14 @@ accidentals)."
  "Note names."
  '())
 
+(ly:add-interface
+ 'octavate-eight-interface
+  "Interface that permits the nominal identification of the octavian
+annotation that multiplies by two the freqency of the pitches present
+in a given staff were they played on a clef that lacked said octavian
+annotation."
+  '())
+
 (ly:add-interface
  'only-prebreak-interface
  "Kill this grob after the line breaking process."

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 9da27ed7c1c97692b6c8131c6265f319f007ebf1..9331744168189285df678a5d9bf18de379ba1371 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -365,6 +365,7 @@
                                 inline-accidental-interface
                                 key-signature-interface
                                 note-head-interface
+                                octavate-eight-interface
                                 stem-interface
                                 time-signature-interface))
        (cross-staff . ,ly:beam::calc-cross-staff)
@@ -1552,6 +1553,7 @@
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Item)
                 (interfaces . (font-interface
+                               octavate-eight-interface
                                self-alignment-interface
                                side-position-interface
                                text-interface))))))