X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fitem-scheme.cc;h=48f3218f22951f11f218f8feffefcb42e22ef95d;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=bd612efdee551e47bd0073b77962c4b5da0e7592;hpb=f93e4199873c91ae32f0e84a610d14853dc379df;p=lilypond.git

diff --git a/lily/item-scheme.cc b/lily/item-scheme.cc
index bd612efdee..48f3218f22 100644
--- a/lily/item-scheme.cc
+++ b/lily/item-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -19,23 +19,38 @@
 */
 
 #include "item.hh"
+#include "paper-column.hh"
 
 LY_DEFINE (ly_item_p, "ly:item?",
            1, 0, 0, (SCM g),
            "Is @var{g} an @code{Item} object?")
 {
-  Grob *me = unsmob_grob (g);
+  Grob *me = unsmob<Grob> (g);
   bool b = dynamic_cast<Item *> (me);
   return ly_bool2scm (b);
 }
 
 LY_DEFINE (ly_item_break_dir, "ly:item-break-dir",
            1, 0, 0, (SCM it),
-           "The break status direction of item @var{it}.  @code{-1} means"
+           "The break status direction of item @var{it}.  @w{@code{-1}} means"
            " end of line, @code{0}@tie{}unbroken, and"
            " @code{1}@tie{}beginning of line.")
 {
-  LY_ASSERT_TYPE (unsmob_item, it, 1);
-  Item *me = unsmob_item (it);
+  LY_ASSERT_SMOB (Item, it, 1);
+  Item *me = unsmob<Item> (it);
   return scm_from_int (me->break_status_dir ());
 }
+
+LY_DEFINE (ly_item_get_column, "ly:item-get-column",
+           1, 0, 0, (SCM it),
+           "Return the @code{PaperColumn} or @code{NonMusicalPaperColumn}"
+           " associated with this @code{Item}.")
+{
+  LY_ASSERT_SMOB (Item, it, 1);
+  Item *me = unsmob<Item> (it);
+
+  if (Paper_column *col = me->get_column ())
+    return col->self_scm ();
+
+  return SCM_EOL;
+}