Merge with master

[lilypond.git] / lily / bar-number-engraver.cc

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 9279e16a6a0ae32ff468d6ad987ee5ba97f53a25..f53cfd6f269075b54109c39e6eebac3d27dbc48d 100644 (file)
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "paper-column.hh"
@@ -20,7 +20,6 @@
   system-start-delims. If we find these, and the top staff is in the
   staff-group, add padding to the bar number.
 */
-
 class Bar_number_engraver : public Engraver
 {
 protected:
@@ -28,6 +27,7 @@ protected:
 protected:
   void stop_translation_timestep ();
   DECLARE_ACKNOWLEDGER (break_aligned);
+  DECLARE_ACKNOWLEDGER (break_alignment);
   void process_music ();
   void create_items ();
   TRANSLATOR_DECLARATIONS (Bar_number_engraver);
@@ -64,13 +64,19 @@ Bar_number_engraver::Bar_number_engraver ()
   text_ = 0;
 }
 
+
+/*
+  see rehearsal mark comments.
+ */
 void
 Bar_number_engraver::acknowledge_break_aligned (Grob_info inf)
 {
   Grob *s = inf.grob ();
   if (text_
+      && !text_->get_parent (X_AXIS)
       && dynamic_cast<Item *> (s)
-      && s->get_property ("break-align-symbol") == ly_symbol2scm ("left-edge"))
+      && (s->get_property_data ("break-align-symbol")
+         == text_->get_property_data ("break-align-symbol")))
     {
       /*
        By default this would land on the Paper_column -- so why
@@ -79,6 +85,18 @@ Bar_number_engraver::acknowledge_break_aligned (Grob_info inf)
     }
 }
 
+
+void
+Bar_number_engraver::acknowledge_break_alignment (Grob_info inf)
+{
+  Grob *s = inf.grob ();
+  if (text_
+      && dynamic_cast<Item *> (s))
+    {
+      text_->set_parent (s, X_AXIS);
+    }
+}
+
 void
 Bar_number_engraver::stop_translation_timestep ()
 {
@@ -97,21 +115,24 @@ Bar_number_engraver::create_items ()
     return;
 
   text_ = make_item ("BarNumber", SCM_EOL);
-  Side_position_interface::set_axis (text_, Y_AXIS);
 }
 
+
+ADD_ACKNOWLEDGER(Bar_number_engraver,break_aligned);
+ADD_ACKNOWLEDGER(Bar_number_engraver,break_alignment);
+
 ADD_TRANSLATOR (Bar_number_engraver,
                /* doc */ "A bar number is created whenever measurePosition "
-               "is zero and there is a bar line. It is \n"
+               "is zero and when there is a bar line (ie. when @code{whichBar} is set. "
+               "It is \n"
                "put on top of all staves, and appears only at  left side of the staff. "
                "The staves are taken from @code{stavesFound}, which is maintained by "
                "@code{@ref{Staff_collecting_engraver}}. ",
 
                /* create */ "BarNumber",
-               /* accept */ "",
                /* read */
                "currentBarNumber "
                "whichBar "
                "stavesFound "
-               "barNumberVisibility",
+               "barNumberVisibility ",
                /* write */ "");