patch::: 1.5.41.jcn1

[lilypond.git] / lily / text-engraver.cc

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index c6e668e4cce7815e21353356f1a209c7f929314d..38716da2af5d008b43a8145f37feccc89cc97cf1 100644 (file)
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -128,13 +128,18 @@ Text_engraver::create_grobs ()
       text->set_grob_property ("text", r->get_mus_property ("text"));
       
       SCM nonempty = get_property ("textNonEmpty");
-      if (to_boolean (nonempty))
-       /*
-         empty text: signal that no rods should be applied.  
-        */
-       text->set_grob_property ("no-spacing-rods" , SCM_BOOL_F);
-               
-      announce_grob (text, r);
+
+      if (gh_boolean_p (nonempty))
+       if (gh_scm2bool (nonempty))
+         /*
+           empty text: signal that no rods should be applied.
+           Default nowadays.
+         */
+         text->set_grob_property ("no-spacing-rods" , SCM_BOOL_F);
+       else
+         text->set_grob_property ("no-spacing-rods" , SCM_BOOL_T);
+       
+      announce_grob (text, r->self_scm ());
       texts_.push (text);
     }
 }