(Introduction): new node.

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

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 4e1a45d1801db680967ddcb0a0700f589127e865..3aeda39292aa51167cf4059c8025fce1499c76d2 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -14,7 +14,7 @@
 #include "item.hh"
 #include "moment.hh"
 #include "engraver.hh"
-#include "translator-group.hh"
+#include "context.hh"
 
 /*
   
@@ -34,7 +34,7 @@ protected:
   virtual void acknowledge_grob (Grob_info);
   virtual void process_music ();
   void create_items ();
-  TRANSLATOR_DECLARATIONS(  Bar_number_engraver );
+  TRANSLATOR_DECLARATIONS (Bar_number_engraver );
 };
 
 
@@ -54,11 +54,12 @@ Bar_number_engraver::process_music ()
        {
          SCM bn = get_property ("currentBarNumber");
          SCM proc = get_property ("barNumberVisibility");
-         if (gh_number_p (bn) && to_boolean(gh_call1(proc, bn)))
+         if (gh_number_p (bn) && gh_procedure_p (proc)
+             && to_boolean (gh_call1(proc, bn)))
            {
              create_items ();
              // guh.
-             text_->set_grob_property
+             text_->set_property
                ("text", scm_makfrom0str (to_string (gh_scm2int (bn)).to_str0 ()));
            }
        }
@@ -80,7 +81,7 @@ Bar_number_engraver::acknowledge_grob (Grob_info inf)
   Grob * s = inf.grob_;
   if (text_
       && dynamic_cast<Item*> (s)
-      && s->get_grob_property ("break-align-symbol") == ly_symbol2scm ("left-edge"))
+      && s->get_property ("break-align-symbol") == ly_symbol2scm ("left-edge"))
     {
       /*
        By default this would land on the Paper_column -- so why
@@ -94,7 +95,7 @@ Bar_number_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
-      text_->set_grob_property ("side-support-elements", get_property ("stavesFound"));
+      text_->set_property ("side-support-elements", get_property ("stavesFound"));
       typeset_grob (text_);
       text_ =0;
     }
@@ -107,14 +108,13 @@ Bar_number_engraver::create_items ()
   if (text_)
     return;
 
-  SCM b = get_property ("BarNumber");
-  text_ = new Item (b);
+  text_ = make_item ("BarNumber");
   Side_position_interface::set_axis (text_,Y_AXIS);
 
-  announce_grob(text_, SCM_EOL);
+  announce_grob (text_, SCM_EOL);
 }
 
-ENTER_DESCRIPTION(Bar_number_engraver,
+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.",
 /* creats*/       "BarNumber",