X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdots.cc;h=1b702e293207749c85219d95b329ccb046041931;hb=dda8fcdc6f378ad4b4e2e5135b9c266088feaf7c;hp=44e06c0b23bc9336a0fd96eef051f910024738c2;hpb=dcade6efa10f6acb65ac3e64a5823ffd0aae04e8;p=lilypond.git

diff --git a/lily/dots.cc b/lily/dots.cc
index 44e06c0b23..1b702e2932 100644
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -3,51 +3,64 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.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 ()
-{
-  no_dots_i_ =0;
-  position_i_ =0;
-}
 
-void
-Dots::do_post_processing ()
+Real
+Dots::quantised_position_callback (Score_element * me, Axis a)
 {
-  if (!(position_i_ % 2))
-    position_i_ ++;
-  if (!no_dots_i_)
+  assert (a == Y_AXIS);
+    
+  SCM d= me->get_elt_property ("dot-count");
+  if (gh_number_p (d) && gh_scm2int (d))
     {
-      transparent_b_ = true;
-      set_empty(true);
+      if (!Directional_element_interface (me).get ())
+	Directional_element_interface (me).set (UP);
+
+
+      int pos = int (Staff_symbol_referencer::position_f (me));
+      if (!(pos % 2))
+	return Staff_symbol_referencer::staff_space (me) / 2.0 * Directional_element_interface (me).get ();
     }
+
+  return  0.0;
 }
 
-Molecule* 
-Dots::brew_molecule_p () const
-{
-  Molecule *out = new Molecule;
-  Atom fill = paper()->lookup_l ()->fill (Box(Interval(0,0),Interval(0,0)));
-  out->add(fill);
 
-  Atom d = paper ()->lookup_l ()->dots (0);
+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(-dw,X_AXIS);
-  for (int i=no_dots_i_; i--; )
+  SCM c = sc->get_elt_property ("dot-count");
+  if (gh_number_p (c))
     {
-      d.translate(2*dw,X_AXIS);
-      out->add (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);
+	}
     }
-  Real inter_f = paper ()->internote_f ();
-  out->translate (inter_f * position_i_, Y_AXIS);
-  return out;
+  return mol.create_scheme ();
 }
 
-IMPLEMENT_IS_TYPE_B1(Dots, Item);
+
+