* SConstruct: Further development.

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

diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index e61fa4e71829a5179f67ce08e56e1f0643f149c2..4977fa0ddce6ca27dc5ced3a3aefe75a04d1e5f4 100644 (file)
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -10,7 +10,7 @@
 
 #include "axis-group-interface.hh"
 #include "system-start-delimiter.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "stencil.hh"
 #include "font-interface.hh"
 #include "all-font-metrics.hh"
@@ -21,13 +21,13 @@
 Stencil
 System_start_delimiter::staff_bracket (Grob*me,Real height)  
 {
-  Real arc_height = gh_scm2double (me->get_property ("arch-height")) ;
+  Real arc_height = ly_scm2double (me->get_property ("arch-height")) ;
   
   SCM at = scm_list_n (ly_symbol2scm ("bracket"),
                    me->get_property ("arch-angle"),
                    me->get_property ("arch-width"),
-                   gh_double2scm (arc_height),
-                   gh_double2scm (height),
+                   scm_make_real (arc_height),
+                   scm_make_real (height),
                    me->get_property ("arch-thick"),
                    me->get_property ("thickness"),
                    SCM_UNDEFINED);
@@ -62,7 +62,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_realvar (ly_symbol2scm ("linethickness")) ;
+  Real lt =me->get_paper ()->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);
@@ -75,7 +75,7 @@ System_start_delimiter::after_line_breaking (SCM smob)
 {
   Grob * me = unsmob_grob (smob);
   SCM   gl = me->get_property ("glyph");
-  if (gh_equal_p (gl,scm_makfrom0str ("bar-line")))
+  if (ly_c_equal_p (gl,scm_makfrom0str ("bar-line")))
     {
       int count = 0;
 
@@ -84,9 +84,9 @@ 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; gh_pair_p (s); s = gh_cdr (s))
+      for (SCM s = elts; ly_c_pair_p (s); s = ly_cdr (s))
        {
-         Interval v = unsmob_grob (gh_car (s))->extent (common, Y_AXIS);
+         Interval v = unsmob_grob (ly_car (s))->extent (common, Y_AXIS);
 
          if (!v.is_empty ())
            count ++;
@@ -109,13 +109,13 @@ System_start_delimiter::print (SCM smob)
   Grob * me = unsmob_grob (smob);
 
   SCM s = me->get_property ("glyph");
-  if (!gh_string_p (s))
+  if (!ly_c_string_p (s))
     return SCM_EOL;
   SCM gsym = scm_string_to_symbol (s) ;
   
   Real staff_space = Staff_symbol_referencer::staff_space (me);
   Interval ext = ly_scm2interval (Axis_group_interface::group_extent_callback
- (me->self_scm (), gh_int2scm (Y_AXIS)));
+ (me->self_scm (), scm_int2num (Y_AXIS)));
   Real l = ext.length () / staff_space;
   
   if (ext.is_empty ()
@@ -147,7 +147,7 @@ System_start_delimiter::staff_brace (Grob*me, Real y)
      name.  This is better than using find_font directly,
      esp. because that triggers mktextfm for non-existent
      fonts. */
-  SCM fam = gh_cons (ly_symbol2scm ("font-encoding"), ly_symbol2scm ("braces"));
+  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));
@@ -169,12 +169,13 @@ System_start_delimiter::staff_brace (Grob*me, Real y)
        lo = cmp;
     }
   while (hi - lo > 1);
-      
-  Stencil m (fm->get_indexed_char_stencil (lo)); // ugh.  ascii?
-  b=m.extent_box ();
-  b[X_AXIS] = Interval (0,0);
 
-  return Stencil (b, m.get_expr ());
+  /* FIXME: ascii? */
+  Stencil stil (fm->get_indexed_char_stencil (lo));
+  b = stil.extent_box ();
+  b[X_AXIS] = Interval (0, 0);
+
+  return Stencil (b, stil.expr ());
 }