* lily/output-def-scheme.cc: new file.

[lilypond.git] / lily / dots.cc

diff --git a/lily/dots.cc b/lily/dots.cc
index 42c6b56922897448d7f70bf76a594f2bdb18c4fc..0fd24ae0a9f902fe6dd468ff8569a9f2c1fdf4c8 100644 (file)
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -7,26 +7,26 @@
 */
 
 #include "dots.hh"
+
 #include "item.hh"
-#include "molecule.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "font-interface.hh"
 #include "lookup.hh"
 #include "staff-symbol-referencer.hh"
 #include "directional-element-interface.hh"
 
-MAKE_SCHEME_CALLBACK (Dots,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Dots,print,1);
 SCM  
-Dots::brew_molecule (SCM d)
+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::brew_molecule (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::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");
+              "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");