X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreak-align-interface.cc;h=0a1678172eca7252366ac07db687b9dcba28f446;hb=9a38b47c4a4589f2e7c413fcdfff83de454719e6;hp=fd2ae3e9f5fcecc6cbf85080f7a3d1adbfe7cda4;hpb=c380a7abde14a60ebd6d8a6eab91ae4e13677a23;p=lilypond.git

diff --git a/lily/break-align-interface.cc b/lily/break-align-interface.cc
index fd2ae3e9f5..0a1678172e 100644
--- a/lily/break-align-interface.cc
+++ b/lily/break-align-interface.cc
@@ -58,7 +58,7 @@ Break_align_interface::self_align_callback (SCM element_smob, SCM axis)
   /*
     Force break alignment itself to be done first, in the case
    */
-  return Side_position_interface::aligned_on_self (element_smob, axis);  
+  return Self_alignment_interface::aligned_on_self (element_smob, axis);  
 }
 
 void
@@ -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;
@@ -215,7 +215,6 @@ Break_align_interface::do_alignment (Grob *me)
 }
 
 
-
 ADD_INTERFACE (Break_aligned_interface, "break-aligned-interface",
   "Items that are aligned in prefatory matter.
 
@@ -229,6 +228,10 @@ of the associated space. The space definition is either (extra-space
 Special keys for the alist are 'first-note and 'next-note, signifyign
 the first note on a line, and the next note halfway a line.
 
+Rules for this spacing are much more complicated than this. 
+See [Wanske] page 126 -- 134, [Ross] pg 143 -- 147
+
+
 ",
   "break-align-symbol break-alignment-done space-alist");