* mf/GNUmakefile: always trace pfa fonts.

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

diff --git a/lily/grob-scheme.cc b/lily/grob-scheme.cc
index a4cb06249c865433b5e6d701efd1b1463eb8d9b2..70004e9959290f43cfe065c1b9a7ceb1402f7de7 100644 (file)
--- a/lily/grob-scheme.cc
+++ b/lily/grob-scheme.cc
@@ -59,7 +59,7 @@ LY_DEFINE (spanner_get_bound, "ly:get-spanner-bound", 2 , 0, 0,
 {
   Spanner * sl = dynamic_cast<Spanner*> (unsmob_grob (slur));
   SCM_ASSERT_TYPE (sl, slur, SCM_ARG1, __FUNCTION__, "spanner grob");
-  SCM_ASSERT_TYPE (ly_dir_p (dir), slur, SCM_ARG2, __FUNCTION__, "dir");
+  SCM_ASSERT_TYPE (is_direction (dir), slur, SCM_ARG2, __FUNCTION__, "dir");
   return sl->get_bound (to_dir (dir))->self_scm ();
 }
 
@@ -101,7 +101,7 @@ LY_DEFINE (ly_get_extent, "ly:get-extent", 3, 0, 0,
   SCM_ASSERT_TYPE (sc, grob, SCM_ARG1, __FUNCTION__, "grob");
   SCM_ASSERT_TYPE (ref, refp, SCM_ARG2, __FUNCTION__, "grob");
   
-  SCM_ASSERT_TYPE (ly_axis_p (axis), axis, SCM_ARG3, __FUNCTION__, "axis");
+  SCM_ASSERT_TYPE (is_axis (axis), axis, SCM_ARG3, __FUNCTION__, "axis");
 
   return ly_interval2scm ( sc->extent (ref, Axis (gh_scm2int (axis))));
 }
@@ -112,14 +112,13 @@ LY_DEFINE (ly_get_parent, "ly:get-parent", 2, 0, 0, (SCM grob, SCM axis),
 {
   Grob * sc = unsmob_grob (grob);
   SCM_ASSERT_TYPE (sc, grob, SCM_ARG1, __FUNCTION__, "grob");
-  SCM_ASSERT_TYPE (ly_axis_p (axis), axis, SCM_ARG2, __FUNCTION__, "axis");
+  SCM_ASSERT_TYPE (is_axis (axis), axis, SCM_ARG2, __FUNCTION__, "axis");
 
   Grob * par = sc->get_parent (Axis (gh_scm2int (axis)));
   return par ? par->self_scm () : SCM_EOL;
 }
 
-/* ly prefix? */
-LY_DEFINE (get_system,
+LY_DEFINE (ly_get_system,
           "ly:get-system",
           1, 0, 0, (SCM grob),
           "Return the System Grob of @var{grob}.")
@@ -133,8 +132,7 @@ LY_DEFINE (get_system,
   return SCM_EOL;
 }
 
-/* ly prefix? */
-LY_DEFINE (get_original,
+LY_DEFINE (ly_get_original,
           "ly:get-original",
           1, 0, 0, (SCM grob),
           "Return the original Grob of @var{grob}")
@@ -164,18 +162,31 @@ LY_DEFINE (get_broken_into,
 }
 
 
-
-LY_DEFINE(ly_property_alist_chain, "ly:grob-property-chain",
-         1,1,0,
-         (SCM grob, SCM defaults),
-         "Return all the properties of @code{grob}. Glue @var{defaults} at the end of the chain.")
+LY_DEFINE (ly_grob_suicide,
+         "ly:grob-suicide", 1, 0, 0, (SCM g),
+          "Kill @var{g}.")
 {
-  Grob * g = unsmob_grob (grob);
-  SCM_ASSERT_TYPE(g, grob, SCM_ARG1, __FUNCTION__, "grob");
+  Grob *me = unsmob_grob (g);
+  SCM_ASSERT_TYPE (me, g, SCM_ARG1, __FUNCTION__, "grob");
+
+  me->suicide ();
+  return SCM_UNDEFINED;
+}
 
-  if (defaults == SCM_UNDEFINED)
-    defaults = SCM_EOL;
 
-  SCM ch = g->get_property_alist_chain (defaults);  
-  return ch;
+
+LY_DEFINE (ly_grob_translate_axis_x,
+         "ly:grob-translate-axis!", 3, 0, 0,
+          (SCM g, SCM d, SCM a),
+          "Translate @var{g} on axis @var{a} over distance @var{d}.")
+{
+  Grob *me = unsmob_grob (g);
+  SCM_ASSERT_TYPE (me, g, SCM_ARG1, __FUNCTION__, "grob");
+  SCM_ASSERT_TYPE (gh_number_p (d), d, SCM_ARG2, __FUNCTION__, "dimension");
+  SCM_ASSERT_TYPE (is_axis (a), a, SCM_ARG3, __FUNCTION__, "axis");
+
+  me->translate_axis (gh_scm2double (d),
+                     Axis (gh_scm2int (a)));
+  return SCM_UNDEFINED;
 }
+