(bezier-sandwich): New function.

[lilypond.git] / lily / dots.cc

diff --git a/lily/dots.cc b/lily/dots.cc
index 2bb9dfdf7a15407b99d099597f7750a28a256991..ba33b5ff537be97439fbdd5fb4ec5e969926586b 100644 (file)
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -8,8 +8,8 @@
 
 #include "dots.hh"
 #include "item.hh"
-#include "molecule.hh"
-#include "paper-def.hh"
+#include "stencil.hh"
+#include "output-def.hh"
 #include "font-interface.hh"
 #include "lookup.hh"
 #include "staff-symbol-referencer.hh"
@@ -20,13 +20,13 @@ SCM
 Dots::print (SCM d)
 {
   Grob *sc = unsmob_grob (d);
-  Molecule mol;
+  Stencil mol;
   
-  SCM c = sc->get_grob_property ("dot-count");
+  SCM c = sc->get_property ("dot-count");
 
-  if (gh_number_p (c))
+  if (scm_is_number (c))
     {
-      Molecule d = Font_interface::get_default_font (sc)->find_by_name (String ("dots-dot"));
+      Stencil d = Font_interface::get_default_font (sc)->find_by_name (String ("dots-dot"));
       Real dw = d.extent (X_AXIS).length ();
       
 
@@ -40,7 +40,7 @@ Dots::print (SCM d)
       mol = Lookup::blank (Box (Interval (0,0),
                                Interval (0,0)));
   
-      for (int i = gh_scm2int (c); i--;)
+      for (int i = scm_to_int (c); i--;)
        {
          d.translate_axis (2*dw,X_AXIS);
          mol.add_at_edge (X_AXIS, RIGHT, d, dw, 0);
@@ -53,9 +53,9 @@ Dots::print (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");
+              "The dots to go with a notehead or rest."
+              "@code{direction} sets the preferred direction to move in case of staff "
+              "line collisions.",
+              "direction dot-count");