Run grand replace for 2015.

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

diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index b2720731d34c0fcc3b5de007c6a0fb9cf04065cb..62c0974f9f3a04627b807c70f0d76581fadcfb14 100644 (file)
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -84,24 +84,14 @@ Stem_engraver::make_stem (Grob_info gi, bool tuplet_start)
 
          the first and last (quarter) note both get one tremolo flag.  */
       int requested_type
-        = robust_scm2int (tremolo_ev_->get_property ("tremolo-type"), 0);
-      SCM f = get_property ("tremoloFlags");
-      if (!requested_type)
-        {
-          if (scm_is_number (f))
-            requested_type = scm_to_int (f);
-          else
-            requested_type = 8;
-        }
-      else
-        context ()->set_property ("tremoloFlags", scm_from_int (requested_type));
+        = robust_scm2int (tremolo_ev_->get_property ("tremolo-type"), 8);
 
       /*
         we take the duration log from the Event, since the duration-log
         for a note head is always <= 2.
       */
       Stream_event *ev = gi.event_cause ();
-      Duration *dur = unsmob_duration (ev->get_property ("duration"));
+      Duration *dur = Duration::unsmob (ev->get_property ("duration"));
 
       int tremolo_flags = intlog2 (requested_type) - 2
                           - (dur->duration_log () > 2 ? dur->duration_log () - 2 : 0);
@@ -134,13 +124,12 @@ Stem_engraver::acknowledge_rhythmic_head (Grob_info gi)
   Stream_event *cause = gi.event_cause ();
   if (!cause)
     return;
-  Duration *d = unsmob_duration (cause->get_property ("duration"));
+  Duration *d = Duration::unsmob (cause->get_property ("duration"));
   if (!d)
     return;
 
   if (!stem_)
-      make_stem (gi, tuplet_start_);
-      
+    make_stem (gi, tuplet_start_);
 
   int ds = Stem::duration_log (stem_);
   int dc = d->duration_log ();
@@ -176,7 +165,7 @@ Stem_engraver::acknowledge_rhythmic_head (Grob_info gi)
       stem_->set_object ("flag", flag->self_scm ());
       maybe_flags_.push_back (flag);
     }
-  if (tuplet_start_) 
+  if (tuplet_start_)
     stem_->set_property ("tuplet-start", SCM_BOOL_T);
 }
 
@@ -184,7 +173,7 @@ void
 Stem_engraver::kill_unused_flags ()
 {
   for (vsize i = 0; i < maybe_flags_.size (); i++)
-    if (unsmob_grob (maybe_flags_[i]->get_parent (X_AXIS)->get_object ("beam")))
+    if (Grob::is_smob (maybe_flags_[i]->get_parent (X_AXIS)->get_object ("beam")))
       maybe_flags_[i]->suicide ();
 }
 
@@ -232,7 +221,7 @@ Stem_engraver::listen_tuplet_span (Stream_event *ev)
       // set stem property if stem already exists
       if (stem_)
         stem_->set_property ("tuplet-start", SCM_BOOL_T);
-      tuplet_start_ = true;  // stash the value for use in later creation 
+      tuplet_start_ = true;  // stash the value for use in later creation
     }
 }
 
@@ -255,7 +244,6 @@ ADD_TRANSLATOR (Stem_engraver,
                 "StemTremolo ",
 
                 /* read */
-                "tremoloFlags "
                 "stemLeftBeamCount "
                 "stemRightBeamCount "
                 "whichBar ",