Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 1b621c5382c60850552a8356756057dbc34e9a83..9f2396504248255304a885ac9d6773718798dfa6 100644 (file)
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -3,85 +3,78 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
-#include "lily-guile.hh"
 #include "paper-column.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "side-position-interface.hh"
-#include "item.hh"
-#include "moment.hh"
 #include "engraver.hh"
 #include "context.hh"
+#include "grob-array.hh"
 
-/*
-  
-TODO: detect the top staff (stavesFound), and acknowledge staff-group
-system-start-delims. If we find these, and the top staff is in the
-staff-group, add padding to the bar number.
+#include "translator.icc"
 
+/*
+  TODO: detect the top staff (stavesFound), and acknowledge staff-group
+  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:
-  Item* text_;
+  Item *text_;
 protected:
-  virtual void stop_translation_timestep ();
-  virtual void acknowledge_grob (Grob_info);
-  virtual void process_music ();
+  void stop_translation_timestep ();
+  DECLARE_ACKNOWLEDGER (break_aligned);
+  DECLARE_ACKNOWLEDGER (break_alignment);
+  void process_music ();
   void create_items ();
-  TRANSLATOR_DECLARATIONS (Bar_number_engraver );
+  TRANSLATOR_DECLARATIONS (Bar_number_engraver);
 };
 
-
 void
 Bar_number_engraver::process_music ()
 {
-  // todo include (&&!time->cadenza_b_)
-
   SCM wb = get_property ("whichBar");
-  
-  if (ly_c_string_p (wb))
+
+  if (scm_is_string (wb))
     {
-      SCM smp = get_property ("measurePosition");
-      
-      Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
+      Moment mp (robust_scm2moment (get_property ("measurePosition"), Moment (0)));
       if (mp.main_part_ == Rational (0))
        {
          SCM bn = get_property ("currentBarNumber");
          SCM proc = get_property ("barNumberVisibility");
-         if (ly_c_number_p (bn) && ly_c_procedure_p (proc)
-             && to_boolean (scm_call_1(proc, bn)))
+         if (scm_is_number (bn) && ly_is_procedure (proc)
+             && to_boolean (scm_call_1 (proc, bn)))
            {
              create_items ();
              // guh.
              text_->set_property
-               ("text", scm_makfrom0str (to_string (ly_scm2int (bn)).to_str0 ()));
+               ("text", scm_number_to_string (bn, scm_from_int (10)));
            }
        }
     }
-
 }
 
-
-
 Bar_number_engraver::Bar_number_engraver ()
 {
-  text_ =0;
+  text_ = 0;
 }
 
-                                              
+
+/*
+  see rehearsal mark comments.
+ */
 void
-Bar_number_engraver::acknowledge_grob (Grob_info inf)
+Bar_number_engraver::acknowledge_break_aligned (Grob_info inf)
 {
-  Grob * s = inf.grob_;
+  Grob *s = inf.grob ();
   if (text_
-      && dynamic_cast<Item*> (s)
-      && s->get_property ("break-align-symbol") == ly_symbol2scm ("left-edge"))
+      && !text_->get_parent (X_AXIS)
+      && dynamic_cast<Item *> (s)
+      && (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
@@ -90,17 +83,23 @@ Bar_number_engraver::acknowledge_grob (Grob_info inf)
     }
 }
 
-void 
-Bar_number_engraver::stop_translation_timestep ()
+
+void
+Bar_number_engraver::acknowledge_break_alignment (Grob_info inf)
 {
-  if (text_)
+  Grob *s = inf.grob ();
+  if (text_
+      && dynamic_cast<Item *> (s))
     {
-      text_->set_property ("side-support-elements", get_property ("stavesFound"));
-      typeset_grob (text_);
-      text_ =0;
+      text_->set_parent (s, X_AXIS);
     }
 }
 
+void
+Bar_number_engraver::stop_translation_timestep ()
+{
+  text_ = 0;
+}
 
 void
 Bar_number_engraver::create_items ()
@@ -109,18 +108,24 @@ Bar_number_engraver::create_items ()
     return;
 
   text_ = make_item ("BarNumber", SCM_EOL);
-  Side_position_interface::set_axis (text_,Y_AXIS);
 }
 
-ENTER_DESCRIPTION (Bar_number_engraver,
-/* descr */       "A bar number is created whenever measurePosition is zero. 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}}. "
-                  ,
-                  
-/* creats*/       "BarNumber",
-/* accepts */     "",
-/* acks  */      "break-aligned-interface",
-/* reads */       "currentBarNumber stavesFound barNumberVisibility" ,
-/* write */       "");
+
+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 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",
+               /* read */
+               "currentBarNumber "
+               "whichBar "
+               "stavesFound "
+               "barNumberVisibility ",
+               /* write */ "");