* lily/beam.cc (least_squares): Add comment.

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

diff --git a/lily/break-align-interface.cc b/lily/break-align-interface.cc
index a4205c00c77dc6928294d94b7c151773f779b454..c29c74b2407c6b12dfba9ecb06ddc03699f45d8e 100644 (file)
--- a/lily/break-align-interface.cc
+++ b/lily/break-align-interface.cc
@@ -52,7 +52,7 @@ Break_align_interface::self_align_callback (SCM element_smob, SCM axis)
   Direction bsd = item->break_status_dir ();
   if (bsd == LEFT)
     {
-      me->set_grob_property ("self-alignment-X", gh_int2scm (RIGHT));
+      me->set_grob_property ("self-alignment-X", scm_int2num (RIGHT));
     }
 
   /*
@@ -155,17 +155,17 @@ Break_align_interface::do_alignment (Grob *me)
       bool entry_found = gh_pair_p (entry);
       if (!entry_found)
        {
-         String sym_str;
-         if(gh_symbol_p(rsym))
-           sym_str = ly_symbol2string (rsym);
+         String sym_string;
+         if(gh_symbol_p (rsym))
+           sym_string = ly_symbol2string (rsym);
 
-         String orig_str ;
+         String orig_string ;
          if (unsmob_grob (l->get_grob_property ("cause")))
-           orig_str = unsmob_grob (l->get_grob_property ("cause"))->name ();
+           orig_string = unsmob_grob (l->get_grob_property ("cause"))->name ();
          
          programming_error (_f("No spacing entry from %s to `%s'",
-                               orig_str.ch_C (),
-                               sym_str.ch_C()));
+                               orig_string.to_str0 (),
+                               sym_string.to_str0 ()));
        }
 
       Real distance = 1.0;