X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem.cc;h=7b387d8d6d5452dca97139e034750aaef23a7fe2;hb=1f72695816f79df61958fc3649591fbf6b95a05a;hp=e876f7a0203623d1690653551ab77cf5b0394148;hpb=439b9eae8f830918d62c7374d4f72a1079334316;p=lilypond.git

diff --git a/lily/stem.cc b/lily/stem.cc
index e876f7a020..7b387d8d6d 100644
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -3,11 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+  TODO: This is way too hairy
 */
 
 #include "stem.hh"
-#include "dimen.hh" 
 #include "debug.hh"
 #include "paper-def.hh"
 #include "note-head.hh"
@@ -16,146 +17,154 @@
 #include "p-col.hh"
 #include "misc.hh"
 #include "beam.hh"
+#include "rest.hh"
+
+
 
-const int STEMLEN=7;
 
-IMPLEMENT_IS_TYPE_B1 (Stem,Item);
+Stem::~Stem ()
+{
+}
 
-Stem::Stem () 
+Stem::Stem ()
 {
   /*
     TODO: staff-size
-   */
-  abbrev_flag_i_ = 0;
-  beam_l_ = 0;
-  beams_left_i_ = 0;
-  beams_right_i_ = 0;
-
-  stem_bottom_f_ = stem_top_f_ = 0;
-  flag_i_ = 4;
-  dir_ =CENTER;
+    */
+  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;
 
-  stem_xoffset_f_ =0;
+  beam_gap_i_ = 0;
+  beam_l_ = 0;
 }
 
-int
-Stem::min_head_i () const
+Interval_t<int>
+Stem::head_positions () const
 {
-  int m = 1000;
-  for (int i =0; i < head_l_arr_.size (); i++)
-    m = m <? head_l_arr_[i]->position_i_;
-  return m;
-}
+  /* 
+    Mysterious FreeBSD fix by John Galbraith.  Somehow, the empty intervals 
+    trigger FP exceptions on FreeBSD.  Fix: do not return infinity 
 
-int
-Stem::max_head_i () const
-{
-  int m = -1000;
+   */
+  if (!head_l_arr_.size ())
+    {
+      return Interval_t<int> (100,-100);	
+    }
+
+  Interval_t<int> r;
   for (int i =0; i < head_l_arr_.size (); i++)
-    m = m >? head_l_arr_[i]->position_i_;
-  return m;
-  
+    {
+      int p = head_l_arr_[i]->position_i_;
+      r[BIGGER] = r[BIGGER] >? p;
+      r[SMALLER] = r[SMALLER] <? p;
+    }
+  return r;
 }
 
 void
 Stem::do_print () const
 {
 #ifndef NPRINT
-  DOUT << "flag "<< flag_i_ << " print_flag? " << !(bool)beam_l_ << "abbrev_flag_i_" << abbrev_flag_i_;
+  DOUT << "flag "<< flag_i_;
+  if (beam_l_)
+    DOUT << "beamed";
 #endif
 }
 
-Real 
+Real
 Stem::stem_length_f () const
 {
-  return stem_top_f_-stem_bottom_f_ ;
+  return yextent_drul_[UP]-yextent_drul_[DOWN] ;
 }
 
 Real
-Stem::stem_start_f () const
+Stem::stem_begin_f () const
 {
-  return (dir_ < 0)? stem_top_f_ : stem_bottom_f_;
+  return yextent_drul_[Direction(-dir_)];
 }
 
 Real
-Stem::stem_end_f () const
+Stem::chord_start_f () const
 {
-  return (dir_ < 0)? stem_bottom_f_ : stem_top_f_;
+  return head_positions()[dir_] * paper ()->internote_f ();
 }
 
+Real
+Stem::stem_end_f () const
+{
+  return yextent_drul_[dir_];
+}
 
 void
 Stem::set_stemend (Real se)
 {
   // todo: margins
-  if (!  ((dir_ > 0 && se >= max_head_i ()) || 
-	  (se <= min_head_i () && dir_ <0)))	
-    warning ("Weird stem size; check for narrow beams");
+  if (dir_ && dir_ * head_positions()[dir_] >= se*dir_)
+    warning (_ ("weird stem size; check for narrow beams"));
 
-  stem_top_f_  = (dir_ < 0) ? max_head_i () : se;
-  stem_bottom_f_  = (dir_ < 0) ? se  : min_head_i ();
+  
+  yextent_drul_[dir_]  =  se;
+  yextent_drul_[Direction(-dir_)] = head_positions()[-dir_];
+}
+
+int
+Stem::type_i () const
+{
+  return head_l_arr_[0]->balltype_i_;
 }
 
 void
-Stem::add (Note_head *n)
+Stem::add_head (Rhythmic_head *n)
 {
-  n->add_dependency (this);
-  if (n->rest_b_) 
-      rest_l_arr_.push (n);
-  else 
-      head_l_arr_.push (n);
-
-#if 0
-  else if (1) //why different? (n->balltype_i_) 
-      head_l_arr_.push (n);
-  else
-      whole_l_arr_.push (n);
-#endif
+  n->add_dependency (this);	// ?
+  if (Note_head *nh = dynamic_cast<Note_head *> (n))
+    {
+      head_l_arr_.push (nh);
+    }
+  else if (Rest *r = dynamic_cast<Rest *> (n))
+    {
+      rest_l_arr_.push (r);
+    }
 }
 
 bool
 Stem::invisible_b () const
 {
-  return !head_l_arr_.size();
+  return (!head_l_arr_.size () ||
+    head_l_arr_[0]->balltype_i_ <= 0);
 }
 
-// if dir_ is set we return fake values.
-
 int
-Stem::get_center_distance_from_top ()
+Stem::get_center_distance (Direction d) const
 {
-  if (dir_)
-    return (dir_ > 0) ? 0 : 1;
-
-  int staff_center = staff_size_i_ / 2;
-  int max = max_head_i () - staff_center;
-  return max >? 0;
+  int staff_center = 0;
+  int distance = d*(head_positions()[d] - staff_center);
+  return distance >? 0;
 }
 
-// if dir_ is set we return fake values.
-int
-Stem::get_center_distance_from_bottom ()
+Direction
+Stem::get_default_dir () const
 {
-  if (dir_)
-    return (dir_ > 0) ? 1 : 0;
-
-  int staff_center = staff_size_i_ / 2;
-  int min = staff_center - min_head_i ();
-  return min >? 0;
+  return (get_center_distance (UP) >
+	  get_center_distance (DOWN)) 
+    ? DOWN 
+    : UP;
 }
 
 Direction
-Stem::get_default_dir ()
+Stem::get_dir () const
 {
-  if (dir_)
-    return dir_;
-  return (get_center_distance_from_top () >=
-    get_center_distance_from_bottom ()) ? 
-    (Direction)-1 : (Direction)1;
+  return dir_;
 }
 
-
 void
 Stem::set_default_dir ()
 {
@@ -165,47 +174,49 @@ Stem::set_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;
+
   if (!dir_)
     set_default_dir ();
+  /* 
+    stems in unnatural (forced) direction should be shortened, 
+    accoding to [Roush & Gourlay]
+   */
+  if (((int)chord_start_f ())
+      && (dir_ != get_default_dir ()))
+    length_f -= shorten_f;
+
+  if (flag_i_ >= 5)
+    length_f += 2.0;
+  if (flag_i_ >= 6)
+    length_f += 1.0;
+  
+  set_stemend ((dir_ > 0) ? head_positions()[BIGGER] + length_f:
+	       head_positions()[SMALLER] - length_f);
 
-  // ugh... how about non 5-line staffs?
-  bool on_ledger_line_b = ((max_head_i () < -2 && dir_ == 1)
-//    || (min_head_i () > staff_size_i_ && dir_ == -1));
-    || (min_head_i () > staff_size_i_ + 3 && dir_ == -1));
-  if (on_ledger_line_b)
-    {
-      set_stemend (staff_size_i_ / 2 - 1);
-    }
-  else 
-    {
-      Real dy = paper ()->interbeam_f ();
-      Real len = STEMLEN;
-      // ugh, should get nice *rule* for this
-      if (abbrev_flag_i_ > 1)
-	len += (abbrev_flag_i_ - 1)* dy / 2;
-      set_stemend ((dir_ > 0) ? max_head_i () + len :
-		   min_head_i () - len);
-    }
+  if (dir_ * stem_end_f () < 0)
+    set_stemend (0);
 }
 
+//xxx
 void
 Stem::set_default_extents ()
 {
   if (!stem_length_f ())
     set_default_stemlen ();
 
-  set_stemend ((dir_< 0) ? 
-	       max_head_i ()-stem_length_f (): min_head_i () +stem_length_f ());
-  if (dir_ > 0){	
-    stem_xoffset_f_ = paper ()->note_width ()-paper ()->rule_thickness ();
-  }
-  else
-    stem_xoffset_f_ = 0;
+
+  if (dir_ == UP)
+    stem_xdir_ = RIGHT;
+  if (invisible_b ())
+    stem_xdir_ = CENTER;
 }
 
 /*
   TODO
-  
+
   move into note_column.cc
 
   */
@@ -215,25 +226,25 @@ Stem::set_noteheads ()
   if (!head_l_arr_.size ())
     return;
   head_l_arr_.sort (Note_head::compare);
-  if (dir_ < 0) 
+  if (dir_ < 0)
     head_l_arr_.reverse ();
-  
+
   head_l_arr_[0]->extremal_i_ = -1;
   head_l_arr_.top ()->extremal_i_ = 1;
   int parity=1;
   int lastpos = head_l_arr_[0]->position_i_;
-  for (int i=1; i < head_l_arr_.size (); i ++) 
+  for (int i=1; i < head_l_arr_.size (); i ++)
     {
       int dy =abs (lastpos- head_l_arr_[i]->position_i_);
-	
-      if (dy <= 1) 
+
+      if (dy <= 1)
 	{
 	  if (parity)
-	    head_l_arr_[i]->x_dir_ = (stem_xoffset_f_>0) ? UP:DOWN;
+	    head_l_arr_[i]->x_dir_ = (stem_xdir_ == LEFT) ? LEFT : RIGHT;
 	  parity = !parity;
 	}
       else
-	parity = 0;
+	parity = 1;
       lastpos = head_l_arr_[i]->position_i_;
     }
 }
@@ -241,115 +252,98 @@ Stem::set_noteheads ()
 void
 Stem::do_pre_processing ()
 {
-  if (stem_bottom_f_== stem_top_f_)
+  if (yextent_drul_[DOWN]== yextent_drul_[UP])
     set_default_extents ();
   set_noteheads ();
-  flag_i_ = dir_*abs (flag_i_);
+  flag_i_ = flag_i_;
   transparent_b_ = invisible_b ();
-  empty_b_ = invisible_b ();
+  set_empty (invisible_b ());
 }
 
+
 Interval
 Stem::do_width () const
 {
-  if (beam_l_ || abs (flag_i_) <= 4)
-    return Interval (0,0);	// TODO!
-  Paper_def*p= paper ();
-  Interval r (p->lookup_l ()->flag (flag_i_).dim.x ());
-  r+= stem_xoffset_f_;
-  return r;
-}
-
-Molecule
-Stem::abbrev_mol () const
-{
-  Real dy = paper ()->interbeam_f ();
-  Real w = 1.5 * paper ()->lookup_l ()->ball (2).dim.x ().length ();
-  Real beamdy = paper ()->interline_f () / 2;
-
-  int beams_i = 0;
-  Real slope = paper ()->internote_f () / 4;
-
-  if (beam_l_) {
-    // huh?
-    slope = 2 * beam_l_->slope;
-    // ugh, rather calc from Abbreviation_req
-    beams_i = beams_right_i_ >? beams_left_i_; 
-  }
-  paper()->lookup_l ()->beam (slope, 20 PT);
-
-  Molecule beams;
-  Atom a (paper ()->lookup_l ()->beam (slope, w));
-  a.translate (Offset(- w / 2, stem_end_f () - (w / 2 * slope)));
-  // ugh
-  if (!beams_i)
-    a.translate (dy + beamdy - dir_ * dy, Y_AXIS);
+  Interval r (0, 0);
+  if (beam_l_ || abs (flag_i_) <= 2)
+    ;	// TODO!
   else
-    a.translate (2 * beamdy - dir_ * (beamdy - dy), Y_AXIS);
-  	
-  for (int i = 0; i < abbrev_flag_i_; i++) 
     {
-      Atom b (a);
-      b.translate (-dir_ * dy * (beams_i + i), Y_AXIS);
-      beams.add (b);
+      r = lookup_l ()->flag (flag_i_, dir_).dim_.x ();
+      r += note_delta_f ();
     }
-
-  return beams;
+  return r;
 }
 
+
+
+
+const Real ANGLE = 20* (2.0*M_PI/360.0); // ugh!
+
 Molecule*
-Stem::brew_molecule_p () const 
+Stem::do_brew_molecule_p () const
 {
-  Real bot  = stem_bottom_f_;
-  Real top = stem_top_f_;
+  Molecule *mol_p =new Molecule;
+  Drul_array<Real> stem_y = yextent_drul_;
+  Real dy = paper ()->internote_f ();
+
+  Real head_wid = 0;
+  if (head_l_arr_.size ())
+    head_wid = head_l_arr_[0]->extent (X_AXIS).length ();
+  stem_y[Direction(-dir_)] += dir_ * head_wid * tan(ANGLE)/(2*dy);
   
-  assert (bot!=top);
- 
-  Paper_def *p =paper ();
+  if (!invisible_b ())
+    {
+      Molecule ss =lookup_l ()->stem (stem_y[DOWN]*dy,
+				     stem_y[UP]*dy);
+      mol_p->add_molecule (ss);
+    }
 
-  Real dy = p->internote_f ();
-  Symbol ss =p->lookup_l ()->stem (bot*dy,top*dy);
+  if (!beam_l_ && abs (flag_i_) > 2)
+    {
+      Molecule fl = lookup_l ()->flag (flag_i_, dir_);
+      fl.translate_axis(stem_y[dir_]*dy, Y_AXIS);
+      mol_p->add_molecule (fl);
+    }
 
-  Molecule* mol_p = new Molecule;
-  if (head_l_arr_.size() && head_l_arr_[0]->balltype_i_)
-    mol_p->add (Atom (ss));
+  if (head_l_arr_.size())
+    {
+      mol_p->translate_axis (note_delta_f (), X_AXIS);
+    }
+  return mol_p;
+}
 
-  if (!beam_l_ && abs (flag_i_) > 4)
+Real
+Stem::note_delta_f () const
+{
+  Real r=0;
+  if (head_l_arr_.size())
     {
-      Symbol fl = p->lookup_l ()->flag (flag_i_);
-      Molecule m (fl);
-      if (flag_i_ < -4){		
-	mol_p->add_bottom (m);
-      }
-      else if (flag_i_ > 4) 
-	{
-	  mol_p->add_top (m);
-	}
+      Interval head_wid(0,  head_l_arr_[0]->extent (X_AXIS).length ());
+      Real rule_thick(paper ()->rule_thickness ());
+      Interval stem_wid(-rule_thick/2, rule_thick/2);
+      if (stem_xdir_ == CENTER)
+	r = head_wid.center ();
       else
-	assert (false); 
-      assert (!abbrev_flag_i_);
+	r = head_wid[stem_xdir_] - stem_wid[stem_xdir_];
     }
-
-  if (abbrev_flag_i_)
-    mol_p->add (abbrev_mol ());
-
-  mol_p->translate (stem_xoffset_f_, X_AXIS);
-  return mol_p;
+  return r;
 }
 
 Real
 Stem::hpos_f () const
 {
-  return Item::hpos_f () + stem_xoffset_f_;
+  return note_delta_f () + Item::hpos_f ();
 }
 
-
+/*
+  TODO:  head_l_arr_/rest_l_arr_ in  do_substitute_dependent ()
+ */
 void
-Stem::do_substitute_dependency (Score_elem*o,Score_elem*n)
+Stem::do_substitute_dependency (Score_element*o,Score_element*n)
 {
-  Item * o_l = o->item ();
-  Item * n_l = n? n->item ():0;
-//  whole_l_arr_.substitute ((Note_head*)o_l, (Note_head*)n_l);
-  head_l_arr_.substitute ((Note_head*)o_l, (Note_head*)n_l);
-  rest_l_arr_.substitute ((Note_head*)o_l, (Note_head*)n_l);
+  if (Note_head*h=dynamic_cast<Note_head*> (o))
+  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));
 }