From: Mike Solomon <mike@apollinemike.com>
Date: Wed, 29 Aug 2012 08:14:16 +0000 (+0200)
Subject: Adds OctavateEight to the avoidance grobs of the Beam_collision_engraver
X-Git-Tag: release/2.17.2-1~39
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2a6d112286bfaabe36ef54fc655821cd87a91f4b;p=lilypond.git

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 b700dc733d..bcd9c698f0 100644
--- 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 8d9c457037..eb76e96e0b 100644
--- 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 9da27ed7c1..9331744168 100644
--- 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))))))