X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=lily%2Fitem.cc;h=057155b52bbb0674b6db481449931a178c0ecd04;hb=c484fb1da7751d35734194e623cb823b559e190f;hp=3b64230848c3573ead65e28811b2caaeb70998e2;hpb=0824dba176ac4991cc7671f18cf920f365100313;p=lilypond.git

diff --git a/lily/item.cc b/lily/item.cc
index 3b64230848..057155b52b 100644
--- a/lily/item.cc
+++ b/lily/item.cc
@@ -3,10 +3,9 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
 #include "paper-score.hh"
 #include "warn.hh"
 #include "item.hh"
@@ -36,7 +35,7 @@ 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))
@@ -47,10 +46,10 @@ Item::breakable_b (Grob*me)
 }
 
 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 *
@@ -69,9 +68,9 @@ Item::copy_breakable_items ()
   do 
     {
       Grob * dolly = clone ();
-      Item * item_p = dynamic_cast<Item*> (dolly);
-      pscore_l_->system_->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;
@@ -129,9 +128,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;
     }
@@ -169,12 +168,12 @@ Item::handle_prebroken_dependencies ()
 	  set_extent (SCM_EOL, Y_AXIS);
 	}
       else if (trans)
-	set_grob_property ("molecule-callback", SCM_EOL);
+	set_grob_property ("print-function", SCM_EOL);
     }
 }
 
 SCM
-Item::do_derived_mark ()
+Item::do_derived_mark ()const
 {
   if (broken_to_drul_[LEFT])
     scm_gc_mark (broken_to_drul_[LEFT]->self_scm ());
@@ -193,12 +192,38 @@ unsmob_item (SCM s )
 
 ADD_INTERFACE(Item,
 	      "item-interface",
-	      "
-
-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}.
-
-",
+	      "\n"
+	      "\n"
+	      "Grobs can be distinguished in their role in the horizontal spacing.\n"
+	      "Many grobs define constraints on the spacing by their sizes. For\n"
+	      "example, note heads, clefs, stems, and all other symbols with a fixed\n"
+	      "shape.  These grobs form a subtype called @code{Item}.\n"
+	      "\n"
+	      "\n"
+	      "Some items need special treatment for line breaking. For example, a\n"
+	      "clef is normally only printed at the start of a line (i.e. after a\n"
+	      "line break).  To model this, `breakable' items (clef, key signature,\n"
+	      "bar lines, etc.) are copied twice. Then we have three versions of each\n"
+	      "breakable item: one version if there is no line break, one version\n"
+	      "that is printed before the line break (at the end of a system), one\n"
+	      "version that is printed after the line break.\n"
+	      "\n"
+	      "Whether these versions are visible and take up space, is determined by\n"
+	      "the outcome of the @code{break-visibility}. This grob property is a\n"
+	      "function taking a direction (-1, 0 or 1) as argument. It returns a\n"
+	      "cons of booleans, signifying whether this grob should be transparent\n"
+	      "and have no extent.\n"
+	      "\n"
+	      "The following variables for break-visibility are predefined:\n"
+	      "@example\n"
+	      "           grob will show:   before  no     after\n"
+	      "                             break   break  break\n"
+	      "  all-invisible              no      no     no\n"
+	      "  begin-of-line-visible      no      no     yes\n"
+	      "  end-of-line-visible        yes     no     no\n"
+	      "  all-visible                yes     yes    yes\n"
+	      "  begin-of-line-invisible    yes     yes    no\n"
+	      "  end-of-line-invisible      no      yes    yes\n"
+	      "@end example\n"
+	      ,
 	      "no-spacing-rods break-visibility breakable")