lilypond-0.1.54

diff --git a/bin/wild-perl b/bin/wild-perl
index ede94c23fc5c85db16b38a933bdcc9cfead0e441..526242583439c6f3e50678481c60716781aef9b1 100644 (file)
--- a/bin/wild-perl
+++ b/bin/wild-perl
@@ -45,5 +45,5 @@ while (<>) {
 
 print "\$(srcdir)/Makefile.am: \$(srcdir)/Makefile.am.wild\n" .
 #    "\t\$(PERL) $my_topsrcdir/bin/wild-perl --top-srcdir=\"\$(real_topsrcdir)\" < \$< > \$@";
-    "\t\$(PERL) $my_topsrcdir/bin/wild-perl < \$< > \$@";
+    "\t\$(PERL) $my_topsrcdir/bin/wild-perl < \$< > \$@\n";
 

diff --git a/lily/script-column.cc b/lily/script-column.cc
index 6f9359aef7c46fce45dd5b706746c304097dc62a..47a508e2c28c90beb348bbfe2d9480667ba52f0f 100644 (file)
--- a/lily/script-column.cc
+++ b/lily/script-column.cc
@@ -11,7 +11,7 @@
 #include "script.hh"
 #include "note-head.hh"
 #include "stem.hh"
-
+#include "general-script-def.hh"
 
 IMPLEMENT_IS_TYPE_B1(Script_column,Horizontal_vertical_group_item);
 
@@ -53,7 +53,8 @@ Script_column::do_pre_processing()
   for (int i=0; i < script_l_arr_.size(); i++) 
     {
       Script*s_l = script_l_arr_[i];
-      placed_l_arr_a[idx (s_l->inside_staff_b_ , s_l->dir_) ].push (s_l);
+      placed_l_arr_a[idx (s_l->specs_l_->inside_b(),
+                         s_l->dir_) ].push (s_l);
     }
   
   for (int j =0; j <4; j++)