* lily/modified-font-metric.cc (text_dimension): try

[lilypond.git] / lily / span-bar.cc

diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index 97e581e938c58ae3ede5c55189dee4de3a2acc33..b6cb8361fc29adb698a2e0056179114bac2f20f2 100644 (file)
--- a/lily/span-bar.cc
+++ b/lily/span-bar.cc
@@ -7,14 +7,13 @@
 */
 
 #include "span-bar.hh"
+
 #include "font-interface.hh"
 #include "dimensions.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "stencil.hh"
 #include "warn.hh"
 #include "axis-group-interface.hh"
-#include "group-interface.hh"
-#include "grob.hh"
 #include "bar-line.hh"
 
 void
@@ -29,7 +28,7 @@ MAKE_SCHEME_CALLBACK (Span_bar,print,1);
 
 /* Limitations/Bugs:
 
-   (1) Elements from 'me->get_grob_property ("elements")' must be
+   (1) Elements from 'me->get_property ("elements")' must be
    ordered according to their y coordinates relative to their common
    axis group parent.  Otherwise, the computation goes mad.
 
@@ -49,23 +48,23 @@ SCM
 Span_bar::print (SCM smobbed_me) 
 {
   Grob *me = unsmob_grob (smobbed_me);
-  SCM first_elt = me->get_grob_property ("elements");
+  SCM first_elt = me->get_property ("elements");
 
   /* compute common refpoint of elements */
   Grob *refp = me;
-  for (SCM elts = first_elt; gh_pair_p (elts); elts = ly_cdr (elts))
+  for (SCM elts = first_elt; scm_is_pair (elts); elts = scm_cdr (elts))
     {
-      SCM smobbed_staff_bar = ly_car (elts);
+      SCM smobbed_staff_bar = scm_car (elts);
       Grob *staff_bar = unsmob_grob (smobbed_staff_bar);
       refp = staff_bar->common_refpoint (refp, Y_AXIS);
     }
 
   Span_bar::evaluate_glyph (me);
-  SCM glyph = me->get_grob_property ("glyph");
+  SCM glyph = me->get_property ("glyph");
 
   /* glyph may not be a string, when ME is killed by Hara Kiri in
     between. */
-  if (!gh_string_p (glyph))
+  if (!scm_is_string (glyph))
     return SCM_EOL;
   
   String glyph_string = ly_scm2string (glyph);
@@ -74,9 +73,9 @@ Span_bar::print (SCM smobbed_me)
   Stencil span_bar_mol;
 
   Interval prev_extent;
-  for (SCM elts = first_elt; gh_pair_p (elts); elts = ly_cdr (elts))
+  for (SCM elts = first_elt; scm_is_pair (elts); elts = scm_cdr (elts))
     {
-      SCM smobbed_staff_bar = ly_car (elts);
+      SCM smobbed_staff_bar = scm_car (elts);
       Grob *staff_bar = unsmob_grob (smobbed_staff_bar);
       Interval ext = staff_bar->extent (refp, Y_AXIS);
       if (ext.is_empty ())
@@ -114,9 +113,9 @@ SCM
 Span_bar::width_callback (SCM element_smob, SCM scm_axis)
 {
   Grob *se = unsmob_grob (element_smob);
-  Axis a = (Axis) gh_scm2int (scm_axis);
+  Axis a = (Axis) scm_to_int (scm_axis);
   assert (a == X_AXIS);
-  String gl = ly_scm2string (se->get_grob_property ("glyph"));
+  String gl = ly_scm2string (se->get_property ("glyph"));
 
   /*
     urg.
@@ -130,8 +129,9 @@ MAKE_SCHEME_CALLBACK (Span_bar,before_line_breaking,1);
 SCM
 Span_bar::before_line_breaking (SCM smob)
 {
-  evaluate_empty (unsmob_grob (smob));
-  evaluate_glyph (unsmob_grob (smob));
+  Grob * g = unsmob_grob (smob);
+  evaluate_empty (g);
+  evaluate_glyph (g);
 
   /* No need to call Bar_line::before_line_breaking (), because the info
      in ELEMENTS already has been procced by
@@ -145,7 +145,7 @@ SCM
 Span_bar::center_on_spanned_callback (SCM element_smob, SCM axis)
 {
   Grob *me = unsmob_grob (element_smob);
-  Axis a = (Axis) gh_scm2int (axis);
+  Axis a = (Axis) scm_to_int (axis);
   assert (a == Y_AXIS);
   Interval i (get_spanned_interval (me));
 
@@ -155,10 +155,10 @@ Span_bar::center_on_spanned_callback (SCM element_smob, SCM axis)
   if (i.is_empty ())
     {
       me->suicide ();
-      return gh_double2scm (0.0);
+      return scm_make_real (0.0);
     }
   
-  return gh_double2scm (i.center ());
+  return scm_make_real (i.center ());
 }
 
 void
@@ -167,7 +167,7 @@ Span_bar::evaluate_empty (Grob*me)
   /* TODO: filter all hara-kiried out of ELEMENS list, and then
      optionally do suicide. Call this cleanage function from
      center_on_spanned_callback () as well. */
-  if (!gh_pair_p (me->get_grob_property ("elements")))
+  if (!scm_is_pair (me->get_property ("elements")))
     {
       me->suicide ();
     }
@@ -176,20 +176,19 @@ Span_bar::evaluate_empty (Grob*me)
 void
 Span_bar::evaluate_glyph (Grob*me)
 {
-  SCM elts = me->get_grob_property ("elements");
-  SCM glyph_symbol = ly_symbol2scm ("glyph");
-  SCM gl = SCM_EOL;
+  SCM gl = me->get_property ("glyph");
 
-  while (gh_pair_p (elts))
+  if (scm_is_string (gl))
+    return ;
+  
+  for (SCM s = me->get_property ("elements");
+       !scm_is_string (gl) && scm_is_pair (s); s = scm_cdr (s))
     {
-      gl = unsmob_grob (gh_car (elts))
-       ->internal_get_grob_property (glyph_symbol);
-      if (gh_string_p (gl))
-       break;
-      elts =gh_cdr (elts);
+      gl = unsmob_grob (scm_car (s))
+       ->get_property ("glyph");
     }
 
-  if (!gh_string_p (gl))
+  if (!scm_is_string (gl))
     {
       me->suicide ();
       return;
@@ -200,26 +199,26 @@ Span_bar::evaluate_glyph (Grob*me)
     {
       type = ".|";
     }
-  else if (type== ":|")
+  else if (type == ":|")
     {
       type = "|.";
     }
-  else if (type== ":|:")
+  else if (type == ":|:")
     {
       type = ".|.";
     }
 
   gl = scm_makfrom0str (type.to_str0 ());
-  if (scm_equal_p (me->internal_get_grob_property (glyph_symbol), gl)
+  if (scm_equal_p (me->get_property ("glyph"), gl)
       != SCM_BOOL_T)
-    me->internal_set_grob_property (glyph_symbol, gl);
+    me->set_property ("glyph", gl);
 }
 
 Interval
 Span_bar::get_spanned_interval (Grob*me) 
 {
   return ly_scm2interval (Axis_group_interface::group_extent_callback
-                         (me->self_scm (), gh_int2scm (Y_AXIS))); 
+                         (me->self_scm (), scm_int2num (Y_AXIS))); 
 }
 
 
@@ -233,9 +232,9 @@ Span_bar::get_bar_size (SCM smob)
     {
       /* This happens if the bars are hara-kiried from under us. */
       me->suicide ();
-      return gh_double2scm (-1);
+      return scm_make_real (-1);
     }
-  return gh_double2scm (iv.length ());
+  return scm_make_real (iv.length ());
 }