patch::: 1.3.54.hwn2

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

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 45636011c048182d9a6a30caeb9e3c49f678c9be..a70b89db352289ecb2c0d6b22417b4ead155e1b6 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>
 */
 
@@ -23,34 +23,24 @@ Bar_engraver::Bar_engraver()
   do_post_move_processing();
 }
 
-
-
-
 void
 Bar_engraver::create_bar ()
 {
   if (!bar_p_)
     {
       bar_p_ = new Staff_bar;
-      bar_p_->set_elt_property ("break-aligned", SCM_BOOL_T);
-
+      bar_p_->property_alist_ = get_property ("basicBarlineProperties");
+      
       // urg: "" != empty...
-      SCM default_type = get_property ("defaultBarType", 0);
+      /*
+       TODO: use symbol.
+       */
+      SCM default_type = get_property ("defaultBarType");
       if (gh_string_p (default_type))
        {
-         bar_p_->set_elt_property ("glyph", default_type); // gu.h
+         bar_p_->set_elt_property ("glyph", default_type); // ugh
        }
 
-#if 0
-      /*
-       urg.  Why did I implement this? And did I implement this so
-       clumsily?  */
-      SCM prop = get_property ("barAtLineStart", 0);
-      if (to_boolean (prop))
-       {
-         bar_p_->set_elt_property ("at-line-start", SCM_BOOL_T);
-       }
-#endif
       announce_element (Score_element_info (bar_p_, 0));
     }
 }
@@ -65,7 +55,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;
     }
@@ -103,7 +93,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");