(make_standard_accidental): only add

support for side-axis is X_AXIS. Fixes text-spacing-accidental.ly

diff --git a/ChangeLog b/ChangeLog
index 8be56f5dd1389bc5712260186476da68cd8a248c..7ec53b95b14fa4f99727a4281e8ccb016c81f787 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-03-02  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/accidental-engraver.cc (make_standard_accidental): only add
+       support for side-axis is X_AXIS. Fixes text-spacing-accidental.ly
+
        * mf/GNUmakefile ($(outdir)/emmentaler-%.otf
        $(outdir)/emmentaler-%.svg): rewrite without functions; too many
        Make incompatibilities.

diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index 729f0466612aa5e8a951306cd6ebd5a343e99b3e..05990a6853dcd6b38396376996c16be53d16566d 100644 (file)
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -408,7 +408,14 @@ Accidental_engraver::make_standard_accidental (Music *note,
     so it is put left of the accidentals.
   */
   for (vsize i = 0; i < left_objects_.size (); i++)
-    Side_position_interface::add_support (left_objects_[i], a);
+    {
+      if (left_objects_[i]->get_property ("side-axis") == scm_from_int (X_AXIS))
+       Side_position_interface::add_support (left_objects_[i], a);
+    }
+
+  /*
+    Hmm. Junkme? 
+   */
   for (vsize i = 0; i < right_objects_.size (); i++)
     Side_position_interface::add_support (a, right_objects_[i]);
 
@@ -586,6 +593,7 @@ ADD_ACKNOWLEDGER (Accidental_engraver, rhythmic_head);
 ADD_ACKNOWLEDGER (Accidental_engraver, tie);
 
 ADD_TRANSLATOR (Accidental_engraver,
+               
                "Make accidentals.  "
                "Catch note heads, ties and notices key-change events.  "
                "This engraver usually lives at Staff level, but "