release: 1.5.25

[lilypond.git] / lily / stem.cc

diff --git a/lily/stem.cc b/lily/stem.cc
index 140e6876b6db803e77b1c2cadf8abb9a58a70377..8502c7581c558ccf8c1ffa2e97900cacb980135c 100644 (file)
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -8,6 +8,7 @@
 
   TODO: This is way too hairy
 */
+
 #include <math.h>              // m_pi
 
 #include "lookup.hh"
@@ -140,7 +141,7 @@ Stem::support_head (Grob*me)
        UGH.
        */
       
-      return unsmob_grob (gh_car (me->get_grob_property ("heads")));
+      return unsmob_grob (ly_car (me->get_grob_property ("heads")));
     }
   else
     return first_head (me);
@@ -176,9 +177,9 @@ Stem::extremal_heads (Grob*me)
   Drul_array<Grob *> exthead;
   exthead[LEFT] = exthead[RIGHT] =0;
   
-  for (SCM s = me->get_grob_property ("heads"); gh_pair_p (s); s = gh_cdr (s))
+  for (SCM s = me->get_grob_property ("heads"); gh_pair_p (s); s = ly_cdr (s))
     {
-      Grob * n = unsmob_grob (gh_car (s));
+      Grob * n = unsmob_grob (ly_car (s));
 
       
       int p = int (Staff_symbol_referencer::position_f (n));
@@ -206,9 +207,9 @@ Array<int>
 Stem::note_head_positions (Grob *me)
 {
   Array<int> ps ;
-  for (SCM s = me->get_grob_property ("heads"); gh_pair_p (s); s = gh_cdr (s))
+  for (SCM s = me->get_grob_property ("heads"); gh_pair_p (s); s = ly_cdr (s))
     {
-      Grob * n = unsmob_grob (gh_car (s));
+      Grob * n = unsmob_grob (ly_car (s));
       int p = int (Staff_symbol_referencer::position_f (n));
 
       ps.push (p);
@@ -227,7 +228,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_element (me, ly_symbol2scm ("heads"), n);
     }
   else
     {
@@ -277,8 +278,8 @@ Stem::get_default_stem_end_position (Grob*me)
   else
     {
       s = me->get_grob_property ("lengths");
-      for (SCM q = s; q != SCM_EOL; q = gh_cdr (q))
-       a.push (gh_scm2double (gh_car (q)));
+      for (SCM q = s; q != SCM_EOL; q = ly_cdr (q))
+       a.push (gh_scm2double (ly_car (q)));
                
       // stem uses half-spaces
       length_f = a[ ((flag_i (me) - 2) >? 0) <? (a.size () - 1)] * 2;
@@ -287,13 +288,13 @@ Stem::get_default_stem_end_position (Grob*me)
 
   a.clear ();
   s = me->get_grob_property ("stem-shorten");
-  for (SCM q = s; gh_pair_p (q); q = gh_cdr (q))
-    a.push (gh_scm2double (gh_car (q)));
+  for (SCM q = s; gh_pair_p (q); q = ly_cdr (q))
+    a.push (gh_scm2double (ly_car (q)));
 
 
   // stem uses half-spaces
 
-  // fixme: use gh_list_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 +345,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
@@ -389,10 +390,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.
@@ -584,15 +586,18 @@ 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);
@@ -632,7 +637,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);
@@ -707,16 +712,16 @@ Stem::calc_stem_info (Grob*me)
   
   s = me->get_grob_property ("beamed-minimum-lengths");
   a.clear ();
-  for (SCM q = s; q != SCM_EOL; q = gh_cdr (q))
-    a.push (gh_scm2double (gh_car (q)));
+  for (SCM q = s; q != SCM_EOL; q = ly_cdr (q))
+    a.push (gh_scm2double (ly_car (q)));
 
 
   Real minimum_length = a[multiplicity <? (a.size () - 1)] * staff_space;
   s = me->get_grob_property ("beamed-lengths");
 
   a.clear ();
-  for (SCM q = s; q != SCM_EOL; q = gh_cdr (q))
-    a.push (gh_scm2double (gh_car (q)));
+  for (SCM q = s; q != SCM_EOL; q = ly_cdr (q))
+    a.push (gh_scm2double (ly_car (q)));
 
   Real stem_length =  a[multiplicity <? (a.size () - 1)] * staff_space;