lilypond-0.1.30

diff --git a/lily/bar-column-grav.cc b/lily/bar-column-grav.cc
index e86a8cee627ae85e2a7a1cf4b4d11e2a6337a6fe..8ab52f41d5a73ada4b8a4b2d41f8ec2b648ecdd7 100644 (file)
--- a/lily/bar-column-grav.cc
+++ b/lily/bar-column-grav.cc
@@ -24,34 +24,34 @@ void
 Bar_column_engraver::acknowledge_element (Score_elem_info info)
 {
   if (info.elem_l_->is_type_b (Script::static_name()) 
-       && info.req_l_->command()
-       && info.origin_grav_l_arr_.size() == 1) 
-         {
-       script_l_arr_.push ((Script*)info.elem_l_->item());
+      && info.req_l_->command()
+      && info.origin_grav_l_arr_.size() == 1) 
+    {
+      script_l_arr_.push ((Script*)info.elem_l_->item());
     }
   else 
     {
-       if  (info.origin_grav_l_arr_.size() == 1 
-            && info.elem_l_->is_type_b (Bar::static_name()))
-            bar_l_ = (Bar*)info.elem_l_->item();
+      if  (info.origin_grav_l_arr_.size() == 1 
+          && info.elem_l_->is_type_b (Bar::static_name()))
+       bar_l_ = (Bar*)info.elem_l_->item();
     }
        
   if (bar_l_ && !barcol_p_) 
     {
-       barcol_p_ = new Bar_column;
-       barcol_p_->breakable_b_ =true;
-       barcol_p_->set_bar (bar_l_);
-       announce_element (Score_elem_info (barcol_p_, 0));
+      barcol_p_ = new Bar_column;
+      barcol_p_->breakable_b_ =true;
+      barcol_p_->set_bar (bar_l_);
+      announce_element (Score_elem_info (barcol_p_, 0));
     }
 
   if  (barcol_p_) 
     {
-       for (int i=0; i < script_l_arr_.size(); i++) 
-         {
-           script_l_arr_[i]->breakable_b_ = true;
-           barcol_p_->add (script_l_arr_[i]);
-         }
-       script_l_arr_.clear();
+      for (int i=0; i < script_l_arr_.size(); i++) 
+       {
+         script_l_arr_[i]->breakable_b_ = true;
+         barcol_p_->add (script_l_arr_[i]);
+       }
+      script_l_arr_.clear();
     }
 }
 
@@ -60,8 +60,8 @@ Bar_column_engraver::do_pre_move_processing()
 {
   if (barcol_p_) 
     {
-       typeset_element (barcol_p_);
-       barcol_p_ =0;
+      typeset_element (barcol_p_);
+      barcol_p_ =0;
     }
 }
 

diff --git a/lily/script-grav.cc b/lily/script-grav.cc
index 1fed7f0299d834cb864b93e92e3f0ab7d4cc5ad1..597fe0809ab72e6130849746661621d9d4a9b177 100644 (file)
--- a/lily/script-grav.cc
+++ b/lily/script-grav.cc
@@ -9,6 +9,7 @@
 #include "musical-request.hh"
 #include "stem.hh"
 #include "staff-sym.hh"
+#include "general-script-def.hh"
 
 Script_engraver::Script_engraver()
 {
@@ -55,7 +56,9 @@ Script_engraver::do_pre_move_processing()
   for (int i=0; i < script_p_arr_.size(); i++) 
     {
       Script*script_p = script_p_arr_[i];
-      script_p->set_staffsym (s_l);
+      if (!script_p->specs_l_->inside_b())
+       script_p->add_support (s_l);
+
       typeset_element (script_p);
     }
   script_p_arr_.clear();