* Documentation/user/music-glossary.tely: add @omf tags

[lilypond.git] / lily / dots.cc

diff --git a/lily/dots.cc b/lily/dots.cc
index 4dc6ab4877a7e373f86486a25ba8830e9ee2290c..b6343f17b4c9911b7e43123df29bc204758be74c 100644 (file)
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "dots.hh"
@@ -16,7 +16,7 @@
 #include "directional-element-interface.hh"
 
 
-MAKE_SCHEME_CALLBACK(Dots,quantised_position_callback,2);
+MAKE_SCHEME_CALLBACK (Dots,quantised_position_callback,2);
 SCM
 Dots::quantised_position_callback (SCM element_smob, SCM axis)
 {
@@ -34,11 +34,11 @@ Dots::quantised_position_callback (SCM element_smob, SCM axis)
        return gh_double2scm (Staff_symbol_referencer::staff_space (me) / 2.0 * Directional_element_interface::get (me));
     }
 
-  return gh_double2scm  (0.0);
+  return gh_double2scm (0.0);
 }
 
 
-MAKE_SCHEME_CALLBACK(Dots,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Dots,brew_molecule,1);
 SCM  
 Dots::brew_molecule (SCM d)
 {
@@ -56,13 +56,17 @@ Dots::brew_molecule (SCM d)
       /*
        we need to add a real blank box, to assure that
        side-positioning doth not cancel the left-most padding.  */
+
+      /*
+       TODO: this should  be handled by side-position padding.
+       */
       mol = Lookup::blank (Box (Interval (0,0),
                                Interval (0,0)));
   
-      for (int i = gh_scm2int (c); i--; )
+      for (int i = gh_scm2int (c); i--;)
        {
          d.translate_axis (2*dw,X_AXIS);
-         mol.add_at_edge (X_AXIS, RIGHT, d, dw);
+         mol.add_at_edge (X_AXIS, RIGHT, d, dw, 0);
        }
     }
   return mol.smobbed_copy ();
@@ -70,3 +74,11 @@ Dots::brew_molecule (SCM d)
 
 
 
+
+ADD_INTERFACE (Dots, "dots-interface",
+  "The dots to go with a notehead/rest.  A separate interface, since they "
+" are a party in collision resolution. "
+" #'direction is the Direction to handle staff-line collisions in.",
+  "direction dot-count");
+
+