X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fitem.cc;h=e94b5bc26762862fd4e38a8a4406bfc5c590b690;hb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;hp=a6c3577a6f2d9224190ea92925ff72ef9f40d110;hpb=8942177c7566bc201b53d7829f23523961e80537;p=lilypond.git diff --git a/lily/item.cc b/lily/item.cc index a6c3577a6f..e94b5bc267 100644 --- a/lily/item.cc +++ b/lily/item.cc @@ -15,13 +15,12 @@ #include "system.hh" #include "group-interface.hh" -Grob * +Grob * Item::clone (int count) const { return new Item (*this, count); } - Item::Item (SCM s, Object_key const *key) : Grob (s, key) { @@ -38,24 +37,23 @@ Item::Item (Item const &s, int copy_count) broken_to_drul_[LEFT] = broken_to_drul_[RIGHT] = 0; } - bool -Item::is_breakable (Grob*me) +Item::is_breakable (Grob *me) { 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)); + + Item *i = dynamic_cast (me->get_parent (X_AXIS)); return (i) ? Item::is_breakable (i) : to_boolean (me->get_property ("breakable")); } 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; } @@ -63,20 +61,19 @@ 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; int count = 0; - do + do { - Grob * dolly = clone (count ++); - Item * item = dynamic_cast (dolly); + Grob *dolly = clone (count++); + Item *item = dynamic_cast (dolly); pscore_->system_->typeset_grob (item); new_copies[i] = item; } @@ -84,17 +81,15 @@ Item::copy_breakable_items () broken_to_drul_ = new_copies; } - bool 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 () { @@ -105,40 +100,39 @@ Item::discretionary_processing () 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_) { - Item * i = dynamic_cast (original_); + Item *i = dynamic_cast (original_); return (i->broken_to_drul_[LEFT] == this) ? LEFT : RIGHT; } @@ -150,7 +144,7 @@ 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. @@ -167,7 +161,7 @@ Item::handle_prebroken_dependencies () 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 (); else if (empty) @@ -190,47 +184,45 @@ Item::do_derived_mark () const 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", - "\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-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")