Merge branch 'release/unstable' into HEAD

diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
index a930d1b527ac21cbbeddb7d9d7ae30c0ae8a1884..b9507766894df7216cdfa1de7eb65026114a1879 100644 (file)
--- a/lily/general-scheme.cc
+++ b/lily/general-scheme.cc
@@ -114,18 +114,6 @@ LY_DEFINE (ly_dir_p, "ly:dir?",
   return SCM_BOOL_F;
 }
 
-LY_DEFINE (ly_vsize_p, "ly:vsize?",
-           1, 0, 0, (SCM s),
-           "Is @var{s} a vsize?")
-{
-  if (scm_is_integer (s))
-    {
-      int i = scm_to_int (s);
-      return i >= 0 ? SCM_BOOL_T : SCM_BOOL_F;
-    }
-  return SCM_BOOL_F;
-}
-
 LY_DEFINE (ly_assoc_get, "ly:assoc-get",
            2, 2, 0,
            (SCM key, SCM alist, SCM default_value, SCM strict_checking),

diff --git a/scm/c++.scm b/scm/c++.scm
index 7d5c85a8bee6ee8e3df34c4e722840c283bb2b50..ded5e9b1209bc0c0be4627db018962d7196eb0f1 100644 (file)
--- a/scm/c++.scm
+++ b/scm/c++.scm
@@ -27,8 +27,7 @@
 
 (define-public (fraction? x)
   (and (pair? x)
-       (integer? (car x)) (integer? (cdr x))
-       (>= (car x) 0) (>= (cdr x) 0)))
+       (index? (car x)) (index? (cdr x))))
 
 (define-public (number-or-grob? x)
   (or (ly:grob? x) (number? x)))
@@ -39,6 +38,9 @@
 (define-public (number-list? x)
   (and (list? x) (every number? x)))
 
+(define-public (index? x)
+  (and (integer? x) (>= x 0)))
+
 (define-public (moment-pair? x)
   (and (pair? x)
        (ly:moment? (car x)) (ly:moment? (cdr x))))

diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 28443694a686e457542c77af7d9f9db74acf46d7..107518d531c002e3859759f99f060a3913bbad69 100644 (file)
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -1107,7 +1107,7 @@ relevant for finding the @code{pure-Y-extent}.")
 
      (side-support-elements ,ly:grob-array? "The side support, an array of
 grobs.")
-     (skyline-quantizing ,ly:vsize? "The number of boxes to break a
+     (skyline-quantizing ,index? "The number of boxes to break a
 slur into when calculating its skyline.")
      (slur ,ly:grob? "A pointer to a @code{Slur} object.")
      (spacing ,ly:grob? "The spacing spanner governing this section.")

diff --git a/scm/lily.scm b/scm/lily.scm
index 21c9599b66170838d0ac7b961a9b6a5e574fa451..ab9e73dbf0b7e5500b025246db806d15d3e362f3 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -490,6 +490,7 @@ messages into errors.")
     (,cheap-list? . "list")
     (,fraction? . "fraction, as pair")
     (,grob-list? . "list of grobs")
+    (,index? . "non-negative integer")
     ;; this is built on cheap-list
     (,list-or-symbol? . "list or symbol")
     (,markup? . "markup")
@@ -551,7 +552,6 @@ messages into errors.")
     (,ly:translator? . "translator")
     (,ly:translator-group? . "translator group")
     (,ly:unpure-pure-container? . "unpure/pure container")
-    (,ly:vsize? . "vsize")
     ))
 
 

diff --git a/scm/safe-lily.scm b/scm/safe-lily.scm
index 010c8d507c349645a9951cbcf2ff152b7cdef045..d70c2b7d4cb9254fff467dd260786e20b6eb3140 100644 (file)
--- a/scm/safe-lily.scm
+++ b/scm/safe-lily.scm
@@ -144,7 +144,6 @@
    ly:unit
    ly:usage
    ly:version
-   ly:vsize?
    ly:warning
 
    ;; FIXME: cannot change staff size in --safe-mode