X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-engraver.cc;fp=lily%2Faxis-group-engraver.cc;h=295ba8b403284ec2d270dfc0435f27c0b855b01d;hb=0ac07f31e0f95fc18e5916ce756b9c746af7cc58;hp=10ad7f59922796e33043cca02e1d0f31567400e6;hpb=2f1263e2ccdddcac2eb9f7d8ce2ed92867d3d160;p=lilypond.git
diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index 10ad7f5992..295ba8b403 100644
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -17,9 +17,10 @@
along with LilyPond. If not, see .
*/
-#include "axis-group-engraver.hh"
+#include "engraver.hh"
#include "axis-group-interface.hh"
+#include "hara-kiri-group-spanner.hh"
#include "pointer-group-interface.hh"
#include "context.hh"
#include "international.hh"
@@ -28,11 +29,54 @@
#include "translator.icc"
+/**
+ Put stuff in a Spanner with an Axis_group_interface.
+ Use as last element of a context.
+*/
+class Axis_group_engraver : public Engraver
+{
+protected:
+ bool active_;
+ Spanner *staffline_;
+ SCM interesting_;
+ vector elts_;
+ void process_music ();
+ virtual void initialize ();
+ virtual void finalize ();
+ DECLARE_ACKNOWLEDGER (grob);
+ void process_acknowledged ();
+ virtual Spanner *get_spanner ();
+ virtual void add_element (Grob *);
+ virtual bool must_be_last () const;
+ virtual void derived_mark () const;
+
+public:
+ TRANSLATOR_DECLARATIONS (Axis_group_engraver);
+};
+
+
Axis_group_engraver::Axis_group_engraver ()
{
staffline_ = 0;
+ interesting_ = SCM_EOL;
+ active_ = false;
}
+void
+Axis_group_engraver::initialize ()
+{
+ active_ = !to_boolean (get_property ("hasAxisGroup"));
+ if (active_)
+ context ()->set_property ("hasAxisGroup", SCM_BOOL_T);
+}
+
+void
+Axis_group_engraver::derived_mark () const
+{
+ scm_gc_mark (interesting_);
+}
+
+
bool
Axis_group_engraver::must_be_last () const
{
@@ -42,12 +86,13 @@ Axis_group_engraver::must_be_last () const
void
Axis_group_engraver::process_music ()
{
- if (!staffline_)
+ if (!staffline_ && active_)
{
staffline_ = get_spanner ();
Grob *it = unsmob_grob (get_property ("currentCommandColumn"));
staffline_->set_bound (LEFT, it);
}
+ interesting_ = get_property ("keepAliveInterfaces");
}
Spanner *
@@ -71,7 +116,17 @@ Axis_group_engraver::finalize ()
void
Axis_group_engraver::acknowledge_grob (Grob_info i)
{
- elts_.push_back (i.grob ());
+ if (staffline_)
+ elts_.push_back (i.grob ());
+
+ if (staffline_ && to_boolean(staffline_->get_property("remove-empty")))
+ {
+ for (SCM s = interesting_; scm_is_pair (s); s = scm_cdr (s))
+ {
+ if (i.grob ()->internal_has_interface (scm_car (s)))
+ Hara_kiri_group_spanner::add_interesting_item (staffline_, i.grob ());
+ }
+ }
}
/*
@@ -121,8 +176,10 @@ ADD_TRANSLATOR (Axis_group_engraver,
"VerticalAxisGroup ",
/* read */
- "currentCommandColumn ",
-
+ "currentCommandColumn "
+ "keepAliveInterfaces "
+ "hasAxisGroup ",
+
/* write */
- ""
+ "hasAxisGroup "
);