X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsystem-start-delimiter.cc;h=6e3a32d03c5ec69e1789d1919b81758fe5f218f8;hb=c668a48a83d7cdc70e97cb25069427c59d75c31a;hp=0127310b01895df300449672a7a45b6ffc0bfb4f;hpb=faaee71fb44c8e1040239797aad336f4e46c2c21;p=lilypond.git

diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index 0127310b01..6e3a32d03c 100644
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -1,29 +1,29 @@
-/*   
+/* 
   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>
-  
+
  */
+
+#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")) ;
-  
+
   SCM at = scm_list_n (ly_symbol2scm ("bracket"),
 		    me->get_property ("arch-angle"),
 		    me->get_property ("arch-width"),
@@ -35,7 +35,7 @@ System_start_delimiter::staff_bracket (Grob*me,Real height)
 
 /*
 TODO: sort this out.
-    
+  
 Another thing:
 In system-start-delimiter.cc I see the line
 
@@ -48,7 +48,7 @@ But I really think that you mean
 (arc_height changes the x-axis-size of arc ; arc_width changes the
 y-axis-size)
 Will not fix it since I'm not sure.
-  
+
    */
 
   Real h = height + 2 * arc_height;
@@ -63,7 +63,7 @@ Will not fix it since I'm not sure.
 Stencil
 System_start_delimiter::simple_bar (Grob*me,Real h) 
 {
-  Real lt =me->get_paper ()->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)),
 				   lt);
@@ -85,15 +85,15 @@ System_start_delimiter::after_line_breaking (SCM smob)
       */
       SCM elts = me->get_property ("elements");
       Grob *common = common_refpoint_of_list (elts, me, Y_AXIS);
-      for (SCM s = elts; ly_c_pair_p (s); s = ly_cdr (s))
+      for (SCM s = elts; scm_is_pair (s); s = scm_cdr (s))
 	{
-	  Interval v = unsmob_grob (ly_car (s))->extent (common, Y_AXIS);
+	  Interval v = unsmob_grob (scm_car (s))->extent (common, Y_AXIS);
 
 	  if (!v.is_empty ())
 	    count ++;
 	}
-  
-  
+
+
       if (count <=  1)
 	{
 	  me->suicide ();
@@ -103,28 +103,28 @@ System_start_delimiter::after_line_breaking (SCM smob)
 }
 
 
-MAKE_SCHEME_CALLBACK (System_start_delimiter,print,1);
+MAKE_SCHEME_CALLBACK (System_start_delimiter, print, 1);
 SCM
 System_start_delimiter::print (SCM smob)
 {
-  Spanner * me = unsmob_spanner (smob);
+  Spanner *me = unsmob_spanner (smob);
   if (!me)
     return SCM_EOL;
-  
+
   SCM s = me->get_property ("glyph");
   if (!scm_is_string (s))
     return SCM_EOL;
   SCM gsym = scm_string_to_symbol (s) ;
-  
+
   Real staff_space = Staff_symbol_referencer::staff_space (me);
 
   SCM elts = me->get_property ("elements");
   Grob * common = common_refpoint_of_list (elts, me, Y_AXIS);
 
   Interval ext;
-  for (SCM s = elts; ly_c_pair_p (s); s = ly_cdr (s))
+  for (SCM s = elts; scm_is_pair (s); s = scm_cdr (s))
     {
-      Spanner * sp = unsmob_spanner (ly_car (s));
+      Spanner * sp = unsmob_spanner (scm_car (s));
       if (sp &&
 	  sp->get_bound (LEFT) == me->get_bound (LEFT))
 	{
@@ -135,11 +135,11 @@ System_start_delimiter::print (SCM smob)
     }
 
   ext -= me->relative_coordinate (common, Y_AXIS);
-  
-  Real l = ext.length () / staff_space;
-  
+
+  Real len = ext.length () / staff_space;
+
   if (ext.is_empty ()
-      || (robust_scm2double (me->get_property ("collapse-height"), 0.0) >= l))
+      || (robust_scm2double (me->get_property ("collapse-height"), 0.0) >= len))
     {
       me->suicide ();
       return SCM_EOL;
@@ -147,34 +147,32 @@ System_start_delimiter::print (SCM smob)
 
   Stencil m;
 
-  if (gsym== ly_symbol2scm ("bracket"))
-    m = staff_bracket (me,l);
+  if (gsym == ly_symbol2scm ("bracket"))
+    m = staff_bracket (me, len);
   else if (gsym == ly_symbol2scm ("brace"))
-    m =  staff_brace (me,l);
+    m = staff_brace (me, len);
   else if (gsym == ly_symbol2scm ("bar-line"))
-    m = simple_bar (me,l);
-  
+    m = simple_bar (me, len);
+
   m.translate_axis (ext.center (), Y_AXIS);
   return m.smobbed_copy ();
 }
 
 Stencil
-System_start_delimiter::staff_brace (Grob*me, Real y)
+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
      fonts. */
-  SCM fam = scm_cons (ly_symbol2scm ("font-encoding"), ly_symbol2scm ("fetaBraces"));
-  
+  SCM fam = scm_cons (ly_symbol2scm ("font-encoding"),
+		      ly_symbol2scm ("fetaBraces"));
+
   SCM alist = scm_list_n (fam, SCM_UNDEFINED);
-  fm = select_font (me->get_paper (), scm_list_n (alist, SCM_UNDEFINED));
-  
+  fm = select_font (me->get_layout (), scm_list_n (alist, SCM_UNDEFINED));
 
   int lo = 0;
-
   int hi = (fm->count () - 1) >? 2;
   Box b;
 
@@ -190,15 +188,12 @@ 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);
 
   return Stencil (b, stil.expr ());
 }
-  
-
 
 
 ADD_INTERFACE (System_start_delimiter,"system-start-delimiter-interface",