* lily/general-scheme.cc (LY_DEFINE): Use snprintf (WAS: sprintf).

[lilypond.git] / lily / item.cc

diff --git a/lily/item.cc b/lily/item.cc
index 057155b52bbb0674b6db481449931a178c0ecd04..a47b19eafd0f16981a693d7a9c266cba17e707c7 100644 (file)
--- a/lily/item.cc
+++ b/lily/item.cc
@@ -6,34 +6,41 @@
   (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "item.hh"
+
 #include "paper-score.hh"
 #include "warn.hh"
-#include "item.hh"
 #include "paper-column.hh"
-#include "spanner.hh"
 #include "lily-guile.hh"
 #include "system.hh"
 #include "group-interface.hh"
 
-Item::Item (SCM s)
-  : Grob (s)
+Grob * 
+Item::clone (int count) const
+{
+  return new Item (*this, count);
+}
+
+
+Item::Item (SCM s, Object_key const *key)
+  : Grob (s, key)
 {
-  broken_to_drul_[LEFT] = broken_to_drul_[RIGHT]=0;
+  broken_to_drul_[LEFT] = broken_to_drul_[RIGHT]= 0;
   Group_interface::add_thing (this, ly_symbol2scm ("interfaces"), ly_symbol2scm ("item-interface"));
 }
 
 /**
    Item copy ctor.  Copy nothing: everything should be a elt property
    or a special purpose pointer (such as broken_to_drul_[]) */
-Item::Item (Item const &s)
-  : Grob (s)
+Item::Item (Item const &s, int copy_count)
+  : Grob (s, copy_count)
 {
-  broken_to_drul_[LEFT] = broken_to_drul_[RIGHT] =0;
+  broken_to_drul_[LEFT] = broken_to_drul_[RIGHT] = 0;
 }
 
 
 bool
-Item::breakable_b (Grob*me) 
+Item::is_breakable (Grob*me) 
 {
   if (me->original_)
     return false;
@@ -41,8 +48,8 @@ Item::breakable_b (Grob*me)
   if (!dynamic_cast<Item*> (me))
     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"));
+  Item * i = dynamic_cast<Item*> (me->get_parent (X_AXIS));
+  return (i) ? Item::is_breakable (i) : to_boolean (me->get_property ("breakable"));
 }
 
 Paper_column *
@@ -64,21 +71,22 @@ void
 Item::copy_breakable_items ()
 {
   Drul_array<Item *> new_copies;
-  Direction  i=LEFT;
+  Direction i = LEFT;
+  int count = 0;
   do 
     {
-      Grob * dolly = clone ();
+      Grob * dolly = clone (count ++);
       Item * item = dynamic_cast<Item*> (dolly);
       pscore_->system_->typeset_grob (item);
-      new_copies[i] =item;
+      new_copies[i] = item;
     }
   while (flip (&i) != LEFT);
-  broken_to_drul_= new_copies;
+  broken_to_drul_ = new_copies;
 }
 
 
 bool
-Item::broken_b () const
+Item::is_broken () const
 {
   return broken_to_drul_[LEFT] || broken_to_drul_[RIGHT];
 }
@@ -90,10 +98,10 @@ Item::broken_b () const
 void
 Item::discretionary_processing ()
 {
-  if (broken_b ())
+  if (is_broken ())
     return;
 
-  if (Item::breakable_b (this))
+  if (Item::is_breakable (this))
     copy_breakable_items ();
 }
 
@@ -152,13 +160,13 @@ Item::handle_prebroken_dependencies ()
     give the item to break-visibility itself, so the function can do
     more complicated things.
   */
-  SCM vis = get_grob_property ("break-visibility");
-  if (gh_procedure_p (vis))
+  SCM vis = get_property ("break-visibility");
+  if (ly_c_procedure_p (vis))
     {
-      SCM args = scm_list_n (gh_int2scm (break_status_dir ()), SCM_UNDEFINED);
-      SCM result = gh_apply (vis, args);
-      bool trans = gh_scm2bool (ly_car (result));
-      bool empty = gh_scm2bool (ly_cdr (result));
+      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));
       
       if (empty && trans)
        suicide ();
@@ -168,7 +176,7 @@ Item::handle_prebroken_dependencies ()
          set_extent (SCM_EOL, Y_AXIS);
        }
       else if (trans)
-       set_grob_property ("print-function", SCM_EOL);
+       set_property ("print-function", SCM_EOL);
     }
 }
 
@@ -190,7 +198,7 @@ unsmob_item (SCM s )
 
 
 
-ADD_INTERFACE(Item,
+ADD_INTERFACE (Item,
              "item-interface",
              "\n"
              "\n"