X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-tremolo.cc;h=3e88861cca6910471384a840bee0151c2687bf97;hb=f0996bcf2f14bd4d55de4ef83b5266fc77bbab52;hp=4eae91b91f8a0aff0a7ae34f1ed76e15f5168a81;hpb=304b5f3aa7eee7b0ff8d4ba7526a1410735f6e74;p=lilypond.git

diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc
index 4eae91b91f..3e88861cca 100644
--- a/lily/stem-tremolo.cc
+++ b/lily/stem-tremolo.cc
@@ -8,42 +8,38 @@
  */
 
 #include "stem-tremolo.hh"
-#include "warn.hh"
+
+#include "spanner.hh"
 #include "beam.hh"
-#include "paper-def.hh"
-#include "lookup.hh"
-#include "stem.hh"
+#include "directional-element-interface.hh"
 #include "item.hh"
+#include "lookup.hh"
+#include "output-def.hh"
 #include "staff-symbol-referencer.hh"
-#include "directional-element-interface.hh"
+#include "stem.hh"
+#include "warn.hh"
 
-/*
-  TODO:
-    lengthen stem if necessary
- */
-MAKE_SCHEME_CALLBACK (Stem_tremolo,dim_callback,2);
+/* TODO: lengthen stem if necessary  */
 
-/*
-  todo: init with cons. 
- */
+MAKE_SCHEME_CALLBACK (Stem_tremolo, dim_callback, 2);
+
+/* todo: init with cons.  */
 SCM
 Stem_tremolo::dim_callback (SCM e, SCM)
 {
-  Grob * se = unsmob_grob (e);
+  Grob *se = unsmob_grob (e);
   
   Real space = Staff_symbol_referencer::staff_space (se);
   return ly_interval2scm (Interval (-space, space));
 }
 
-/*
-  ugh ?  --from Slur
- */
+/* ugh ?  --from Slur   */
 MAKE_SCHEME_CALLBACK (Stem_tremolo, height, 2);
 SCM
 Stem_tremolo::height (SCM smob, SCM ax)
 {
-  Axis a = (Axis)gh_scm2int (ax);
-  Grob * me = unsmob_grob (smob);
+  Axis a = (Axis)scm_to_int (ax);
+  Grob *me = unsmob_grob (smob);
   assert (a == Y_AXIS);
 
   SCM mol = me->get_uncached_stencil ();
@@ -54,22 +50,18 @@ Stem_tremolo::height (SCM smob, SCM ax)
     return ly_interval2scm (Interval ());
 }
 
-
 Stencil
 Stem_tremolo::raw_stencil (Grob *me)
 {
   Grob *stem = unsmob_grob (me->get_property ("stem"));
-  Grob *beam = Stem::get_beam (stem);
-  
+  Spanner*beam = Stem::get_beam (stem);
   Real dydx;
   if (beam)
     {
       Real dy = 0;
       SCM s = beam->get_property ("positions");
       if (is_number_pair (s))
-	{
-	  dy = -gh_scm2double (gh_car (s)) +gh_scm2double (gh_cdr (s));
-	}
+	dy = -scm_to_double (scm_car (s)) +scm_to_double (scm_cdr (s));
       
       Real dx = Beam::last_visible_stem (beam)->relative_coordinate (0, X_AXIS)
 	- Beam::first_visible_stem (beam)->relative_coordinate (0, X_AXIS);
@@ -82,18 +74,18 @@ Stem_tremolo::raw_stencil (Grob *me)
   Real ss = Staff_symbol_referencer::staff_space (me);
   Real thick = robust_scm2double (me->get_property ("beam-thickness"),1);
   Real width = robust_scm2double (me->get_property ("beam-width"),1);
-  Real blot = me->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter"));
+  Real blot = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
 
   width *= ss;
   thick *= ss;
   
   Stencil a (Lookup::beam (dydx, width, thick, blot));
-  a.translate (Offset (-width/2, width / 2 * dydx));
+  a.translate (Offset (-width * 0.5, width * 0.5 * dydx));
   
   int tremolo_flags = 0;
   SCM s = me->get_property ("flag-count");
-  if (gh_number_p (s))
-    tremolo_flags = gh_scm2int (s);
+  if (scm_is_number (s))
+    tremolo_flags = scm_to_int (s);
 
   if (!tremolo_flags)
     {
@@ -103,11 +95,7 @@ Stem_tremolo::raw_stencil (Grob *me)
       return Stencil ();
     }
 
-  /*
-    Who the fuck is 0.81 ?
-
-    --hwn.
-   */
+  /* Who the fuck is 0.81 ? --hwn.   */
   Real beam_translation = beam ? Beam::get_beam_translation (beam) : 0.81;
 
   Stencil mol; 
@@ -120,17 +108,25 @@ Stem_tremolo::raw_stencil (Grob *me)
   return mol;
 }
 
-
 MAKE_SCHEME_CALLBACK (Stem_tremolo,print,1);
 SCM
 Stem_tremolo::print (SCM grob) 
 {
   Grob *me = unsmob_grob (grob);
   Grob *stem = unsmob_grob (me->get_property ("stem"));
-  Grob *beam = Stem::get_beam (stem);
+  if (!stem)
+    {
+      programming_error ("No stem for stem-tremolo");
+      return SCM_EOL;
+    }
+  
+  Spanner *beam = Stem::get_beam (stem);
   Direction stemdir = Stem::get_direction (stem);
+  if (stemdir == 0)
+    stemdir = UP;
+
   Real beam_translation
-    = (beam && beam->live ())
+    = (beam && beam->is_live ())
     ? Beam::get_beam_translation (beam)
     : 0.81;
 
@@ -139,64 +135,43 @@ Stem_tremolo::print (SCM grob)
   Real ss = Staff_symbol_referencer::staff_space (me);
 
   // ugh, rather calc from Stem_tremolo_req
-  int beam_count = (beam) ? (Stem::beam_multiplicity (stem).length () + 1): 0;
-
-  /*
-    TODO.
-   */
-
+  int beam_count = beam ? (Stem::beam_multiplicity (stem).length () + 1) : 0;
 
   Real beamthickness = 0.0;
   SCM sbt = (beam) ? beam->get_property ("thickness") : SCM_EOL ;
-  if (gh_number_p (sbt))
-    {
-      beamthickness = gh_scm2double (sbt) * ss;
-    }
+  if (scm_is_number (sbt))
+    beamthickness = scm_to_double (sbt) * ss;
 
   Real end_y
-    = Stem::stem_end_position (stem) *ss/2 
+    = Stem::stem_end_position (stem) * ss / 2
     - stemdir * (beam_count * beamthickness
 		 + ((beam_count -1) >? 0) * beam_translation);
 
-  /*
-    the 0.33 ss is to compensate for the size of the note head
-   */
-  Real chord_start_y = Stem::chord_start_y (stem) +
-    0.33 * ss * stemdir;
+  /* FIXME: the 0.33 ss is to compensate for the size of the note head.  */
+  Real chord_start_y = Stem::chord_start_y (stem) + 0.33 * ss * stemdir;
 
   Real padding = beam_translation;
 
-  /*
-    if there is a flag, just above/below the notehead.
-    if there is not enough space, center on remaining space,
-    else one beamspace away from stem end.
-   */
+  /* if there is a flag, just above/below the notehead.
+     if there is not enough space, center on remaining space,
+     else one beamspace away from stem end.  */
   if (!beam && Stem::duration_log (stem) >= 3)
     {
       mol.align_to (Y_AXIS, -stemdir);
-      mol.translate_axis (chord_start_y + .5 * stemdir, Y_AXIS);
-    }
-  else if (stemdir * (end_y - chord_start_y) - 2*padding - mol_ext.length ()  < 0.0)
-    {
-      mol.translate_axis (0.5 * (end_y + chord_start_y)  - mol_ext.center (),Y_AXIS);
+      mol.translate_axis (chord_start_y + 0.5 * stemdir, Y_AXIS);
     }
+  else if (stemdir * (end_y - chord_start_y) - 2 * padding - mol_ext.length ()
+	   < 0.0)
+    mol.translate_axis (0.5 * (end_y + chord_start_y) - mol_ext.center (),
+			Y_AXIS);
   else
-    {
-      mol.translate_axis (end_y - stemdir * beam_translation
-			  -mol_ext [stemdir]
-			  , Y_AXIS);
-    }
-  
+    mol.translate_axis (end_y - stemdir * beam_translation -mol_ext [stemdir],
+			Y_AXIS);
+
   return mol.smobbed_copy ();
 }
 
 
-void
-Stem_tremolo::set_stem (Grob*me,Grob *s)
-{
-  me->set_property ("stem", s->self_scm ());
-}
-
 
 ADD_INTERFACE (Stem_tremolo,"stem-tremolo-interface",
   "A beam slashing a stem to indicate a tremolo.",