patch::: 1.3.99.jcn2

[lilypond.git] / lily / tie-engraver.cc

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 09c4d47c6015084fa9eba1be843d9a7c043e24c1..bec3b7f0fa45335e312b6f033882670ebc38c27a 100644 (file)
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -1,5 +1,5 @@
 /*   
-  ctie-engraver.cc --  implement Tie_engraver
+  tie-engraver.cc --  implement Tie_engraver
   
   source file of the GNU LilyPond music typesetter
   
@@ -13,6 +13,7 @@
 #include "musical-request.hh"
 #include "tie.hh"
 #include "translator-group.hh"
+#include "spanner.hh"
 #include "tie-column.hh"
 #include "pqueue.hh"
 #include "engraver.hh"
@@ -44,10 +45,13 @@ inline int compare (CHead_melodic_tuple const &a, CHead_melodic_tuple const &b)
 class Tie_engraver : public Engraver
 {
   PQueue<CHead_melodic_tuple> past_notes_pq_;
+  Moment end_mom_;
+  Moment next_end_mom_;
+
   Tie_req *req_l_;
   Array<CHead_melodic_tuple> now_heads_;
   Array<CHead_melodic_tuple> stopped_heads_;
-  Link_array<Tie> tie_p_arr_;
+  Link_array<Score_element> tie_p_arr_;
 
   Spanner * tie_column_p_;
   
@@ -80,6 +84,9 @@ Tie_engraver::do_try_music (Music *m)
 {
   if (Tie_req * c = dynamic_cast<Tie_req*> (m))
     {
+      /*      if (end_mom_ > now_mom ())
+       return false;
+      */
       req_l_ = c;
       SCM m = get_property ("automaticMelismata");
       bool am = gh_boolean_p (m) &&gh_scm2bool (m);
@@ -116,8 +123,6 @@ Tie_engraver::do_process_music ()
   if (req_l_)
     {
       Moment now = now_mom ();
-      Link_array<Note_head> nharr;
-      
       stopped_heads_.clear ();
       while (past_notes_pq_.size ()
             && past_notes_pq_.front ().end_ == now)
@@ -151,8 +156,8 @@ Tie_engraver::process_acknowledged ()
            }
          else
            {
-             head_list  = gh_cons (gh_cons (stopped_heads_[j].head_l_->self_scm_,
-                                            now_heads_[i].head_l_->self_scm_),
+             head_list  = gh_cons (gh_cons (stopped_heads_[j].head_l_->self_scm (),
+                                            now_heads_[i].head_l_->self_scm ()),
                                    head_list);
 
              past_notes_pq_. insert (now_heads_[i]);
@@ -163,7 +168,7 @@ Tie_engraver::process_acknowledged ()
            }
        }
 
-      SCM basic = get_property ("basicTieProperties");
+      SCM basic = get_property ("Tie");
       SCM sparse = get_property ("sparseTies");
       if (to_boolean (sparse))
        {
@@ -174,36 +179,36 @@ Tie_engraver::process_acknowledged ()
          
          SCM pair = gh_list_ref (head_list, gh_int2scm (i/2));
          
-         Tie * p = new Tie (basic);
+         Spanner * p = new Spanner (basic);
          Tie::set_head (p,LEFT, dynamic_cast<Item*> (unsmob_element (gh_car (pair))));
          Tie::set_head (p,RIGHT, dynamic_cast<Item*> (unsmob_element (gh_cdr (pair))));
          
          tie_p_arr_.push (p);
-         announce_element (Score_element_info (p, req_l_));
+         announce_element (p, req_l_);
        }
       else for (SCM s = head_list; gh_pair_p (s); s = gh_cdr (s))
        {
-         Tie * p = new Tie (basic);
+         Score_element * p = new Spanner (basic);
          Tie::set_interface (p);
          
          Tie::set_head (p, LEFT, dynamic_cast<Item*> (unsmob_element (gh_caar (s))));
          Tie::set_head (p, RIGHT, dynamic_cast<Item*> (unsmob_element (gh_cdar (s))));
          
          tie_p_arr_.push (p);
-         announce_element (Score_element_info (p, req_l_));
+         announce_element (p, req_l_);
        }
 
       if (!tie_p_arr_.size ())
        {
-         req_l_->warning (_ ("No ties were created!"));
+         req_l_->origin ()->warning (_ ("No ties were created!"));
        }
       else if (tie_p_arr_.size () > 1 && !tie_column_p_)
        {
-         tie_column_p_ = new Spanner (get_property ("basicTieColumnProperties"));
+         tie_column_p_ = new Spanner (get_property ("TieColumn"));
          Tie_column::set_interface (tie_column_p_);
          for (int i = tie_p_arr_.size (); i--; )
            Tie_column::add_tie (tie_column_p_,tie_p_arr_ [i]);
-         announce_element (Score_element_info (tie_column_p_, 0));
+         announce_element (tie_column_p_, 0);
        }
     }
 }
@@ -245,8 +250,8 @@ Tie_engraver::typeset_tie (Score_element *her)
       new_head_drul[d] = Tie::head(her,(Direction)-d);
   } while (flip(&d) != LEFT);
 
-  index_set_cell (her->get_elt_property ("heads"), LEFT, new_head_drul[LEFT]->self_scm_ );
-  index_set_cell (her->get_elt_property ("heads"), RIGHT, new_head_drul[RIGHT]->self_scm_ );
+  index_set_cell (her->get_elt_property ("heads"), LEFT, new_head_drul[LEFT]->self_scm () );
+  index_set_cell (her->get_elt_property ("heads"), RIGHT, new_head_drul[RIGHT]->self_scm () );
 
   typeset_element (her);
 }