X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-engraver.cc;h=fb39ae4955c5f301f141bc32b527362cfa74b759;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=badd058e5446d3e99aeed0a45c48909e1e4d3b91;hpb=1c846b2c2348b4e0ca4a3c2e8fb267047ba2d203;p=lilypond.git

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index badd058e54..fb39ae4955 100644
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -18,7 +18,6 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "bar-line.hh"
 #include "context.hh"
 #include "score-engraver.hh"
 #include "warn.hh"
@@ -34,22 +33,22 @@ class Bar_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Bar_engraver);
-  void request_bar (string type_string);
 
 protected:
   void stop_translation_timestep ();
   void process_acknowledged ();
 
-  DECLARE_END_ACKNOWLEDGER (spanner);
+  void acknowledge_end_spanner (Grob_info);
 
 private:
   void create_bar ();
 
   Item *bar_;
-  vector<Spanner*> spanners_;
+  vector<Spanner *> spanners_;
 };
 
-Bar_engraver::Bar_engraver ()
+Bar_engraver::Bar_engraver (Context *c)
+  : Engraver (c)
 {
   bar_ = 0;
 }
@@ -61,8 +60,8 @@ Bar_engraver::create_bar ()
     {
       bar_ = make_item ("BarLine", SCM_EOL);
       SCM gl = get_property ("whichBar");
-      if (scm_equal_p (gl, bar_->get_property ("glyph")) != SCM_BOOL_T)
-	bar_->set_property ("glyph", gl);
+      if (!ly_is_equal (gl, bar_->get_property ("glyph")))
+        bar_->set_property ("glyph", gl);
     }
 }
 
@@ -107,23 +106,30 @@ Bar_engraver::acknowledge_end_spanner (Grob_info gi)
   Grob *g = gi.grob ();
 
   if (to_boolean (g->get_property ("to-barline")))
-    spanners_.push_back (dynamic_cast<Spanner*> (g));
+    spanners_.push_back (dynamic_cast<Spanner *> (g));
 }
 
-ADD_END_ACKNOWLEDGER (Bar_engraver, spanner);
 
-ADD_TRANSLATOR (Bar_engraver,
-		/* doc */
-		"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.",
-
-		/* create */
-		"BarLine ",
-
-		/* read */
-		"whichBar ",
+void
+Bar_engraver::boot ()
+{
+  ADD_END_ACKNOWLEDGER (Bar_engraver, spanner);
+}
 
-		/* write */
-		"forbidBreak "
-		);
+ADD_TRANSLATOR (Bar_engraver,
+                /* doc */
+                "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.  This engraver"
+                " is required to trigger the creation of clefs at the start"
+                " of systems.",
+
+                /* create */
+                "BarLine ",
+
+                /* read */
+                "whichBar ",
+
+                /* write */
+                "forbidBreak "
+               );