*** empty log message ***

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

diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc
index cac78d7e8a87fece3f20a600f7218b9d1e61a3b8..abee9361b67b35e404bb1b3345b625c1df390ad6 100644 (file)
--- a/lily/stem-tremolo.cc
+++ b/lily/stem-tremolo.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -46,32 +46,31 @@ Stem_tremolo::height (SCM smob, SCM ax)
   Grob * me = unsmob_grob (smob);
   assert (a == Y_AXIS);
 
-  SCM mol = me->get_uncached_molecule ();
+  SCM mol = me->get_uncached_stencil ();
 
-  if (Molecule *m = unsmob_molecule (mol))
+  if (Stencil *m = unsmob_stencil (mol))
     return ly_interval2scm (m->extent (a));
   else
-    return ly_interval2scm (Interval());
+    return ly_interval2scm (Interval ());
 }
 
 
-MAKE_SCHEME_CALLBACK (Stem_tremolo,brew_molecule,1);
-SCM
-Stem_tremolo::brew_molecule (SCM smob)
+Stencil
+Stem_tremolo::raw_stencil (Grob *me)
 {
-  Grob *me= unsmob_grob (smob);
-  Grob * stem = unsmob_grob (me->get_grob_property ("stem"));
-  Grob * beam = Stem::get_beam (stem);
+  Grob *stem = unsmob_grob (me->get_property ("stem"));
+  Grob *beam = Stem::get_beam (stem);
   
   Real dydx;
   if (beam)
     {
       Real dy = 0;
-      SCM s = beam->get_grob_property ("positions");
-      if (gh_pair_p (s))
+      SCM s = beam->get_property ("positions");
+      if (is_number_pair (s))
        {
          dy = -gh_scm2double (gh_car (s)) +gh_scm2double (gh_cdr (s));
        }
+      
       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;
@@ -80,17 +79,19 @@ Stem_tremolo::brew_molecule (SCM smob)
     // urg
     dydx = 0.25;
 
-  Real ss = Staff_symbol_referencer::staff_space (stem);
-  Real thick = gh_scm2double (me->get_grob_property ("beam-thickness"));
-  Real width = gh_scm2double (me->get_grob_property ("beam-width"));
+  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"));
+
   width *= ss;
   thick *= ss;
   
-  Molecule a (Lookup::beam (dydx, width, thick));
+  Stencil a (Lookup::beam (dydx, width, thick, blot));
   a.translate (Offset (-width/2, width / 2 * dydx));
   
   int tremolo_flags = 0;
-  SCM s = me->get_grob_property ("flag-count");
+  SCM s = me->get_property ("flag-count");
   if (gh_number_p (s))
     tremolo_flags = gh_scm2int (s);
 
@@ -98,8 +99,8 @@ Stem_tremolo::brew_molecule (SCM smob)
     {
       programming_error ("No tremolo flags?");
 
-      me->suicide();
-      return SCM_EOL;
+      me->suicide ();
+      return Stencil ();
     }
 
   /*
@@ -109,26 +110,40 @@ Stem_tremolo::brew_molecule (SCM smob)
    */
   Real beam_translation = beam ? Beam::get_beam_translation (beam) : 0.81;
 
-  Molecule mol; 
+  Stencil mol; 
   for (int i = 0; i < tremolo_flags; i++)
     {
-      Molecule b (a);
+      Stencil b (a);
       b.translate_axis (beam_translation * i, Y_AXIS);
-      mol.add_molecule (b);
+      mol.add_stencil (b);
     }
+  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);
   Direction stemdir = Stem::get_direction (stem);
+  Real beam_translation
+    = (beam && beam->live ())
+    ? Beam::get_beam_translation (beam)
+    : 0.81;
+
+  Stencil mol = raw_stencil (me);
   Interval mol_ext = mol.extent (Y_AXIS);
+  Real ss = Staff_symbol_referencer::staff_space (me);
 
   // ugh, rather calc from Stem_tremolo_req
-  int beams_i = (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_grob_property ("thickness") : SCM_EOL ;
+  SCM sbt = (beam) ? beam->get_property ("thickness") : SCM_EOL ;
   if (gh_number_p (sbt))
     {
       beamthickness = gh_scm2double (sbt) * ss;
@@ -136,8 +151,8 @@ Stem_tremolo::brew_molecule (SCM smob)
 
   Real end_y
     = Stem::stem_end_position (stem) *ss/2 
-    - stemdir * (beams_i * beamthickness
-                + ((beams_i -1) >? 0) * beam_translation);
+    - stemdir * (beam_count * beamthickness
+                + ((beam_count -1) >? 0) * beam_translation);
 
   /*
     the 0.33 ss is to compensate for the size of the note head
@@ -148,12 +163,18 @@ Stem_tremolo::brew_molecule (SCM smob)
   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 (stemdir * (end_y - chord_start_y) - 2*padding - mol_ext.length ()  < 0.0)
+  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 ((end_y + chord_start_y) /2.0  - mol_ext.center (),Y_AXIS);
+      mol.translate_axis (0.5 * (end_y + chord_start_y)  - mol_ext.center (),Y_AXIS);
     }
   else
     {
@@ -169,10 +190,10 @@ Stem_tremolo::brew_molecule (SCM smob)
 void
 Stem_tremolo::set_stem (Grob*me,Grob *s)
 {
-  me->set_grob_property ("stem", s->self_scm ());
+  me->set_property ("stem", s->self_scm ());
 }
 
 
 ADD_INTERFACE (Stem_tremolo,"stem-tremolo-interface",
-  "",
+  "A beam slashing a stem to indicate a tremolo.",
   "stem beam-width beam-thickness flag-count");