X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-tremolo.cc;h=9a0fb6f1714be67f415f42ab7fcdd5dde7d9c15e;hb=5ffda4a007986f26f314d6fc8bbd6d983647d65a;hp=24f15420f0432d2c71e29ad3ceb91038f78fe6fc;hpb=bc30d5ab67f4cf1e2c5cd953f6ea27867ae2fc05;p=lilypond.git

diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc
index 24f15420f0..9a0fb6f171 100644
--- a/lily/stem-tremolo.cc
+++ b/lily/stem-tremolo.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -55,23 +55,22 @@ Stem_tremolo::height (SCM smob, SCM ax)
 }
 
 
-MAKE_SCHEME_CALLBACK (Stem_tremolo,brew_molecule,1);
-SCM
-Stem_tremolo::brew_molecule (SCM smob)
+Molecule
+Stem_tremolo::raw_molecule (Grob *me)
 {
-  Grob *me= unsmob_grob (smob);
-  Grob * stem = unsmob_grob (me->get_grob_property ("stem"));
-  Grob * beam = Stem::beam_l (stem);
+  Grob *stem = unsmob_grob (me->get_grob_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))
+      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,13 +79,15 @@ 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_grob_property ("beam-thickness"),1);
+  Real width = robust_scm2double (me->get_grob_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));
+  Molecule a (Lookup::beam (dydx, width, thick, blot));
   a.translate (Offset (-width/2, width / 2 * dydx));
   
   int tremolo_flags = 0;
@@ -99,7 +100,7 @@ Stem_tremolo::brew_molecule (SCM smob)
       programming_error ("No tremolo flags?");
 
       me->suicide();
-      return SCM_EOL;
+      return Molecule ();
     }
 
   /*
@@ -107,20 +108,38 @@ Stem_tremolo::brew_molecule (SCM smob)
 
     --hwn.
    */
-  Real beam_space = beam ? Beam::get_beam_space (beam) : 0.81;
+  Real beam_translation = beam ? Beam::get_beam_translation (beam) : 0.81;
 
   Molecule mol; 
   for (int i = 0; i < tremolo_flags; i++)
     {
       Molecule b (a);
-      b.translate_axis (beam_space * i, Y_AXIS);
+      b.translate_axis (beam_translation * i, Y_AXIS);
       mol.add_molecule (b);
     }
+  return mol;
+}
+
+
+MAKE_SCHEME_CALLBACK (Stem_tremolo,brew_molecule,1);
+SCM
+Stem_tremolo::brew_molecule (SCM grob) 
+{
+  Grob *me = unsmob_grob (grob);
+  Grob *stem = unsmob_grob (me->get_grob_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;
+
+  Molecule mol = raw_molecule (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;
+  int beam_count = (beam) ? (Stem::beam_multiplicity (stem).length () + 1): 0;
 
   /*
     TODO.
@@ -136,8 +155,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_space);
+    - stemdir * (beam_count * beamthickness
+		 + ((beam_count -1) >? 0) * beam_translation);
 
   /*
     the 0.33 ss is to compensate for the size of the note head
@@ -145,19 +164,25 @@ Stem_tremolo::brew_molecule (SCM smob)
   Real chord_start_y = Stem::chord_start_y (stem) +
     0.33 * ss * stemdir;
 
-  Real padding = beam_space;
+  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
     {
-      mol.translate_axis (end_y - stemdir * beam_space
+      mol.translate_axis (end_y - stemdir * beam_translation
 			  -mol_ext [stemdir]
 			  , Y_AXIS);
     }