Fix some bugs in the dynamic engraver and PostScript backend

diff --git a/ChangeLog b/ChangeLog
index 82ecabb76718eb6d6b8664f5940d5f1b7841df04..88550130b7f3a96b7ea9e1567077cba7817d37ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-31  Erlend Aasland  <erlenda@gmail.com>
+
+       * dynamic-engraver.cc: fix bug (dynamics collide with accidentals)
+
+       * scm/output-ps.scm (repeat-slash): fix a bug that made repeat slash beams
+       too wide.
+
 2006-05-30  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * lily/relocate.cc (read_relocation_dir): Do not blindly

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 6720e777454fd1a2c95da545ddd4c62652dd1186..ab242f653c0c760d1247bcd8eb30739a988fc8a9 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -61,6 +61,7 @@ class Dynamic_engraver : public Engraver
   void typeset_all ();
 
   TRANSLATOR_DECLARATIONS (Dynamic_engraver);
+  DECLARE_ACKNOWLEDGER (accidental);
   DECLARE_ACKNOWLEDGER (script);
   DECLARE_ACKNOWLEDGER (stem_tremolo);
   DECLARE_ACKNOWLEDGER (note_column);
@@ -386,6 +387,14 @@ Dynamic_engraver::typeset_all ()
 }
 
 
+void
+Dynamic_engraver::acknowledge_accidental (Grob_info info)
+{
+  if (line_spanner_)
+    Side_position_interface::add_support (line_spanner_, info.grob ());
+}
+
+
 void
 Dynamic_engraver::acknowledge_stem_tremolo (Grob_info info)
 {
@@ -459,6 +468,7 @@ Dynamic_engraver::acknowledge_script (Grob_info info)
     Side_position_interface::add_support (line_spanner_, info.grob ());
 }
 
+ADD_ACKNOWLEDGER (Dynamic_engraver, accidental);
 ADD_ACKNOWLEDGER (Dynamic_engraver, script);
 ADD_ACKNOWLEDGER (Dynamic_engraver, note_column);
 ADD_ACKNOWLEDGER (Dynamic_engraver, slur);

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index d7c55df028d4e1bae257ba6ba121f784d214b5ee..2e8c78e2d5f9ba4b161c040c8de8085ed31d7cf5 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -240,7 +240,7 @@
   (define (euclidean-length x y)
     (sqrt (+ (* x x) (* y y))))
 
-  (let ((x-width (euclidean-length slope (/ beam-thickness slope)))
+  (let ((x-width (euclidean-length beam-thickness (/ beam-thickness slope)))
        (height (* width slope)))
     (format #f "~a draw_repeat_slash"
            (numbers->string4 (list x-width width height)))))