X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fitem.cc;h=173df20ed87fd7b19451d2f4b212ea9c0dc18eea;hb=c44e6e55681395d4ae4d59807aeab0b136d933bc;hp=2077c17b450e8ff779c1a3671f8bdd534af5699f;hpb=b1323f33e9aa4b9eea05eefb8755c907d4d762d4;p=lilypond.git diff --git a/lily/item.cc b/lily/item.cc index 2077c17b45..173df20ed8 100644 --- a/lily/item.cc +++ b/lily/item.cc @@ -3,52 +3,54 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys */ +#include "item.hh" + +#include "axis-group-interface.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" +#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::is_breakable (Grob*me) +Item::is_non_musical (Grob *me) { - if (me->original_) + if (me->original ()) return false; - if (!dynamic_cast (me)) - me->programming_error ("only items can be breakable."); - - Item * i =dynamic_cast (me->get_parent (X_AXIS)); - return (i) ? Item::is_breakable (i) : to_boolean (me->get_property ("breakable")); + Item *i = dynamic_cast (me->get_parent (X_AXIS)); + return i ? Item::is_non_musical (i) : to_boolean (me->get_property ("non-musical")); } Paper_column * Item::get_column () const { - Item *parent = dynamic_cast (get_parent (X_AXIS)); + Item *parent = dynamic_cast (get_parent (X_AXIS)); return parent ? parent->get_column () : 0; } @@ -56,26 +58,26 @@ System * Item::get_system () const { Grob *g = get_parent (X_AXIS); - return g ? g->get_system () : 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 = dynamic_cast (dolly); - pscore_->system_->typeset_grob (item); - new_copies[i] =item; + 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::is_broken () const @@ -83,54 +85,52 @@ 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 (is_broken ()) return; - if (Item::is_breakable (this)) + if (Item::is_non_musical (this)) copy_breakable_items (); } -Grob* -Item::find_broken_piece (System*l) const +Grob * +Item::find_broken_piece (System *l) const { - if (get_system () == l) - return (Item*) (this); + if (get_system () == l) + return (Item *) (this); Direction d = LEFT; - do { - Grob *s = broken_to_drul_[d]; - if (s && s->get_system () == 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_) + if (original ()) { - Item * i = dynamic_cast (original_); + Item *i = dynamic_cast (original ()); return (i->broken_to_drul_[LEFT] == this) ? LEFT : RIGHT; } @@ -142,88 +142,96 @@ 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_property ("break-visibility"); - if (gh_procedure_p (vis)) + 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_c_vector_ref (vis, 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_property ("print-function", SCM_EOL); } } -SCM -Item::do_derived_mark ()const +bool +Item::pure_is_visible (int start, int end) const +{ + SCM vis = get_property ("break-visibility"); + if (scm_is_vector (vis)) + { + int pos = 1; + int pc_rank = Paper_column::get_rank (get_column ()); + if (pc_rank == start) + pos = 2; + else if (pc_rank == end) + pos = 0; + return to_boolean (scm_vector_ref (vis, scm_from_int (pos))); + } + return true; +} + +Interval_t +Item::spanned_rank_iv () +{ + int c = get_column ()->get_rank (); + return Interval_t (c, c); +} + +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 ) -{ - return dynamic_cast (unsmob_grob (s)); -} - - - -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" - "@end example\n" - , - "no-spacing-rods break-visibility breakable") +} + +Item * +unsmob_item (SCM s) +{ + return dynamic_cast (unsmob_grob (s)); +} + +ADD_INTERFACE (Item, + + "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", + + /* properties */ + "break-visibility " + "no-spacing-rods " + "non-musical")