From bf278a94409fb4a7a94189ff4be0343f091ec8c3 Mon Sep 17 00:00:00 2001 From: Patrick McCarty Date: Thu, 30 Sep 2010 15:02:05 -0700 Subject: [PATCH] Move `symbol-or-boolean?' to c++.scm. This also fixes one of the compile issues with Guile 1.9. --- ly/music-functions-init.ly | 1 - scm/c++.scm | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) 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. -- 2.39.2