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 493be5a6672df6b47510cba885d325844bfa2b80..628ad64fe7ed02b4afa9b0a3c1e6dd8e37eca4f1 100644 (file)
--- a/lily/system-start-delimiter-engraver.cc
+++ b/lily/system-start-delimiter-engraver.cc
@@ -40,7 +40,7 @@ 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::has_interface (inf.elem_l_))
     {
@@ -52,7 +52,7 @@ System_start_delimiter_engraver::acknowledge_element (Score_element_info inf)
        */
       if (gh_symbol_p (gl) && gl  == ly_symbol2scm ("brace")
          && gh_symbol_p (my_gl) && my_gl == ly_symbol2scm ("bracket"))
-       inf.elem_l_->translate_axis ( -paper_l ()->get_var ("staffspace"), X_AXIS); // ugh
+       inf.elem_l_->translate_axis ( -1.0, X_AXIS); // ugh
     }
 
 }
@@ -65,19 +65,10 @@ System_start_delimiter_engraver::System_start_delimiter_engraver()
 void
 System_start_delimiter_engraver::do_creation_processing()
 {
-  delim_ = new Spanner (get_property ("basicSystemStartDelimiterProperties"));
-  System_start_delimiter::set_interface (delim_);
+  delim_ = new Spanner (get_property ("SystemStartDelimiter"));
+
   delim_->set_bound (LEFT, unsmob_element (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 (delim_,0);
 }
@@ -85,11 +76,6 @@ System_start_delimiter_engraver::do_creation_processing()
 void
 System_start_delimiter_engraver::do_removal_processing ()
 {
-  // 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_);
 }