test

[lilypond.git] / lily / item.cc

diff --git a/lily/item.cc b/lily/item.cc
index abae1689a6ad828a82430caa84b59435ad395cff..12d4d48a47c238576b82f771b6e980c88aa06624 100644 (file)
--- a/lily/item.cc
+++ b/lily/item.cc
@@ -8,7 +8,7 @@
 
 
 #include "paper-score.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "item.hh"
 #include "paper-column.hh"
 #include "spanner.hh"
@@ -21,7 +21,6 @@ Item::Item (SCM s)
 {
   broken_to_drul_[LEFT] = broken_to_drul_[RIGHT]=0;
   Group_interface::add_thing (this, ly_symbol2scm ("interfaces"), ly_symbol2scm ("item-interface"));
-                    
 }
 
 /**
@@ -37,28 +36,28 @@ Item::Item (Item const &s)
 bool
 Item::breakable_b (Grob*me) 
 {
-  if (me->original_l_)
+  if (me->original_)
     return false;
 
   if (!dynamic_cast<Item*> (me))
-    programming_error ("only items can be breakable.");
+    me->programming_error ("only items can be breakable.");
   
   Item * i  =dynamic_cast<Item*> (me->get_parent (X_AXIS));
   return (i) ?  Item::breakable_b (i) : to_boolean (me->get_grob_property ("breakable"));
 }
 
 Paper_column *
-Item::column_l () const
+Item::get_column () const
 {
   Item *parent = dynamic_cast<Item*> (get_parent (X_AXIS));
-  return parent ? parent->column_l () : 0;
+  return parent ? parent->get_column () : 0;
 }
 
 System *
-Item::line_l () const
+Item::get_system () const
 {
   Grob *g = get_parent (X_AXIS);
-  return g ?  g->line_l () : 0;
+  return g ?  g->get_system () : 0;
 }
 
 
@@ -70,9 +69,9 @@ Item::copy_breakable_items ()
   do 
     {
       Grob * dolly = clone ();
-      Item * item_p = dynamic_cast<Item*> (dolly);
-      pscore_l_->line_l_->typeset_grob (item_p);
-      new_copies[i] =item_p;
+      Item * item = dynamic_cast<Item*> (dolly);
+      pscore_->system_->typeset_grob (item);
+      new_copies[i] =item;
     }
   while (flip (&i) != LEFT);
   broken_to_drul_= new_copies;
@@ -102,13 +101,13 @@ Item::discretionary_processing ()
 Grob*
 Item::find_broken_piece (System*l) const
 {
-  if (line_l () == l) 
+  if (get_system () == l) 
     return (Item*) (this);
 
   Direction d = LEFT;
   do {
     Grob *s = broken_to_drul_[d];
-    if (s && s->line_l () == l)
+    if (s && s->get_system () == l)
       return s;
   }
   while (flip (&d) != LEFT);
@@ -130,9 +129,9 @@ Item::find_prebroken_piece (Direction d) const
 Direction
 Item::break_status_dir () const
 {
-  if (original_l_)
+  if (original_)
     {
-      Item * i = dynamic_cast<Item*> (original_l_);
+      Item * i = dynamic_cast<Item*> (original_);
 
       return (i->broken_to_drul_[LEFT] == this) ? LEFT : RIGHT;
     }
@@ -143,12 +142,7 @@ Item::break_status_dir () const
 void
 Item::handle_prebroken_dependencies ()
 {
-  if (original_l_)
-    {
-      mutable_property_alist_
-       = handle_broken_grobs(original_l_->mutable_property_alist_,
-                              gh_int2scm (break_status_dir ()));
-    }
+  Grob::handle_prebroken_dependencies ();
   
   /*
     Can't do this earlier, because try_visibility_lambda () might set
@@ -156,11 +150,10 @@ Item::handle_prebroken_dependencies ()
 
     TODO:
 
-    handle visibility-lambda the item itself iso. breakstatusdir, so
-    the function can do more complicated things.
-    
+    give the item to break-visibility itself, so the function can do
+    more complicated things.
   */
-  SCM vis = get_grob_property ("visibility-lambda");
+  SCM vis = get_grob_property ("break-visibility");
   if (gh_procedure_p (vis))
     {
       SCM args = scm_list_n (gh_int2scm (break_status_dir ()), SCM_UNDEFINED);
@@ -200,5 +193,12 @@ unsmob_item (SCM s )
 
 ADD_INTERFACE(Item,
              "item-interface",
-             "",
-             "no-spacing-rods visibility-lambda breakable")
+             "
+
+Grobs can be distinguished in their role in the horizontal spacing.
+Many grobs define constraints on the spacing by their sizes. For
+example, note heads, clefs, stems, and all other symbols with a fixed
+shape.  These grobs form a subtype called @code{Item}.
+
+",
+             "no-spacing-rods break-visibility breakable")