Issue 2984: Use define-void-function rather than define-music-function in several...

diff --git a/Documentation/snippets/generating-whole-scores-also-book-parts-in-scheme-without-using-the-parser.ly b/Documentation/snippets/generating-whole-scores-also-book-parts-in-scheme-without-using-the-parser.ly
index c2182e123a3130279d1910ca41e18d86e5949b07..ab86d893393b1b9aa603bc72e11986ee6c7abf9e 100644 (file)
--- a/Documentation/snippets/generating-whole-scores-also-book-parts-in-scheme-without-using-the-parser.ly
+++ b/Documentation/snippets/generating-whole-scores-also-book-parts-in-scheme-without-using-the-parser.ly
@@ -98,9 +98,8 @@ modified to inser all collected scores so far to the book.
             (set! pitch (modulo (1+ pitch) 7)))))
 
 oneNoteScore =
-#(define-music-function (parser location) ()
-   (add-one-note-score parser)
-   (make-music 'Music 'void #t))
+#(define-void-function (parser location) ()
+   (add-one-note-score parser))
 
 %%%
 

diff --git a/input/regression/figured-bass-slashed-numbers.ly b/input/regression/figured-bass-slashed-numbers.ly
index fc5a718b99f41d0ae234968f7268dbd34e80940f..73dce5c74467f91c11f9dfaf4fda8a950aff1dc6 100644 (file)
--- a/input/regression/figured-bass-slashed-numbers.ly
+++ b/input/regression/figured-bass-slashed-numbers.ly
@@ -25,10 +25,9 @@ bassfigures = \figuremode {
 #(define (adjust-slash-stencil-default num forward stencil mag)
     stencil)
 
-unsetExceptions = #(define-music-function (parser location) ()
+unsetExceptions = #(define-void-function (parser location) ()
 ;  (set! horizontal-slash-interval horizontal-slash-interval-default)
 ;  (set! adjust-slash-stencil adjust-slash-stencil-default)
-  (make-music 'Music 'void #t)
 )
 
 <<

diff --git a/input/regression/identifier-following-chordmode.ly b/input/regression/identifier-following-chordmode.ly
index 7269e91cb4a88b1fe6bb6cd0abb16e4b5f6ca282..63790a7b55f6ff3aa345774a3b5950d84f77c11d 100644 (file)
--- a/input/regression/identifier-following-chordmode.ly
+++ b/input/regression/identifier-following-chordmode.ly
@@ -10,10 +10,9 @@ modifier."
 \version "2.16.0"
 
 myDisplayMusic =
-#(define-music-function (parser location music)
+#(define-void-function (parser location music)
  (ly:music?)
- (display-scheme-music music (current-error-port))
- (make-music 'SequentialMusic 'void #t))
+ (display-scheme-music music (current-error-port)))
 
 \myDisplayMusic \chordmode { c }
 

diff --git a/input/regression/scheme-book-scores.ly b/input/regression/scheme-book-scores.ly
index 678844e2a85eeb3ca5ac49dcf4e01c402490717d..5e24ef5f3958984a1d33b78916f64ecece0a6cfe 100644 (file)
--- a/input/regression/scheme-book-scores.ly
+++ b/input/regression/scheme-book-scores.ly
@@ -31,9 +31,8 @@ informations from top- and booklevel stack correctly."
             (set! pitch (modulo (1+ pitch) 7)))))
 
 oneNoteScore =
-#(define-music-function (parser location) ()
-   (add-one-note-score parser)
-   (make-music 'Music 'void #t))
+#(define-void-function (parser location) ()
+   (add-one-note-score parser))
 
 %%%
 

diff --git a/ly/predefined-fretboards-init.ly b/ly/predefined-fretboards-init.ly
index 71000148b6708d4770c60beac2e1a35bcf7df470..705e9628720702b5f24ad21daf9948a2a268f3fb 100644 (file)
--- a/ly/predefined-fretboards-init.ly
+++ b/ly/predefined-fretboards-init.ly
@@ -30,14 +30,13 @@
 % chord-shape-table
 
 addChordShape =
-#(define-music-function (parser location key-symbol tuning shape-definition)
+#(define-void-function (parser location key-symbol tuning shape-definition)
    (symbol? pair? string-or-pair?)
    (_i "Add chord shape @var{shape-definition} to the @var{chord-shape-table}
 hash with the key @code{(cons @var{key-symbol} @var{tuning})}.")
    (hash-set! chord-shape-table
                (cons key-symbol tuning)
-               shape-definition)
-   (make-music 'SequentialMusic 'void #t))
+               shape-definition))
 
 #(define (chord-shape shape-code tuning)
    (get-chord-shape shape-code tuning chord-shape-table))
@@ -62,7 +61,7 @@ table @code{rest}."
 % fretboard-table
 
 storePredefinedDiagram =
-#(define-music-function
+#(define-void-function
    (parser location fretboard-table chord tuning diagram-definition)
    (hash-table? ly:music? pair? string-or-pair?)
   (_i "Add predefined fret diagram defined by @var{diagram-definition}
@@ -75,5 +74,4 @@ storePredefinedDiagram =
                                  diagram-definition)))
   (hash-set! fretboard-table
              hash-key
-             verbose-definition)
-  (make-music 'SequentialMusic 'void #t)))
+             verbose-definition)))

diff --git a/ly/property-init.ly b/ly/property-init.ly
index 7bd237b333c1274fda5ad28c8d65f66bfd0ed52e..2c538ce86cb8dc0c308d67ba97c807e7902bcfb8 100644 (file)
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -393,19 +393,17 @@ phrasingSlurSolid =
 %% point and click
 
 pointAndClickOn  =
-#(define-music-function (parser location) ()
+#(define-void-function (parser location) ()
    (_i "Enable generation of code in final-format (e.g. pdf) files to reference the
 originating lilypond source statement;
 this is helpful when developing a score but generates bigger final-format files.")
-   (ly:set-option 'point-and-click #t)
-   (make-music 'SequentialMusic 'void #t))
+   (ly:set-option 'point-and-click #t))
 
 pointAndClickOff =
-#(define-music-function (parser location) ()
+#(define-void-function (parser location) ()
    (_i "Suppress generating extra code in final-format (e.g. pdf) files to point
 back to the lilypond source statement.")
-   (ly:set-option 'point-and-click #f)
-   (make-music 'SequentialMusic 'void #t))
+   (ly:set-option 'point-and-click #f))
 
 pointAndClickTypes =
 #(define-void-function (parser location types) (symbol-list-or-symbol?)