* lily/include/lily-guile.hh: many new ly_ functions. Thanks to

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

diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc
index 864f01a5d58c0de5116ed5a2566306571fc9443c..66f893c79f0b62640fa571739d5e03208d8cef6c 100644 (file)
--- a/lily/break-align-engraver.cc
+++ b/lily/break-align-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "engraver.hh"
@@ -18,7 +18,7 @@ class Break_align_engraver : public Engraver
 {
   Item *align_;
   Protected_scm column_alist_;
-  Item *edge_;
+  Item *left_edge_;
 
   void add_to_group (SCM,Item*);
 protected:
@@ -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))
+  for (SCM p = column_alist_; ly_pair_p (p); p = ly_cdr (p))
     {
       SCM pair = ly_car (p);
       add_column (ly_cdr (pair));
     }
-
-  
   column_alist_ = SCM_EOL;
 
   if (align_)
@@ -73,10 +60,10 @@ Break_align_engraver::stop_translation_timestep ()
       typeset_grob (align_);
       align_ = 0;
     }
-  if (edge_)
+  if (left_edge_)
     {
-      typeset_grob (edge_);
-      edge_ = 0;
+      typeset_grob (left_edge_);
+      left_edge_ = 0;
     }
 }
 
@@ -84,7 +71,7 @@ Break_align_engraver::stop_translation_timestep ()
 Break_align_engraver::Break_align_engraver ()
 {
   column_alist_ = SCM_EOL;
-  edge_ = 0;
+  left_edge_ = 0;
   align_ = 0;
 }
 
@@ -93,27 +80,33 @@ Break_align_engraver::acknowledge_grob (Grob_info inf)
 {
   if (Item * item = dynamic_cast <Item *> (inf.grob_))
     {
-      if (item->empty_b (X_AXIS) || item->get_parent (X_AXIS))
+      /*
+       Removed check for item->empty (X_AXIS). --hwn 20/1/04
+       */
+      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");
-      if (!gh_symbol_p (align_name))
+      SCM align_name = item->get_property ("break-align-symbol");
+      if (!ly_symbol_p (align_name))
        return ;
 
       if (!align_)
        {
-         align_ = new Item (get_property ("BreakAlignment"));
+         align_ = make_item ("BreakAlignment");
 
          announce_grob (align_, SCM_EOL);
 
-         edge_ = new Item (get_property ("LeftEdge"));
-         add_to_group (edge_->get_grob_property ("break-align-symbol"), edge_);
-         announce_grob(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);
@@ -121,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;
@@ -133,11 +126,11 @@ Break_align_engraver::add_to_group(SCM align_name, Item*item)
     }
   else
     {
-      group = new Item (get_property ("BreakAlignGroup"));
+      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 ());
 
@@ -145,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 */       "");