* buildscripts/mf-to-table.py (base): remove AFM support.

[lilypond.git] / lily / break-align-interface.cc

diff --git a/lily/break-align-interface.cc b/lily/break-align-interface.cc
index a79998b989572baf9e408879640767253f9f7b9e..88fb549dea0500a95096f6ca145138868626b539 100644 (file)
--- a/lily/break-align-interface.cc
+++ b/lily/break-align-interface.cc
@@ -8,18 +8,17 @@
 
 
 #include <math.h>
+
+#include "break-align-interface.hh"
 #include <libc-extension.hh>   // isinf
 
 #include "self-alignment-interface.hh"
 #include "side-position-interface.hh"
 #include "axis-group-interface.hh"
 #include "warn.hh"
-#include "lily-guile.hh"
-#include "break-align-interface.hh"
 #include "dimensions.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "paper-column.hh"
-#include "group-interface.hh"
 #include "align-interface.hh"
 
 MAKE_SCHEME_CALLBACK (Break_align_interface,alignment_callback,2);
@@ -28,7 +27,7 @@ SCM
 Break_align_interface::alignment_callback (SCM element_smob, SCM axis)
 {
   Grob *me = unsmob_grob (element_smob);
-  Axis a = (Axis) ly_scm2int (axis);
+  Axis a = (Axis) scm_to_int (axis);
 
   assert (a == X_AXIS);
   Grob *par = me->get_parent (a);
@@ -46,7 +45,7 @@ SCM
 Break_align_interface::self_align_callback (SCM element_smob, SCM axis)
 {
   Grob *me = unsmob_grob (element_smob);
-  Axis a = (Axis) ly_scm2int (axis);
+  Axis a = (Axis) scm_to_int (axis);
   assert (a == X_AXIS);
   
   Item* item = dynamic_cast<Item*> (me);
@@ -76,7 +75,7 @@ Break_align_interface::ordered_elements (Grob *grob)
   Item *me  = dynamic_cast<Item*> (grob);
   SCM elts = me->get_property ("elements");
   SCM order_vec = me->get_property ("break-align-orders");
-  if (!is_vector (order_vec)
+  if (!ly_c_vector_p (order_vec)
       || ly_vector_length (order_vec) < 3)
     return  Pointer_group_interface__extract_grobs (me, (Grob*)0,
                                                    "elements");
@@ -88,13 +87,13 @@ Break_align_interface::ordered_elements (Grob *grob)
     Copy in order specified in BREAK-ALIGN-ORDER.
   */
   Link_array<Grob> new_elts;
-  for (; is_pair (order); order = ly_cdr (order))
+  for (; scm_is_pair (order); order = scm_cdr (order))
     {
-      SCM sym = ly_car (order);
+      SCM sym = scm_car (order);
       
-      for (SCM s =elts; is_pair (s); s = ly_cdr (s))
+      for (SCM s = elts; scm_is_pair (s); s = scm_cdr (s))
        {
-         Grob *g = unsmob_grob (ly_car (s));
+         Grob *g = unsmob_grob (scm_car (s));
          if (g && sym == g->get_property ("break-align-symbol"))
            {
              new_elts.push (g);
@@ -121,7 +120,7 @@ Break_align_interface::do_alignment (Grob *grob)
   Array<Interval> extents;
 
   int last_nonempty = -1; 
-  for (int i=0; i < elems.size (); i++) 
+  for (int i = 0; i < elems.size (); i++) 
     {
       Interval y = elems[i]->extent (elems[i], X_AXIS);
       extents.push (y);
@@ -135,7 +134,7 @@ Break_align_interface::do_alignment (Grob *grob)
   
   Array<Real> offsets;
   offsets.set_size (elems.size ());
-  for (int i= 0; i < offsets.size ();i ++)
+  for (int i = 0; i < offsets.size ();i ++)
     offsets[i] = 0.0;
 
 
@@ -161,19 +160,19 @@ Break_align_interface::do_alignment (Grob *grob)
        Find the first grob with a space-alist entry.
        */
       for (SCM s = l->get_property ("elements");
-          is_pair (s) ; s = ly_cdr (s))
+          scm_is_pair (s) ; s = scm_cdr (s))
          {
-           Grob *elt = unsmob_grob (ly_car (s));
+           Grob *elt = unsmob_grob (scm_car (s));
 
            if (edge_idx < 0
                && elt->get_property ("break-align-symbol")
                == ly_symbol2scm ( "left-edge"))
              edge_idx = idx;
            
-           SCM l =elt->get_property ("space-alist");
-           if (is_pair (l))
+           SCM l = elt->get_property ("space-alist");
+           if (scm_is_pair (l))
              {
-               alist= l;
+               alist = l;
                break;
              }
          }
@@ -186,9 +185,9 @@ Break_align_interface::do_alignment (Grob *grob)
        reason.
       */
       for (SCM s = r ? r->get_property ("elements") : SCM_EOL;
-          !is_symbol (rsym) && is_pair (s); s = ly_cdr (s))
+          !scm_is_symbol (rsym) && scm_is_pair (s); s = scm_cdr (s))
        {
-         Grob * elt =unsmob_grob (ly_car (s));
+         Grob * elt = unsmob_grob (scm_car (s));
 
          rsym = elt->get_property ("break-align-symbol");
        }
@@ -197,14 +196,14 @@ Break_align_interface::do_alignment (Grob *grob)
        edge_idx = next_idx;
 
       SCM entry = SCM_EOL;
-      if (is_symbol (rsym))
+      if (scm_is_symbol (rsym))
        entry = scm_assq (rsym, alist);
 
-      bool entry_found = is_pair (entry);
+      bool entry_found = scm_is_pair (entry);
       if (!entry_found)
        {
          String sym_string;
-         if (is_symbol (rsym))
+         if (scm_is_symbol (rsym))
            sym_string = ly_symbol2string (rsym);
 
          String orig_string ;
@@ -221,10 +220,10 @@ Break_align_interface::do_alignment (Grob *grob)
       
       if (entry_found)
        {
-         entry = ly_cdr (entry);
+         entry = scm_cdr (entry);
          
-         distance = ly_scm2double (ly_cdr (entry));
-         type = ly_car (entry) ;
+         distance = scm_to_double (scm_cdr (entry));
+         type = scm_car (entry) ;
        }
 
       if (r)
@@ -247,8 +246,8 @@ Break_align_interface::do_alignment (Grob *grob)
   Real here = 0.0;
   Interval total_extent;
 
-  Real alignment_off =0.0;  
-  for (int i =0 ; i < offsets.size (); i++)
+  Real alignment_off = 0.0;  
+  for (int i = 0 ; i < offsets.size (); i++)
     {
       here += offsets[i];
       if (i == edge_idx)
@@ -265,7 +264,7 @@ Break_align_interface::do_alignment (Grob *grob)
     alignment_off = -total_extent[LEFT];
 
   here = alignment_off;
-  for (int i =0 ; i < offsets.size (); i++)
+  for (int i = 0 ; i < offsets.size (); i++)
     {
       here += offsets[i];
       elems[i]->translate_axis (here, X_AXIS);