release: 1.3.6

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

diff --git a/lily/break-align-item.cc b/lily/break-align-item.cc
index dd6ab6490db031c79ab086750c3d29a7b58e585d..1d6c6cb89103860179deb40d423f29eb09afc148 100644 (file)
--- a/lily/break-align-item.cc
+++ b/lily/break-align-item.cc
@@ -17,8 +17,6 @@
 /*
   Handle spacing for prefatory matter. 
 
-
-
   TODO: rewrite this.  It is kludgy
 */
 
@@ -68,7 +66,7 @@ Break_align_item::do_pre_processing()
        next_origin = ly_str02scm ("begin-of-note");
       
       SCM extra_space
-       = scm_eval (scm_listify (ly_symbol ("break-align-spacer"),
+       = scm_eval (scm_listify (ly_symbol2scm ("break-align-spacer"),
                                 current_origin, next_origin, SCM_UNDEFINED)); 
       SCM symbol = SCM_CAR (extra_space);
       Real spc = gh_scm2double (SCM_CADR(extra_space));
@@ -113,12 +111,12 @@ Break_align_item::do_pre_processing()
   
   Real stretch_distance =0.;
   
-  if (SCM_CAR (symbol_list) == gh_symbol2scm ("extra-space"))
+  if (SCM_CAR (symbol_list) == ly_symbol2scm ("extra-space"))
     {
       spring_len += dists.top ();
       stretch_distance = dists.top ();
     }
-  else if (SCM_CAR (symbol_list) == gh_symbol2scm ("minimum-space"))
+  else if (SCM_CAR (symbol_list) == ly_symbol2scm ("minimum-space"))
     {
       spring_len = spring_len >? dists.top ();
       stretch_distance = spring_len;