* lily/beam.cc (set_minimum_dy): new function. Round non-zero

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

diff --git a/lily/break-align-interface.cc b/lily/break-align-interface.cc
index c4d429a008ea4f7104f33de831662d81a8b9bc40..ae9b7779c5a9e219e5f40e7c57fad5b1c70f3a02 100644 (file)
--- a/lily/break-align-interface.cc
+++ b/lily/break-align-interface.cc
@@ -186,7 +186,7 @@ Break_align_interface::do_alignment (Grob *grob)
        reason.
       */
       for (SCM s = r ? r->get_property ("elements") : SCM_EOL;
-          !ly_c_symbol_p (rsym) && ly_c_pair_p (s); s = ly_cdr (s))
+          !scm_is_symbol (rsym) && ly_c_pair_p (s); s = ly_cdr (s))
        {
          Grob * elt =unsmob_grob (ly_car (s));
 
@@ -197,14 +197,14 @@ Break_align_interface::do_alignment (Grob *grob)
        edge_idx = next_idx;
 
       SCM entry = SCM_EOL;
-      if (ly_c_symbol_p (rsym))
+      if (scm_is_symbol (rsym))
        entry = scm_assq (rsym, alist);
 
       bool entry_found = ly_c_pair_p (entry);
       if (!entry_found)
        {
          String sym_string;
-         if (ly_c_symbol_p (rsym))
+         if (scm_is_symbol (rsym))
            sym_string = ly_symbol2string (rsym);
 
          String orig_string ;
@@ -223,7 +223,7 @@ Break_align_interface::do_alignment (Grob *grob)
        {
          entry = ly_cdr (entry);
          
-         distance = ly_scm2double (ly_cdr (entry));
+         distance = scm_to_double (ly_cdr (entry));
          type = ly_car (entry) ;
        }