patch::: 1.3.33.jcn3

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

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 1dc6c18fafef76859e9896a9eb1fbe75235ad6b8..d835edbd09765ef3a809ab807ad9338f494218f9 100644 (file)
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997, 1998, 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -17,8 +17,6 @@
 #include "engraver-group-engraver.hh"
 #include "warn.hh"
 
-ADD_THIS_TRANSLATOR (Bar_engraver);
-
 Bar_engraver::Bar_engraver()
 {
   bar_p_ =0;
@@ -37,7 +35,7 @@ Bar_engraver::create_bar ()
       bar_p_->set_elt_property ("break-aligned", SCM_BOOL_T);
 
       // urg: "" != empty...
-      SCM default_type = get_property ("defaultBarType", 0);
+      SCM default_type = get_property ("defaultBarType");
       if (gh_string_p (default_type))
        {
          bar_p_->set_elt_property ("glyph", default_type); // gu.h
@@ -46,8 +44,12 @@ Bar_engraver::create_bar ()
 #if 0
       /*
        urg.  Why did I implement this? And did I implement this so
-       clumsily?  */
-      SCM prop = get_property ("barAtLineStart", 0);
+       clumsily?
+
+       input/test/just-friends.ly
+       Maybe a staffgroup of just one staff would be a better solution.
+      */
+      SCM prop = get_property ("barAtLineStart");
       if (to_boolean (prop))
        {
          bar_p_->set_elt_property ("at-line-start", SCM_BOOL_T);
@@ -67,7 +69,7 @@ Bar_engraver::request_bar (String requested_type)
 {
   if (!now_mom ())
     {
-      SCM prop = get_property ("barAtLineStart", 0);
+      SCM prop = get_property ("barAtLineStart");
       if (!to_boolean (prop))
        return;
     }
@@ -105,7 +107,7 @@ Bar_engraver::do_removal_processing ()
 }
 
 void
-Bar_engraver::do_process_requests()
+Bar_engraver::do_process_music()
 {  
   Translator * t = daddy_grav_l  ()->get_simple_translator ("Timing_engraver");
 
@@ -145,3 +147,7 @@ Bar_engraver::do_pre_move_processing()
     }
 }
 
+ADD_THIS_TRANSLATOR(Bar_engraver);
+
+
+