patch::: 1.3.121.jcn2

[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 323b502845726c005b28a795e6e43b9e002c2813..169537a5df5ffe88e79fa1a87cfbdebc45e6745f 100644 (file)
--- a/lily/system-start-delimiter-engraver.cc
+++ b/lily/system-start-delimiter-engraver.cc
@@ -14,6 +14,7 @@
 #include "group-interface.hh"
 #include "paper-column.hh"
 #include "paper-def.hh"
+#include "spanner.hh"
 
 class System_start_delimiter_engraver : public Engraver
 {
@@ -23,15 +24,15 @@ public:
 
 protected:
   Spanner * delim_;
-  virtual void acknowledge_element (Score_element_info);
-  virtual void do_creation_processing ();
-  virtual void do_removal_processing ();
+  virtual void acknowledge_grob (Grob_info);
+  virtual void initialize ();
+  virtual void finalize ();
 };
 
 ADD_THIS_TRANSLATOR(System_start_delimiter_engraver);
 
 void
-System_start_delimiter_engraver::acknowledge_element (Score_element_info inf)
+System_start_delimiter_engraver::acknowledge_grob (Grob_info inf)
 {
   if (Staff_symbol::has_interface (inf.elem_l_))
     {
@@ -39,19 +40,19 @@ System_start_delimiter_engraver::acknowledge_element (Score_element_info inf)
        don't add as Axis_group_interface::add_element (delim_, ),
        because that would set the parent as well */
          
-      Pointer_group_interface (delim_).add_element (inf.elem_l_);
+      Pointer_group_interface::add_element (delim_, "elements", inf.elem_l_);
     }
-  else if (System_start_delimiter * b = dynamic_cast<System_start_delimiter *> (inf.elem_l_))
+  else if (System_start_delimiter::has_interface (inf.elem_l_))
     {
-      SCM gl = b->get_elt_property ("glyph");
-      SCM my_gl = delim_->get_elt_property ("glyph");
+      SCM gl = inf.elem_l_->get_grob_property ("glyph");
+      SCM my_gl = delim_->get_grob_property ("glyph");
 
       /*
        UGH UGH
        */
       if (gh_symbol_p (gl) && gl  == ly_symbol2scm ("brace")
          && gh_symbol_p (my_gl) && my_gl == ly_symbol2scm ("bracket"))
-       b->translate_axis ( -paper_l ()->get_var ("interline"), X_AXIS); // ugh
+       inf.elem_l_->translate_axis ( -1.0, X_AXIS); // ugh
     }
 
 }
@@ -62,33 +63,20 @@ System_start_delimiter_engraver::System_start_delimiter_engraver()
 }
 
 void
-System_start_delimiter_engraver::do_creation_processing()
+System_start_delimiter_engraver::initialize()
 {
-  delim_ = new System_start_delimiter (get_property ("basicSystemStartDelimiterProperties"));
-  delim_->set_bound (LEFT, unsmob_element (get_property ("currentCommandColumn")));
+  delim_ = new Spanner (get_property ("SystemStartDelimiter"));
+
+  delim_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
 
-  /*
-    You can't override the glyph using \property, you must do it in
-    the predefined context (ie. \translator { ... } )
-   */
-  SCM s = get_property ("systemStartDelimiterGlyph");
-  if (gh_symbol_p (s))
-    {
-      delim_->set_elt_property ("glyph", s);
-    }
 
-  announce_element (Score_element_info (delim_,0));
+  announce_grob (delim_,0);
 }
 
 void
-System_start_delimiter_engraver::do_removal_processing ()
+System_start_delimiter_engraver::finalize ()
 {
-  // ugh, should have naming without bracket
-  SCM collapse = get_property ("bracketCollapseHeight");
-  if (gh_number_p (collapse))
-    delim_->set_elt_property ("collapse-height", collapse);
-      
-  delim_->set_bound (RIGHT, unsmob_element (get_property ("currentCommandColumn")));
-  typeset_element (delim_);
+  delim_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
+  typeset_grob (delim_);
 }