source file of the GNU LilyPond music typesetter
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "moment.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?
-
-",
+ " Paper_columns form the top-most item parent. (The Paper_columns X\n"
+" parent is System, which is a spanner.)\n"
+"\n"
+" Paper_columns form the units for the spacing engine. 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"
+"\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"
+" Don't be confused by right-items: each spacing wish can also contain\n"
+" a number of items, with which a spacing constraint may be kept. It's\n"
+" a little baroque, but it might come in handy later on?\n"
+"\n",
"between-cols between-system-string when bounded-by-me shortest-playing-duration shortest-starter-duration");
int
-Paper_column::rank_i (Grob*me)
+Paper_column::get_rank (Grob*me)
{
- return dynamic_cast<Paper_column*> (me)->rank_i_;
+ return dynamic_cast<Paper_column*> (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);
}
Paper_column::Paper_column (SCM l)
: Item (l) // guh.?
{
- line_l_=0;
- rank_i_ = -1;
+ system_=0;
+ rank_ = -1;
}
Moment
{
Grob *me = unsmob_grob (p);
- String r = to_str (Paper_column::rank_i (me));
+ String r = to_string (Paper_column::get_rank (me));
SCM properties = Font_interface::font_alist_chain (me);
-
- Molecule t = Text_item::text2molecule (me, ly_str02scm (r.ch_C()),
- properties);
+
+ SCM scm_mol = Text_item::interpret_markup (me->get_paper ()->self_scm (),
+ properties,
+ scm_makfrom0str (r.to_str0 ()));
+ Molecule t = *unsmob_molecule (scm_mol);
t.align_to (X_AXIS, CENTER);
t.align_to (Y_AXIS, DOWN);
- Molecule l = Lookup::filledbox (Box (Interval (-0.01, 0.01),
+ Molecule l = Lookup::filled_box (Box (Interval (-0.01, 0.01),
Interval (-2, -1)));
t.add_molecule (l);
SCM c = me->get_grob_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);
}
-
- c = gh_cdr (c);
}
me->set_grob_property ("bounded-by-me", c);