release: 1.3.88

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

diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc
index a2e174f69b793efb0a2ace8d5a8496de8da34f5f..2bfd4dfcbe423176dfff102c54b43dcfd362656f 100644 (file)
--- a/lily/stem-tremolo.cc
+++ b/lily/stem-tremolo.cc
@@ -13,8 +13,7 @@
 #include "paper-def.hh"
 #include "lookup.hh"
 #include "stem.hh"
-#include "offset.hh"
-#include "dimension-cache.hh"
+#include "item.hh"
 #include "staff-symbol-referencer.hh"
 #include "directional-element-interface.hh"
 
@@ -26,26 +25,25 @@
 void
 Stem_tremolo::set_interface (Score_element *me)
 {
-me->set_elt_pointer ("stem", SCM_EOL);
 }
 
 
 Interval
 Stem_tremolo::dim_callback (Score_element * se, Axis )
 {
-  Real space = Staff_symbol_referencer_interface (se).staff_space ();
+  Real space = Staff_symbol_referencer::staff_space (se);
   return Interval (-space, space);
 }
 
 
 
-MAKE_SCHEME_SCORE_ELEMENT_CALLBACK(Stem_tremolo,brew_molecule);
+MAKE_SCHEME_CALLBACK(Stem_tremolo,brew_molecule);
 SCM
 Stem_tremolo::brew_molecule (SCM smob)
 {
   Score_element *me= unsmob_element (smob);
-  Stem * stem = dynamic_cast<Stem*> (unsmob_element (me->get_elt_pointer ("stem")));
-  Beam * beam = stem->beam_l ();
+  Score_element * stem = unsmob_element (me->get_elt_property ("stem"));
+  Score_element * beam = Stem::beam_l (stem);
   
   Real dydx;
   if (beam)
@@ -54,15 +52,15 @@ Stem_tremolo::brew_molecule (SCM smob)
       SCM s = beam->get_elt_property ("height");
       if (gh_number_p (s))
        dy = gh_scm2double (s);
-      Real dx = beam->last_visible_stem ()->relative_coordinate (0, X_AXIS)
-       - beam->first_visible_stem ()->relative_coordinate (0, X_AXIS);
+      Real dx = Beam::last_visible_stem (beam)->relative_coordinate (0, X_AXIS)
+       - Beam::first_visible_stem (beam)->relative_coordinate (0, X_AXIS);
       dydx = dx ? dy/dx : 0;
     }
   else
     // urg
     dydx = 0.25;
 
-  Real ss = Staff_symbol_referencer_interface (stem).staff_space ();
+  Real ss = Staff_symbol_referencer::staff_space (stem);
   Real thick = gh_scm2double (me->get_elt_property ("beam-thickness"));
   Real width = gh_scm2double (me->get_elt_property ("beam-width"));
   width *= ss;
@@ -79,8 +77,12 @@ Stem_tremolo::brew_molecule (SCM smob)
     // huh?
     tremolo_flags = 1;
 
-  int mult = beam ? beam->get_multiplicity () : 0;
-  Real interbeam_f = me->paper_l ()->interbeam_f (mult);
+  int mult = beam ? Beam::get_multiplicity (beam) : 0;
+  SCM space_proc = me->get_elt_property ("beam-space-function");
+  SCM space = gh_call1 (space_proc, gh_int2scm (mult));
+  Real interbeam_f = gh_scm2double (space) * ss;
+
+
   Molecule mol; 
   for (int i = 0; i < tremolo_flags; i++)
     {
@@ -93,26 +95,26 @@ Stem_tremolo::brew_molecule (SCM smob)
   if (beam)
     {
       // ugh, rather calc from Stem_tremolo_req
-      int beams_i = stem->beam_count(RIGHT) >? stem->beam_count (LEFT);
+      int beams_i = Stem::beam_count(stem, RIGHT) >? Stem::beam_count (stem, LEFT);
       mol.translate (Offset(stem->relative_coordinate (0, X_AXIS) - me->relative_coordinate (0, X_AXIS),
-                           stem->stem_end_position () * ss / 2 - 
-                           Directional_element_interface (beam).get () * beams_i * interbeam_f));
+                           Stem::stem_end_position (stem ) * ss / 2 - 
+                           Directional_element_interface::get (beam) * beams_i * interbeam_f));
     }
   else
     {  
       /*
        Beams should intersect one beamthickness below stem end
       */
-      Real dy = stem->stem_end_position () * ss / 2;
-      dy -= mol.extent (Y_AXIS).length () / 2 *  stem->get_direction ();
+      Real dy = Stem::stem_end_position (stem ) * ss / 2;
+      dy -= mol.extent (Y_AXIS).length () / 2 *  Stem::get_direction (stem );
 
       /*
        uhg.  Should use relative coords and placement
       */
       Real whole_note_correction;
-      if (stem->invisible_b ())
-       whole_note_correction = -stem->get_direction ()
-         * stem->support_head ()->extent (X_AXIS).length () / 2;
+      if (Stem::invisible_b (stem ))
+       whole_note_correction = -Stem::get_direction (stem )
+         * Stem::support_head (stem )->extent (X_AXIS).length () / 2;
       else
        whole_note_correction = 0;
         
@@ -127,6 +129,6 @@ Stem_tremolo::brew_molecule (SCM smob)
 void
 Stem_tremolo::set_stem (Score_element*me,Score_element *s)
 {
-  me->set_elt_pointer ("stem", s->self_scm_);
+  me->set_elt_property ("stem", s->self_scm ());
 }