source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <math.h>
-#include <libc-extension.hh>
+#include <libc-extension.hh> // isinf
#include "font-metric.hh"
#include "dimensions.hh"
#include "string.hh"
#include "molecule.hh"
#include "debug.hh"
-#include "killing-cons.tcc"
+
#include "ly-smobs.icc"
SCM
Molecule::smobbed_copy () const
{
- Molecule * m = new Molecule(*this);
+ Molecule * m = new Molecule (*this);
return m->smobbed_self ();
}
Interval
-Molecule::extent(Axis a) const
+Molecule::extent (Axis a) const
{
return dim_[a];
}
dim_ = b;
}
-Molecule::Molecule()
+Molecule::Molecule ()
{
expr_ = SCM_EOL;
set_empty (true);
Axis a = X_AXIS;
while (a < NO_AXES)
{
- if (abs(o[a]) > 30 CM
+ if (abs (o[a]) > 30 CM
|| isinf (o[a]) || isnan (o[a]))
{
programming_error ("Improbable offset for translation: setting to zero");
incr (a);
}
- expr_ = gh_list (ly_symbol2scm ("translate-molecule"),
+ expr_ = scm_list_n (ly_symbol2scm ("translate-molecule"),
ly_offset2scm (o),
expr_, SCM_UNDEFINED);
if (!empty_b ())
void
Molecule::translate_axis (Real x,Axis a)
{
- Offset o(0,0);
+ Offset o (0,0);
o[a] = x;
translate (o);
}
void
Molecule::add_molecule (Molecule const &m)
{
- expr_ = gh_list (ly_symbol2scm ("combine-molecule"),
+ expr_ = scm_list_n (ly_symbol2scm ("combine-molecule"),
m.expr_,
expr_, SCM_UNDEFINED);
dim_.unite (m.dim_);
}
else
{
- dim_[X_AXIS] = Interval(0,0);
+ dim_[X_AXIS] = Interval (0,0);
dim_[Y_AXIS] = Interval (0,0);
}
}
Molecule::align_to (Axis a, Direction d)
{
Interval i (extent (a));
- Real r = (d == CENTER) ? i.center () : i[d];
+ Real r = (d == CENTER) ? i.center () : i[d];
translate_axis (-r, a);
}
add_molecule (toadd);
}
-
-
-
-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);
-}
-
+/* 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)
{
Molecule* m = unsmob_molecule (mol);
- if (m && axis_p (axis) && number_pair_p (np))
+ if (m && ly_axis_p (axis) && ly_number_pair_p (np))
{
Interval iv = ly_scm2interval (np);
- m->dim_[Axis(gh_scm2int (axis))] = ly_scm2interval (np);
+ m->dim_[Axis (gh_scm2int (axis))] = iv;
}
else
warning ("ly-set-molecule-extent!: invalid arguments");
{
Molecule *m = unsmob_molecule (mol);
- if (!m || !axis_p (axis))
+ if (!m || !ly_axis_p (axis))
{
warning ("ly-get-molecule-extent: invalid arguments");
return ly_interval2scm (Interval (0,0));
Molecule * m2 = unsmob_molecule (second);
Molecule result;
- if (!m1 || !m2 || !isdir_b (direction) || !axis_p (axis) || !gh_number_p (padding))
+ if (!m1 || !m2 || !isdir_b (direction) || !ly_axis_p (axis) || !gh_number_p (padding))
{
warning ("ly-combine-molecule-at-edge: invalid arguments");
Molecule r;
}
+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 ();
+}
+
+
static void
molecule_init ()
{
- 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);
+ scm_c_define_gsubr ("ly-make-molecule", 3, 0, 0, (Scheme_function_unknown) make_molecule);
+ 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);
+ADD_SCM_INIT_FUNC (molecule,molecule_init);
bool
}
SCM
-fontify_atom(Font_metric * met, SCM f)
+fontify_atom (Font_metric * met, SCM f)
{
if (f == SCM_EOL)
return f;
else
- return gh_list (ly_symbol2scm ("fontify"),
+ return scm_list_n (ly_symbol2scm ("fontify"),
ly_quote_scm (met->description_), f, SCM_UNDEFINED);
}
{
return dim_;
}
-IMPLEMENT_SIMPLE_SMOBS(Molecule);
+IMPLEMENT_SIMPLE_SMOBS (Molecule);
int
Molecule::print_smob (SCM s, SCM port, scm_print_state *)
{
- Molecule *r = (Molecule *) gh_cdr (s);
scm_puts ("#<Molecule ", port);
- /* String str(r->str());
- scm_puts ((char *)str.ch_C(), port);*/
+#if 0
+ Molecule *r = (Molecule *) ly_cdr (s);
+ String str (r->str ());
+ scm_puts ((char *)str.ch_C (), port);
+#endif
scm_puts (" >", port);
return 1;
SCM
Molecule::mark_smob (SCM s)
{
- Molecule *r = (Molecule *) gh_cdr (s);
+ Molecule *r = (Molecule *) ly_cdr (s);
return r->expr_;
}
-IMPLEMENT_TYPE_P(Molecule, "molecule?");
-IMPLEMENT_DEFAULT_EQUAL_P(Molecule);
-IMPLEMENT_UNSMOB(Molecule, molecule);
+IMPLEMENT_TYPE_P (Molecule, "molecule?");
+IMPLEMENT_DEFAULT_EQUAL_P (Molecule);
+