Merge branch 'master' into translation

[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 73a3c8ccc75cb9cdb99674f6809c75c36f0bb1d1..7eadbb0eec3ca70d0cfec80e8685b888f33f5273 100644 (file)
--- a/lily/system-start-delimiter-engraver.cc
+++ b/lily/system-start-delimiter-engraver.cc
@@ -26,6 +26,8 @@
 #include "staff-symbol.hh"
 #include "system-start-delimiter.hh"
 
+#include "translator.icc"
+
 struct Bracket_nesting_node
 {
 public:
@@ -191,7 +193,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 +203,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 +229,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);