repeat tremolo: robust to zero-duration elements

[lilypond.git] / scm / music-functions.scm

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 1b679a7228ab964d4cd2bb1de76ccc5aef4c8bc6..65f885bbf87e1a76921c7f3e8e98900e2b0c980c 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -234,8 +234,7 @@ which often can be read back in order to generate an equivalent expression."
   "Display the music expression using LilyPond syntax"
   (memoize-clef-names supported-clefs)
   (parameterize ((*indent* 0)
-                 (*previous-duration* (ly:make-duration 2))
-                 (*force-duration* force-duration))
+                 (*omit-duration* #f))
                 (display (music->lily-string expr parser) port)
                 (newline port)))
 
@@ -286,8 +285,9 @@ depth-first through MUSIC."
          (body (ly:music-property tremolo 'element))
          (children (if (music-is-of-type? body 'sequential-music)
                        ;; \repeat tremolo n { ... }
-                       (length (extract-named-music body '(EventChord
-                                                           NoteEvent)))
+                       (count duration-of-note ; do not count empty <>
+                              (extract-named-music body
+                                                   '(EventChord NoteEvent)))
                        ;; \repeat tremolo n c4
                        1))
          (tremolo-type (if (positive? children)