(parse_symbol_list): Bugfix.

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

diff --git a/lily/grob-scheme.cc b/lily/grob-scheme.cc
index f74dbdac53a8cb385a9acfcbf692f0ec033a4231..344612c8f83d1fa44b337e2a5927be742be45e8d 100644 (file)
--- a/lily/grob-scheme.cc
+++ b/lily/grob-scheme.cc
@@ -4,13 +4,16 @@
   source file of the GNU LilyPond music typesetter
 
   (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
-                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "grob.hh"
+
 #include "warn.hh"
 #include "item.hh"
 #include "output-def.hh"
 #include "system.hh"
+#include "font-interface.hh"
 
 LY_DEFINE (ly_grob_set_property_x, "ly:grob-set-property!",
           3, 0, 0, (SCM grob, SCM sym, SCM val),
@@ -29,11 +32,10 @@ LY_DEFINE (ly_grob_set_property_x, "ly:grob-set-property!",
 
 LY_DEFINE (ly_grob_property, "ly:grob-property",
           2, 0, 0, (SCM grob, SCM sym),
-         "Return the value of a value in grob @var{g} of property @var{sym}. "
+          "Return the value of a value in grob @var{g} of property @var{sym}. "
           "It will return @code{' ()} (end-of-list) "
           "if  @var{sym} is undefined in @var{g}."
-          "\n\n"
-          )
+          "\n\n")
 {
   Grob *sc = unsmob_grob (grob);
   SCM_ASSERT_TYPE (sc, grob, SCM_ARG1, __FUNCTION__, "grob");
@@ -42,12 +44,26 @@ LY_DEFINE (ly_grob_property, "ly:grob-property",
   return sc->internal_get_property (sym);
 }
 
+LY_DEFINE (ly_grob_object, "ly:grob-object",
+          2, 0, 0, (SCM grob, SCM sym),
+          "Return the value of a pointer in grob @var{g} of property @var{sym}. "
+          "It will return @code{' ()} (end-of-list) "
+          "if  @var{sym} is undefined in @var{g}."
+          "\n\n")
+{
+  Grob *sc = unsmob_grob (grob);
+  SCM_ASSERT_TYPE (sc, grob, SCM_ARG1, __FUNCTION__, "grob");
+  SCM_ASSERT_TYPE (scm_is_symbol (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
+
+  return sc->internal_get_object (sym);
+}
+
 LY_DEFINE (ly_spanner_get_bound, "ly:spanner-get-bound",
           2, 0, 0, (SCM slur, SCM dir),
           "Get one of the bounds of @var{spanner}. @var{dir} is @code{-1} "
           "for left, and @code{1} for right.")
 {
-  Spanner * sl = dynamic_cast<Spanner*> (unsmob_grob (slur));
+  Spanner *sl = dynamic_cast<Spanner *> (unsmob_grob (slur));
   SCM_ASSERT_TYPE (sl, slur, SCM_ARG1, __FUNCTION__, "spanner grob");
   SCM_ASSERT_TYPE (is_direction (dir), slur, SCM_ARG2, __FUNCTION__, "dir");
   return sl->get_bound (to_dir (dir))->self_scm ();
@@ -59,24 +75,27 @@ LY_DEFINE (ly_grob_layout, "ly:grob-layout",
           1, 0, 0, (SCM g),
           "Get @code{\\layout} definition from grob @var{g}.")
 {
-  Grob * sc = unsmob_grob (g);
+  Grob *sc = unsmob_grob (g);
   SCM_ASSERT_TYPE (sc, g, SCM_ARG1, __FUNCTION__, "grob");
 
   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 "
+          1, 1, 0, (SCM grob, SCM global),
+          "Get an alist chain for grob @var{grob}, with @var{global} as the "
           "global default. If unspecified, @code{font-defaults} "
           "from the layout block is taken. ")
 {
-  Grob *sc = unsmob_grob (g);
-  SCM_ASSERT_TYPE (sc, g, SCM_ARG1, __FUNCTION__, "grob");
+  Grob *sc = unsmob_grob (grob);
+  SCM_ASSERT_TYPE (sc, grob, SCM_ARG1, __FUNCTION__, "grob");
 
   if (global == SCM_UNDEFINED)
-    global
-      = sc->get_layout ()->lookup_variable (ly_symbol2scm ("font-defaults"));
+    {
+      global = sc->get_layout ()->lookup_variable (ly_symbol2scm ("font-defaults"));
+      if (global == SCM_UNDEFINED)
+       global = SCM_EOL;
+    }
 
   return sc->get_property_alist_chain (global);
 }
@@ -92,7 +111,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 (scm_to_int (axis))));
+  return ly_interval2scm (sc->extent (ref, Axis (scm_to_int (axis))));
 }
 
 LY_DEFINE (ly_grob_parent, "ly:grob-parent",
@@ -158,7 +177,7 @@ LY_DEFINE (ly_spanner_broken_into, "ly:spanner-broken-into",
           1, 0, 0, (SCM spanner),
           "Return broken-into list for @var{spanner}.")
 {
-  Spanner *me = dynamic_cast<Spanner*> (unsmob_grob (spanner));
+  Spanner *me = dynamic_cast<Spanner *> (unsmob_grob (spanner));
   SCM_ASSERT_TYPE (me, spanner, SCM_ARG1, __FUNCTION__, "spanner");
 
   SCM s = SCM_EOL;
@@ -196,7 +215,7 @@ LY_DEFINE (ly_spanner_p, "ly:spanner?",
           "Is  @var{g} a spanner object?")
 {
   Grob *me = unsmob_grob (g);
-  bool b = dynamic_cast<Spanner*> (me);
+  bool b = dynamic_cast<Spanner *> (me);
 
   return ly_bool2scm (b);
 }
@@ -206,7 +225,7 @@ LY_DEFINE (ly_item_p, "ly:item?",
           "Is @var{g} an @code{Item} object?")
 {
   Grob *me = unsmob_grob (g);
-  bool b = dynamic_cast<Item*> (me);
+  bool b = dynamic_cast<Item *> (me);
   return ly_bool2scm (b);
 }
 
@@ -215,19 +234,28 @@ LY_DEFINE (ly_item_break_dir, "ly:item-break-dir",
           "The break status dir of item @var{it}. @code{-1} is end of "
           "line, @code{0} unbroken, and @code{1} begin of line.")
 {
-  Item *me = dynamic_cast<Item*> (unsmob_grob (it));
+  Item *me = dynamic_cast<Item *> (unsmob_grob (it));
   SCM_ASSERT_TYPE (me, it, SCM_ARG1, __FUNCTION__, "Item");
-  return scm_int2num (me->break_status_dir ());
+  return scm_from_int (me->break_status_dir ());
 }
 
-
-LY_DEFINE(ly_grob_key, "ly:grob-key",
-         1,0,0,
-         (SCM grob),
-         "Return the object-key for @var{grob}."
-         )
+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 ();
 }
+
+
+LY_DEFINE (ly_grob_default_font, "ly:grob-default-font",
+          1, 0, 0, (SCM grob),
+          "Return the default font for grob @var{gr}.")
+{
+  Grob *gr = unsmob_grob (grob);
+  SCM_ASSERT_TYPE (gr, grob, SCM_ARG1, __FUNCTION__, "grob");
+
+  return Font_interface::get_default_font (gr)->self_scm ();
+}