X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnew-fingering-engraver.cc;h=2749d5cb3f623d1c46fd050c2f5b03bf7c9ab784;hb=7c83ac2d86066ca8f41260d37e792e166ad5dbb6;hp=7cb38bd95677910a6b566da3b030cb24a0137875;hpb=f9214bac21e9926dc3248416f58190c98c4167a9;p=lilypond.git

diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index 7cb38bd956..2749d5cb3f 100644
--- a/lily/new-fingering-engraver.cc
+++ b/lily/new-fingering-engraver.cc
@@ -108,7 +108,7 @@ New_fingering_engraver::acknowledge_rhythmic_head (Grob_info inf)
 	{
 	  inf.grob ()->set_property ("style", ly_symbol2scm ("harmonic"));
 	  Grob *d = unsmob_grob (inf.grob ()->get_object ("dot"));
-	  if (d)
+	  if (d && !to_boolean (get_property ("harmonicDots")))
 	    d->suicide ();
 	}
     }
@@ -249,7 +249,7 @@ 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,
@@ -289,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 ();
 }
@@ -345,20 +345,23 @@ 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 "
+		"harmonicDots "
 		"strokeFingerOrientations "
-		"stringNumberOrientations "
-		,
+		"stringNumberOrientations ",
 		
-		/* write */ "");
+		/* write */
+		""
+		);