* scm/define-context-properties.scm

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

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 2d519a7f65a11013d8319cdbe48bbbdc304a4fa1..e62d814c96f0353cdd3585bf3d4852e4993692f2 100644 (file)
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -22,7 +22,7 @@
 class Bar_engraver : public Engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(  Bar_engraver );
+  TRANSLATOR_DECLARATIONS (Bar_engraver);
   void request_bar (String type_string);
     
 protected:
@@ -47,12 +47,10 @@ Bar_engraver::create_bar ()
 {
   if (!bar_)
     {
-      bar_ = make_item ("BarLine");
+      bar_ = make_item ("BarLine", SCM_EOL);
       SCM gl = get_property ("whichBar");
-      if (scm_equal_p (gl, bar_->get_grob_property ("glyph")) != SCM_BOOL_T)
-         bar_->set_grob_property ("glyph", gl);
-      
-      announce_grob(bar_, SCM_EOL);
+      if (scm_equal_p (gl, bar_->get_property ("glyph")) != SCM_BOOL_T)
+         bar_->set_property ("glyph", gl);
     }
 }
 
@@ -69,7 +67,7 @@ Bar_engraver::finalize ()
   This is a little hairy : whichBar may be set by
   Repeat_acknowledge_engraver::process_music, which is at score
   context. This means that grobs could should be created after
-  process_music. We do stuff process_acknowledged_grobs(), just to be
+  process_music. We do stuff process_acknowledged_grobs (), just to be
   on the safe side.
      
 */
@@ -77,20 +75,14 @@ Bar_engraver::finalize ()
 void
 Bar_engraver::process_acknowledged_grobs ()
 {
-  if (!bar_ && gh_string_p (get_property ("whichBar")))
-    {
-      create_bar ();
-    }
+  if (!bar_ && ly_c_string_p (get_property ("whichBar")))
+    create_bar ();
 }
 
 void
 Bar_engraver::typeset_bar ()
 {
-  if (bar_) 
-    {
-      typeset_grob (bar_);
-      bar_ =0;
-    }
+  bar_ = 0;
 }
 
 /*
@@ -100,15 +92,14 @@ void
 Bar_engraver::stop_translation_timestep ()
 {
   if (!bar_)
-    {
-      get_score_engraver ()->forbid_breaks (); // guh. Use properties!
-    }
+    /* guh. Use properties! */
+    get_score_engraver ()->forbid_breaks ();
   else
     typeset_bar ();
 }
 
 
-ENTER_DESCRIPTION(Bar_engraver,
+ENTER_DESCRIPTION (Bar_engraver,
 /* descr */       "Create barlines. This engraver is controlled through the "
 "@code{whichBar} property. If it has no bar line to create, it will forbid a linebreak at this point",
 /* creats*/       "BarLine",