* lily/rest.cc (y_offset_callback): only use direction if

staff-position wasn't set before.

* scm/define-grobs.scm (all-grob-descriptions): reinstate neutral
direction for stems.

diff --git a/ChangeLog b/ChangeLog
index 65250ca46346aa2f3f14c798bc5673537c22fb9e..4ff54c472b536028795b8c5385c64f478b329dbe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-03-16  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/rest.cc (y_offset_callback): only use direction if
+       staff-position wasn't set before.
+
        * lily/bar-number-engraver.cc: add support for
        barNumberAlignSymbol. 
        add ADD_ACKNOWLEDGER() call for break_aligned. Fixes bar-number-breathe

diff --git a/lily/rest.cc b/lily/rest.cc
index 8d6cba506858f01f4fcccaf23af98d5dc4d4fcf7..b274aab8725d90ab16f73616fdf7e0228e949dfd 100644 (file)
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -29,6 +29,8 @@ Rest::y_offset_callback (SCM smob)
 
   Real amount = robust_scm2double (me->get_property ("staff-position"), 0)
     * 0.5 * ss;
+  bool position_override = amount;
+  
   if (line_count % 2)
     {
       if (duration_log == 0 && line_count > 1)
@@ -46,10 +48,11 @@ Rest::y_offset_callback (SCM smob)
   if (dot && duration_log >= -1 && duration_log <= 1) // UGH again.
     {
       dot->set_property ("staff-position",
-                      scm_from_int ((duration_log == 0) ? -1 : 1));
+                        scm_from_int ((duration_log == 0) ? -1 : 1));
     }
 
-  amount += 2 * ss * get_grob_direction (me);; 
+  if (!position_override)
+    amount += 2 * ss * get_grob_direction (me);; 
   
   return scm_from_double (amount);
 }

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index eb54bfbec8b1e885ffae78a2137f2ebaa34a8e05..8fd355b2693348809993f7392c96387aeebd2e4a 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1552,7 +1552,9 @@
     (SystemStartBar
      . (
        (Y-extent . #f)
-       (padding . 0.0)
+
+       ;; ugh--hardcoded. 
+       (padding . -0.1)  ;; bar must cover rounded ending of staff line.
        (X-offset . ,ly:side-position-interface::x-aligned-side)
        (direction . ,LEFT)
        (style . bar-line)