* scm/define-markup-commands.scm (fill-line): use

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

diff --git a/lily/grob-scheme.cc b/lily/grob-scheme.cc
index 05eedf65127ed08a170fb86105e3e8190af3a28a..d6d32e9ecd1b52d1be8919f495b91fe320f6b587 100644 (file)
--- a/lily/grob-scheme.cc
+++ b/lily/grob-scheme.cc
@@ -1,5 +1,5 @@
 /*
-  grob-scheme.cc --
+  grob-scheme.cc -- Scheme entry points for the grob datatype
 
   source file of the GNU LilyPond music typesetter
 
@@ -7,21 +7,18 @@
                  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "grob.hh"
 #include "warn.hh"
-#include "spanner.hh"
 #include "item.hh"
 #include "output-def.hh"
 #include "system.hh"
 
-
 LY_DEFINE (ly_grob_set_property_x, "ly:grob-set-property!",
           3, 0, 0, (SCM grob, SCM sym, SCM val),
           "Set @var{sym} in grob @var{grob} to value @var{val}")
 {
   Grob *sc = unsmob_grob (grob);
   SCM_ASSERT_TYPE (sc, grob, SCM_ARG1, __FUNCTION__, "grob");
-  SCM_ASSERT_TYPE (ly_c_symbol_p (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
+  SCM_ASSERT_TYPE (scm_is_symbol (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
 
   if (!type_check_assignment (sym, val, ly_symbol2scm ("backend-type?")))
     error ("typecheck failed");
@@ -40,7 +37,7 @@ LY_DEFINE (ly_grob_property, "ly:grob-property",
 {
   Grob *sc = unsmob_grob (grob);
   SCM_ASSERT_TYPE (sc, grob, SCM_ARG1, __FUNCTION__, "grob");
-  SCM_ASSERT_TYPE (ly_c_symbol_p (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
+  SCM_ASSERT_TYPE (scm_is_symbol (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
 
   return sc->internal_get_property (sym);
 }
@@ -58,28 +55,28 @@ LY_DEFINE (ly_spanner_get_bound, "ly:spanner-get-bound",
 
 /* TODO: make difference between scaled and unscalead variable in
    calling (i.e different funcs.) */
-LY_DEFINE (ly_grob_paper, "ly:grob-paper",
+LY_DEFINE (ly_grob_layout, "ly:grob-layout",
           1, 0, 0, (SCM g),
-          "Get @code{\\paper} definition from grob @var{g}.")
+          "Get @code{\\layout} definition from grob @var{g}.")
 {
   Grob * sc = unsmob_grob (g);
   SCM_ASSERT_TYPE (sc, g, SCM_ARG1, __FUNCTION__, "grob");
 
-  return sc->get_paper ()->self_scm ();
+  return sc->get_layout ()->self_scm ();
 }
 
 LY_DEFINE (ly_grob_alist_chain, "ly:grob-alist-chain",
           1, 1, 0, (SCM g, SCM global),
           "Get an alist chain for grob @var{g}, with @var{global} as the "
           "global default. If unspecified, @code{font-defaults} "
-          "from the paper block is taken. ")
+          "from the layout block is taken. ")
 {
   Grob *sc = unsmob_grob (g);
   SCM_ASSERT_TYPE (sc, g, SCM_ARG1, __FUNCTION__, "grob");
 
   if (global == SCM_UNDEFINED)
     global
-      = sc->get_paper ()->lookup_variable (ly_symbol2scm ("font-defaults"));
+      = sc->get_layout ()->lookup_variable (ly_symbol2scm ("font-defaults"));
 
   return sc->get_property_alist_chain (global);
 }
@@ -95,7 +92,7 @@ LY_DEFINE (ly_get_extent, "ly:grob-extent",
   SCM_ASSERT_TYPE (ref, refp, SCM_ARG2, __FUNCTION__, "grob");
   SCM_ASSERT_TYPE (is_axis (axis), axis, SCM_ARG3, __FUNCTION__, "axis");
 
-  return ly_interval2scm ( sc->extent (ref, Axis (ly_scm2int (axis))));
+  return ly_interval2scm ( sc->extent (ref, Axis (scm_to_int (axis))));
 }
 
 LY_DEFINE (ly_grob_parent, "ly:grob-parent",
@@ -107,10 +104,32 @@ LY_DEFINE (ly_grob_parent, "ly:grob-parent",
   SCM_ASSERT_TYPE (sc, grob, SCM_ARG1, __FUNCTION__, "grob");
   SCM_ASSERT_TYPE (is_axis (axis), axis, SCM_ARG2, __FUNCTION__, "axis");
 
-  Grob *par = sc->get_parent (Axis (ly_scm2int (axis)));
+  Grob *par = sc->get_parent (Axis (scm_to_int (axis)));
   return par ? par->self_scm () : SCM_EOL;
 }
 
+LY_DEFINE (ly_grob_properties, "ly:grob-properties",
+          1, 0, 0, (SCM grob),
+          "Get the mutable proprerties of @var{grob}.")
+{
+  Grob *g = unsmob_grob (grob);
+  SCM_ASSERT_TYPE (g, grob, SCM_ARG1, __FUNCTION__, "grob");
+
+  /* FIXME: uhg? copy/read only? */
+  return g->mutable_property_alist_;
+}
+
+LY_DEFINE (ly_grob_basic_properties, "ly:grob-basic-properties",
+          1, 0, 0, (SCM grob),
+          "Get the immutable properties of @var{grob}.")
+{
+  Grob *g = unsmob_grob (grob);
+  SCM_ASSERT_TYPE (g, grob, SCM_ARG1, __FUNCTION__, "grob");
+
+  /* FIXME: uhg? copy/read only? */
+  return g->immutable_property_alist_;
+}
+
 LY_DEFINE (ly_grob_system, "ly:grob-system",
           1, 0, 0, (SCM g),
           "Return the System Grob of @var{g}.")
@@ -156,7 +175,7 @@ LY_DEFINE (ly_grob_suicide, "ly:grob-suicide",
   SCM_ASSERT_TYPE (me, g, SCM_ARG1, __FUNCTION__, "grob");
 
   me->suicide ();
-  return SCM_UNDEFINED;
+  return SCM_UNSPECIFIED;
 }
 
 LY_DEFINE (ly_grob_translate_axis_x, "ly:grob-translate-axis!",
@@ -165,11 +184,11 @@ LY_DEFINE (ly_grob_translate_axis_x, "ly:grob-translate-axis!",
 {
   Grob *me = unsmob_grob (g);
   SCM_ASSERT_TYPE (me, g, SCM_ARG1, __FUNCTION__, "grob");
-  SCM_ASSERT_TYPE (ly_c_number_p (d), d, SCM_ARG2, __FUNCTION__, "dimension");
+  SCM_ASSERT_TYPE (scm_is_number (d), d, SCM_ARG2, __FUNCTION__, "dimension");
   SCM_ASSERT_TYPE (is_axis (a), a, SCM_ARG3, __FUNCTION__, "axis");
 
-  me->translate_axis (ly_scm2double (d), Axis (ly_scm2int (a)));
-  return SCM_UNDEFINED;
+  me->translate_axis (scm_to_double (d), Axis (scm_to_int (a)));
+  return SCM_UNSPECIFIED;
 }
 
 LY_DEFINE (ly_spanner_p, "ly:spanner?",
@@ -200,3 +219,15 @@ LY_DEFINE (ly_item_break_dir, "ly:item-break-dir",
   SCM_ASSERT_TYPE (me, it, SCM_ARG1, __FUNCTION__, "Item");
   return scm_int2num (me->break_status_dir ());
 }
+
+
+LY_DEFINE(ly_grob_key, "ly:grob-key",
+         1,0,0,
+         (SCM grob),
+         "Return the object-key for @var{grob}."
+         )
+{
+  Grob *me = unsmob_grob (grob);
+  SCM_ASSERT_TYPE (me, grob, SCM_ARG1, __FUNCTION__, "Grob");
+  return me->get_key ()->self_scm ();
+}