X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdots.cc;h=0c7d634798a87c2ab26e481f8b3521dd62365045;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=31facd5fbd09df708a37371bd46c472e7be60341;hpb=c802622f935af83bb791ded58056428d6be31d0a;p=lilypond.git diff --git a/lily/dots.cc b/lily/dots.cc index 31facd5fbd..0c7d634798 100644 --- a/lily/dots.cc +++ b/lily/dots.cc @@ -1,72 +1,82 @@ /* - 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--2014 Han-Wen Nienhuys - (c) 1997--2000 Han-Wen Nienhuys + 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 . */ #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" - +#include "international.hh" -MAKE_SCHEME_CALLBACK(Dots,quantised_position_callback,2); +MAKE_SCHEME_CALLBACK (Dots, print, 1); SCM -Dots::quantised_position_callback (SCM element_smob, SCM axis) +Dots::print (SCM d) { - Score_element *me = unsmob_element (element_smob); - Axis a = (Axis) gh_scm2int (axis); - assert (a == Y_AXIS); - - SCM d= me->get_elt_property ("dot-count"); - if (gh_number_p (d) && gh_scm2int (d)) - { - if (!Directional_element_interface::get (me)) - Directional_element_interface::set (me, UP); - - if (Staff_symbol_referencer::on_staffline (me)) - return gh_double2scm (Staff_symbol_referencer::staff_space (me) / 2.0 * Directional_element_interface::get (me)); - } + Grob *sc = unsmob_grob (d); + Stencil mol; - return gh_double2scm (0.0); -} + SCM c = sc->get_property ("dot-count"); - -MAKE_SCHEME_CALLBACK(Dots,brew_molecule,1); -SCM -Dots::brew_molecule (SCM d) -{ - Score_element *sc = unsmob_element (d); - Molecule mol; - - SCM c = sc->get_elt_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")); + 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. */ - mol = Lookup::blank (Box (Interval (0,0), - Interval (0,0))); - - for (int i = gh_scm2int (c); i--; ) - { - d.translate_axis (2*dw,X_AXIS); - mol.add_at_edge (X_AXIS, RIGHT, d, dw); - } + 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--;) + { + 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.", - + /* properties */ + "direction " + "dot-count " + "style " + );