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 546fa8d3f6c5f51f393a25037bf82297aed2f7f4..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--2007 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 ();
        }
     }
@@ -262,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
@@ -272,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_));
@@ -346,9 +345,9 @@ 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.",
+               "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 "
@@ -358,6 +357,7 @@ ADD_TRANSLATOR (New_fingering_engraver,
 
                /* read */
                "fingeringOrientations "
+               "harmonicDots "
                "strokeFingerOrientations "
                "stringNumberOrientations ",