release: 1.3.47

[lilypond.git] / lily / dots.cc

diff --git a/lily/dots.cc b/lily/dots.cc
index 8bba43afcb4c7a9872c4038238484b572eb72e31..5fa59bdd50ea3f5384c90556d9e1639b70148cf3 100644 (file)
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -3,51 +3,61 @@
 
   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 ()
 {
-  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_ ++;
-  if (!no_dots_i_)
+  SCM d= get_elt_property ("dot-count");
+  if (!gh_number_p (d) || !gh_scm2int (d))
     {
-      transparent_b_ = true;
-      set_empty(true);
+      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);
 
-Molecule* 
-Dots::brew_molecule_p () const
+      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::do_brew_molecule () const
 {
-  Molecule *out = new Molecule;
-  Atom fill = paper()->lookup_l ()->fill (Box(Interval(0,0),Interval(0,0)));
-  out->add(fill);
+  Molecule mol (lookup_l ()->blank (Box (Interval (0,0),
+                                         Interval (0,0))));
+  Molecule d = lookup_l ()->afm_find (String ("dots-dot"));
 
-  Atom d = paper ()->lookup_l ()->dots ();
+  Real dw = d.dim_[X_AXIS].length ();
+  d.translate_axis (-dw, X_AXIS);
 
-  Real dw = d.dim_[X_AXIS].length();
-  d.translate_axis(-dw,X_AXIS);
-  for (int i=no_dots_i_; i--; )
+
+  for (int i = gh_scm2int (get_elt_property ("dot-count")); i--; )
     {
-      d.translate_axis(2*dw,X_AXIS);
-      out->add (d);
+      d.translate_axis (2*dw,X_AXIS);
+      mol.add_molecule (d);
     }
-  Real inter_f = paper ()->internote_f ();
-  out->translate_axis (inter_f * position_i_, Y_AXIS);
-  return out;
+
+  return mol;
 }
 
-IMPLEMENT_IS_TYPE_B1(Dots, Item);
+
+