PartCombine: part-combine texts on first real note rather than rests

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

diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index 05470724151221d42ff6c3b07fef627843ee4e44..d09e3b95b8bb637de93018f12ab9f5f51eade291 100644 (file)
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -69,14 +69,14 @@ Stem_engraver::make_stem (Grob_info gi)
   if (tremolo_ev_)
     {
       /* Stem tremolo is never applied to a note by default,
-        is must me requested.  But there is a default for the
+        it must be requested.  But there is a default for the
         tremolo value:
 
         c4:8 c c:
 
-        the first and last (quarter) note bothe get one tremolo flag.  */
+        the first and last (quarter) note both get one tremolo flag.  */
       int requested_type
-       = scm_to_int (tremolo_ev_->get_property ("tremolo-type"));
+       = robust_scm2int (tremolo_ev_->get_property ("tremolo-type"), 0);
       SCM f = get_property ("tremoloFlags");
       if (!requested_type)
        {