X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdots.cc;h=ff777b926aae1ebc772786d9ac88d16d903a71aa;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=ccd29ae3b61a04843be48771f2eb31a665dac3d3;hpb=fdfd147f1233eef6ea8b176290221b5a4ec38868;p=lilypond.git diff --git a/lily/dots.cc b/lily/dots.cc index ccd29ae3b6..ff777b926a 100644 --- a/lily/dots.cc +++ b/lily/dots.cc @@ -3,65 +3,70 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ #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" - -MAKE_SCHEME_SCORE_ELEMENT_CALLBACK(Dots,after_line_breaking); +#include "international.hh" +MAKE_SCHEME_CALLBACK (Dots, print, 1); SCM -Dots::after_line_breaking (SCM smob) +Dots::print (SCM d) { - Item * p = dynamic_cast (unsmob_element (smob)); - - SCM d= p->get_elt_property ("dot-count"); - if (gh_number_p (d) && gh_scm2int (d)) - { - if (!Directional_element_interface (p).get ()) - Directional_element_interface (p).set (UP); - - Staff_symbol_referencer_interface si (p); - int pos = int (si.position_f ()); - if (!(pos % 2)) - si.set_position (pos + Directional_element_interface (p).get ()); - } - - return SCM_UNDEFINED; -} + Grob *sc = unsmob_grob (d); + Stencil mol; -MAKE_SCHEME_SCORE_ELEMENT_CALLBACK(Dots,brew_molecule); + SCM c = sc->get_property ("dot-count"); -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); + /* + we need to add a real blank box, to assure that + side-positioning doth not cancel the left-most padding. */ - for (int i = gh_scm2int (c); i--; ) + /* + 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_molecule (d); + 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 " + );