new file.

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

diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index fde98b9db1c6e2c38b790c7989ba1355a40b8ff0..ded4977de0899d7d2d3ea2224c6c02d69c66070a 100644 (file)
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -1,26 +1,26 @@
 /* 
-  system-start-delimiter.cc --  implement System_start_delimiter
+  system-start-delimiter.cc -- implement System_start_delimiter
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
  */
+
+#include "system-start-delimiter.hh"
+
 #include <math.h>
 
 #include "spanner.hh"
 #include "axis-group-interface.hh"
-#include "system-start-delimiter.hh"
 #include "output-def.hh"
-#include "stencil.hh"
 #include "font-interface.hh"
 #include "all-font-metrics.hh"
-#include "grob.hh"
 #include "staff-symbol-referencer.hh"
 #include "lookup.hh"
 
 Stencil
-System_start_delimiter::staff_bracket (Grob*me,Real height)
+System_start_delimiter::staff_bracket (Grob*me, Real height)
 {
   Real arc_height = scm_to_double (me->get_property ("arch-height")) ;
 
@@ -61,22 +61,22 @@ Will not fix it since I'm not sure.
 
 
 Stencil
-System_start_delimiter::simple_bar (Grob*me,Real h) 
+System_start_delimiter::simple_bar (Grob*me, Real h) 
 {
-  Real lt =me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness")) ;
+  Real lt = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness")) ;
   Real w = lt * robust_scm2double (me->get_property ("thickness"), 1);
-  return Lookup::round_filled_box (Box (Interval (0,w), Interval (-h/2, h/2)),
+  return Lookup::round_filled_box (Box (Interval (0, w), Interval (-h/2, h/2)),
                                   lt);
 }
 
-MAKE_SCHEME_CALLBACK (System_start_delimiter,after_line_breaking,1);
+MAKE_SCHEME_CALLBACK (System_start_delimiter, after_line_breaking, 1);
 
 SCM
 System_start_delimiter::after_line_breaking (SCM smob)
 {
   Grob * me = unsmob_grob (smob);
   SCM   gl = me->get_property ("glyph");
-  if (ly_c_equal_p (gl,scm_makfrom0str ("bar-line")))
+  if (ly_c_equal_p (gl, scm_makfrom0str ("bar-line")))
     {
       int count = 0;
 
@@ -147,7 +147,7 @@ System_start_delimiter::print (SCM smob)
 
   Stencil m;
 
-  if (gsym== ly_symbol2scm ("bracket"))
+  if (gsym == ly_symbol2scm ("bracket"))
     m = staff_bracket (me, len);
   else if (gsym == ly_symbol2scm ("brace"))
     m = staff_brace (me, len);
@@ -162,7 +162,6 @@ Stencil
 System_start_delimiter::staff_brace (Grob *me, Real y)
 {
   Font_metric *fm = 0;
-
   /* 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
@@ -189,8 +188,7 @@ System_start_delimiter::staff_brace (Grob *me, Real y)
     }
   while (hi - lo > 1);
 
-  /* FIXME: ascii? */
-  Stencil stil (fm->get_indexed_char_stencil (lo));
+  Stencil stil (fm->find_by_name ("brace" + to_string (lo)));
   b = stil.extent_box ();
   b[X_AXIS] = Interval (0, 0);
 
@@ -198,7 +196,7 @@ System_start_delimiter::staff_brace (Grob *me, Real y)
 }
 
 
-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. "
               "It is implemented as a spanner."
               ,