Merge commit 'origin' into release/unstable

[lilypond.git] / scm / lily.scm

diff --git a/scm/lily.scm b/scm/lily.scm
index 6726125964ef9e0f10998bc3eb23816cecbbb110..55d331fd82b68e27389017c9cf77d7ec7068e22e 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -430,6 +430,7 @@ LilyPond safe mode.  The syntax is the same as `define*-public'."
        (,input-port? . "input port")
        (,integer? . "integer")
        (,list? . "list")
+       (,list-or-symbol? . "list or symbol")
        (,ly:context? . "context")
        (,ly:dimension? . "dimension, in staff space")
        (,ly:dir? . "direction")
@@ -457,9 +458,11 @@ LilyPond safe mode.  The syntax is the same as `define*-public'."
        (,output-port? . "output port")
        (,pair? . "pair")
        (,procedure? . "procedure")
+       (,real? . "real number")
        (,rhythmic-location? . "rhythmic location")
        (,scheme? . "any type")
        (,string? . "string")
+       (,string-or-pair? . "string or pair")
        (,symbol? . "symbol")
        (,vector? . "vector")))