release: 1.3.93

[lilypond.git] / lily / dots.cc

diff --git a/lily/dots.cc b/lily/dots.cc
index c125ffcd4299c0d9767b8155a3b7a6a17c18318c..25e4cec7dd18b0233ad477d6e37c782fe97ce5fe 100644 (file)
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -3,56 +3,62 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "dots.hh"
+#include "item.hh"
 #include "molecule.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
+#include "staff-symbol-referencer.hh"
+#include "directional-element-interface.hh"
 
-Dots::Dots ()
-{
-  dots_i_ =0;
-  position_i_ =0;
-  resolve_dir_ =CENTER;
-}
 
-void
-Dots::do_post_processing ()
+Real
+Dots::quantised_position_callback (Score_element * me, Axis a)
 {
-  if (!resolve_dir_)
-    resolve_dir_ = UP;
-  
-  if (!(position_i_ % 2))
-    position_i_ += resolve_dir_;
-
-  if (!dots_i_)
+  assert (a == Y_AXIS);
+    
+  SCM d= me->get_elt_property ("dot-count");
+  if (gh_number_p (d) && gh_scm2int (d))
     {
-      set_elt_property (transparent_scm_sym, SCM_BOOL_T);
-      set_empty (true, X_AXIS, Y_AXIS);
+      if (!Directional_element_interface::get (me))
+       Directional_element_interface::set (me, UP);
+
+      if (Staff_symbol_referencer::on_staffline (me))
+       return Staff_symbol_referencer::staff_space (me) / 2.0 * Directional_element_interface::get (me);
     }
+
+  return  0.0;
 }
 
-Molecule* 
-Dots::do_brew_molecule_p () const
-{
-  Molecule *out = new Molecule;
-  Molecule fill = lookup_l ()->fill (Box (Interval (0,0),
-                                              Interval (0,0)));
-  out->add_molecule (fill);
 
-  Molecule d = lookup_l ()->dots ();
+MAKE_SCHEME_CALLBACK(Dots,brew_molecule);
+SCM  
+Dots::brew_molecule (SCM d)
+{
+  Score_element *sc = unsmob_element (d);
+  Molecule mol (sc->lookup_l ()->blank (Box (Interval (0,0),
+                                        Interval (0,0))));
 
-  Real dw = d.dim_[X_AXIS].length ();
-  d.translate_axis (-dw, X_AXIS);
-  for (int i=dots_i_; i--; )
+  SCM c = sc->get_elt_property ("dot-count");
+  if (gh_number_p (c))
     {
-      d.translate_axis (2*dw,X_AXIS);
-      out->add_molecule (d);
+      Molecule d = sc->lookup_l ()->afm_find (String ("dots-dot"));
+
+      Real dw = d.extent (X_AXIS).length ();
+      d.translate_axis (-dw, X_AXIS);
+
+
+      for (int i = gh_scm2int (c); i--; )
+       {
+         d.translate_axis (2*dw,X_AXIS);
+         mol.add_molecule (d);
+       }
     }
-  out->translate_axis (staff_line_leading_f () * position_i_ /2., Y_AXIS);
-  return out;
+  return mol.create_scheme ();
 }
 
 
+