X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmolecule.cc;h=6bb59a58a1b3239e0cf01332e45b74d75e1880bc;hb=5ca271301d3af557f4720223736dc2d7b981c12b;hp=e37f9e7c33d4ab9f34315d1f4d24c03a6880ef4a;hpb=cec6dfa6bf0fb931eb7f42b1ee44ca2ec19a9f34;p=lilypond.git diff --git a/lily/molecule.cc b/lily/molecule.cc index e37f9e7c33..6bb59a58a1 100644 --- a/lily/molecule.cc +++ b/lily/molecule.cc @@ -3,99 +3,286 @@ source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ +#include +#include // isinf + +#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" -String -Molecule::TeX_string() const + +#include "ly-smobs.icc" + + +SCM +Molecule::smobbed_copy () const { - String s; - for (iter_top (ats,c); c.ok(); c++) - s+=c->TeX_string(); - return s; + Molecule * m = new Molecule (*this); + + return m->smobbed_self (); } -Box -Molecule::extent() const +Interval +Molecule::extent (Axis a) const { - Box b; - for (iter_top (ats,c); c.ok(); c++) - b.unite (c->extent()); - return b; + return dim_[a]; +} + +Molecule::Molecule (Box b, SCM func) +{ + expr_ = func; + dim_ = b; +} + +Molecule::Molecule () +{ + expr_ = SCM_EOL; + set_empty (true); } void 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_ = scm_list_n (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_ = scm_list_n (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++) + if (e) { - add (**c); + 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_at_edge (Axis a, Direction d, Molecule const &m) +Molecule::align_to (Axis a, Direction d) +{ + Interval i (extent (a)); + Real r = (d == CENTER) ? i.center () : i[d]; + translate_axis (-r, a); +} + +void +Molecule::add_at_edge (Axis a, Direction d, Molecule const &m, Real padding) { - if (!ats.size()) + Real my_extent= empty_b () ? 0.0 : dim_[a][d]; + Interval i (m.extent (a)); + Real his_extent; + if (i.empty_b ()) { - add (m); - return; + programming_error ("Molecule::add_at_edge: adding empty molecule."); + his_extent = 0.0; } - Real offset = extent ()[a][d] - m.extent ()[a][-d]; + else + his_extent = i[-d]; + + Real offset = my_extent - his_extent; Molecule toadd (m); - toadd.translate (offset, a); - add (toadd); + toadd.translate_axis (offset + d * padding, a); + add_molecule (toadd); } - - -void -Molecule::operator = (Molecule const &) +/* ly_? Thought we had the ly_ prefix for wrapping/adding to gh_ */ +SCM +Molecule::ly_set_molecule_extent_x (SCM mol, SCM axis, SCM np) { - assert (false); + Molecule* m = unsmob_molecule (mol); + SCM_ASSERT_TYPE (m, mol, SCM_ARG1, __FUNCTION__, "molecule"); + SCM_ASSERT_TYPE (ly_axis_p(axis), axis, SCM_ARG2, __FUNCTION__, "axis"); + SCM_ASSERT_TYPE (ly_number_pair_p (np), np, SCM_ARG3, __FUNCTION__, "number pair"); + + Interval iv = ly_scm2interval (np); + m->dim_[Axis (gh_scm2int (axis))] = iv; + + return SCM_UNDEFINED; } -Molecule::Molecule (Molecule const &s) +SCM +Molecule::ly_get_molecule_extent (SCM mol, SCM axis) { - add (s); + Molecule *m = unsmob_molecule (mol); + SCM_ASSERT_TYPE (m, mol, SCM_ARG1, __FUNCTION__, "molecule"); + SCM_ASSERT_TYPE (ly_axis_p(axis), axis, SCM_ARG2, __FUNCTION__, "axis"); + + return ly_interval2scm (m->extent (Axis (gh_scm2int (axis)))); } -void -Molecule::print() const + +SCM +Molecule::ly_molecule_combined_at_edge (SCM first, SCM axis, SCM direction, + SCM second, SCM padding) + { -#ifndef NPRINT - if (! check_debug) - return; - for (iter_top (ats,c); c.ok(); c++) - c->print(); + Molecule * m1 = unsmob_molecule (first); + Molecule * m2 = unsmob_molecule (second); + Molecule result; + + + SCM_ASSERT_TYPE(ly_axis_p(axis), axis, SCM_ARG2, __FUNCTION__, "axis"); + SCM_ASSERT_TYPE(ly_dir_p (direction), direction, SCM_ARG3, __FUNCTION__, "dir"); + SCM_ASSERT_TYPE(gh_number_p(padding), padding, SCM_ARG4, __FUNCTION__, "number"); + + if (m1) + result = *m1; + if (m2) + result.add_at_edge (Axis (gh_scm2int (axis)), Direction (gh_scm2int (direction)), + *m2, gh_scm2double (padding)); + + return result.smobbed_copy (); +} + + +SCM +make_molecule (SCM expr, SCM xext, SCM yext) +{ + /* + TODO: typechecking. + */ + Box b (ly_scm2interval (xext), ly_scm2interval(yext)); + Molecule m (b, expr); + return m.smobbed_copy (); +} + +SCM +fontify_atom (Font_metric * met, SCM f) +{ + if (f == SCM_EOL) + return f; + else + return scm_list_n (ly_symbol2scm ("fontify"), + ly_quote_scm (met->description_), f, SCM_UNDEFINED); +} + +SCM +ly_fontify_atom (SCM met, SCM f) +{ + SCM_ASSERT_TYPE(unsmob_metrics (met), met, SCM_ARG1, __FUNCTION__, "font metric"); + + return fontify_atom (unsmob_metrics (met), f); +} + +SCM +ly_align_to_x (SCM mol, SCM axis, SCM dir) +{ + SCM_ASSERT_TYPE(unsmob_molecule (mol), mol, SCM_ARG1, __FUNCTION__, "molecule"); + SCM_ASSERT_TYPE(ly_axis_p(axis), axis, SCM_ARG2, __FUNCTION__, "axis"); + SCM_ASSERT_TYPE(ly_dir_p (dir), dir, SCM_ARG3, __FUNCTION__, "dir"); + + unsmob_molecule (mol)->align_to ((Axis)gh_scm2int (axis), Direction (gh_scm2int (dir))); + + return SCM_UNDEFINED; +} + + +static void +molecule_init () +{ + scm_c_define_gsubr ("ly-make-molecule", 3, 0, 0, (Scheme_function_unknown) make_molecule); + scm_c_define_gsubr ("ly-fontify-atom", 2, 0, 0, (Scheme_function_unknown) ly_fontify_atom); + scm_c_define_gsubr ("ly-align-to!", 3, 0, 0, (Scheme_function_unknown) ly_align_to_x); + scm_c_define_gsubr ("ly-combine-molecule-at-edge", 5 , 0, 0, (Scheme_function_unknown) Molecule::ly_molecule_combined_at_edge); + scm_c_define_gsubr ("ly-set-molecule-extent!", 3 , 0, 0, (Scheme_function_unknown) Molecule::ly_set_molecule_extent_x); + scm_c_define_gsubr ("ly-get-molecule-extent", 2 , 0, 0, (Scheme_function_unknown) Molecule::ly_get_molecule_extent); +} +ADD_SCM_INIT_FUNC (molecule,molecule_init); + + +bool +Molecule::empty_b () const +{ + return expr_ == SCM_EOL; +} + +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 *) +{ + + scm_puts ("#str ()); + scm_puts ((char *)str.ch_C (), port); #endif + scm_puts (" >", port); + + return 1; } -void -Molecule::add (Atom const &a) + +SCM +Molecule::mark_smob (SCM s) { - ats.bottom().add (new Atom (a)); + Molecule *r = (Molecule *) ly_cdr (s); + + return r->expr_; } + +IMPLEMENT_TYPE_P (Molecule, "molecule?"); +IMPLEMENT_DEFAULT_EQUAL_P (Molecule); +