From 308a86cda5161be44ab0b831b02ec01ef7e800b8 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Tue, 26 Mar 2002 22:24:06 +0000
Subject: [PATCH] lilypond-1.1.63

---
 lily/include/ly-symbols.hh | 1 +
 lily/lyric-engraver.cc     | 3 ++-
 lily/spacing-engraver.cc   | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lily/include/ly-symbols.hh b/lily/include/ly-symbols.hh
index 28d10c7745..1a35162ab1 100644
--- 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 7171fc7200..37aa4065ee 100644
--- 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 a7785e47b4..8b6b4c893d 100644
--- 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 ());
-- 
2.39.5