2003 -> 2004

[lilypond.git] / lily / molecule.cc

diff --git a/lily/molecule.cc b/lily/molecule.cc
index f054a280212b2193d93751c0c6abcabe5cc20bf4..552e88675c7230e994e6594e88f98a64c2d5dbd7 100644 (file)
--- a/lily/molecule.cc
+++ b/lily/molecule.cc
@@ -3,99 +3,190 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include <math.h>
+#include <libc-extension.hh>   // isinf
+
+#include "font-metric.hh" 
+#include "dimensions.hh"
 #include "interval.hh"
-#include "dimen.hh"
 #include "string.hh"
 #include "molecule.hh"
-#include "atom.hh"
-#include "debug.hh"
-#include "tex.hh"
+#include "warn.hh"
+
+
+#include "ly-smobs.icc"
+
 
-String
-Molecule::TeX_string() const
+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]) > 100 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 (!is_empty ())
+    dim_.translate (o);
 }
+  
 
 void
 Molecule::translate_axis (Real x,Axis a)
 {
-  for (iter_top (ats,c); c.ok(); c++)
-    c->translate_axis (x,a);
+  Offset o (0,0);
+  o[a] = x;
+  translate (o);
+}  
+
+
+
+void
+Molecule::add_molecule (Molecule const &m)
+{
+  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)
+    {
+      dim_[X_AXIS].set_empty ();
+      dim_[Y_AXIS].set_empty ();
+    }
+  else
     {
-      add (**c);
+      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, Real x)
 {
-  if (!ats.size()) 
+  if (is_empty ())
+    return ;
+
+  Interval i (extent (a));
+  translate_axis (-i.linear_combination (x), a);
+}
+
+/*
+  See scheme Function.
+ */
+void
+Molecule::add_at_edge (Axis a, Direction d, Molecule const &m, Real padding,
+                      Real minimum)
+{
+  Real my_extent= is_empty () ? 0.0 : dim_[a][d];
+  Interval i (m.extent (a));
+  Real his_extent;
+  if (i.is_empty ())
     {
-      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)  + d*padding;
+  if (minimum > 0  && fabs (offset) <  minimum)
+    offset = sign (offset) * minimum; 
+  
   Molecule toadd (m);
   toadd.translate_axis (offset, a);
-  add (toadd);
+  add_molecule (toadd);
 }
 
-  
-  
-void
-Molecule::operator = (Molecule const &)
+
+
+/*
+  Hmm... maybe this is not such a good idea ; stuff can be empty,
+  while expr_ == '()
+ */
+bool
+Molecule::is_empty () const
 {
-  assert (false);
+  return expr_ == SCM_EOL;
 }
 
-Molecule::Molecule (Molecule const &s)
+SCM
+Molecule::get_expr () const
 {
-  add (s);
+  return expr_;
 }
 
-void
-Molecule::print() const
+
+
+Box
+Molecule::extent_box () const
 {
-#ifndef NPRINT
-  if (! check_debug)
-    return;
-  for (iter_top (ats,c); c.ok(); c++)
-    c->print();
-#endif
+  return dim_;
 }
+IMPLEMENT_SIMPLE_SMOBS (Molecule);
 
-void
-Molecule::add (Atom const &a)
+
+int
+Molecule::print_smob (SCM , SCM port, scm_print_state *)
+{
+  scm_puts ("#<Molecule ", port);
+  scm_puts (" >", port);
+  
+  return 1;
+}
+
+  
+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, "ly:molecule?");
+IMPLEMENT_DEFAULT_EQUAL_P (Molecule);
+