release: 1.3.62

[lilypond.git] / lily / system-start-delimiter.cc

diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index bc942774434830452eb5a34b5f4944898b12f918..5be06b334ee7315995f45859eade2c84ffcaa918 100644 (file)
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -19,72 +19,93 @@ Molecule
 System_start_delimiter::staff_bracket (Real height) const 
 {
   Paper_def* p= paper_l ();
-  Real arc_height = p->get_var("bracket_arch_height");
+  SCM scmss = p->get_scmvar ("staffspace");
+  Real ss = gh_scm2double (scmss);
+  Real arc_height = gh_scm2double (get_elt_property("arch-height")) * ss ;
+  
   SCM at = gh_list (ly_symbol2scm ("bracket"),
-                   gh_double2scm (p->get_var("bracket_arch_angle")),
-                   gh_double2scm (p->get_var("bracket_arch_width")),
+                   scm_product (get_elt_property ("arch-angle"), scmss),
+                   scm_product (get_elt_property ("arch-width"), scmss),
                    gh_double2scm (arc_height),
-                   gh_double2scm (p->get_var("bracket_width")),
+                   scm_product (get_elt_property ("bracket-width"),scmss),
                    gh_double2scm (height),
-                   gh_double2scm (p->get_var("bracket_arch_thick")),
-                   gh_double2scm (p->get_var("bracket_thick")),
+                   scm_product (get_elt_property ("arch-thick"),scmss),
+                   scm_product (get_elt_property ("bracket-thick"),scmss),
                    SCM_UNDEFINED);
 
-  Real staff_space = p->get_var ("interline");
   Real h = height + 2 * arc_height;
-  Box b (Interval (0, 1.5 * staff_space), Interval (-h/2, h/2));
+  Box b (Interval (0, 1.5 * ss), Interval (-h/2, h/2));
   Molecule mol (b, at);
-  
-  mol.translate_axis (- mol.dim_[X_AXIS].length () / 2, X_AXIS);
+  mol.align_to (X_AXIS, CENTER);
   return mol;
 }
 
-System_start_delimiter::System_start_delimiter ()
+System_start_delimiter::System_start_delimiter (SCM s)
+  : Spanner (s)
 {
-  set_empty (Y_AXIS);
+  set_extent_callback (0, Y_AXIS);
+  Pointer_group_interface (this).set_interface();
 }
 
 Molecule
 System_start_delimiter::simple_bar (Real h) const
 {
-  Real w = paper_l ()->get_var ("barthick_score");
+  Real w = paper_l ()->get_var ("stafflinethickness") *
+    gh_scm2double (get_elt_property ("thickness"));
   return lookup_l ()->filledbox (Box (Interval(0,w), Interval(-h/2, h/2)));
 }
-   
 
-Molecule
-System_start_delimiter::do_brew_molecule ()const
+GLUE_SCORE_ELEMENT(System_start_delimiter,after_line_breaking);
+SCM
+System_start_delimiter::member_after_line_breaking ()
+{
+  SCM   gl = get_elt_property ("glyph");
+  
+  if (scm_ilength (get_elt_pointer ("elements")) <=  1 && gl == ly_symbol2scm ("bar-line"))
+    {
+      suicide ();
+    }
+  return SCM_UNDEFINED;
+}
+
+MAKE_SCHEME_SCORE_ELEMENT_CALLBACK(System_start_delimiter,brew_molecule);
+
+SCM
+System_start_delimiter::brew_molecule (SCM smob)
 {
-  Interval ext = Axis_group_interface::group_extent_callback (dim_cache_[Y_AXIS]);
+  Score_element * sc = unsmob_element (smob);
+
+  System_start_delimiter * ssd= dynamic_cast<System_start_delimiter*> (sc);
+  
+  Interval ext = Axis_group_interface::group_extent_callback (sc, Y_AXIS);
   Real l = ext.length (); 
   Molecule m;
 
-  SCM s = get_elt_property ("collapse-height");
+  SCM s = sc->get_elt_property ("collapse-height");
   if (gh_number_p (s) && l < gh_scm2double (s))
     {
-      System_start_delimiter * me = (System_start_delimiter*)this;
-      me->set_elt_property ("transparent", SCM_BOOL_T);
-      me->set_empty (X_AXIS);
-      me->set_empty (Y_AXIS);
-      return m;
+      sc->suicide();
+      return SCM_EOL;
     }
 
+  s = sc->get_elt_property ("glyph");
+  if (!gh_symbol_p(s))
+    return SCM_EOL;
   
-  s = get_elt_property ("glyph");
-  if (gh_symbol_p (s) && s == ly_symbol2scm ("bracket"))
-    m = staff_bracket (l);
-  else if (gh_symbol_p (s) && s == ly_symbol2scm ("brace"))
-    m =  staff_brace (l);
-  else
-    m = simple_bar (l);
+  if (s == ly_symbol2scm ("bracket"))
+    m = ssd->staff_bracket (l);
+  else if (s == ly_symbol2scm ("brace"))
+    m = ssd-> staff_brace (l);
+  else if (s == ly_symbol2scm ("bar-line"))
+    m = ssd->simple_bar (l);
   
   
   m.translate_axis (ext.center (), Y_AXIS);
-  return m;
+  return m.create_scheme ();
 }
 
 /*
-  ugh. Suck me plenty.
+  Ugh. Suck me plenty.
  */
 Molecule
 System_start_delimiter::staff_brace (Real y)  const
@@ -99,9 +120,8 @@ System_start_delimiter::staff_brace (Real y)  const
   int idx = int (((maxht - step) <? y - minht) / step);
   idx = idx >? 0;
 
-  SCM l = scm_eval (gh_list (ly_symbol2scm ("style-to-cmr"),
-                           ly_str02scm ("brace"),
-                           SCM_UNDEFINED));
+  SCM l = scm_assoc (ly_str02scm ("brace"),
+                    scm_eval (ly_symbol2scm ("cmr-alist")));
   
   String nm = "feta-braces";
   if (l != SCM_BOOL_F)