X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fitem.cc;h=32882aac71303f656978bb72eeee7863529304d2;hb=8e1bf39ba8b390db542d203b6c301e09f834637d;hp=973a574c5736ceb76ed8ca65ddcc1028647b5774;hpb=e6caaa132f59006e5c47d0007b24bfedd07ad145;p=lilypond.git

diff --git a/lily/item.cc b/lily/item.cc
index 973a574c57..32882aac71 100644
--- a/lily/item.cc
+++ b/lily/item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "item.hh"
@@ -25,7 +25,6 @@ Item::Item (SCM s, Object_key const *key)
   : Grob (s, key)
 {
   broken_to_drul_[LEFT] = broken_to_drul_[RIGHT] = 0;
-  interfaces_ = scm_cons (ly_symbol2scm ("item-interface"), interfaces_);
 }
 
 /**
@@ -40,7 +39,7 @@ Item::Item (Item const &s, int copy_count)
 bool
 Item::is_breakable (Grob *me)
 {
-  if (me->original_)
+  if (me->original ())
     return false;
 
   if (!dynamic_cast<Item *> (me))
@@ -74,7 +73,7 @@ Item::copy_breakable_items ()
     {
       Grob *dolly = clone (count++);
       Item *item = dynamic_cast<Item *> (dolly);
-      pscore_->root_system ()->typeset_grob (item);
+      get_root_system (this)->typeset_grob (item);
       new_copies[i] = item;
     }
   while (flip (&i) != LEFT);
@@ -131,9 +130,9 @@ Item::find_prebroken_piece (Direction d) const
 Direction
 Item::break_status_dir () const
 {
-  if (original_)
+  if (original ())
     {
-      Item *i = dynamic_cast<Item *> (original_);
+      Item *i = dynamic_cast<Item *> (original ());
 
       return (i->broken_to_drul_[LEFT] == this) ? LEFT : RIGHT;
     }
@@ -149,40 +148,24 @@ Item::handle_prebroken_dependencies ()
   /*
     Can't do this earlier, because try_visibility_lambda () might set
     the elt property transparent, which would then be copied.
-
-    TODO:
-
-    give the item to break-visibility itself, so the function can do
-    more complicated things.
   */
   SCM vis = get_property ("break-visibility");
-  if (ly_is_procedure (vis))
+  if (scm_is_vector (vis))
     {
-      SCM args = scm_list_n (scm_int2num (break_status_dir ()), SCM_UNDEFINED);
-      SCM result = scm_apply_0 (vis, args);
-      bool trans = ly_scm2bool (scm_car (result));
-      bool empty = ly_scm2bool (scm_cdr (result));
+      bool visible = to_boolean (scm_vector_ref (vis, scm_from_int (break_status_dir () + 1)));
 
-      if (empty && trans)
+      if (!visible)
 	suicide ();
-      else if (empty)
-	{
-	  set_extent (SCM_EOL, X_AXIS);
-	  set_extent (SCM_EOL, Y_AXIS);
-	}
-      else if (trans)
-	set_property ("print-function", SCM_EOL);
     }
 }
 
-SCM
-Item::do_derived_mark () const
+void
+Item::derived_mark () const
 {
   if (broken_to_drul_[LEFT])
     scm_gc_mark (broken_to_drul_[LEFT]->self_scm ());
   if (broken_to_drul_[RIGHT])
     scm_gc_mark (broken_to_drul_[RIGHT]->self_scm ());
-  return SCM_EOL;
 }
 
 Item *
@@ -225,5 +208,6 @@ ADD_INTERFACE (Item,
 	       "  all-visible                yes     yes    yes\n"
 	       "  begin-of-line-invisible    yes     yes    no\n"
 	       "  end-of-line-invisible      no      yes    yes\n"
+	       "  center-invisible           yes      no    yes\n"
 	       "@end example\n",
 	       "no-spacing-rods break-visibility breakable")