X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-column.cc;h=21ec714301b4751bfe9cb62db593dc4b5470fc1d;hb=6b93aa32e32d736202d803c68f5156cc253a5f7c;hp=c3260848dab4f78d9e64363fe54ecdebded9ed6e;hpb=4c624f467a6aecf1f5a46bf272b48ec1cee15d3f;p=lilypond.git diff --git a/lily/paper-column.cc b/lily/paper-column.cc index c3260848da..21ec714301 100644 --- a/lily/paper-column.cc +++ b/lily/paper-column.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ #include "moment.hh" @@ -12,34 +12,31 @@ #include "warn.hh" #include "axis-group-interface.hh" #include "spaceable-grob.hh" -#include "molecule.hh" +#include "stencil.hh" #include "text-item.hh" #include "lookup.hh" #include "font-interface.hh" - +#include "paper-def.hh" 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.) - - 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"); - + "@code{Paper_column} objects form the top-most X-parents for items. " + " The are two types of columns: musical columns, where are attached to, and " + " non-musical columns, where bar-lines, clefs etc. are attached to. " + " The spacing engine determines the X-positions of these objects." + "\n\n" + "They are\n" + " numbered, the first (leftmost) is column 0. Numbering happens before\n" + " line-breaking, and columns are not renumbered after line breaking.\n" + " Since many columns go unused, you should only use the rank field to\n" + " get ordering information. Two adjacent columns may have\n" + " non-adjacent numbers.\n" + "\n" + , + "between-cols between-system-string when bounded-by-me " + "shortest-playing-duration shortest-starter-duration"); void Paper_column::do_break_processing () @@ -50,19 +47,19 @@ Paper_column::do_break_processing () int -Paper_column::rank_i (Grob*me) +Paper_column::get_rank (Grob*me) { - return dynamic_cast (me)->rank_i_; + return dynamic_cast (me)->rank_; } System* -Paper_column::line_l () const +Paper_column::get_system () const { - return line_l_; + return system_; } Paper_column* -Paper_column::column_l () const +Paper_column::get_column () const { return (Paper_column*) (this); } @@ -70,14 +67,14 @@ Paper_column::column_l () const Paper_column::Paper_column (SCM l) : Item (l) // guh.? { - line_l_=0; - rank_i_ = -1; + system_=0; + rank_ = -1; } Moment Paper_column::when_mom (Grob*me) { - SCM m = me->get_grob_property ("when"); + SCM m = me->get_property ("when"); Moment s (0); if (unsmob_moment (m)) { @@ -87,24 +84,23 @@ Paper_column::when_mom (Grob*me) } bool -Paper_column::musical_b (Grob *me) +Paper_column::is_musical (Grob *me) { - SCM m = me->get_grob_property ("shortest-starter-duration"); + SCM m = me->get_property ("shortest-starter-duration"); Moment s (0); if (unsmob_moment (m)) { s = *unsmob_moment (m); } return s != Moment (0); - } bool -Paper_column::used_b (Grob*me) +Paper_column::is_used (Grob*me) { - return gh_pair_p (me->get_grob_property ("elements")) || Item::breakable_b (me) - || gh_pair_p (me->get_grob_property ("bounded-by-me")) + return gh_pair_p (me->get_property ("elements")) || Item::is_breakable (me) + || gh_pair_p (me->get_property ("bounded-by-me")) ; } @@ -112,24 +108,26 @@ Paper_column::used_b (Grob*me) Print a vertical line and the rank number, to aid debugging. */ -MAKE_SCHEME_CALLBACK(Paper_column,brew_molecule,1); +MAKE_SCHEME_CALLBACK (Paper_column,print,1); SCM -Paper_column::brew_molecule (SCM p) +Paper_column::print (SCM p) { 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); + String r = to_string (Paper_column::get_rank (me)); + SCM properties = Font_interface::text_font_alist_chain (me); + + SCM scm_mol = Text_item::interpret_markup (me->get_paper ()->self_scm (), + properties, + scm_makfrom0str (r.to_str0 ())); + Stencil t = *unsmob_stencil (scm_mol); t.align_to (X_AXIS, CENTER); t.align_to (Y_AXIS, DOWN); - Molecule l = Lookup::filledbox (Box (Interval (-0.01, 0.01), + Stencil l = Lookup::filled_box (Box (Interval (-0.01, 0.01), Interval (-2, -1))); - t.add_molecule (l); + t.add_stencil (l); return t.smobbed_copy (); } @@ -140,32 +138,29 @@ Paper_column::brew_molecule (SCM p) THIS IS BROKEN KLUDGE. WE SHOULD INVENT SOMETHING BETTER. */ -MAKE_SCHEME_CALLBACK(Paper_column,before_line_breaking,1); +MAKE_SCHEME_CALLBACK (Paper_column,before_line_breaking,1); SCM Paper_column::before_line_breaking (SCM grob) { Grob *me = unsmob_grob (grob); - SCM c = me->get_grob_property ("bounded-by-me"); + SCM c = me->get_property ("bounded-by-me"); SCM *ptrptr = &c; - while (gh_pair_p (c)) + while (gh_pair_p (*ptrptr)) { - Grob * g = unsmob_grob (gh_car (c)); + Grob * g = unsmob_grob (gh_car (*ptrptr)); if (!g || !g->live ()) { - *ptrptr = gh_cdr (c); + *ptrptr = gh_cdr (*ptrptr); } else { - ptrptr = SCM_CDRLOC (c); + ptrptr = SCM_CDRLOC (*ptrptr); } - - if (gh_pair_p(c)) - c = gh_cdr (c); } - me->set_grob_property ("bounded-by-me", c); + me->set_property ("bounded-by-me", c); return SCM_UNSPECIFIED; }