(print): robustify.

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

diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc
index f1bf4c6383a753ded309ddfe0f99133146490c7e..a18647b0da26dee02f7a4aa486f5c17ce5b45f9f 100644 (file)
--- a/lily/break-align-engraver.cc
+++ b/lily/break-align-engraver.cc
@@ -12,19 +12,20 @@
 #include "item.hh"
 #include "align-interface.hh"
 #include "axis-group-interface.hh"
-
+#include "context.hh"
+#include "translator-group.hh"
 
 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:
@@ -36,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_; gh_pair_p (p); p = ly_cdr (p))
+  for (SCM p = column_alist_; ly_c_pair_p (p); p = ly_cdr (p))
     {
       SCM pair = ly_car (p);
       add_column (ly_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;
 }
 
 
@@ -75,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)
 {
@@ -92,21 +85,22 @@ Break_align_engraver::acknowledge_grob (Grob_info inf)
        return ;
 
       SCM align_name = item->get_property ("break-align-symbol");
-      if (!gh_symbol_p (align_name))
+      if (!scm_is_symbol (align_name))
        return ;
 
       if (!align_)
        {
-         align_ = make_item ("BreakAlignment");
+         align_ = make_item ("BreakAlignment", SCM_EOL);
 
-         announce_grob (align_, SCM_EOL);
+         
 
          Context*origin = inf.origin_contexts (this)[0];
-         left_edge_ =  make_item_from_properties (origin,
-                                                  ly_symbol2scm ("LeftEdge"));
+         left_edge_ =  make_item_from_properties (origin->implementation (),
+                                                  ly_symbol2scm ("LeftEdge"),
+                                                  SCM_EOL
+                                                  );
          add_to_group (left_edge_->get_property ("break-align-symbol"),
                        left_edge_);
-         announce_grob (left_edge_, SCM_EOL);
        }
       
       add_to_group (align_name, item);
@@ -126,11 +120,10 @@ Break_align_engraver::add_to_group (SCM align_name, Item*item)
     }
   else
     {
-      group = make_item ("BreakAlignGroup");
+      group = make_item ("BreakAlignGroup", item->self_scm () );
 
       group->set_property ("break-align-symbol", align_name);
       group->set_parent (align_, Y_AXIS);
-      announce_grob (group, item->self_scm ());
          
       column_alist_ = scm_assoc_set_x (column_alist_, align_name, group->self_scm ());