X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdots.cc;h=43c47b77199a4576a7de3890f8011d485e925e84;hb=5fd7bf3338c85bbaf0212422e9e649ab5f66383b;hp=edd64f01445d4d92eb1af5ec4821a530d7b1b68d;hpb=b638d530ac5a32a832646cdd2b680ce52d0764f0;p=lilypond.git

diff --git a/lily/dots.cc b/lily/dots.cc
index edd64f0144..43c47b7719 100644
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -1,69 +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--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.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 "directional-element-interface.hh"
+#include "international.hh"
 
-Dots::Dots (SCM s)
-  : Item (s)
-{
-}
-
-GLUE_SCORE_ELEMENT(Dots,after_line_breaking);
+MAKE_SCHEME_CALLBACK (Dots, print, 1);
 SCM
-Dots::member_after_line_breaking ()
+Dots::print (SCM d)
 {
-  SCM d= get_elt_property ("dot-count");
-  if (gh_number_p (d) && gh_scm2int (d))
-    {
-      if (!Directional_element_interface (this).get ())
-	Directional_element_interface (this).set (UP);
-
-      Staff_symbol_referencer_interface si (this);
-      int p = int (si.position_f ());
-      if (!(p % 2))
-	si.set_position (p  + Directional_element_interface (this).get ());
-    }
+  Grob *sc = unsmob_grob (d);
+  Stencil mol;
 
-    return SCM_UNDEFINED;
+  SCM c = sc->get_property ("dot-count");
 
-}
-
-MAKE_SCHEME_SCORE_ELEMENT_CALLBACK(Dots,brew_molecule);
-
-SCM  
-Dots::brew_molecule (SCM d)
-{
-  Score_element *sc = unsmob_element (d);
-  Molecule mol (sc->lookup_l ()->blank (Box (Interval (0,0),
-					 Interval (0,0))));
-
-  SCM c = sc->get_elt_property ("dot-count");
-  if (gh_number_p (c))
+  if (scm_is_number (c))
     {
-      Molecule d = sc->lookup_l ()->afm_find (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 ();
-      d.translate_axis (-dw, X_AXIS);
-
 
-      for (int i = gh_scm2int (c); i--; )
-	{
-	  d.translate_axis (2*dw,X_AXIS);
-	  mol.add_molecule (d);
-	}
+      /*
+        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.
+      */
+      mol = Lookup::blank (Box (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);
+        }
     }
-  return mol.create_scheme ();
+  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.",
+
+               /* properties */
+               "direction "
+               "dot-count "
+               "style "
+              );