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

diff --git a/lily/dots.cc b/lily/dots.cc
index 0627b2b720..b7f787bc02 100644
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -1,9 +1,20 @@
 /*
-  dots.cc -- implement Dots
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "dots.hh"
@@ -13,47 +24,59 @@
 #include "font-interface.hh"
 #include "lookup.hh"
 #include "staff-symbol-referencer.hh"
-#include "directional-element-interface.hh"
+#include "international.hh"
 
 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");
 
   if (scm_is_number (c))
     {
-      Stencil d = Font_interface::get_default_font (sc)->find_by_name (std::string ("dots.dot"));
+      SCM scm_style = sc->get_property ("style");
+      string style = "";
+      if (scm_is_symbol (scm_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;
+        }
       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, 0);
-	}
+        {
+          mol.add_at_edge (X_AXIS, RIGHT, d, dw);
+        }
     }
   return mol.smobbed_copy ();
 }
 
-ADD_INTERFACE (Dots, "dots-interface",
-	       "The dots to go with a notehead or rest."
-	       "@code{direction} sets the preferred direction to move in case of staff "
-	       "line collisions.",
-
-	       /* properties */
-	       "direction "
-	       "dot-count");
+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.",
 
+               /* properties */
+               "direction "
+               "dot-count "
+               "style "
+              );