X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnew-fingering-engraver.cc;h=1cd7cd10e294cbbed8e1629261095df8a7eea7a1;hb=f5fb973721809df7b4ce7639caf36c2fb66f3454;hp=2749d5cb3f623d1c46fd050c2f5b03bf7c9ab784;hpb=085d664639efb22f5252d101b151f7cc8f9f86f5;p=lilypond.git

diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index 2749d5cb3f..1cd7cd10e2 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--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -125,10 +125,8 @@ New_fingering_engraver::acknowledge_stem (Grob_info inf)
 void
 New_fingering_engraver::add_script (Grob *head,
 				    Stream_event *event,
-				    Stream_event *note)
+				    Stream_event * /* note */)
 {
-  (void) note;
-
   Finger_tuple ft;
 
   Grob *g = make_item ("Script", event->self_scm ());
@@ -262,8 +260,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 +268,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_));