send_stream_event(...); macro should only produce one statement

[lilypond.git] / lily / system-start-delimiter-engraver.cc

diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc
index ebc77e86ba0b17c24fc7d3b5903cf3e5ea64d51e..7d9ce8d47dbda8b90004e8c9b48bb422f48b6138 100644 (file)
--- a/lily/system-start-delimiter-engraver.cc
+++ b/lily/system-start-delimiter-engraver.cc
@@ -26,6 +26,10 @@
 #include "staff-symbol.hh"
 #include "system-start-delimiter.hh"
 
+#include "translator.icc"
+
+using std::vector;
+
 struct Bracket_nesting_node
 {
 public:
@@ -132,10 +136,10 @@ Bracket_nesting_group::from_list (SCM x)
           node->from_list (entry);
           children_.push_back (node);
         }
-      else if (entry == ly_symbol2scm ("SystemStartBrace")
-               || entry == ly_symbol2scm ("SystemStartBracket")
-               || entry == ly_symbol2scm ("SystemStartBar")
-               || entry == ly_symbol2scm ("SystemStartSquare"))
+      else if (scm_is_eq (entry, ly_symbol2scm ("SystemStartBrace"))
+               || scm_is_eq (entry, ly_symbol2scm ("SystemStartBracket"))
+               || scm_is_eq (entry, ly_symbol2scm ("SystemStartBar"))
+               || scm_is_eq (entry, ly_symbol2scm ("SystemStartSquare")))
         symbol_ = entry;
       else
         children_.push_back (new Bracket_nesting_staff (0));
@@ -191,7 +195,7 @@ System_start_delimiter_engraver::process_music ()
       nesting_->from_list (hierarchy);
       nesting_->create_grobs (this, delimiter_name);
       nesting_->set_bound (LEFT,
-                           Grob::unsmob (get_property ("currentCommandColumn")));
+                           unsmob<Grob> (get_property ("currentCommandColumn")));
     }
 }
 
@@ -201,7 +205,7 @@ System_start_delimiter_engraver::finalize ()
   if (nesting_)
     {
       nesting_->set_bound (RIGHT,
-                           Grob::unsmob (get_property ("currentCommandColumn")));
+                           unsmob<Grob> (get_property ("currentCommandColumn")));
       nesting_->set_nesting_support (0);
 
       delete nesting_;
@@ -227,8 +231,6 @@ System_start_delimiter_engraver::acknowledge_system_start_delimiter (Grob_info i
   nesting_->add_support (inf.grob ());
 }
 
-#include "translator.icc"
-
 ADD_ACKNOWLEDGER (System_start_delimiter_engraver, staff_symbol);
 ADD_ACKNOWLEDGER (System_start_delimiter_engraver, system_start_delimiter);