* scm/page-layout.scm (default-page-make-stencil): only add header

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

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 96e4afb2e75d2b874f39e1747fbec36b57c70549..4e9cc302f7a377abeba125440cc99372eb1e8c9f 100644 (file)
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -3,57 +3,49 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
-#include "lily-guile.hh"
 #include "paper-column.hh"
 #include "output-def.hh"
 #include "side-position-interface.hh"
-#include "item.hh"
-#include "moment.hh"
 #include "engraver.hh"
 #include "context.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.
-
+  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 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 (scm_is_string (wb))
     {
-      Moment mp (robust_scm2moment (get_property ("measurePosition"),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 (scm_is_number (bn) && ly_c_procedure_p (proc)
-             && to_boolean (scm_call_1(proc, bn)))
+             && to_boolean (scm_call_1 (proc, bn)))
            {
              create_items ();
              // guh.
@@ -62,23 +54,19 @@ Bar_number_engraver::process_music ()
            }
        }
     }
-
 }
 
-
-
 Bar_number_engraver::Bar_number_engraver ()
 {
-  text_ =0;
+  text_ = 0;
 }
 
-                                              
 void
 Bar_number_engraver::acknowledge_grob (Grob_info inf)
 {
-  Grob * s = inf.grob_;
+  Grob *s = inf.grob_;
   if (text_
-      && dynamic_cast<Item*> (s)
+      && dynamic_cast<Item *> (s)
       && s->get_property ("break-align-symbol") == ly_symbol2scm ("left-edge"))
     {
       /*
@@ -88,18 +76,17 @@ Bar_number_engraver::acknowledge_grob (Grob_info inf)
     }
 }
 
-void 
+void
 Bar_number_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
       text_->set_property ("side-support-elements", get_property ("stavesFound"));
-      
-      text_ =0;
+
+      text_ = 0;
     }
 }
 
-
 void
 Bar_number_engraver::create_items ()
 {
@@ -107,18 +94,17 @@ Bar_number_engraver::create_items ()
     return;
 
   text_ = make_item ("BarNumber", SCM_EOL);
-  Side_position_interface::set_axis (text_,Y_AXIS);
+  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_TRANSLATOR (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 */ "");