release: 1.2.8

[lilypond.git] / lily / axis-group-engraver.cc

diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index 44b85b416e7ac3fc5e7b9a2463ce92bd4dc246f1..ad7e9784bb75aa90f5e17276cf6eb4b72392213c 100644 (file)
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -8,7 +8,7 @@
 
 #include "axis-group-engraver.hh"
 #include "axis-group-spanner.hh"
-#include "p-col.hh"
+#include "paper-column.hh"
 
 Axis_group_engraver::Axis_group_engraver ()
 {
@@ -40,10 +40,7 @@ Axis_group_engraver::do_removal_processing ()
 void
 Axis_group_engraver::acknowledge_element (Score_element_info i)
 {
-  if (!i.elem_l_->parent_l (Y_AXIS))
-    {
-      elts_.push (i.elem_l_);
-    }
+  elts_.push (i.elem_l_);
 }
 
 void
@@ -53,6 +50,14 @@ Axis_group_engraver::process_acknowledged ()
     {
       if (!elts_[i]->parent_l (Y_AXIS))
        staffline_p_->add_element (elts_[i]);
+
+      /* UGH UGH UGH */
+      else if (elts_[i]->get_elt_property (ly_symbol ("Axis_group_element::add_extra_element")) == SCM_BOOL_F
+              && ! dynamic_cast<Axis_group_element*> (elts_[i]->parent_l (Y_AXIS)))
+              
+       {
+         staffline_p_->add_extra_element (elts_[i]);
+       }
     }
   elts_.clear ();
 }