* lily/ledger-line-spanner.cc (print): swap linear_combination

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

diff --git a/lily/break-align-interface.cc b/lily/break-align-interface.cc
index 363f505fafc30d7dedf92d424f2c8809489532cb..bcd62a73fc380cffbcb4e6e2ccb47ef0441df9cb 100644 (file)
--- a/lily/break-align-interface.cc
+++ b/lily/break-align-interface.cc
@@ -17,7 +17,7 @@
 #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"
@@ -28,7 +28,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 +46,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 +76,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 (!ly_vector_p (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 +88,13 @@ Break_align_interface::ordered_elements (Grob *grob)
     Copy in order specified in BREAK-ALIGN-ORDER.
   */
   Link_array<Grob> new_elts;
-  for (; ly_pair_p (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; ly_pair_p (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);
@@ -161,9 +161,9 @@ Break_align_interface::do_alignment (Grob *grob)
        Find the first grob with a space-alist entry.
        */
       for (SCM s = l->get_property ("elements");
-          ly_pair_p (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")
@@ -171,7 +171,7 @@ Break_align_interface::do_alignment (Grob *grob)
              edge_idx = idx;
            
            SCM l =elt->get_property ("space-alist");
-           if (ly_pair_p (l))
+           if (scm_is_pair (l))
              {
                alist= l;
                break;
@@ -186,9 +186,9 @@ Break_align_interface::do_alignment (Grob *grob)
        reason.
       */
       for (SCM s = r ? r->get_property ("elements") : SCM_EOL;
-          !ly_symbol_p (rsym) && ly_pair_p (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 +197,14 @@ Break_align_interface::do_alignment (Grob *grob)
        edge_idx = next_idx;
 
       SCM entry = SCM_EOL;
-      if (ly_symbol_p (rsym))
+      if (scm_is_symbol (rsym))
        entry = scm_assq (rsym, alist);
 
-      bool entry_found = ly_pair_p (entry);
+      bool entry_found = scm_is_pair (entry);
       if (!entry_found)
        {
          String sym_string;
-         if (ly_symbol_p (rsym))
+         if (scm_is_symbol (rsym))
            sym_string = ly_symbol2string (rsym);
 
          String orig_string ;
@@ -221,10 +221,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)