Issue 4305: Remove `symbol-or-boolean?' predicate

This also reverts commit bf278a94409fb4a7a94189ff4be0343f091ec8c3.

We already have `boolean-or-symbol?' as predicate.

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index e173083989b37ade4fb367dee3dbc2589411158e..9b1d36623baf9f115aa09fe774b51e3c29e02b97 100644 (file)
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -1151,7 +1151,7 @@ that they share a staff with stems directed downward.")
                             (list part1 part2) DOWN chord-range))
 
 partcombineForce =
-#(define-music-function (location parser type once) (symbol-or-boolean? boolean?)
+#(define-music-function (location parser type once) (boolean-or-symbol? boolean?)
    (_i "Override the part-combiner.")
    (make-music 'EventChord
                'elements (list (make-music 'PartCombineForceEvent

diff --git a/scm/c++.scm b/scm/c++.scm
index 48f54d3582b77fb6a426803b55022c2da33de424..ba38d5a05738e1b42cd4b94d64f860d91c17fbf1 100644 (file)
--- a/scm/c++.scm
+++ b/scm/c++.scm
@@ -93,8 +93,6 @@
 
 (define-public (scheme? x) #t)
 
-(define-public (symbol-or-boolean? x)
-  (or (symbol? x) (boolean? x)))
 
 (define-public (void? x)
   (unspecified? x))