* Documentation/user/refman.itely: Compile fix for \mark #'(music ...).

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

diff --git a/lily/thread-devnull-engraver.cc b/lily/thread-devnull-engraver.cc
index 4006c476a243d2f539bec3039a9abb135794fef5..96e397f69f09aecfb0d20b46fdf700984a09497e 100644 (file)
--- a/lily/thread-devnull-engraver.cc
+++ b/lily/thread-devnull-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "engraver.hh"
@@ -14,34 +14,50 @@
 class Thread_devnull_engraver : public Engraver
 {
 public:
-  VIRTUAL_COPY_CONS (Translator);
+  TRANSLATOR_DECLARATIONS(Thread_devnull_engraver);
   
 protected:
   virtual void acknowledge_grob (Grob_info);
 };
 
-ADD_THIS_TRANSLATOR (Thread_devnull_engraver);
+
 
 void
 Thread_devnull_engraver::acknowledge_grob (Grob_info i)
 {
-  /*
-    FIXME: coriolan-fix hack -- ff  geen inspiratie
-    
-    We should have at least three modes:
-    
-      1. Never -- do nothing
-      2. Allways -- junk everythingallways
-      3. Regular: junk according to two/unison/unisilence/soloADue
-
-    but how shall we do that?
-
-    Hmm, maybe just: threadDevNull = 'never|'allways|...
-   */
-  if (!to_boolean (get_property ("disableDevNullThread"))
-      && daddy_trans_l_->id_str_.left_str (3) == "two"
-      && (to_boolean (get_property ("unison"))
-         || to_boolean (get_property ("unisilence")))
-      && to_boolean (get_property ("soloADue")))
-    i.elem_l_->suicide ();
+  SCM s = get_property ("devNullThread");
+
+#if 0
+  /* No need, next if will never be true */
+  if (s == ly_symbol2scm ("never"))
+    return;
+#endif
+
+  if (s == ly_symbol2scm ("always")
+      || (s == SCM_EOL
+         && to_boolean (get_property ("soloADue"))
+         && ((daddy_trans_l_->id_str_.left_str (3) == "two"
+              && (to_boolean (get_property ("unison"))
+                  || to_boolean (get_property ("unisilence"))))
+
+             /* Maybe this should be optional? */
+             || to_boolean (get_property ("othersolo")))))
+    {
+      i.grob_l_->suicide ();
+    }
 }
+Thread_devnull_engraver::Thread_devnull_engraver(){}
+
+ENTER_DESCRIPTION(Thread_devnull_engraver,
+/* descr */       "Kill elements whenever we are Voice called `two' and either
+unison, unisilence or soloADue is set.@footnote{On unix systems, the
+file @file{/dev/null} is special device: anything written to it is
+discarded.}. This engraver works closely together with the part
+combiner.  When the part combiner notices that two threads are
+identical, it tells the @code{Thread_devnull_engraver} to discard
+everything in the second thread.
+",
+/* creats*/       "",
+/* acks  */       "grob-interface",
+/* reads */       "",
+/* write */       "");