* lily/side-position-interface.cc (aligned_side): multiply

staff_radius by 2.

* lily/script-engraver.cc (make_script_from_event): allow setting
values to '()

diff --git a/ChangeLog b/ChangeLog
index 37db40a761e43752e7df9aa225b0632df8cc41f2..50131f03815bfcded58d8eee3c1883c3e4c18ce6 100644 (file)
--- 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 6baa67bfc05d8d20536fc4b18d88afe63499780d..65de9a73dcff7460b0048ae72b713a03b9edacd5 100644 (file)
--- 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 7d4ab573d3aad19afc663490a4760149d3232c92..081b6559e93a2fdf16e5b82bc6bf13e31f1fad71 100644 (file)
--- 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 ae503621bc6017a8da7e60bb0453ff2dadcfb0e2..4abda7780ff7595747ad500869b9f9770645e8e4 100644 (file)
--- 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" .