X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-column.cc;h=991e58983fe84cd00ccb101ca86ddb8fecfb5236;hb=8536db51578c1d3ba3da834e5a308c2790dd4f87;hp=69e49a77d9789556781982ed40261892aa7bde68;hpb=304b5f3aa7eee7b0ff8d4ba7526a1410735f6e74;p=lilypond.git diff --git a/lily/paper-column.cc b/lily/paper-column.cc index 69e49a77d9..991e58983f 100644 --- a/lily/paper-column.cc +++ b/lily/paper-column.cc @@ -3,23 +3,28 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ -#include "moment.hh" #include "paper-column.hh" + +#include "moment.hh" #include "paper-score.hh" #include "warn.hh" #include "axis-group-interface.hh" #include "spaceable-grob.hh" -#include "stencil.hh" -#include "text-item.hh" +#include "text-interface.hh" #include "lookup.hh" #include "font-interface.hh" -#include "paper-def.hh" - - +#include "output-def.hh" +#include "pointer-group-interface.hh" +#include "grob-array.hh" +Grob * +Paper_column::clone (int count) const +{ + return new Paper_column (*this, count); +} ADD_INTERFACE (Paper_column, "paper-column-interface", "@code{Paper_column} objects form the top-most X-parents for items. " @@ -33,10 +38,9 @@ ADD_INTERFACE (Paper_column, "paper-column-interface", " 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"); + "\n", + "between-cols when bounded-by-me " + "page-penalty shortest-playing-duration shortest-starter-duration"); void Paper_column::do_break_processing () @@ -45,42 +49,45 @@ Paper_column::do_break_processing () Item::do_break_processing (); } - int -Paper_column::get_rank (Grob*me) +Paper_column::get_rank (Grob *me) { - return dynamic_cast (me)->rank_; + return dynamic_cast (me)->rank_; } -System* +System * Paper_column::get_system () const { return system_; } -Paper_column* +Paper_column * Paper_column::get_column () const { - return (Paper_column*) (this); + return (Paper_column *) (this); } -Paper_column::Paper_column (SCM l) - : Item (l) // guh.? +Paper_column::Paper_column (SCM l, Object_key const *key) + : Item (l, key) // guh.? { - system_=0; + system_ = 0; rank_ = -1; } +Paper_column::Paper_column (Paper_column const &src, int count) + : Item (src, count) +{ + system_ = 0; + rank_ = src.rank_; +} + Moment -Paper_column::when_mom (Grob*me) +Paper_column::when_mom (Grob *me) { SCM m = me->get_property ("when"); - Moment s (0); - if (unsmob_moment (m)) - { - return *unsmob_moment (m); - } - return s; + if (Moment *when = unsmob_moment (m)) + return *when; + return Moment (0); } bool @@ -94,73 +101,85 @@ Paper_column::is_musical (Grob *me) } return s != Moment (0); } - bool -Paper_column::is_used (Grob*me) +Paper_column::is_used (Grob *me) { - return gh_pair_p (me->get_property ("elements")) || Item::is_breakable (me) - || gh_pair_p (me->get_property ("bounded-by-me")) - ; + extract_grob_set (me ,"elements", elts); + if (elts.size()) + return true; + + extract_grob_set (me ,"bounded-by-me", bbm); + if (bbm.size()) + return true; + return Item::is_breakable (me); } /* - Print a vertical line and the rank number, to aid debugging. - */ + Print a vertical line and the rank number, to aid debugging. +*/ -MAKE_SCHEME_CALLBACK (Paper_column,print,1); +MAKE_SCHEME_CALLBACK (Paper_column, print, 1); SCM Paper_column::print (SCM p) { Grob *me = unsmob_grob (p); String r = to_string (Paper_column::get_rank (me)); - SCM properties = Font_interface::font_alist_chain (me); - SCM scm_mol = Text_item::interpret_markup (me->get_paper ()->self_scm (), - properties, - scm_makfrom0str (r.to_str0 ())); + Moment *mom = unsmob_moment (me->get_property ("when")); + String when = mom ? mom->to_string () : "?/?"; + + SCM properties = Font_interface::text_font_alist_chain (me); + + SCM scm_mol = Text_interface::interpret_markup (me->get_layout ()->self_scm (), + properties, + scm_makfrom0str (r.to_str0 ())); + SCM when_mol = Text_interface::interpret_markup (me->get_layout ()->self_scm (), + properties, + scm_makfrom0str (when.to_str0 ())); Stencil t = *unsmob_stencil (scm_mol); + t.add_at_edge (Y_AXIS, DOWN, *unsmob_stencil (when_mol), 0.1, 0.1); t.align_to (X_AXIS, CENTER); t.align_to (Y_AXIS, DOWN); - + Stencil l = Lookup::filled_box (Box (Interval (-0.01, 0.01), Interval (-2, -1))); t.add_stencil (l); - return t.smobbed_copy (); + return t.smobbed_copy (); } /* This is all too hairy. We use bounded-by-me to make sure that some columns are kept "alive". Unfortunately, when spanners are suicided, - this falls apart again. (sigh.) + this falls apart again, because suicided spanners are still in + bounded-by-me - THIS IS BROKEN KLUDGE. WE SHOULD INVENT SOMETHING BETTER. - */ -MAKE_SCHEME_CALLBACK (Paper_column,before_line_breaking,1); + THIS IS BROKEN KLUDGE. WE SHOULD INVENT SOMETHING BETTER. +*/ +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_property ("bounded-by-me"); - SCM *ptrptr = &c; - - while (gh_pair_p (*ptrptr)) + SCM bbm = me->get_object ("bounded-by-me"); + Grob_array * ga = unsmob_grob_array (bbm); + if (!ga) + return SCM_UNSPECIFIED; + + Link_array &array (ga->array_reference ()); + + for (int i = array.size(); i--; ) { - Grob * g = unsmob_grob (gh_car (*ptrptr)); + Grob *g = array[i]; - if (!g || !g->live ()) - { - *ptrptr = gh_cdr (*ptrptr); - } - else - { - ptrptr = SCM_CDRLOC (*ptrptr); + if (!g || !g->is_live ()) + { // UGH . potentially quadratic. + array.del (i); } } - me->set_property ("bounded-by-me", c); return SCM_UNSPECIFIED; }