Issue 5167/6: Changes: show \markup xxx = ... \etc assignments

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

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index b2594a2cb871a8f4b5cff207083e36b18245aaf3..fb39ae4955c5f301f141bc32b527362cfa74b759 100644 (file)
--- 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--2012 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
@@ -33,13 +33,12 @@ 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 ();
@@ -48,7 +47,8 @@ private:
   vector<Spanner *> spanners_;
 };
 
-Bar_engraver::Bar_engraver ()
+Bar_engraver::Bar_engraver (Context *c)
+  : Engraver (c)
 {
   bar_ = 0;
 }
@@ -60,7 +60,7 @@ 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)
+      if (!ly_is_equal (gl, bar_->get_property ("glyph")))
         bar_->set_property ("glyph", gl);
     }
 }
@@ -109,13 +109,20 @@ Bar_engraver::acknowledge_end_spanner (Grob_info gi)
     spanners_.push_back (dynamic_cast<Spanner *> (g));
 }
 
-ADD_END_ACKNOWLEDGER (Bar_engraver, spanner);
+
+void
+Bar_engraver::boot ()
+{
+  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.",
+                " 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 ",