X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdots.cc;h=8319118752c781ec16fc01f69fa7f62a035c44a0;hb=cadb80a98fffcf101886553dd1327e7c468682dc;hp=44e06c0b23bc9336a0fd96eef051f910024738c2;hpb=dcade6efa10f6acb65ac3e64a5823ffd0aae04e8;p=lilypond.git

diff --git a/lily/dots.cc b/lily/dots.cc
index 44e06c0b23..8319118752 100644
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -1,53 +1,83 @@
 /*
-  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--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.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"
-#include "molecule.hh"
-#include "paper-def.hh"
+
+#include "item.hh"
+#include "output-def.hh"
+#include "font-interface.hh"
 #include "lookup.hh"
+#include "staff-symbol-referencer.hh"
+#include "international.hh"
 
-Dots::Dots ()
+MAKE_SCHEME_CALLBACK (Dots, print, 1);
+SCM
+Dots::print (SCM d)
 {
-  no_dots_i_ =0;
-  position_i_ =0;
-}
+  Grob *sc = unsmob_grob (d);
+  Stencil mol;
 
-void
-Dots::do_post_processing ()
-{
-  if (!(position_i_ % 2))
-    position_i_ ++;
-  if (!no_dots_i_)
+  SCM c = sc->get_property ("dot-count");
+
+  if (scm_is_number (c))
     {
-      transparent_b_ = true;
-      set_empty(true);
-    }
-}
+      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 ();
 
-Molecule* 
-Dots::brew_molecule_p () const
-{
-  Molecule *out = new Molecule;
-  Atom fill = paper()->lookup_l ()->fill (Box(Interval(0,0),Interval(0,0)));
-  out->add(fill);
+      /*
+	we need to add a real blank box, to assure that
+	side-positioning doth not cancel the left-most padding.  */
 
-  Atom d = paper ()->lookup_l ()->dots (0);
+      /*
+	TODO: this should  be handled by side-position padding.
+      */
+      mol = Lookup::blank (Box (Interval (0, 0),
+				Interval (0, 0)));
 
-  Real dw = d.dim_[X_AXIS].length();
-  d.translate(-dw,X_AXIS);
-  for (int i=no_dots_i_; i--; )
-    {
-      d.translate(2*dw,X_AXIS);
-      out->add (d);
+      for (int i = scm_to_int (c); i--;)
+	{
+	  d.translate_axis (2 * dw, X_AXIS);
+	  mol.add_at_edge (X_AXIS, RIGHT, d, dw);
+	}
     }
-  Real inter_f = paper ()->internote_f ();
-  out->translate (inter_f * position_i_, Y_AXIS);
-  return out;
+  return mol.smobbed_copy ();
 }
 
-IMPLEMENT_IS_TYPE_B1(Dots, Item);
+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 "
+	       );