From: fred <fred>
Date: Tue, 26 Mar 2002 22:26:13 +0000 (+0000)
Subject: lilypond-1.2.9
X-Git-Tag: release/1.5.59~2148
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5975f364247f4fe190283df7b9b21588f0b50374;p=lilypond.git

lilypond-1.2.9
---

diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index e8e2e8dd85..9c5749b892 100644
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -41,13 +41,12 @@ Script_engraver::do_process_requests()
     {
       Articulation_req* l=script_req_l_arr_[i];
 
-
       SCM list = ly_ch_C_eval_scm (("(articulation-to-scriptdef \"" + l->articulation_str_ + "\")").ch_C());
       
       if (list == SCM_BOOL_F)
 	{
-	  l->warning(_f("don't know how to interpret articulation `%s'\n",
-			l->articulation_str_.ch_C()));
+	  l->warning (_f ("Don't know how to interpret articulation `%s'",
+			l->articulation_str_.ch_C ()));
 	  continue;
 	}
       Script *p =new Script;
@@ -85,14 +84,13 @@ Script_engraver::do_process_requests()
 	  padding = (Real)paddingprop;
 	}
 
-
       Scalar axisprop = get_property ("scriptHorizontal",0);
       if (axisprop.to_bool ())
 	ss->axis_ = X_AXIS;
 
       if (follow_staff && !axisprop.to_bool ())
 	ss->set_elt_property (no_staff_support_scm_sym, SCM_BOOL_T);
-      
+
       p->set_staff_side (ss);
       ss->set_elt_property (script_priority_scm_sym, priority);
       if (padding)
@@ -127,6 +125,10 @@ Script_engraver::acknowledge_element (Score_element_info inf)
 	    {
 	      ss->set_parent (inf.elem_l_, X_AXIS);
 	    }
+	  if (ss->axis_ == X_AXIS
+	      && !ss->parent_l (Y_AXIS))
+	    ss->set_parent (rh, Y_AXIS);
+	  
 	  ss->add_support (rh);
 	}
     }