''

[lilypond.git] / lily / stem.cc

diff --git a/lily/stem.cc b/lily/stem.cc
index 7ff2812ca98bc528f4ecf0f642b196558a1c0224..79823a10923942f0212c7e8c62b50cac4a369883 100644 (file)
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -36,7 +36,7 @@ Stem::set_beaming (Grob*me ,int i,  Direction d)
   
   if (!gh_pair_p (pair))
     {
-      pair = gh_cons (gh_int2scm (0),gh_int2scm (0));
+      pair = gh_cons (gh_int2scm (-1),gh_int2scm (-1));
       me->      set_grob_property ("beaming", pair);
     }
   index_set_cell (pair, d, gh_int2scm (i));
@@ -49,7 +49,7 @@ Stem::beam_count (Grob*me,Direction d)
   if (gh_pair_p (p))
     return gh_scm2int (index_cell (p,d));
   else
-    return 0;
+    return -1;
 }
 
 Interval
@@ -113,7 +113,7 @@ Stem::set_stemend (Grob*me, Real se)
   Direction d= get_direction (me);
   
   if (d && d * head_positions (me)[get_direction (me)] >= se*d)
-    warning (_ ("Weird stem size; check for narrow beams"));
+    me->warning (_ ("Weird stem size; check for narrow beams"));
 
   me->set_grob_property ("stem-end-position", gh_double2scm (se));
 }
@@ -229,10 +229,6 @@ Stem::add_head (Grob*me, Grob *n)
     {
       Pointer_group_interface::add_grob (me, ly_symbol2scm ("heads"), n);
     }
-  else
-    {
-      n->set_grob_property ("rest", n->self_scm ());
-    }
 }
 
 bool
@@ -296,6 +292,10 @@ Stem::get_default_stem_end_position (Grob*me)
   // fixme: use scm_list_n_ref () iso. array[]
   Real shorten_f = a[ ((flag_i (me) - 2) >? 0) <? (a.size () - 1)] * 2;
 
+  /* On boundary: shorten only half */
+  if (abs (chord_start_f (me)) == 0.5)
+    shorten_f *= 0.5;
+
   /* URGURGURG
      'set-default-stemlen' sets direction too
    */
@@ -306,11 +306,9 @@ Stem::get_default_stem_end_position (Grob*me)
       Directional_element_interface::set (me, dir);
     }
   
-  /* 
-    stems in unnatural (forced) direction should be shortened, 
-    according to [Roush & Gourlay]
-   */
-  if (( (int)chord_start_f (me))
+  /* stems in unnatural (forced) direction should be shortened, 
+    according to [Roush & Gourlay] */
+  if (chord_start_f (me)
       && (get_direction (me) != get_default_dir (me)))
     length_f -= shorten_f;
 
@@ -354,8 +352,8 @@ Stem::get_default_stem_end_position (Grob*me)
 
 
   bool no_extend_b = to_boolean (me->get_grob_property ("no-stem-extend"));
-   if (!grace_b && !no_extend_b && dir * st < 0) // junkme?
-      st = 0.0;
+  if (!grace_b && !no_extend_b && dir * st < 0) // junkme?
+    st = 0.0;
 
   return st;
 }
@@ -658,6 +656,19 @@ Stem::beam_l (Grob*me)
 Stem_info
 Stem::calc_stem_info (Grob*me) 
 {
+  SCM scm_info = me->get_grob_property ("stem-info");
+
+  if (gh_pair_p (scm_info ))
+    {
+      Stem_info si ;
+
+      si.ideal_y = gh_scm2double (gh_car (scm_info)); 
+      si.max_y = gh_scm2double (gh_cadr (scm_info)); 
+      si.min_y = gh_scm2double (gh_caddr (scm_info));
+
+      return si;
+    }
+    
   Grob * beam = beam_l (me);
 
   Direction beam_dir = Directional_element_interface::get (beam);
@@ -670,19 +681,16 @@ Stem::calc_stem_info (Grob*me)
 
   Real staff_space = Staff_symbol_referencer::staff_space (me);
   Real half_space = staff_space / 2;
+  
   int multiplicity = Beam::get_multiplicity (beam);
-
-
-  SCM space_proc = beam->get_grob_property ("space-function");
-  SCM space = gh_call1 (space_proc, gh_int2scm (multiplicity));
-  Real interbeam_f = gh_scm2double (space) * staff_space;
+  Real interbeam_f = Beam::get_interbeam (beam);
 
   Real thick = gh_scm2double (beam->get_grob_property ("thickness"));
   Stem_info info; 
-  info.idealy_f_ = chord_start_f (me);
+  info.ideal_y = chord_start_f (me);
 
   // for simplicity, we calculate as if dir == UP
-  info.idealy_f_ *= beam_dir;
+  info.ideal_y *= beam_dir;
   SCM grace_prop = me->get_grob_property ("grace");
 
   bool grace_b = to_boolean (grace_prop);
@@ -710,13 +718,13 @@ Stem::calc_stem_info (Grob*me)
     {
       if (multiplicity)
        {
-         info.idealy_f_ += thick + (multiplicity - 1) * interbeam_f;
+         info.ideal_y += thick + (multiplicity - 1) * interbeam_f;
        }
-      info.miny_f_ = info.idealy_f_;
-      info.maxy_f_ = INT_MAX;
+      info.min_y = info.ideal_y;
+      info.max_y = 1000;  // INT_MAX;
 
-      info.idealy_f_ += stem_length;
-      info.miny_f_ += minimum_length;
+      info.ideal_y += stem_length;
+      info.min_y += minimum_length;
 
       /*
        lowest beam of (UP) beam must never be lower than second staffline
@@ -735,8 +743,8 @@ Stem::calc_stem_info (Grob*me)
             staffline
             lowest beam of (UP) beam must never be lower than second staffline
           */
-         info.miny_f_ =
-           info.miny_f_ >? 0
+         info.min_y =
+           info.min_y >? 0
            >? (- 2 * half_space - thick
                + (multiplicity > 0) * thick
                + interbeam_f * (multiplicity - 1));
@@ -745,29 +753,35 @@ Stem::calc_stem_info (Grob*me)
   else
     /* knee */
     {
-      info.idealy_f_ -= thick;
-      info.maxy_f_ = info.idealy_f_;
-      info.miny_f_ = -INT_MAX;
+      info.ideal_y -= thick;
+      info.max_y = info.ideal_y;
+      info.min_y = - 1000 ; // INT_MAX;
 
-      info.idealy_f_ -= stem_length;
-      info.maxy_f_ -= minimum_length;
+      info.ideal_y -= stem_length;
+      info.max_y -= minimum_length;
     }
   
-  info.idealy_f_ = (info.maxy_f_ <? info.idealy_f_) >? info.miny_f_;
+  info.ideal_y = (info.max_y <? info.ideal_y) >? info.min_y;
 
   s = beam->get_grob_property ("shorten");
   if (gh_number_p (s))
-    info.idealy_f_ -= gh_scm2double (s);
+    info.ideal_y -= gh_scm2double (s);
 
- Grob *common = me->common_refpoint (beam, Y_AXIS);
+  Grob *common = me->common_refpoint (beam, Y_AXIS);
   Real interstaff_f = beam_dir *
- (me->relative_coordinate (common, Y_AXIS)
+    (me->relative_coordinate (common, Y_AXIS)
      - beam->relative_coordinate (common, Y_AXIS));
-
-  info.idealy_f_ += interstaff_f;
-  info.miny_f_ += interstaff_f;
-  info.maxy_f_ += interstaff_f ;
-
+  
+  info.ideal_y += interstaff_f;
+  info.min_y += interstaff_f;
+  info.max_y += interstaff_f ;
+
+  me->set_grob_property ("stem-info",
+                        scm_list_n (gh_double2scm (info.ideal_y),
+                                    gh_double2scm (info.max_y),
+                                    gh_double2scm (info.min_y),
+                                    SCM_UNDEFINED));
+  
   return info;
 }
 
@@ -777,8 +791,7 @@ Stem::has_interface (Grob*m)
   return m && m->has_interface (ly_symbol2scm ("stem-interface"));
 }
 
-void
-Stem::set_interface (Grob*me)
-{    
-  me->set_interface (ly_symbol2scm ("stem-interface"));
-}
+ADD_INTERFACE (Stem,"stem-interface",
+  "A stem",
+  "thickness stem-info beamed-lengths beamed-minimum-lengths lengths beam stem-shorten duration-log beaming neutral-direction stem-end-position support-head heads direction length style no-stem-extend flag-style dir-forced");
+