X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsystem-start-delimiter.cc;h=7099ca7e7a30039bd40abd0f408f12316129e4cb;hb=023604318fe8e1ec89eb9c9e222e0dd21f103d18;hp=c7317a620ec56e644236dda4b2af641dcdccda69;hpb=bebe3c81debee6cd3fe5d23e0c748a2540965b14;p=lilypond.git

diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index c7317a620e..7099ca7e7a 100644
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -3,23 +3,21 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "system-start-delimiter.hh"
-
-
-#include "spanner.hh"
+#include "text-interface.hh" 
+#include "all-font-metrics.hh"
 #include "axis-group-interface.hh"
-#include "output-def.hh"
 #include "font-interface.hh"
-#include "all-font-metrics.hh"
-#include "staff-symbol-referencer.hh"
-#include "lookup.hh"
 #include "item.hh"
 #include "line-interface.hh"
-
+#include "lookup.hh"
+#include "output-def.hh"
 #include "pointer-group-interface.hh"
+#include "spanner.hh"
+#include "staff-symbol-referencer.hh"
 
 Stencil
 System_start_delimiter::staff_bracket (Grob *me, Real height)
@@ -56,10 +54,8 @@ System_start_delimiter::staff_bracket (Grob *me, Real height)
 Stencil
 System_start_delimiter::line_bracket (Grob *me, Real height)
 {
-  height -= 1.0;
-
   Real thick
-    = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"))
+    = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"))
     * robust_scm2double (me->get_property ("thickness"), 1);
   Real w = 0.8;
   
@@ -82,7 +78,7 @@ System_start_delimiter::line_bracket (Grob *me, Real height)
 Stencil
 System_start_delimiter::simple_bar (Grob *me, Real h)
 {
-  Real lt = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
   Real w = lt * robust_scm2double (me->get_property ("thickness"), 1);
   return Lookup::round_filled_box (Box (Interval (0, w), Interval (-h / 2, h / 2)),
 				   lt);
@@ -98,7 +94,7 @@ System_start_delimiter::print (SCM smob)
 
   Interval ext;
   int non_empty_count = 0;
-  for (int i = elts.size (); i--;)
+  for (vsize i = elts.size (); i--;)
     {
       Spanner *sp = dynamic_cast<Spanner *> (elts[i]);
 
@@ -132,6 +128,8 @@ System_start_delimiter::print (SCM smob)
     m = staff_brace (me, len);
   else if (glyph_sym == ly_symbol2scm ("bar-line"))
     m = simple_bar (me, len);
+  else if (glyph_sym == ly_symbol2scm ("line-bracket"))
+    m = line_bracket (me, len);
 
   m.translate_axis (ext.center (), Y_AXIS);
   return m.smobbed_copy ();
@@ -144,15 +142,16 @@ System_start_delimiter::staff_brace (Grob *me, Real y)
   /* We go through the style sheet to lookup the font file
      name.  This is better than using find_font directly,
      esp. because that triggers mktextfm for non-existent
->     fonts. */
+     fonts. */
   SCM fam = scm_cons (ly_symbol2scm ("font-encoding"),
 		      ly_symbol2scm ("fetaBraces"));
 
   SCM alist = scm_list_n (fam, SCM_UNDEFINED);
   fm = select_font (me->layout (), scm_list_n (alist, SCM_UNDEFINED));
 
-  int lo = 0;
-  int hi = max (fm->count () - 1, 2);
+  int
+    lo = 0;
+  int hi = max ((int) fm->count () - 1, 2);
 
   /* do a binary search for each Y, not very efficient, but passable?  */
   Box b;
@@ -175,13 +174,13 @@ System_start_delimiter::staff_brace (Grob *me, Real y)
   return stil;
 }
 
-ADD_INTERFACE (System_start_delimiter, "system-start-delimiter-interface",
+ADD_INTERFACE (System_start_delimiter,
+	       "system-start-delimiter-interface",
 	       "The brace, bracket or bar in front of the system. "
 	       ,
 
 	       /* properties */
 	       "collapse-height "
-	       "styles "
-	       "staff-hierarchy "
+	       "style "
 	       "thickness "
 	       );