From 12f5c8bdbeaef45fd41ae6f1d410cbe3f5b68a52 Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Sat, 19 Nov 2005 10:42:29 +0000
Subject: [PATCH] * lily/side-position-interface.cc (aligned_side): multiply
 staff_radius by 2.

* lily/script-engraver.cc (make_script_from_event): allow setting
values to '()
---
 ChangeLog                       | 8 ++++++++
 lily/script-engraver.cc         | 3 ++-
 lily/side-position-interface.cc | 6 +++---
 scm/script.scm                  | 1 +
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 37db40a761..50131f0381 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-19  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* lily/side-position-interface.cc (aligned_side): multiply
+	staff_radius by 2.
+
+	* lily/script-engraver.cc (make_script_from_event): allow setting
+	values to '()
+
 2005-11-18  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* lily/system-start-delimiter.cc (line_bracket): don't shorten height.
diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index 6baa67bfc0..65de9a73dc 100644
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -132,7 +132,8 @@ void make_script_from_event (Grob *p,  Context *tg,
 	}
 
       SCM preset = p->get_property_data (sym);
-      if (scm_call_1 (type, preset) == SCM_BOOL_F)
+      if (val == SCM_EOL
+	  || scm_call_1 (type, preset) == SCM_BOOL_F)
 	p->internal_set_property (sym, val);
     }
 
diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index 7d4ab573d3..081b6559e9 100644
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -103,8 +103,8 @@ Side_position_interface::general_side_position (Grob *me, Axis a, bool use_exten
       && total_off * dir < minimum_space)
     total_off = minimum_space * dir;
   
-  /* FIXME: 100CM should relate to paper size.  */
-  if (fabs (total_off) > 100 CM)
+  /* FIXME: 1000 should relate to paper size.  */
+  if (fabs (total_off) > 1000)
     {
       String msg
 	= String_convert::form_string ("Improbable offset for grob %s: %f%s",
@@ -180,7 +180,7 @@ Side_position_interface::aligned_side (Grob*me, Axis a)
 	  Real rounded = directed_round (position, dir);
 	  Grob *head = me->get_parent (X_AXIS);
       
-	  if (rounded <= Staff_symbol_referencer::staff_radius (me) 
+	  if (rounded <= 2 * Staff_symbol_referencer::staff_radius (me) 
 	      || (Note_head::has_interface (head)
 		  && sign (Staff_symbol_referencer::get_position (head)) == - dir))
 	    {
diff --git a/scm/script.scm b/scm/script.scm
index ae503621bc..4abda7780f 100644
--- a/scm/script.scm
+++ b/scm/script.scm
@@ -21,6 +21,7 @@
 	   (side-relative-direction . -1)))	 
 	 ("marcato" .
 	  ((script-stencil . (feta . ("dmarcato" . "umarcato")))
+;	   (staff-padding . ())
 	   (quantize-position . #t)
 	   (side-relative-direction .  -1)))
 	 ("staccatissimo" .
-- 
2.39.5