patch::: 1.1.41.tca1

[lilypond.git] / lily / stem.cc

diff --git a/lily/stem.cc b/lily/stem.cc
index a0600e8636a1bef5f01c004660ebf67ad29989db..55b2036269b12ddfb95110d1d3709e0cef11c521 100644 (file)
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -19,30 +19,25 @@
 #include "beam.hh"
 #include "rest.hh"
 
+void
+Stem::set_direction (Direction d)
+{
+  if  (!dir_)
+    warning ("Stem direction set already!");
 
+  dir_ = d;
 
-
-Stem::~Stem ()
-{
+  /*
+    todo
+  */
 }
 
 Stem::Stem ()
 {
-  /*
-    TODO: staff-size
-    */
   beams_i_drul_[LEFT] = beams_i_drul_[RIGHT] = -1;
-  mult_i_ = 0;
-
   yextent_drul_[DOWN] = yextent_drul_[UP] = 0;
   flag_i_ = 2;
   dir_ = CENTER;
-  beam_dir_ = CENTER;
-  dir_forced_b_ = false;
-  stem_xdir_ = LEFT;
-  staff_size_i_ = 8;
-
-  beam_gap_i_ = 0;
   beam_l_ = 0;
 }
 
@@ -94,7 +89,7 @@ Stem::stem_begin_f () const
 Real
 Stem::chord_start_f () const
 {
-  return head_positions()[dir_] * paper ()->internote_f ();
+  return head_positions()[dir_] * staff_line_leading_f ()/2.0;
 }
 
 Real
@@ -165,24 +160,20 @@ Stem::get_dir () const
   return dir_;
 }
 
-void
-Stem::set_default_dir ()
-{
-  dir_ = get_default_dir ();
-}
 
 void
 Stem::set_default_stemlen ()
 {
-  Real internote_f = paper ()->internote_f ();
-  Real length_f = paper ()->get_var ("stem_length0") / internote_f;
-  Real shorten_f = paper ()->get_var ("forced_stem_shorten0") / internote_f;
+  Real internote_f = staff_line_leading_f ()/2.0;
+  Real length_f = paper_l ()->get_var ("stem_length0") / internote_f;
+  Real shorten_f = paper_l ()->get_var ("forced_stem_shorten0") / internote_f;
 
   if (!dir_)
-    set_default_dir ();
+    dir_ = get_default_dir ();
+
   /* 
     stems in unnatural (forced) direction should be shortened, 
-    accoding to [Roush & Gourlay]
+    according to [Roush & Gourlay]
    */
   if (((int)chord_start_f ())
       && (dir_ != get_default_dir ()))
@@ -207,19 +198,8 @@ Stem::set_default_extents ()
   if (!stem_length_f ())
     set_default_stemlen ();
 
-
-  if (dir_ == UP)
-    stem_xdir_ = RIGHT;
-  if (invisible_b ())
-    stem_xdir_ = CENTER;
 }
 
-/*
-  TODO
-
-  move into note_column.cc
-
-  */
 void
 Stem::set_noteheads ()
 {
@@ -229,10 +209,13 @@ Stem::set_noteheads ()
   if (dir_ < 0)
     head_l_arr_.reverse ();
 
-  head_l_arr_[0]->extremal_i_ = -1;
-  head_l_arr_.top ()->extremal_i_ = 1;
+  Note_head * beginhead =   head_l_arr_[0];
+  beginhead->set_elt_property (extremal_scm_sym, SCM_BOOL_T);
+  if  (beginhead !=   head_l_arr_.top ())
+    head_l_arr_.top ()->set_elt_property (extremal_scm_sym, SCM_BOOL_T);
+  
   int parity=1;
-  int lastpos = head_l_arr_[0]->position_i_;
+  int lastpos = beginhead->position_i_;
   for (int i=1; i < head_l_arr_.size (); i ++)
     {
       int dy =abs (lastpos- head_l_arr_[i]->position_i_);
@@ -240,7 +223,7 @@ Stem::set_noteheads ()
       if (dy <= 1)
        {
          if (parity)
-           head_l_arr_[i]->x_dir_ = (stem_xdir_ == LEFT) ? LEFT : RIGHT;
+           head_l_arr_[i]->flip_around_stem (dir_);
          parity = !parity;
        }
       else
@@ -255,8 +238,11 @@ Stem::do_pre_processing ()
   if (yextent_drul_[DOWN]== yextent_drul_[UP])
     set_default_extents ();
   set_noteheads ();
-  flag_i_ = flag_i_;
-  transparent_b_ = invisible_b ();
+
+  if (invisible_b ())
+    {
+      set_elt_property (transparent_scm_sym, SCM_BOOL_T);
+    }
   set_empty (invisible_b ());
 }
 
@@ -285,7 +271,7 @@ Stem::do_brew_molecule_p () const
 {
   Molecule *mol_p =new Molecule;
   Drul_array<Real> stem_y = yextent_drul_;
-  Real dy = paper ()->internote_f ();
+  Real dy = staff_line_leading_f ()/2.0;
 
   Real head_wid = 0;
   if (head_l_arr_.size ())
@@ -320,12 +306,12 @@ Stem::note_delta_f () const
   if (head_l_arr_.size())
     {
       Interval head_wid(0,  head_l_arr_[0]->extent (X_AXIS).length ());
-      Real rule_thick(paper ()->rule_thickness ());
+      Real rule_thick(paper_l ()->rule_thickness ());
       Interval stem_wid(-rule_thick/2, rule_thick/2);
-      if (stem_xdir_ == CENTER)
+      if (dir_ == CENTER)
        r = head_wid.center ();
       else
-       r = head_wid[stem_xdir_] - stem_wid[stem_xdir_];
+       r = head_wid[dir_] - stem_wid[dir_];
     }
   return r;
 }
@@ -336,27 +322,17 @@ Stem::hpos_f () const
   return note_delta_f () + Item::hpos_f ();
 }
 
-/*
-  TODO:  head_l_arr_/rest_l_arr_ in  
- */
 void
 Stem::do_substitute_element_pointer (Score_element*o,Score_element*n)
 {
   if (Note_head*h=dynamic_cast<Note_head*> (o))
-  head_l_arr_.substitute (h, dynamic_cast<Note_head*>(n));
+    head_l_arr_.substitute (h, dynamic_cast<Note_head*>(n));
   if (Rest *r=dynamic_cast<Rest*> (o))
     rest_l_arr_.substitute (r, dynamic_cast<Rest*>(n));
   if (Beam* b = dynamic_cast<Beam*> (o))
     {
       if (b == beam_l_) 
-       {
-         beam_l_ = dynamic_cast<Beam*> (n);
-         if (!beam_l_)
-           {
-             beams_i_drul_[LEFT] = 0;
-             beams_i_drul_[RIGHT] = 0;
-             mult_i_ = 0;
-           }
-       }
+       beam_l_ = dynamic_cast<Beam*> (n);
     }
+  Staff_symbol_referencer::do_substitute_element_pointer (o,n);
 }