X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdots.cc;h=b7f787bc022f0e9c1af1428ba9b1d645abd2ae39;hb=ef5a42b89fce52317d2b8b0e176e5a012687f2c3;hp=f432e7f74f583f284fc1e3481d78161f96569c46;hpb=bc95f4434f760d41191341ab4508b2064eb19025;p=lilypond.git

diff --git a/lily/dots.cc b/lily/dots.cc
index f432e7f74f..b7f787bc02 100644
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@ MAKE_SCHEME_CALLBACK (Dots, print, 1);
 SCM
 Dots::print (SCM d)
 {
-  Grob *sc = unsmob_grob (d);
+  Grob *sc = unsmob<Grob> (d);
   Stencil mol;
 
   SCM c = sc->get_property ("dot-count");
@@ -38,46 +38,45 @@ Dots::print (SCM d)
   if (scm_is_number (c))
     {
       SCM scm_style = sc->get_property ("style");
-      string style ="";
+      string style = "";
       if (scm_is_symbol (scm_style))
-	style = ly_symbol2string (scm_style);
-      string idx =  "dots.dot" + style;
+        style = ly_symbol2string (scm_style);
+      string idx = "dots.dot" + style;
       Stencil d = Font_interface::get_default_font (sc)->find_by_name (idx);
       if (d.is_empty ())
-	{
-	  sc->warning (_f ("dot `%s' not found", idx.c_str ()));
-	  return SCM_EOL;
-	}
+        {
+          sc->warning (_f ("dot `%s' not found", idx.c_str ()));
+          return SCM_EOL;
+        }
       Real dw = d.extent (X_AXIS).length ();
 
       /*
-	we need to add a real blank box, to assure that
-	side-positioning doth not cancel the left-most padding.  */
+        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.
+        TODO: this should  be handled by side-position padding.
       */
       mol = Lookup::blank (Box (Interval (0, 0),
-				Interval (0, 0)));
+                                Interval (0, 0)));
 
       for (int i = scm_to_int (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);
+        }
     }
   return mol.smobbed_copy ();
 }
 
 ADD_INTERFACE (Dots,
-	       "The dots to go with a notehead or rest.  @code{direction}"
-	       " sets the preferred direction to move in case of staff line"
-	       " collisions.  @code{style} defaults to undefined, which is"
-	       " normal 19th/20th century traditional style.  Set"
-	       " @code{style} to @code{vaticana} for ancient type dots.",
+               "The dots to go with a notehead or rest.  @code{direction}"
+               " sets the preferred direction to move in case of staff line"
+               " collisions.  @code{style} defaults to undefined, which is"
+               " normal 19th/20th century traditional style.  Set"
+               " @code{style} to @code{vaticana} for ancient type dots.",
 
-	       /* properties */
-	       "direction "
-	       "dot-count "
-	       "style "
-	       );
+               /* properties */
+               "direction "
+               "dot-count "
+               "style "
+              );