release: 1.5.4

[lilypond.git] / lily / molecule.cc

diff --git a/lily/molecule.cc b/lily/molecule.cc
index e135b6b3fc07efd113c30d3b27602001c5e161fd..b226c741e7fbf5f251535afd3e89abd294bdf5c3 100644 (file)
--- a/lily/molecule.cc
+++ b/lily/molecule.cc
@@ -3,11 +3,11 @@
 
   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"
@@ -15,7 +15,7 @@
 #include "string.hh"
 #include "molecule.hh"
 #include "debug.hh"
-#include "killing-cons.tcc"
+
 
 #include "ly-smobs.icc"
 
@@ -23,13 +23,13 @@
 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];
 }
@@ -40,7 +40,7 @@ Molecule::Molecule (Box b, SCM func)
   dim_ = b;
 }
 
-Molecule::Molecule()
+Molecule::Molecule ()
 {
   expr_ = SCM_EOL;
   set_empty (true);
@@ -52,7 +52,7 @@ Molecule::translate (Offset o)
   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");
@@ -72,7 +72,7 @@ Molecule::translate (Offset o)
 void
 Molecule::translate_axis (Real x,Axis a)
 {
-  Offset o(0,0);
+  Offset o (0,0);
   o[a] = x;
   translate (o);
 }  
@@ -98,7 +98,7 @@ Molecule::set_empty (bool e)
     }
   else
     {
-      dim_[X_AXIS] = Interval(0,0);
+      dim_[X_AXIS] = Interval (0,0);
       dim_[Y_AXIS] = Interval (0,0);
     }
 }
@@ -108,7 +108,7 @@ void
 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);
 }
 
@@ -132,6 +132,84 @@ Molecule::add_at_edge (Axis a, Direction d, Molecule const &m, Real padding)
   add_molecule (toadd);
 }
 
+/* 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 && ly_axis_p (axis) && ly_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)
+{
+  Molecule *m = unsmob_molecule (mol);
+ 
+  if (!m || !ly_axis_p (axis))
+    {
+      warning ("ly-get-molecule-extent: invalid arguments");
+      return ly_interval2scm (Interval (0,0));
+    }
+
+  return ly_interval2scm (m->extent (Axis (gh_scm2int (axis))));
+}
+
+
+SCM
+Molecule::ly_molecule_combined_at_edge (SCM first, SCM axis, SCM direction,
+                          SCM second, SCM padding)
+
+{
+  Molecule * m1 = unsmob_molecule (first);
+  Molecule * m2 = unsmob_molecule (second);
+  Molecule result;
+  
+  if (!m1 || !m2 || !isdir_b (direction) || !ly_axis_p (axis) || !gh_number_p (padding))
+    {
+      warning ("ly-combine-molecule-at-edge: invalid arguments");
+      Molecule r;
+      return  r.smobbed_copy ();
+    }
+
+  result = *m1;
+
+  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 ();
+}
+
+
+static void
+molecule_init ()
+{
+  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);
+
+
 bool
 Molecule::empty_b () const
 {
@@ -139,7 +217,7 @@ Molecule::empty_b () const
 }
 
 SCM
-fontify_atom(Font_metric * met, SCM f)
+fontify_atom (Font_metric * met, SCM f)
 {
   if (f == SCM_EOL)
     return f;
@@ -161,7 +239,7 @@ Molecule::extent_box () const
 {
   return dim_;
 }
-IMPLEMENT_SIMPLE_SMOBS(Molecule);
+IMPLEMENT_SIMPLE_SMOBS (Molecule);
 
 
 int
@@ -170,8 +248,8 @@ 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);*/
+  /*  String str (r->str ());
+  scm_puts ((char *)str.ch_C (), port);*/
   scm_puts (" >", port);
   
   return 1;
@@ -186,6 +264,6 @@ Molecule::mark_smob (SCM 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);
+IMPLEMENT_UNSMOB (Molecule, molecule);