Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc
index 3ee7489568c5ff4da82f16ba72686be73092a9a5..e6a7935c568c5283aeed26671cf39a7b1ec39c73 100644 (file)
--- a/lily/break-align-engraver.cc
+++ b/lily/break-align-engraver.cc
@@ -1,60 +1,44 @@
-/*   
-  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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 #include "engraver.hh"
 #include "protected-scm.hh"
 #include "break-align-interface.hh"
-#include "item.hh"
 #include "align-interface.hh"
 #include "axis-group-interface.hh"
 #include "context.hh"
 #include "translator-group.hh"
 
+#include "translator.icc"
+
 class Break_align_engraver : public Engraver
 {
   Item *align_;
-SCM column_alist_;
+  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 ();
+  void stop_translation_timestep ();
   virtual void derived_mark () const;
-  void add_column (SCM);
-  
 public:
   TRANSLATOR_DECLARATIONS (Break_align_engraver);
+  DECLARE_ACKNOWLEDGER (break_aligned);
 };
 
-void
-Break_align_engraver::add_column (SCM smob)
-{
-  Grob * e = unsmob_grob (smob);
-  Break_align_interface::add_element (align_,e);
-  
-}
-
 void
 Break_align_engraver::stop_translation_timestep ()
 {
-  for (SCM p = column_alist_; scm_is_pair (p); p = scm_cdr (p))
-    {
-      SCM pair = scm_car (p);
-      add_column (scm_cdr (pair));
-    }
   column_alist_ = SCM_EOL;
 
   align_ = 0;
   left_edge_ = 0;
 }
 
-
 Break_align_engraver::Break_align_engraver ()
 {
   column_alist_ = SCM_EOL;
@@ -69,75 +53,77 @@ Break_align_engraver::derived_mark () const
 }
 
 void
-Break_align_engraver::acknowledge_grob (Grob_info inf)
+Break_align_engraver::acknowledge_break_aligned (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");
-      bool breakable = (to_boolean (bp));
-      if (!breakable)
-       return ;
+      if (!Item::is_non_musical (item))
+       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];
 
-         Context*origin = inf.origin_contexts (this)[0];
-         left_edge_ =  make_item_from_properties (origin->implementation (),
-                                                  ly_symbol2scm ("LeftEdge"),
-                                                  SCM_EOL
-                                                  );
+         Translator_group *tg = origin->implementation ();
+         Engraver *random_source = dynamic_cast<Engraver *> (unsmob_translator (scm_car (tg->get_simple_trans_list ())));
+
+         /*
+           Make left edge appear to come from same context as clef/bar-line etc.
+         */
+         left_edge_ = make_item_from_properties (random_source,
+                                                 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 ());
 
+      Break_align_interface::add_element (align_, group);
     }
   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_ACKNOWLEDGER (Break_align_engraver, break_aligned);
+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}. ",
+               /* create */ "BreakAlignment BreakAlignGroup LeftEdge",
+               /* accept */ "",
+               /* read */ "",
+               /* write */ "");