Clarifies that multi-measure rests can be used for a single bar.

[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 de89a20764f636c31398f5521f8f1e6349068b0c..9734f522cbda7ad9af4d33e411a7ab94dda97254 100644 (file)
--- a/lily/system-start-delimiter-engraver.cc
+++ b/lily/system-start-delimiter-engraver.cc
@@ -9,7 +9,7 @@
 #include "system-start-delimiter.hh"
 #include "engraver.hh"
 #include "staff-symbol.hh"
-#include "group-interface.hh"
+#include "pointer-group-interface.hh"
 #include "paper-column.hh"
 #include "output-def.hh"
 #include "spanner.hh"
@@ -21,41 +21,38 @@ public:
 
 protected:
   Spanner *delim_;
-  virtual void acknowledge_grob (Grob_info);
-  virtual void process_music ();
+  DECLARE_ACKNOWLEDGER (system_start_delimiter);
+  DECLARE_ACKNOWLEDGER (staff_symbol);
+
+  void process_music ();
   virtual void finalize ();
 };
 
 void
-System_start_delimiter_engraver::acknowledge_grob (Grob_info inf)
+System_start_delimiter_engraver::acknowledge_staff_symbol (Grob_info inf)
 {
-  if (Staff_symbol::has_interface (inf.grob_))
-    {
-      /*
-       don't add as Axis_group_interface::add_element (delim_, ),
-       because that would set the parent as well */
+  /*
+    don't add as Axis_group_interface::add_element (delim_, ),
+    because that would set the parent as well */
 
-      Pointer_group_interface::add_grob (delim_, ly_symbol2scm ("elements"), inf.grob_);
-    }
-  else if (System_start_delimiter::has_interface (inf.grob_))
-    {
-      SCM gl = inf.grob_->get_property ("glyph");
-      SCM my_gl = delim_->get_property ("glyph");
+  Pointer_group_interface::add_grob (delim_, ly_symbol2scm ("elements"), inf.grob ());
+}
+void
+System_start_delimiter_engraver::acknowledge_system_start_delimiter (Grob_info inf)
+{
+  SCM gl = inf.grob ()->get_property ("glyph");
+  SCM my_gl = delim_->get_property ("glyph");
 
-      /*
-       UGH UGH
-      */
-      if (scm_is_string (gl) && ly_c_equal_p (gl, scm_makfrom0str ("brace"))
-         && scm_is_string (my_gl) && ly_c_equal_p (my_gl, scm_makfrom0str ("bracket")))
-       inf.grob_->translate_axis (-0.8, X_AXIS); // ugh
-      else if (scm_is_string (gl) && ly_c_equal_p (gl, scm_makfrom0str ("bracket"))
-              && scm_is_string (my_gl) && ly_c_equal_p (my_gl, scm_makfrom0str ("bracket")))
-       {
-         inf.grob_->translate_axis (-0.8, X_AXIS); // ugh
-         inf.grob_->set_property ("arch-height",
-                                  scm_make_real (scm_to_double (inf.grob_->get_property
-                                                                ("arch-height")) + 0.5));
-       }
+  /*
+    UGH UGH
+  */
+  if (scm_is_string (gl) && ly_is_equal (gl, scm_makfrom0str ("brace"))
+      && scm_is_string (my_gl) && ly_is_equal (my_gl, scm_makfrom0str ("bracket")))
+    inf.grob ()->translate_axis (-0.8, X_AXIS); // ugh
+  else if (scm_is_string (gl) && ly_is_equal (gl, scm_makfrom0str ("bracket"))
+          && scm_is_string (my_gl) && ly_is_equal (my_gl, scm_makfrom0str ("bracket")))
+    {
+      inf.grob ()->translate_axis (-0.8, X_AXIS); // ugh
     }
 }
 
@@ -74,7 +71,6 @@ System_start_delimiter_engraver::process_music ()
                                             ly_symbol2string (delim_name).to_str0 ());
 
       delim_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
-
     }
 }
 void
@@ -83,14 +79,17 @@ System_start_delimiter_engraver::finalize ()
   if (delim_)
     {
       delim_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
-
     }
 }
 
+#include "translator.icc"
+
+ADD_ACKNOWLEDGER (System_start_delimiter_engraver, system_start_delimiter);
+ADD_ACKNOWLEDGER (System_start_delimiter_engraver, staff_symbol);
+
 ADD_TRANSLATOR (System_start_delimiter_engraver,
                /* descr */ "Creates a system start delimiter (ie. SystemStart@{Bar, Brace, Bracket@} spanner",
                /* creats*/ "SystemStartBar SystemStartBrace SystemStartBracket",
                /* accepts */ "",
-               /* acks  */ "system-start-delimiter-interface staff-symbol-interface",
                /* reads */ "systemStartDelimiter",
                /* write */ "");