catch GUILE errors

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

diff --git a/lily/voice-devnull-engraver.cc b/lily/voice-devnull-engraver.cc
index d580a91b2fdb46067f6edea91900004cfc3612fd..eb47ba180b62ece70bbacdf1d97c2a6fa4f7de51 100644 (file)
--- a/lily/voice-devnull-engraver.cc
+++ b/lily/voice-devnull-engraver.cc
@@ -27,6 +27,7 @@ static char const *eat_spanners[] = {
   "beam",
   "crescendo",
   "decrescendo",
+  "rest",
   "slur",
   0
 };
@@ -35,15 +36,16 @@ bool
 Voice_devnull_engraver::try_music (Music *m)
 {
   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"))
+  if (gh_equal_p (s, ly_symbol2scm ("always"))
       || (s == SCM_EOL
-         && daddy_trans_l_->id_str_.left_str (3) == "two"
+         && daddy_trans_->id_string_.left_string (3) == "two"
          && (to_boolean (get_property ("unison"))
              || to_boolean (get_property ("unisilence")))))
     {
@@ -89,16 +91,29 @@ Voice_devnull_engraver::acknowledge_grob (Grob_info i)
     return;
 #endif
 
-  if (s == ly_symbol2scm ("allways")
+#if 0  /* We used to have have this until 1.5.68.  Not sure about
+         soloADue requirement */
+  if (s == ly_symbol2scm ("always")
       || (s == SCM_EOL
-         && daddy_trans_l_->id_str_.left_str (3) == "two"
+         && daddy_trans_->id_string_.left_string (3) == "two"
          && (to_boolean (get_property ("unison"))
              || to_boolean (get_property ("unisilence")))))
+#else
+    if (s == ly_symbol2scm ("always")
+       || (s == SCM_EOL
+           && to_boolean (get_property ("soloADue"))
+           && ((daddy_trans_->id_string_.left_string (3) == "two"
+                && (to_boolean (get_property ("unison"))
+                    || to_boolean (get_property ("unisilence"))))
+               
+               /* Maybe this should be optional? */
+             || to_boolean (get_property ("othersolo")))))
+#endif
+    
     for (char const **p = junk_interfaces; *p; p++)
-      if (i.grob_l_->has_interface (ly_symbol2scm (*p)))
+      if (i.grob_->internal_has_interface (ly_symbol2scm (*p)))
        {
-         /* Ugh, we can suicide them, but they remain living */
-         i.grob_l_->suicide ();
+         i.grob_->suicide ();
          return;
        }
 }