Issue 2525: Fix a number of display-lily shortcomings

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

diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index 9ae9a9998aa9717145d8ea0c3379df1f1f12ee29..0ad31ec1265d4d30cb8724c7a3bf0aacb2ca707b 100644 (file)
--- a/lily/new-fingering-engraver.cc
+++ b/lily/new-fingering-engraver.cc
@@ -85,7 +85,7 @@ protected:
 void
 New_fingering_engraver::acknowledge_inline_accidental (Grob_info inf)
 {
-  accidentals_.push_back(inf.grob ());
+  accidentals_.push_back (inf.grob ());
 }
 
 void
@@ -114,15 +114,15 @@ New_fingering_engraver::acknowledge_rhythmic_head (Grob_info inf)
       else if (ev->in_event_class ("script-event"))
         add_script (inf.grob (), ev, note_ev);
       else if (ev->in_event_class ("string-number-event"))
-        {    
+        {
           // String numbers are used in calculating harmonics even
           // when we don't want them displayed.  So don't make space
           // for them if 'stencil is #f
           Grob *g = make_item ("StringNumber", ev->self_scm ());
           if (g->get_property ("stencil") != SCM_BOOL_F)
             add_fingering (inf.grob (),
-                            ly_symbol2scm ("StringNumber"), &string_numbers_,
-                            ev, note_ev);
+                           ly_symbol2scm ("StringNumber"), &string_numbers_,
+                           ev, note_ev);
           g->suicide (); // Kill grob created to check stencil
         }
       else if (ev->in_event_class ("stroke-finger-event"))
@@ -291,9 +291,8 @@ New_fingering_engraver::position_scripts (SCM orientations,
       f->set_property ("direction", scm_from_int (hordir));
     }
 
-  Direction d = DOWN;
   Drul_array< vector<Finger_tuple> > vertical (down, up);
-  do
+  for (DOWN_and_UP (d))
     {
       for (vsize i = 0; i < vertical[d].size (); i++)
         {
@@ -311,7 +310,6 @@ New_fingering_engraver::position_scripts (SCM orientations,
           f->set_property ("direction", scm_from_int (d));
         }
     }
-  while (flip (&d) != DOWN);
 }
 
 void