* flower

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

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 43d6917587cb67131baff665359a04c63e555f45..efd6098c5ad5c612e4ea7a838c90bd970f770d5f 100644 (file)
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -1,11 +1,10 @@
-/*   
+/*
   tie-engraver.cc -- implement Tie_engraver
-  
+
   source file of the GNU LilyPond music typesetter
-  
+
   (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+*/
 
 #include "tie.hh"
 #include "context.hh"
@@ -33,10 +32,10 @@ struct Head_event_tuple
   Grob *head_;
   SCM tie_definition_;
   Music *event_;
-  Head_event_tuple()
+  Head_event_tuple ()
   {
   }
-  Head_event_tuple(Grob *h, Music *m, SCM def)
+  Head_event_tuple (Grob *h, Music *m, SCM def)
   {
     head_ = h;
     event_ = m;
@@ -50,27 +49,26 @@ class Tie_engraver : public Engraver
   Link_array<Grob> now_heads_;
   Array<Head_event_tuple> heads_to_tie_;
   Link_array<Grob> ties_;
-  
-  Spanner * tie_column_;
-  
+
+  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 bool try_music (Music *);
   virtual void process_music ();
-  void typeset_tie (Grob*);
+  void typeset_tie (Grob *);
 public:
   TRANSLATOR_DECLARATIONS (Tie_engraver);
 };
 
-
 void
 Tie_engraver::derived_mark () const
 {
   Engraver::derived_mark ();
-  for (int i = 0;  i < heads_to_tie_.size();  i++)
+  for (int i = 0; i < heads_to_tie_.size (); i++)
     scm_gc_mark (heads_to_tie_[i].tie_definition_);
 }
 
@@ -80,7 +78,6 @@ Tie_engraver::Tie_engraver ()
   tie_column_ = 0;
 }
 
-
 bool
 Tie_engraver::try_music (Music *mus)
 {
@@ -88,7 +85,7 @@ Tie_engraver::try_music (Music *mus)
     {
       event_ = mus;
     }
-  
+
   return true;
 }
 
@@ -106,29 +103,29 @@ Tie_engraver::acknowledge_grob (Grob_info i)
 {
   if (Note_head::has_interface (i.grob_))
     {
-      Grob * h  = i.grob_;
+      Grob *h = i.grob_;
       now_heads_.push (h);
-      for  (int i = heads_to_tie_.size (); i--;)
+      for (int i = heads_to_tie_.size (); i--;)
        {
-         Grob *th =  heads_to_tie_[i].head_;
-         Music * right_mus = unsmob_music (h->get_property ("cause"));
-         Music * left_mus = unsmob_music (th->get_property ("cause"));
+         Grob *th = heads_to_tie_[i].head_;
+         Music *right_mus = unsmob_music (h->get_property ("cause"));
+         Music *left_mus = unsmob_music (th->get_property ("cause"));
 
          /*
            maybe should check positions too.
-          */
+         */
          if (right_mus && left_mus
              && ly_c_equal_p (right_mus->get_property ("pitch"),
-                            left_mus->get_property ("pitch")))
+                              left_mus->get_property ("pitch")))
            {
-             Grob * p = new Spanner  (heads_to_tie_[i].tie_definition_,
-                                      context()->get_grob_key ("Tie"));
+             Grob *p = new Spanner (heads_to_tie_[i].tie_definition_,
+                                    context ()->get_grob_key ("Tie"));
              announce_grob (p, heads_to_tie_[i].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);
              heads_to_tie_.del (i);
            }
@@ -150,7 +147,7 @@ Tie_engraver::start_translation_timestep ()
 {
   context ()->set_property ("tieMelismaBusy",
                            ly_bool2scm (heads_to_tie_.size ()));
-      
+
 }
 
 void
@@ -162,8 +159,8 @@ Tie_engraver::stop_translation_timestep ()
        {
          heads_to_tie_.clear ();
        }
-      
-      for (int i = 0; i<  ties_.size (); i++)
+
+      for (int i = 0; i< ties_.size (); i++)
        {
          typeset_tie (ties_[i]);
        }
@@ -171,23 +168,22 @@ Tie_engraver::stop_translation_timestep ()
       ties_.clear ();
       tie_column_ = 0;
     }
-  
+
   if (event_)
     {
       SCM start_definition
        = updated_grob_properties (context (), ly_symbol2scm ("Tie"));
 
       if (!to_boolean (get_property ("tieWaitForNote")))
-       heads_to_tie_.clear();
+       heads_to_tie_.clear ();
 
-      for  (int i = 0; i < now_heads_.size(); i++)
+      for (int i = 0; i < now_heads_.size (); i++)
        {
          heads_to_tie_.push (Head_event_tuple (now_heads_[i], event_,
-                                               start_definition
-                                               ));
-       }      
+                                               start_definition));
+       }
     }
-  
+
   event_ = 0;
   now_heads_.clear ();
 }
@@ -201,22 +197,23 @@ Tie_engraver::typeset_tie (Grob *her)
   Direction d = LEFT;
   Drul_array<Grob *> 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);
+  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_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 ());
 
 }
 
-
 ADD_TRANSLATOR (Tie_engraver,
-/* descr */       "Generate ties between noteheads of equal pitch.",
-/* creats*/       "Tie TieColumn",
-/* accepts */     "tie-event",
-/* acks  */      "rhythmic-head-interface",
-/* reads */       "tieMelismaBusy",
-/* write */       "");
+               /* descr */ "Generate ties between noteheads of equal pitch.",
+               /* creats*/ "Tie TieColumn",
+               /* accepts */ "tie-event",
+               /* acks  */ "rhythmic-head-interface",
+               /* reads */ "tieMelismaBusy",
+               /* write */ "");