* Documentation/user/notation.itely (Bar lines): Added a note that

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

diff --git a/lily/break-align-interface.cc b/lily/break-align-interface.cc
index a18681bcdffa5dc6fe63852ea06aea27d15d87b1..bcd62a73fc380cffbcb4e6e2ccb47ef0441df9cb 100644 (file)
--- a/lily/break-align-interface.cc
+++ b/lily/break-align-interface.cc
@@ -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 (; scm_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; scm_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);
@@ -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");
-          scm_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")
@@ -186,9 +186,9 @@ Break_align_interface::do_alignment (Grob *grob)
        reason.
       */
       for (SCM s = r ? r->get_property ("elements") : SCM_EOL;
-          !scm_is_symbol (rsym) && scm_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");
        }
@@ -221,10 +221,10 @@ Break_align_interface::do_alignment (Grob *grob)
       
       if (entry_found)
        {
-         entry = ly_cdr (entry);
+         entry = scm_cdr (entry);
          
-         distance = scm_to_double (ly_cdr (entry));
-         type = ly_car (entry) ;
+         distance = scm_to_double (scm_cdr (entry));
+         type = scm_car (entry) ;
        }
 
       if (r)