X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fambitus-engraver.cc;h=0a76267c7edb3c58c36afb2f56a7b611e0ca0fd7;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=ae692d380a141412ee08c5331f0c6236fe84ba01;hpb=4a401ca1c60f428daa242dbdd102fdb3f327ebfb;p=lilypond.git

diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index ae692d380a..0a76267c7e 100644
--- 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--2011 Juergen Reuter <reuter@ipd.uka.de>
+  Copyright (C) 2002--2015 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_);
@@ -120,9 +118,15 @@ Ambitus_engraver::stop_translation_timestep ()
        * may then oversee a clef that is defined in a staff context if
        * we are in a voice context; middleCPosition would then be
        * assumed to be 0.
+
+       * Don't use middleCPosition as this may be thwarted by a cue
+       * starting here.  middleCOffset is not affected by cue clefs.
        */
-      start_c0_ = robust_scm2int (get_property ("middleCPosition"), 0);
-      start_key_sig_ = get_property ("keySignature");
+      int clef_pos = robust_scm2int (get_property ("middleCClefPosition"), 0);
+      int offset = robust_scm2int (get_property ("middleCOffset"), 0);
+
+      start_c0_ = clef_pos + offset;
+      start_key_sig_ = get_property ("keyAlterations");
 
       is_typeset_ = true;
     }
@@ -139,9 +143,9 @@ Ambitus_engraver::acknowledge_note_head (Grob_info info)
         If the engraver is added to a percussion context,
         filter out unpitched note heads.
       */
-      if (!unsmob_pitch (p))
+      if (!Pitch::is_smob (p))
         return;
-      Pitch pitch = *unsmob_pitch (p);
+      Pitch pitch = *Pitch::unsmob (p);
       Drul_array<bool> expands = pitch_interval_.add_point (pitch);
       if (expands[UP])
         causes_[UP] = nr;
@@ -158,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 ());
@@ -194,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 ();
     }
@@ -230,8 +230,9 @@ ADD_TRANSLATOR (Ambitus_engraver,
                 "AmbitusNoteHead ",
 
                 /* read */
-                "keySignature "
-                "middleCPosition ",
+                "keyAlterations "
+                "middleCClefPosition "
+                "middleCOffset ",
 
                 /* write */
                 ""