* lily/ledger-line-spanner.cc (print): swap linear_combination

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

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 6b48a88173e953d10a0f4afd9876d526d6d516ff..1aecbe526cb16b4a18ca5bc8e5cd0a81b93e1c23 100644 (file)
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -11,6 +11,7 @@
 #include "tie.hh"
 #include "context.hh"
 
+#include "protected-scm.hh"
 #include "spanner.hh"
 #include "tie-column.hh"
 #include "engraver.hh"
@@ -27,8 +28,6 @@
 
    TODO: Remove the dependency on musical info. We should tie on the
    basis of position and duration-log of the heads (not of the events).
-
-   TODO: support sparseTies.
 */
 class Tie_engraver : public Engraver
 {
@@ -37,18 +36,20 @@ class Tie_engraver : public Engraver
   Link_array<Grob> now_heads_;
   Link_array<Grob> heads_to_tie_;
   Link_array<Grob> ties_;
+  SCM tie_start_definition_;
   
   Spanner * tie_column_;
   
 protected:
   virtual void stop_translation_timestep ();
+  virtual void derived_mark () const;
   virtual void start_translation_timestep ();
   virtual void acknowledge_grob (Grob_info);
   virtual bool try_music (Music*);
   virtual void process_music ();
   void typeset_tie (Grob*);
 public:
-  TRANSLATOR_DECLARATIONS(Tie_engraver);
+  TRANSLATOR_DECLARATIONS (Tie_engraver);
 };
 
 
@@ -58,6 +59,13 @@ Tie_engraver::Tie_engraver ()
   event_ = 0;
   last_event_  = 0;
   tie_column_ = 0;
+  tie_start_definition_ = SCM_EOL;
+}
+
+void
+Tie_engraver::derived_mark () const
+{
+  scm_gc_mark (tie_start_definition_);
 }
 
 
@@ -76,7 +84,9 @@ void
 Tie_engraver::process_music ()
 {
   if (event_)
-    daddy_context_->set_property ("tieMelismaBusy", SCM_BOOL_T);
+    {
+      context ()->set_property ("tieMelismaBusy", SCM_BOOL_T);
+    }
 }
 
 void
@@ -96,24 +106,24 @@ Tie_engraver::acknowledge_grob (Grob_info i)
            maybe should check positions too.
           */
          if (right_mus && left_mus
-             && gh_equal_p (right_mus->get_property ("pitch"),
+             && ly_c_equal_p (right_mus->get_property ("pitch"),
                             left_mus->get_property ("pitch")))
            {
-             Grob * p = make_spanner ("Tie");
+             Grob * p = new Spanner  (tie_start_definition_);
+             announce_grob (p, last_event_->self_scm ());
              Tie::set_interface (p); // cannot remove yet!
          
              Tie::set_head (p, LEFT, th);
              Tie::set_head (p, RIGHT, h);
          
              ties_.push (p);
-             announce_grob(p, last_event_->self_scm());
            }
        }
 
       if (ties_.size () && ! tie_column_)
        {
-         tie_column_ = make_spanner ("TieColumn");
-         announce_grob(tie_column_, SCM_EOL);
+         tie_column_ = make_spanner ("TieColumn", SCM_EOL);
+         
        }
 
       if (tie_column_)
@@ -125,8 +135,8 @@ Tie_engraver::acknowledge_grob (Grob_info i)
 void
 Tie_engraver::start_translation_timestep ()
 {
-  daddy_context_->set_property ("tieMelismaBusy",
-                             gh_bool2scm (heads_to_tie_.size ()));
+  context ()->set_property ("tieMelismaBusy",
+                             ly_bool2scm (heads_to_tie_.size ()));
       
 }
 
@@ -141,17 +151,14 @@ Tie_engraver::stop_translation_timestep ()
          typeset_tie (ties_[i]);
        }
 
-      ties_.clear();
+      ties_.clear ();
       last_event_ = 0;
-      if (tie_column_)
-       {
-         typeset_grob (tie_column_);
-         tie_column_ =0;
-       }
+      tie_column_ =0;
     }
   
   if (event_)
     {
+      tie_start_definition_ = updated_grob_properties (context (), ly_symbol2scm ("Tie"));
       heads_to_tie_ = now_heads_;
       last_event_ = event_;
     }
@@ -177,11 +184,10 @@ Tie_engraver::typeset_tie (Grob *her)
   index_set_cell (her->get_property ("head-pair"), LEFT, new_head_drul[LEFT]->self_scm ());
   index_set_cell (her->get_property ("head-pair"), RIGHT, new_head_drul[RIGHT]->self_scm ());
 
-  typeset_grob (her);
 }
 
 
-ENTER_DESCRIPTION(Tie_engraver,
+ENTER_DESCRIPTION (Tie_engraver,
 /* descr */       "Generate ties between noteheads of equal pitch.",
 /* creats*/       "Tie TieColumn",
 /* accepts */     "tie-event",