From: Patrick McCarty <pnorcks@gmail.com>
Date: Thu, 30 Sep 2010 22:02:05 +0000 (-0700)
Subject: Move `symbol-or-boolean?' to c++.scm.
X-Git-Tag: release/2.13.40-1~5
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bf278a94409fb4a7a94189ff4be0343f091ec8c3;p=lilypond.git

Move `symbol-or-boolean?' to c++.scm.

This also fixes one of the compile issues with Guile 1.9.
---

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index f3e3777785..82f5a91648 100644
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -614,7 +614,6 @@ that they share a staff.")
    (make-part-combine-music parser
                             (list part1 part2)))
 
-#(define (symbol-or-boolean? x) (or (symbol? x) (boolean? x)))
 partcombineForce =
 #(define-music-function (location parser type once) (symbol-or-boolean? boolean?)
    (_i "Override the part-combiner.")
diff --git a/scm/c++.scm b/scm/c++.scm
index bc518030ae..7f28900917 100644
--- a/scm/c++.scm
+++ b/scm/c++.scm
@@ -55,6 +55,8 @@
 
 (define-public (scheme? x) #t)
 
+(define-public (symbol-or-boolean? x)
+  (or (symbol? x) (boolean? x)))
 
 ;; moved list to end of lily.scm: then all type-predicates are
 ;; defined.