X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-column.cc;h=5c344836d4bf576e5407c629b9eed5d87be6058c;hb=7ba6b0e42d76063d7657325cea92d76d7701fb94;hp=7c5e0c26844884bed8961b33e42414238516ad70;hpb=1a71119277d04b287b3a976c526adba6500239c6;p=lilypond.git diff --git a/lily/paper-column.cc b/lily/paper-column.cc index 7c5e0c2684..5c344836d4 100644 --- a/lily/paper-column.cc +++ b/lily/paper-column.cc @@ -3,142 +3,131 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ +#include "moment.hh" #include "paper-column.hh" #include "paper-score.hh" #include "debug.hh" +#include "axis-group-interface.hh" +#include "spaceable-grob.hh" +#include "molecule.hh" +#include "text-item.hh" +#include "lookup.hh" +#include "font-interface.hh" -void -Paper_column::add_rod (Paper_column * p, Real d) -{ - Direction dir = Direction (sign (p->rank_i () - rank_i ())); - - if (!dir) - { - programming_error ("Must set minimum distance between differing columns."); - return; - } - - for (int i=0; i < minimal_dists_arr_drul_[dir].size (); i++) - { - Column_rod &rod = minimal_dists_arr_drul_[dir][i]; - if (rod.other_l_ == p) - { - rod.distance_f_ = rod.distance_f_ >? d; - return ; - } - } - Column_rod cr; - cr.distance_f_ = d; - cr.other_l_ = p; - minimal_dists_arr_drul_[dir].push (cr); -} -void -Paper_column::add_spring (Paper_column * p, Real d, Real s) -{ - Direction dir = Direction (sign (p->rank_i () - rank_i ())); - - if (!dir) - { - warning (_ ("Must set spring between differing columns")); - return; - } - - for (int i=0; i < spring_arr_drul_[dir].size (); i++) - { - Column_spring &spring = spring_arr_drul_[dir][i]; - if (spring.other_l_ == p) - { - spring.distance_f_ = spring.distance_f_ >? d; - return ; - } - } - Column_spring cr; - cr.distance_f_ = d; - cr.strength_f_ = s; - cr.other_l_ = p; +ADD_INTERFACE (Paper_column, "paper-column-interface", + " Paper_columns form the top-most item parent. (The Paper_columns X + parent is System, which is a spanner.) - spring_arr_drul_[dir].push (cr); -} + Paper_columns form the units for the spacing engine. They are + numbered, the first (leftmost) is column 0. Numbering happens before + line-breaking, and columns are not renumbered after line breaking. + + Since many columns go unused, you should only use the rank field to + get ordering information. Two adjacent columns may have + non-adjacent numbers. + + Don't be confused by right-items: each spacing wish can also contain + a number of items, with which a spacing constraint may be kept. It's + a little baroque, but it might come in handy later on? +", + "between-cols between-system-string when bounded-by-me shortest-playing-duration shortest-starter-duration"); -int -Paper_column::rank_i() const -{ - return rank_i_; -} void -Paper_column::set_rank (int i) +Paper_column::do_break_processing () { - rank_i_ = i; + Spaceable_grob::remove_interface (this); + Item::do_break_processing (); } -void -Paper_column::do_print() const +int +Paper_column::rank_i (Grob*me) { -#ifndef NPRINT - DEBUG_OUT << "rank: " << rank_i_ << '\n'; - Direction d = LEFT; - do - { - for (int i=0; i < minimal_dists_arr_drul_[d].size (); i++) - { - minimal_dists_arr_drul_[d][i].print (); - } - for (int i=0; i < spring_arr_drul_[d].size (); i++) - { - spring_arr_drul_[d][i].print (); - } - - } - while ((flip (&d))!=LEFT); - Item::do_print (); -#endif + return dynamic_cast (me)->rank_i_; } -bool -Paper_column::breakpoint_b() const +System* +Paper_column::line_l () const { - return !line_l_; + return line_l_; } -Paper_column::Paper_column() +Paper_column* +Paper_column::column_l () const { - set_axes (X_AXIS, X_AXIS); + return (Paper_column*) (this); +} +Paper_column::Paper_column (SCM l) + : Item (l) // guh.? +{ line_l_=0; rank_i_ = -1; } -Line_of_score* -Paper_column::line_l() const +Moment +Paper_column::when_mom (Grob*me) { - return line_l_; + SCM m = me->get_grob_property ("when"); + Moment s (0); + if (unsmob_moment (m)) + { + return *unsmob_moment (m); + } + return s; } +bool +Paper_column::musical_b (Grob *me) +{ + SCM m = me->get_grob_property ("shortest-starter-duration"); + Moment s (0); + if (unsmob_moment (m)) + { + s = *unsmob_moment (m); + } + return s != Moment (0); + +} + - - -Paper_column* -Paper_column::column_l () const +bool +Paper_column::used_b (Grob*me) { - return (Paper_column*)(this); + return gh_pair_p (me->get_grob_property ("elements")) || Item::breakable_b (me) + || gh_pair_p (me->get_grob_property ("bounded-by-me")) + ; } /* - ugh. + Print a vertical line and the rank number, to aid debugging. */ -void -Paper_column::preprocess () + +MAKE_SCHEME_CALLBACK(Paper_column,brew_molecule,1); +SCM +Paper_column::brew_molecule (SCM p) { - minimal_dists_arr_drul_[LEFT].sort (Column_rod::compare); - minimal_dists_arr_drul_[RIGHT].sort (Column_rod::compare); - spring_arr_drul_[LEFT].sort (Column_spring::compare); - spring_arr_drul_[RIGHT].sort (Column_spring::compare); + Grob *me = unsmob_grob (p); + + String r = to_str (Paper_column::rank_i (me)); + SCM properties = Font_interface::font_alist_chain (me); + + Molecule t = Text_item::text2molecule (me, ly_str02scm (r.ch_C()), + properties); + t.align_to (X_AXIS, CENTER); + t.align_to (Y_AXIS, DOWN); + + Molecule l = Lookup::filledbox (Box (Interval (-0.01, 0.01), + Interval (-2, -1))); + + t.add_molecule (l); + return t.smobbed_copy (); } +