2003 -> 2004

[lilypond.git] / lily / stem.cc

diff --git a/lily/stem.cc b/lily/stem.cc
index cda3175f7516353772685c5e3ea9124c22eff114..49c907879e1a19f609eb3945fbe401c81db6554d 100644 (file)
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
     Jan Nieuwenhuizen <janneke@gnu.org>
 
   TODO: This is way too hairy
@@ -451,8 +451,7 @@ Stem::position_noteheads (Grob*me)
     heads.reverse ();
 
 
-  Real thick = robust_scm2double (me->get_grob_property ("thickness"),1)
-     * me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
+  Real thick = thickness (me);
       
   Grob *hed = support_head (me);
   Real w = Note_head::head_extent (hed,X_AXIS)[dir];
@@ -463,13 +462,17 @@ Stem::position_noteheads (Grob*me)
     }
   
   bool parity= true;
-  int lastpos = int (Staff_symbol_referencer::get_position (heads[0]));
+  Real lastpos = Real (Staff_symbol_referencer::get_position (heads[0]));
   for (int i=1; i < heads.size (); i ++)
     {
       Real p = Staff_symbol_referencer::get_position (heads[i]);
-      int dy =abs (lastpos- (int)p);
+      Real dy =fabs (lastpos- p);
 
-      if (dy <= 1)
+      /*
+       dy should always be 0.5, 0.0, 1.0, but provide safety margin
+       for rounding errors.
+      */
+      if (dy < 1.1)            
        {
          if (parity)
            {
@@ -683,14 +686,17 @@ Stem::dim_callback (SCM e, SCM ax)
   else
     {
       r = flag (me).extent (X_AXIS)
-       +
-        gh_scm2double (me->get_grob_property ("thickness"))
-       * me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"))/2;
+       + thickness (me)/2;
     }
   return ly_interval2scm (r);
 }
  
-
+Real
+Stem::thickness (Grob* me)
+{
+  return gh_scm2double (me->get_grob_property ("thickness"))
+    * Staff_symbol_referencer::line_thickness (me);
+}
 
 MAKE_SCHEME_CALLBACK (Stem,brew_molecule,1);
 
@@ -700,11 +706,9 @@ Stem::brew_molecule (SCM smob)
   Grob*me = unsmob_grob (smob);
   Molecule mol;
   Direction d = get_direction (me);
-  
-  
      
   /*
-    TODO: make  the stem start a direction ?
+    TODO: make the stem start a direction ?
 
     This is required to avoid stems passing in tablature chords...
   */
@@ -715,9 +719,7 @@ Stem::brew_molecule (SCM smob)
     return SCM_EOL;
 
   if (invisible_b (me))
-    {
-      return SCM_EOL;
-    }
+    return SCM_EOL;
   
   Real y1 = Staff_symbol_referencer::get_position (lh);
   Real y2 = stem_end_position (me);
@@ -742,8 +744,7 @@ Stem::brew_molecule (SCM smob)
 
   
   // URG
-  Real stem_width = robust_scm2double (me->get_grob_property ("thickness"), 1)
-    * me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
+  Real stem_width = thickness (me);
   Real blot = 
        me->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter"));
   
@@ -805,8 +806,7 @@ Stem::off_callback (SCM element_smob, SCM)
       if (attach)
        {
          Real rule_thick
-           = robust_scm2double (me->get_grob_property ("thickness"), 1)
-           * me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
+           = thickness (me);
          
          r += - d * rule_thick * 0.5;
        }
@@ -851,7 +851,7 @@ Stem::calc_stem_info (Grob *me)
   Real staff_space = Staff_symbol_referencer::staff_space (me);
   Grob *beam = get_beam (me);
   Real beam_translation = Beam::get_beam_translation (beam);
-  Real beam_thickness = robust_scm2double (beam->get_grob_property ("thickness"), 1);
+  Real beam_thickness = Beam::get_thickness (beam);
   int beam_count = Beam::get_direction_beam_count (beam, my_dir);
 
 
@@ -893,7 +893,7 @@ Stem::calc_stem_info (Grob *me)
   Real note_start =
     /* staff positions */
     head_positions (me)[my_dir] * 0.5
-    * my_dir;
+    * my_dir * staff_space;
   Real ideal_y = note_start + ideal_length;
 
 
@@ -977,3 +977,18 @@ ADD_INTERFACE (Stem,"stem-interface",
               "no-stem-extend stroke-style");
 
 
+
+/****************************************************************/
+
+Stem_info::Stem_info()
+{
+  ideal_y_ = shortest_y_ =0;
+  dir_ = CENTER;
+}
+
+void
+Stem_info::scale (Real x)
+{
+  ideal_y_ *= x;
+  shortest_y_ *= x;
+}