From 4a3214c0bebc4d492352b8d8069b093daf498391 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Tue, 26 Mar 2002 23:22:31 +0000
Subject: [PATCH] lilypond-1.3.57

---
 lily/local-key-engraver.cc          | 2 +-
 lily/multi-measure-rest-engraver.cc | 2 +-
 lily/staff-symbol-referencer.cc     | 4 +++-
 lily/text-engraver.cc               | 6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lily/local-key-engraver.cc b/lily/local-key-engraver.cc
index 8a5678fe1b..192baaee47 100644
--- a/lily/local-key-engraver.cc
+++ b/lily/local-key-engraver.cc
@@ -124,7 +124,7 @@ Local_key_engraver::process_acknowledged ()
 	    {
 	      if (!key_item_p_) 
 		{
-		  key_item_p_ = new Local_key_item (SCM_EOL);
+		  key_item_p_ = new Local_key_item (get_property ("basicLocalKeyProperties"));
 		  Side_position_interface (key_item_p_).set_axis (X_AXIS);
 		  Side_position_interface (key_item_p_).set_direction (LEFT);
 		  staff_symbol_referencer(key_item_p_).set_interface ();
diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc
index 5941e43ec8..943092d400 100644
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -109,7 +109,7 @@ Multi_measure_rest_engraver::do_process_music ()
 
   if (busy_span_req_l_ && !mmrest_p_)
     {
-      mmrest_p_ = new Multi_measure_rest (SCM_EOL);
+      mmrest_p_ = new Multi_measure_rest (get_property ("basicMultiMeasureRestProperties"));
       Staff_symbol_referencer_interface si (mmrest_p_);
       si.set_interface ();
 
diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index 9c52f04256..ba6d15a7d8 100644
--- a/lily/staff-symbol-referencer.cc
+++ b/lily/staff-symbol-referencer.cc
@@ -21,7 +21,9 @@ Staff_symbol_referencer_interface::Staff_symbol_referencer_interface (Score_elem
 void
 Staff_symbol_referencer_interface::set_interface ()
 {
-  elt_l_->set_elt_property ("staff-position", gh_double2scm (0.0));
+  if (!gh_number_p (elt_l_->get_elt_property ("staff-position")))
+      elt_l_->set_elt_property ("staff-position", gh_double2scm (0.0));
+      
   elt_l_->add_offset_callback (callback, Y_AXIS);
 }
 
diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index a3d72332f9..a0390bd6a2 100644
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -78,7 +78,7 @@ Text_engraver::do_process_music ()
     {
       Text_script_req * r = reqs_[i];
 
-      Text_item *text = new Text_item (SCM_EOL);
+      Text_item *text = new Text_item (get_property ("basicTextScriptProperties"));
       Side_position_interface stafy (text);
 
       SCM axisprop = get_property ("scriptHorizontal");
@@ -106,9 +106,9 @@ Text_engraver::do_process_music ()
 	text->set_elt_property ("style", ly_str02scm (r->style_str_.ch_C()));
       
       SCM empty = get_property ("textNonEmpty");
-      if (!to_boolean (empty))
+      if (to_boolean (empty))
 	{
-	  text->set_elt_property ("no-spacing-rods" , SCM_BOOL_T);
+	  text->set_elt_property ("no-spacing-rods" , SCM_BOOL_F);
 	  text->set_extent_callback (0, X_AXIS);
 	}
       announce_element (Score_element_info (text, r));
-- 
2.39.5