lilypond-1.1.63

diff --git a/lily/include/ly-symbols.hh b/lily/include/ly-symbols.hh
index 28d10c77459cf807dab07f58f9b5835f91e60e70..1a35162ab1c2b6b8ad7ded8de1b58e4e5d78f01f 100644 (file)
--- a/lily/include/ly-symbols.hh
+++ b/lily/include/ly-symbols.hh
@@ -54,6 +54,7 @@ DECLARE_LY_SYMBOL(minimum_space);
 DECLARE_LY_SYMBOL(molecule);
 DECLARE_LY_SYMBOL(notewidth);
 DECLARE_LY_SYMBOL(non_default);
+DECLARE_LY_SYMBOL(non_rhythmic);
 DECLARE_LY_SYMBOL(octave_dir);
 DECLARE_LY_SYMBOL(origin);
 DECLARE_LY_SYMBOL(output);

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 7171fc7200e1296644eb6f703bed7c14ea2e06e4..37aa4065ee24ce62d85db7b532c56e07f11010ce 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -42,12 +42,13 @@ Lyric_engraver::do_process_requests()
     {
       text_p_=  new Text_item;
       text_p_->text_str_ = req_l_->text_str_;
-
       text_p_->text_str_ += " ";       // ugh.
 
       Scalar style = get_property ("textStyle", 0);
       if (style.length_i ())
        text_p_->style_str_ = style;
+
+      text_p_->set_elt_property (non_rhythmic_scm_sym, SCM_BOOL_T);
       
       announce_element (Score_element_info (text_p_, req_l_));
     }

diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc
index a7785e47b47aba98cc1b13b10fe4a8d64a776227..8b6b4c893de2f761d950617a8988da37b06b7ffb 100644 (file)
--- a/lily/spacing-engraver.cc
+++ b/lily/spacing-engraver.cc
@@ -55,6 +55,9 @@ Spacing_engraver::acknowledge_element (Score_element_info i)
   if (i.elem_l_->get_elt_property (grace_scm_sym) != SCM_BOOL_F)
     return;
 
+  if (i.elem_l_->get_elt_property (non_rhythmic_scm_sym) != SCM_BOOL_F)
+    return;
+  
   if (Rhythmic_req * r = dynamic_cast<Rhythmic_req*>(i.req_l_))
     {
       Rhythmic_tuple t(i, now_mom () + r->length_mom ());