Run `make grand-replace'.

[lilypond.git] / lily / new-fingering-engraver.cc

diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index 1ae7794393cffa9dd7be84a82bad09b4f0d5c4c7..5078e2d2db9f1bcd11139528f93c469703c80c33 100644 (file)
--- 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--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -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,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);
@@ -257,8 +262,6 @@ New_fingering_engraver::position_scripts (SCM orientations,
       f->set_property ("direction", scm_from_int (hordir));
     }
 
-  int finger_prio = 200;
-
   Direction d = DOWN;
   Drul_array< vector<Finger_tuple> > vertical (down, up);
   do
@@ -267,6 +270,7 @@ New_fingering_engraver::position_scripts (SCM orientations,
        {
          Finger_tuple ft = vertical[d][i];
          Grob *f = ft.script_;
+         int finger_prio = robust_scm2int (f->get_property ("script-priority"), 200);
          f->set_parent (ft.head_, X_AXIS);
          f->set_property ("script-priority",
                           scm_from_int (finger_prio + d * ft.position_));
@@ -284,7 +288,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 +344,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 */
+               ""
+               );