* scm/output-tex.scm (text): remove debugging code.

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

diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc
index 91db57ae33473afe68879fd4700fe704e977428b..f1bf4c6383a753ded309ddfe0f99133146490c7e 100644 (file)
--- a/lily/break-align-engraver.cc
+++ b/lily/break-align-engraver.cc
@@ -28,7 +28,7 @@ protected:
   void add_column (SCM);
   
 public:
-  TRANSLATOR_DECLARATIONS(Break_align_engraver);
+  TRANSLATOR_DECLARATIONS (Break_align_engraver);
 };
 
 void
@@ -48,24 +48,11 @@ Break_align_engraver::finalize ()
 void
 Break_align_engraver::stop_translation_timestep ()
 {
-  SCM order = get_property ("breakAlignOrder");
-  for (; gh_pair_p (order); order = ly_cdr (order))
-    {
-      SCM p = scm_assoc (ly_car (order), column_alist_);
-      if (gh_pair_p (p))
-       {
-         add_column (ly_cdr (p));
-         column_alist_ = scm_assoc_remove_x (column_alist_, ly_car (order));
-       }
-    }
-
   for (SCM p = column_alist_; gh_pair_p (p); p = ly_cdr (p))
     {
       SCM pair = ly_car (p);
       add_column (ly_cdr (pair));
     }
-
-  
   column_alist_ = SCM_EOL;
 
   if (align_)
@@ -99,12 +86,12 @@ Break_align_engraver::acknowledge_grob (Grob_info inf)
       if (item->get_parent (X_AXIS))
        return;
 
-      SCM bp=item->get_grob_property ("breakable");
+      SCM bp=item->get_property ("breakable");
       bool breakable = (to_boolean (bp));
       if (!breakable)
        return ;
 
-      SCM align_name = item->get_grob_property ("break-align-symbol");
+      SCM align_name = item->get_property ("break-align-symbol");
       if (!gh_symbol_p (align_name))
        return ;
 
@@ -114,9 +101,12 @@ Break_align_engraver::acknowledge_grob (Grob_info inf)
 
          announce_grob (align_, SCM_EOL);
 
-         left_edge_ = make_item ("LeftEdge");
-         add_to_group (left_edge_->get_grob_property ("break-align-symbol"), left_edge_);
-         announce_grob(left_edge_, SCM_EOL);
+         Context*origin = inf.origin_contexts (this)[0];
+         left_edge_ =  make_item_from_properties (origin,
+                                                  ly_symbol2scm ("LeftEdge"));
+         add_to_group (left_edge_->get_property ("break-align-symbol"),
+                       left_edge_);
+         announce_grob (left_edge_, SCM_EOL);
        }
       
       add_to_group (align_name, item);
@@ -124,7 +114,7 @@ Break_align_engraver::acknowledge_grob (Grob_info inf)
 }
 
 void
-Break_align_engraver::add_to_group(SCM align_name, Item*item)
+Break_align_engraver::add_to_group (SCM align_name, Item*item)
 {
   SCM s = scm_assoc (align_name, column_alist_);
   Item * group = 0;
@@ -138,9 +128,9 @@ Break_align_engraver::add_to_group(SCM align_name, Item*item)
     {
       group = make_item ("BreakAlignGroup");
 
-      group->set_grob_property ("break-align-symbol", align_name);
+      group->set_property ("break-align-symbol", align_name);
       group->set_parent (align_, Y_AXIS);
-      announce_grob(group, item->self_scm());
+      announce_grob (group, item->self_scm ());
          
       column_alist_ = scm_assoc_set_x (column_alist_, align_name, group->self_scm ());
 
@@ -148,10 +138,13 @@ Break_align_engraver::add_to_group(SCM align_name, Item*item)
   Axis_group_interface::add_element (group, item);
 }
 
-ENTER_DESCRIPTION(Break_align_engraver,
-/* descr */       "Align grobs with corresponding break-align-symbols into groups, and order the groups according to breakAlignOrder",
-/* creats*/       "BreakAlignment BreakAlignGroup LeftEdge",
-/* accepts */     "",
-/* acks  */       "break-aligned-interface"
-,/* reads */       "breakAlignOrder",
-/* write */       "");
+ENTER_DESCRIPTION (Break_align_engraver,
+                  "Align grobs with corresponding @code{break-align-symbols} into "
+                  "groups, and order the groups according to @code{breakAlignOrder}. "
+                  "The left edge of the alignment gets a separate group, with a symbol @code{left-edge}. "
+                  ,
+                  /* creats*/       "BreakAlignment BreakAlignGroup LeftEdge",
+                  /* accepts */     "",
+                  /* acks  */       "break-aligned-interface",
+                  /* reads */       "",
+                  /* write */       "");