X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fitem.cc;h=c1069e87bf39f288442eff01530ff5bc479a87fa;hb=75eebcb49e52d296b1da3e1074e0825d2c780db4;hp=a16253825a282747a611b598e606ad3e92c871f0;hpb=cf33d3709d3b5028fa9c208aa490ce066960ad5c;p=lilypond.git diff --git a/lily/item.cc b/lily/item.cc index a16253825a..c1069e87bf 100644 --- a/lily/item.cc +++ b/lily/item.cc @@ -3,135 +3,136 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys */ +#include "item.hh" #include "paper-score.hh" -#include "debug.hh" -#include "item.hh" +#include "warn.hh" #include "paper-column.hh" -#include "spanner.hh" #include "lily-guile.hh" #include "system.hh" -#include "group-interface.hh" +#include "pointer-group-interface.hh" -Item::Item (SCM s) - : Grob (s) +Grob * +Item::clone (int count) const { - broken_to_drul_[LEFT] = broken_to_drul_[RIGHT]=0; - Group_interface::add_thing (this, ly_symbol2scm ("interfaces"), ly_symbol2scm ("item-interface")); + 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; } /** 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_l_) + if (me->original ()) return false; - if (!dynamic_cast (me)) + if (!dynamic_cast (me)) me->programming_error ("only items can be breakable."); - - Item * i =dynamic_cast (me->get_parent (X_AXIS)); - return (i) ? Item::breakable_b (i) : to_boolean (me->get_grob_property ("breakable")); + + Item *i = dynamic_cast (me->get_parent (X_AXIS)); + return (i) ? Item::is_breakable (i) : to_boolean (me->get_property ("breakable")); } Paper_column * -Item::column_l () const +Item::get_column () const { - Item *parent = dynamic_cast (get_parent (X_AXIS)); - return parent ? parent->column_l () : 0; + Item *parent = dynamic_cast (get_parent (X_AXIS)); + 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; } - void Item::copy_breakable_items () { Drul_array new_copies; - Direction i=LEFT; - do + Direction i = LEFT; + int count = 0; + do { - Grob * dolly = clone (); - Item * item_p = dynamic_cast (dolly); - pscore_l_->line_l_->typeset_grob (item_p); - new_copies[i] =item_p; + Grob *dolly = clone (count++); + Item *item = dynamic_cast (dolly); + get_root_system (this)->typeset_grob (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]; } - /* Generate items for begin and end-of line. - */ +*/ void Item::discretionary_processing () { - if (broken_b ()) + if (is_broken ()) return; - if (Item::breakable_b (this)) + if (Item::is_breakable (this)) copy_breakable_items (); } -Grob* -Item::find_broken_piece (System*l) const +Grob * +Item::find_broken_piece (System *l) const { - if (line_l () == l) - return (Item*) (this); + if (get_system () == l) + return (Item *) (this); Direction d = LEFT; - do { - Grob *s = broken_to_drul_[d]; - if (s && s->line_l () == l) - return s; - } + do + { + Grob *s = broken_to_drul_[d]; + if (s && s->get_system () == l) + return s; + } while (flip (&d) != LEFT); return 0; } - -Item* +Item * Item::find_prebroken_piece (Direction d) const { - Item * me = (Item *) (this); + Item *me = (Item *) (this); if (!d) return me; - return dynamic_cast (broken_to_drul_[d]); + return dynamic_cast (broken_to_drul_[d]); } - Direction Item::break_status_dir () const { - if (original_l_) + if (original ()) { - Item * i = dynamic_cast (original_l_); + Item *i = dynamic_cast (original ()); return (i->broken_to_drul_[LEFT] == this) ? LEFT : RIGHT; } @@ -143,62 +144,70 @@ void Item::handle_prebroken_dependencies () { Grob::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_grob_property ("break-visibility"); - if (gh_procedure_p (vis)) + SCM vis = get_property ("break-visibility"); + if (scm_is_vector (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)); - - if (empty && trans) + bool visible = to_boolean (scm_vector_ref (vis, scm_from_int (break_status_dir () + 1))); + + if (!visible) suicide (); - else if (empty) - { - set_extent (SCM_EOL, X_AXIS); - set_extent (SCM_EOL, Y_AXIS); - } - else if (trans) - set_grob_property ("molecule-callback", SCM_EOL); } } -SCM -Item::do_derived_mark () +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* -unsmob_item (SCM s ) +Item * +unsmob_item (SCM s) { - return dynamic_cast (unsmob_grob (s)); + return dynamic_cast (unsmob_grob (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}. - -", - "no-spacing-rods break-visibility breakable") +ADD_INTERFACE (Item, + "item-interface", + "\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" + " center-invisible yes no yes\n" + "@end example\n", + "no-spacing-rods break-visibility breakable")