Run grand-replace (issue 3765)

[lilypond.git] / lily / ambitus-engraver.cc

diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index 8690b01f80b4dedab341344fb3e8ff8485fcfe00..a72c735b51417a55190cd29d19ebf5fefb2c09ab 100644 (file)
--- a/lily/ambitus-engraver.cc
+++ b/lily/ambitus-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2002--2012 Juergen Reuter <reuter@ipd.uka.de>
+  Copyright (C) 2002--2014 Juergen Reuter <reuter@ipd.uka.de>
 
   Han-Wen Nienhuys <hanwen@xs4all.nl
 
@@ -71,8 +71,7 @@ Ambitus_engraver::create_ambitus ()
 {
   ambitus_ = make_item ("AmbitusLine", SCM_EOL);
   group_ = make_item ("Ambitus", SCM_EOL);
-  Direction d = DOWN;
-  do
+  for (DOWN_and_UP (d))
     {
       heads_[d] = make_item ("AmbitusNoteHead", SCM_EOL);
       accidentals_[d] = make_item ("AmbitusAccidental", SCM_EOL);
@@ -82,7 +81,6 @@ Ambitus_engraver::create_ambitus ()
       Axis_group_interface::add_element (group_, heads_[d]);
       Axis_group_interface::add_element (group_, accidentals_[d]);
     }
-  while (flip (&d) != DOWN);
 
   ambitus_->set_parent (heads_[DOWN], X_AXIS);
   Axis_group_interface::add_element (group_, ambitus_);
@@ -164,8 +162,7 @@ Ambitus_engraver::finalize ()
       Grob *accidental_placement
         = make_item ("AccidentalPlacement", accidentals_[DOWN]->self_scm ());
 
-      Direction d = DOWN;
-      do
+      for (DOWN_and_UP (d))
         {
           Pitch p = pitch_interval_[d];
           heads_[d]->set_property ("cause", causes_[d]->self_scm ());
@@ -200,24 +197,21 @@ Ambitus_engraver::finalize ()
           Separation_item::add_conditional_item (heads_[d],
                                                  accidental_placement);
           Accidental_placement::add_accidental (accidental_placement,
-                                                accidentals_[d]);
+                                                accidentals_[d], false, 0);
           Pointer_group_interface::add_grob (ambitus_,
                                              ly_symbol2scm ("note-heads"),
                                              heads_[d]);
         }
-      while (flip (&d) != DOWN);
 
       Axis_group_interface::add_element (group_, accidental_placement);
     }
   else
     {
-      Direction d = DOWN;
-      do
+      for (DOWN_and_UP (d))
         {
           accidentals_[d]->suicide ();
           heads_[d]->suicide ();
         }
-      while (flip (&d) != DOWN);
 
       ambitus_->suicide ();
     }
@@ -238,7 +232,7 @@ ADD_TRANSLATOR (Ambitus_engraver,
                 /* read */
                 "keySignature "
                 "middleCClefPosition "
-               "middleCOffset ",
+                "middleCOffset ",
 
                 /* write */
                 ""