(find_font): Add "lm" to try-AFM-first

[lilypond.git] / lily / separation-item.cc

diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index 5024a98a705319681a5f6e0f70f61cfd1a6a1628..c77a3564355ac4a05ea7192346f889c401b8902c 100644 (file)
--- a/lily/separation-item.cc
+++ b/lily/separation-item.cc
@@ -8,6 +8,7 @@
  */
 
 #include "separation-item.hh"
+
 #include "paper-column.hh"
 #include "warn.hh"
 #include "group-interface.hh"
@@ -40,9 +41,9 @@ Separation_item::conditional_width (Grob * me, Grob * left)
   Paper_column * pc = item->get_column ();
   
   
-  for (SCM s =  me->get_property ("conditional-elements"); is_pair (s); s = ly_cdr (s))
+  for (SCM s =  me->get_property ("conditional-elements"); scm_is_pair (s); s = scm_cdr (s))
     {
-      SCM elt = ly_car (s);
+      SCM elt = scm_car (s);
       if (!unsmob_grob (elt))
        continue;
       
@@ -84,9 +85,9 @@ Separation_item::width (Grob *me)
   Paper_column * pc = item->get_column ();
   Interval w;
   
-  for (SCM s =  me->get_property ("elements"); is_pair (s); s = ly_cdr (s))
+  for (SCM s =  me->get_property ("elements"); scm_is_pair (s); s = scm_cdr (s))
     {
-      SCM elt = ly_car (s);
+      SCM elt = scm_car (s);
       if (!unsmob_grob (elt))
        continue;
 
@@ -140,11 +141,11 @@ Separation_item::extremal_break_aligned_grob (Grob *separation_item, Direction d
   last_ext->set_empty ();
   Grob *last_grob = 0;
   for (SCM s = separation_item->get_property ("elements");
-       is_pair (s); s = ly_cdr (s))
+       scm_is_pair (s); s = scm_cdr (s))
     {
-      Grob * break_item = unsmob_grob (ly_car (s));
+      Grob * break_item = unsmob_grob (scm_car (s));
       
-      if (!is_symbol (break_item->get_property ("break-align-symbol")))
+      if (!scm_is_symbol (break_item->get_property ("break-align-symbol")))
        continue;
 
       Interval ext = break_item->extent (col, X_AXIS);