X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=lily%2Fmolecule.cc;h=c3cb95b66ac9211e8d29ea90809765a2bb97a895;hb=343637e19d2690386903e8a7829ce55ef2c8e048;hp=f9cc7bb12a9da38d87b4e51a55c4616fda3d913d;hpb=6a62932652940f4ac2931f75d48796887fbc5fdc;p=lilypond.git diff --git a/lily/molecule.cc b/lily/molecule.cc index f9cc7bb12a..c3cb95b66a 100644 --- a/lily/molecule.cc +++ b/lily/molecule.cc @@ -3,138 +3,268 @@ source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--2000 Han-Wen Nienhuys */ +#include +#include + +#include "font-metric.hh" +#include "dimensions.hh" #include "interval.hh" -#include "dimen.hh" #include "string.hh" #include "molecule.hh" -#include "symbol.hh" #include "debug.hh" -#include "tex.hh" +#include "killing-cons.tcc" + +#include "ly-smobs.icc" + + +SCM +Molecule::smobbed_copy () const +{ + Molecule * m = new Molecule(*this); + + return m->smobbed_self (); +} -String -Molecule::TeX_string() const +Interval +Molecule::extent(Axis a) const { - String s; - for(iter_top(ats,c); c.ok(); c++) - s+=c->TeX_string(); - return s; + return dim_[a]; } -Box -Molecule::extent() const +Molecule::Molecule (Box b, SCM func) { - Box b; - for(iter_top(ats,c); c.ok(); c++) - b.unite(c->extent()); - return b; + expr_ = func; + dim_ = b; +} + +Molecule::Molecule() +{ + expr_ = SCM_EOL; + set_empty (true); } void -Molecule::translate(Offset o) +Molecule::translate (Offset o) { - for (iter_top(ats,c); c.ok(); c++) - c->translate(o); + Axis a = X_AXIS; + while (a < NO_AXES) + { + if (abs(o[a]) > 30 CM + || isinf (o[a]) || isnan (o[a])) + { + programming_error ("Improbable offset for translation: setting to zero"); + o[a] = 0.0; + } + incr (a); + } + + expr_ = gh_list (ly_symbol2scm ("translate-molecule"), + ly_offset2scm (o), + expr_, SCM_UNDEFINED); + if (!empty_b ()) + dim_.translate (o); } + + +void +Molecule::translate_axis (Real x,Axis a) +{ + Offset o(0,0); + o[a] = x; + translate (o); +} + + void -Molecule::translate(Real x,Axis a) +Molecule::add_molecule (Molecule const &m) { - for (iter_top(ats,c); c.ok(); c++) - c->translate(x,a); + expr_ = gh_list (ly_symbol2scm ("combine-molecule"), + m.expr_, + expr_, SCM_UNDEFINED); + dim_.unite (m.dim_); } void -Molecule::add(Molecule const &m) +Molecule::set_empty (bool e) { - for (iter_top(m.ats,c); c.ok(); c++) { - add(**c); + if (e) + { + dim_[X_AXIS].set_empty (); + dim_[Y_AXIS].set_empty (); + } + else + { + dim_[X_AXIS] = Interval(0,0); + dim_[Y_AXIS] = Interval (0,0); } } + void -Molecule::add_right(Molecule const &m) +Molecule::align_to (Axis a, Direction d) { - if (!ats.size()) { - add(m); - return; - } - Real xof=extent().x().right - m.extent().x().left; - - - Molecule toadd(m); - toadd.translate(Offset(xof, 0.0)); - add(toadd); + Interval i (extent (a)); + Real r = (d == CENTER) ? i.center () : i[d]; + translate_axis (-r, a); } void -Molecule::add_left(Molecule const &m) +Molecule::add_at_edge (Axis a, Direction d, Molecule const &m, Real padding) { - if (!ats.size()) { - add(m); - return; + Real my_extent= empty_b () ? 0.0 : dim_[a][d]; + Interval i (m.extent (a)); + Real his_extent; + if (i.empty_b ()) + { + programming_error ("Molecule::add_at_edge: adding empty molecule."); + his_extent = 0.0; } - Real xof=extent().x().left - m.extent().x().right; - - Molecule toadd(m); - toadd.translate(Offset(xof, 0.0)); - add(toadd); + else + his_extent = i[-d]; + + Real offset = my_extent - his_extent; + Molecule toadd (m); + toadd.translate_axis (offset + d * padding, a); + add_molecule (toadd); } -void -Molecule::add_top(Molecule const &m) + + +bool +number_pair_p (SCM p) +{ + return gh_pair_p (p) && gh_number_p (gh_car (p)) && gh_number_p (gh_cdr (p)); +} + +bool +axis_p (SCM a) +{ + return gh_number_p (a) && (gh_scm2int (a) == 0 || gh_scm2int (a) == 1); +} + +SCM +Molecule::ly_set_molecule_extent_x (SCM mol, SCM axis, SCM np) +{ + Molecule* m = unsmob_molecule (mol); + if (m && axis_p (axis) && number_pair_p (np)) + { + Interval iv = ly_scm2interval (np); + m->dim_[Axis(gh_scm2int (axis))] = ly_scm2interval (np); + } + else + warning ("ly-set-molecule-extent!: invalid arguments"); + return SCM_UNDEFINED; +} + +SCM +Molecule::ly_get_molecule_extent (SCM mol, SCM axis) { - if (!ats.size()) { - add(m); - return; + Molecule *m = unsmob_molecule (mol); + + if (!m || !axis_p (axis)) + { + warning ("ly-get-molecule-extent: invalid arguments"); + return ly_interval2scm (Interval (0,0)); } - Real yof=extent().y().right - m.extent().y().left; - Molecule toadd(m); - toadd.translate(yof, Y_AXIS); - add(toadd); + return ly_interval2scm (m->extent (Axis (gh_scm2int (axis)))); } -void -Molecule::add_bottom(Molecule const &m) + +SCM +Molecule::ly_molecule_combined_at_edge (SCM first, SCM axis, SCM direction, + SCM second, SCM padding) + { - if (!ats.size()) { - add(m); - return; + Molecule * m1 = unsmob_molecule (first); + Molecule * m2 = unsmob_molecule (second); + Molecule result; + + if (!m1 || !m2 || !isdir_b (direction) || !axis_p (axis) || !gh_number_p (padding)) + { + warning ("ly-combine-molecule-at-edge: invalid arguments"); + Molecule r; + return r.smobbed_copy (); } - Real yof=extent().y().left- m.extent().y().right; - Molecule toadd(m); - toadd.translate(yof, Y_AXIS); - add(toadd); + + result = *m1; + + result.add_at_edge (Axis (gh_scm2int (axis)), Direction (gh_scm2int (direction)), + *m2, gh_scm2double (padding)); + + return result.smobbed_copy (); } -void -Molecule::operator = (Molecule const &) + +static void +molecule_init () { - assert(false); + scm_make_gsubr ("ly-combine-molecule-at-edge", 5 , 0, 0, (Scheme_function_unknown) Molecule::ly_molecule_combined_at_edge); + scm_make_gsubr ("ly-set-molecule-extent!", 3 , 0, 0, (Scheme_function_unknown) Molecule::ly_set_molecule_extent_x); + scm_make_gsubr ("ly-get-molecule-extent", 2 , 0, 0, (Scheme_function_unknown) Molecule::ly_get_molecule_extent); } +ADD_SCM_INIT_FUNC(molecule,molecule_init); -Molecule::Molecule(Molecule const &s) + +bool +Molecule::empty_b () const { - add(s); + return expr_ == SCM_EOL; } -void -Molecule::print() const +SCM +fontify_atom(Font_metric * met, SCM f) { -#ifndef NPRINT - if (! check_debug) - return; - for (iter_top(ats,c); c.ok(); c++) - c->print(); -#endif + if (f == SCM_EOL) + return f; + else + return gh_list (ly_symbol2scm ("fontify"), + ly_quote_scm (met->description_), f, SCM_UNDEFINED); } -void -Molecule::add(Atom const &a) +SCM +Molecule::get_expr () const +{ + return expr_; +} + + + +Box +Molecule::extent_box () const +{ + return dim_; +} +IMPLEMENT_SIMPLE_SMOBS(Molecule); + + +int +Molecule::print_smob (SCM s, SCM port, scm_print_state *) +{ + Molecule *r = (Molecule *) gh_cdr (s); + + scm_puts ("#str()); + scm_puts ((char *)str.ch_C(), port);*/ + scm_puts (" >", port); + + return 1; +} + + +SCM +Molecule::mark_smob (SCM s) { - ats.bottom().add(new Atom(a)); + Molecule *r = (Molecule *) gh_cdr (s); + + return r->expr_; } + +IMPLEMENT_TYPE_P(Molecule, "molecule?"); +IMPLEMENT_DEFAULT_EQUAL_P(Molecule); +IMPLEMENT_UNSMOB(Molecule, molecule);