X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnew-fingering-engraver.cc;h=fe75842c0ffa29342119be223e8785219bcefce6;hb=f49e954f4a1c1c388ebe8c0581a20da0238aed25;hp=594f24f337deca28defdb719969dad63ed834f42;hpb=44ad1d66c072e4d6545e75c769c86a460cb1df13;p=lilypond.git

diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index 594f24f337..fe75842c0f 100644
--- a/lily/new-fingering-engraver.cc
+++ b/lily/new-fingering-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -93,7 +93,7 @@ New_fingering_engraver::acknowledge_rhythmic_head (Grob_info inf)
 		       &fingerings_,
 		       ev, note_ev);
       else if (ev->in_event_class ("text-script-event"))
-	ev->origin ()->warning (_ ("can't add text scripts to individual note heads"));
+	ev->origin ()->warning (_ ("cannot add text scripts to individual note heads"));
       else if (ev->in_event_class ("script-event"))
 	add_script (inf.grob (), ev, note_ev);
       else if (ev->in_event_class ("string-number-event"))
@@ -249,7 +249,12 @@ New_fingering_engraver::position_scripts (SCM orientations,
       Grob *f = ft.script_;
       f->set_parent (ft.head_, X_AXIS);
       f->set_parent (ft.head_, Y_AXIS);
-
+      f->set_property ("avoid-slur", SCM_BOOL_F);
+      if (hordir == LEFT
+	  && unsmob_grob (ft.head_->get_object ("accidental-grob")))
+	Side_position_interface::add_support (f,
+					      unsmob_grob (ft.head_->get_object ("accidental-grob")));
+					      
       Self_alignment_interface::set_align_self (f, Y_AXIS);
       Self_alignment_interface::set_center_parent (f, Y_AXIS);
       Side_position_interface::set_axis (f, X_AXIS);
@@ -284,7 +289,7 @@ New_fingering_engraver::position_scripts (SCM orientations,
 void
 New_fingering_engraver::stop_translation_timestep ()
 {
-  position_all();
+  position_all ();
   stem_ = 0;
   heads_.clear ();
 }
@@ -340,20 +345,22 @@ ADD_ACKNOWLEDGER (New_fingering_engraver, rhythmic_head);
 ADD_ACKNOWLEDGER (New_fingering_engraver, stem);
 
 ADD_TRANSLATOR (New_fingering_engraver,
-		/* doc */ "Create fingering-scripts for notes in a new chord.  "
-		"This engraver is ill-named, since it "
-		"also takes care of articulations and harmonic note heads",
+		/* doc */
+		"Create fingering scripts for notes in a new chord.  This"
+		" engraver is ill-named, since it also takes care of"
+		" articulations and harmonic note heads.",
+
 		/* create */
 		"Fingering "
 		"StringNumber "
 		"StrokeFinger "
-		"Script "
-		,
+		"Script ",
+
 		/* read */
-		
 		"fingeringOrientations "
 		"strokeFingerOrientations "
-		"stringNumberOrientations "
-		,
+		"stringNumberOrientations ",
 		
-		/* write */ "");
+		/* write */
+		""
+		);