From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 16 Mar 2006 15:45:39 +0000 (+0000)
Subject: * lily/rest.cc (y_offset_callback): only use direction if
X-Git-Tag: release/2.7.39~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=975edd40c3fb51106679f6463c8e3dfae3811811;p=lilypond.git

* 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 65250ca463..4ff54c472b 100644
--- 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 8d6cba5068..b274aab872 100644
--- 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 eb54bfbec8..8fd355b269 100644
--- 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)