*** empty log message ***

[lilypond.git] / lily / break-align-engraver.cc

diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc
index 08fc9d6ef11356947f25e91824aef6644d08f62e..53165f55d575d4618fec1f1b4f1d47c94954c5a9 100644 (file)
--- a/lily/break-align-engraver.cc
+++ b/lily/break-align-engraver.cc
@@ -18,14 +18,14 @@
 class Break_align_engraver : public Engraver
 {
   Item *align_;
-  Protected_scm column_alist_;
+  SCM column_alist_;
   Item *left_edge_;
 
   void add_to_group (SCM,Item*);
 protected:
-  virtual void finalize ();
   virtual void acknowledge_grob (Grob_info i);
   virtual void stop_translation_timestep ();
+  virtual void derived_mark () const;
   void add_column (SCM);
   
 public:
@@ -37,35 +37,21 @@ Break_align_engraver::add_column (SCM smob)
 {
   Grob * e = unsmob_grob (smob);
   Break_align_interface::add_element (align_,e);
-  typeset_grob (e);
-}
-
-void
-Break_align_engraver::finalize ()
-{
-  column_alist_ = SCM_EOL;
+  
 }
 
 void
 Break_align_engraver::stop_translation_timestep ()
 {
-  for (SCM p = column_alist_; ly_c_pair_p (p); p = ly_cdr (p))
+  for (SCM p = column_alist_; scm_is_pair (p); p = scm_cdr (p))
     {
-      SCM pair = ly_car (p);
-      add_column (ly_cdr (pair));
+      SCM pair = scm_car (p);
+      add_column (scm_cdr (pair));
     }
   column_alist_ = SCM_EOL;
 
-  if (align_)
-    {
-      typeset_grob (align_);
-      align_ = 0;
-    }
-  if (left_edge_)
-    {
-      typeset_grob (left_edge_);
-      left_edge_ = 0;
-    }
+  align_ = 0;
+  left_edge_ = 0;
 }
 
 
@@ -76,6 +62,12 @@ Break_align_engraver::Break_align_engraver ()
   align_ = 0;
 }
 
+void
+Break_align_engraver::derived_mark () const
+{
+  scm_gc_mark (column_alist_);
+}
+
 void
 Break_align_engraver::acknowledge_grob (Grob_info inf)
 {
@@ -93,7 +85,7 @@ Break_align_engraver::acknowledge_grob (Grob_info inf)
        return ;
 
       SCM align_name = item->get_property ("break-align-symbol");
-      if (!ly_c_symbol_p (align_name))
+      if (!scm_is_symbol (align_name))
        return ;
 
       if (!align_)
@@ -123,7 +115,7 @@ Break_align_engraver::add_to_group (SCM align_name, Item*item)
 
   if (s != SCM_BOOL_F)
     {
-      Grob *e =  unsmob_grob (ly_cdr (s));
+      Grob *e =  unsmob_grob (scm_cdr (s));
       group = dynamic_cast<Item*> (e);
     }
   else