Issue 4550 (1/2) Avoid "using namespace std;" in included files

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

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 8a75d25619a2d0f017b6f7a21f0e2e030cccc801..cab5e6ee1620512adc6a4ad828854b5965dbd63b 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--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"
@@ -27,6 +26,8 @@
 
 #include "translator.icc"
 
+using std::vector;
+
 /*
   generate bars. Either user ("|:"), or default (new measure)
 */
@@ -34,7 +35,6 @@ class Bar_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Bar_engraver);
-  void request_bar (string type_string);
 
 protected:
   void stop_translation_timestep ();
@@ -61,7 +61,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);
     }
 }
@@ -116,7 +116,9 @@ 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 ",