release: 1.3.131

[lilypond.git] / lily / molecule.cc

diff --git a/lily/molecule.cc b/lily/molecule.cc
index 079a829d8a78b5b9c0d051ebe1e46ee4ecb5e84e..da4ef0cfcb39c2bff55c7b0abd2ce74bcbac4fc3 100644 (file)
--- a/lily/molecule.cc
+++ b/lily/molecule.cc
@@ -3,13 +3,13 @@
 
   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 "font-metric.hh"
+#include "font-metric.hh" 
 #include "dimensions.hh"
 #include "interval.hh"
 #include "string.hh"
@@ -17,6 +17,17 @@
 #include "debug.hh"
 #include "killing-cons.tcc"
 
+#include "ly-smobs.icc"
+
+
+SCM
+Molecule::smobbed_copy () const
+{
+  Molecule * m = new Molecule(*this);
+
+  return m->smobbed_self ();
+}
+
 Interval
 Molecule::extent(Axis a) const
 {
@@ -106,16 +117,100 @@ Molecule::add_at_edge (Axis a, Direction d, Molecule const &m, Real padding)
 {
   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.");
-  
-  Real his_extent = i[-d];
+    {
+      programming_error ("Molecule::add_at_edge: adding empty molecule.");
+      his_extent = 0.0;
+    }
+  else
+    his_extent = i[-d];      
+
   Real offset = my_extent -  his_extent;
   Molecule toadd (m);
   toadd.translate_axis (offset + d * padding, 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); 
+}
+
+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)
+{
+  Molecule *m = unsmob_molecule (mol);
+ 
+  if (!m || !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) || !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 ();
+}
+
+
+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);
+}
+ADD_SCM_INIT_FUNC(molecule,molecule_init);
+
+
 bool
 Molecule::empty_b () const
 {
@@ -125,8 +220,11 @@ Molecule::empty_b () const
 SCM
 fontify_atom(Font_metric * met, SCM f)
 {
-  return  gh_list (ly_symbol2scm ("fontify"),
-                  ly_quote_scm (met->description ()), f, SCM_UNDEFINED);
+  if (f == SCM_EOL)
+    return f;
+  else
+    return  gh_list (ly_symbol2scm ("fontify"),
+                    ly_quote_scm (met->description_), f, SCM_UNDEFINED);
 }
 
 SCM
@@ -135,28 +233,38 @@ Molecule::get_expr () const
   return expr_;
 }
 
-Molecule
-create_molecule (SCM scm_mol)
+
+
+Box
+Molecule::extent_box () const
 {
-  if (!gh_pair_p (scm_mol))
-    return Molecule ();
+  return dim_;
+}
+IMPLEMENT_SIMPLE_SMOBS(Molecule);
 
-  SCM exp = gh_car (scm_mol);
-  scm_mol = gh_cdr (scm_mol);
-  Box b ;
-  if (gh_pair_p (scm_mol))
-    {
-      Interval i1 = ly_scm2interval (gh_car (scm_mol));
-      Interval i2 = ly_scm2interval (gh_cdr (scm_mol));  
-      b = Box (i1,i2);
-    }
-  return Molecule (b, exp);
+
+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);*/
+  scm_puts (" >", port);
+  
+  return 1;
 }
 
+  
 SCM
-Molecule::create_scheme () const
+Molecule::mark_smob (SCM s)
 {
-  return gh_cons (expr_,
-                 gh_cons (ly_interval2scm (dim_[X_AXIS]),
-                          ly_interval2scm (dim_[Y_AXIS])));
+  Molecule  *r = (Molecule *) gh_cdr (s);
+  
+  return r->expr_;
 }
+
+IMPLEMENT_TYPE_P(Molecule, "molecule?");
+IMPLEMENT_DEFAULT_EQUAL_P(Molecule);
+IMPLEMENT_UNSMOB(Molecule, molecule);