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 2363fdded0c4210931ca2a5f003ef23501470434..e6a7935c568c5283aeed26671cf39a7b1ec39c73 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--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 #include "engraver.hh"
 #include "protected-scm.hh"
@@ -23,12 +23,11 @@ class Break_align_engraver : public Engraver
 
   void add_to_group (SCM, Item *);
 protected:
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
+  void stop_translation_timestep ();
   virtual void derived_mark () const;
 public:
   TRANSLATOR_DECLARATIONS (Break_align_engraver);
-  DECLARE_ACKNOWLEDGER(break_aligned);
-
+  DECLARE_ACKNOWLEDGER (break_aligned);
 };
 
 void
@@ -64,27 +63,25 @@ Break_align_engraver::acknowledge_break_aligned (Grob_info inf)
       if (item->get_parent (X_AXIS))
        return;
 
-      SCM bp = item->get_property ("breakable");
-      bool breakable = (to_boolean (bp));
-      if (!breakable)
+      if (!Item::is_non_musical (item))
        return;
 
       SCM align_name = item->get_property ("break-align-symbol");
       if (!scm_is_symbol (align_name))
        return;
-
+         
       if (!align_)
        {
          align_ = make_item ("BreakAlignment", SCM_EOL);
 
          Context *origin = inf.origin_contexts (this)[0];
 
-         Translator_group *tg = origin ->implementation ();
-         Engraver *random_source =  dynamic_cast<Engraver*> (unsmob_translator (scm_car (tg->get_simple_trans_list ())));
+         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,
@@ -121,13 +118,12 @@ Break_align_engraver::add_to_group (SCM align_name, Item *item)
     }
   Axis_group_interface::add_element (group, item);
 }
-ADD_ACKNOWLEDGER(Break_align_engraver, break_aligned);
+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}. ",
-               /* creats*/ "BreakAlignment BreakAlignGroup LeftEdge",
-               /* accepts */ "",
-               /* acks  */ "",
-               /* reads */ "",
+               /* create */ "BreakAlignment BreakAlignGroup LeftEdge",
+               /* accept */ "",
+               /* read */ "",
                /* write */ "");