X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem.cc;h=7c780fadd7244aab8c69e6f95b70ebd09d665644;hb=0f0860112a07a4eab33ac36d8c1b9b01d431ddfa;hp=3cd58198b3b34fb82aa332596696e555ee76cbd9;hpb=a9e27bfa5428cdedd91a5616e1aef8cbba6ec3a5;p=lilypond.git

diff --git a/lily/stem.cc b/lily/stem.cc
index 3cd58198b3..7c780fadd7 100644
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -1,5 +1,14 @@
+/*
+  stem.cc -- implement Stem
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1996, 1997--1998 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"
@@ -7,271 +16,334 @@
 #include "molecule.hh"
 #include "p-col.hh"
 #include "misc.hh"
+#include "beam.hh"
+#include "rest.hh"
 
-const int STEMLEN=7;
 
-int
-Stem::min_head_i()const
+
+
+Stem::~Stem ()
 {
-    int m = 1000;
-    for (int i =0; i < head_l_arr_.size(); i++)
-	m = m <? head_l_arr_[i]->position_i_;
-    return m;
 }
 
-int
-Stem::max_head_i() const
+Stem::Stem ()
 {
-    int m = -1000;
-    for (int i =0; i < head_l_arr_.size(); i++)
-	m = m >? head_l_arr_[i]->position_i_;
-    return m;
-    
+  /*
+    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;
 }
 
-Stem::Stem(int c) 
+Interval_t<int>
+Stem::head_positions () const
 {
-    beams_left_i_ = 0;
-    beams_right_i_ = 0;
-
-    stem_bottom_f_ = stem_top_f_ = 0;
-    flag_i_ = 4;
-    dir_i_ =0;
-    staff_size_i_ = c;
-
-    print_flag_b_=true;
-    stem_xoffset_f_ =0;
+  /* 
+    Mysterious FreeBSD fix by John Galbraith.  Somehow, the empty intervals 
+    trigger FP exceptions on FreeBSD.  Fix: do not return infinity 
+
+   */
+  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++)
+    {
+      int p = head_l_arr_[i]->position_i_;
+      r[BIGGER] = r[BIGGER] >? p;
+      r[SMALLER] = r[SMALLER] <? p;
+    }
+  return r;
 }
 
-IMPLEMENT_STATIC_NAME(Stem);
-
 void
-Stem::do_print() const
+Stem::do_print () const
 {
 #ifndef NPRINT
-    mtor << "flag "<< flag_i_ << " print_flag_b_ " << print_flag_b_;
-
+  DOUT << "flag "<< flag_i_;
+  if (beam_l_)
+    DOUT << "beamed";
 #endif
 }
 
-Real 
-Stem::stem_length_f()const
+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_i_ < 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_i_ < 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)
+Stem::set_stemend (Real se)
 {
-    // todo: margins
-    if (!  ((dir_i_ > 0 && se >= max_head_i()) || 
-	    (se <= min_head_i() && dir_i_ <0))  )	
- 	warning("Weird stem size; check for narrow beams");
+  // todo: margins
+  if (dir_ && dir_ * head_positions()[dir_] >= se*dir_)
+    warning (_ ("weird stem size; check for narrow beams"));
 
-    stem_top_f_  = (dir_i_ < 0) ? max_head_i()           : se;
-    stem_bottom_f_  = (dir_i_ < 0) ? se  : min_head_i();
+  
+  yextent_drul_[dir_]  =  se;
+  yextent_drul_[Direction(-dir_)] = head_positions()[-dir_];
 }
 
-void
-Stem::add(Note_head *n)
+int
+Stem::type_i () const
 {
-    n->add_dependency(this);
-    if (n->rest_b_) {
-	rest_l_arr_.push(n);
-    } else if (n->balltype_i_ == 1) {
-	whole_l_arr_.push(n);
-	return;
-    } else{
-	head_l_arr_.push(n);
-    }
+  return head_l_arr_[0]->balltype_i_;
 }
 
-bool
-Stem::invisible_b()const
+void
+Stem::add_head (Rhythmic_head *n)
 {
-    return !head_l_arr_.size();
+  n->add_dependency (this);	// ?
+  if (dynamic_cast<Note_head *> (n))
+    {
+      head_l_arr_.push ((Note_head*)n);
+    }
+  else if (dynamic_cast<Rest *> (n))
+    {
+      rest_l_arr_.push ((Rest*)n);
+    }
 }
+
 bool
-Stem::chord_b() const
+Stem::invisible_b () const
 {
-    return head_l_arr_.size() > 1;
+  return (!head_l_arr_.size () ||
+    head_l_arr_[0]->balltype_i_ <= 0);
 }
 
-// if dir_i_ is set we return a fake value.
 int
-Stem::get_center_distance()
+Stem::get_center_distance (Direction d) const
 {
-    if (dir_i_)
-      return -dir_i_;
-
-    int staff_center = staff_size_i_ / 2;
-    int min = min_head_i() - staff_center;
-    int max = max_head_i() - staff_center;
-    return (abs(max) > abs(min)) ? max : min;
+  int staff_center = 0;
+  int distance = d*(head_positions()[d] - staff_center);
+  return distance >? 0;
 }
 
-int
-Stem::get_default_dir()
+Direction
+Stem::get_default_dir () const
 {
-    if (dir_i_)
-        return dir_i_;
-    return -sign(get_center_distance());
+  return (get_center_distance (UP) >
+	  get_center_distance (DOWN)) 
+    ? DOWN 
+    : UP;
 }
 
+Direction
+Stem::get_dir () const
+{
+  return dir_;
+}
 
 void
-Stem::set_default_dir()
+Stem::set_default_dir ()
 {
-    dir_i_ = get_default_dir();
+  dir_ = get_default_dir ();
 }
 
 void
-Stem::set_default_stemlen()
+Stem::set_default_stemlen ()
 {
-    if (!dir_i_)
-	set_default_dir();
-
-    
-    // ugh... how about non 5-line staffs?
-    if ((max_head_i() < -2 && dir_i_ == 1 )
-	||(min_head_i() > staff_size_i_ && dir_i_ == -1) ){
-	set_stemend(    staff_size_i_ /2 -1 );
-    } else {
-	set_stemend( (dir_i_ > 0) ? max_head_i() + STEMLEN : 
-				     min_head_i() - 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);
 
-    }
+  if (dir_ * stem_end_f () < 0)
+    set_stemend (0);
 }
 
-
+//xxx
 void
-Stem::set_default_extents()
+Stem::set_default_extents ()
 {
-    if (!stem_length_f())
-	set_default_stemlen();
-
-    set_stemend((dir_i_< 0) ? 
-		max_head_i()-stem_length_f(): min_head_i() +stem_length_f());
-    if (dir_i_ > 0){	
-	stem_xoffset_f_ = paper()->note_width()-paper()->rule_thickness();
-    } else
-	stem_xoffset_f_ = 0;
+  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()
+Stem::set_noteheads ()
 {
-    if(!head_l_arr_.size())
-	return;
-    head_l_arr_.sort(Note_head::compare);
-    if (dir_i_ < 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 ++) {
-	int dy =abs(lastpos- head_l_arr_[i]->position_i_);
-	
-	if (dy <= 1) {
-	    if (parity)
-		head_l_arr_[i]->x_dir_i_ = (stem_xoffset_f_>0) ? 1:-1;
-	    parity = !parity;
-	} else
-	    parity = 0;
-	lastpos = head_l_arr_[i]->position_i_;
+  if (!head_l_arr_.size ())
+    return;
+  head_l_arr_.sort (Note_head::compare);
+  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 ++)
+    {
+      int dy =abs (lastpos- head_l_arr_[i]->position_i_);
+
+      if (dy <= 1)
+	{
+	  if (parity)
+	    head_l_arr_[i]->x_dir_ = (stem_xdir_ == LEFT) ? LEFT : RIGHT;
+	  parity = !parity;
+	}
+      else
+	parity = 1;
+      lastpos = head_l_arr_[i]->position_i_;
     }
 }
 
 void
-Stem::do_pre_processing()
+Stem::do_pre_processing ()
 {
-    if (stem_bottom_f_== stem_top_f_)
-	set_default_extents();
-    set_noteheads();
-    flag_i_ = dir_i_*abs(flag_i_);
+  if (yextent_drul_[DOWN]== yextent_drul_[UP])
+    set_default_extents ();
+  set_noteheads ();
+  flag_i_ = flag_i_;
+  transparent_b_ = invisible_b ();
+  set_empty (invisible_b ());
 }
 
 
 Interval
-Stem::do_width()const
+Stem::do_width () const
 {
-    if (!print_flag_b_ || 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;
+  Interval r (0, 0);
+  if (beam_l_ || abs (flag_i_) <= 2)
+    ;	// TODO!
+  else
+    {
+      r = lookup_l ()->flag (flag_i_, dir_).dim_.x ();
+      r += note_delta_f ();
+    }
+  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
 {
-    Molecule *out =0;
-    if ( invisible_b() )
-	return Score_elem::brew_molecule_p();
-    
-    Real bot  = stem_bottom_f_;
-    Real top = stem_top_f_;
-    
-    assert(bot!=top);
- 
-    Paper_def *p =paper();
-
-    Real dy = p->internote_f();
-    Symbol ss =p->lookup_l()->stem(bot*dy,top*dy);
-
-    out = new Molecule(Atom(ss));
-
-    if (print_flag_b_&&abs(flag_i_) > 4){
-	Symbol fl = p->lookup_l()->flag(flag_i_);
-	Molecule m(fl);
-	if (flag_i_ < -4){		
-	    out->add_bottom(m);
-	} else if (flag_i_ > 4) {
-	    out->add_top(m);
-	} else
-	    assert(false); 
+  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);
+  
+  if (!invisible_b ())
+    {
+      Atom ss =lookup_l ()->stem (stem_y[DOWN]*dy,
+				     stem_y[UP]*dy);
+      mol_p->add_atom (ss);
+    }
+
+  if (!beam_l_ && abs (flag_i_) > 2)
+    {
+      Atom fl = lookup_l ()->flag (flag_i_, dir_);
+      fl.translate_axis(stem_y[dir_]*dy, Y_AXIS);
+      mol_p->add_atom (fl);
     }
 
-    out->translate(Offset(stem_xoffset_f_,0));
-    return out;
+  if (head_l_arr_.size())
+    {
+      mol_p->translate_axis (note_delta_f (), X_AXIS);
+    }
+  return mol_p;
 }
 
 Real
-Stem::hpos_f()const
+Stem::note_delta_f () const
 {
-    return Item::hpos_f() + stem_xoffset_f_;
+  Real r=0;
+  if (head_l_arr_.size())
+    {
+      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
+	r = head_wid[stem_xdir_] - stem_wid[stem_xdir_];
+    }
+  return r;
 }
 
+Real
+Stem::hpos_f () const
+{
+  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));
 }