release: 1.5.29

[lilypond.git] / lily / stem.cc

diff --git a/lily/stem.cc b/lily/stem.cc
index d55e8d0738b7e9ef83c738cf6909bf098e61c546..f02c00598ad430328582aa5eca8324e26145dad3 100644 (file)
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -3,11 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
     Jan Nieuwenhuizen <janneke@gnu.org>
 
   TODO: This is way too hairy
 */
+
 #include <math.h>              // m_pi
 
 #include "lookup.hh"
@@ -81,7 +82,6 @@ Stem::stem_end_position (Grob*me)
   Real pos;
   if (!gh_number_p (p))
     {
-
       pos = get_default_stem_end_position (me);
       me->set_grob_property ("stem-end-position", gh_double2scm (pos));
     }
@@ -227,7 +227,7 @@ Stem::add_head (Grob*me, Grob *n)
 
   if (Note_head::has_interface (n))
     {
-      Pointer_group_interface::add_element (me, "heads",n);
+      Pointer_group_interface::add_grob (me, ly_symbol2scm ("heads"), n);
     }
   else
     {
@@ -293,7 +293,7 @@ Stem::get_default_stem_end_position (Grob*me)
 
   // stem uses half-spaces
 
-  // fixme: use scm_listify_ref () iso. array[]
+  // fixme: use scm_list_n_ref () iso. array[]
   Real shorten_f = a[ ((flag_i (me) - 2) >? 0) <? (a.size () - 1)] * 2;
 
   /* URGURGURG
@@ -344,7 +344,7 @@ Stem::get_default_stem_end_position (Grob*me)
            which should be a dot-column.
           */
          if (dir * (st + flagy -  dp) < 0.5)
-           Side_position_interface::add_support (dots->parent_l (X_AXIS), me);
+           Side_position_interface::add_support (dots->get_parent (X_AXIS), me);
 
          /*
            previous approach was to lengthen the stem. This is not
@@ -379,7 +379,7 @@ Stem::position_noteheads (Grob*me)
     return;
   
   Link_array<Grob> heads =
-    Pointer_group_interface__extract_elements (me, (Grob*)0, "heads");
+    Pointer_group_interface__extract_grobs (me, (Grob*)0, "heads");
 
   heads.sort (compare_position);
   Direction dir =get_direction (me);
@@ -389,10 +389,11 @@ Stem::position_noteheads (Grob*me)
 
 
   Grob *hed = support_head (me);
-  Real w = hed->extent (hed, X_AXIS)[dir];
+  Real w = Note_head::head_extent (hed,X_AXIS)[dir];
   for (int i=0; i < heads.size (); i++)
     {
-      heads[i]->translate_axis (w - heads[i]->extent (heads[i], X_AXIS)[dir], X_AXIS);
+      heads[i]->translate_axis (w - Note_head::head_extent (heads[i],X_AXIS)[dir],
+                               X_AXIS);
     }
   
   bool parity= true;           // todo: make me settable.
@@ -432,11 +433,9 @@ Stem::before_line_breaking (SCM smob)
       // suicide ();
     }
   
-  set_spacing_hints (me);
   return SCM_UNSPECIFIED;
 }
 
-
 /*
   ugh.
   When in a beam with tuplet brackets, brew_mol is called early,
@@ -458,31 +457,6 @@ Stem::height (SCM smob, SCM ax)
 }
 
 
-/**
-   set stem directions for hinting the optical spacing correction.
-
-   Modifies DIR_LIST property of the Stem's Paper_column
-
-   TODO: more advanced: supply height of noteheads as well, for more advanced spacing possibilities
- */
-void
-Stem::set_spacing_hints (Grob*me) 
-{
-  if (!invisible_b (me))
-    {
-      SCM scmdir  = gh_int2scm (get_direction (me));
-
-      Item* item = dynamic_cast<Item*> (me);
-      Item * col =  item->column_l ();
-      SCM dirlist =col->get_grob_property ("dir-list");
-      if (scm_c_memq (scmdir, dirlist) == SCM_BOOL_F)
-       {
-         dirlist = gh_cons (scmdir, dirlist);
-         col->set_grob_property ("dir-list", dirlist);
-       }
-    }
-}
-
 Molecule
 Stem::flag (Grob*me)
 {
@@ -584,19 +558,22 @@ Stem::brew_molecule (SCM smob)
   Real y1 = Staff_symbol_referencer::position_f (first_head (me));
   Real y2 = stem_end_position (me);
   
-  Interval stem_y (y1,y2);
-  stem_y.unite (Interval (y2,y1));
+  Interval stem_y (y1 <? y2,y2 >? y1);
+
 
   // dy?
-  Real dy = Staff_symbol_referencer::staff_space (me)/2.0;
-    
+  Real dy = Staff_symbol_referencer::staff_space (me) * 0.5;
+
   if (Grob *hed = support_head (me))
     {
-      Interval head_height = hed->extent (hed,Y_AXIS);
+      /*
+       must not take ledgers into account.
+       */
+      Interval head_height = Note_head::head_extent (hed,Y_AXIS);
       Real y_attach = Note_head::stem_attachment_coordinate ( hed, Y_AXIS);
 
       y_attach = head_height.linear_combination (y_attach);
-      stem_y[Direction (-d)] += d * 2*y_attach;
+      stem_y[Direction (-d)] += d * y_attach/dy;
     }
   
   if (!invisible_b (me))
@@ -632,7 +609,7 @@ Stem::off_callback (SCM element_smob, SCM)
   Real r=0;
   if (Grob * f = first_head (me))
     {
-      Interval head_wid = f->extent (f,X_AXIS);
+      Interval head_wid = Note_head::head_extent(f, X_AXIS);
 
       Real attach =
        Note_head::stem_attachment_coordinate(f, X_AXIS);