X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fbreak-align-engraver.cc;h=2897a1aaa8b570998a9f6e00e975d9266fc5fe7a;hb=b7f005cbf2757c8c1d3383a0ccc935cf5e3c2e38;hp=49ea7ca788f0d7cd5a442354548f8f67003c23a3;hpb=c659cb200486c2f908703696a1b2873e78c8160a;p=lilypond.git

diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc
index 49ea7ca788..2897a1aaa8 100644
--- a/lily/break-align-engraver.cc
+++ b/lily/break-align-engraver.cc
@@ -1,11 +1,10 @@
-/*   
-  break-align-engraver.cc --  implement Break_align_engraver
-  
+/*
+  break-align-engraver.cc -- implement Break_align_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
 #include "engraver.hh"
 #include "protected-scm.hh"
 #include "break-align-interface.hh"
@@ -20,13 +19,13 @@ class Break_align_engraver : public Engraver
   SCM column_alist_;
   Item *left_edge_;
 
-  void add_to_group (SCM,Item*);
+  void add_to_group (SCM, Item *);
 protected:
   virtual void acknowledge_grob (Grob_info i);
   virtual void stop_translation_timestep ();
   virtual void derived_mark () const;
   void add_column (SCM);
-  
+
 public:
   TRANSLATOR_DECLARATIONS (Break_align_engraver);
 };
@@ -34,9 +33,8 @@ public:
 void
 Break_align_engraver::add_column (SCM smob)
 {
-  Grob * e = unsmob_grob (smob);
-  Break_align_interface::add_element (align_,e);
-  
+  Grob *e = unsmob_grob (smob);
+  Break_align_interface::add_element (align_, e);
 }
 
 void
@@ -53,7 +51,6 @@ Break_align_engraver::stop_translation_timestep ()
   left_edge_ = 0;
 }
 
-
 Break_align_engraver::Break_align_engraver ()
 {
   column_alist_ = SCM_EOL;
@@ -70,71 +67,69 @@ Break_align_engraver::derived_mark () const
 void
 Break_align_engraver::acknowledge_grob (Grob_info inf)
 {
-  if (Item * item = dynamic_cast <Item *> (inf.grob_))
+  if (Item *item = dynamic_cast<Item *> (inf.grob ()))
     {
       /*
 	Removed check for item->empty (X_AXIS). --hwn 20/1/04
-       */
+      */
       if (item->get_parent (X_AXIS))
 	return;
 
-      SCM bp=item->get_property ("breakable");
+      SCM bp = item->get_property ("breakable");
       bool breakable = (to_boolean (bp));
       if (!breakable)
-	return ;
+	return;
 
       SCM align_name = item->get_property ("break-align-symbol");
       if (!scm_is_symbol (align_name))
-	return ;
+	return;
 
       if (!align_)
 	{
 	  align_ = make_item ("BreakAlignment", SCM_EOL);
 
-	  Context*origin = inf.origin_contexts (this)[0];
-	  left_edge_ = make_item_from_properties (dynamic_cast<Engraver*> (origin->implementation ()),
+	  Context *origin = inf.origin_contexts (this)[0];
+	  left_edge_ = make_item_from_properties (dynamic_cast<Engraver *> (origin->implementation ()),
 						  ly_symbol2scm ("LeftEdge"),
 						  SCM_EOL,
 						  "LeftEdge");
 	  add_to_group (left_edge_->get_property ("break-align-symbol"),
 			left_edge_);
 	}
-      
+
       add_to_group (align_name, item);
     }
 }
 
 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;
+  Item *group = 0;
 
   if (s != SCM_BOOL_F)
     {
-      Grob *e =  unsmob_grob (scm_cdr (s));
-      group = dynamic_cast<Item*> (e);
+      Grob *e = unsmob_grob (scm_cdr (s));
+      group = dynamic_cast<Item *> (e);
     }
   else
     {
-      group = make_item ("BreakAlignGroup", item->self_scm () );
+      group = make_item ("BreakAlignGroup", item->self_scm ());
 
       group->set_property ("break-align-symbol", align_name);
       group->set_parent (align_, Y_AXIS);
-	  
-      column_alist_ = scm_assoc_set_x (column_alist_, align_name, group->self_scm ());
 
+      column_alist_ = scm_assoc_set_x (column_alist_, align_name, group->self_scm ());
     }
   Axis_group_interface::add_element (group, item);
 }
 
-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 */       "");
+ADD_TRANSLATOR (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 */ "");