patch::: 1.3.108.jcn3

[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 d8ec2aed2fa15e1996d4a7d549872c20ea7c2309..628ad64fe7ed02b4afa9b0a3c1e6dd8e37eca4f1 100644 (file)
--- a/lily/system-start-delimiter-engraver.cc
+++ b/lily/system-start-delimiter-engraver.cc
@@ -14,20 +14,16 @@
 #include "group-interface.hh"
 #include "paper-column.hh"
 #include "paper-def.hh"
+#include "spanner.hh"
 
-/*
-  TODO: rename this to system-open-engraver (or whatever.)
-
- */
 class System_start_delimiter_engraver : public Engraver
 {
 public:
   VIRTUAL_COPY_CONS(Translator);
   System_start_delimiter_engraver();
 
-  Spanner * spanbar_;
 protected:
-
+  Spanner * delim_;
   virtual void acknowledge_element (Score_element_info);
   virtual void do_creation_processing ();
   virtual void do_removal_processing ();
@@ -35,63 +31,52 @@ protected:
 
 ADD_THIS_TRANSLATOR(System_start_delimiter_engraver);
 
-
 void
 System_start_delimiter_engraver::acknowledge_element (Score_element_info inf)
 {
-  if (dynamic_cast<Staff_symbol*> (inf.elem_l_))
+  if (Staff_symbol::has_interface (inf.elem_l_))
     {
       /*
-       don't add as Axis_group_interface (spanbar_).add_element (),
+       don't add as Axis_group_interface::add_element (delim_, ),
        because that would set the parent as well */
          
-      Group_interface (spanbar_).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 = get_property ("spanBarGlyph");
+      SCM gl = inf.elem_l_->get_elt_property ("glyph");
+      SCM my_gl = delim_->get_elt_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
     }
 
 }
 
 System_start_delimiter_engraver::System_start_delimiter_engraver()
 {
-  spanbar_ = 0;
+  delim_ = 0;
 }
 
 void
 System_start_delimiter_engraver::do_creation_processing()
 {
-  spanbar_ = new System_start_delimiter;
-  spanbar_->set_bound (LEFT, get_staff_info ().command_pcol_l ());
-  announce_element (Score_element_info (spanbar_,0));
+  delim_ = new Spanner (get_property ("SystemStartDelimiter"));
+
+  delim_->set_bound (LEFT, unsmob_element (get_property ("currentCommandColumn")));
+
+
+  announce_element (delim_,0);
 }
 
 void
 System_start_delimiter_engraver::do_removal_processing ()
 {
-  SCM s = get_property ("systemStartDelimiterGlyph");
-  if (gh_symbol_p (s))
-    {
-      spanbar_->set_elt_property ("glyph", s);
-    }
-
-  // ugh, should have naming without bracket
-  SCM collapse = get_property ("bracketCollapseHeight");
-  if (gh_number_p (collapse))
-    spanbar_->set_elt_property ("collapse-height", collapse);
-  else
-    spanbar_->set_elt_property ("collapse-height", gh_double2scm (1));
-      
-  spanbar_->set_bound (RIGHT, get_staff_info ().command_pcol_l ());
-  typeset_element (spanbar_);
+  delim_->set_bound (RIGHT, unsmob_element (get_property ("currentCommandColumn")));
+  typeset_element (delim_);
 }