Merge branch 'master' of git://git.savannah.gnu.org/lilypond.git

[lilypond.git] / lily / grob-scheme.cc

diff --git a/lily/grob-scheme.cc b/lily/grob-scheme.cc
index c27a9ee8bdab5ff3dbe941a0e9bc6533857ca264..f10ee2106fe762f73569e03794d1ba26358b8d8d 100644 (file)
--- a/lily/grob-scheme.cc
+++ b/lily/grob-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2010 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1998--2011 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -18,13 +18,14 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "warn.hh"             // error ()
+#include "font-interface.hh"
+#include "grob-array.hh"
 #include "item.hh"
 #include "output-def.hh"
-#include "system.hh"
-#include "font-interface.hh"
 #include "paper-score.hh"
-#include "grob-array.hh"
+#include "simple-closure.hh"
+#include "system.hh"
+#include "warn.hh"             // error ()
 
 LY_DEFINE (ly_grob_property_data, "ly:grob-property-data",
           2, 0, 0, (SCM grob, SCM sym),
@@ -49,6 +50,7 @@ LY_DEFINE (ly_grob_set_property_x, "ly:grob-set-property!",
   LY_ASSERT_TYPE (ly_is_symbol, sym, 2);
 
   if (!ly_is_procedure (val)
+      && !is_simple_closure (val)
       && !type_check_assignment (sym, val, ly_symbol2scm ("backend-type?")))
     error ("typecheck failed");
 
@@ -111,9 +113,9 @@ LY_DEFINE (ly_grob_interfaces, "ly:grob-interfaces",
 
 LY_DEFINE (ly_grob_object, "ly:grob-object",
           2, 0, 0, (SCM grob, SCM sym),
-          "Return the value of a pointer in grob@tie{}@var{g} of property"
+          "Return the value of a pointer in grob @var{grob} of property"
           " @var{sym}.  It returns @code{'()} (end-of-list) if @var{sym}"
-          " is undefined in@tie{}@var{g}.")
+          " is undefined in @var{grob}.")
 {
   Grob *sc = unsmob_grob (grob);
    
@@ -337,7 +339,7 @@ LY_DEFINE (ly_grob_suicide_x, "ly:grob-suicide!",
 
 LY_DEFINE (ly_grob_translate_axis_x, "ly:grob-translate-axis!",
           3, 0, 0, (SCM grob, SCM d, SCM a),
-          "Translate @var{g} on axis@tie{}@var{a} over"
+          "Translate @var{grob} on axis@tie{}@var{a} over"
           " distance@tie{}@var{d}.")
 {
   Grob *me = unsmob_grob (grob);
@@ -352,7 +354,7 @@ LY_DEFINE (ly_grob_translate_axis_x, "ly:grob-translate-axis!",
 
 LY_DEFINE (ly_grob_default_font, "ly:grob-default-font",
           1, 0, 0, (SCM grob),
-          "Return the default font for grob @var{gr}.")
+          "Return the default font for grob @var{grob}.")
 {
   Grob *gr = unsmob_grob (grob);