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

diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index 92fee10a50..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--2012 Juergen Reuter <reuter@ipd.uka.de>
+  Copyright (C) 2002--2015 Juergen Reuter <reuter@ipd.uka.de>
 
   Han-Wen Nienhuys <hanwen@xs4all.nl
 
@@ -126,7 +126,7 @@ Ambitus_engraver::stop_translation_timestep ()
       int offset = robust_scm2int (get_property ("middleCOffset"), 0);
 
       start_c0_ = clef_pos + offset;
-      start_key_sig_ = get_property ("keySignature");
+      start_key_sig_ = get_property ("keyAlterations");
 
       is_typeset_ = true;
     }
@@ -143,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;
@@ -197,7 +197,7 @@ 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]);
@@ -230,7 +230,7 @@ ADD_TRANSLATOR (Ambitus_engraver,
                 "AmbitusNoteHead ",
 
                 /* read */
-                "keySignature "
+                "keyAlterations "
                 "middleCClefPosition "
                 "middleCOffset ",