release: 1.3.55

[lilypond.git] / lily / dots.cc

diff --git a/lily/dots.cc b/lily/dots.cc
index 0525aa1dda9e45f3cd01915d708d05be90b5df9f..a658d838e72d986e9fab7ff073c8a0afa1262772 100644 (file)
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -3,35 +3,63 @@
 
   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 "molecule.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
+#include "staff-symbol-referencer.hh"
+#include "directional-element-interface.hh"
 
-Dots::Dots ()
+Dots::Dots (SCM s)
+  : Item (s)
 {
-  no_dots_i_ =0;
-  position_i_ =0;
+  set_elt_property ("dot-count", gh_int2scm (0));
 }
 
 void
-Dots::do_post_processing ()
+Dots::after_line_breaking ()
 {
-  if (!(position_i_ % 2))
-    position_i_ ++;
+  SCM d= get_elt_property ("dot-count");
+  if (!gh_number_p (d) || !gh_scm2int (d))
+    {
+      set_elt_property ("transparent", SCM_BOOL_T);
+      set_extent_callback (0, X_AXIS);
+      set_extent_callback (0, Y_AXIS);
+    }
+  else
+    {
+      if (!directional_element (this).get ())
+       directional_element (this).set (UP);
+
+      Staff_symbol_referencer_interface si (this);
+      int p = int (si.position_f ());
+      if (!(p % 2))
+       si.set_position (p  + directional_element (this).get ());
+    }
 }
 
-Molecule* 
-Dots::brew_molecule_p () const
+Molecule  
+Dots::do_brew_molecule () const
 {
-  Symbol d = paper ()->lookup_l ()->dots (no_dots_i_);
-  Molecule *out = new Molecule (Atom (d));
-  Real inter_f = paper ()->internote_f ();
-  out->translate (inter_f * position_i_, Y_AXIS);
-  return out;
+  Molecule mol (lookup_l ()->blank (Box (Interval (0,0),
+                                        Interval (0,0))));
+  Molecule d = 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 (get_elt_property ("dot-count")); i--; )
+    {
+      d.translate_axis (2*dw,X_AXIS);
+      mol.add_molecule (d);
+    }
+
+  return mol;
 }
 
-IMPLEMENT_IS_TYPE_B1(Dots, Item);
+
+