Merge tag 'upstream/2.19.80' into debian-experimental

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

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 5bbd07ea8fae1ade4bffe1067e9d7faf6b213d69..1c6f55cedab4f9e63a6c3ae8d99ee5847416ee26 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -1087,6 +1087,10 @@ actually fully cloned."
         (apply ly:input-warning ip msg rest)
         (apply ly:warning msg rest))))
 
+(define-public (ly:music-error music msg . rest)
+  (ly:parser-error (apply format #f msg rest)
+                   (ly:music-property music 'origin)))
+
 (define-public (ly:event-warning event msg . rest)
   (let ((ip (ly:event-property event 'origin)))
     (if (ly:input-location? ip)
@@ -2170,13 +2174,11 @@ retaining only the chord articulations.  Returns the modified music."
                                'duration dur
                                'articulations full-arts))
                   (else
-                   (ly:music-error m (_ "Missing duration"))
-                   (make-music 'NoteEvent
-                               'duration (ly:make-duration 2 0 0)
-                               'articulations full-arts))))))
+                   ;; This is an empty chord.  Ugh.  We cannot really
+                   ;; reduce this in any manner, so we just keep it.
+                   m)))))
    music))
 
-
 (defmacro-public make-relative (variables reference music)
   "The list of pitch or music variables in @var{variables} is used as
 a sequence for creating relativable music from @var{music}.