release: 1.3.69

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

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 0090dbd9b576a943a214e89c832a98cd5d55d7d7..4f619e27ae2d5738fd68a631f9b9b2e20be3db9e 100644 (file)
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -9,20 +9,21 @@
 
 #include "tie-engraver.hh"
 #include "command-request.hh"
-#include "note-head.hh"
+#include "rhythmic-head.hh"
 #include "musical-request.hh"
 #include "tie.hh"
 #include "translator-group.hh"
 #include "tie-column.hh"
 #include "pqueue.hh"
 #include "engraver.hh"
+#include "item.hh"
 
 struct CHead_melodic_tuple {
   Melodic_req *req_l_ ;
-  Note_head *head_l_;
+  Score_element *head_l_;
   Moment end_;
   CHead_melodic_tuple ();
-  CHead_melodic_tuple (Note_head*, Melodic_req*, Moment);
+  CHead_melodic_tuple (Score_element*, Melodic_req*, Moment);
   static int pitch_compare (CHead_melodic_tuple const &, CHead_melodic_tuple const &);
   static int time_compare (CHead_melodic_tuple const &, CHead_melodic_tuple const &);  
 };
@@ -38,7 +39,7 @@ inline int compare (CHead_melodic_tuple const &a, CHead_melodic_tuple const &b)
    priority queue. If we have a Tie_req, connect the notes that finish
    just at this time, and note that start at this time.
 
-   TODO: should share code with Beam_engraver, Extender_engraver?
+   TODO: junk the pq.
  */
 class Tie_engraver : public Engraver
 {
@@ -57,9 +58,9 @@ protected:
   virtual void do_pre_move_processing ();
   virtual void acknowledge_element (Score_element_info);
   virtual bool do_try_music (Music*);
-  virtual void do_process_requests ();
+  virtual void do_process_music ();
   virtual void process_acknowledged ();
-
+  void typeset_tie (Score_element*);
 public:
   VIRTUAL_COPY_CONS(Translator);
   Tie_engraver();
@@ -80,7 +81,7 @@ Tie_engraver::do_try_music (Music *m)
   if (Tie_req * c = dynamic_cast<Tie_req*> (m))
     {
       req_l_ = c;
-      SCM m = get_property ("automaticMelismata",0);
+      SCM m = get_property ("automaticMelismata");
       bool am = gh_boolean_p (m) &&gh_scm2bool (m);
       if (am)
        {
@@ -94,28 +95,23 @@ Tie_engraver::do_try_music (Music *m)
 void
 Tie_engraver::set_melisma (bool m)
 {
-  Translator_group *where = daddy_trans_l_;
-  get_property ("tieMelismaBusy", &where);
-  if (!where)
-    where = daddy_trans_l_;
-    
   daddy_trans_l_->set_property ("tieMelismaBusy", m ? SCM_BOOL_T : SCM_BOOL_F);
 }
 
 void
 Tie_engraver::acknowledge_element (Score_element_info i)
 {
-  if (Note_head *nh = dynamic_cast<Note_head *> (i.elem_l_))
+  if (Rhythmic_head::has_interface (i.elem_l_))
     {
       Note_req * m = dynamic_cast<Note_req* > (i.req_l_);
       if (!m)
        return;
-      now_heads_.push (CHead_melodic_tuple (nh, m, now_mom()+ m->length_mom ()));
+      now_heads_.push (CHead_melodic_tuple (i.elem_l_, m, now_mom()+ m->length_mom ()));
     }
 }
 
 void
-Tie_engraver::do_process_requests ()
+Tie_engraver::do_process_music ()
 {
   if (req_l_)
     {
@@ -167,8 +163,8 @@ Tie_engraver::process_acknowledged ()
            }
        }
 
-
-      SCM sparse = get_property ("sparseTies", 0);
+      SCM basic = get_property ("basicTieProperties");
+      SCM sparse = get_property ("sparseTies");
       if (to_boolean (sparse))
        {
          int i = scm_ilength (head_list);
@@ -178,18 +174,20 @@ Tie_engraver::process_acknowledged ()
          
          SCM pair = gh_list_ref (head_list, gh_int2scm (i/2));
          
-         Tie * p = new Tie;
-         p->set_head (LEFT, dynamic_cast<Item*> (unsmob_element (gh_car (pair))));
-         p->set_head (RIGHT, dynamic_cast<Item*> (unsmob_element (gh_cdr (pair))));
+         Tie * p = new Tie (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_));
        }
       else for (SCM s = head_list; gh_pair_p (s); s = gh_cdr (s))
        {
-         Tie * p = new Tie;
-         p->set_head (LEFT, dynamic_cast<Item*> (unsmob_element (gh_caar (s))));
-         p->set_head (RIGHT, dynamic_cast<Item*> (unsmob_element (gh_cdar (s))));
+         Tie * p = new Tie (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_));
@@ -201,9 +199,10 @@ Tie_engraver::process_acknowledged ()
        }
       else if (tie_p_arr_.size () > 1 && !tie_column_p_)
        {
-         tie_column_p_ = new Tie_column;
+         tie_column_p_ = new Tie_column (get_property ("basicTieColumnProperties"));
+         Tie_column::set_interface (tie_column_p_);
          for (int i = tie_p_arr_.size (); i--; )
-           tie_column_p_->add_tie (tie_p_arr_ [i]);
+           Tie_column::add_tie (tie_column_p_,tie_p_arr_ [i]);
          announce_element (Score_element_info (tie_column_p_, 0));
        }
     }
@@ -221,7 +220,7 @@ Tie_engraver::do_pre_move_processing ()
 
   for (int i=0; i<  tie_p_arr_.size (); i++)
    {
-      typeset_element (tie_p_arr_[i]);
+      typeset_tie (tie_p_arr_[i]);
     }
   tie_p_arr_.clear ();
   if (tie_column_p_)
@@ -231,10 +230,31 @@ Tie_engraver::do_pre_move_processing ()
     }
 }
 
+void
+Tie_engraver::typeset_tie (Score_element *her)
+{
+  if (!(Tie::head (her,LEFT) && Tie::head (her,RIGHT)))
+    warning (_ ("lonely tie"));
+
+  Direction d = LEFT;
+  Drul_array<Score_element *> new_head_drul;
+  new_head_drul[LEFT] = Tie::head(her,LEFT);
+  new_head_drul[RIGHT] = Tie::head (her,RIGHT);  
+  do {
+    if (!Tie::head (her,d))
+      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_ );
+
+  typeset_element (her);
+}
+
 void
 Tie_engraver::do_post_move_processing ()
 {
-  SCM m = get_property ("automaticMelismata",0);
+  SCM m = get_property ("automaticMelismata");
   if (to_boolean (m))
     {
       set_melisma (false);
@@ -255,7 +275,7 @@ CHead_melodic_tuple::CHead_melodic_tuple ()
   end_ = 0;
 }
 
-CHead_melodic_tuple::CHead_melodic_tuple (Note_head *h, Melodic_req*m, Moment mom)
+CHead_melodic_tuple::CHead_melodic_tuple (Score_element *h, Melodic_req*m, Moment mom)
 {
   head_l_ = h;
   req_l_ = m;