release: 1.3.129

[lilypond.git] / lily / voice-devnull-engraver.cc

diff --git a/lily/voice-devnull-engraver.cc b/lily/voice-devnull-engraver.cc
index ed5e782706b56c44820057833212bcfccff4ec24..b3414f531d2475bbd6494aa2b20f625d49305ef0 100644 (file)
--- a/lily/voice-devnull-engraver.cc
+++ b/lily/voice-devnull-engraver.cc
@@ -17,35 +17,85 @@ public:
   VIRTUAL_COPY_CONS (Translator);
   
 protected:
-  virtual void acknowledge_element (Score_element_info);
+  virtual bool try_music (Music *m);
+  virtual void acknowledge_grob (Grob_info);
 };
 
 ADD_THIS_TRANSLATOR (Voice_devnull_engraver);
 
-void
-Voice_devnull_engraver::acknowledge_element (Score_element_info i)
+static char const *eat_spanners[] = {
+  "beam-interface",
+  "slur",
+  "tie",
+  "dynamic-interface",
+  "crescendo-interface",
+  0
+};
+
+bool
+Voice_devnull_engraver::try_music (Music *m)
 {
-  if (daddy_trans_l_->id_str_ == "two"
-      && (to_boolean (get_property ("unison"))
-         || to_boolean (get_property ("unisilence"))))
+  SCM s = get_property ("devNullVoice");
+#if 0
+  /* No need */
+  if (gh_equal_p (s, ly_symbol2scm ("never")))
+    return;
+#endif
+
+  if (gh_equal_p (s, ly_symbol2scm ("allways"))
+      || (s == SCM_EOL
+         && daddy_trans_l_->id_str_.left_str (3) == "two"
+         && (to_boolean (get_property ("unison"))
+             || to_boolean (get_property ("unisilence")))))
     {
-      static char const *junk[] = {
-       //      "beam-interface",
-       "slur-interface",
-       "tie-interface",
-       "text-item-interface",
-       "text-script-interface",
-       "dynamic-interface",
-       "crescendo-interface",
-       0
-      };
-      for (char const **p = junk; *p; *p++)
+      for (char const **p = eat_spanners; *p; p++)
        {
-         if (i.elem_l_->has_interface (ly_symbol2scm (*p)))
+         if (Span_req *s = dynamic_cast <Span_req *> (m))
            {
-             i.elem_l_->suicide ();
-             return;
+             if (scm_equal_p (s->get_mus_property ("span-type"),
+                              ly_str02scm ( *p)) == SCM_BOOL_T)
+               {
+                 return true;
+               }
            }
        }
     }
+  return false;
+}
+  
+static char const *junk_interfaces[] = {
+#if 0
+  "beam-interface",
+#endif
+  "slur-interface",
+  "tie-interface",
+  "text-item-interface",
+  "text-script-interface",
+  "dynamic-interface",
+  "crescendo-interface",
+  0
+};
+
+void
+Voice_devnull_engraver::acknowledge_grob (Grob_info i)
+{
+  SCM s = get_property ("devNullVoice");
+#if 0
+  /* No need */
+  if (gh_equal_p (s, ly_symbol2scm ("never")))
+    return;
+#endif
+
+  if (gh_equal_p (s, ly_symbol2scm ("allways"))
+      || (gh_equal_p (s, ly_symbol2scm ("unisolo"))
+         && daddy_trans_l_->id_str_.left_str (3) == "two"
+         && (to_boolean (get_property ("unison"))
+             || to_boolean (get_property ("unisilence")))))
+    for (char const **p = junk_interfaces; *p; p++)
+      if (i.elem_l_->has_interface (ly_symbol2scm (*p)))
+       {
+         i.elem_l_->suicide ();
+         return;
+       }
 }
+